From 3ff7cf9eedd0509c5d9f18df364a7e6fb6a57752 Mon Sep 17 00:00:00 2001 From: Joel Brobecker Date: Fri, 15 Aug 2003 23:02:05 +0000 Subject: Further multiarching work mostly for hppa64-*-hpux11: * hppa-tdep.h: New file. * hppa-tdep.c: #include hppa-tdep.c. (hppa32_num_regs): Renamed from hppa_num_regs. (hppa64_num_regs): New constant. (hppa64_call_dummy_breakpoint_offset): New constant. (hppa32_call_dummy_length): New constant. (hppa64_call_dummy_length): New constant. (hppa32_stack_align): Make name 32bit explicit. (hppa32_register_virtual_type): Likewise. (hppa32_extract_return_value): Likewise. (hppa32_use_struct_convention): Likewise. (hppa32_store_return_value): Likewise. (hppa64_register_virtual_type): New function. (hppa64_extract_return_value): New function. (hppa64_use_struct_convention): New function. (hppa64_store_return_value): New function. (hppa_frame_locals_address): Remove declaration, function does not exist anymore. (hppa_register_byte): Add support for PA64 ABI. (hppa_gdbarch_init): Add support for PA64 ABI. * hppa-hpux-tdep.c (hppa32_hpux_frame_saved_pc_in_sigtramp): Make name 32bit explicit. (hppa32_hpux_frame_base_before_sigtramp): Likewise. (hppa32_hpux_frame_find_saved_regs_in_sigtramp): Likewise. (hppa64_hpux_frame_saved_pc_in_sigtramp): New function. (hppa64_hpux_frame_base_before_sigtramp): New function. (hppa64_hpux_frame_find_saved_regs_in_sigtramp): New function. * config/pa/tm-hppa64.h: Remove macros that are no longer necessary now that the gdbarch vector is properly setup. Transform some macros into function calls. Some minor cleanup. * config/pa/tm-hppah.h: Update function calls in macros following the function renaming in hppa-hpux-tdep.c. * Makefile.in (hppa_tdep_h): New variable. (hppa-tdep.o): Add dependency over hppa_tdep_h. --- gdb/hppa-hpux-tdep.c | 81 +++++++++++++++++++++++++++++++++++++++++++--------- 1 file changed, 67 insertions(+), 14 deletions(-) (limited to 'gdb/hppa-hpux-tdep.c') diff --git a/gdb/hppa-hpux-tdep.c b/gdb/hppa-hpux-tdep.c index e7849bf4b3f..62271ffbc14 100644 --- a/gdb/hppa-hpux-tdep.c +++ b/gdb/hppa-hpux-tdep.c @@ -32,12 +32,18 @@ extern initialize_file_ftype _initialize_hppa_hpux_tdep; /* FIXME: brobecker 2002-12-25. The following functions will eventually become static, after the multiarching conversion is done. */ int hppa_hpux_pc_in_sigtramp (CORE_ADDR pc, char *name); -void hppa_hpux_frame_saved_pc_in_sigtramp (struct frame_info *fi, - CORE_ADDR *tmp); -void hppa_hpux_frame_base_before_sigtramp (struct frame_info *fi, - CORE_ADDR *tmp); -void hppa_hpux_frame_find_saved_regs_in_sigtramp - (struct frame_info *fi, CORE_ADDR *fsr); +void hppa32_hpux_frame_saved_pc_in_sigtramp (struct frame_info *fi, + CORE_ADDR *tmp); +void hppa32_hpux_frame_base_before_sigtramp (struct frame_info *fi, + CORE_ADDR *tmp); +void hppa32_hpux_frame_find_saved_regs_in_sigtramp (struct frame_info *fi, + CORE_ADDR *fsr); +void hppa64_hpux_frame_saved_pc_in_sigtramp (struct frame_info *fi, + CORE_ADDR *tmp); +void hppa64_hpux_frame_base_before_sigtramp (struct frame_info *fi, + CORE_ADDR *tmp); +void hppa64_hpux_frame_find_saved_regs_in_sigtramp (struct frame_info *fi, + CORE_ADDR *fsr); int hppa_hpux_pc_in_sigtramp (CORE_ADDR pc, char *name) @@ -48,9 +54,9 @@ hppa_hpux_pc_in_sigtramp (CORE_ADDR pc, char *name) return (name && (strcmp ("_sigreturn", name) == 0)); } -/* For hppa_hpux_frame_saved_pc_in_sigtramp, - hppa_hpux_frame_base_before_sigtramp and - hppa_hpux_frame_find_saved_regs_in_sigtramp: +/* For hppa32_hpux_frame_saved_pc_in_sigtramp, + hppa32_hpux_frame_base_before_sigtramp and + hppa32_hpux_frame_find_saved_regs_in_sigtramp: The signal context structure pointer is always saved at the base of the frame which "calls" the signal handler. We only want to find @@ -67,21 +73,21 @@ hppa_hpux_pc_in_sigtramp (CORE_ADDR pc, char *name) written. */ void -hppa_hpux_frame_saved_pc_in_sigtramp (struct frame_info *fi, CORE_ADDR *tmp) +hppa32_hpux_frame_saved_pc_in_sigtramp (struct frame_info *fi, CORE_ADDR *tmp) { *tmp = read_memory_integer (get_frame_base (fi) + (43 * 4), 4); } void -hppa_hpux_frame_base_before_sigtramp (struct frame_info *fi, - CORE_ADDR *tmp) +hppa32_hpux_frame_base_before_sigtramp (struct frame_info *fi, + CORE_ADDR *tmp) { *tmp = read_memory_integer (get_frame_base (fi) + (40 * 4), 4); } void -hppa_hpux_frame_find_saved_regs_in_sigtramp (struct frame_info *fi, - CORE_ADDR *fsr) +hppa32_hpux_frame_find_saved_regs_in_sigtramp (struct frame_info *fi, + CORE_ADDR *fsr) { int i; const CORE_ADDR tmp = get_frame_base (fi) + (10 * 4); @@ -95,6 +101,53 @@ hppa_hpux_frame_find_saved_regs_in_sigtramp (struct frame_info *fi, } } +/* For hppa64_hpux_frame_saved_pc_in_sigtramp, + hppa64_hpux_frame_base_before_sigtramp and + hppa64_hpux_frame_find_saved_regs_in_sigtramp: + + These functions are the PA64 ABI equivalents of the 32bits counterparts + above. See the comments there. + + For PA64, the save_state structure is at an offset of 24 32-bit words + from the sigcontext structure. The 64 bit general registers are at an + offset of 640 bytes from the beginning of the save_state structure, + and the floating pointer register are at an offset of 256 bytes from + the beginning of the save_state structure. */ + +void +hppa64_hpux_frame_saved_pc_in_sigtramp (struct frame_info *fi, CORE_ADDR *tmp) +{ + *tmp = read_memory_integer + (get_frame_base (fi) + (24 * 4) + 640 + (33 * 8), 8); +} + +void +hppa64_hpux_frame_base_before_sigtramp (struct frame_info *fi, + CORE_ADDR *tmp) +{ + *tmp = read_memory_integer + (get_frame_base (fi) + (24 * 4) + 640 + (30 * 8), 8); +} + +void +hppa64_hpux_frame_find_saved_regs_in_sigtramp (struct frame_info *fi, + CORE_ADDR *fsr) +{ + int i; + const CORE_ADDR tmp1 = get_frame_base (fi) + (24 * 4) + 640; + const CORE_ADDR tmp2 = get_frame_base (fi) + (24 * 4) + 256; + + for (i = 0; i < NUM_REGS; i++) + { + if (i == SP_REGNUM) + fsr[SP_REGNUM] = read_memory_integer (tmp1 + SP_REGNUM * 8, 8); + else if (i >= FP0_REGNUM) + fsr[i] = tmp2 + (i - FP0_REGNUM) * 8; + else + fsr[i] = tmp1 + i * 8; + } +} + static void hppa_hpux_init_abi (struct gdbarch_info info, struct gdbarch *gdbarch) { -- cgit v1.2.1