diff options
| author | DJ Delorie <dj@redhat.com> | 2015-04-30 15:25:49 -0400 |
|---|---|---|
| committer | DJ Delorie <dj@redhat.com> | 2015-04-30 15:25:49 -0400 |
| commit | 0952813b0b27abe7f53a8048c0218883412e54cd (patch) | |
| tree | 5407096ab234c7abec96a530789cd5bdb7069077 /sim/rl78/rl78.c | |
| parent | b49f93f6995a5d23c752db103902314d4e23f761 (diff) | |
| download | gdb-0952813b0b27abe7f53a8048c0218883412e54cd.zip gdb-0952813b0b27abe7f53a8048c0218883412e54cd.tar.gz gdb-0952813b0b27abe7f53a8048c0218883412e54cd.tar.bz2 | |
Make RL78 disassembler and simulator respect ISA for mul/div
[gas]
* config/rl78-defs.h (rl78_isa_g10): New.
(rl78_isa_g13): New.
(rl78_isa_g14): New.
* config/rl78-parse.y (ISA_G10): New.
(ISA_G13): New.
(ISA_G14): New.
(MULHU, MULH, MULU, DIVHU, DIVWU, MACHU, MACH): Use them.
* config/tc-rl78.c (rl78_isa_g10): New.
(rl78_isa_g13): New.
(rl78_isa_g14): New.
[gdb]
* rl78-tdep.c (rl78_analyze_prologue): Pass RL78_ISA_DEFAULT to
rl78_decode_opcode
[include]
* dis-asm.h (print_insn_rl78_g10): New.
(print_insn_rl78_g13): New.
(print_insn_rl78_g14): New.
(rl78_get_disassembler): New.
* opcode/rl78.h (RL78_Dis_Isa): New.
(rl78_decode_opcode): Add ISA parameter.
[opcodes]
* disassemble.c (disassembler): Choose suitable disassembler based
on E_ABI.
* rl78-decode.opc (rl78_decode_opcode): Take ISA parameter. Use
it to decode mul/div insns.
* rl78-decode.c: Regenerate.
* rl78-dis.c (print_insn_rl78): Rename to...
(print_insn_rl78_common): ...this, take ISA parameter.
(print_insn_rl78): New.
(print_insn_rl78_g10): New.
(print_insn_rl78_g13): New.
(print_insn_rl78_g14): New.
(rl78_get_disassembler): New.
[sim]
* rl78/cpu.c (g14_multiply): New.
* rl78/cpu.h (g14_multiply): New.
* rl78/load.c (rl78_load): Decode ISA completely.
* rl78/main.c (main): Expand -M to include other ISAs.
* rl78/rl78.c (decode_opcode): Decode based on ISA.
* rl78/trace.c (rl78_disasm_fn): New.
(sim_disasm_init): Reset it.
(sim_disasm_one): Get correct disassembler for ISA.
Diffstat (limited to 'sim/rl78/rl78.c')
| -rw-r--r-- | sim/rl78/rl78.c | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/sim/rl78/rl78.c b/sim/rl78/rl78.c index aca6762..c8d1442 100644 --- a/sim/rl78/rl78.c +++ b/sim/rl78/rl78.c @@ -421,10 +421,16 @@ decode_opcode (void) int a, b, v, v2; unsigned int u, u2; int obits; + RL78_Dis_Isa isa; + + isa = (rl78_g10_mode ? RL78_ISA_G10 + : g14_multiply ? RL78_ISA_G14 + : g13_multiply ? RL78_ISA_G13 + : RL78_ISA_DEFAULT); rl78_data.dpc = pc; opcode_size = rl78_decode_opcode (pc, &opcode, - rl78_get_byte, &rl78_data); + rl78_get_byte, &rl78_data, isa); opcode_pc = pc; pc += opcode_size; @@ -851,7 +857,7 @@ decode_opcode (void) rl78_data.dpc = pc; opcode_size = rl78_decode_opcode (pc, &opcode, - rl78_get_byte, &rl78_data); + rl78_get_byte, &rl78_data, isa); pc += opcode_size; tprintf (" skipped: %s\n", opcode.syntax); break; |