OpenE2K
/
binutils-gdb
12
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

* d10v-tdep.c (d10v_frame_chain, d10v_frame_init_saved_regs, 

show_regs, d10v_read_pc, d10v_write_pc, d10v_read_sp,
d10v_write_sp, d10v_write_fp, d10v_read_fp,
d10v_push_return_address): Call the functions d10v_make_daddr,
d10v_make_iaddr, d10v_convert_iaddr_to_raw, and
d10v_convert_daddr_to_raw, not the global macros D10V_MAKE_DADDR,
D10V_MAKE_IADDR, D10V_CONVERT_IADDR_TO_RAW, and
D10V_CONVERT_DADDR_TO_RAW.
This commit is contained in:
Jim Blandy 2001-07-05 21:27:08 +00:00
parent a78f18dc3a
commit 7b57012552
2 changed files with 26 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
gdb/ChangeLog
View File

@ -1,5 +1,14 @@
2001-07-05 Jim Blandy <jimb@redhat.com> 2001-07-05 Jim Blandy <jimb@redhat.com>
* d10v-tdep.c (d10v_frame_chain, d10v_frame_init_saved_regs,
show_regs, d10v_read_pc, d10v_write_pc, d10v_read_sp,
d10v_write_sp, d10v_write_fp, d10v_read_fp,
d10v_push_return_address): Call the functions d10v_make_daddr,
d10v_make_iaddr, d10v_convert_iaddr_to_raw, and
d10v_convert_daddr_to_raw, not the global macros D10V_MAKE_DADDR,
D10V_MAKE_IADDR, D10V_CONVERT_IADDR_TO_RAW, and
D10V_CONVERT_DADDR_TO_RAW.
* dwarf2read (dwarf2_build_psymtabs_hard): Doc fix. * dwarf2read (dwarf2_build_psymtabs_hard): Doc fix.
2001-07-05 Mark Kettenis <kettenis@gnu.org> 2001-07-05 Mark Kettenis <kettenis@gnu.org>

34
gdb/d10v-tdep.c
View File

