diff options
-rw-r--r-- | sim/sh/ChangeLog | 5 | ||||
-rw-r--r-- | sim/sh/gencode.c | 4 |
2 files changed, 7 insertions, 2 deletions
diff --git a/sim/sh/ChangeLog b/sim/sh/ChangeLog index 549e49976ba..10b4ae21710 100644 --- a/sim/sh/ChangeLog +++ b/sim/sh/ChangeLog @@ -1,3 +1,8 @@ +2004-08-18 J"orn Rennecke <joern.rennecke@superh.com> + + * gencode.c (tab): For shad snd shld, fix result for + (op1 < 0 && shift_amount == 0). + 2004-02-02 Michael Snyder <msnyder@redhat.com> * gencode.c (movua.l): Set thislock to 0, not n. diff --git a/sim/sh/gencode.c b/sim/sh/gencode.c index 33475918704..155138a2daf 100644 --- a/sim/sh/gencode.c +++ b/sim/sh/gencode.c @@ -1054,7 +1054,7 @@ op tab[] = }, { "n", "mn", "shad <REG_M>,<REG_N>", "0100nnnnmmmm1100", - "R[n] = (R[m] < 0) ? (R[n] >> ((-R[m])&0x1f)) : (R[n] << (R[m] & 0x1f));", + "R[n] = (R[m] < 0) ? (R[m]&0x1f ? R[n] >> ((-R[m])&0x1f) : R[n] >> 31) : (R[n] << (R[m] & 0x1f));", }, { "n", "n", "shal <REG_N>", "0100nnnn00100000", @@ -1068,7 +1068,7 @@ op tab[] = }, { "n", "mn", "shld <REG_M>,<REG_N>", "0100nnnnmmmm1101", - "R[n] = (R[m] < 0) ? (UR[n] >> ((-R[m])&0x1f)): (R[n] << (R[m] & 0x1f));", + "R[n] = (R[m] < 0) ? (R[m]&0x1f ? UR[n] >> ((-R[m])&0x1f) : 0): (R[n] << (R[m] & 0x1f));", }, { "n", "n", "shll <REG_N>", "0100nnnn00000000", |