diff options
| author | Doug Evans <dje@google.com> | 1998-03-15 05:15:18 +0000 |
|---|---|---|
| committer | Doug Evans <dje@google.com> | 1998-03-15 05:15:18 +0000 |
| commit | b01a8697e29b26cb67a0355696dca97713e6fc18 (patch) | |
| tree | acf1654d57a3540fa72c1a61b12b4dd3e6b5d8c6 /sim/m32r/semx.c | |
| parent | 84c6d152d1229e1ed22622c1981192495ccb419e (diff) | |
| download | gdb-b01a8697e29b26cb67a0355696dca97713e6fc18.zip gdb-b01a8697e29b26cb67a0355696dca97713e6fc18.tar.gz gdb-b01a8697e29b26cb67a0355696dca97713e6fc18.tar.bz2 | |
* config.in (HAVE_FCNTL_H): Add.
* configure: Regenerate.
* Makefile.in (SIM_OBJS): Add devices.o.
* m32r-sim.h (m32r_devices): Renamed from m32r_mspr_device.
(UART_*): Define m32r serial port parameters.
(M32R_DEVICE_ADDR,M32R_DEVICE_LEN): Define.
* m32r.c (device_io_{read,write}_buffer,device_error): Move from here,
* devices.c: To here.
* sim-if.c: Don't include signal.h,sim-core.h.
(sim_open): Use M32R_DEVICE_{ADDR,LEN} in sim_core_attach call.
(sim_resume): Call sim_module_{resume,suspend}.
* m32r.c (m32r_h_cr_{get,set}): Use register number enums.
* tconfig.in (SIM_HANDLES_LMA): Define.
* sim-if.c (do_trap): Result is new pc.
Handle --environment=operating.
* sem-switch.c,sem.c: Regenerate.
start-sanitize-m32rx
* semx.c: Regenerate.
end-sanitize-m32rx
Diffstat (limited to 'sim/m32r/semx.c')
| -rw-r--r-- | sim/m32r/semx.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/sim/m32r/semx.c b/sim/m32r/semx.c index 8bd7927..2803419 100644 --- a/sim/m32r/semx.c +++ b/sim/m32r/semx.c @@ -2405,7 +2405,7 @@ do { TRACE_RESULT (current_cpu, "h-ie-0", 'x', CPU (h_ie)); CPU (h_cond) = OPRND (h_bcond_0); TRACE_RESULT (current_cpu, "condbit", 'x', CPU (h_cond)); - BRANCH_NEW_PC (new_pc, SEM_BRANCH_VIA_ADDR (sem_arg, OPRND (h_bpc_0))); + BRANCH_NEW_PC (new_pc, SEM_BRANCH_VIA_ADDR (sem_arg, ANDSI (OPRND (h_bpc_0), -4))); TRACE_RESULT (current_cpu, "pc", 'x', CPU (h_pc)); } while (0); @@ -3021,10 +3021,10 @@ SEM_FN_NAME (m32rx,trap) (SIM_CPU *current_cpu, SEM_ARG sem_arg, PAREXEC *par_ex do { m32rx_h_cr_set (current_cpu, 6, ADDSI (OPRND (pc), 4)); TRACE_RESULT (current_cpu, "h-cr-6", 'x', m32rx_h_cr_get (current_cpu, 6)); -m32rx_h_cr_set (current_cpu, 0, ANDSI (SRLSI (OPRND (h_cr_0), 8), 33488896)); +m32rx_h_cr_set (current_cpu, 0, ANDSI (SLLSI (OPRND (h_cr_0), 8), 65408)); TRACE_RESULT (current_cpu, "h-cr-0", 'x', m32rx_h_cr_get (current_cpu, 0)); -do_trap (current_cpu, OPRND (uimm4)); -; /*clobber*/ + BRANCH_NEW_PC (new_pc, SEM_BRANCH_VIA_ADDR (sem_arg, do_trap (current_cpu, OPRND (uimm4)))); + TRACE_RESULT (current_cpu, "pc", 'x', CPU (h_pc)); } while (0); #if WITH_PROFILE_MODEL_P |