FreeChainXenon/binutils-gdb
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Add support for MSP430 F5 hardware multiply.

Browse source 
* msp430-sim.c (sim_open): Check for needed memory at address
	0x500 not 0x200.
	(get_op): Add support for F5 hardware multiply addresses.
	(put_op): Likewise.
This commit is contained in:
Nick Clifton 2015-12-07 10:19:19 +00:00
parent cbf9597294
commit f7584f0560
2 changed files with 59 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

7
sim/msp430/ChangeLog
View file

@ -1,3 +1,10 @@
2015-12-07 Nick Clifton <nickc@redhat.com>
* msp430-sim.c (sim_open): Check for needed memory at address
0x500 not 0x200.
(get_op): Add support for F5 hardware multiply addresses.
(put_op): Likewise.
2015-11-15 Mike Frysinger <vapier@gentoo.org> 2015-11-15 Mike Frysinger <vapier@gentoo.org>
* Makefile.in (SIM_OBJS): Delete sim-reason.o, sim-reg.o, and * Makefile.in (SIM_OBJS): Delete sim-reason.o, sim-reg.o, and

62
sim/msp430/msp430-sim.c
View file

@ -181,8 +181,8 @@ sim_open (SIM_OPEN_KIND kind,
Note - these values match the memory regions in the libgloss/msp430/msp430[xl]-sim.ld scripts. */ Note - these values match the memory regions in the libgloss/msp430/msp430[xl]-sim.ld scripts. */
if (sim_core_read_buffer (sd, MSP430_CPU (sd), read_map, &c, 0x2, 1) == 0) if (sim_core_read_buffer (sd, MSP430_CPU (sd), read_map, &c, 0x2, 1) == 0)
sim_do_commandf (sd, "memory-region 0,0x20"); /* Needed by the GDB testsuite. */ sim_do_commandf (sd, "memory-region 0,0x20"); /* Needed by the GDB testsuite. */
if (sim_core_read_buffer (sd, MSP430_CPU (sd), read_map, &c, 0x200, 1) == 0) if (sim_core_read_buffer (sd, MSP430_CPU (sd), read_map, &c, 0x500, 1) == 0)
sim_do_commandf (sd, "memory-region 0x200,0xfd00"); /* RAM and/or ROM */ sim_do_commandf (sd, "memory-region 0x500,0xfa00"); /* RAM and/or ROM */
if (sim_core_read_buffer (sd, MSP430_CPU (sd), read_map, &c, 0xfffe, 1) == 0) if (sim_core_read_buffer (sd, MSP430_CPU (sd), read_map, &c, 0xfffe, 1) == 0)
sim_do_commandf (sd, "memory-region 0xffc0,0x40"); /* VECTORS. */ sim_do_commandf (sd, "memory-region 0xffc0,0x40"); /* VECTORS. */
if (sim_core_read_buffer (sd, MSP430_CPU (sd), read_map, &c, 0x10000, 1) == 0) if (sim_core_read_buffer (sd, MSP430_CPU (sd), read_map, &c, 0x10000, 1) == 0)
@ -404,10 +404,12 @@ get_op (SIM_DESC sd, MSP430_Opcode_Decoded *opc, int n)
if (addr == 0x5dd) if (addr == 0x5dd)
rv = 2; rv = 2;
#endif #endif
if (addr >= 0x130 && addr <= 0x15B) if ((addr >= 0x130 && addr <= 0x15B)
|| (addr >= 0x4C0 && addr <= 0x4EB))
{ {
switch (addr) switch (addr)
{ {
case 0x4CA:
case 0x13A: case 0x13A:
switch (HWMULT (sd, hwmult_type)) switch (HWMULT (sd, hwmult_type))
{ {
@ -422,6 +424,7 @@ get_op (SIM_DESC sd, MSP430_Opcode_Decoded *opc, int n)
} }
break; break;
case 0x4CC:
case 0x13C: case 0x13C:
switch (HWMULT (sd, hwmult_type)) switch (HWMULT (sd, hwmult_type))
{ {
@ -437,6 +440,7 @@ get_op (SIM_DESC sd, MSP430_Opcode_Decoded *opc, int n)
} }
break; break;
case 0x4CE:
case 0x13E: case 0x13E:
switch (HWMULT (sd, hwmult_type)) switch (HWMULT (sd, hwmult_type))
{ {
@ -455,18 +459,22 @@ get_op (SIM_DESC sd, MSP430_Opcode_Decoded *opc, int n)
} }
break; break;
case 0x4E4:
case 0x154: case 0x154:
rv = zero_ext (HWMULT (sd, hw32mult_result), 16); rv = zero_ext (HWMULT (sd, hw32mult_result), 16);
break; break;
case 0x4E6:
case 0x156: case 0x156:
rv = zero_ext (HWMULT (sd, hw32mult_result) >> 16, 16); rv = zero_ext (HWMULT (sd, hw32mult_result) >> 16, 16);
break; break;
case 0x4E8:
case 0x158: case 0x158:
rv = zero_ext (HWMULT (sd, hw32mult_result) >> 32, 16); rv = zero_ext (HWMULT (sd, hw32mult_result) >> 32, 16);
break; break;
case 0x4EA:
case 0x15A: case 0x15A:
switch (HWMULT (sd, hw32mult_type)) switch (HWMULT (sd, hw32mult_type))
{ {
@ -581,7 +589,8 @@ put_op (SIM_DESC sd, MSP430_Opcode_Decoded *opc, int n, int val)
if (addr == 0x5ce) if (addr == 0x5ce)
putchar (val); putchar (val);
#endif #endif
if (addr >= 0x130 && addr <= 0x15B) if ((addr >= 0x130 && addr <= 0x15B)
|| (addr >= 0x4C0 && addr <= 0x4EB))
{ {
signed int a,b; signed int a,b;
@ -590,12 +599,33 @@ put_op (SIM_DESC sd, MSP430_Opcode_Decoded *opc, int n, int val)
switch (addr) switch (addr)
{ {
case 0x130: HWMULT (sd, hwmult_op1) = val; HWMULT (sd, hwmult_type) = UNSIGN_32; break; case 0x4C0:
case 0x132: HWMULT (sd, hwmult_op1) = val; HWMULT (sd, hwmult_type) = SIGN_32; break; case 0x130:
case 0x134: HWMULT (sd, hwmult_op1) = val; HWMULT (sd, hwmult_type) = UNSIGN_MAC_32; break; HWMULT (sd, hwmult_op1) = val;
case 0x136: HWMULT (sd, hwmult_op1) = val; HWMULT (sd, hwmult_type) = SIGN_MAC_32; break; HWMULT (sd, hwmult_type) = UNSIGN_32;
break;
case 0x138: HWMULT (sd, hwmult_op2) = val; case 0x4C2:
case 0x132:
HWMULT (sd, hwmult_op1) = val;
HWMULT (sd, hwmult_type) = SIGN_32;
break;
case 0x4C4:
case 0x134:
HWMULT (sd, hwmult_op1) = val;
HWMULT (sd, hwmult_type) = UNSIGN_MAC_32;
break;
case 0x4C6:
case 0x136:
HWMULT (sd, hwmult_op1) = val;
HWMULT (sd, hwmult_type) = SIGN_MAC_32;
break;
case 0x4C8:
case 0x138:
HWMULT (sd, hwmult_op2) = val;
switch (HWMULT (sd, hwmult_type)) switch (HWMULT (sd, hwmult_type))
{ {
case UNSIGN_32: case UNSIGN_32:
@ -630,7 +660,8 @@ put_op (SIM_DESC sd, MSP430_Opcode_Decoded *opc, int n, int val)
} }
break; break;
case 0x13a: case 0x4CA:
case 0x13A:
/* Copy into LOW result... */ /* Copy into LOW result... */
switch (HWMULT (sd, hwmult_type)) switch (HWMULT (sd, hwmult_type))
{ {
@ -647,24 +678,34 @@ put_op (SIM_DESC sd, MSP430_Opcode_Decoded *opc, int n, int val)
} }
break; break;
case 0x4D0:
case 0x140: case 0x140:
HWMULT (sd, hw32mult_op1) = val; HWMULT (sd, hw32mult_op1) = val;
HWMULT (sd, hw32mult_type) = UNSIGN_64; HWMULT (sd, hw32mult_type) = UNSIGN_64;
break; break;
case 0x4D2:
case 0x142: case 0x142:
HWMULT (sd, hw32mult_op1) = (HWMULT (sd, hw32mult_op1) & 0xFFFF) | (val << 16); HWMULT (sd, hw32mult_op1) = (HWMULT (sd, hw32mult_op1) & 0xFFFF) | (val << 16);
break; break;
case 0x4D4:
case 0x144: case 0x144:
HWMULT (sd, hw32mult_op1) = val; HWMULT (sd, hw32mult_op1) = val;
HWMULT (sd, hw32mult_type) = SIGN_64; HWMULT (sd, hw32mult_type) = SIGN_64;
break; break;
case 0x4D6:
case 0x146: case 0x146:
HWMULT (sd, hw32mult_op1) = (HWMULT (sd, hw32mult_op1) & 0xFFFF) | (val << 16); HWMULT (sd, hw32mult_op1) = (HWMULT (sd, hw32mult_op1) & 0xFFFF) | (val << 16);
break; break;
case 0x4E0:
case 0x150: case 0x150:
HWMULT (sd, hw32mult_op2) = val; HWMULT (sd, hw32mult_op2) = val;
break; break;
case 0x4E2:
case 0x152: case 0x152:
HWMULT (sd, hw32mult_op2) = (HWMULT (sd, hw32mult_op2) & 0xFFFF) | (val << 16); HWMULT (sd, hw32mult_op2) = (HWMULT (sd, hw32mult_op2) & 0xFFFF) | (val << 16);
switch (HWMULT (sd, hw32mult_type)) switch (HWMULT (sd, hw32mult_type))
@ -1115,6 +1156,7 @@ msp430_step_once (SIM_DESC sd)
init_disassemble_info (&info, stderr, (fprintf_ftype) fprintf); init_disassemble_info (&info, stderr, (fprintf_ftype) fprintf);
info.private_data = sd; info.private_data = sd;
info.read_memory_func = msp430_dis_read; info.read_memory_func = msp430_dis_read;
fprintf (stderr, "%#8x ", opcode_pc); fprintf (stderr, "%#8x ", opcode_pc);
for (i = 0; i < opsize; i += 2) for (i = 0; i < opsize; i += 2)
fprintf (stderr, " %02x%02x", b[i+1], b[i]); fprintf (stderr, " %02x%02x", b[i+1], b[i]);