diff options
| author | Ulrich Weigand <uweigand@de.ibm.com> | 2007-05-31 17:32:22 +0000 |
|---|---|---|
| committer | Ulrich Weigand <uweigand@de.ibm.com> | 2007-05-31 17:32:22 +0000 |
| commit | f57d151a994d668d681871f04cfd6e32a1c5ac33 (patch) | |
| tree | 9e7e24aadc1cc3a59415b6d719d724f3cd70fd28 | |
| parent | 8d4c1ba398fa8961059e66d57d0a85c9901d8ebd (diff) | |
| download | gdb-f57d151a994d668d681871f04cfd6e32a1c5ac33.zip gdb-f57d151a994d668d681871f04cfd6e32a1c5ac33.tar.gz gdb-f57d151a994d668d681871f04cfd6e32a1c5ac33.tar.bz2 | |
2007-05-31 Markus Deuling <deuling@de.ibm.com>
* gdbarch.sh (NUM_REGS): Replace by gdbarch_num_regs.
* i386-tdep.c (i386_dbx_reg_to_regnum)
(i386_svr4_reg_to_regnum): Likewise.
* inf-ptrace.c (inf_ptrace_fetch_registers)
(inf_ptrace_store_registers): Likewise.
* corelow.c (get_core_registers): Likewise.
* i386-linux-nat.c (supply_gregset, fill_gregset)
(i386_linux_fetch_inferior_registers)
(i386_linux_store_inferior_registers): Likewise.
* remote.c (init_remote_state,packet_reg_from_regnum)
(packet_reg_from_pnum,process_g_packet,remote_fetch_registers)
(remote_prepare_to_store,store_registers_using_G)
(remote_store_registers,remote_arch_state): Likewise.
* tracepoint.c (encode_actions): Likewise.
* mi/mi-main.c (mi_cmd_data_list_register_names)
(mi_cmd_data_list_changed_registers,mi_cmd_data_list_register_values)
(mi_cmd_data_write_register_values): Likewise.
* tui/tui-regs.c (tui_show_register_group)
(tui_show_register_group): Likewise.
* xtensa-tdep.h (FP_ALIAS): Likewise.
* xtensa-tdep.c (xtensa_register_name,xtensa_register_type)
(xtensa_reg_to_regnum,xtensa_pseudo_register_read)
(xtensa_pseudo_register_write,xtensa_register_reggroup_p): Likewise.
* win32-nat.c (do_win32_fetch_inferior_registers)
(do_win32_store_inferior_registers,fetch_elf_core_registers
* user-regs.h: Likewise (comment).
* user-regs.c (user_reg, user_reg_map_name_to_regnum): Likewise.
* trad-frame.c (trad_frame_alloc_saved_regs): Likewise.
* target-descriptions.h: Likewise (comment).
* target-descriptions.c (tdesc_use_registers): Likewise (comment).
* target.c (debug_print_register): Likewise.
* stack.c (frame_info): Likewise.
* stabsread.c (define_symbol): Likewise.
* sh64-tdep.c (sh64_do_pseudo_register,sh64_print_register)
(sh64_media_print_registers_info)
(sh64_compact_print_registers_info): Likewise.
* rs6000-tdep.c (rs6000_register_sim_regno): Likewise.
* rs6000-nat.c (fetch_register,store_register): Likewise.
* remote-sim.c (one2one_register_sim_regno,gdbsim_fetch_register)
(gdbsim_fetch_register,gdbsim_store_register): Likewise.
* remote-mips.c (mips_fetch_registers,mips_store_registers): Likewise.
* remote-m32r-sdi.c (m32r_fetch_registers)
(m32r_store_registers): Likewise.
* reggroups.c (default_register_reggroup_p): Likewise.
* regcache.c (init_regcache_descr,register_size,regcache,regcache_save)
(regcache_restore,regcache_dump): Likewise.
* monitor.c (monitor_fetch_registers,monitor_store_registers): Likewise.
* mips-tdep.c (mips_xfer_register,mips_register_name)
(mips_register_reggroup_p,mips_pseudo_register_read)
(mips_pseudo_register_write,mips_convert_register_p,mips_register_type)
(mips_unwind_pc,mips_unwind_sp,mips_unwind_dummy_id,set_reg_offset)
(mips16_scan_prologue,mips_insn16_frame_cache,reset_saved_regs)
(mips32_scan_prologue,mips_insn32_frame_cache,read_next_frame_reg)
(mips_n32n64_return_value,mips_o32_return_value,mips_o64_return_value)
(print_gp_register_row,mips_print_registers_info)
(mips_stab_reg_to_regnum,mips_dwarf_dwarf2_ecoff_reg_to_regnum)
(mips_register_sim_regno): Likewise.
* mips-linux-tdep.c (mips_linux_o32_sigframe_init)
(mips_linux_n32n64_sigframe_init): Likewise.
* mips-linux-nat.c (mips_linux_register_addr)
(mips64_linux_register_addr): Likewise.
* findvar.c (value_of_register): Likewise.
* infcmd.c (default_print_registers_info,registers_info)
(print_vector_info,print_float_info): Likewise.
* mips64obsd-tdep.c (mips64obsd_sigframe_init): Likewise.
* inf-child.c (inf_child_fetch_inferior_registers): Likewise.
* m68k-tdep.c (m68k_dwarf_reg_to_regnum): Likewise.
* m68hc11-tdep.c (m68hc11_frame_unwind_cache(: Likewise.
* m32r-tdep.c (m32r_frame_unwind_cache): Likewise.
* ia64-linux-nat.c (ia64_register_addr,ia64_cannot_fetch_register)
(ia64_cannot_store_register,ia64_linux_fetch_registers)
(ia64_linux_store_registers): Likewise.
* hpux-thread.c (hpux_thread_fetch_registers)
(hpux_thread_store_registers): Likewise.
* h8300-tdep.c (E_PSEUDO_CCR_REGNUM,E_PSEUDO_EXR_REGNUM)
(h8300_init_frame_cache,h8300_frame_cache,h8300_frame_prev_register)
(h8300_register_type): Likewise.
* dwarf2-frame.c (dwarf2_frame_cache)
(dwarf2_frame_state_alloc_regs): Likewise.
* cris-tdep.c (cris_register_size,cris_cannot_fetch_register)
(cris_cannot_store_register,crisv32_cannot_fetch_register)
(crisv32_cannot_store_register,cris_register_name): Likewise.
* avr-tdep.c (avr_frame_unwind_cache): Likewise.
* arch-utils.c (legacy_register_sim_regno)
(legacy_virtual_frame_pointer): Likewise.
* arm-tdep.c (arm_make_prologue_cache,arm_register_sim_regno):Likewise.
* arm-tdep.h: Likewise (comment).
* frv-tdep.c (frv_register_sim_regno): Likewise.
* m68klinux-nat.c (old_fetch_inferior_registers)
(old_store_inferior_registers): Likewise.
* m32c-tdep.c (m32c_virtual_frame_pointer): Likewise.
* irix5-nat.c (fetch_core_registers): Likewise.
* hppa-tdep.c (hppa_frame_cache): Likewise.
* hppa-linux-nat.c (hppa_linux_register_addr)
(hppa_linux_fetch_inferior_registers)
(hppa_linux_store_inferior_registers): Likewise.
* hppa-hpux-nat.c (hppa_hpux_fetch_inferior_registers)
(hppa_hpux_store_inferior_registers): Likewise.
* amd64-nat.c (amd64_native_gregset_reg_offset)
(amd64_supply_native_gregset,amd64_collect_native_gregset): Likewise.
* dbug-rom.c (dbug_regname): Likewise.
* m68hc11-tdep.c (m68hc11_frame_unwind_cache)
(HARD_PAGE_REGNUM (comment)): Likewise.
* gdbarch.sh (NUM_PSEUDO_REGS): Replace by gdbarch_num_pseudo_regs.
* i386-tdep.c (i386_dbx_reg_to_regnum)
(i386_svr4_reg_to_regnum): Likewise.
* mi/mi-main.c (mi_cmd_data_list_register_names)
(mi_cmd_data_list_changed_registers,mi_cmd_data_list_register_values)
(mi_cmd_data_write_register_values): Likewise.
* gdbarch.c, gdbarch.h: Regenerate.
* tui/tui-regs.c (tui_show_register_group): Likewise.
* xtensa-tdep.h (FP_ALIAS): Likewise.
* user-regs.h: Likewise (comment).
* user-regs.c (user_reg, user_reg_map_name_to_regnum): Likewise.
* trad-frame.c (trad_frame_alloc_saved_regs): Likewise.
* target-descriptions.h: Likewise (comment).
* target.c (debug_print_register): Likewise.
* stack.c (frame_info): Likewise.
* stabsread.c (define_symbol): Likewise.
* sh64-tdep.c (sh64_print_register,sh64_media_print_registers_info)
(sh64_compact_print_registers_info): Likewise.
* rs6000-tdep.c (rs6000_register_sim_regno): Likewise.
* regcache.c (init_regcache_descr,register_size,regcache,regcache_save
(regcache_restore,regcache_dump): Likewise.
* mips-tdep.c (print_gp_register_row,mips_print_registers_info)
(mips_dwarf_dwarf2_ecoff_reg_to_regnum)
(mips_stab_reg_to_regnum): Likewise.
* findvar.c (value_of_register): Likewise.
* infcmd.c (default_print_registers_info,registers_info)
(print_vector_info,print_float_info): Likewise.
* m68k-tdep.c (m68k_dwarf_reg_to_regnum): Likewise.
* h8300-tdep.c (h8300_register_type): Likewise.
* dwarf2-frame.c (dwarf2_frame_cache): Likewise.
* frame.h (SIZEOF_FRAME_SAVED_REGS): Likewise.
* xtensa-tdep.c (xtensa_register_type,xtensa_reg_to_regnum)
(xtensa_pseudo_register_read,xtensa_pseudo_register_write): Likewise.
* parse.c: Remove comment.
* gdbarch.c, gdbarch.h: Regenerate
63 files changed, 597 insertions, 303 deletions
diff --git a/gdb/ChangeLog b/gdb/ChangeLog index df9bfcea..7b8f33b 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,5 +1,146 @@ 2007-05-31 Markus Deuling <deuling@de.ibm.com> + * gdbarch.sh (NUM_REGS): Replace by gdbarch_num_regs. + * i386-tdep.c (i386_dbx_reg_to_regnum) + (i386_svr4_reg_to_regnum): Likewise. + * inf-ptrace.c (inf_ptrace_fetch_registers) + (inf_ptrace_store_registers): Likewise. + * corelow.c (get_core_registers): Likewise. + * i386-linux-nat.c (supply_gregset, fill_gregset) + (i386_linux_fetch_inferior_registers) + (i386_linux_store_inferior_registers): Likewise. + * remote.c (init_remote_state,packet_reg_from_regnum) + (packet_reg_from_pnum,process_g_packet,remote_fetch_registers) + (remote_prepare_to_store,store_registers_using_G) + (remote_store_registers,remote_arch_state): Likewise. + * tracepoint.c (encode_actions): Likewise. + * mi/mi-main.c (mi_cmd_data_list_register_names) + (mi_cmd_data_list_changed_registers,mi_cmd_data_list_register_values) + (mi_cmd_data_write_register_values): Likewise. + * tui/tui-regs.c (tui_show_register_group) + (tui_show_register_group): Likewise. + * xtensa-tdep.h (FP_ALIAS): Likewise. + * xtensa-tdep.c (xtensa_register_name,xtensa_register_type) + (xtensa_reg_to_regnum,xtensa_pseudo_register_read) + (xtensa_pseudo_register_write,xtensa_register_reggroup_p): Likewise. + * win32-nat.c (do_win32_fetch_inferior_registers) + (do_win32_store_inferior_registers,fetch_elf_core_registers + * user-regs.h: Likewise (comment). + * user-regs.c (user_reg, user_reg_map_name_to_regnum): Likewise. + * trad-frame.c (trad_frame_alloc_saved_regs): Likewise. + * target-descriptions.h: Likewise (comment). + * target-descriptions.c (tdesc_use_registers): Likewise (comment). + * target.c (debug_print_register): Likewise. + * stack.c (frame_info): Likewise. + * stabsread.c (define_symbol): Likewise. + * sh64-tdep.c (sh64_do_pseudo_register,sh64_print_register) + (sh64_media_print_registers_info) + (sh64_compact_print_registers_info): Likewise. + * rs6000-tdep.c (rs6000_register_sim_regno): Likewise. + * rs6000-nat.c (fetch_register,store_register): Likewise. + * remote-sim.c (one2one_register_sim_regno,gdbsim_fetch_register) + (gdbsim_fetch_register,gdbsim_store_register): Likewise. + * remote-mips.c (mips_fetch_registers,mips_store_registers): Likewise. + * remote-m32r-sdi.c (m32r_fetch_registers) + (m32r_store_registers): Likewise. + * reggroups.c (default_register_reggroup_p): Likewise. + * regcache.c (init_regcache_descr,register_size,regcache,regcache_save) + (regcache_restore,regcache_dump): Likewise. + * monitor.c (monitor_fetch_registers,monitor_store_registers): Likewise. + * mips-tdep.c (mips_xfer_register,mips_register_name) + (mips_register_reggroup_p,mips_pseudo_register_read) + (mips_pseudo_register_write,mips_convert_register_p,mips_register_type) + (mips_unwind_pc,mips_unwind_sp,mips_unwind_dummy_id,set_reg_offset) + (mips16_scan_prologue,mips_insn16_frame_cache,reset_saved_regs) + (mips32_scan_prologue,mips_insn32_frame_cache,read_next_frame_reg) + (mips_n32n64_return_value,mips_o32_return_value,mips_o64_return_value) + (print_gp_register_row,mips_print_registers_info) + (mips_stab_reg_to_regnum,mips_dwarf_dwarf2_ecoff_reg_to_regnum) + (mips_register_sim_regno): Likewise. + * mips-linux-tdep.c (mips_linux_o32_sigframe_init) + (mips_linux_n32n64_sigframe_init): Likewise. + * mips-linux-nat.c (mips_linux_register_addr) + (mips64_linux_register_addr): Likewise. + * findvar.c (value_of_register): Likewise. + * infcmd.c (default_print_registers_info,registers_info) + (print_vector_info,print_float_info): Likewise. + * mips64obsd-tdep.c (mips64obsd_sigframe_init): Likewise. + * inf-child.c (inf_child_fetch_inferior_registers): Likewise. + * m68k-tdep.c (m68k_dwarf_reg_to_regnum): Likewise. + * m68hc11-tdep.c (m68hc11_frame_unwind_cache(: Likewise. + * m32r-tdep.c (m32r_frame_unwind_cache): Likewise. + * ia64-linux-nat.c (ia64_register_addr,ia64_cannot_fetch_register) + (ia64_cannot_store_register,ia64_linux_fetch_registers) + (ia64_linux_store_registers): Likewise. + * hpux-thread.c (hpux_thread_fetch_registers) + (hpux_thread_store_registers): Likewise. + * h8300-tdep.c (E_PSEUDO_CCR_REGNUM,E_PSEUDO_EXR_REGNUM) + (h8300_init_frame_cache,h8300_frame_cache,h8300_frame_prev_register) + (h8300_register_type): Likewise. + * dwarf2-frame.c (dwarf2_frame_cache) + (dwarf2_frame_state_alloc_regs): Likewise. + * cris-tdep.c (cris_register_size,cris_cannot_fetch_register) + (cris_cannot_store_register,crisv32_cannot_fetch_register) + (crisv32_cannot_store_register,cris_register_name): Likewise. + * avr-tdep.c (avr_frame_unwind_cache): Likewise. + * arch-utils.c (legacy_register_sim_regno) + (legacy_virtual_frame_pointer): Likewise. + * arm-tdep.c (arm_make_prologue_cache,arm_register_sim_regno):Likewise. + * arm-tdep.h: Likewise (comment). + * frv-tdep.c (frv_register_sim_regno): Likewise. + * m68klinux-nat.c (old_fetch_inferior_registers) + (old_store_inferior_registers): Likewise. + * m32c-tdep.c (m32c_virtual_frame_pointer): Likewise. + * irix5-nat.c (fetch_core_registers): Likewise. + * hppa-tdep.c (hppa_frame_cache): Likewise. + * hppa-linux-nat.c (hppa_linux_register_addr) + (hppa_linux_fetch_inferior_registers) + (hppa_linux_store_inferior_registers): Likewise. + * hppa-hpux-nat.c (hppa_hpux_fetch_inferior_registers) + (hppa_hpux_store_inferior_registers): Likewise. + * amd64-nat.c (amd64_native_gregset_reg_offset) + (amd64_supply_native_gregset,amd64_collect_native_gregset): Likewise. + * dbug-rom.c (dbug_regname): Likewise. + * m68hc11-tdep.c (m68hc11_frame_unwind_cache) + (HARD_PAGE_REGNUM (comment)): Likewise. + * gdbarch.sh (NUM_PSEUDO_REGS): Replace by gdbarch_num_pseudo_regs. + * i386-tdep.c (i386_dbx_reg_to_regnum) + (i386_svr4_reg_to_regnum): Likewise. + * mi/mi-main.c (mi_cmd_data_list_register_names) + (mi_cmd_data_list_changed_registers,mi_cmd_data_list_register_values) + (mi_cmd_data_write_register_values): Likewise. + * gdbarch.c, gdbarch.h: Regenerate. + * tui/tui-regs.c (tui_show_register_group): Likewise. + * xtensa-tdep.h (FP_ALIAS): Likewise. + * user-regs.h: Likewise (comment). + * user-regs.c (user_reg, user_reg_map_name_to_regnum): Likewise. + * trad-frame.c (trad_frame_alloc_saved_regs): Likewise. + * target-descriptions.h: Likewise (comment). + * target.c (debug_print_register): Likewise. + * stack.c (frame_info): Likewise. + * stabsread.c (define_symbol): Likewise. + * sh64-tdep.c (sh64_print_register,sh64_media_print_registers_info) + (sh64_compact_print_registers_info): Likewise. + * rs6000-tdep.c (rs6000_register_sim_regno): Likewise. + * regcache.c (init_regcache_descr,register_size,regcache,regcache_save + (regcache_restore,regcache_dump): Likewise. + * mips-tdep.c (print_gp_register_row,mips_print_registers_info) + (mips_dwarf_dwarf2_ecoff_reg_to_regnum) + (mips_stab_reg_to_regnum): Likewise. + * findvar.c (value_of_register): Likewise. + * infcmd.c (default_print_registers_info,registers_info) + (print_vector_info,print_float_info): Likewise. + * m68k-tdep.c (m68k_dwarf_reg_to_regnum): Likewise. + * h8300-tdep.c (h8300_register_type): Likewise. + * dwarf2-frame.c (dwarf2_frame_cache): Likewise. + * frame.h (SIZEOF_FRAME_SAVED_REGS): Likewise. + * xtensa-tdep.c (xtensa_register_type,xtensa_reg_to_regnum) + (xtensa_pseudo_register_read,xtensa_pseudo_register_write): Likewise. + * parse.c: Remove comment. + * gdbarch.c, gdbarch.h: Regenerate + +2007-05-31 Markus Deuling <deuling@de.ibm.com> + * gdbarch.sh (CANNOT_FETCH_REGISTER): Replace by gdbarch_cannot_fetch_register. * alpha-nat.c (fetch_osf_core_registers): Likewise. diff --git a/gdb/amd64-nat.c b/gdb/amd64-nat.c index 6663267..ca7b468 100644 --- a/gdb/amd64-nat.c +++ b/gdb/amd64-nat.c @@ -66,10 +66,10 @@ amd64_native_gregset_reg_offset (int regnum) num_regs = amd64_native_gregset32_num_regs; } - if (num_regs > NUM_REGS) - num_regs = NUM_REGS; + if (num_regs > gdbarch_num_regs (current_gdbarch)) + num_regs = gdbarch_num_regs (current_gdbarch); - if (regnum < num_regs && regnum < NUM_REGS) + if (regnum < num_regs && regnum < gdbarch_num_regs (current_gdbarch)) return reg_offset[regnum]; return -1; @@ -100,8 +100,8 @@ amd64_supply_native_gregset (struct regcache *regcache, if (gdbarch_ptr_bit (gdbarch) == 32) num_regs = amd64_native_gregset32_num_regs; - if (num_regs > NUM_REGS) - num_regs = NUM_REGS; + if (num_regs > gdbarch_num_regs (current_gdbarch)) + num_regs = gdbarch_num_regs (current_gdbarch); for (i = 0; i < num_regs; i++) { @@ -147,8 +147,8 @@ amd64_collect_native_gregset (const struct regcache *regcache, } } - if (num_regs > NUM_REGS) - num_regs = NUM_REGS; + if (num_regs > gdbarch_num_regs (current_gdbarch)) + num_regs = gdbarch_num_regs (current_gdbarch); for (i = 0; i < num_regs; i++) { diff --git a/gdb/arch-utils.c b/gdb/arch-utils.c index ee9fbfb..e267457 100644 --- a/gdb/arch-utils.c +++ b/gdb/arch-utils.c @@ -83,7 +83,7 @@ int legacy_register_sim_regno (int regnum) { /* Only makes sense to supply raw registers. */ - gdb_assert (regnum >= 0 && regnum < NUM_REGS); + gdb_assert (regnum >= 0 && regnum < gdbarch_num_regs (current_gdbarch)); /* NOTE: cagney/2002-05-13: The old code did it this way and it is suspected that some GDB/SIM combinations may rely on this behavour. The default should be one2one_register_sim_regno @@ -186,9 +186,10 @@ legacy_virtual_frame_pointer (CORE_ADDR pc, register and an offset can determine this. I think it should instead generate a byte code expression as that would work better with things like Dwarf2's CFI. */ - if (DEPRECATED_FP_REGNUM >= 0 && DEPRECATED_FP_REGNUM < NUM_REGS) + if (DEPRECATED_FP_REGNUM >= 0 + && DEPRECATED_FP_REGNUM < gdbarch_num_regs (current_gdbarch)) *frame_regnum = DEPRECATED_FP_REGNUM; - else if (SP_REGNUM >= 0 && SP_REGNUM < NUM_REGS) + else if (SP_REGNUM >= 0 && SP_REGNUM < gdbarch_num_regs (current_gdbarch)) *frame_regnum = SP_REGNUM; else /* Should this be an internal error? I guess so, it is reflecting diff --git a/gdb/arm-tdep.c b/gdb/arm-tdep.c index 2cfb5c0..38d5015 100644 --- a/gdb/arm-tdep.c +++ b/gdb/arm-tdep.c @@ -908,7 +908,7 @@ arm_make_prologue_cache (struct frame_info *next_frame) /* Calculate actual addresses of saved registers using offsets determined by arm_scan_prologue. */ - for (reg = 0; reg < NUM_REGS; reg++) + for (reg = 0; reg < gdbarch_num_regs (current_gdbarch); reg++) if (trad_frame_addr_p (cache->saved_regs, reg)) cache->saved_regs[reg].addr += cache->prev_sp; @@ -1434,7 +1434,7 @@ static int arm_register_sim_regno (int regnum) { int reg = regnum; - gdb_assert (reg >= 0 && reg < NUM_REGS); + gdb_assert (reg >= 0 && reg < gdbarch_num_regs (current_gdbarch)); if (regnum >= ARM_WR0_REGNUM && regnum <= ARM_WR15_REGNUM) return regnum - ARM_WR0_REGNUM + SIM_ARM_IWMMXT_COP0R0_REGNUM; diff --git a/gdb/arm-tdep.h b/gdb/arm-tdep.h index 29f2328..46894ab 100644 --- a/gdb/arm-tdep.h +++ b/gdb/arm-tdep.h @@ -74,7 +74,7 @@ enum gdb_regnum { #define STATUS_REGISTER_SIZE 4 /* Number of machine registers. The only define actually required - is NUM_REGS. The other definitions are used for documentation + is gdbarch_num_regs. The other definitions are used for documentation purposes and code readability. */ /* For 26 bit ARM code, a fake copy of the PC is placed in register 25 (PS) (and called PS for processor status) so the status bits can be cleared diff --git a/gdb/avr-tdep.c b/gdb/avr-tdep.c index d072459..963a859 100644 --- a/gdb/avr-tdep.c +++ b/gdb/avr-tdep.c @@ -903,7 +903,7 @@ avr_frame_unwind_cache (struct frame_info *next_frame, /* Adjust all the saved registers so that they contain addresses and not offsets. */ - for (i = 0; i < NUM_REGS - 1; i++) + for (i = 0; i < gdbarch_num_regs (current_gdbarch) - 1; i++) if (info->saved_regs[i].addr) { info->saved_regs[i].addr = (info->prev_sp - info->saved_regs[i].addr); diff --git a/gdb/corelow.c b/gdb/corelow.c index 7be9655..82e6d7d 100644 --- a/gdb/corelow.c +++ b/gdb/corelow.c @@ -503,7 +503,7 @@ get_core_registers (struct regcache *regcache, int regno) ".reg-xfp", 3, "extended floating-point", 0); /* Supply dummy value for all registers not found in the core. */ - for (i = 0; i < NUM_REGS; i++) + for (i = 0; i < gdbarch_num_regs (current_gdbarch); i++) if (!regcache_valid_p (regcache, i)) regcache_raw_supply (regcache, i, NULL); } diff --git a/gdb/cris-tdep.c b/gdb/cris-tdep.c index aaeeee8..1eb214a 100644 --- a/gdb/cris-tdep.c +++ b/gdb/cris-tdep.c @@ -1549,7 +1549,7 @@ cris_register_size (int regno) /* Special register not applicable to this CRIS version. */ return 0; } - else if (regno >= PC_REGNUM && regno < NUM_REGS) + else if (regno >= PC_REGNUM && regno < gdbarch_num_regs (current_gdbarch)) { /* This will apply to CRISv32 only where there are additional registers after the special registers (pseudo PC and support registers). */ @@ -1566,7 +1566,7 @@ cris_register_size (int regno) static int cris_cannot_fetch_register (int regno) { - return ((regno < 0 || regno >= NUM_REGS) + return ((regno < 0 || regno >= gdbarch_num_regs (current_gdbarch)) || (cris_register_size (regno) == 0)); } @@ -1582,7 +1582,9 @@ cris_cannot_store_register (int regno) 3. Those registers to which a write has no effect. */ - if (regno < 0 || regno >= NUM_REGS || cris_register_size (regno) == 0) + if (regno < 0 + || regno >= gdbarch_num_regs (current_gdbarch) + || cris_register_size (regno) == 0) /* Not implemented. */ return 1; @@ -1606,7 +1608,7 @@ cris_cannot_store_register (int regno) static int crisv32_cannot_fetch_register (int regno) { - return ((regno < 0 || regno >= NUM_REGS) + return ((regno < 0 || regno >= gdbarch_num_regs (current_gdbarch)) || (cris_register_size (regno) == 0)); } @@ -1622,7 +1624,9 @@ crisv32_cannot_store_register (int regno) 3. Those registers to which a write has no effect. */ - if (regno < 0 || regno >= NUM_REGS || cris_register_size (regno) == 0) + if (regno < 0 + || regno >= gdbarch_num_regs (current_gdbarch) + || cris_register_size (regno) == 0) /* Not implemented. */ return 1; @@ -1759,7 +1763,7 @@ cris_register_name (int regno) /* General register. */ return cris_genreg_names[regno]; } - else if (regno >= NUM_GENREGS && regno < NUM_REGS) + else if (regno >= NUM_GENREGS && regno < gdbarch_num_regs (current_gdbarch)) { return cris_special_register_name (regno); } diff --git a/gdb/dbug-rom.c b/gdb/dbug-rom.c index c4f0ef0..298a28b 100644 --- a/gdb/dbug-rom.c +++ b/gdb/dbug-rom.c @@ -92,7 +92,7 @@ dbug_regname (int index) }; if ((index >= (sizeof (regnames) / sizeof (regnames[0]))) - || (index < 0) || (index >= NUM_REGS)) + || (index < 0) || (index >= gdbarch_num_regs (current_gdbarch))) return NULL; else return regnames[index]; diff --git a/gdb/dwarf2-frame.c b/gdb/dwarf2-frame.c index b1c56eb..116da31 100644 --- a/gdb/dwarf2-frame.c +++ b/gdb/dwarf2-frame.c @@ -163,7 +163,7 @@ struct dwarf2_frame_state which is unused in that case. */ #define cfa_exp_len cfa_reg -/* Assert that the register set RS is large enough to store NUM_REGS +/* Assert that the register set RS is large enough to store gdbarch_num_regs columns. If necessary, enlarge the register set. */ static void @@ -808,7 +808,8 @@ dwarf2_frame_cache (struct frame_info *next_frame, void **this_cache) { struct cleanup *old_chain; struct gdbarch *gdbarch = get_frame_arch (next_frame); - const int num_regs = NUM_REGS + NUM_PSEUDO_REGS; + const int num_regs = gdbarch_num_regs (current_gdbarch) + + gdbarch_num_pseudo_regs (current_gdbarch); struct dwarf2_frame_cache *cache; struct dwarf2_frame_state *fs; struct dwarf2_fde *fde; @@ -900,7 +901,7 @@ dwarf2_frame_cache (struct frame_info *next_frame, void **this_cache) correspond to a real register. If it doesn't correspond to a real register, or if we shouldn't treat it as such, DWARF2_REG_TO_REGNUM should be defined to return a number outside - the range [0, NUM_REGS). */ + the range [0, gdbarch_num_regs). */ { int column; /* CFI speak for "register number". */ diff --git a/gdb/findvar.c b/gdb/findvar.c index 1414852..437ec2d 100644 --- a/gdb/findvar.c +++ b/gdb/findvar.c @@ -264,7 +264,8 @@ value_of_register (int regnum, struct frame_info *frame) /* User registers lie completely outside of the range of normal registers. Catch them early so that the target never sees them. */ - if (regnum >= NUM_REGS + NUM_PSEUDO_REGS) + if (regnum >= gdbarch_num_regs (current_gdbarch) + + gdbarch_num_pseudo_regs (current_gdbarch)) return value_of_user_reg (regnum, frame); frame_register (frame, regnum, &optim, &lval, &addr, &realnum, raw_buffer); diff --git a/gdb/frame.h b/gdb/frame.h index 5181855..b29370a 100644 --- a/gdb/frame.h +++ b/gdb/frame.h @@ -583,7 +583,8 @@ enum print_what #error "SIZEOF_FRAME_SAVED_REGS can not be re-defined" #endif #define SIZEOF_FRAME_SAVED_REGS \ - (sizeof (CORE_ADDR) * (NUM_REGS+NUM_PSEUDO_REGS)) + (sizeof (CORE_ADDR) * (gdbarch_num_regs (current_gdbarch)\ + + gdbarch_num_pseudo_regs (current_gdbarch))) /* Allocate zero initialized memory from the frame cache obstack. Appendices to the frame info (such as the unwind cache) should diff --git a/gdb/frv-tdep.c b/gdb/frv-tdep.c index cdb7882..e21b3ec 100644 --- a/gdb/frv-tdep.c +++ b/gdb/frv-tdep.c @@ -394,7 +394,7 @@ frv_register_sim_regno (int reg) H_SPR_FNER1, /* fner1_regnum */ }; - gdb_assert (reg >= 0 && reg < NUM_REGS); + gdb_assert (reg >= 0 && reg < gdbarch_num_regs (current_gdbarch)); if (first_gpr_regnum <= reg && reg <= last_gpr_regnum) return reg - first_gpr_regnum + SIM_FRV_GR0_REGNUM; diff --git a/gdb/gdbarch.c b/gdb/gdbarch.c index 58bb2a8..29ba81d 100644 --- a/gdb/gdbarch.c +++ b/gdb/gdbarch.c @@ -1173,19 +1173,9 @@ gdbarch_dump (struct gdbarch *current_gdbarch, struct ui_file *file) fprintf_unfiltered (file, "gdbarch_dump: name_of_malloc = %s\n", NAME_OF_MALLOC); -#ifdef NUM_PSEUDO_REGS - fprintf_unfiltered (file, - "gdbarch_dump: NUM_PSEUDO_REGS # %s\n", - XSTRING (NUM_PSEUDO_REGS)); -#endif fprintf_unfiltered (file, "gdbarch_dump: num_pseudo_regs = %s\n", paddr_d (current_gdbarch->num_pseudo_regs)); -#ifdef NUM_REGS - fprintf_unfiltered (file, - "gdbarch_dump: NUM_REGS # %s\n", - XSTRING (NUM_REGS)); -#endif fprintf_unfiltered (file, "gdbarch_dump: num_regs = %s\n", paddr_d (current_gdbarch->num_regs)); diff --git a/gdb/gdbarch.h b/gdb/gdbarch.h index a30b69a..17ab3be 100644 --- a/gdb/gdbarch.h +++ b/gdb/gdbarch.h @@ -297,12 +297,6 @@ extern void set_gdbarch_pseudo_register_write (struct gdbarch *gdbarch, gdbarch_ extern int gdbarch_num_regs (struct gdbarch *gdbarch); extern void set_gdbarch_num_regs (struct gdbarch *gdbarch, int num_regs); -#if !defined (GDB_TM_FILE) && defined (NUM_REGS) -#error "Non multi-arch definition of NUM_REGS" -#endif -#if !defined (NUM_REGS) -#define NUM_REGS (gdbarch_num_regs (current_gdbarch)) -#endif /* This macro gives the number of pseudo-registers that live in the register namespace but do not get fetched or stored on the target. @@ -311,12 +305,6 @@ extern void set_gdbarch_num_regs (struct gdbarch *gdbarch, int num_regs); extern int gdbarch_num_pseudo_regs (struct gdbarch *gdbarch); extern void set_gdbarch_num_pseudo_regs (struct gdbarch *gdbarch, int num_pseudo_regs); -#if !defined (GDB_TM_FILE) && defined (NUM_PSEUDO_REGS) -#error "Non multi-arch definition of NUM_PSEUDO_REGS" -#endif -#if !defined (NUM_PSEUDO_REGS) -#define NUM_PSEUDO_REGS (gdbarch_num_pseudo_regs (current_gdbarch)) -#endif /* GDB's standard (or well known) register numbers. These can map onto a real register or a pseudo (computed) register or not be defined at diff --git a/gdb/gdbarch.sh b/gdb/gdbarch.sh index 8f2f075..4d5e60a 100755 --- a/gdb/gdbarch.sh +++ b/gdb/gdbarch.sh @@ -429,12 +429,12 @@ f:TARGET_VIRTUAL_FRAME_POINTER:void:virtual_frame_pointer:CORE_ADDR pc, int *fra 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 # -v:=:int:num_regs:::0:-1 +v::int:num_regs:::0:-1 # This macro gives the number of pseudo-registers that live in the # register namespace but do not get fetched or stored on the target. # These pseudo-registers may be aliases for other registers, # combinations of other registers, or they may be computed by GDB. -v:=:int:num_pseudo_regs:::0:0::0 +v::int:num_pseudo_regs:::0:0::0 # GDB's standard (or well known) register numbers. These can map onto # a real register or a pseudo (computed) register or not be defined at diff --git a/gdb/h8300-tdep.c b/gdb/h8300-tdep.c index 8e817b1..df10748 100644 --- a/gdb/h8300-tdep.c +++ b/gdb/h8300-tdep.c @@ -62,8 +62,8 @@ enum gdb_regnum #define H8300_MAX_NUM_REGS 18 -#define E_PSEUDO_CCR_REGNUM (NUM_REGS) -#define E_PSEUDO_EXR_REGNUM (NUM_REGS+1) +#define E_PSEUDO_CCR_REGNUM (gdbarch_num_regs (current_gdbarch)) +#define E_PSEUDO_EXR_REGNUM (gdbarch_num_regs (current_gdbarch)+1) struct h8300_frame_cache { @@ -134,7 +134,7 @@ h8300_init_frame_cache (struct h8300_frame_cache *cache) /* Saved registers. We initialize these to -1 since zero is a valid offset (that's where %fp is supposed to be stored). */ - for (i = 0; i < NUM_REGS; i++) + for (i = 0; i < gdbarch_num_regs (current_gdbarch); i++) cache->saved_regs[i] = -1; } @@ -475,7 +475,7 @@ h8300_frame_cache (struct frame_info *next_frame, void **this_cache) /* Adjust all the saved registers such that they contain addresses instead of offsets. */ - for (i = 0; i < NUM_REGS; i++) + for (i = 0; i < gdbarch_num_regs (current_gdbarch); i++) if (cache->saved_regs[i] != -1) cache->saved_regs[i] = cache->base - cache->saved_regs[i]; @@ -518,7 +518,8 @@ h8300_frame_prev_register (struct frame_info *next_frame, void **this_cache, return; } - if (regnum < NUM_REGS && cache->saved_regs[regnum] != -1) + if (regnum < gdbarch_num_regs (current_gdbarch) + && cache->saved_regs[regnum] != -1) { *optimizedp = 0; *lvalp = lval_memory; @@ -1122,7 +1123,8 @@ h8300_print_registers_info (struct gdbarch *gdbarch, struct ui_file *file, static struct type * h8300_register_type (struct gdbarch *gdbarch, int regno) { - if (regno < 0 || regno >= NUM_REGS + NUM_PSEUDO_REGS) + if (regno < 0 || regno >= gdbarch_num_regs (current_gdbarch) + + gdbarch_num_pseudo_regs (current_gdbarch)) internal_error (__FILE__, __LINE__, "h8300_register_type: illegal register number %d", regno); else diff --git a/gdb/hppa-hpux-nat.c b/gdb/hppa-hpux-nat.c index fcf681c..325bbc0 100644 --- a/gdb/hppa-hpux-nat.c +++ b/gdb/hppa-hpux-nat.c @@ -145,7 +145,7 @@ static void hppa_hpux_fetch_inferior_registers (struct regcache *regcache, int regnum) { if (regnum == -1) - for (regnum = 0; regnum < NUM_REGS; regnum++) + for (regnum = 0; regnum < gdbarch_num_regs (current_gdbarch); regnum++) hppa_hpux_fetch_register (regcache, regnum); else hppa_hpux_fetch_register (regcache, regnum); @@ -215,7 +215,7 @@ static void hppa_hpux_store_inferior_registers (struct regcache *regcache, int regnum) { if (regnum == -1) - for (regnum = 0; regnum < NUM_REGS; regnum++) + for (regnum = 0; regnum < gdbarch_num_regs (current_gdbarch); regnum++) hppa_hpux_store_register (regcache, regnum); else hppa_hpux_store_register (regcache, regnum); diff --git a/gdb/hppa-linux-nat.c b/gdb/hppa-linux-nat.c index daabe3d..c4319a0 100644 --- a/gdb/hppa-linux-nat.c +++ b/gdb/hppa-linux-nat.c @@ -158,7 +158,7 @@ hppa_linux_register_addr (int regno, CORE_ADDR blockend) { CORE_ADDR addr; - if ((unsigned) regno >= NUM_REGS) + if ((unsigned) regno >= gdbarch_num_regs (current_gdbarch)) error (_("Invalid register number %d."), regno); if (u_offsets[regno] == -1) @@ -274,7 +274,7 @@ hppa_linux_fetch_inferior_registers (struct regcache *regcache, int regno) { if (-1 == regno) { - for (regno = 0; regno < NUM_REGS; regno++) + for (regno = 0; regno < gdbarch_num_regs (current_gdbarch); regno++) fetch_register (regcache, regno); } else @@ -292,7 +292,7 @@ hppa_linux_store_inferior_registers (struct regcache *regcache, int regno) { if (-1 == regno) { - for (regno = 0; regno < NUM_REGS; regno++) + for (regno = 0; regno < gdbarch_num_regs (current_gdbarch); regno++) store_register (regcache, regno); } else diff --git a/gdb/hppa-tdep.c b/gdb/hppa-tdep.c index 806651c..8a05c73 100644 --- a/gdb/hppa-tdep.c +++ b/gdb/hppa-tdep.c @@ -2180,7 +2180,7 @@ hppa_frame_cache (struct frame_info *next_frame, void **this_cache) { /* Convert all the offsets into addresses. */ int reg; - for (reg = 0; reg < NUM_REGS; reg++) + for (reg = 0; reg < gdbarch_num_regs (current_gdbarch); reg++) { if (trad_frame_addr_p (cache->saved_regs, reg)) cache->saved_regs[reg].addr += cache->base; diff --git a/gdb/hpux-thread.c b/gdb/hpux-thread.c index 28920ba..1717a25 100644 --- a/gdb/hpux-thread.c +++ b/gdb/hpux-thread.c @@ -275,7 +275,7 @@ hpux_thread_fetch_registers (struct regcache *regcache, int regno) if (regno == -1) { first_regno = 0; - last_regno = NUM_REGS - 1; + last_regno = gdbarch_num_regs (current_gdbarch) - 1; } else { @@ -337,7 +337,7 @@ hpux_thread_store_registers (struct regcache *regcache, int regno) if (regno == -1) { first_regno = 0; - last_regno = NUM_REGS - 1; + last_regno = gdbarch_num_regs (current_gdbarch) - 1; } else { diff --git a/gdb/i386-linux-nat.c b/gdb/i386-linux-nat.c index 3275ccb..ceb8084 100644 --- a/gdb/i386-linux-nat.c +++ b/gdb/i386-linux-nat.c @@ -209,7 +209,7 @@ supply_gregset (struct regcache *regcache, const elf_gregset_t *gregsetp) for (i = 0; i < I386_NUM_GREGS; i++) regcache_raw_supply (regcache, i, regp + regmap[i]); - if (I386_LINUX_ORIG_EAX_REGNUM < NUM_REGS) + if (I386_LINUX_ORIG_EAX_REGNUM < gdbarch_num_regs (current_gdbarch)) regcache_raw_supply (regcache, I386_LINUX_ORIG_EAX_REGNUM, regp + ORIG_EAX); } @@ -230,7 +230,7 @@ fill_gregset (const struct regcache *regcache, regcache_raw_collect (regcache, i, regp + regmap[i]); if ((regno == -1 || regno == I386_LINUX_ORIG_EAX_REGNUM) - && I386_LINUX_ORIG_EAX_REGNUM < NUM_REGS) + && I386_LINUX_ORIG_EAX_REGNUM < gdbarch_num_regs (current_gdbarch)) regcache_raw_collect (regcache, I386_LINUX_ORIG_EAX_REGNUM, regp + ORIG_EAX); } @@ -457,7 +457,7 @@ i386_linux_fetch_inferior_registers (struct regcache *regcache, int regno) { int i; - for (i = 0; i < NUM_REGS; i++) + for (i = 0; i < gdbarch_num_regs (current_gdbarch); i++) if (regno == -1 || regno == i) fetch_register (regcache, i); @@ -529,7 +529,7 @@ i386_linux_store_inferior_registers (struct regcache *regcache, int regno) { int i; - for (i = 0; i < NUM_REGS; i++) + for (i = 0; i < gdbarch_num_regs (current_gdbarch); i++) if (regno == -1 || regno == i) store_register (regcache, i); diff --git a/gdb/i386-tdep.c b/gdb/i386-tdep.c index 32f0e97..c55d840 100644 --- a/gdb/i386-tdep.c +++ b/gdb/i386-tdep.c @@ -201,7 +201,8 @@ i386_dbx_reg_to_regnum (int reg) } /* This will hopefully provoke a warning. */ - return NUM_REGS + NUM_PSEUDO_REGS; + return gdbarch_num_regs (current_gdbarch) + + gdbarch_num_pseudo_regs (current_gdbarch); } /* Convert SVR4 register number REG to the appropriate register number @@ -245,7 +246,8 @@ i386_svr4_reg_to_regnum (int reg) } /* This will hopefully provoke a warning. */ - return NUM_REGS + NUM_PSEUDO_REGS; + return gdbarch_num_regs (current_gdbarch) + + gdbarch_num_pseudo_regs (current_gdbarch); } #undef I387_ST0_REGNUM diff --git a/gdb/ia64-linux-nat.c b/gdb/ia64-linux-nat.c index ff2d61c..418b171 100644 --- a/gdb/ia64-linux-nat.c +++ b/gdb/ia64-linux-nat.c @@ -308,7 +308,7 @@ ia64_register_addr (int regno) { CORE_ADDR addr; - if (regno < 0 || regno >= NUM_REGS) + if (regno < 0 || regno >= gdbarch_num_regs (current_gdbarch)) error (_("Invalid register number %d."), regno); if (u_offsets[regno] == -1) @@ -322,7 +322,9 @@ ia64_register_addr (int regno) static int ia64_cannot_fetch_register (int regno) { - return regno < 0 || regno >= NUM_REGS || u_offsets[regno] == -1; + return regno < 0 + || regno >= gdbarch_num_regs (current_gdbarch) + || u_offsets[regno] == -1; } static int @@ -357,7 +359,9 @@ ia64_cannot_store_register (int regno) were previously read from the inferior process to be written back.) */ - return regno < 0 || regno >= NUM_REGS || u_offsets[regno] == -1 + return regno < 0 + || regno >= gdbarch_num_regs (current_gdbarch) + || u_offsets[regno] == -1 || regno == IA64_BSPSTORE_REGNUM; } @@ -714,7 +718,7 @@ static void ia64_linux_fetch_registers (struct regcache *regcache, int regnum) { if (regnum == -1) - for (regnum = 0; regnum < NUM_REGS; regnum++) + for (regnum = 0; regnum < gdbarch_num_regs (current_gdbarch); regnum++) ia64_linux_fetch_register (regcache, regnum); else ia64_linux_fetch_register (regcache, regnum); @@ -767,7 +771,7 @@ static void ia64_linux_store_registers (struct regcache *regcache, int regnum) { if (regnum == -1) - for (regnum = 0; regnum < NUM_REGS; regnum++) + for (regnum = 0; regnum < gdbarch_num_regs (current_gdbarch); regnum++) ia64_linux_store_register (regcache, regnum); else ia64_linux_store_register (regcache, regnum); diff --git a/gdb/inf-child.c b/gdb/inf-child.c index a30d519..59891de 100644 --- a/gdb/inf-child.c +++ b/gdb/inf-child.c @@ -37,7 +37,7 @@ inf_child_fetch_inferior_registers (struct regcache *regcache, int regnum) { if (regnum == -1) { - for (regnum = 0; regnum < NUM_REGS; regnum++) + for (regnum = 0; regnum < gdbarch_num_regs (current_gdbarch); regnum++) regcache_raw_supply (regcache, regnum, NULL); } else diff --git a/gdb/inf-ptrace.c b/gdb/inf-ptrace.c index dfdfe50..9b485f0 100644 --- a/gdb/inf-ptrace.c +++ b/gdb/inf-ptrace.c @@ -664,7 +664,7 @@ static void inf_ptrace_fetch_registers (struct regcache *regcache, int regnum) { if (regnum == -1) - for (regnum = 0; regnum < NUM_REGS; regnum++) + for (regnum = 0; regnum < gdbarch_num_regs (current_gdbarch); regnum++) inf_ptrace_fetch_register (regcache, regnum); else inf_ptrace_fetch_register (regcache, regnum); @@ -717,7 +717,7 @@ void inf_ptrace_store_registers (struct regcache *regcache, int regnum) { if (regnum == -1) - for (regnum = 0; regnum < NUM_REGS; regnum++) + for (regnum = 0; regnum < gdbarch_num_regs (current_gdbarch); regnum++) inf_ptrace_store_register (regcache, regnum); else inf_ptrace_store_register (regcache, regnum); diff --git a/gdb/infcmd.c b/gdb/infcmd.c index 29bc1d3..4464577 100644 --- a/gdb/infcmd.c +++ b/gdb/infcmd.c @@ -1599,7 +1599,8 @@ default_print_registers_info (struct gdbarch *gdbarch, int regnum, int print_all) { int i; - const int numregs = NUM_REGS + NUM_PSEUDO_REGS; + const int numregs = gdbarch_num_regs (current_gdbarch) + + gdbarch_num_pseudo_regs (current_gdbarch); gdb_byte buffer[MAX_REGISTER_SIZE]; for (i = 0; i < numregs; i++) @@ -1743,7 +1744,8 @@ registers_info (char *addr_exp, int fpregs) int regnum = strtol (start, &endptr, 0); if (endptr == end && regnum >= 0 - && regnum < NUM_REGS + NUM_PSEUDO_REGS) + && regnum < gdbarch_num_regs (current_gdbarch) + + gdbarch_num_pseudo_regs (current_gdbarch)) { gdbarch_print_registers_info (current_gdbarch, gdb_stdout, frame, regnum, fpregs); @@ -1767,7 +1769,10 @@ registers_info (char *addr_exp, int fpregs) if (group != NULL) { int regnum; - for (regnum = 0; regnum < NUM_REGS + NUM_PSEUDO_REGS; regnum++) + for (regnum = 0; + regnum < gdbarch_num_regs (current_gdbarch) + + gdbarch_num_pseudo_regs (current_gdbarch); + regnum++) { if (gdbarch_register_reggroup_p (current_gdbarch, regnum, group)) @@ -1807,7 +1812,10 @@ print_vector_info (struct gdbarch *gdbarch, struct ui_file *file, int regnum; int printed_something = 0; - for (regnum = 0; regnum < NUM_REGS + NUM_PSEUDO_REGS; regnum++) + for (regnum = 0; + regnum < gdbarch_num_regs (current_gdbarch) + + gdbarch_num_pseudo_regs (current_gdbarch); + regnum++) { if (gdbarch_register_reggroup_p (gdbarch, regnum, vector_reggroup)) { @@ -2024,7 +2032,10 @@ print_float_info (struct gdbarch *gdbarch, struct ui_file *file, int regnum; int printed_something = 0; - for (regnum = 0; regnum < NUM_REGS + NUM_PSEUDO_REGS; regnum++) + for (regnum = 0; + regnum < gdbarch_num_regs (current_gdbarch) + + gdbarch_num_pseudo_regs (current_gdbarch); + regnum++) { if (gdbarch_register_reggroup_p (gdbarch, regnum, float_reggroup)) { diff --git a/gdb/irix5-nat.c b/gdb/irix5-nat.c index 880568e..9769da2 100644 --- a/gdb/irix5-nat.c +++ b/gdb/irix5-nat.c @@ -253,13 +253,13 @@ fetch_core_registers (struct regcache *regcache, /* If regsize is 8, this is a N32 or N64 core file. If regsize is 4, this is an O32 core file. */ - if (core_reg_size != regsize * NUM_REGS) + if (core_reg_size != regsize * gdbarch_num_regs (current_gdbarch)) { warning (_("wrong size gregset struct in core file")); return; } - for (regno = 0; regno < NUM_REGS; regno++) + for (regno = 0; regno < gdbarch_num_regs (current_gdbarch); regno++) { regcache_raw_supply (regcache, regno, srcp); srcp += regsize; diff --git a/gdb/m32c-tdep.c b/gdb/m32c-tdep.c index 91a56cc..5763d5c 100644 --- a/gdb/m32c-tdep.c +++ b/gdb/m32c-tdep.c @@ -2557,7 +2557,7 @@ m32c_virtual_frame_pointer (CORE_ADDR pc, break; } /* Sanity check */ - if (*frame_regnum > NUM_REGS) + if (*frame_regnum > gdbarch_num_regs (current_gdbarch)) internal_error (__FILE__, __LINE__, _("No virtual frame pointer available")); } diff --git a/gdb/m32r-tdep.c b/gdb/m32r-tdep.c index 45b72db..3766c14 100644 --- a/gdb/m32r-tdep.c +++ b/gdb/m32r-tdep.c @@ -625,7 +625,7 @@ m32r_frame_unwind_cache (struct frame_info *next_frame, /* Adjust all the saved registers so that they contain addresses and not offsets. */ - for (i = 0; i < NUM_REGS - 1; i++) + for (i = 0; i < gdbarch_num_regs (current_gdbarch) - 1; i++) if (trad_frame_addr_p (info->saved_regs, i)) info->saved_regs[i].addr = (info->prev_sp + info->saved_regs[i].addr); diff --git a/gdb/m68hc11-tdep.c b/gdb/m68hc11-tdep.c index d4fff89..0e8c512 100644 --- a/gdb/m68hc11-tdep.c +++ b/gdb/m68hc11-tdep.c @@ -96,7 +96,7 @@ enum insn_return_kind { /* 68HC12 page number register. Note: to keep a compatibility with gcc register naming, we must not have to rename FP and other soft registers. The page register - is a real hard register and must therefore be counted by NUM_REGS. + is a real hard register and must therefore be counted by gdbarch_num_regs. For this it has the same number as Z register (which is not used). */ #define HARD_PAGE_REGNUM 8 #define M68HC11_LAST_HARD_REG (HARD_PAGE_REGNUM) @@ -856,7 +856,10 @@ m68hc11_frame_unwind_cache (struct frame_info *next_frame, /* Adjust all the saved registers so that they contain addresses and not offsets. */ - for (i = 0; i < NUM_REGS + NUM_PSEUDO_REGS - 1; i++) + for (i = 0; + i < gdbarch_num_regs (current_gdbarch) + + gdbarch_num_pseudo_regs (current_gdbarch) - 1; + i++) if (trad_frame_addr_p (info->saved_regs, i)) { info->saved_regs[i].addr += this_base; diff --git a/gdb/m68k-tdep.c b/gdb/m68k-tdep.c index d928d74..c96d4d5 100644 --- a/gdb/m68k-tdep.c +++ b/gdb/m68k-tdep.c @@ -496,7 +496,8 @@ m68k_dwarf_reg_to_regnum (int num) /* pc */ return M68K_PC_REGNUM; else - return NUM_REGS + NUM_PSEUDO_REGS; + return gdbarch_num_regs (current_gdbarch) + + gdbarch_num_pseudo_regs (current_gdbarch); } diff --git a/gdb/m68klinux-nat.c b/gdb/m68klinux-nat.c index 8f5b7c2..6844f51 100644 --- a/gdb/m68klinux-nat.c +++ b/gdb/m68klinux-nat.c @@ -166,7 +166,7 @@ old_fetch_inferior_registers (struct regcache *regcache, int regno) } else { - for (regno = 0; regno < NUM_REGS; regno++) + for (regno = 0; regno < gdbarch_num_regs (current_gdbarch); regno++) { fetch_register (regcache, regno); } @@ -228,7 +228,7 @@ old_store_inferior_registers (const struct regcache *regcache, int regno) } else { - for (regno = 0; regno < NUM_REGS; regno++) + for (regno = 0; regno < gdbarch_num_regs (current_gdbarch); regno++) { store_register (regcache, regno); } diff --git a/gdb/mi/mi-main.c b/gdb/mi/mi-main.c index 00e19dd..ad7aae0 100644 --- a/gdb/mi/mi-main.c +++ b/gdb/mi/mi-main.c @@ -286,12 +286,13 @@ mi_cmd_data_list_register_names (char *command, char **argv, int argc) struct cleanup *cleanup; /* Note that the test for a valid register must include checking the - REGISTER_NAME because NUM_REGS may be allocated for the union of + REGISTER_NAME because gdbarch_num_regs may be allocated for the union of the register sets within a family of related processors. In this case, some entries of REGISTER_NAME will change depending upon the particular processor being debugged. */ - numregs = NUM_REGS + NUM_PSEUDO_REGS; + numregs = gdbarch_num_regs (current_gdbarch) + + gdbarch_num_pseudo_regs (current_gdbarch); cleanup = make_cleanup_ui_out_list_begin_end (uiout, "register-names"); @@ -347,12 +348,13 @@ mi_cmd_data_list_changed_registers (char *command, char **argv, int argc) cleanup = make_cleanup_regcache_xfree (prev_regs); /* Note that the test for a valid register must include checking the - REGISTER_NAME because NUM_REGS may be allocated for the union of + REGISTER_NAME because gdbarch_num_regs may be allocated for the union of the register sets within a family of related processors. In this case, some entries of REGISTER_NAME will change depending upon the particular processor being debugged. */ - numregs = NUM_REGS + NUM_PSEUDO_REGS; + numregs = gdbarch_num_regs (current_gdbarch) + + gdbarch_num_pseudo_regs (current_gdbarch); make_cleanup_ui_out_list_begin_end (uiout, "changed-registers"); @@ -449,12 +451,13 @@ mi_cmd_data_list_register_values (char *command, char **argv, int argc) struct cleanup *list_cleanup, *tuple_cleanup; /* Note that the test for a valid register must include checking the - REGISTER_NAME because NUM_REGS may be allocated for the union of + REGISTER_NAME because gdbarch_num_regs may be allocated for the union of the register sets within a family of related processors. In this case, some entries of REGISTER_NAME will change depending upon the particular processor being debugged. */ - numregs = NUM_REGS + NUM_PSEUDO_REGS; + numregs = gdbarch_num_regs (current_gdbarch) + + gdbarch_num_pseudo_regs (current_gdbarch); if (argc == 0) { @@ -580,12 +583,13 @@ mi_cmd_data_write_register_values (char *command, char **argv, int argc) char format; /* Note that the test for a valid register must include checking the - REGISTER_NAME because NUM_REGS may be allocated for the union of + REGISTER_NAME because gdbarch_num_regs may be allocated for the union of the register sets within a family of related processors. In this case, some entries of REGISTER_NAME will change depending upon the particular processor being debugged. */ - numregs = NUM_REGS + NUM_PSEUDO_REGS; + numregs = gdbarch_num_regs (current_gdbarch) + + gdbarch_num_pseudo_regs (current_gdbarch); if (argc == 0) { diff --git a/gdb/mips-linux-nat.c b/gdb/mips-linux-nat.c index 6b961ac..2a383ab 100644 --- a/gdb/mips-linux-nat.c +++ b/gdb/mips-linux-nat.c @@ -59,7 +59,7 @@ mips_linux_register_addr (struct gdbarch *gdbarch, int regno, int store) { CORE_ADDR regaddr; - if (regno < 0 || regno >= NUM_REGS) + if (regno < 0 || regno >= gdbarch_num_regs (current_gdbarch)) error (_("Bogon register number %d."), regno); if (regno > MIPS_ZERO_REGNUM && regno < MIPS_ZERO_REGNUM + 32) @@ -92,7 +92,7 @@ mips64_linux_register_addr (struct gdbarch *gdbarch, int regno, int store) { CORE_ADDR regaddr; - if (regno < 0 || regno >= NUM_REGS) + if (regno < 0 || regno >= gdbarch_num_regs (current_gdbarch)) error (_("Bogon register number %d."), regno); if (regno > MIPS_ZERO_REGNUM && regno < MIPS_ZERO_REGNUM + 32) diff --git a/gdb/mips-linux-tdep.c b/gdb/mips-linux-tdep.c index ff0b124..670d224 100644 --- a/gdb/mips-linux-tdep.c +++ b/gdb/mips-linux-tdep.c @@ -831,13 +831,15 @@ mips_linux_o32_sigframe_init (const struct tramp_frame *self, regs_base = sigcontext_base; #if 0 - trad_frame_set_reg_addr (this_cache, ORIG_ZERO_REGNUM + NUM_REGS, + trad_frame_set_reg_addr (this_cache, ORIG_ZERO_REGNUM + + gdbarch_num_regs (current_gdbarch), regs_base + SIGCONTEXT_REGS); #endif for (ireg = 1; ireg < 32; ireg++) trad_frame_set_reg_addr (this_cache, - ireg + MIPS_ZERO_REGNUM + NUM_REGS, + ireg + MIPS_ZERO_REGNUM + + gdbarch_num_regs (current_gdbarch), regs_base + SIGCONTEXT_REGS + ireg * SIGCONTEXT_REG_SIZE); @@ -851,27 +853,37 @@ mips_linux_o32_sigframe_init (const struct tramp_frame *self, the "high" bits depends on endianness. */ for (ireg = 0; ireg < 32; ireg++) if ((TARGET_BYTE_ORDER == BFD_ENDIAN_BIG) != (ireg & 1)) - trad_frame_set_reg_addr (this_cache, ireg + regs->fp0 + NUM_REGS, + trad_frame_set_reg_addr (this_cache, + ireg + regs->fp0 + + gdbarch_num_regs (current_gdbarch), sigcontext_base + SIGCONTEXT_FPREGS + 4 + (ireg & ~1) * SIGCONTEXT_REG_SIZE); else - trad_frame_set_reg_addr (this_cache, ireg + regs->fp0 + NUM_REGS, + trad_frame_set_reg_addr (this_cache, + ireg + regs->fp0 + + gdbarch_num_regs (current_gdbarch), sigcontext_base + SIGCONTEXT_FPREGS + (ireg & ~1) * SIGCONTEXT_REG_SIZE); - trad_frame_set_reg_addr (this_cache, regs->pc + NUM_REGS, + trad_frame_set_reg_addr (this_cache, + regs->pc + gdbarch_num_regs (current_gdbarch), regs_base + SIGCONTEXT_PC); trad_frame_set_reg_addr (this_cache, - regs->fp_control_status + NUM_REGS, + regs->fp_control_status + + gdbarch_num_regs (current_gdbarch), sigcontext_base + SIGCONTEXT_FPCSR); - trad_frame_set_reg_addr (this_cache, regs->hi + NUM_REGS, + trad_frame_set_reg_addr (this_cache, + regs->hi + gdbarch_num_regs (current_gdbarch), regs_base + SIGCONTEXT_HI); - trad_frame_set_reg_addr (this_cache, regs->lo + NUM_REGS, + trad_frame_set_reg_addr (this_cache, + regs->lo + gdbarch_num_regs (current_gdbarch), regs_base + SIGCONTEXT_LO); - trad_frame_set_reg_addr (this_cache, regs->cause + NUM_REGS, + trad_frame_set_reg_addr (this_cache, + regs->cause + gdbarch_num_regs (current_gdbarch), sigcontext_base + SIGCONTEXT_CAUSE); - trad_frame_set_reg_addr (this_cache, regs->badvaddr + NUM_REGS, + trad_frame_set_reg_addr (this_cache, + regs->badvaddr + gdbarch_num_regs (current_gdbarch), sigcontext_base + SIGCONTEXT_BADVADDR); /* Choice of the bottom of the sigframe is somewhat arbitrary. */ @@ -969,34 +981,45 @@ mips_linux_n32n64_sigframe_init (const struct tramp_frame *self, sigcontext_base += N64_SIGFRAME_SIGCONTEXT_OFFSET; #if 0 - trad_frame_set_reg_addr (this_cache, ORIG_ZERO_REGNUM + NUM_REGS, + trad_frame_set_reg_addr (this_cache, + ORIG_ZERO_REGNUM + + gdbarch_num_regs (current_gdbarch), sigcontext_base + N64_SIGCONTEXT_REGS); #endif for (ireg = 1; ireg < 32; ireg++) trad_frame_set_reg_addr (this_cache, - ireg + MIPS_ZERO_REGNUM + NUM_REGS, + ireg + MIPS_ZERO_REGNUM + + gdbarch_num_regs (current_gdbarch), sigcontext_base + N64_SIGCONTEXT_REGS + ireg * N64_SIGCONTEXT_REG_SIZE); for (ireg = 0; ireg < 32; ireg++) - trad_frame_set_reg_addr (this_cache, ireg + regs->fp0 + NUM_REGS, + trad_frame_set_reg_addr (this_cache, + ireg + regs->fp0 + + gdbarch_num_regs (current_gdbarch), sigcontext_base + N64_SIGCONTEXT_FPREGS + ireg * N64_SIGCONTEXT_REG_SIZE); - trad_frame_set_reg_addr (this_cache, regs->pc + NUM_REGS, + trad_frame_set_reg_addr (this_cache, + regs->pc + gdbarch_num_regs (current_gdbarch), sigcontext_base + N64_SIGCONTEXT_PC); trad_frame_set_reg_addr (this_cache, - regs->fp_control_status + NUM_REGS, + regs->fp_control_status + + gdbarch_num_regs (current_gdbarch), sigcontext_base + N64_SIGCONTEXT_FPCSR); - trad_frame_set_reg_addr (this_cache, regs->hi + NUM_REGS, + trad_frame_set_reg_addr (this_cache, + regs->hi + gdbarch_num_regs (current_gdbarch), sigcontext_base + N64_SIGCONTEXT_HI); - trad_frame_set_reg_addr (this_cache, regs->lo + NUM_REGS, + trad_frame_set_reg_addr (this_cache, + regs->lo + gdbarch_num_regs (current_gdbarch), sigcontext_base + N64_SIGCONTEXT_LO); - trad_frame_set_reg_addr (this_cache, regs->cause + NUM_REGS, + trad_frame_set_reg_addr (this_cache, + regs->cause + gdbarch_num_regs (current_gdbarch), sigcontext_base + N64_SIGCONTEXT_CAUSE); - trad_frame_set_reg_addr (this_cache, regs->badvaddr + NUM_REGS, + trad_frame_set_reg_addr (this_cache, + regs->badvaddr + gdbarch_num_regs (current_gdbarch), sigcontext_base + N64_SIGCONTEXT_BADVADDR); /* Choice of the bottom of the sigframe is somewhat arbitrary. */ diff --git a/gdb/mips-tdep.c b/gdb/mips-tdep.c index 06d1876..974e42a 100644 --- a/gdb/mips-tdep.c +++ b/gdb/mips-tdep.c @@ -327,7 +327,7 @@ mips_xfer_register (struct regcache *regcache, int reg_num, int length, const gdb_byte *out, int buf_offset) { int reg_offset = 0; - gdb_assert (reg_num >= NUM_REGS); + gdb_assert (reg_num >= gdbarch_num_regs (current_gdbarch)); /* Need to transfer the left or right part of the register, based on the targets byte order. */ switch (endian) @@ -493,10 +493,10 @@ mips_register_name (int regno) enum mips_abi abi = mips_abi (current_gdbarch); - /* Map [NUM_REGS .. 2*NUM_REGS) onto the raw registers, but then - don't make the raw register names visible. */ - int rawnum = regno % NUM_REGS; - if (regno < NUM_REGS) + /* Map [gdbarch_num_regs .. 2*gdbarch_num_regs) onto the raw registers, + but then don't make the raw register names visible. */ + int rawnum = regno % gdbarch_num_regs (current_gdbarch); + if (regno < gdbarch_num_regs (current_gdbarch)) return ""; /* The MIPS integer registers are always mapped from 0 to 31. The @@ -509,7 +509,7 @@ mips_register_name (int regno) else return mips_gpr_names[rawnum]; } - else if (32 <= rawnum && rawnum < NUM_REGS) + else if (32 <= rawnum && rawnum < gdbarch_num_regs (current_gdbarch)) { gdb_assert (rawnum - 32 < NUM_MIPS_PROCESSOR_REGS); return tdep->mips_processor_reg_names[rawnum - 32]; @@ -528,15 +528,15 @@ mips_register_reggroup_p (struct gdbarch *gdbarch, int regnum, int vector_p; int float_p; int raw_p; - int rawnum = regnum % NUM_REGS; - int pseudo = regnum / NUM_REGS; + int rawnum = regnum % gdbarch_num_regs (current_gdbarch); + int pseudo = regnum / gdbarch_num_regs (current_gdbarch); if (reggroup == all_reggroup) return pseudo; vector_p = TYPE_VECTOR (register_type (gdbarch, regnum)); float_p = TYPE_CODE (register_type (gdbarch, regnum)) == TYPE_CODE_FLT; /* FIXME: cagney/2003-04-13: Can't yet use gdbarch_num_regs (gdbarch), as not all architectures are multi-arch. */ - raw_p = rawnum < NUM_REGS; + raw_p = rawnum < gdbarch_num_regs (current_gdbarch); if (REGISTER_NAME (regnum) == NULL || REGISTER_NAME (regnum)[0] == '\0') return 0; if (reggroup == float_reggroup) @@ -557,15 +557,16 @@ mips_register_reggroup_p (struct gdbarch *gdbarch, int regnum, } /* Map the symbol table registers which live in the range [1 * - NUM_REGS .. 2 * NUM_REGS) back onto the corresponding raw + gdbarch_num_regs .. 2 * gdbarch_num_regs) back onto the corresponding raw registers. Take care of alignment and size problems. */ static void mips_pseudo_register_read (struct gdbarch *gdbarch, struct regcache *regcache, int cookednum, gdb_byte *buf) { - int rawnum = cookednum % NUM_REGS; - gdb_assert (cookednum >= NUM_REGS && cookednum < 2 * NUM_REGS); + int rawnum = cookednum % gdbarch_num_regs (current_gdbarch); + gdb_assert (cookednum >= gdbarch_num_regs (current_gdbarch) + && cookednum < 2 * gdbarch_num_regs (current_gdbarch)); if (register_size (gdbarch, rawnum) == register_size (gdbarch, cookednum)) regcache_raw_read (regcache, rawnum, buf); else if (register_size (gdbarch, rawnum) > @@ -586,8 +587,9 @@ mips_pseudo_register_write (struct gdbarch *gdbarch, struct regcache *regcache, int cookednum, const gdb_byte *buf) { - int rawnum = cookednum % NUM_REGS; - gdb_assert (cookednum >= NUM_REGS && cookednum < 2 * NUM_REGS); + int rawnum = cookednum % gdbarch_num_regs (current_gdbarch); + gdb_assert (cookednum >= gdbarch_num_regs (current_gdbarch) + && cookednum < 2 * gdbarch_num_regs (current_gdbarch)); if (register_size (gdbarch, rawnum) == register_size (gdbarch, cookednum)) regcache_raw_write (regcache, rawnum, buf); else if (register_size (gdbarch, rawnum) > @@ -641,8 +643,10 @@ mips_convert_register_p (int regnum, struct type *type) { return (TARGET_BYTE_ORDER == BFD_ENDIAN_BIG && register_size (current_gdbarch, regnum) == 4 - && (regnum % NUM_REGS) >= mips_regnum (current_gdbarch)->fp0 - && (regnum % NUM_REGS) < mips_regnum (current_gdbarch)->fp0 + 32 + && (regnum % gdbarch_num_regs (current_gdbarch)) + >= mips_regnum (current_gdbarch)->fp0 + && (regnum % gdbarch_num_regs (current_gdbarch)) + < mips_regnum (current_gdbarch)->fp0 + 32 && TYPE_CODE (type) == TYPE_CODE_FLT && TYPE_LENGTH (type) == 8); } @@ -668,9 +672,11 @@ mips_value_to_register (struct frame_info *frame, int regnum, static struct type * mips_register_type (struct gdbarch *gdbarch, int regnum) { - gdb_assert (regnum >= 0 && regnum < 2 * NUM_REGS); - if ((regnum % NUM_REGS) >= mips_regnum (current_gdbarch)->fp0 - && (regnum % NUM_REGS) < mips_regnum (current_gdbarch)->fp0 + 32) + gdb_assert (regnum >= 0 && regnum < 2 * gdbarch_num_regs (current_gdbarch)); + if ((regnum % gdbarch_num_regs (current_gdbarch)) + >= mips_regnum (current_gdbarch)->fp0 + && (regnum % gdbarch_num_regs (current_gdbarch)) + < mips_regnum (current_gdbarch)->fp0 + 32) { /* The floating-point registers raw, or cooked, always match mips_isa_regsize(), and also map 1:1, byte for byte. */ @@ -679,7 +685,7 @@ mips_register_type (struct gdbarch *gdbarch, int regnum) else return builtin_type_ieee_double; } - else if (regnum < NUM_REGS) + else if (regnum < gdbarch_num_regs (current_gdbarch)) { /* The raw or ISA registers. These are all sized according to the ISA regsize. */ @@ -692,9 +698,10 @@ mips_register_type (struct gdbarch *gdbarch, int regnum) { /* The cooked or ABI registers. These are sized according to the ABI (with a few complications). */ - if (regnum >= (NUM_REGS + if (regnum >= (gdbarch_num_regs (current_gdbarch) + mips_regnum (current_gdbarch)->fp_control_status) - && regnum <= NUM_REGS + MIPS_LAST_EMBED_REGNUM) + && regnum <= gdbarch_num_regs (current_gdbarch) + + MIPS_LAST_EMBED_REGNUM) /* The pseudo/cooked view of the embedded registers is always 32-bit. The raw view is handled below. */ return builtin_type_int32; @@ -795,13 +802,16 @@ static CORE_ADDR mips_unwind_pc (struct gdbarch *gdbarch, struct frame_info *next_frame) { return frame_unwind_register_signed (next_frame, - NUM_REGS + mips_regnum (gdbarch)->pc); + gdbarch_num_regs (current_gdbarch) + + mips_regnum (gdbarch)->pc); } static CORE_ADDR mips_unwind_sp (struct gdbarch *gdbarch, struct frame_info *next_frame) { - return frame_unwind_register_signed (next_frame, NUM_REGS + MIPS_SP_REGNUM); + return frame_unwind_register_signed (next_frame, + gdbarch_num_regs (current_gdbarch) + + MIPS_SP_REGNUM); } /* Assuming NEXT_FRAME->prev is a dummy, return the frame ID of that @@ -812,8 +822,11 @@ mips_unwind_sp (struct gdbarch *gdbarch, struct frame_info *next_frame) static struct frame_id mips_unwind_dummy_id (struct gdbarch *gdbarch, struct frame_info *next_frame) { - return frame_id_build (frame_unwind_register_signed (next_frame, NUM_REGS + MIPS_SP_REGNUM), - frame_pc_unwind (next_frame)); + return frame_id_build + (frame_unwind_register_signed (next_frame, + gdbarch_num_regs (current_gdbarch) + + MIPS_SP_REGNUM), + frame_pc_unwind (next_frame)); } static void @@ -1338,11 +1351,11 @@ struct mips_frame_cache way we will only recognize the first save of a given register in a function prologue. - For simplicity, save the address in both [0 .. NUM_REGS) and - [NUM_REGS .. 2*NUM_REGS). Strictly speaking, only the second range - is used as it is only second range (the ABI instead of ISA - registers) that comes into play when finding saved registers in a - frame. */ + For simplicity, save the address in both [0 .. gdbarch_num_regs) and + [gdbarch_num_regs .. 2*gdbarch_num_regs). + Strictly speaking, only the second range is used as it is only second + range (the ABI instead of ISA registers) that comes into play when finding + saved registers in a frame. */ static void set_reg_offset (struct mips_frame_cache *this_cache, int regnum, @@ -1351,8 +1364,12 @@ set_reg_offset (struct mips_frame_cache *this_cache, int regnum, if (this_cache != NULL && this_cache->saved_regs[regnum].addr == -1) { - this_cache->saved_regs[regnum + 0 * NUM_REGS].addr = offset; - this_cache->saved_regs[regnum + 1 * NUM_REGS].addr = offset; + this_cache->saved_regs[regnum + + 0 * gdbarch_num_regs (current_gdbarch)].addr + = offset; + this_cache->saved_regs[regnum + + 1 * gdbarch_num_regs (current_gdbarch)].addr + = offset; } } @@ -1419,7 +1436,8 @@ mips16_scan_prologue (CORE_ADDR start_pc, CORE_ADDR limit_pc, /* Can be called when there's no process, and hence when there's no NEXT_FRAME. */ if (next_frame != NULL) - sp = read_next_frame_reg (next_frame, NUM_REGS + MIPS_SP_REGNUM); + sp = read_next_frame_reg (next_frame, gdbarch_num_regs (current_gdbarch) + + MIPS_SP_REGNUM); else sp = 0; @@ -1571,13 +1589,17 @@ mips16_scan_prologue (CORE_ADDR start_pc, CORE_ADDR limit_pc, if (this_cache != NULL) { this_cache->base = - (frame_unwind_register_signed (next_frame, NUM_REGS + frame_reg) + (frame_unwind_register_signed (next_frame, + gdbarch_num_regs (current_gdbarch) + + frame_reg) + frame_offset - frame_adjust); /* FIXME: brobecker/2004-10-10: Just as in the mips32 case, we should be able to get rid of the assignment below, evetually. But it's still needed for now. */ - this_cache->saved_regs[NUM_REGS + mips_regnum (current_gdbarch)->pc] - = this_cache->saved_regs[NUM_REGS + MIPS_RA_REGNUM]; + this_cache->saved_regs[gdbarch_num_regs (current_gdbarch) + + mips_regnum (current_gdbarch)->pc] + = this_cache->saved_regs[gdbarch_num_regs (current_gdbarch) + + MIPS_RA_REGNUM]; } /* If we didn't reach the end of the prologue when scanning the function @@ -1622,7 +1644,8 @@ mips_insn16_frame_cache (struct frame_info *next_frame, void **this_cache) } /* SP_REGNUM, contains the value and not the address. */ - trad_frame_set_value (cache->saved_regs, NUM_REGS + MIPS_SP_REGNUM, cache->base); + trad_frame_set_value (cache->saved_regs, gdbarch_num_regs (current_gdbarch) + + MIPS_SP_REGNUM, cache->base); return (*this_cache); } @@ -1702,7 +1725,7 @@ reset_saved_regs (struct mips_frame_cache *this_cache) return; { - const int num_regs = NUM_REGS; + const int num_regs = gdbarch_num_regs (current_gdbarch); int i; for (i = 0; i < num_regs; i++) @@ -1734,7 +1757,8 @@ mips32_scan_prologue (CORE_ADDR start_pc, CORE_ADDR limit_pc, /* Can be called when there's no process, and hence when there's no NEXT_FRAME. */ if (next_frame != NULL) - sp = read_next_frame_reg (next_frame, NUM_REGS + MIPS_SP_REGNUM); + sp = read_next_frame_reg (next_frame, gdbarch_num_regs (current_gdbarch) + + MIPS_SP_REGNUM); else sp = 0; @@ -1789,7 +1813,9 @@ restart: unsigned alloca_adjust; frame_reg = 30; - frame_addr = read_next_frame_reg (next_frame, NUM_REGS + 30); + frame_addr = read_next_frame_reg (next_frame, + gdbarch_num_regs + (current_gdbarch) + 30); alloca_adjust = (unsigned) (frame_addr - (sp + low_word)); if (alloca_adjust > 0) { @@ -1817,7 +1843,9 @@ restart: unsigned alloca_adjust; frame_reg = 30; - frame_addr = read_next_frame_reg (next_frame, NUM_REGS + 30); + frame_addr = read_next_frame_reg (next_frame, + gdbarch_num_regs + (current_gdbarch) + 30); alloca_adjust = (unsigned) (frame_addr - sp); if (alloca_adjust > 0) { @@ -1882,13 +1910,17 @@ restart: if (this_cache != NULL) { this_cache->base = - (frame_unwind_register_signed (next_frame, NUM_REGS + frame_reg) + (frame_unwind_register_signed (next_frame, + gdbarch_num_regs (current_gdbarch) + + frame_reg) + frame_offset); /* FIXME: brobecker/2004-09-15: We should be able to get rid of this assignment below, eventually. But it's still needed for now. */ - this_cache->saved_regs[NUM_REGS + mips_regnum (current_gdbarch)->pc] - = this_cache->saved_regs[NUM_REGS + MIPS_RA_REGNUM]; + this_cache->saved_regs[gdbarch_num_regs (current_gdbarch) + + mips_regnum (current_gdbarch)->pc] + = this_cache->saved_regs[gdbarch_num_regs (current_gdbarch) + + MIPS_RA_REGNUM]; } /* If we didn't reach the end of the prologue when scanning the function @@ -1944,7 +1976,9 @@ mips_insn32_frame_cache (struct frame_info *next_frame, void **this_cache) } /* SP_REGNUM, contains the value and not the address. */ - trad_frame_set_value (cache->saved_regs, NUM_REGS + MIPS_SP_REGNUM, cache->base); + trad_frame_set_value (cache->saved_regs, + gdbarch_num_regs (current_gdbarch) + MIPS_SP_REGNUM, + cache->base); return (*this_cache); } @@ -2123,7 +2157,7 @@ static CORE_ADDR read_next_frame_reg (struct frame_info *fi, int regno) { /* Always a pseudo. */ - gdb_assert (regno >= NUM_REGS); + gdb_assert (regno >= gdbarch_num_regs (current_gdbarch)); if (fi == NULL) { LONGEST val; @@ -2875,10 +2909,12 @@ mips_n32n64_return_value (struct gdbarch *gdbarch, if (mips_debug) fprintf_unfiltered (gdb_stderr, "Return float in $f0 and $f2\n"); mips_xfer_register (regcache, - NUM_REGS + mips_regnum (current_gdbarch)->fp0, + gdbarch_num_regs (current_gdbarch) + + mips_regnum (current_gdbarch)->fp0, 8, TARGET_BYTE_ORDER, readbuf, writebuf, 0); mips_xfer_register (regcache, - NUM_REGS + mips_regnum (current_gdbarch)->fp0 + 2, + gdbarch_num_regs (current_gdbarch) + + mips_regnum (current_gdbarch)->fp0 + 2, 8, TARGET_BYTE_ORDER, readbuf ? readbuf + 8 : readbuf, writebuf ? writebuf + 8 : writebuf, 0); return RETURN_VALUE_REGISTER_CONVENTION; @@ -2891,7 +2927,8 @@ mips_n32n64_return_value (struct gdbarch *gdbarch, if (mips_debug) fprintf_unfiltered (gdb_stderr, "Return float in $fp0\n"); mips_xfer_register (regcache, - NUM_REGS + mips_regnum (current_gdbarch)->fp0, + gdbarch_num_regs (current_gdbarch) + + mips_regnum (current_gdbarch)->fp0, TYPE_LENGTH (type), TARGET_BYTE_ORDER, readbuf, writebuf, 0); return RETURN_VALUE_REGISTER_CONVENTION; @@ -2922,7 +2959,8 @@ mips_n32n64_return_value (struct gdbarch *gdbarch, if (mips_debug) fprintf_unfiltered (gdb_stderr, "Return float struct+%d\n", offset); - mips_xfer_register (regcache, NUM_REGS + regnum, + mips_xfer_register (regcache, gdbarch_num_regs (current_gdbarch) + + regnum, TYPE_LENGTH (TYPE_FIELD_TYPE (type, field)), TARGET_BYTE_ORDER, readbuf, writebuf, offset); } @@ -2946,7 +2984,8 @@ mips_n32n64_return_value (struct gdbarch *gdbarch, if (mips_debug) fprintf_unfiltered (gdb_stderr, "Return struct+%d:%d in $%d\n", offset, xfer, regnum); - mips_xfer_register (regcache, NUM_REGS + regnum, xfer, + mips_xfer_register (regcache, gdbarch_num_regs (current_gdbarch) + + regnum, xfer, BFD_ENDIAN_UNKNOWN, readbuf, writebuf, offset); } return RETURN_VALUE_REGISTER_CONVENTION; @@ -2967,7 +3006,8 @@ mips_n32n64_return_value (struct gdbarch *gdbarch, if (mips_debug) fprintf_unfiltered (gdb_stderr, "Return scalar+%d:%d in $%d\n", offset, xfer, regnum); - mips_xfer_register (regcache, NUM_REGS + regnum, xfer, + mips_xfer_register (regcache, gdbarch_num_regs (current_gdbarch) + + regnum, xfer, TARGET_BYTE_ORDER, readbuf, writebuf, offset); } return RETURN_VALUE_REGISTER_CONVENTION; @@ -3298,7 +3338,8 @@ mips_o32_return_value (struct gdbarch *gdbarch, struct type *type, if (mips_debug) fprintf_unfiltered (gdb_stderr, "Return float in $fp0\n"); mips_xfer_register (regcache, - NUM_REGS + mips_regnum (current_gdbarch)->fp0, + gdbarch_num_regs (current_gdbarch) + + mips_regnum (current_gdbarch)->fp0, TYPE_LENGTH (type), TARGET_BYTE_ORDER, readbuf, writebuf, 0); return RETURN_VALUE_REGISTER_CONVENTION; @@ -3315,19 +3356,23 @@ mips_o32_return_value (struct gdbarch *gdbarch, struct type *type, { case BFD_ENDIAN_LITTLE: mips_xfer_register (regcache, - NUM_REGS + mips_regnum (current_gdbarch)->fp0 + + gdbarch_num_regs (current_gdbarch) + + mips_regnum (current_gdbarch)->fp0 + 0, 4, TARGET_BYTE_ORDER, readbuf, writebuf, 0); mips_xfer_register (regcache, - NUM_REGS + mips_regnum (current_gdbarch)->fp0 + - 1, 4, TARGET_BYTE_ORDER, readbuf, writebuf, 4); + gdbarch_num_regs (current_gdbarch) + + mips_regnum (current_gdbarch)->fp0 + 1, + 4, TARGET_BYTE_ORDER, readbuf, writebuf, 4); break; case BFD_ENDIAN_BIG: mips_xfer_register (regcache, - NUM_REGS + mips_regnum (current_gdbarch)->fp0 + - 1, 4, TARGET_BYTE_ORDER, readbuf, writebuf, 0); + gdbarch_num_regs (current_gdbarch) + + mips_regnum (current_gdbarch)->fp0 + 1, + 4, TARGET_BYTE_ORDER, readbuf, writebuf, 0); mips_xfer_register (regcache, - NUM_REGS + mips_regnum (current_gdbarch)->fp0 + - 0, 4, TARGET_BYTE_ORDER, readbuf, writebuf, 4); + gdbarch_num_regs (current_gdbarch) + + mips_regnum (current_gdbarch)->fp0 + 0, + 4, TARGET_BYTE_ORDER, readbuf, writebuf, 4); break; default: internal_error (__FILE__, __LINE__, _("bad switch")); @@ -3362,7 +3407,8 @@ mips_o32_return_value (struct gdbarch *gdbarch, struct type *type, if (mips_debug) fprintf_unfiltered (gdb_stderr, "Return float struct+%d\n", offset); - mips_xfer_register (regcache, NUM_REGS + regnum, + mips_xfer_register (regcache, gdbarch_num_regs (current_gdbarch) + + regnum, TYPE_LENGTH (TYPE_FIELD_TYPE (type, field)), TARGET_BYTE_ORDER, readbuf, writebuf, offset); } @@ -3388,7 +3434,8 @@ mips_o32_return_value (struct gdbarch *gdbarch, struct type *type, if (mips_debug) fprintf_unfiltered (gdb_stderr, "Return struct+%d:%d in $%d\n", offset, xfer, regnum); - mips_xfer_register (regcache, NUM_REGS + regnum, xfer, + mips_xfer_register (regcache, gdbarch_num_regs (current_gdbarch) + + regnum, xfer, BFD_ENDIAN_UNKNOWN, readbuf, writebuf, offset); } return RETURN_VALUE_REGISTER_CONVENTION; @@ -3411,7 +3458,8 @@ mips_o32_return_value (struct gdbarch *gdbarch, struct type *type, if (mips_debug) fprintf_unfiltered (gdb_stderr, "Return scalar+%d:%d in $%d\n", offset, xfer, regnum); - mips_xfer_register (regcache, NUM_REGS + regnum, xfer, + mips_xfer_register (regcache, gdbarch_num_regs (current_gdbarch) + + regnum, xfer, TARGET_BYTE_ORDER, readbuf, writebuf, offset); } return RETURN_VALUE_REGISTER_CONVENTION; @@ -3671,7 +3719,8 @@ mips_o64_return_value (struct gdbarch *gdbarch, if (mips_debug) fprintf_unfiltered (gdb_stderr, "Return float in $fp0\n"); mips_xfer_register (regcache, - NUM_REGS + mips_regnum (current_gdbarch)->fp0, + gdbarch_num_regs (current_gdbarch) + + mips_regnum (current_gdbarch)->fp0, TYPE_LENGTH (type), TARGET_BYTE_ORDER, readbuf, writebuf, 0); return RETURN_VALUE_REGISTER_CONVENTION; @@ -3692,7 +3741,8 @@ mips_o64_return_value (struct gdbarch *gdbarch, if (mips_debug) fprintf_unfiltered (gdb_stderr, "Return scalar+%d:%d in $%d\n", offset, xfer, regnum); - mips_xfer_register (regcache, NUM_REGS + regnum, xfer, + mips_xfer_register (regcache, gdbarch_num_regs (current_gdbarch) + + regnum, xfer, TARGET_BYTE_ORDER, readbuf, writebuf, offset); } return RETURN_VALUE_REGISTER_CONVENTION; @@ -3955,7 +4005,9 @@ print_gp_register_row (struct ui_file *file, struct frame_info *frame, /* For GP registers, we print a separate row of names above the vals */ for (col = 0, regnum = start_regnum; - col < ncols && regnum < NUM_REGS + NUM_PSEUDO_REGS; regnum++) + col < ncols && regnum < gdbarch_num_regs (current_gdbarch) + + gdbarch_num_pseudo_regs (current_gdbarch); + regnum++) { if (*REGISTER_NAME (regnum) == '\0') continue; /* unused register */ @@ -3974,14 +4026,17 @@ print_gp_register_row (struct ui_file *file, struct frame_info *frame, return regnum; /* print the R0 to R31 names */ - if ((start_regnum % NUM_REGS) < MIPS_NUMREGS) - fprintf_filtered (file, "\n R%-4d", start_regnum % NUM_REGS); + if ((start_regnum % gdbarch_num_regs (current_gdbarch)) < MIPS_NUMREGS) + fprintf_filtered (file, "\n R%-4d", + start_regnum % gdbarch_num_regs (current_gdbarch)); else fprintf_filtered (file, "\n "); /* now print the values in hex, 4 or 8 to the row */ for (col = 0, regnum = start_regnum; - col < ncols && regnum < NUM_REGS + NUM_PSEUDO_REGS; regnum++) + col < ncols && regnum < gdbarch_num_regs (current_gdbarch) + + gdbarch_num_pseudo_regs (current_gdbarch); + regnum++) { if (*REGISTER_NAME (regnum) == '\0') continue; /* unused register */ @@ -4024,7 +4079,7 @@ mips_print_registers_info (struct gdbarch *gdbarch, struct ui_file *file, { if (regnum != -1) /* do one specified register */ { - gdb_assert (regnum >= NUM_REGS); + gdb_assert (regnum >= gdbarch_num_regs (current_gdbarch)); if (*(REGISTER_NAME (regnum)) == '\0') error (_("Not a valid register for the current processor type")); @@ -4034,8 +4089,9 @@ mips_print_registers_info (struct gdbarch *gdbarch, struct ui_file *file, else /* do all (or most) registers */ { - regnum = NUM_REGS; - while (regnum < NUM_REGS + NUM_PSEUDO_REGS) + regnum = gdbarch_num_regs (current_gdbarch); + while (regnum < gdbarch_num_regs (current_gdbarch) + + gdbarch_num_pseudo_regs (current_gdbarch)) { if (TYPE_CODE (register_type (gdbarch, regnum)) == TYPE_CODE_FLT) @@ -4467,7 +4523,7 @@ mips_skip_trampoline_code (CORE_ADDR pc) } /* Convert a dbx stab register number (from `r' declaration) to a GDB - [1 * NUM_REGS .. 2 * NUM_REGS) REGNUM. */ + [1 * gdbarch_num_regs .. 2 * gdbarch_num_regs) REGNUM. */ static int mips_stab_reg_to_regnum (int num) @@ -4484,13 +4540,14 @@ mips_stab_reg_to_regnum (int num) else /* This will hopefully (eventually) provoke a warning. Should we be calling complaint() here? */ - return NUM_REGS + NUM_PSEUDO_REGS; - return NUM_REGS + regnum; + return gdbarch_num_regs (current_gdbarch) + + gdbarch_num_pseudo_regs (current_gdbarch); + return gdbarch_num_regs (current_gdbarch) + regnum; } /* Convert a dwarf, dwarf2, or ecoff register number to a GDB [1 * - NUM_REGS .. 2 * NUM_REGS) REGNUM. */ + gdbarch_num_regs .. 2 * gdbarch_num_regs) REGNUM. */ static int mips_dwarf_dwarf2_ecoff_reg_to_regnum (int num) @@ -4507,20 +4564,21 @@ mips_dwarf_dwarf2_ecoff_reg_to_regnum (int num) else /* This will hopefully (eventually) provoke a warning. Should we be calling complaint() here? */ - return NUM_REGS + NUM_PSEUDO_REGS; - return NUM_REGS + regnum; + return gdbarch_num_regs (current_gdbarch) + + gdbarch_num_pseudo_regs (current_gdbarch); + return gdbarch_num_regs (current_gdbarch) + regnum; } static int mips_register_sim_regno (int regnum) { /* Only makes sense to supply raw registers. */ - gdb_assert (regnum >= 0 && regnum < NUM_REGS); + gdb_assert (regnum >= 0 && regnum < gdbarch_num_regs (current_gdbarch)); /* FIXME: cagney/2002-05-13: Need to look at the pseudo register to decide if it is valid. Should instead define a standard sim/gdb register numbering scheme. */ - if (REGISTER_NAME (NUM_REGS + regnum) != NULL - && REGISTER_NAME (NUM_REGS + regnum)[0] != '\0') + if (REGISTER_NAME (gdbarch_num_regs (current_gdbarch) + regnum) != NULL + && REGISTER_NAME (gdbarch_num_regs (current_gdbarch) + regnum)[0] != '\0') return regnum; else return LEGACY_SIM_REGNO_IGNORE; diff --git a/gdb/mips64obsd-tdep.c b/gdb/mips64obsd-tdep.c index 7fde211..ddcd24d 100644 --- a/gdb/mips64obsd-tdep.c +++ b/gdb/mips64obsd-tdep.c @@ -91,23 +91,33 @@ mips64obsd_sigframe_init (const struct tramp_frame *self, /* We find the appropriate instance of `struct sigcontext' at a fixed offset in the signal frame. */ - sp = frame_unwind_register_signed (next_frame, MIPS_SP_REGNUM + NUM_REGS); + sp = frame_unwind_register_signed (next_frame, + MIPS_SP_REGNUM + + gdbarch_num_regs (current_gdbarch)); sigcontext_addr = sp + 32; /* PC. */ regnum = mips_regnum (gdbarch)->pc; - trad_frame_set_reg_addr (cache, regnum + NUM_REGS, sigcontext_addr + 16); + trad_frame_set_reg_addr (cache, + regnum + gdbarch_num_regs (current_gdbarch), + sigcontext_addr + 16); /* GPRs. */ for (regnum = MIPS_AT_REGNUM, addr = sigcontext_addr + 32; regnum <= MIPS_RA_REGNUM; regnum++, addr += 8) - trad_frame_set_reg_addr (cache, regnum + NUM_REGS, addr); + trad_frame_set_reg_addr (cache, + regnum + gdbarch_num_regs (current_gdbarch), + addr); /* HI and LO. */ regnum = mips_regnum (gdbarch)->lo; - trad_frame_set_reg_addr (cache, regnum + NUM_REGS, sigcontext_addr + 280); + trad_frame_set_reg_addr (cache, + regnum + gdbarch_num_regs (current_gdbarch), + sigcontext_addr + 280); regnum = mips_regnum (gdbarch)->hi; - trad_frame_set_reg_addr (cache, regnum + NUM_REGS, sigcontext_addr + 288); + trad_frame_set_reg_addr (cache, + regnum + gdbarch_num_regs (current_gdbarch), + sigcontext_addr + 288); /* TODO: Handle the floating-point registers. */ diff --git a/gdb/monitor.c b/gdb/monitor.c index 494df39..550f8af 100644 --- a/gdb/monitor.c +++ b/gdb/monitor.c @@ -1279,7 +1279,7 @@ monitor_fetch_registers (struct regcache *regcache, int regno) return; } - for (regno = 0; regno < NUM_REGS; regno++) + for (regno = 0; regno < gdbarch_num_regs (current_gdbarch); regno++) monitor_fetch_register (regcache, regno); } else @@ -1356,7 +1356,7 @@ monitor_store_registers (struct regcache *regcache, int regno) return; } - for (regno = 0; regno < NUM_REGS; regno++) + for (regno = 0; regno < gdbarch_num_regs (current_gdbarch); regno++) monitor_store_register (regcache, regno); } diff --git a/gdb/parse.c b/gdb/parse.c index af3ef72..2193d5a 100644 --- a/gdb/parse.c +++ b/gdb/parse.c @@ -47,8 +47,7 @@ #include "parser-defs.h" #include "gdbcmd.h" #include "symfile.h" /* for overlay functions */ -#include "inferior.h" /* for NUM_PSEUDO_REGS. NOTE: replace - with "gdbarch.h" when appropriate. */ +#include "inferior.h" #include "doublest.h" #include "gdb_assert.h" #include "block.h" diff --git a/gdb/regcache.c b/gdb/regcache.c index bf313df..9899f60 100644 --- a/gdb/regcache.c +++ b/gdb/regcache.c @@ -94,8 +94,11 @@ init_regcache_descr (struct gdbarch *gdbarch) /* Total size of the register space. The raw registers are mapped directly onto the raw register cache while the pseudo's are either mapped onto raw-registers or memory. */ - descr->nr_cooked_registers = NUM_REGS + NUM_PSEUDO_REGS; - descr->sizeof_cooked_register_valid_p = NUM_REGS + NUM_PSEUDO_REGS; + descr->nr_cooked_registers = gdbarch_num_regs (current_gdbarch) + + gdbarch_num_pseudo_regs (current_gdbarch); + descr->sizeof_cooked_register_valid_p = gdbarch_num_regs (current_gdbarch) + + gdbarch_num_pseudo_regs + (current_gdbarch); /* Fill in a table of register types. */ descr->register_type @@ -105,12 +108,12 @@ init_regcache_descr (struct gdbarch *gdbarch) /* Construct a strictly RAW register cache. Don't allow pseudo's into the register cache. */ - descr->nr_raw_registers = NUM_REGS; + descr->nr_raw_registers = gdbarch_num_regs (current_gdbarch); /* FIXME: cagney/2002-08-13: Overallocate the register_valid_p array. This pretects GDB from erant code that accesses elements - of the global register_valid_p[] array in the range [NUM_REGS - .. NUM_REGS + NUM_PSEUDO_REGS). */ + of the global register_valid_p[] array in the range + [gdbarch_num_regs .. gdbarch_num_regs + gdbarch_num_pseudo_regs). */ descr->sizeof_raw_register_valid_p = descr->sizeof_cooked_register_valid_p; /* Lay out the register cache. @@ -172,7 +175,9 @@ register_size (struct gdbarch *gdbarch, int regnum) { struct regcache_descr *descr = regcache_descr (gdbarch); int size; - gdb_assert (regnum >= 0 && regnum < (NUM_REGS + NUM_PSEUDO_REGS)); + gdb_assert (regnum >= 0 + && regnum < (gdbarch_num_regs (current_gdbarch) + + gdbarch_num_pseudo_regs (current_gdbarch))); size = descr->sizeof_register[regnum]; return size; } @@ -183,8 +188,8 @@ struct regcache { struct regcache_descr *descr; /* The register buffers. A read-only register cache can hold the - full [0 .. NUM_REGS + NUM_PSEUDO_REGS) while a read/write - register cache can only hold [0 .. NUM_REGS). */ + full [0 .. gdbarch_num_regs + gdbarch_num_pseudo_regs) while a read/write + register cache can only hold [0 .. gdbarch_num_regs). */ gdb_byte *registers; /* Register cache status: register_valid_p[REG] == 0 if REG value is not in the cache @@ -270,8 +275,8 @@ regcache_save (struct regcache *dst, regcache_cooked_read_ftype *cooked_read, memset (dst->registers, 0, dst->descr->sizeof_cooked_registers); memset (dst->register_valid_p, 0, dst->descr->sizeof_cooked_register_valid_p); /* Copy over any registers (identified by their membership in the - save_reggroup) and mark them as valid. The full [0 .. NUM_REGS + - NUM_PSEUDO_REGS) range is checked since some architectures need + save_reggroup) and mark them as valid. The full [0 .. gdbarch_num_regs + + gdbarch_num_pseudo_regs) range is checked since some architectures need to save/restore `cooked' registers that live in memory. */ for (regnum = 0; regnum < dst->descr->nr_cooked_registers; regnum++) { @@ -300,8 +305,8 @@ regcache_restore (struct regcache *dst, doesn't make much sense. */ gdb_assert (!dst->readonly_p); /* Copy over any registers, being careful to only restore those that - were both saved and need to be restored. The full [0 .. NUM_REGS - + NUM_PSEUDO_REGS) range is checked since some architectures need + were both saved and need to be restored. The full [0 .. gdbarch_num_regs + + gdbarch_num_pseudo_regs) range is checked since some architectures need to save/restore `cooked' registers that live in memory. */ for (regnum = 0; regnum < dst->descr->nr_cooked_registers; regnum++) { @@ -1005,12 +1010,15 @@ regcache_dump (struct regcache *regcache, struct ui_file *file, regcache->descr->sizeof_raw_registers); fprintf_unfiltered (file, "sizeof_raw_register_valid_p %ld\n", regcache->descr->sizeof_raw_register_valid_p); - fprintf_unfiltered (file, "NUM_REGS %d\n", NUM_REGS); - fprintf_unfiltered (file, "NUM_PSEUDO_REGS %d\n", NUM_PSEUDO_REGS); + fprintf_unfiltered (file, "gdbarch_num_regs %d\n", + gdbarch_num_regs (current_gdbarch)); + fprintf_unfiltered (file, "gdbarch_num_pseudo_regs %d\n", + gdbarch_num_pseudo_regs (current_gdbarch)); #endif gdb_assert (regcache->descr->nr_cooked_registers - == (NUM_REGS + NUM_PSEUDO_REGS)); + == (gdbarch_num_regs (current_gdbarch) + + gdbarch_num_pseudo_regs (current_gdbarch))); for (regnum = -1; regnum < regcache->descr->nr_cooked_registers; regnum++) { @@ -1036,10 +1044,11 @@ regcache_dump (struct regcache *regcache, struct ui_file *file, /* Relative number. */ if (regnum < 0) fprintf_unfiltered (file, " %4s", "Rel"); - else if (regnum < NUM_REGS) + else if (regnum < gdbarch_num_regs (current_gdbarch)) fprintf_unfiltered (file, " %4d", regnum); else - fprintf_unfiltered (file, " %4d", (regnum - NUM_REGS)); + fprintf_unfiltered (file, " %4d", + (regnum - gdbarch_num_regs (current_gdbarch))); /* Offset. */ if (regnum < 0) diff --git a/gdb/reggroups.c b/gdb/reggroups.c index 812afed..90bcb8e 100644 --- a/gdb/reggroups.c +++ b/gdb/reggroups.c @@ -168,7 +168,7 @@ default_register_reggroup_p (struct gdbarch *gdbarch, int regnum, float_p = TYPE_CODE (register_type (gdbarch, regnum)) == TYPE_CODE_FLT; /* FIXME: cagney/2003-04-13: Can't yet use gdbarch_num_regs (gdbarch), as not all architectures are multi-arch. */ - raw_p = regnum < NUM_REGS; + raw_p = regnum < gdbarch_num_regs (current_gdbarch); if (group == float_reggroup) return float_p; if (group == vector_reggroup) diff --git a/gdb/remote-m32r-sdi.c b/gdb/remote-m32r-sdi.c index a4452de..1392e0b 100644 --- a/gdb/remote-m32r-sdi.c +++ b/gdb/remote-m32r-sdi.c @@ -910,7 +910,7 @@ m32r_fetch_registers (struct regcache *regcache) { int regno; - for (regno = 0; regno < NUM_REGS; regno++) + for (regno = 0; regno < gdbarch_num_regs (current_gdbarch); regno++) m32r_fetch_register (regcache, regno); } @@ -959,7 +959,7 @@ m32r_store_registers (struct regcache *regcache) { int regno; - for (regno = 0; regno < NUM_REGS; regno++) + for (regno = 0; regno < gdbarch_num_regs (current_gdbarch); regno++) m32r_store_register (regcache, regno); registers_changed (); diff --git a/gdb/remote-mips.c b/gdb/remote-mips.c index 5c2954d..38c5e2a 100644 --- a/gdb/remote-mips.c +++ b/gdb/remote-mips.c @@ -1899,7 +1899,7 @@ mips_fetch_registers (struct regcache *regcache, int regno) if (regno == -1) { - for (regno = 0; regno < NUM_REGS; regno++) + for (regno = 0; regno < gdbarch_num_regs (current_gdbarch); regno++) mips_fetch_registers (regcache, regno); return; } @@ -1960,7 +1960,7 @@ mips_store_registers (struct regcache *regcache, int regno) if (regno == -1) { - for (regno = 0; regno < NUM_REGS; regno++) + for (regno = 0; regno < gdbarch_num_regs (current_gdbarch); regno++) mips_store_registers (regcache, regno); return; } diff --git a/gdb/remote-sim.c b/gdb/remote-sim.c index af2238f..f2b7c6c 100644 --- a/gdb/remote-sim.c +++ b/gdb/remote-sim.c @@ -274,7 +274,7 @@ int one2one_register_sim_regno (int regnum) { /* Only makes sense to supply raw registers. */ - gdb_assert (regnum >= 0 && regnum < NUM_REGS); + gdb_assert (regnum >= 0 && regnum < gdbarch_num_regs (current_gdbarch)); return regnum; } @@ -283,7 +283,7 @@ gdbsim_fetch_register (struct regcache *regcache, int regno) { if (regno == -1) { - for (regno = 0; regno < NUM_REGS; regno++) + for (regno = 0; regno < gdbarch_num_regs (current_gdbarch); regno++) gdbsim_fetch_register (regcache, regno); return; } @@ -308,7 +308,7 @@ gdbsim_fetch_register (struct regcache *regcache, int regno) static int warn_user = 1; char buf[MAX_REGISTER_SIZE]; int nr_bytes; - gdb_assert (regno >= 0 && regno < NUM_REGS); + gdb_assert (regno >= 0 && regno < gdbarch_num_regs (current_gdbarch)); memset (buf, 0, MAX_REGISTER_SIZE); nr_bytes = sim_fetch_register (gdbsim_desc, REGISTER_SIM_REGNO (regno), @@ -345,7 +345,7 @@ gdbsim_store_register (struct regcache *regcache, int regno) { if (regno == -1) { - for (regno = 0; regno < NUM_REGS; regno++) + for (regno = 0; regno < gdbarch_num_regs (current_gdbarch); regno++) gdbsim_store_register (regcache, regno); return; } diff --git a/gdb/remote.c b/gdb/remote.c index 152ab66..d6e5000 100644 --- a/gdb/remote.c +++ b/gdb/remote.c @@ -269,7 +269,7 @@ struct remote_arch_state long sizeof_g_packet; /* Description of the remote protocol registers indexed by REGNUM - (making an array NUM_REGS in size). */ + (making an array gdbarch_num_regs in size). */ struct packet_reg *regs; /* This is the size (in chars) of the first response to the ``g'' @@ -336,8 +336,10 @@ init_remote_state (struct gdbarch *gdbarch) /* Use the architecture to build a regnum<->pnum table, which will be 1:1 unless a feature set specifies otherwise. */ - rsa->regs = GDBARCH_OBSTACK_CALLOC (gdbarch, NUM_REGS, struct packet_reg); - for (regnum = 0; regnum < NUM_REGS; regnum++) + rsa->regs = GDBARCH_OBSTACK_CALLOC (gdbarch, + gdbarch_num_regs (current_gdbarch), + struct packet_reg); + for (regnum = 0; regnum < gdbarch_num_regs (current_gdbarch); regnum++) { struct packet_reg *r = &rsa->regs[regnum]; @@ -354,8 +356,11 @@ init_remote_state (struct gdbarch *gdbarch) with a remote protocol number, in order of ascending protocol number. */ - remote_regs = alloca (NUM_REGS * sizeof (struct packet_reg *)); - for (num_remote_regs = 0, regnum = 0; regnum < NUM_REGS; regnum++) + remote_regs = alloca (gdbarch_num_regs (current_gdbarch) + * sizeof (struct packet_reg *)); + for (num_remote_regs = 0, regnum = 0; + regnum < gdbarch_num_regs (current_gdbarch); + regnum++) if (rsa->regs[regnum].pnum != -1) remote_regs[num_remote_regs++] = &rsa->regs[regnum]; @@ -423,7 +428,7 @@ get_remote_packet_size (void) static struct packet_reg * packet_reg_from_regnum (struct remote_arch_state *rsa, long regnum) { - if (regnum < 0 && regnum >= NUM_REGS) + if (regnum < 0 && regnum >= gdbarch_num_regs (current_gdbarch)) return NULL; else { @@ -437,7 +442,7 @@ static struct packet_reg * packet_reg_from_pnum (struct remote_arch_state *rsa, LONGEST pnum) { int i; - for (i = 0; i < NUM_REGS; i++) + for (i = 0; i < gdbarch_num_regs (current_gdbarch); i++) { struct packet_reg *r = &rsa->regs[i]; if (r->pnum == pnum) @@ -3611,7 +3616,7 @@ process_g_packet (struct regcache *regcache) { rsa->sizeof_g_packet = buf_len / 2; - for (i = 0; i < NUM_REGS; i++) + for (i = 0; i < gdbarch_num_regs (current_gdbarch); i++) { if (rsa->regs[i].pnum == -1) continue; @@ -3649,7 +3654,7 @@ process_g_packet (struct regcache *regcache) { int i; - for (i = 0; i < NUM_REGS; i++) + for (i = 0; i < gdbarch_num_regs (current_gdbarch); i++) { struct packet_reg *r = &rsa->regs[i]; if (r->in_g_packet) @@ -3716,7 +3721,7 @@ remote_fetch_registers (struct regcache *regcache, int regnum) fetch_registers_using_g (regcache); - for (i = 0; i < NUM_REGS; i++) + for (i = 0; i < gdbarch_num_regs (current_gdbarch); i++) if (!rsa->regs[i].in_g_packet) if (!fetch_register_using_p (regcache, &rsa->regs[i])) { @@ -3742,7 +3747,7 @@ remote_prepare_to_store (struct regcache *regcache) case PACKET_DISABLE: case PACKET_SUPPORT_UNKNOWN: /* Make sure all the necessary registers are cached. */ - for (i = 0; i < NUM_REGS; i++) + for (i = 0; i < gdbarch_num_regs (current_gdbarch); i++) if (rsa->regs[i].in_g_packet) regcache_raw_read (regcache, rsa->regs[i].regnum, buf); break; @@ -3807,7 +3812,7 @@ store_registers_using_G (const struct regcache *regcache) int i; regs = alloca (rsa->sizeof_g_packet); memset (regs, 0, rsa->sizeof_g_packet); - for (i = 0; i < NUM_REGS; i++) + for (i = 0; i < gdbarch_num_regs (current_gdbarch); i++) { struct packet_reg *r = &rsa->regs[i]; if (r->in_g_packet) @@ -3862,7 +3867,7 @@ remote_store_registers (struct regcache *regcache, int regnum) store_registers_using_G (regcache); - for (i = 0; i < NUM_REGS; i++) + for (i = 0; i < gdbarch_num_regs (current_gdbarch); i++) if (!rsa->regs[i].in_g_packet) if (!store_register_using_P (regcache, &rsa->regs[i])) /* See above for why we do not issue an error here. */ diff --git a/gdb/rs6000-nat.c b/gdb/rs6000-nat.c index 3be2e9f..2c77328 100644 --- a/gdb/rs6000-nat.c +++ b/gdb/rs6000-nat.c @@ -228,7 +228,7 @@ fetch_register (struct regcache *regcache, int regno) /* Bogus register number. */ else if (nr < 0) { - if (regno >= NUM_REGS) + if (regno >= gdbarch_num_regs (current_gdbarch)) fprintf_unfiltered (gdb_stderr, "gdb error: register no %d not implemented.\n", regno); @@ -288,7 +288,7 @@ store_register (const struct regcache *regcache, int regno) /* Bogus register number. */ else if (nr < 0) { - if (regno >= NUM_REGS) + if (regno >= gdbarch_num_regs (current_gdbarch)) fprintf_unfiltered (gdb_stderr, "gdb error: register no %d not implemented.\n", regno); diff --git a/gdb/rs6000-tdep.c b/gdb/rs6000-tdep.c index afd901e..5c23bf2 100644 --- a/gdb/rs6000-tdep.c +++ b/gdb/rs6000-tdep.c @@ -289,7 +289,9 @@ rs6000_register_sim_regno (int reg) struct gdbarch_tdep *tdep = gdbarch_tdep (current_gdbarch); int sim_regno; - gdb_assert (0 <= reg && reg <= NUM_REGS + NUM_PSEUDO_REGS); + gdb_assert (0 <= reg + && reg <= gdbarch_num_regs (current_gdbarch) + + gdbarch_num_pseudo_regs (current_gdbarch)); sim_regno = tdep->sim_regno[reg]; if (sim_regno >= 0) diff --git a/gdb/sh64-tdep.c b/gdb/sh64-tdep.c index 62b6825..32de32c 100644 --- a/gdb/sh64-tdep.c +++ b/gdb/sh64-tdep.c @@ -2002,9 +2002,10 @@ sh64_do_pseudo_register (struct gdbarch *gdbarch, struct ui_file *file, { /* All the sh64-compact mode registers are pseudo registers. */ - if (regnum < NUM_REGS - || regnum >= NUM_REGS + NUM_PSEUDO_REGS_SH_MEDIA - + NUM_PSEUDO_REGS_SH_COMPACT) + if (regnum < gdbarch_num_regs (current_gdbarch) + || regnum >= gdbarch_num_regs (current_gdbarch) + + NUM_PSEUDO_REGS_SH_MEDIA + + NUM_PSEUDO_REGS_SH_COMPACT) internal_error (__FILE__, __LINE__, _("Invalid pseudo register number %d\n"), regnum); @@ -2092,11 +2093,12 @@ static void sh64_print_register (struct gdbarch *gdbarch, struct ui_file *file, struct frame_info *frame, int regnum) { - if (regnum < 0 || regnum >= NUM_REGS + NUM_PSEUDO_REGS) + if (regnum < 0 || regnum >= gdbarch_num_regs (current_gdbarch) + + gdbarch_num_pseudo_regs (current_gdbarch)) internal_error (__FILE__, __LINE__, _("Invalid register number %d\n"), regnum); - else if (regnum >= 0 && regnum < NUM_REGS) + else if (regnum >= 0 && regnum < gdbarch_num_regs (current_gdbarch)) { if (TYPE_CODE (register_type (gdbarch, regnum)) == TYPE_CODE_FLT) sh64_do_fp_register (gdbarch, file, frame, regnum); /* FP regs */ @@ -2104,7 +2106,8 @@ sh64_print_register (struct gdbarch *gdbarch, struct ui_file *file, sh64_do_register (gdbarch, file, frame, regnum); } - else if (regnum < NUM_REGS + NUM_PSEUDO_REGS) + else if (regnum < gdbarch_num_regs (current_gdbarch) + + gdbarch_num_pseudo_regs (current_gdbarch)) sh64_do_pseudo_register (gdbarch, file, frame, regnum); } @@ -2124,7 +2127,7 @@ sh64_media_print_registers_info (struct gdbarch *gdbarch, struct ui_file *file, /* do all (or most) registers */ { regnum = 0; - while (regnum < NUM_REGS) + while (regnum < gdbarch_num_regs (current_gdbarch)) { /* If the register name is empty, it is undefined for this processor, so don't display anything. */ @@ -2155,7 +2158,8 @@ sh64_media_print_registers_info (struct gdbarch *gdbarch, struct ui_file *file, } if (fpregs) - while (regnum < NUM_REGS + NUM_PSEUDO_REGS) + while (regnum < gdbarch_num_regs (current_gdbarch) + + gdbarch_num_pseudo_regs (current_gdbarch)) { sh64_do_pseudo_register (gdbarch, file, frame, regnum); regnum++; @@ -2183,7 +2187,8 @@ sh64_compact_print_registers_info (struct gdbarch *gdbarch, /* do all compact registers */ { regnum = R0_C_REGNUM; - while (regnum < NUM_REGS + NUM_PSEUDO_REGS) + while (regnum < gdbarch_num_regs (current_gdbarch) + + gdbarch_num_pseudo_regs (current_gdbarch)) { sh64_do_pseudo_register (gdbarch, file, frame, regnum); regnum++; diff --git a/gdb/stabsread.c b/gdb/stabsread.c index feda42f..5d3da16 100644 --- a/gdb/stabsread.c +++ b/gdb/stabsread.c @@ -1021,10 +1021,12 @@ define_symbol (CORE_ADDR valu, char *string, int desc, int type, SYMBOL_TYPE (sym) = read_type (&p, objfile); SYMBOL_CLASS (sym) = LOC_REGPARM; SYMBOL_VALUE (sym) = STAB_REG_TO_REGNUM (valu); - if (SYMBOL_VALUE (sym) >= NUM_REGS + NUM_PSEUDO_REGS) + if (SYMBOL_VALUE (sym) >= gdbarch_num_regs (current_gdbarch) + + gdbarch_num_pseudo_regs (current_gdbarch)) { reg_value_complaint (SYMBOL_VALUE (sym), - NUM_REGS + NUM_PSEUDO_REGS, + gdbarch_num_regs (current_gdbarch) + + gdbarch_num_pseudo_regs (current_gdbarch), SYMBOL_PRINT_NAME (sym)); SYMBOL_VALUE (sym) = SP_REGNUM; /* Known safe, though useless */ } @@ -1037,10 +1039,12 @@ define_symbol (CORE_ADDR valu, char *string, int desc, int type, SYMBOL_TYPE (sym) = read_type (&p, objfile); SYMBOL_CLASS (sym) = LOC_REGISTER; SYMBOL_VALUE (sym) = STAB_REG_TO_REGNUM (valu); - if (SYMBOL_VALUE (sym) >= NUM_REGS + NUM_PSEUDO_REGS) + if (SYMBOL_VALUE (sym) >= gdbarch_num_regs (current_gdbarch) + + gdbarch_num_pseudo_regs (current_gdbarch)) { reg_value_complaint (SYMBOL_VALUE (sym), - NUM_REGS + NUM_PSEUDO_REGS, + gdbarch_num_regs (current_gdbarch) + + gdbarch_num_pseudo_regs (current_gdbarch), SYMBOL_PRINT_NAME (sym)); SYMBOL_VALUE (sym) = SP_REGNUM; /* Known safe, though useless */ } @@ -1309,10 +1313,12 @@ define_symbol (CORE_ADDR valu, char *string, int desc, int type, SYMBOL_TYPE (sym) = read_type (&p, objfile); SYMBOL_CLASS (sym) = LOC_REGPARM_ADDR; SYMBOL_VALUE (sym) = STAB_REG_TO_REGNUM (valu); - if (SYMBOL_VALUE (sym) >= NUM_REGS + NUM_PSEUDO_REGS) + if (SYMBOL_VALUE (sym) >= gdbarch_num_regs (current_gdbarch) + + gdbarch_num_pseudo_regs (current_gdbarch)) { reg_value_complaint (SYMBOL_VALUE (sym), - NUM_REGS + NUM_PSEUDO_REGS, + gdbarch_num_regs (current_gdbarch) + + gdbarch_num_pseudo_regs (current_gdbarch), SYMBOL_PRINT_NAME (sym)); SYMBOL_VALUE (sym) = SP_REGNUM; /* Known safe, though useless */ } diff --git a/gdb/stack.c b/gdb/stack.c index 08eac88..9d1e8b8 100644 --- a/gdb/stack.c +++ b/gdb/stack.c @@ -1059,7 +1059,8 @@ frame_info (char *addr_exp, int from_tty) } count = 0; - numregs = NUM_REGS + NUM_PSEUDO_REGS; + numregs = gdbarch_num_regs (current_gdbarch) + + gdbarch_num_pseudo_regs (current_gdbarch); for (i = 0; i < numregs; i++) if (i != SP_REGNUM && gdbarch_register_reggroup_p (current_gdbarch, i, all_reggroup)) diff --git a/gdb/target-descriptions.c b/gdb/target-descriptions.c index 7d6652d..e8b7cbc 100644 --- a/gdb/target-descriptions.c +++ b/gdb/target-descriptions.c @@ -717,7 +717,7 @@ tdesc_use_registers (struct gdbarch *gdbarch, htab_remove_elt (reg_hash, reg); /* Assign numbers to the remaining registers and add them to the - list of registers. The new numbers are always above NUM_REGS. + list of registers. The new numbers are always above gdbarch_num_regs. Iterate over the features, not the hash table, so that the order matches that in the target description. */ diff --git a/gdb/target-descriptions.h b/gdb/target-descriptions.h index 9c64190..575b349 100644 --- a/gdb/target-descriptions.h +++ b/gdb/target-descriptions.h @@ -48,7 +48,7 @@ void target_clear_description (void); const struct target_desc *target_current_description (void); /* Record architecture-specific functions to call for pseudo-register - support. If tdesc_use_registers is called and NUM_PSEUDO_REGS + support. If tdesc_use_registers is called and gdbarch_num_pseudo_regs is greater than zero, then these should be called as well. They are equivalent to the gdbarch methods with similar names, except that they will only be called for pseudo registers. */ @@ -66,10 +66,10 @@ void set_tdesc_pseudo_register_reggroup_p /* Update GDBARCH to use the target description for registers. Fixed register assignments are taken from EARLY_DATA, which is freed. All registers which have not been assigned fixed numbers are given - numbers above the current value of NUM_REGS. NUM_REGS and various - register-related predicates are updated to refer to the target - description. This function should only be called from the - architecture's gdbarch initialization routine, and only after + numbers above the current value of gdbarch_num_regs. + gdbarch_num_regs and various register-related predicates are updated to + refer to the target description. This function should only be called from + the architecture's gdbarch initialization routine, and only after successfully validating the required registers. */ void tdesc_use_registers (struct gdbarch *gdbarch, diff --git a/gdb/target.c b/gdb/target.c index bbd97fa..3331d8b 100644 --- a/gdb/target.c +++ b/gdb/target.c @@ -2154,7 +2154,8 @@ debug_print_register (const char * func, struct regcache *regcache, int regno) { fprintf_unfiltered (gdb_stdlog, "%s ", func); - if (regno >= 0 && regno < NUM_REGS + NUM_PSEUDO_REGS + if (regno >= 0 && regno < gdbarch_num_regs (current_gdbarch) + + gdbarch_num_pseudo_regs (current_gdbarch) && REGISTER_NAME (regno) != NULL && REGISTER_NAME (regno)[0] != '\0') fprintf_unfiltered (gdb_stdlog, "(%s)", REGISTER_NAME (regno)); else diff --git a/gdb/tracepoint.c b/gdb/tracepoint.c index fb771d2..8a33bb9 100644 --- a/gdb/tracepoint.c +++ b/gdb/tracepoint.c @@ -1565,7 +1565,7 @@ encode_actions (struct tracepoint *t, char ***tdp_actions, if (0 == strncasecmp ("$reg", action_exp, 4)) { - for (i = 0; i < NUM_REGS; i++) + for (i = 0; i < gdbarch_num_regs (current_gdbarch); i++) add_register (collect, i); action_exp = strchr (action_exp, ','); /* more? */ } diff --git a/gdb/trad-frame.c b/gdb/trad-frame.c index 5c8f213..6dfa0b6 100644 --- a/gdb/trad-frame.c +++ b/gdb/trad-frame.c @@ -53,7 +53,8 @@ trad_frame_alloc_saved_regs (struct frame_info *next_frame) { int regnum; struct gdbarch *gdbarch = get_frame_arch (next_frame); - int numregs = NUM_REGS + NUM_PSEUDO_REGS; + int numregs = gdbarch_num_regs (current_gdbarch) + + gdbarch_num_pseudo_regs (current_gdbarch); struct trad_frame_saved_reg *this_saved_regs = FRAME_OBSTACK_CALLOC (numregs, struct trad_frame_saved_reg); for (regnum = 0; regnum < numregs; regnum++) diff --git a/gdb/tui/tui-regs.c b/gdb/tui/tui-regs.c index e40f340..96b52d4 100644 --- a/gdb/tui/tui-regs.c +++ b/gdb/tui/tui-regs.c @@ -220,7 +220,10 @@ tui_show_register_group (struct gdbarch *gdbarch, struct reggroup *group, /* See how many registers must be displayed. */ nr_regs = 0; - for (regnum = 0; regnum < NUM_REGS + NUM_PSEUDO_REGS; regnum++) + for (regnum = 0; + regnum < gdbarch_num_regs (current_gdbarch) + + gdbarch_num_pseudo_regs (current_gdbarch); + regnum++) { /* Must be in the group and have a name. */ if (gdbarch_register_reggroup_p (gdbarch, regnum, group) @@ -256,7 +259,10 @@ tui_show_register_group (struct gdbarch *gdbarch, struct reggroup *group, /* Now set the register names and values */ pos = 0; - for (regnum = 0; regnum < NUM_REGS + NUM_PSEUDO_REGS; regnum++) + for (regnum = 0; + regnum < gdbarch_num_regs (current_gdbarch) + + gdbarch_num_pseudo_regs (current_gdbarch); + regnum++) { struct tui_gen_win_info *data_item_win; struct tui_data_element *data; diff --git a/gdb/user-regs.c b/gdb/user-regs.c index ef9d3b2..9a11bb1d 100644 --- a/gdb/user-regs.c +++ b/gdb/user-regs.c @@ -31,12 +31,13 @@ /* A table of user registers. User registers have regnum's that live above of the range [0 - .. NUM_REGS + NUM_PSEUDO_REGS) (which is controlled by the target). + .. gdbarch_num_regs + gdbarch_num_pseudo_regs) + (which is controlled by the target). The target should never see a user register's regnum value. Always append, never delete. By doing this, the relative regnum - (offset from NUM_REGS + NUM_PSEUDO_REGS) assigned to each user - register never changes. */ + (offset from gdbarch_num_regs + gdbarch_num_pseudo_regs) + assigned to each user register never changes. */ struct user_reg { @@ -155,7 +156,8 @@ user_reg_map_name_to_regnum (struct gdbarch *gdbarch, const char *name, if ((len < 0 && strcmp (reg->name, name)) || (len == strlen (reg->name) && strncmp (reg->name, name, len) == 0)) - return NUM_REGS + NUM_PSEUDO_REGS + nr; + return gdbarch_num_regs (current_gdbarch) + + gdbarch_num_pseudo_regs (current_gdbarch) + nr; } } diff --git a/gdb/user-regs.h b/gdb/user-regs.h index 5cc9d05..f3779f4 100644 --- a/gdb/user-regs.h +++ b/gdb/user-regs.h @@ -31,7 +31,8 @@ specific registers are present when the architecture is selected. These registers are assigned register numbers outside the - architecture's register range [0 .. NUM_REGS + NUM_PSEUDO_REGS). + architecture's register range + [0 .. gdbarch_num_regs + gdbarch_num_pseudo_regs]. Their values should be constructed using per-frame information. */ /* TODO: cagney/2003-06-27: Need to think more about how these diff --git a/gdb/win32-nat.c b/gdb/win32-nat.c index b52edd0..13f90ee 100644 --- a/gdb/win32-nat.c +++ b/gdb/win32-nat.c @@ -396,7 +396,7 @@ do_win32_fetch_inferior_registers (struct regcache *regcache, int r) regcache_raw_supply (regcache, r, context_offset); else { - for (r = 0; r < NUM_REGS; r++) + for (r = 0; r < gdbarch_num_regs (current_gdbarch); r++) do_win32_fetch_inferior_registers (regcache, r); } @@ -423,7 +423,7 @@ do_win32_store_inferior_registers (const struct regcache *regcache, int r) ((char *) ¤t_thread->context) + mappings[r]); else { - for (r = 0; r < NUM_REGS; r++) + for (r = 0; r < gdbarch_num_regs (current_gdbarch); r++) do_win32_store_inferior_registers (regcache, r); } } @@ -2256,7 +2256,7 @@ fetch_elf_core_registers (struct regcache *regcache, error (_("Core file register section too small (%u bytes)."), core_reg_size); return; } - for (r = 0; r < NUM_REGS; r++) + for (r = 0; r < gdbarch_num_regs (current_gdbarch); r++) regcache_raw_supply (regcache, r, core_reg_sect + mappings[r]); } diff --git a/gdb/windows-nat.c b/gdb/windows-nat.c index b52edd0..13f90ee 100644 --- a/gdb/windows-nat.c +++ b/gdb/windows-nat.c @@ -396,7 +396,7 @@ do_win32_fetch_inferior_registers (struct regcache *regcache, int r) regcache_raw_supply (regcache, r, context_offset); else { - for (r = 0; r < NUM_REGS; r++) + for (r = 0; r < gdbarch_num_regs (current_gdbarch); r++) do_win32_fetch_inferior_registers (regcache, r); } @@ -423,7 +423,7 @@ do_win32_store_inferior_registers (const struct regcache *regcache, int r) ((char *) ¤t_thread->context) + mappings[r]); else { - for (r = 0; r < NUM_REGS; r++) + for (r = 0; r < gdbarch_num_regs (current_gdbarch); r++) do_win32_store_inferior_registers (regcache, r); } } @@ -2256,7 +2256,7 @@ fetch_elf_core_registers (struct regcache *regcache, error (_("Core file register section too small (%u bytes)."), core_reg_size); return; } - for (r = 0; r < NUM_REGS; r++) + for (r = 0; r < gdbarch_num_regs (current_gdbarch); r++) regcache_raw_supply (regcache, r, core_reg_sect + mappings[r]); } diff --git a/gdb/xtensa-tdep.c b/gdb/xtensa-tdep.c index eb06b06..ef9fa24 100644 --- a/gdb/xtensa-tdep.c +++ b/gdb/xtensa-tdep.c @@ -181,7 +181,8 @@ static const char * xtensa_register_name (int regnum) { /* Return the name stored in the register map. */ - if (regnum >= 0 && regnum < NUM_REGS + NUM_PSEUDO_REGS) + if (regnum >= 0 && regnum < gdbarch_num_regs (current_gdbarch) + + gdbarch_num_pseudo_regs (current_gdbarch)) return REGMAP[regnum].name; /* Invalid register number. */ @@ -211,7 +212,8 @@ xtensa_register_type (struct gdbarch *gdbarch, int regnum) return lookup_pointer_type (builtin_type_void); /* Return the stored type for all other registers. */ - else if (regnum >= 0 && regnum < NUM_REGS + NUM_PSEUDO_REGS) + else if (regnum >= 0 && regnum < gdbarch_num_regs (current_gdbarch) + + gdbarch_num_pseudo_regs (current_gdbarch)) { xtensa_register_t* reg = ®MAP[regnum]; @@ -289,7 +291,10 @@ xtensa_reg_to_regnum (int regnum) if (regnum >= 0 && regnum < 16) return A0_BASE + regnum; - for (i = 0; i < NUM_REGS + NUM_PSEUDO_REGS; i++) + for (i = 0; + i < gdbarch_num_regs (current_gdbarch) + + gdbarch_num_pseudo_regs (current_gdbarch); + i++) if (regnum == REGMAP[i].target_number) return i; @@ -491,11 +496,13 @@ xtensa_pseudo_register_read (struct gdbarch *gdbarch, } /* We can always read 'regular' registers. */ - if (regnum >= 0 && regnum < NUM_REGS) + if (regnum >= 0 && regnum < gdbarch_num_regs (current_gdbarch)) regcache_raw_read (regcache, regnum, buffer); /* Pseudo registers. */ - else if (regnum >= 0 && regnum < NUM_REGS + NUM_PSEUDO_REGS) + else if (regnum >= 0 + && regnum < gdbarch_num_regs (current_gdbarch) + + gdbarch_num_pseudo_regs (current_gdbarch)) { xtensa_register_t *reg = ®MAP[regnum]; xtensa_register_type_t type = reg->type; @@ -574,11 +581,13 @@ xtensa_pseudo_register_write (struct gdbarch *gdbarch, /* We can always write 'core' registers. Note: We might have converted Ax->ARy. */ - if (regnum >= 0 && regnum < NUM_REGS) + if (regnum >= 0 && regnum < gdbarch_num_regs (current_gdbarch)) regcache_raw_write (regcache, regnum, buffer); /* Pseudo registers. */ - else if (regnum >= 0 && regnum < NUM_REGS + NUM_PSEUDO_REGS) + else if (regnum >= 0 + && regnum < gdbarch_num_regs (current_gdbarch) + + gdbarch_num_pseudo_regs (current_gdbarch)) { xtensa_register_t *reg = ®MAP[regnum]; xtensa_register_type_t type = reg->type; @@ -701,7 +710,7 @@ xtensa_register_reggroup_p (struct gdbarch *gdbarch, if (group == vector_reggroup || group == xtensa_vectra_reggroup) return rg & xtRegisterGroupVectra; if (group == save_reggroup || group == restore_reggroup) - return (regnum < NUM_REGS + return (regnum < gdbarch_num_regs (current_gdbarch) && (reg->flags & SAVE_REST_FLAGS) == SAVE_REST_VALID); else return 1; diff --git a/gdb/xtensa-tdep.h b/gdb/xtensa-tdep.h index b6ed965..4b21908 100644 --- a/gdb/xtensa-tdep.h +++ b/gdb/xtensa-tdep.h @@ -264,7 +264,9 @@ struct gdbarch_tdep #define REGMAP_BYTES (gdbarch_tdep (current_gdbarch)->regmap_bytes) #define A0_BASE (gdbarch_tdep (current_gdbarch)->a0_base) #define AR_BASE (gdbarch_tdep (current_gdbarch)->ar_base) -#define FP_ALIAS (NUM_REGS + NUM_PSEUDO_REGS) +#define FP_ALIAS \ + (gdbarch_num_regs (current_gdbarch) \ + + gdbarch_num_pseudo_regs (current_gdbarch)) #define CALL_ABI (gdbarch_tdep (current_gdbarch)->call_abi) #define NUM_CONTEXTS (gdbarch_tdep (current_gdbarch)->num_contexts) |