diff options
| author | Doug Evans <dje@google.com> | 1998-07-21 23:54:10 +0000 |
|---|---|---|
| committer | Doug Evans <dje@google.com> | 1998-07-21 23:54:10 +0000 |
| commit | 7422fa0cc8de61c9c76e2284273d7173f714fa7c (patch) | |
| tree | 0ef663503515fd14edefc47ea2901d50e26a4917 /sim/m32r/extract.c | |
| parent | b817384cca766906892a3d883ea9614071ee8e71 (diff) | |
| download | gdb-7422fa0cc8de61c9c76e2284273d7173f714fa7c.zip gdb-7422fa0cc8de61c9c76e2284273d7173f714fa7c.tar.gz gdb-7422fa0cc8de61c9c76e2284273d7173f714fa7c.tar.bz2 | |
* cpu.h,extract.c: Regenerate. pc-rel calcs done on f_dispNN now.
* cpux.h,readx.c,semx.c: Ditto.
Diffstat (limited to 'sim/m32r/extract.c')
| -rw-r--r-- | sim/m32r/extract.c | 17 |
1 files changed, 9 insertions, 8 deletions
diff --git a/sim/m32r/extract.c b/sim/m32r/extract.c index 110c675..93e58ff 100644 --- a/sim/m32r/extract.c +++ b/sim/m32r/extract.c @@ -26,6 +26,7 @@ with this program; if not, write to the Free Software Foundation, Inc., #define WANT_CPU_M32R #include "sim-main.h" +#include "cgen-ops.h" #include "cpu-sim.h" void @@ -257,7 +258,7 @@ EX_FN_NAME (m32r,fmt_bc8) (SIM_CPU *current_cpu, PCADDR pc, insn_t insn, ARGBUF EXTRACT_FMT_BC8_CODE /* Record the fields for the semantic handler. */ - FLD (f_disp8) = (pc & -4L) + f_disp8; + FLD (f_disp8) = f_disp8; TRACE_EXTRACT (current_cpu, (current_cpu, pc, "fmt_bc8", "disp8 0x%x", 'x', f_disp8, (char *) 0)); abuf->length = length; @@ -274,7 +275,7 @@ EX_FN_NAME (m32r,fmt_bc24) (SIM_CPU *current_cpu, PCADDR pc, insn_t insn, ARGBUF EXTRACT_FMT_BC24_CODE /* Record the fields for the semantic handler. */ - FLD (f_disp24) = pc + f_disp24; + FLD (f_disp24) = f_disp24; TRACE_EXTRACT (current_cpu, (current_cpu, pc, "fmt_bc24", "disp24 0x%x", 'x', f_disp24, (char *) 0)); abuf->length = length; @@ -293,7 +294,7 @@ EX_FN_NAME (m32r,fmt_beq) (SIM_CPU *current_cpu, PCADDR pc, insn_t insn, ARGBUF /* Record the fields for the semantic handler. */ FLD (f_r1) = & CPU (h_gr)[f_r1]; FLD (f_r2) = & CPU (h_gr)[f_r2]; - FLD (f_disp16) = pc + f_disp16; + FLD (f_disp16) = f_disp16; TRACE_EXTRACT (current_cpu, (current_cpu, pc, "fmt_beq", "src1 0x%x", 'x', f_r1, "src2 0x%x", 'x', f_r2, "disp16 0x%x", 'x', f_disp16, (char *) 0)); abuf->length = length; @@ -319,7 +320,7 @@ EX_FN_NAME (m32r,fmt_beqz) (SIM_CPU *current_cpu, PCADDR pc, insn_t insn, ARGBUF /* Record the fields for the semantic handler. */ FLD (f_r2) = & CPU (h_gr)[f_r2]; - FLD (f_disp16) = pc + f_disp16; + FLD (f_disp16) = f_disp16; TRACE_EXTRACT (current_cpu, (current_cpu, pc, "fmt_beqz", "src2 0x%x", 'x', f_r2, "disp16 0x%x", 'x', f_disp16, (char *) 0)); abuf->length = length; @@ -344,7 +345,7 @@ EX_FN_NAME (m32r,fmt_bl8) (SIM_CPU *current_cpu, PCADDR pc, insn_t insn, ARGBUF EXTRACT_FMT_BL8_CODE /* Record the fields for the semantic handler. */ - FLD (f_disp8) = (pc & -4L) + f_disp8; + FLD (f_disp8) = f_disp8; TRACE_EXTRACT (current_cpu, (current_cpu, pc, "fmt_bl8", "disp8 0x%x", 'x', f_disp8, (char *) 0)); abuf->length = length; @@ -369,7 +370,7 @@ EX_FN_NAME (m32r,fmt_bl24) (SIM_CPU *current_cpu, PCADDR pc, insn_t insn, ARGBUF EXTRACT_FMT_BL24_CODE /* Record the fields for the semantic handler. */ - FLD (f_disp24) = pc + f_disp24; + FLD (f_disp24) = f_disp24; TRACE_EXTRACT (current_cpu, (current_cpu, pc, "fmt_bl24", "disp24 0x%x", 'x', f_disp24, (char *) 0)); abuf->length = length; @@ -394,7 +395,7 @@ EX_FN_NAME (m32r,fmt_bra8) (SIM_CPU *current_cpu, PCADDR pc, insn_t insn, ARGBUF EXTRACT_FMT_BRA8_CODE /* Record the fields for the semantic handler. */ - FLD (f_disp8) = (pc & -4L) + f_disp8; + FLD (f_disp8) = f_disp8; TRACE_EXTRACT (current_cpu, (current_cpu, pc, "fmt_bra8", "disp8 0x%x", 'x', f_disp8, (char *) 0)); abuf->length = length; @@ -411,7 +412,7 @@ EX_FN_NAME (m32r,fmt_bra24) (SIM_CPU *current_cpu, PCADDR pc, insn_t insn, ARGBU EXTRACT_FMT_BRA24_CODE /* Record the fields for the semantic handler. */ - FLD (f_disp24) = pc + f_disp24; + FLD (f_disp24) = f_disp24; TRACE_EXTRACT (current_cpu, (current_cpu, pc, "fmt_bra24", "disp24 0x%x", 'x', f_disp24, (char *) 0)); abuf->length = length; |