aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRichard Earnshaw <richard.earnshaw@arm.com>2002-02-13 16:24:59 +0000
committerRichard Earnshaw <richard.earnshaw@arm.com>2002-02-13 16:24:59 +0000
commit9ae9b4eac4f559a33d164b9537114b9587a59fd1 (patch)
tree84983da884eac6433efc0b5bfb0203c2ef737530
parent079777f63ef67cd6bbb9846c0179404e17427fc6 (diff)
downloadgdb-9ae9b4eac4f559a33d164b9537114b9587a59fd1.zip
gdb-9ae9b4eac4f559a33d164b9537114b9587a59fd1.tar.gz
gdb-9ae9b4eac4f559a33d164b9537114b9587a59fd1.tar.bz2
Argh! These should also have been committed along with:
* arm-tdep.h: New file. * arm-tdep.c: Include arm-tdep.h. (arm_addr_bits_remove, arm_smash_text_address, arm_saved_pc_after_call) (arm_skip_prologue, arm_call_dummy_words, arm_fix_call_dummy) (arm_print_float_info, arm_register_type, convert_to_extended) (arm_elf_make_msymbols_special, arm_coff_make_msymbol_special) (arm_extract_return_value, arm_register_name): Make static. (arm_software_single_step): Similarly. Fix types in declaration. (arm_register_byte, arm_register_raw_size, arm_register_virtual_size) (arm_store_return_value, arm_store_struct_return): New functions. (arm_gdbarch_init): Register the above functions. Also register call_dummy_start_offset, sizeof_call_dummy_words, function_start_offset, inner_than, decr_pc_after_break, fp_regnum, sp_regnum, pc_regnum, register_bytes, num_regs, max_register_raw_size, max_register_virtual_size, register_size. Set up prologue_cache.saved_regs here, rather than ... (_initialize_arm_tdep): ... here. * config/arm/tm-arm.h (struct type, struct value): Delete forward declarations. (arm_addr_bits_remove, arm_smash_text_address, arm_saved_pc_after_call) (arm_skip_prologue, arm_call_dummy_words, arm_fix_call_dummy) (arm_print_float_info, arm_register_type, convert_to_extended) (arm_elf_make_msymbols_special, arm_coff_make_msymbol_special) (arm_extract_return_value, arm_register_name): Delete declarations. (SMASH_TEXT_ADDRESS, ADDR_BITS_REMOVE, FUNCTION_START_OFFSET) (SKIP_PROLOGUE, SAVED_PC_AFTER_CALL, INNER_THAN, BREAKPOINT_FROM_PC) (DECR_PC_AFTER_BREAK, PRINT_FLOAT_INFO, REGISTER_SIZE, NUM_REGS) (REGISTER_NAME, REGISTER_BYTES, REGISTER_BYTE, REGISTER_RAW_SIZE) (REGISTER_VIRTUAL_SIZE, MAX_REGISTER_RAW_SIZE) (MAX_REGISTER_VIRTUAL_SIZE, REGISTER_VIRTUAL_TYPE, STORE_STRUCT_RETURN) (EXTRACT_RETURN_VALUE, STORE_RETURN_VALUE, CALL_DUMMY_WORDS) (SIZEOF_CALL_DUMMY_WORDS, CALL_DUMMY_START_OFFSET, FIX_CALL_DUMMY) (SOFTWARE_SINGLE_STEP_P, SOFTWARE_SINGLE_STEP) (ELF_MAKE_MSYMBOL_SPECIAL, COFF_MAKE_MSYMBOL_SPECIAL) Delete. (arm_pc_is_thumb, arm_pc_is_thumb_dummy, thumb_get_next_pc) (arm_get_next_pc): No-longer static -- these are needed by the RDI interface. * arm-linux-nat.c arm-linux-tdep.c armnbsd-nat.c: Include arm-tdep.h. * remote-rdi.c remote-rdp.c: Likewise. * Makefile.in (arm-linux-nat.o, arm-linux-tdep.o arm-tdep.o) (armnbsd-nat.o, remote-rdi.o, remote_rdp.o): Update dependencies. * config/arm/tm-nbsd.h (SOFTWARE_SINGLE_STEP_P): Delete bogus definition. * arm-tdep.h (ARM_A1_REGNUM, ARM_A4_REGNUM, ARM_AP_REGNUM) (ARM_SP_REGNUM, ARM_LR_REGNUM, ARM_PC_REGNUM, ARM_F0_REGNUM) (ARM_F3_REGNUM, ARM_F7_REGNUM, ARM_FPS_REGNUM, ARM_PS_REGNUM): Renamed from non-ARM_ prefixed definitions. * arm-tdep.c armnbsd-nat.c arm-linux-nat.c arm-linux-tdep.c: Update all uses of above. * remote-rdi.c remote-rdp.c: Likewise. * arm-linux-nat.c (ARM_CPSR_REGNUM): Renamed from CPSR_REGNUM.
-rw-r--r--gdb/remote-rdi.c15
-rw-r--r--gdb/remote-rdp.c22
2 files changed, 20 insertions, 17 deletions
diff --git a/gdb/remote-rdi.c b/gdb/remote-rdi.c
index c707eb2..db51dcb 100644
--- a/gdb/remote-rdi.c
+++ b/gdb/remote-rdi.c
@@ -36,6 +36,7 @@
#include "breakpoint.h"
#include "completer.h"
#include "regcache.h"
+#include "arm-tdep.h"
#ifdef USG
#include <sys/types.h>
@@ -470,7 +471,7 @@ arm_rdi_resume (ptid_t ptid, int step, enum target_signal siggnal)
if (step)
{
- pc = read_register (PC_REGNUM);
+ pc = read_register (ARM_PC_REGNUM);
pc = arm_get_next_pc (pc);
arm_rdi_insert_breakpoint (pc, handle);
}
@@ -551,14 +552,14 @@ arm_rdi_fetch_registers (int regno)
supply_register (regno, (char *) cookedreg);
}
store_unsigned_integer (cookedreg, 4, rawregs[15]);
- supply_register (PS_REGNUM, (char *) cookedreg);
- arm_rdi_fetch_registers (PC_REGNUM);
+ supply_register (ARM_PS_REGNUM, (char *) cookedreg);
+ arm_rdi_fetch_registers (ARM_PC_REGNUM);
}
else
{
- if (regno == PC_REGNUM)
+ if (regno == ARM_PC_REGNUM)
rdi_regmask = RDIReg_PC;
- else if (regno == PS_REGNUM)
+ else if (regno == ARM_PS_REGNUM)
rdi_regmask = RDIReg_CPSR;
else if (regno < 0 || regno > 15)
{
@@ -607,9 +608,9 @@ arm_rdi_store_registers (int regno)
/* RDI manipulates data in host byte order, so convert now. */
store_unsigned_integer (rawerreg, 4, rawreg[0]);
- if (regno == PC_REGNUM)
+ if (regno == ARM_PC_REGNUM)
rdi_regmask = RDIReg_PC;
- else if (regno == PS_REGNUM)
+ else if (regno == ARM_PS_REGNUM)
rdi_regmask = RDIReg_CPSR;
else if (regno < 0 || regno > 15)
return;
diff --git a/gdb/remote-rdp.c b/gdb/remote-rdp.c
index bb602cd..2f9183a 100644
--- a/gdb/remote-rdp.c
+++ b/gdb/remote-rdp.c
@@ -52,6 +52,8 @@
#include "regcache.h"
#include "serial.h"
+#include "arm-tdep.h"
+
#ifdef HAVE_TIME_H
#include <time.h>
#endif
@@ -613,14 +615,14 @@ remote_rdp_fetch_register (int regno)
char buf[MAX_REGISTER_RAW_SIZE];
if (regno < 15)
rdp_fetch_one_register (1 << regno, buf);
- else if (regno == PC_REGNUM)
+ else if (regno == ARM_PC_REGNUM)
rdp_fetch_one_register (RDP_CPU_READWRITE_MASK_PC, buf);
- else if (regno == PS_REGNUM)
+ else if (regno == ARM_PS_REGNUM)
rdp_fetch_one_register (RDP_CPU_READWRITE_MASK_CPSR, buf);
- else if (regno == FPS_REGNUM)
+ else if (regno == ARM_FPS_REGNUM)
rdp_fetch_one_fpu_register (RDP_FPU_READWRITE_MASK_FPS, buf);
- else if (regno >= F0_REGNUM && regno <= F7_REGNUM)
- rdp_fetch_one_fpu_register (1 << (regno - F0_REGNUM), buf);
+ else if (regno >= ARM_F0_REGNUM && regno <= ARM_F7_REGNUM)
+ rdp_fetch_one_fpu_register (1 << (regno - ARM_F0_REGNUM), buf);
else
{
printf ("Help me with fetch reg %d\n", regno);
@@ -644,12 +646,12 @@ remote_rdp_store_register (int regno)
read_register_gen (regno, tmp);
if (regno < 15)
rdp_store_one_register (1 << regno, tmp);
- else if (regno == PC_REGNUM)
+ else if (regno == ARM_PC_REGNUM)
rdp_store_one_register (RDP_CPU_READWRITE_MASK_PC, tmp);
- else if (regno == PS_REGNUM)
+ else if (regno == ARM_PS_REGNUM)
rdp_store_one_register (RDP_CPU_READWRITE_MASK_CPSR, tmp);
- else if (regno >= F0_REGNUM && regno <= F7_REGNUM)
- rdp_store_one_fpu_register (1 << (regno - F0_REGNUM), tmp);
+ else if (regno >= ARM_F0_REGNUM && regno <= ARM_F7_REGNUM)
+ rdp_store_one_fpu_register (1 << (regno - ARM_F0_REGNUM), tmp);
else
{
printf ("Help me with reg %d\n", regno);
@@ -1092,7 +1094,7 @@ rdp_step (void)
else
{
char handle[4];
- CORE_ADDR pc = read_register (PC_REGNUM);
+ CORE_ADDR pc = read_register (ARM_PC_REGNUM);
pc = arm_get_next_pc (pc);
remote_rdp_insert_breakpoint (pc, handle);
rdp_execute ();