Toolchain/binutils-gdb
1
0
Fork 0
forked from Imagelibrary/binutils-gdb
Code Pull Requests Activity

* mips-tdep.c (mips_fetch_instruction, mips16_fetch_instruction)

Browse Source 
(mips_mdebug_frame_cache, mips16_scan_prologue)
(mips32_scan_prologue, mips_stub_frame_cache)
(heuristic_proc_start, heuristic_proc_desc)
(mips_eabi_push_dummy_call, mips_n32n64_push_dummy_call)
(mips_n32n64_return_value, mips_o32_push_dummy_call)
(mips_o32_return_value, mips_o64_push_dummy_call)
(mips_step_skips_delay, mips_skip_trampoline_code)
(mips_gdbarch_init): Use MIPS_A0_REGNUM instead of A0_REGNUM,
MIPS_RA_REGNUM instead of RA_REGNUM, MIPS_T9_REGNUM instead of
T9_REGNUM, MIPS_V0_REGNUM instead of V0_REGNUM, MIPS_ZERO_REGNUM
instead of ZERO_REGNUM, MIPS32_SIZE_INSN instead of MIPS_INSTLEN
and MIPS16_INSN_SIZE instead of MIPS16_INSTLEN.
(mips_dump_tdep): Don't print A0_REGNUM, RA_REGNUM,
T9_REGNUM, V0_REGNUM, ZERO_REGNUM, MIPS_INSTLEN and
MIPS16_INSTLEN.  Use MIPS_A0_REGNUM instead of A0_REGNUM.
* mips-linux-tdep.c (mips_linux_o32_sigframe_init)
(mips_linux_n32n64_sigframe_init): Use MIPS_ZERO_REGNUM instead of
ZERO_REGNUM.
* mipsnbsd-tdep.c (mipsnbsd_cannot_fetch_register)
(mipsnbsd_cannot_store_register): Use MIPS_ZERO_REGNUM instead of
ZERO_REGNUM.
(mipsnbsd_get_longjmp_target): Use MIPS_A0_REGNUM instead of
A0_REGNUM.
* mipsnbsd-nat.c: Include "mips-tdep.h".
(getregs_supplies): Use MIPS_ZERO_REGNUM instead of ZERO_REGNUM.
* Makefile.in (mipsnbsd-nat.o): Update dependencies.
This commit is contained in:
Mark Kettenis
2004-10-30 14:31:19 +00:00
parent 1c8831c5ad
commit 4c7d22cba3
5 changed files with 68 additions and 77 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
gdb/Makefile.in
View File

@@ -2236,7 +2236,7 @@ mips-linux-tdep.o: mips-linux-tdep.c $(defs_h) $(gdbcore_h) $(target_h) \
$(solib_svr4_h) $(osabi_h) $(mips_tdep_h) $(gdb_string_h) \ $(solib_svr4_h) $(osabi_h) $(mips_tdep_h) $(gdb_string_h) \
$(gdb_assert_h) $(frame_h) $(trad_frame_h) $(tramp_frame_h) $(gdb_assert_h) $(frame_h) $(trad_frame_h) $(tramp_frame_h)
mipsnbsd-nat.o: mipsnbsd-nat.c $(defs_h) $(inferior_h) $(regcache_h) \ mipsnbsd-nat.o: mipsnbsd-nat.c $(defs_h) $(inferior_h) $(regcache_h) \
$(mipsnbsd_tdep_h) $(mips_tdep_h) $(mipsnbsd_tdep_h)
mipsnbsd-tdep.o: mipsnbsd-tdep.c $(defs_h) $(gdbcore_h) $(regcache_h) \ mipsnbsd-tdep.o: mipsnbsd-tdep.c $(defs_h) $(gdbcore_h) $(regcache_h) \
$(target_h) $(value_h) $(osabi_h) $(nbsd_tdep_h) $(mipsnbsd_tdep_h) \ $(target_h) $(value_h) $(osabi_h) $(nbsd_tdep_h) $(mipsnbsd_tdep_h) \
$(mips_tdep_h) $(solib_svr4_h) $(mips_tdep_h) $(solib_svr4_h)

4
gdb/mips-linux-tdep.c
View File

