diff options
| author | Yao Qi <yao.qi@linaro.org> | 2016-11-03 14:35:13 +0000 |
|---|---|---|
| committer | Yao Qi <yao.qi@linaro.org> | 2016-11-03 14:35:13 +0000 |
| commit | d19280adb5b2d1470dc39756ccac8a8fa2af8321 (patch) | |
| tree | c452ae7ecd2c45f4dfbfe404eb4bd5a7c99aaf28 /gdb/mt-tdep.c | |
| parent | 44f1c4d7b0160a51ecf7fe1af42416f1d2a71356 (diff) | |
| download | gdb-d19280adb5b2d1470dc39756ccac8a8fa2af8321.zip gdb-d19280adb5b2d1470dc39756ccac8a8fa2af8321.tar.gz gdb-d19280adb5b2d1470dc39756ccac8a8fa2af8321.tar.bz2 | |
Split breakpoint_from_pc to breakpoint_kind_from_pc and sw_breakpoint_from_kind
We convert each ARCH_breakpoint_from_pc to ARCH_breakpoint_kind_from_pc
and ARCH_sw_breakpoint_from_kind. Note that gdbarch doesn't have methods
breakpoint_kind_from_pc and sw_breakpoint_from_kind so far.
gdb:
2016-11-03 Yao Qi <yao.qi@linaro.org>
* arch-utils.h (GDBARCH_BREAKPOINT_FROM_PC): New macro.
(GDBARCH_BREAKPOINT_MANIPULATION_ENDIAN): New macro.
* arm-tdep.c (arm_breakpoint_from_pc): Remove.
(arm_breakpoint_kind_from_pc): New function.
(arm_sw_breakpoint_from_kind): New function.
(arm_breakpoint_from_pc): Call arm_breakpoint_kind_from_pc
and arm_sw_breakpoint_from_kind.
Use GDBARCH_BREAKPOINT_FROM_PC.
(arm_remote_breakpoint_from_pc): Call
arm_breakpoint_kind_from_pc.
(arm_gdbarch_init): Replace set_gdbarch_breakpoint_from_pc
with SET_GDBARCH_BREAKPOINT_MANIPULATION.
* arc-tdep.c: Likewise.
* bfin-tdep.c: Likewise.
* cris-tdep.c: Likewise.
* iq2000-tdep.c: Likewise.
* m32r-tdep.c: Likewise.
* mips-tdep.c: Likewise.
* mt-tdep.c: Likewise.
* nios2-tdep.c: Likewise.
* rs6000-tdep.c: Likewise.
* score-tdep.c: Likewise.
* sh-tdep.c: Likewise.
* sh64-tdep.c: Likewise.
* tic6x-tdep.c: Likewise.
* v850-tdep.c: Likewise.
* xtensa-tdep.c: Likewise.
Diffstat (limited to 'gdb/mt-tdep.c')
| -rw-r--r-- | gdb/mt-tdep.c | 27 |
1 files changed, 17 insertions, 10 deletions
diff --git a/gdb/mt-tdep.c b/gdb/mt-tdep.c index 5d7f31c..0adf413 100644 --- a/gdb/mt-tdep.c +++ b/gdb/mt-tdep.c @@ -449,26 +449,33 @@ mt_skip_prologue (struct gdbarch *gdbarch, CORE_ADDR pc) return pc; } -/* The breakpoint instruction must be the same size as the smallest - instruction in the instruction set. - - The BP for ms1 is defined as 0x68000000 (BREAK). - The BP for ms2 is defined as 0x69000000 (illegal). */ +static int +mt_breakpoint_kind_from_pc (struct gdbarch *gdbarch, CORE_ADDR *pcptr) +{ + return 4; +} static const gdb_byte * -mt_breakpoint_from_pc (struct gdbarch *gdbarch, CORE_ADDR *bp_addr, - int *bp_size) +mt_sw_breakpoint_from_kind (struct gdbarch *gdbarch, int kind, int *size) { + /* The breakpoint instruction must be the same size as the smallest + instruction in the instruction set. + + The BP for ms1 is defined as 0x68000000 (BREAK). + The BP for ms2 is defined as 0x69000000 (illegal). */ static gdb_byte ms1_breakpoint[] = { 0x68, 0, 0, 0 }; static gdb_byte ms2_breakpoint[] = { 0x69, 0, 0, 0 }; - *bp_size = 4; + *size = kind; + if (gdbarch_bfd_arch_info (gdbarch)->mach == bfd_mach_ms2) return ms2_breakpoint; - + return ms1_breakpoint; } +GDBARCH_BREAKPOINT_FROM_PC (mt) + /* Select the correct coprocessor register bank. Return the pseudo regnum we really want to read. */ @@ -1162,7 +1169,7 @@ mt_gdbarch_init (struct gdbarch_info info, struct gdbarch_list *arches) set_gdbarch_pseudo_register_write (gdbarch, mt_pseudo_register_write); set_gdbarch_skip_prologue (gdbarch, mt_skip_prologue); set_gdbarch_inner_than (gdbarch, core_addr_lessthan); - set_gdbarch_breakpoint_from_pc (gdbarch, mt_breakpoint_from_pc); + SET_GDBARCH_BREAKPOINT_MANIPULATION (mt); set_gdbarch_decr_pc_after_break (gdbarch, 0); set_gdbarch_frame_args_skip (gdbarch, 0); set_gdbarch_print_insn (gdbarch, print_insn_mt); |