From: Ulrich Weigand Date: Tue, 12 Jun 2007 16:43:39 +0000 (+0000) Subject: 2007-06-12 Markus Deuling X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=c7bb205ca90c54c3a99aa42dc9aa21872347690b;p=binutils-gdb.git 2007-06-12 Markus Deuling * gdbarch.sh (TARGET_VIRTUAL_FRAME_POINTER): Replace by gdbarch_virtual_frame_pointer. * tracepoint.c (encode_actions): Likewise. * dwarf2loc.c (dwarf2_loc_desc_needs_frame): Likewise. * ax-gdb.c (gen_frame_args_address, gen_frame_locals_address): Likewise. * gdbarch.c, gdbarch.h: Regenerate. --- diff --git a/gdb/ChangeLog b/gdb/ChangeLog index 992b0ebc51e..781034e1e72 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,3 +1,12 @@ +2007-06-12 Markus Deuling + + * gdbarch.sh (TARGET_VIRTUAL_FRAME_POINTER): Replace by + gdbarch_virtual_frame_pointer. + * tracepoint.c (encode_actions): Likewise. + * dwarf2loc.c (dwarf2_loc_desc_needs_frame): Likewise. + * ax-gdb.c (gen_frame_args_address, gen_frame_locals_address): Likewise. + * gdbarch.c, gdbarch.h: Regenerate. + 2007-06-12 Markus Deuling * gdbarch.sh (TARGET_FLOAT_BIT): Replace by gdbarch_float_bit. diff --git a/gdb/ax-gdb.c b/gdb/ax-gdb.c index 779aec3d347..b00806fd0b7 100644 --- a/gdb/ax-gdb.c +++ b/gdb/ax-gdb.c @@ -461,7 +461,8 @@ gen_frame_args_address (struct agent_expr *ax) int frame_reg; LONGEST frame_offset; - TARGET_VIRTUAL_FRAME_POINTER (ax->scope, &frame_reg, &frame_offset); + gdbarch_virtual_frame_pointer (current_gdbarch, + ax->scope, &frame_reg, &frame_offset); ax_reg (ax, frame_reg); gen_offset (ax, frame_offset); } @@ -475,7 +476,8 @@ gen_frame_locals_address (struct agent_expr *ax) int frame_reg; LONGEST frame_offset; - TARGET_VIRTUAL_FRAME_POINTER (ax->scope, &frame_reg, &frame_offset); + gdbarch_virtual_frame_pointer (current_gdbarch, + ax->scope, &frame_reg, &frame_offset); ax_reg (ax, frame_reg); gen_offset (ax, frame_offset); } diff --git a/gdb/dwarf2loc.c b/gdb/dwarf2loc.c index d79c1f5d0fd..79e120bd969 100644 --- a/gdb/dwarf2loc.c +++ b/gdb/dwarf2loc.c @@ -387,7 +387,8 @@ dwarf2_tracepoint_var_ref (struct symbol *symbol, struct agent_expr *ax, error (_("Unexpected opcode after DW_OP_fbreg for symbol \"%s\"."), SYMBOL_PRINT_NAME (symbol)); - TARGET_VIRTUAL_FRAME_POINTER (ax->scope, &frame_reg, &frame_offset); + gdbarch_virtual_frame_pointer (current_gdbarch, + ax->scope, &frame_reg, &frame_offset); ax_reg (ax, frame_reg); ax_const_l (ax, frame_offset); ax_simple (ax, aop_add); diff --git a/gdb/gdbarch.c b/gdb/gdbarch.c index b03c944cf9d..b75f280e67d 100644 --- a/gdb/gdbarch.c +++ b/gdb/gdbarch.c @@ -1265,12 +1265,6 @@ gdbarch_dump (struct gdbarch *current_gdbarch, struct ui_file *file) fprintf_unfiltered (file, "gdbarch_dump: vbit_in_delta = %s\n", paddr_d (current_gdbarch->vbit_in_delta)); -#ifdef TARGET_VIRTUAL_FRAME_POINTER - fprintf_unfiltered (file, - "gdbarch_dump: %s # %s\n", - "TARGET_VIRTUAL_FRAME_POINTER(pc, frame_regnum, frame_offset)", - XSTRING (TARGET_VIRTUAL_FRAME_POINTER (pc, frame_regnum, frame_offset))); -#endif fprintf_unfiltered (file, "gdbarch_dump: virtual_frame_pointer = <0x%lx>\n", (long) current_gdbarch->virtual_frame_pointer); diff --git a/gdb/gdbarch.h b/gdb/gdbarch.h index 134b8155b4d..f8bb5099cb6 100644 --- a/gdb/gdbarch.h +++ b/gdb/gdbarch.h @@ -217,12 +217,6 @@ extern void set_gdbarch_write_pc (struct gdbarch *gdbarch, gdbarch_write_pc_ftyp typedef void (gdbarch_virtual_frame_pointer_ftype) (CORE_ADDR pc, int *frame_regnum, LONGEST *frame_offset); extern void gdbarch_virtual_frame_pointer (struct gdbarch *gdbarch, CORE_ADDR pc, int *frame_regnum, LONGEST *frame_offset); extern void set_gdbarch_virtual_frame_pointer (struct gdbarch *gdbarch, gdbarch_virtual_frame_pointer_ftype *virtual_frame_pointer); -#if !defined (GDB_TM_FILE) && defined (TARGET_VIRTUAL_FRAME_POINTER) -#error "Non multi-arch definition of TARGET_VIRTUAL_FRAME_POINTER" -#endif -#if !defined (TARGET_VIRTUAL_FRAME_POINTER) -#define TARGET_VIRTUAL_FRAME_POINTER(pc, frame_regnum, frame_offset) (gdbarch_virtual_frame_pointer (current_gdbarch, pc, frame_regnum, frame_offset)) -#endif extern int gdbarch_pseudo_register_read_p (struct gdbarch *gdbarch); diff --git a/gdb/gdbarch.sh b/gdb/gdbarch.sh index 3ee6c1270fe..1efaaa7366e 100755 --- a/gdb/gdbarch.sh +++ b/gdb/gdbarch.sh @@ -425,7 +425,7 @@ f:TARGET_WRITE_PC:void:write_pc:CORE_ADDR val, ptid_t ptid:val, ptid:0:generic_t # Function for getting target's idea of a frame pointer. FIXME: GDB's # whole scheme for dealing with "frames" and "frame pointers" needs a # serious shakedown. -f:TARGET_VIRTUAL_FRAME_POINTER:void:virtual_frame_pointer:CORE_ADDR pc, int *frame_regnum, LONGEST *frame_offset:pc, frame_regnum, frame_offset:0:legacy_virtual_frame_pointer::0 +f::void:virtual_frame_pointer:CORE_ADDR pc, int *frame_regnum, LONGEST *frame_offset:pc, frame_regnum, frame_offset:0:legacy_virtual_frame_pointer::0 # M::void:pseudo_register_read:struct regcache *regcache, int cookednum, gdb_byte *buf:regcache, cookednum, buf M::void:pseudo_register_write:struct regcache *regcache, int cookednum, const gdb_byte *buf:regcache, cookednum, buf diff --git a/gdb/tracepoint.c b/gdb/tracepoint.c index a2a073d0d5f..ff5c6b7b456 100644 --- a/gdb/tracepoint.c +++ b/gdb/tracepoint.c @@ -1539,7 +1539,8 @@ encode_actions (struct tracepoint *t, char ***tdp_actions, *tdp_actions = NULL; *stepping_actions = NULL; - TARGET_VIRTUAL_FRAME_POINTER (t->address, &frame_reg, &frame_offset); + gdbarch_virtual_frame_pointer (current_gdbarch, + t->address, &frame_reg, &frame_offset); for (action = t->actions; action; action = action->next) {