Imagelibrary/binutils-gdb
1
0
Fork 1
mirror of https://github.com/bminor/binutils-gdb.git synced 2025-12-10 17:43:16 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix a small but in the emulation of the MSP430 hardware multiply.

Browse Source 
* msp430-sim.c (get_op): Handle reads of low result register when
	in MAC mode.
	(put_op): Copy MAC result into result words.
	Handle writes to the low result register.
This commit is contained in:
Nick Clifton
2014-06-03 09:00:57 +01:00
parent 9f44512958
commit aef392c4ae
2 changed files with 37 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
sim/msp430/ChangeLog
View File

@@ -1,3 +1,10 @@
2014-06-03 Nick Clifton <nickc@redhat.com>
* msp430-sim.c (get_op): Handle reads of low result register when
in MAC mode.
(put_op): Copy MAC result into result words.
Handle writes to the low result register.
2014-05-12 DJ Delorie <dj@redhat.com> 2014-05-12 DJ Delorie <dj@redhat.com>
* msp43-sim.c (sign_ext): Change to "long long" to support * msp43-sim.c (sign_ext): Change to "long long" to support

33
sim/msp430/msp430-sim.c
View File

@@ -413,16 +413,24 @@ get_op (SIM_DESC sd, MSP430_Opcode_Decoded *opc, int n)
switch (addr) switch (addr)
{ {
case 0x13A: case 0x13A:
rv = zero_ext (hwmult_result, 16); switch (hwmult_type)
{
case UNSIGN_MAC_32:
case UNSIGN_32: rv = zero_ext (hwmult_result, 16); break;
case SIGN_MAC_32:
case SIGN_32: rv = sign_ext (hwmult_signed_result, 16); break;
}
break; break;
case 0x13C: case 0x13C:
switch (hwmult_type) switch (hwmult_type)
{ {
case UNSIGN_MAC_32:
case UNSIGN_32: case UNSIGN_32:
rv = zero_ext (hwmult_result >> 16, 16); rv = zero_ext (hwmult_result >> 16, 16);
break; break;
case SIGN_MAC_32:
case SIGN_32: case SIGN_32:
rv = sign_ext (hwmult_signed_result >> 16, 16); rv = sign_ext (hwmult_signed_result >> 16, 16);
break; break;
@@ -599,7 +607,8 @@ put_op (SIM_DESC sd, MSP430_Opcode_Decoded *opc, int n, int val)
case UNSIGN_MAC_32: case UNSIGN_MAC_32:
hwmult_accumulator += hwmult_op1 * hwmult_op2; hwmult_accumulator += hwmult_op1 * hwmult_op2;
hwmult_signed_accumulator += hwmult_op1 * hwmult_op2; hwmult_signed_accumulator += hwmult_op1 * hwmult_op2;
hwmult_result = hwmult_signed_result = 0; hwmult_result = hwmult_accumulator;
hwmult_signed_result = hwmult_signed_accumulator;
break; break;
case SIGN_MAC_32: case SIGN_MAC_32:
@@ -607,7 +616,25 @@ put_op (SIM_DESC sd, MSP430_Opcode_Decoded *opc, int n, int val)
b = sign_ext (hwmult_op2, 16); b = sign_ext (hwmult_op2, 16);
hwmult_accumulator += a * b; hwmult_accumulator += a * b;
hwmult_signed_accumulator += a * b; hwmult_signed_accumulator += a * b;
hwmult_result = hwmult_signed_result = 0; hwmult_result = hwmult_accumulator;
hwmult_signed_result = hwmult_signed_accumulator;
break;
}
break;
case 0x13a:
/* Copy into LOW result... */
switch (hwmult_type)
{
case UNSIGN_MAC_32:
case UNSIGN_32:
hwmult_accumulator = hwmult_result = zero_ext (val, 16);
hwmult_signed_accumulator = sign_ext (val, 16);
break;
case SIGN_MAC_32:
case SIGN_32:
hwmult_signed_accumulator = hwmult_result = sign_ext (val, 16);
hwmult_accumulator = zero_ext (val, 16);
break; break;
} }
break; break;