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/rs6000-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/rs6000-tdep.c')
| -rw-r--r-- | gdb/rs6000-tdep.c | 19 |
1 files changed, 6 insertions, 13 deletions
diff --git a/gdb/rs6000-tdep.c b/gdb/rs6000-tdep.c index ca4d668..7cb7a9e 100644 --- a/gdb/rs6000-tdep.c +++ b/gdb/rs6000-tdep.c @@ -967,18 +967,11 @@ rs6000_fetch_pointer_argument (struct frame_info *frame, int argi, /* Sequence of bytes for breakpoint instruction. */ -static const unsigned char * -rs6000_breakpoint_from_pc (struct gdbarch *gdbarch, CORE_ADDR *bp_addr, - int *bp_size) -{ - static unsigned char big_breakpoint[] = { 0x7d, 0x82, 0x10, 0x08 }; - static unsigned char little_breakpoint[] = { 0x08, 0x10, 0x82, 0x7d }; - *bp_size = 4; - if (gdbarch_byte_order (gdbarch) == BFD_ENDIAN_BIG) - return big_breakpoint; - else - return little_breakpoint; -} +static unsigned char big_breakpoint[] = { 0x7d, 0x82, 0x10, 0x08 }; +static unsigned char little_breakpoint[] = { 0x08, 0x10, 0x82, 0x7d }; + +GDBARCH_BREAKPOINT_MANIPULATION_ENDIAN (rs6000, little_breakpoint, + big_breakpoint) /* Instruction masks for displaced stepping. */ #define BRANCH_MASK 0xfc000000 @@ -6486,7 +6479,7 @@ rs6000_gdbarch_init (struct gdbarch_info info, struct gdbarch_list *arches) set_gdbarch_skip_main_prologue (gdbarch, rs6000_skip_main_prologue); set_gdbarch_inner_than (gdbarch, core_addr_lessthan); - set_gdbarch_breakpoint_from_pc (gdbarch, rs6000_breakpoint_from_pc); + SET_GDBARCH_BREAKPOINT_MANIPULATION (rs6000); /* The value of symbols of type N_SO and N_FUN maybe null when it shouldn't be. */ |