@ -636,7 +636,7 @@ d10v_frame_chain (struct frame_info *fi)
REGISTER_RAW_SIZE (FP_REGNUM))) REGISTER_RAW_SIZE (FP_REGNUM)))
return (CORE_ADDR) 0; return (CORE_ADDR) 0;
return D10V_MAKE_DADDR (read_memory_unsigned_integer (fi->saved_regs[FP_REGNUM], return d10v_make_daddr (read_memory_unsigned_integer (fi->saved_regs[FP_REGNUM],
REGISTER_RAW_SIZE (FP_REGNUM))); REGISTER_RAW_SIZE (FP_REGNUM)));
} }
@ -780,7 +780,7 @@ d10v_frame_init_saved_regs (struct frame_info *fi)
fi->extra_info->size = -next_addr; fi->extra_info->size = -next_addr;
if (!(fp & 0xffff)) if (!(fp & 0xffff))
fp = D10V_MAKE_DADDR (read_register (SP_REGNUM)); fp = d10v_make_daddr (read_register (SP_REGNUM));
for (i = 0; i < NUM_REGS - 1; i++) for (i = 0; i < NUM_REGS - 1; i++)
if (fi->saved_regs[i]) if (fi->saved_regs[i])
@ -791,11 +791,11 @@ d10v_frame_init_saved_regs (struct frame_info *fi)
if (fi->saved_regs[LR_REGNUM]) if (fi->saved_regs[LR_REGNUM])
{ {
CORE_ADDR return_pc = read_memory_unsigned_integer (fi->saved_regs[LR_REGNUM], REGISTER_RAW_SIZE (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); fi->extra_info->return_pc = d10v_make_iaddr (return_pc);
} }
else else
{ {
fi->extra_info->return_pc = D10V_MAKE_IADDR (read_register (LR_REGNUM)); fi->extra_info->return_pc = d10v_make_iaddr (read_register (LR_REGNUM));
} }
/* th SP is not normally (ever?) saved, but check anyway */ /* th SP is not normally (ever?) saved, but check anyway */
@ -843,7 +843,7 @@ show_regs (char *args, int from_tty)
int a; int a;
printf_filtered ("PC=%04lx (0x%lx) PSW=%04lx RPT_S=%04lx RPT_E=%04lx RPT_C=%04lx\n", printf_filtered ("PC=%04lx (0x%lx) PSW=%04lx RPT_S=%04lx RPT_E=%04lx RPT_C=%04lx\n",
(long) read_register (PC_REGNUM), (long) read_register (PC_REGNUM),
(long) D10V_MAKE_IADDR (read_register (PC_REGNUM)), (long) d10v_make_iaddr (read_register (PC_REGNUM)),
(long) read_register (PSW_REGNUM), (long) read_register (PSW_REGNUM),
(long) read_register (24), (long) read_register (24),
(long) read_register (25), (long) read_register (25),
@ -908,7 +908,7 @@ d10v_read_pc (ptid_t ptid)
inferior_ptid = ptid; inferior_ptid = ptid;
pc = (int) read_register (PC_REGNUM); pc = (int) read_register (PC_REGNUM);
inferior_ptid = save_ptid; inferior_ptid = save_ptid;
retval = D10V_MAKE_IADDR (pc); retval = d10v_make_iaddr (pc);
return retval; return retval;
} }
@ -919,32 +919,32 @@ d10v_write_pc (CORE_ADDR val, ptid_t ptid)
save_ptid = inferior_ptid; save_ptid = inferior_ptid;
inferior_ptid = ptid; inferior_ptid = ptid;
write_register (PC_REGNUM, D10V_CONVERT_IADDR_TO_RAW (val)); write_register (PC_REGNUM, d10v_convert_iaddr_to_raw (val));
inferior_ptid = save_ptid; inferior_ptid = save_ptid;
} }
static CORE_ADDR static CORE_ADDR
d10v_read_sp (void) d10v_read_sp (void)
{ {
return (D10V_MAKE_DADDR (read_register (SP_REGNUM))); return (d10v_make_daddr (read_register (SP_REGNUM)));
} }
static void static void
d10v_write_sp (CORE_ADDR val) d10v_write_sp (CORE_ADDR val)
{ {
write_register (SP_REGNUM, D10V_CONVERT_DADDR_TO_RAW (val)); write_register (SP_REGNUM, d10v_convert_daddr_to_raw (val));
} }
static void static void
d10v_write_fp (CORE_ADDR val) d10v_write_fp (CORE_ADDR val)
{ {
write_register (FP_REGNUM, D10V_CONVERT_DADDR_TO_RAW (val)); write_register (FP_REGNUM, d10v_convert_daddr_to_raw (val));
} }
static CORE_ADDR static CORE_ADDR
d10v_read_fp (void) d10v_read_fp (void)
{ {
return (D10V_MAKE_DADDR (read_register (FP_REGNUM))); return (d10v_make_daddr (read_register (FP_REGNUM)));
} }
/* Function: push_return_address (pc) /* Function: push_return_address (pc)
@ -954,7 +954,7 @@ d10v_read_fp (void)
static CORE_ADDR static CORE_ADDR
d10v_push_return_address (CORE_ADDR pc, CORE_ADDR sp) d10v_push_return_address (CORE_ADDR pc, CORE_ADDR sp)
{ {
write_register (LR_REGNUM, D10V_CONVERT_IADDR_TO_RAW (CALL_DUMMY_ADDRESS ())); write_register (LR_REGNUM, d10v_convert_iaddr_to_raw (CALL_DUMMY_ADDRESS ()));
return sp; return sp;
} }
@ -1021,12 +1021,12 @@ d10v_push_arguments (int nargs, value_ptr *args, CORE_ADDR sp,
&& (TYPE_CODE (TYPE_TARGET_TYPE (type)) == TYPE_CODE_FUNC)) && (TYPE_CODE (TYPE_TARGET_TYPE (type)) == TYPE_CODE_FUNC))
{ {
/* function pointer */ /* function pointer */
val = D10V_CONVERT_IADDR_TO_RAW (val); val = d10v_convert_iaddr_to_raw (val);
} }
else if (D10V_IADDR_P (val)) else if (d10v_iaddr_p (val))
{ {
/* also function pointer! */ /* also function pointer! */
val = D10V_CONVERT_DADDR_TO_RAW (val); val = d10v_convert_daddr_to_raw (val);
} }
else else
{ {
@ -1106,7 +1106,7 @@ d10v_extract_return_value (struct type *type, char regbuf[REGISTER_BYTES],
int num; int num;
short snum; short snum;
snum = extract_address (regbuf + REGISTER_BYTE (RET1_REGNUM), REGISTER_RAW_SIZE (RET1_REGNUM)); snum = extract_address (regbuf + REGISTER_BYTE (RET1_REGNUM), REGISTER_RAW_SIZE (RET1_REGNUM));
store_address (valbuf, 4, D10V_MAKE_IADDR (snum)); store_address (valbuf, 4, d10v_make_iaddr (snum));
} }
else if (TYPE_CODE (type) == TYPE_CODE_PTR) else if (TYPE_CODE (type) == TYPE_CODE_PTR)
{ {
@ -1114,7 +1114,7 @@ d10v_extract_return_value (struct type *type, char regbuf[REGISTER_BYTES],
int num; int num;
short snum; short snum;
snum = extract_address (regbuf + REGISTER_BYTE (RET1_REGNUM), REGISTER_RAW_SIZE (RET1_REGNUM)); snum = extract_address (regbuf + REGISTER_BYTE (RET1_REGNUM), REGISTER_RAW_SIZE (RET1_REGNUM));
store_address (valbuf, 4, D10V_MAKE_DADDR (snum)); store_address (valbuf, 4, d10v_make_daddr (snum));
} }
else else
{ {