diff options
| author | Joyce Janczyn <janczyn@cygnus> | 1998-08-26 13:31:38 +0000 |
|---|---|---|
| committer | Joyce Janczyn <janczyn@cygnus> | 1998-08-26 13:31:38 +0000 |
| commit | ef4d20e91566e7f6ee7133ccee235f6922bd6df5 (patch) | |
| tree | 37ba058df116aad44ea867bbf02f3f47b34a6dda | |
| parent | 7c71c3ea984e667edb041395fc780ac40088b002 (diff) | |
| download | fsf-binutils-gdb-ef4d20e91566e7f6ee7133ccee235f6922bd6df5.zip fsf-binutils-gdb-ef4d20e91566e7f6ee7133ccee235f6922bd6df5.tar.gz fsf-binutils-gdb-ef4d20e91566e7f6ee7133ccee235f6922bd6df5.tar.bz2 | |
Regress yesterday's change to jmp instruction -- it has deceiving syntax.
Also tidy up some code to match documentation and fix div, divu by 0.
| -rw-r--r-- | sim/mn10300/ChangeLog | 5 | ||||
| -rw-r--r-- | sim/mn10300/mn10300.igen | 44 |
2 files changed, 32 insertions, 17 deletions
diff --git a/sim/mn10300/ChangeLog b/sim/mn10300/ChangeLog index 251f478..1278b76 100644 --- a/sim/mn10300/ChangeLog +++ b/sim/mn10300/ChangeLog @@ -1,3 +1,8 @@ +Wed Aug 26 09:29:38 1998 Joyce Janczyn <janczyn@cygnus.com> + + * mn10300.igen (div,divu): Fix divide instructions so divide by 0 + behaves like the hardware. + Tue Aug 25 16:46:59 1998 Joyce Janczyn <janczyn@cygnus.com> * mn10300.igen (OP_F0F4): Need to load contents of register AN0 diff --git a/sim/mn10300/mn10300.igen b/sim/mn10300/mn10300.igen index 821529b..aec7a43 100644 --- a/sim/mn10300/mn10300.igen +++ b/sim/mn10300/mn10300.igen @@ -1964,18 +1964,23 @@ PC = cia; denom = (signed32)State.regs[REG_D0 + DM1]; - /* still need to check for overflow */ + + temp = State.regs[REG_MDR]; + temp <<= 32; + temp |= State.regs[REG_D0 + DN0]; if ( !(v = (0 == denom)) ) { - temp = State.regs[REG_MDR]; - temp <<= 32; - temp |= State.regs[REG_D0 + DN0]; State.regs[REG_MDR] = temp % (signed32)State.regs[REG_D0 + DM1]; temp /= (signed32)State.regs[REG_D0 + DM1]; State.regs[REG_D0 + DN0] = temp & 0xffffffff; - z = (State.regs[REG_D0 + DN0] == 0); - n = (State.regs[REG_D0 + DN0] & 0x80000000) != 0; } + else + { + State.regs[REG_MDR] = temp; + State.regs[REG_D0 + DN0] = 0xff; + } + z = (State.regs[REG_D0 + DN0] == 0); + n = (State.regs[REG_D0 + DN0] & 0x80000000) != 0; PSW &= ~(PSW_Z | PSW_N | PSW_C | PSW_V); PSW |= ((z ? PSW_Z : 0) | (n ? PSW_N : 0) | (v ? PSW_V : 0)); } @@ -1996,17 +2001,22 @@ PC = cia; denom = (unsigned32)State.regs[REG_D0 + DM1]; + temp = State.regs[REG_MDR]; + temp <<= 32; + temp |= State.regs[REG_D0 + DN0]; if ( !(v = (0 == denom)) ) { - temp = State.regs[REG_MDR]; - temp <<= 32; - temp |= State.regs[REG_D0 + DN0]; State.regs[REG_MDR] = temp % State.regs[REG_D0 + DM1]; temp /= State.regs[REG_D0 + DM1]; State.regs[REG_D0 + DN0] = temp & 0xffffffff; - z = (State.regs[REG_D0 + DN0] == 0); - n = (State.regs[REG_D0 + DN0] & 0x80000000) != 0; } + else + { + State.regs[REG_MDR] = temp; + State.regs[REG_D0 + DN0] = 0xff; + } + z = (State.regs[REG_D0 + DN0] == 0); + n = (State.regs[REG_D0 + DN0] & 0x80000000) != 0; PSW &= ~(PSW_Z | PSW_N | PSW_C | PSW_V); PSW |= ((z ? PSW_Z : 0) | (n ? PSW_N : 0) | (v ? PSW_V : 0)); } @@ -3334,7 +3344,7 @@ // end-sanitize-am33 { /* OP_F0F4 (); */ - PC = load_word (State.regs[REG_A0 + AN0]); + PC = State.regs[REG_A0 + AN0]; nia = PC; } @@ -3512,19 +3522,19 @@ } -// 1111 0101 0000 DmDn; udf20 Dm,Dm -8.0xf5+4.0x0,2.DM1,2.DM0:D0:::putx +// 1111 0101 0000 DmDn; udf20 Dm,Dn +8.0xf5+4.0x0,2.DM1,2.DN0:D0:::putx "putx" *mn10300 { /* OP_F500 (); */ PC = cia; - State.regs[REG_MDRQ] = State.regs[REG_D0 + DM0]; + State.regs[REG_MDRQ] = State.regs[REG_D0 + DN0]; } -// 1111 0110 1111 DmDn; udf15 Dn,Dn -8.0xf6+4.0xf,2.DN1,2.DN0:D0:::getx +// 1111 0110 1111 DmDn; udf15 Dm,Dn +8.0xf6+4.0xf,2.DM1,2.DN0:D0:::getx "getx" *mn10300 // start-sanitize-am33 |