This is the mail archive of the
gdb-patches@sources.redhat.com
mailing list for the GDB project.
[PATCH] Update D10V generic_dummy calls
- From: Michael Snyder <msnyder at cygnus dot com>
- To: gdb-patches at sources dot redhat dot com
- Cc: ezannoni at redhat dot com
- Date: Thu, 23 May 2002 08:38:36 -0700
- Subject: [PATCH] Update D10V generic_dummy calls
2002-05-22 Michael Snyder <msnyder@redhat.com>
* d10v-tdep.c: Change a few macros to enums for ease of debugging.
(d10v_frame_chain_valid): Add PC_IN_CALL_DUMMY clause.
(d10v_frame_saved_pc): Add PC_IN_CALL_DUMMY clause.
(d10v_frame_chain): Bail immediately if PC_IN_CALL_DUMMY.
Don't bail if return_pc is PC_IN_CALL_DUMMY.
Add a temp variable to save a call (and a memory read).
(d10v_init_extra_frame_info): Get fi->pc from callee's return_pc
if possible (so that PC_IN_CALL_DUMMY will work).
Index: d10v-tdep.c
===================================================================
RCS file: /cvs/src/src/gdb/d10v-tdep.c,v
retrieving revision 1.39
diff -p -r1.39 d10v-tdep.c
*** d10v-tdep.c 13 May 2002 14:00:35 -0000 1.39
--- d10v-tdep.c 23 May 2002 15:51:09 -0000
*************** struct gdbarch_tdep
*** 60,88 ****
/* These are the addresses the D10V-EVA board maps data and
instruction memory to. */
! #define DMEM_START 0x2000000
! #define IMEM_START 0x1000000
! #define STACK_START 0x200bffe
/* d10v register names. */
enum
{
R0_REGNUM = 0,
LR_REGNUM = 13,
PSW_REGNUM = 16,
NR_IMAP_REGS = 2,
! NR_A_REGS = 2
};
#define NR_DMAP_REGS (gdbarch_tdep (current_gdbarch)->nr_dmap_regs)
#define A0_REGNUM (gdbarch_tdep (current_gdbarch)->a0_regnum)
- /* d10v calling convention. */
-
- #define ARG1_REGNUM R0_REGNUM
- #define ARGN_REGNUM 3
- #define RET1_REGNUM R0_REGNUM
-
/* Local functions */
extern void _initialize_d10v_tdep (void);
--- 60,95 ----
/* These are the addresses the D10V-EVA board maps data and
instruction memory to. */
! enum memspace {
! DMEM_START = 0x2000000,
! IMEM_START = 0x1000000,
! STACK_START = 0x200bffe
! };
/* d10v register names. */
enum
{
R0_REGNUM = 0,
+ R3_REGNUM = 3,
+ _FP_REGNUM = 11,
LR_REGNUM = 13,
+ _SP_REGNUM = 15,
PSW_REGNUM = 16,
+ _PC_REGNUM = 18,
NR_IMAP_REGS = 2,
! NR_A_REGS = 2,
! TS2_NUM_REGS = 37,
! TS3_NUM_REGS = 42,
! /* d10v calling convention. */
! ARG1_REGNUM = R0_REGNUM,
! ARGN_REGNUM = R3_REGNUM,
! RET1_REGNUM = R0_REGNUM,
};
+
#define NR_DMAP_REGS (gdbarch_tdep (current_gdbarch)->nr_dmap_regs)
#define A0_REGNUM (gdbarch_tdep (current_gdbarch)->a0_regnum)
/* Local functions */
extern void _initialize_d10v_tdep (void);
*************** static void do_d10v_pop_frame (struct fr
*** 101,109 ****
static int
d10v_frame_chain_valid (CORE_ADDR chain, struct frame_info *frame)
{
! return ((chain) != 0 && (frame) != 0
! && (frame)->pc > IMEM_START
! && !inside_entry_file (FRAME_SAVED_PC (frame)));
}
static CORE_ADDR
--- 108,121 ----
static int
d10v_frame_chain_valid (CORE_ADDR chain, struct frame_info *frame)
{
! if (chain != 0 && frame != NULL)
! {
! if (PC_IN_CALL_DUMMY (frame->pc, frame->frame, frame->frame))
! return 1; /* Path back from a call dummy must be valid. */
! return ((frame)->pc > IMEM_START
! && !inside_main_func (frame->pc));
! }
! else return 0;
}
static CORE_ADDR
*************** d10v_extract_struct_value_address (char
*** 483,489 ****
static CORE_ADDR
d10v_frame_saved_pc (struct frame_info *frame)
{
! return ((frame)->extra_info->return_pc);
}
/* Immediately after a function call, return the saved pc. We can't
--- 495,506 ----
static CORE_ADDR
d10v_frame_saved_pc (struct frame_info *frame)
{
! if (PC_IN_CALL_DUMMY (frame->pc, frame->frame, frame->frame))
! return d10v_make_iaddr (generic_read_register_dummy (frame->pc,
! frame->frame,
! PC_REGNUM));
! else
! return ((frame)->extra_info->return_pc);
}
/* Immediately after a function call, return the saved pc. We can't
*************** d10v_skip_prologue (CORE_ADDR pc)
*** 650,660 ****
static CORE_ADDR
d10v_frame_chain (struct frame_info *fi)
{
d10v_frame_init_saved_regs (fi);
if (fi->extra_info->return_pc == IMEM_START
|| inside_entry_file (fi->extra_info->return_pc))
! return (CORE_ADDR) 0;
if (!fi->saved_regs[FP_REGNUM])
{
--- 667,689 ----
static CORE_ADDR
d10v_frame_chain (struct frame_info *fi)
{
+ CORE_ADDR addr;
+
+ /* A generic call dummy's frame is the same as caller's. */
+ if (PC_IN_CALL_DUMMY (fi->pc, fi->frame, fi->frame))
+ return fi->frame;
+
d10v_frame_init_saved_regs (fi);
+
if (fi->extra_info->return_pc == IMEM_START
|| inside_entry_file (fi->extra_info->return_pc))
! {
! /* This is meant to halt the backtrace at "_start".
! Make sure we don't halt it at a generic dummy frame. */
! if (!PC_IN_CALL_DUMMY (fi->extra_info->return_pc, 0, 0))
! return (CORE_ADDR) 0;
! }
if (!fi->saved_regs[FP_REGNUM])
{
*************** d10v_frame_chain (struct frame_info *fi)
*** 665,676 ****
return fi->saved_regs[SP_REGNUM];
}
! if (!read_memory_unsigned_integer (fi->saved_regs[FP_REGNUM],
! REGISTER_RAW_SIZE (FP_REGNUM)))
return (CORE_ADDR) 0;
! return d10v_make_daddr (read_memory_unsigned_integer (fi->saved_regs[FP_REGNUM],
! REGISTER_RAW_SIZE (FP_REGNUM)));
}
static int next_addr, uses_frame;
--- 694,705 ----
return fi->saved_regs[SP_REGNUM];
}
! addr = read_memory_unsigned_integer (fi->saved_regs[FP_REGNUM],
! REGISTER_RAW_SIZE (FP_REGNUM));
! if (addr == 0)
return (CORE_ADDR) 0;
! return d10v_make_daddr (addr);
}
static int next_addr, uses_frame;
*************** d10v_frame_init_saved_regs (struct frame
*** 804,810 ****
op1 = (op & 0x3FFF8000) >> 15;
op2 = op & 0x7FFF;
}
! if (!prologue_find_regs (op1, fi, pc) || !prologue_find_regs (op2, fi, pc))
break;
}
pc += 4;
--- 833,840 ----
op1 = (op & 0x3FFF8000) >> 15;
op2 = op & 0x7FFF;
}
! if (!prologue_find_regs (op1, fi, pc)
! || !prologue_find_regs (op2, fi, pc))
break;
}
pc += 4;
*************** d10v_frame_init_saved_regs (struct frame
*** 823,829 ****
if (fi->saved_regs[LR_REGNUM])
{
! CORE_ADDR return_pc = read_memory_unsigned_integer (fi->saved_regs[LR_REGNUM], REGISTER_RAW_SIZE (LR_REGNUM));
fi->extra_info->return_pc = d10v_make_iaddr (return_pc);
}
else
--- 853,861 ----
if (fi->saved_regs[LR_REGNUM])
{
! CORE_ADDR return_pc
! = read_memory_unsigned_integer (fi->saved_regs[LR_REGNUM],
! REGISTER_RAW_SIZE (LR_REGNUM));
fi->extra_info->return_pc = d10v_make_iaddr (return_pc);
}
else
*************** d10v_frame_init_saved_regs (struct frame
*** 831,843 ****
fi->extra_info->return_pc = d10v_make_iaddr (read_register (LR_REGNUM));
}
! /* th SP is not normally (ever?) saved, but check anyway */
if (!fi->saved_regs[SP_REGNUM])
{
/* if the FP was saved, that means the current FP is valid, */
/* otherwise, it isn't being used, so we use the SP instead */
if (uses_frame)
! fi->saved_regs[SP_REGNUM] = read_register (FP_REGNUM) + fi->extra_info->size;
else
{
fi->saved_regs[SP_REGNUM] = fp + fi->extra_info->size;
--- 863,876 ----
fi->extra_info->return_pc = d10v_make_iaddr (read_register (LR_REGNUM));
}
! /* The SP is not normally (ever?) saved, but check anyway */
if (!fi->saved_regs[SP_REGNUM])
{
/* if the FP was saved, that means the current FP is valid, */
/* otherwise, it isn't being used, so we use the SP instead */
if (uses_frame)
! fi->saved_regs[SP_REGNUM]
! = read_register (FP_REGNUM) + fi->extra_info->size;
else
{
fi->saved_regs[SP_REGNUM] = fp + fi->extra_info->size;
*************** d10v_init_extra_frame_info (int fromleaf
*** 858,863 ****
--- 891,902 ----
fi->extra_info->size = 0;
fi->extra_info->return_pc = 0;
+ /* If fi->pc is zero, but this is not the outermost frame,
+ then let's snatch the return_pc from the callee, so that
+ PC_IN_CALL_DUMMY will work. */
+ if (fi->pc == 0 && fi->level != 0 && fi->next != NULL)
+ fi->pc = d10v_frame_saved_pc (fi->next);
+
/* The call dummy doesn't save any registers on the stack, so we can
return now. */
if (PC_IN_CALL_DUMMY (fi->pc, fi->frame, fi->frame))
*************** d10v_push_arguments (int nargs, struct v
*** 1037,1043 ****
struct type *type = check_typedef (VALUE_TYPE (arg));
char *contents = VALUE_CONTENTS (arg);
int len = TYPE_LENGTH (type);
! /* printf ("push: type=%d len=%d\n", TYPE_CODE (type), len); */
{
int aligned_regnum = (regnum + 1) & ~1;
if (len <= 2 && regnum <= ARGN_REGNUM)
--- 1076,1082 ----
struct type *type = check_typedef (VALUE_TYPE (arg));
char *contents = VALUE_CONTENTS (arg);
int len = TYPE_LENGTH (type);
! /* printf ("push: type=%d len=%d\n", type->code, len); */
{
int aligned_regnum = (regnum + 1) & ~1;
if (len <= 2 && regnum <= ARGN_REGNUM)
*************** d10v_extract_return_value (struct type *
*** 1091,1097 ****
char *valbuf)
{
int len;
! /* printf("RET: TYPE=%d len=%d r%d=0x%x\n", TYPE_CODE (type), TYPE_LENGTH (type), RET1_REGNUM - R0_REGNUM, (int) extract_unsigned_integer (regbuf + REGISTER_BYTE(RET1_REGNUM), REGISTER_RAW_SIZE (RET1_REGNUM))); */
{
len = TYPE_LENGTH (type);
if (len == 1)
--- 1130,1136 ----
char *valbuf)
{
int len;
! /* printf("RET: TYPE=%d len=%d r%d=0x%x\n",type->code, TYPE_LENGTH (type), RET1_REGNUM - R0_REGNUM, (int) extract_unsigned_integer (regbuf + REGISTER_BYTE(RET1_REGNUM), REGISTER_RAW_SIZE (RET1_REGNUM))); */
{
len = TYPE_LENGTH (type);
if (len == 1)
*************** d10v_gdbarch_init (struct gdbarch_info i
*** 1486,1492 ****
set_gdbarch_register_byte (gdbarch, d10v_register_byte);
set_gdbarch_register_raw_size (gdbarch, d10v_register_raw_size);
set_gdbarch_max_register_raw_size (gdbarch, 8);
! set_gdbarch_register_virtual_size (gdbarch, generic_register_size);
set_gdbarch_max_register_virtual_size (gdbarch, 8);
set_gdbarch_register_virtual_type (gdbarch, d10v_register_virtual_type);
--- 1525,1531 ----
set_gdbarch_register_byte (gdbarch, d10v_register_byte);
set_gdbarch_register_raw_size (gdbarch, d10v_register_raw_size);
set_gdbarch_max_register_raw_size (gdbarch, 8);
! set_gdbarch_register_virtual_size (gdbarch, generic_register_virtual_size);
set_gdbarch_max_register_virtual_size (gdbarch, 8);
set_gdbarch_register_virtual_type (gdbarch, d10v_register_virtual_type);