@@ -975,7 +975,7 @@ mips_linux_o32_sigframe_init (const struct tramp_frame *self,
#endif #endif
for (ireg = 1; ireg < 32; ireg++) for (ireg = 1; ireg < 32; ireg++)
trad_frame_set_reg_addr (this_cache, ireg + ZERO_REGNUM + NUM_REGS, trad_frame_set_reg_addr (this_cache, ireg + MIPS_ZERO_REGNUM + NUM_REGS,
sigcontext_base + SIGCONTEXT_REGS sigcontext_base + SIGCONTEXT_REGS
+ ireg * SIGCONTEXT_REG_SIZE); + ireg * SIGCONTEXT_REG_SIZE);
@@ -1097,7 +1097,7 @@ mips_linux_n32n64_sigframe_init (const struct tramp_frame *self,
#endif #endif
for (ireg = 1; ireg < 32; ireg++) for (ireg = 1; ireg < 32; ireg++)
trad_frame_set_reg_addr (this_cache, ireg + ZERO_REGNUM + NUM_REGS, trad_frame_set_reg_addr (this_cache, ireg + MIPS_ZERO_REGNUM + NUM_REGS,
sigcontext_base + N64_SIGCONTEXT_REGS sigcontext_base + N64_SIGCONTEXT_REGS
+ ireg * N64_SIGCONTEXT_REG_SIZE); + ireg * N64_SIGCONTEXT_REG_SIZE);

115
gdb/mips-tdep.c
View File

@@ -951,17 +951,17 @@ after_prologue (CORE_ADDR pc)
static t_inst static t_inst
mips_fetch_instruction (CORE_ADDR addr) mips_fetch_instruction (CORE_ADDR addr)
{ {
char buf[MIPS_INSTLEN]; char buf[MIPS32_INSN_SIZE];
int instlen; int instlen;
int status; int status;
if (pc_is_mips16 (addr)) if (pc_is_mips16 (addr))
{ {
instlen = MIPS16_INSTLEN; instlen = MIPS16_INSN_SIZE;
addr = unmake_mips16_addr (addr); addr = unmake_mips16_addr (addr);
} }
else else
instlen = MIPS_INSTLEN; instlen = MIPS32_INSN_SIZE;
status = deprecated_read_memory_nobpt (addr, buf, instlen); status = deprecated_read_memory_nobpt (addr, buf, instlen);
if (status) if (status)
memory_error (status, addr); memory_error (status, addr);
@@ -971,16 +971,14 @@ mips_fetch_instruction (CORE_ADDR addr)
static ULONGEST static ULONGEST
mips16_fetch_instruction (CORE_ADDR addr) mips16_fetch_instruction (CORE_ADDR addr)
{ {
char buf[MIPS_INSTLEN]; char buf[MIPS16_INSN_SIZE];
int instlen;
int status; int status;
instlen = MIPS16_INSTLEN;
addr = unmake_mips16_addr (addr); addr = unmake_mips16_addr (addr);
status = deprecated_read_memory_nobpt (addr, buf, instlen); status = deprecated_read_memory_nobpt (addr, buf, sizeof (buf));
if (status) if (status)
memory_error (status, addr); memory_error (status, addr);
return extract_unsigned_integer (buf, instlen); return extract_unsigned_integer (buf, sizeof (buf));
} }
/* These the fields of 32 bit mips instructions */ /* These the fields of 32 bit mips instructions */
@@ -1613,7 +1611,7 @@ mips_mdebug_frame_cache (struct frame_info *next_frame, void **this_cache)
} }
cache->saved_regs[NUM_REGS + mips_regnum (current_gdbarch)->pc] cache->saved_regs[NUM_REGS + mips_regnum (current_gdbarch)->pc]
= cache->saved_regs[NUM_REGS + RA_REGNUM]; = cache->saved_regs[NUM_REGS + MIPS_RA_REGNUM];
} }
/* SP_REGNUM, contains the value and not the address. */ /* SP_REGNUM, contains the value and not the address. */
@@ -1803,7 +1801,7 @@ mips16_scan_prologue (CORE_ADDR start_pc, CORE_ADDR limit_pc,
if (limit_pc > start_pc + 200) if (limit_pc > start_pc + 200)
limit_pc = start_pc + 200; limit_pc = start_pc + 200;
for (cur_pc = start_pc; cur_pc < limit_pc; cur_pc += MIPS16_INSTLEN) for (cur_pc = start_pc; cur_pc < limit_pc; cur_pc += MIPS16_INSN_SIZE)
{ {
/* Save the previous instruction. If it's an EXTEND, we'll extract /* Save the previous instruction. If it's an EXTEND, we'll extract
the immediate offset extension from it in mips16_get_imm. */ the immediate offset extension from it in mips16_get_imm. */
@@ -1819,7 +1817,7 @@ mips16_scan_prologue (CORE_ADDR start_pc, CORE_ADDR limit_pc,
over the extend. */ over the extend. */
if ((inst & 0xf800) == 0xf000) /* extend */ if ((inst & 0xf800) == 0xf000) /* extend */
{ {
extend_bytes = MIPS16_INSTLEN; extend_bytes = MIPS16_INSN_SIZE;
continue; continue;
} }
@@ -1853,12 +1851,12 @@ mips16_scan_prologue (CORE_ADDR start_pc, CORE_ADDR limit_pc,
else if ((inst & 0xff00) == 0x6200) /* sw $ra,n($sp) */ else if ((inst & 0xff00) == 0x6200) /* sw $ra,n($sp) */
{ {
offset = mips16_get_imm (prev_inst, inst, 8, 4, 0); offset = mips16_get_imm (prev_inst, inst, 8, 4, 0);
set_reg_offset (this_cache, RA_REGNUM, sp + offset); set_reg_offset (this_cache, MIPS_RA_REGNUM, sp + offset);
} }
else if ((inst & 0xff00) == 0xfa00) /* sd $ra,n($sp) */ else if ((inst & 0xff00) == 0xfa00) /* sd $ra,n($sp) */
{ {
offset = mips16_get_imm (prev_inst, inst, 8, 8, 0); offset = mips16_get_imm (prev_inst, inst, 8, 8, 0);
set_reg_offset (this_cache, RA_REGNUM, sp + offset); set_reg_offset (this_cache, MIPS_RA_REGNUM, sp + offset);
} }
else if (inst == 0x673d) /* move $s1, $sp */ else if (inst == 0x673d) /* move $s1, $sp */
{ {
@@ -1888,7 +1886,7 @@ mips16_scan_prologue (CORE_ADDR start_pc, CORE_ADDR limit_pc,
&& (inst & 0x700) != 0x700) /* entry */ && (inst & 0x700) != 0x700) /* entry */
entry_inst = inst; /* save for later processing */ entry_inst = inst; /* save for later processing */
else if ((inst & 0xf800) == 0x1800) /* jal(x) */ else if ((inst & 0xf800) == 0x1800) /* jal(x) */
cur_pc += MIPS16_INSTLEN; /* 32-bit instruction */ cur_pc += MIPS16_INSN_SIZE; /* 32-bit instruction */
else if ((inst & 0xff1c) == 0x6704) /* move reg,$a0-$a3 */ else if ((inst & 0xff1c) == 0x6704) /* move reg,$a0-$a3 */
{ {
/* This instruction is part of the prologue, but we don't /* This instruction is part of the prologue, but we don't
@@ -1933,7 +1931,7 @@ mips16_scan_prologue (CORE_ADDR start_pc, CORE_ADDR limit_pc,
offset = -4; offset = -4;
if (entry_inst & 0x20) if (entry_inst & 0x20)
{ {
set_reg_offset (this_cache, RA_REGNUM, sp + offset); set_reg_offset (this_cache, MIPS_RA_REGNUM, sp + offset);
offset -= mips_abi_regsize (current_gdbarch); offset -= mips_abi_regsize (current_gdbarch);
} }
@@ -1954,7 +1952,7 @@ mips16_scan_prologue (CORE_ADDR start_pc, CORE_ADDR limit_pc,
be able to get rid of the assignment below, evetually. But it's be able to get rid of the assignment below, evetually. But it's
still needed for now. */ still needed for now. */
this_cache->saved_regs[NUM_REGS + mips_regnum (current_gdbarch)->pc] this_cache->saved_regs[NUM_REGS + mips_regnum (current_gdbarch)->pc]
= this_cache->saved_regs[NUM_REGS + RA_REGNUM]; = this_cache->saved_regs[NUM_REGS + MIPS_RA_REGNUM];
} }
/* If we didn't reach the end of the prologue when scanning the function /* If we didn't reach the end of the prologue when scanning the function
@@ -2119,7 +2117,7 @@ mips32_scan_prologue (CORE_ADDR start_pc, CORE_ADDR limit_pc,
restart: restart:
frame_offset = 0; frame_offset = 0;
for (cur_pc = start_pc; cur_pc < limit_pc; cur_pc += MIPS_INSTLEN) for (cur_pc = start_pc; cur_pc < limit_pc; cur_pc += MIPS32_INSN_SIZE)
{ {
unsigned long inst, high_word, low_word; unsigned long inst, high_word, low_word;
int reg; int reg;
@@ -2239,7 +2237,7 @@ restart:
|| high_word == 0x3408 /* ori $t0,$zero,n */ || high_word == 0x3408 /* ori $t0,$zero,n */
)) ))
{ {
load_immediate_bytes += MIPS_INSTLEN; /* FIXME!! */ load_immediate_bytes += MIPS32_INSN_SIZE; /* FIXME! */
} }
else else
{ {
@@ -2263,7 +2261,7 @@ restart:
this assignment below, eventually. But it's still needed this assignment below, eventually. But it's still needed
for now. */ for now. */
this_cache->saved_regs[NUM_REGS + mips_regnum (current_gdbarch)->pc] this_cache->saved_regs[NUM_REGS + mips_regnum (current_gdbarch)->pc]
= this_cache->saved_regs[NUM_REGS + RA_REGNUM]; = this_cache->saved_regs[NUM_REGS + MIPS_RA_REGNUM];
} }
/* If we didn't reach the end of the prologue when scanning the function /* If we didn't reach the end of the prologue when scanning the function
@@ -2401,13 +2399,13 @@ mips_stub_frame_cache (struct frame_info *next_frame, void **this_cache)
(*this_cache) = this_trad_cache; (*this_cache) = this_trad_cache;
/* The return address is in the link register. */ /* The return address is in the link register. */
trad_frame_set_reg_realreg (this_trad_cache, PC_REGNUM, RA_REGNUM); trad_frame_set_reg_realreg (this_trad_cache, PC_REGNUM, MIPS_RA_REGNUM);
/* Frame ID, since it's a frameless / stackless function, no stack /* Frame ID, since it's a frameless / stackless function, no stack
space is allocated and SP on entry is the current SP. */ space is allocated and SP on entry is the current SP. */
pc = frame_pc_unwind (next_frame); pc = frame_pc_unwind (next_frame);
find_pc_partial_function (pc, NULL, &start_addr, NULL); find_pc_partial_function (pc, NULL, &start_addr, NULL);
stack_addr = frame_unwind_register_signed (next_frame, SP_REGNUM); stack_addr = frame_unwind_register_signed (next_frame, MIPS_SP_REGNUM);
trad_frame_set_id (this_trad_cache, frame_id_build (start_addr, stack_addr)); trad_frame_set_id (this_trad_cache, frame_id_build (start_addr, stack_addr));
/* Assume that the frame's base is the same as the /* Assume that the frame's base is the same as the
@@ -2594,7 +2592,7 @@ heuristic_proc_start (CORE_ADDR pc)
if (heuristic_fence_post == UINT_MAX || fence < VM_MIN_ADDRESS) if (heuristic_fence_post == UINT_MAX || fence < VM_MIN_ADDRESS)
fence = VM_MIN_ADDRESS; fence = VM_MIN_ADDRESS;
instlen = pc_is_mips16 (pc) ? MIPS16_INSTLEN : MIPS_INSTLEN; instlen = pc_is_mips16 (pc) ? MIPS16_INSN_SIZE : MIPS32_INSN_SIZE;
/* search back for previous return */ /* search back for previous return */
for (start_pc -= instlen;; start_pc -= instlen) for (start_pc -= instlen;; start_pc -= instlen)
@@ -2660,7 +2658,8 @@ heuristic-fence-post' command.\n", paddr_nz (pc), paddr_nz (pc));
} }
else if (mips_about_to_return (start_pc)) else if (mips_about_to_return (start_pc))
{ {
start_pc += 2 * MIPS_INSTLEN; /* skip return, and its delay slot */ /* Skip return and its delay slot. */
start_pc += 2 * MIPS32_INSN_SIZE;
break; break;
} }
@@ -2678,7 +2677,7 @@ heuristic_proc_desc (CORE_ADDR start_pc, CORE_ADDR limit_pc,
memset (&temp_proc_desc, '\0', sizeof (temp_proc_desc)); memset (&temp_proc_desc, '\0', sizeof (temp_proc_desc));
PROC_LOW_ADDR (&temp_proc_desc) = start_pc; PROC_LOW_ADDR (&temp_proc_desc) = start_pc;
PROC_FRAME_REG (&temp_proc_desc) = MIPS_SP_REGNUM; PROC_FRAME_REG (&temp_proc_desc) = MIPS_SP_REGNUM;
PROC_PC_REG (&temp_proc_desc) = RA_REGNUM; PROC_PC_REG (&temp_proc_desc) = MIPS_RA_REGNUM;
if (pc_is_mips16 (start_pc)) if (pc_is_mips16 (start_pc))
mips16_scan_prologue (start_pc, limit_pc, next_frame, this_cache); mips16_scan_prologue (start_pc, limit_pc, next_frame, this_cache);
@@ -3136,11 +3135,11 @@ mips_eabi_push_dummy_call (struct gdbarch *gdbarch, struct value *function,
/* For shared libraries, "t9" needs to point at the function /* For shared libraries, "t9" needs to point at the function
address. */ address. */
regcache_cooked_write_signed (regcache, T9_REGNUM, func_addr); regcache_cooked_write_signed (regcache, MIPS_T9_REGNUM, func_addr);
/* Set the return address register to point to the entry point of /* Set the return address register to point to the entry point of
the program, where a breakpoint lies in wait. */ the program, where a breakpoint lies in wait. */
regcache_cooked_write_signed (regcache, RA_REGNUM, bp_addr); regcache_cooked_write_signed (regcache, MIPS_RA_REGNUM, bp_addr);
/* First ensure that the stack and structure return address (if any) /* First ensure that the stack and structure return address (if any)
are properly aligned. The stack has to be at least 64-bit are properly aligned. The stack has to be at least 64-bit
@@ -3165,7 +3164,7 @@ mips_eabi_push_dummy_call (struct gdbarch *gdbarch, struct value *function,
paddr_nz (sp), (long) align_up (len, 16)); paddr_nz (sp), (long) align_up (len, 16));
/* Initialize the integer and float register pointers. */ /* Initialize the integer and float register pointers. */
argreg = A0_REGNUM; argreg = MIPS_A0_REGNUM;
float_argreg = mips_fpa0_regnum (current_gdbarch); float_argreg = mips_fpa0_regnum (current_gdbarch);
/* The struct_return pointer occupies the first parameter-passing reg. */ /* The struct_return pointer occupies the first parameter-passing reg. */
@@ -3455,11 +3454,11 @@ mips_n32n64_push_dummy_call (struct gdbarch *gdbarch, struct value *function,
/* For shared libraries, "t9" needs to point at the function /* For shared libraries, "t9" needs to point at the function
address. */ address. */
regcache_cooked_write_signed (regcache, T9_REGNUM, func_addr); regcache_cooked_write_signed (regcache, MIPS_T9_REGNUM, func_addr);
/* Set the return address register to point to the entry point of /* Set the return address register to point to the entry point of
the program, where a breakpoint lies in wait. */ the program, where a breakpoint lies in wait. */
regcache_cooked_write_signed (regcache, RA_REGNUM, bp_addr); regcache_cooked_write_signed (regcache, MIPS_RA_REGNUM, bp_addr);
/* First ensure that the stack and structure return address (if any) /* First ensure that the stack and structure return address (if any)
are properly aligned. The stack has to be at least 64-bit are properly aligned. The stack has to be at least 64-bit
@@ -3482,7 +3481,7 @@ mips_n32n64_push_dummy_call (struct gdbarch *gdbarch, struct value *function,
paddr_nz (sp), (long) align_up (len, 16)); paddr_nz (sp), (long) align_up (len, 16));
/* Initialize the integer and float register pointers. */ /* Initialize the integer and float register pointers. */
argreg = A0_REGNUM; argreg = MIPS_A0_REGNUM;
float_argreg = mips_fpa0_regnum (current_gdbarch); float_argreg = mips_fpa0_regnum (current_gdbarch);
/* The struct_return pointer occupies the first parameter-passing reg. */ /* The struct_return pointer occupies the first parameter-passing reg. */
@@ -3738,7 +3737,7 @@ mips_n32n64_return_value (struct gdbarch *gdbarch,
mips_xfer_lower. */ mips_xfer_lower. */
int offset; int offset;
int regnum; int regnum;
for (offset = 0, regnum = V0_REGNUM; for (offset = 0, regnum = MIPS_V0_REGNUM;
offset < TYPE_LENGTH (type); offset < TYPE_LENGTH (type);
offset += register_size (current_gdbarch, regnum), regnum++) offset += register_size (current_gdbarch, regnum), regnum++)
{ {
@@ -3759,7 +3758,7 @@ mips_n32n64_return_value (struct gdbarch *gdbarch,
justified. */ justified. */
int offset; int offset;
int regnum; int regnum;
for (offset = 0, regnum = V0_REGNUM; for (offset = 0, regnum = MIPS_V0_REGNUM;
offset < TYPE_LENGTH (type); offset < TYPE_LENGTH (type);
offset += register_size (current_gdbarch, regnum), regnum++) offset += register_size (current_gdbarch, regnum), regnum++)
{ {
@@ -3794,11 +3793,11 @@ mips_o32_push_dummy_call (struct gdbarch *gdbarch, struct value *function,
/* For shared libraries, "t9" needs to point at the function /* For shared libraries, "t9" needs to point at the function
address. */ address. */
regcache_cooked_write_signed (regcache, T9_REGNUM, func_addr); regcache_cooked_write_signed (regcache, MIPS_T9_REGNUM, func_addr);
/* Set the return address register to point to the entry point of /* Set the return address register to point to the entry point of
the program, where a breakpoint lies in wait. */ the program, where a breakpoint lies in wait. */
regcache_cooked_write_signed (regcache, RA_REGNUM, bp_addr); regcache_cooked_write_signed (regcache, MIPS_RA_REGNUM, bp_addr);
/* First ensure that the stack and structure return address (if any) /* First ensure that the stack and structure return address (if any)
are properly aligned. The stack has to be at least 64-bit are properly aligned. The stack has to be at least 64-bit
@@ -3821,7 +3820,7 @@ mips_o32_push_dummy_call (struct gdbarch *gdbarch, struct value *function,
paddr_nz (sp), (long) align_up (len, 16)); paddr_nz (sp), (long) align_up (len, 16));
/* Initialize the integer and float register pointers. */ /* Initialize the integer and float register pointers. */
argreg = A0_REGNUM; argreg = MIPS_A0_REGNUM;
float_argreg = mips_fpa0_regnum (current_gdbarch); float_argreg = mips_fpa0_regnum (current_gdbarch);
/* The struct_return pointer occupies the first parameter-passing reg. */ /* The struct_return pointer occupies the first parameter-passing reg. */
@@ -4188,7 +4187,7 @@ mips_o32_return_value (struct gdbarch *gdbarch, struct type *type,
mips_xfer_lower. */ mips_xfer_lower. */
int offset; int offset;
int regnum; int regnum;
for (offset = 0, regnum = V0_REGNUM; for (offset = 0, regnum = MIPS_V0_REGNUM;
offset < TYPE_LENGTH (type); offset < TYPE_LENGTH (type);
offset += register_size (current_gdbarch, regnum), regnum++) offset += register_size (current_gdbarch, regnum), regnum++)
{ {
@@ -4211,7 +4210,7 @@ mips_o32_return_value (struct gdbarch *gdbarch, struct type *type,
the ISA. mips_stack_argsize controls this. */ the ISA. mips_stack_argsize controls this. */
int offset; int offset;
int regnum; int regnum;
for (offset = 0, regnum = V0_REGNUM; for (offset = 0, regnum = MIPS_V0_REGNUM;
offset < TYPE_LENGTH (type); offset < TYPE_LENGTH (type);
offset += mips_stack_argsize (gdbarch), regnum++) offset += mips_stack_argsize (gdbarch), regnum++)
{ {
@@ -4248,11 +4247,11 @@ mips_o64_push_dummy_call (struct gdbarch *gdbarch, struct value *function,
/* For shared libraries, "t9" needs to point at the function /* For shared libraries, "t9" needs to point at the function
address. */ address. */
regcache_cooked_write_signed (regcache, T9_REGNUM, func_addr); regcache_cooked_write_signed (regcache, MIPS_T9_REGNUM, func_addr);
/* Set the return address register to point to the entry point of /* Set the return address register to point to the entry point of
the program, where a breakpoint lies in wait. */ the program, where a breakpoint lies in wait. */
regcache_cooked_write_signed (regcache, RA_REGNUM, bp_addr); regcache_cooked_write_signed (regcache, MIPS_RA_REGNUM, bp_addr);
/* First ensure that the stack and structure return address (if any) /* First ensure that the stack and structure return address (if any)
are properly aligned. The stack has to be at least 64-bit are properly aligned. The stack has to be at least 64-bit
@@ -4275,7 +4274,7 @@ mips_o64_push_dummy_call (struct gdbarch *gdbarch, struct value *function,
paddr_nz (sp), (long) align_up (len, 16)); paddr_nz (sp), (long) align_up (len, 16));
/* Initialize the integer and float register pointers. */ /* Initialize the integer and float register pointers. */
argreg = A0_REGNUM; argreg = MIPS_A0_REGNUM;
float_argreg = mips_fpa0_regnum (current_gdbarch); float_argreg = mips_fpa0_regnum (current_gdbarch);
/* The struct_return pointer occupies the first parameter-passing reg. */ /* The struct_return pointer occupies the first parameter-passing reg. */
@@ -4960,17 +4959,16 @@ is_delayed (unsigned long insn)
int int
mips_step_skips_delay (CORE_ADDR pc) mips_step_skips_delay (CORE_ADDR pc)
{ {
char buf[MIPS_INSTLEN]; char buf[MIPS32_INSN_SIZE];
/* There is no branch delay slot on MIPS16. */ /* There is no branch delay slot on MIPS16. */
if (pc_is_mips16 (pc)) if (pc_is_mips16 (pc))
return 0; return 0;
if (target_read_memory (pc, buf, MIPS_INSTLEN) != 0) if (target_read_memory (pc, buf, sizeof buf) != 0)
/* If error reading memory, guess that it is not a delayed branch. */ /* If error reading memory, guess that it is not a delayed branch. */
return 0; return 0;
return is_delayed ((unsigned long) return is_delayed (extract_unsigned_integer (buf, sizeof buf));
extract_unsigned_integer (buf, MIPS_INSTLEN));
} }
/* To skip prologues, I use this predicate. Returns either PC itself /* To skip prologues, I use this predicate. Returns either PC itself
@@ -5303,7 +5301,7 @@ mips_skip_trampoline_code (CORE_ADDR pc)
target PC is in $31 ($ra). */ target PC is in $31 ($ra). */
if (strcmp (name, "__mips16_ret_sf") == 0 if (strcmp (name, "__mips16_ret_sf") == 0
|| strcmp (name, "__mips16_ret_df") == 0) || strcmp (name, "__mips16_ret_df") == 0)
return read_signed_register (RA_REGNUM); return read_signed_register (MIPS_RA_REGNUM);
if (strncmp (name, "__mips16_call_stub_", 19) == 0) if (strncmp (name, "__mips16_call_stub_", 19) == 0)
{ {
@@ -5348,7 +5346,7 @@ mips_skip_trampoline_code (CORE_ADDR pc)
/* Scan through this _fn_stub_ code for the lui/addiu pair. /* Scan through this _fn_stub_ code for the lui/addiu pair.
The limit on the search is arbitrarily set to 20 The limit on the search is arbitrarily set to 20
instructions. FIXME. */ instructions. FIXME. */
for (i = 0, pc = 0; i < 20; i++, target_pc += MIPS_INSTLEN) for (i = 0, pc = 0; i < 20; i++, target_pc += MIPS32_INSN_SIZE)
{ {
inst = mips_fetch_instruction (target_pc); inst = mips_fetch_instruction (target_pc);
if ((inst & 0xffff0000) == 0x3c010000) /* lui $at */ if ((inst & 0xffff0000) == 0x3c010000) /* lui $at */
@@ -5794,7 +5792,7 @@ mips_gdbarch_init (struct gdbarch_info info, struct gdbarch_list *arches)
case MIPS_ABI_O32: case MIPS_ABI_O32:
set_gdbarch_push_dummy_call (gdbarch, mips_o32_push_dummy_call); set_gdbarch_push_dummy_call (gdbarch, mips_o32_push_dummy_call);
set_gdbarch_return_value (gdbarch, mips_o32_return_value); set_gdbarch_return_value (gdbarch, mips_o32_return_value);
tdep->mips_last_arg_regnum = A0_REGNUM + 4 - 1; tdep->mips_last_arg_regnum = MIPS_A0_REGNUM + 4 - 1;
tdep->mips_last_fp_arg_regnum = tdep->regnum->fp0 + 12 + 4 - 1; tdep->mips_last_fp_arg_regnum = tdep->regnum->fp0 + 12 + 4 - 1;
tdep->default_mask_address_p = 0; tdep->default_mask_address_p = 0;
set_gdbarch_long_bit (gdbarch, 32); set_gdbarch_long_bit (gdbarch, 32);
@@ -5807,7 +5805,7 @@ mips_gdbarch_init (struct gdbarch_info info, struct gdbarch_list *arches)
mips_o64_store_return_value); mips_o64_store_return_value);
set_gdbarch_deprecated_extract_return_value (gdbarch, set_gdbarch_deprecated_extract_return_value (gdbarch,
mips_o64_extract_return_value); mips_o64_extract_return_value);
tdep->mips_last_arg_regnum = A0_REGNUM + 4 - 1; tdep->mips_last_arg_regnum = MIPS_A0_REGNUM + 4 - 1;
tdep->mips_last_fp_arg_regnum = tdep->regnum->fp0 + 12 + 4 - 1; tdep->mips_last_fp_arg_regnum = tdep->regnum->fp0 + 12 + 4 - 1;
tdep->default_mask_address_p = 0; tdep->default_mask_address_p = 0;
set_gdbarch_long_bit (gdbarch, 32); set_gdbarch_long_bit (gdbarch, 32);
@@ -5821,7 +5819,7 @@ mips_gdbarch_init (struct gdbarch_info info, struct gdbarch_list *arches)
mips_eabi_store_return_value); mips_eabi_store_return_value);
set_gdbarch_deprecated_extract_return_value (gdbarch, set_gdbarch_deprecated_extract_return_value (gdbarch,
mips_eabi_extract_return_value); mips_eabi_extract_return_value);
tdep->mips_last_arg_regnum = A0_REGNUM + 8 - 1; tdep->mips_last_arg_regnum = MIPS_A0_REGNUM + 8 - 1;
tdep->mips_last_fp_arg_regnum = tdep->regnum->fp0 + 12 + 8 - 1; tdep->mips_last_fp_arg_regnum = tdep->regnum->fp0 + 12 + 8 - 1;
tdep->default_mask_address_p = 0; tdep->default_mask_address_p = 0;
set_gdbarch_long_bit (gdbarch, 32); set_gdbarch_long_bit (gdbarch, 32);
@@ -5837,7 +5835,7 @@ mips_gdbarch_init (struct gdbarch_info info, struct gdbarch_list *arches)
mips_eabi_store_return_value); mips_eabi_store_return_value);
set_gdbarch_deprecated_extract_return_value (gdbarch, set_gdbarch_deprecated_extract_return_value (gdbarch,
mips_eabi_extract_return_value); mips_eabi_extract_return_value);
tdep->mips_last_arg_regnum = A0_REGNUM + 8 - 1; tdep->mips_last_arg_regnum = MIPS_A0_REGNUM + 8 - 1;
tdep->mips_last_fp_arg_regnum = tdep->regnum->fp0 + 12 + 8 - 1; tdep->mips_last_fp_arg_regnum = tdep->regnum->fp0 + 12 + 8 - 1;
tdep->default_mask_address_p = 0; tdep->default_mask_address_p = 0;
set_gdbarch_long_bit (gdbarch, 64); set_gdbarch_long_bit (gdbarch, 64);
@@ -5850,7 +5848,7 @@ mips_gdbarch_init (struct gdbarch_info info, struct gdbarch_list *arches)
case MIPS_ABI_N32: case MIPS_ABI_N32:
set_gdbarch_push_dummy_call (gdbarch, mips_n32n64_push_dummy_call); set_gdbarch_push_dummy_call (gdbarch, mips_n32n64_push_dummy_call);
set_gdbarch_return_value (gdbarch, mips_n32n64_return_value); set_gdbarch_return_value (gdbarch, mips_n32n64_return_value);
tdep->mips_last_arg_regnum = A0_REGNUM + 8 - 1; tdep->mips_last_arg_regnum = MIPS_A0_REGNUM + 8 - 1;
tdep->mips_last_fp_arg_regnum = tdep->regnum->fp0 + 12 + 8 - 1; tdep->mips_last_fp_arg_regnum = tdep->regnum->fp0 + 12 + 8 - 1;
tdep->default_mask_address_p = 0; tdep->default_mask_address_p = 0;
set_gdbarch_long_bit (gdbarch, 32); set_gdbarch_long_bit (gdbarch, 32);
@@ -5863,7 +5861,7 @@ mips_gdbarch_init (struct gdbarch_info info, struct gdbarch_list *arches)
case MIPS_ABI_N64: case MIPS_ABI_N64:
set_gdbarch_push_dummy_call (gdbarch, mips_n32n64_push_dummy_call); set_gdbarch_push_dummy_call (gdbarch, mips_n32n64_push_dummy_call);
set_gdbarch_return_value (gdbarch, mips_n32n64_return_value); set_gdbarch_return_value (gdbarch, mips_n32n64_return_value);
tdep->mips_last_arg_regnum = A0_REGNUM + 8 - 1; tdep->mips_last_arg_regnum = MIPS_A0_REGNUM + 8 - 1;
tdep->mips_last_fp_arg_regnum = tdep->regnum->fp0 + 12 + 8 - 1; tdep->mips_last_fp_arg_regnum = tdep->regnum->fp0 + 12 + 8 - 1;
tdep->default_mask_address_p = 0; tdep->default_mask_address_p = 0;
set_gdbarch_long_bit (gdbarch, 64); set_gdbarch_long_bit (gdbarch, 64);
@@ -6092,7 +6090,6 @@ mips_dump_tdep (struct gdbarch *current_gdbarch, struct ui_file *file)
fprintf_unfiltered (file, fprintf_unfiltered (file,
"mips_dump_tdep: mips_stack_argsize() = %d\n", "mips_dump_tdep: mips_stack_argsize() = %d\n",
mips_stack_argsize (current_gdbarch)); mips_stack_argsize (current_gdbarch));
fprintf_unfiltered (file, "mips_dump_tdep: A0_REGNUM = %d\n", A0_REGNUM);
fprintf_unfiltered (file, fprintf_unfiltered (file,
"mips_dump_tdep: ADDR_BITS_REMOVE # %s\n", "mips_dump_tdep: ADDR_BITS_REMOVE # %s\n",
XSTRING (ADDR_BITS_REMOVE (ADDR))); XSTRING (ADDR_BITS_REMOVE (ADDR)));
@@ -6132,18 +6129,13 @@ mips_dump_tdep (struct gdbarch *current_gdbarch, struct ui_file *file)
"mips_dump_tdep: MACHINE_CPROC_SP_OFFSET = %d\n", "mips_dump_tdep: MACHINE_CPROC_SP_OFFSET = %d\n",
MACHINE_CPROC_SP_OFFSET); MACHINE_CPROC_SP_OFFSET);
#endif #endif
fprintf_unfiltered (file,
"mips_dump_tdep: MIPS16_INSTLEN = %d\n",
MIPS16_INSTLEN);
fprintf_unfiltered (file, "mips_dump_tdep: MIPS_DEFAULT_ABI = FIXME!\n"); fprintf_unfiltered (file, "mips_dump_tdep: MIPS_DEFAULT_ABI = FIXME!\n");
fprintf_unfiltered (file, fprintf_unfiltered (file,
"mips_dump_tdep: MIPS_EFI_SYMBOL_NAME = multi-arch!!\n"); "mips_dump_tdep: MIPS_EFI_SYMBOL_NAME = multi-arch!!\n");
fprintf_unfiltered (file,
"mips_dump_tdep: MIPS_INSTLEN = %d\n", MIPS_INSTLEN);
fprintf_unfiltered (file, fprintf_unfiltered (file,
"mips_dump_tdep: MIPS_LAST_ARG_REGNUM = %d (%d regs)\n", "mips_dump_tdep: MIPS_LAST_ARG_REGNUM = %d (%d regs)\n",
MIPS_LAST_ARG_REGNUM, MIPS_LAST_ARG_REGNUM,
MIPS_LAST_ARG_REGNUM - A0_REGNUM + 1); MIPS_LAST_ARG_REGNUM - MIPS_A0_REGNUM + 1);
fprintf_unfiltered (file, fprintf_unfiltered (file,
"mips_dump_tdep: MIPS_NUMREGS = %d\n", MIPS_NUMREGS); "mips_dump_tdep: MIPS_NUMREGS = %d\n", MIPS_NUMREGS);
fprintf_unfiltered (file, fprintf_unfiltered (file,
@@ -6165,7 +6157,6 @@ mips_dump_tdep (struct gdbarch *current_gdbarch, struct ui_file *file)
fprintf_unfiltered (file, "mips_dump_tdep: PROC_REG_OFFSET = function?\n"); fprintf_unfiltered (file, "mips_dump_tdep: PROC_REG_OFFSET = function?\n");
fprintf_unfiltered (file, "mips_dump_tdep: PROC_SYMBOL = function?\n"); fprintf_unfiltered (file, "mips_dump_tdep: PROC_SYMBOL = function?\n");
fprintf_unfiltered (file, "mips_dump_tdep: PS_REGNUM = %d\n", PS_REGNUM); fprintf_unfiltered (file, "mips_dump_tdep: PS_REGNUM = %d\n", PS_REGNUM);
fprintf_unfiltered (file, "mips_dump_tdep: RA_REGNUM = %d\n", RA_REGNUM);
#ifdef SAVED_BYTES #ifdef SAVED_BYTES
fprintf_unfiltered (file, fprintf_unfiltered (file,
"mips_dump_tdep: SAVED_BYTES = %d\n", SAVED_BYTES); "mips_dump_tdep: SAVED_BYTES = %d\n", SAVED_BYTES);
@@ -6202,7 +6193,6 @@ mips_dump_tdep (struct gdbarch *current_gdbarch, struct ui_file *file)
fprintf_unfiltered (file, fprintf_unfiltered (file,
"mips_dump_tdep: STOPPED_BY_WATCHPOINT # %s\n", "mips_dump_tdep: STOPPED_BY_WATCHPOINT # %s\n",
XSTRING (STOPPED_BY_WATCHPOINT (WS))); XSTRING (STOPPED_BY_WATCHPOINT (WS)));
fprintf_unfiltered (file, "mips_dump_tdep: T9_REGNUM = %d\n", T9_REGNUM);
fprintf_unfiltered (file, fprintf_unfiltered (file,
"mips_dump_tdep: TABULAR_REGISTER_OUTPUT = used?\n"); "mips_dump_tdep: TABULAR_REGISTER_OUTPUT = used?\n");
fprintf_unfiltered (file, fprintf_unfiltered (file,
@@ -6232,12 +6222,9 @@ mips_dump_tdep (struct gdbarch *current_gdbarch, struct ui_file *file)
fprintf_unfiltered (file, fprintf_unfiltered (file,
"mips_dump_tdep: UNUSED_REGNUM = %d\n", UNUSED_REGNUM); "mips_dump_tdep: UNUSED_REGNUM = %d\n", UNUSED_REGNUM);
#endif #endif
fprintf_unfiltered (file, "mips_dump_tdep: V0_REGNUM = %d\n", V0_REGNUM);
fprintf_unfiltered (file, fprintf_unfiltered (file,
"mips_dump_tdep: VM_MIN_ADDRESS = %ld\n", "mips_dump_tdep: VM_MIN_ADDRESS = %ld\n",
(long) VM_MIN_ADDRESS); (long) VM_MIN_ADDRESS);
fprintf_unfiltered (file,
"mips_dump_tdep: ZERO_REGNUM = %d\n", ZERO_REGNUM);
} }
extern initialize_file_ftype _initialize_mips_tdep; /* -Wmissing-prototypes */ extern initialize_file_ftype _initialize_mips_tdep; /* -Wmissing-prototypes */

3
gdb/mipsnbsd-nat.c
View File

@@ -23,6 +23,7 @@
#include "inferior.h" #include "inferior.h"
#include "regcache.h" #include "regcache.h"
#include "mips-tdep.h"
#include "mipsnbsd-tdep.h" #include "mipsnbsd-tdep.h"
#include <sys/types.h> #include <sys/types.h>
@@ -33,7 +34,7 @@
static int static int
getregs_supplies (int regno) getregs_supplies (int regno)
{ {
return ((regno) >= ZERO_REGNUM && (regno) <= PC_REGNUM); return ((regno) >= MIPS_ZERO_REGNUM && (regno) <= PC_REGNUM);
} }
void void

21
gdb/mipsnbsd-tdep.c
View File

@@ -26,6 +26,8 @@
#include "value.h" #include "value.h"
#include "osabi.h" #include "osabi.h"
#include "gdb_string.h"
#include "nbsd-tdep.h" #include "nbsd-tdep.h"
#include "mipsnbsd-tdep.h" #include "mipsnbsd-tdep.h"
#include "mips-tdep.h" #include "mips-tdep.h"
@@ -194,15 +196,16 @@ static const unsigned char sigtramp_retcode_mipseb[RETCODE_SIZE] =
}; };
static LONGEST static LONGEST
mipsnbsd_sigtramp_offset (CORE_ADDR pc) mipsnbsd_sigtramp_offset (struct frame_info *next_frame)
{ {
CORE_ADDR pc = frame_pc_unwind (next_frame);
const char *retcode = TARGET_BYTE_ORDER == BFD_ENDIAN_BIG const char *retcode = TARGET_BYTE_ORDER == BFD_ENDIAN_BIG
? sigtramp_retcode_mipseb : sigtramp_retcode_mipsel; ? sigtramp_retcode_mipseb : sigtramp_retcode_mipsel;
unsigned char ret[RETCODE_SIZE], w[4]; unsigned char ret[RETCODE_SIZE], w[4];
LONGEST off; LONGEST off;
int i; int i;
if (deprecated_read_memory_nobpt (pc, (char *) w, sizeof (w)) != 0) if (!safe_frame_unwind_memory (next_frame, pc, w, sizeof (w)))
return -1; return -1;
for (i = 0; i < RETCODE_NWORDS; i++) for (i = 0; i < RETCODE_NWORDS; i++)
@@ -216,7 +219,7 @@ mipsnbsd_sigtramp_offset (CORE_ADDR pc)
off = i * 4; off = i * 4;
pc -= off; pc -= off;
if (deprecated_read_memory_nobpt (pc, (char *) ret, sizeof (ret)) != 0) if (!safe_frame_unwind_memory (next_frame, pc, ret, sizeof (ret)))
return -1; return -1;
if (memcmp (ret, retcode, RETCODE_SIZE) == 0) if (memcmp (ret, retcode, RETCODE_SIZE) == 0)
@@ -226,8 +229,8 @@ mipsnbsd_sigtramp_offset (CORE_ADDR pc)
} }
/* Figure out where the longjmp will land. We expect that we have /* Figure out where the longjmp will land. We expect that we have
just entered longjmp and haven't yet setup the stack frame, so just entered longjmp and haven't yet setup the stack frame, so the
the args are still in the argument regs. A0_REGNUM points at the args are still in the argument regs. MIPS_A0_REGNUM points at the
jmp_buf structure from which we extract the PC that we will land jmp_buf structure from which we extract the PC that we will land
at. The PC is copied into *pc. This routine returns true on at. The PC is copied into *pc. This routine returns true on
success. */ success. */
@@ -245,7 +248,7 @@ mipsnbsd_get_longjmp_target (CORE_ADDR *pc)
buf = alloca (NBSD_MIPS_JB_ELEMENT_SIZE); buf = alloca (NBSD_MIPS_JB_ELEMENT_SIZE);
jb_addr = read_register (A0_REGNUM); jb_addr = read_register (MIPS_A0_REGNUM);
if (target_read_memory (jb_addr + NBSD_MIPS_JB_OFFSET, buf, if (target_read_memory (jb_addr + NBSD_MIPS_JB_OFFSET, buf,
NBSD_MIPS_JB_ELEMENT_SIZE)) NBSD_MIPS_JB_ELEMENT_SIZE))
@@ -259,14 +262,14 @@ mipsnbsd_get_longjmp_target (CORE_ADDR *pc)
static int static int
mipsnbsd_cannot_fetch_register (int regno) mipsnbsd_cannot_fetch_register (int regno)
{ {
return (regno == ZERO_REGNUM return (regno == MIPS_ZERO_REGNUM
|| regno == mips_regnum (current_gdbarch)->fp_implementation_revision); || regno == mips_regnum (current_gdbarch)->fp_implementation_revision);
} }
static int static int
mipsnbsd_cannot_store_register (int regno) mipsnbsd_cannot_store_register (int regno)
{ {
return (regno == ZERO_REGNUM return (regno == MIPS_ZERO_REGNUM
|| regno == mips_regnum (current_gdbarch)->fp_implementation_revision); || regno == mips_regnum (current_gdbarch)->fp_implementation_revision);
} }
@@ -289,7 +292,7 @@ mipsnbsd_ilp32_solib_svr4_fetch_link_map_offsets (void)
lmo.link_map_size = 24; lmo.link_map_size = 24;
lmo.l_addr_offset = 0; lmo.l_addr_offset = 4;
lmo.l_addr_size = 4; lmo.l_addr_size = 4;
lmo.l_name_offset = 8; lmo.l_name_offset = 8;