diff options
author | David Carlton <carlton@bactrian.org> | 2002-09-27 20:03:29 +0000 |
---|---|---|
committer | David Carlton <carlton@bactrian.org> | 2002-09-27 20:03:29 +0000 |
commit | 000dc7bf623e1d88646561e5b49f0bfc2f3c3608 (patch) | |
tree | 5bf825dd5393e7a307a6aa29fa0b915b3b0f667d /sim | |
parent | ab3e45a3dffa71cbd5bed579cbb1a2656d3bad62 (diff) | |
download | gdb-000dc7bf623e1d88646561e5b49f0bfc2f3c3608.tar.gz |
Merge with mainline; tag is carlton_dictionary-20020927-merge
Diffstat (limited to 'sim')
-rw-r--r-- | sim/v850/ChangeLog | 4 | ||||
-rw-r--r-- | sim/v850/simops.c | 2 |
2 files changed, 5 insertions, 1 deletions
diff --git a/sim/v850/ChangeLog b/sim/v850/ChangeLog index e10f1dab3a5..100ece186e5 100644 --- a/sim/v850/ChangeLog +++ b/sim/v850/ChangeLog @@ -1,3 +1,7 @@ +2002-09-26 Jim Wilson <wilson@redhat.com> + + * simops (OP_10007E0): Don't subtract 4 from PC. + 2002-09-19 Nick Clifton <nickc@redhat.com> * interp.c (sim_open): Remove reference to v850ea. diff --git a/sim/v850/simops.c b/sim/v850/simops.c index d8a4d58ae11..eba728fa287 100644 --- a/sim/v850/simops.c +++ b/sim/v850/simops.c @@ -1880,7 +1880,7 @@ OP_10007E0 () ECR |= 0x40 + OP[0]; /* Flag that we are now doing exception processing. */ PSW |= PSW_EP | PSW_ID; - PC = ((OP[0] < 0x10) ? 0x40 : 0x50) - 4; + PC = (OP[0] < 0x10) ? 0x40 : 0x50; return 0; } |