diff options
Diffstat (limited to 'gdb/hppa-tdep.c')
| -rw-r--r-- | gdb/hppa-tdep.c | 3142 |
1 files changed, 616 insertions, 2526 deletions
diff --git a/gdb/hppa-tdep.c b/gdb/hppa-tdep.c index 06aa5a9..f96a211 100644 --- a/gdb/hppa-tdep.c +++ b/gdb/hppa-tdep.c @@ -35,10 +35,14 @@ #include "osabi.h" #include "gdb_assert.h" #include "infttrace.h" +#include "arch-utils.h" /* For argument passing to the inferior */ #include "symtab.h" #include "infcall.h" #include "dis-asm.h" +#include "trad-frame.h" +#include "frame-unwind.h" +#include "frame-base.h" #ifdef USG #include <sys/types.h> @@ -72,26 +76,12 @@ static const int hppa32_num_regs = 128; static const int hppa64_num_regs = 96; -static const int hppa64_call_dummy_breakpoint_offset = 22 * 4; - -/* DEPRECATED_CALL_DUMMY_LENGTH is computed based on the size of a - word on the target machine, not the size of an instruction. Since - a word on this target holds two instructions we have to divide the - instruction size by two to get the word size of the dummy. */ -static const int hppa32_call_dummy_length = INSTRUCTION_SIZE * 28; -static const int hppa64_call_dummy_length = INSTRUCTION_SIZE * 26 / 2; - /* Get at various relevent fields of an instruction word. */ #define MASK_5 0x1f #define MASK_11 0x7ff #define MASK_14 0x3fff #define MASK_21 0x1fffff -/* Define offsets into the call dummy for the target function address. - See comments related to CALL_DUMMY for more info. */ -#define FUNC_LDIL_OFFSET (INSTRUCTION_SIZE * 9) -#define FUNC_LDO_OFFSET (INSTRUCTION_SIZE * 10) - /* Define offsets into the call dummy for the _sr4export address. See comments related to CALL_DUMMY for more info. */ #define SR4EXPORT_LDIL_OFFSET (INSTRUCTION_SIZE * 12) @@ -114,22 +104,12 @@ static unsigned extract_5R_store (unsigned int); static unsigned extract_5r_store (unsigned int); -static void find_dummy_frame_regs (struct frame_info *, CORE_ADDR *); - -static int find_proc_framesize (CORE_ADDR); - -static int find_return_regnum (CORE_ADDR); - struct unwind_table_entry *find_unwind_entry (CORE_ADDR); static int extract_17 (unsigned int); -static unsigned deposit_21 (unsigned int, unsigned int); - static int extract_21 (unsigned); -static unsigned deposit_14 (int, unsigned int); - static int extract_14 (unsigned); static void unwind_command (char *, int); @@ -138,8 +118,6 @@ static int low_sign_extend (unsigned int, unsigned int); static int sign_extend (unsigned int, unsigned int); -static int restore_pc_queue (CORE_ADDR *); - static int hppa_alignof (struct type *); static int prologue_inst_adjust_sp (unsigned long); @@ -150,10 +128,6 @@ static int inst_saves_gr (unsigned long); static int inst_saves_fr (unsigned long); -static int pc_in_interrupt_handler (CORE_ADDR); - -static int pc_in_linker_stub (CORE_ADDR); - static int compare_unwind_entries (const void *, const void *); static void read_unwind_info (struct objfile *); @@ -162,11 +136,6 @@ static void internalize_unwinds (struct objfile *, struct unwind_table_entry *, asection *, unsigned int, unsigned int, CORE_ADDR); -static void pa_print_registers (char *, int, int); -static void pa_strcat_registers (char *, int, int, struct ui_file *); -static void pa_register_look_aside (char *, int, long *); -static void pa_print_fp_reg (int); -static void pa_strcat_fp_reg (int, struct ui_file *, enum precision_type); static void record_text_segment_lowaddr (bfd *, asection *, void *); /* FIXME: brobecker 2002-11-07: We will likely be able to make the following functions static, once we hppa is partially multiarched. */ @@ -175,44 +144,13 @@ CORE_ADDR hppa_skip_prologue (CORE_ADDR pc); CORE_ADDR hppa_skip_trampoline_code (CORE_ADDR pc); int hppa_in_solib_call_trampoline (CORE_ADDR pc, char *name); int hppa_in_solib_return_trampoline (CORE_ADDR pc, char *name); -CORE_ADDR hppa_saved_pc_after_call (struct frame_info *frame); int hppa_inner_than (CORE_ADDR lhs, CORE_ADDR rhs); -CORE_ADDR hppa32_stack_align (CORE_ADDR sp); -CORE_ADDR hppa64_stack_align (CORE_ADDR sp); int hppa_pc_requires_run_before_use (CORE_ADDR pc); int hppa_instruction_nullified (void); -int hppa_register_raw_size (int reg_nr); -int hppa_register_byte (int reg_nr); -struct type * hppa32_register_virtual_type (int reg_nr); -struct type * hppa64_register_virtual_type (int reg_nr); -void hppa_store_struct_return (CORE_ADDR addr, CORE_ADDR sp); -void hppa32_extract_return_value (struct type *type, char *regbuf, - char *valbuf); -void hppa64_extract_return_value (struct type *type, char *regbuf, - char *valbuf); -int hppa32_use_struct_convention (int gcc_p, struct type *type); -int hppa64_use_struct_convention (int gcc_p, struct type *type); -void hppa32_store_return_value (struct type *type, char *valbuf); -void hppa64_store_return_value (struct type *type, char *valbuf); int hppa_cannot_store_register (int regnum); -void hppa_init_extra_frame_info (int fromleaf, struct frame_info *frame); -CORE_ADDR hppa_frame_chain (struct frame_info *frame); -int hppa_frame_chain_valid (CORE_ADDR chain, struct frame_info *thisframe); -int hppa_frameless_function_invocation (struct frame_info *frame); -CORE_ADDR hppa_frame_saved_pc (struct frame_info *frame); -CORE_ADDR hppa_frame_args_address (struct frame_info *fi); -int hppa_frame_num_args (struct frame_info *frame); -void hppa_push_dummy_frame (void); -void hppa_pop_frame (void); -CORE_ADDR hppa_fix_call_dummy (char *dummy, CORE_ADDR pc, CORE_ADDR fun, - int nargs, struct value **args, - struct type *type, int gcc_p); -CORE_ADDR hppa_push_arguments (int nargs, struct value **args, CORE_ADDR sp, - int struct_return, CORE_ADDR struct_addr); CORE_ADDR hppa_smash_text_address (CORE_ADDR addr); CORE_ADDR hppa_target_read_pc (ptid_t ptid); void hppa_target_write_pc (CORE_ADDR v, ptid_t ptid); -CORE_ADDR hppa_target_read_fp (void); typedef struct { @@ -232,21 +170,110 @@ extern int hp_som_som_object_present; /* In breakpoint.c */ extern int exception_catchpoints_are_fragile; -/* Should call_function allocate stack space for a struct return? */ +/* Handle 32/64-bit struct return conventions. */ -int -hppa32_use_struct_convention (int gcc_p, struct type *type) +static enum return_value_convention +hppa32_return_value (struct gdbarch *gdbarch, + struct type *type, struct regcache *regcache, + void *readbuf, const void *writebuf) { - return (TYPE_LENGTH (type) > 2 * DEPRECATED_REGISTER_SIZE); -} - -/* Same as hppa32_use_struct_convention() for the PA64 ABI. */ - -int -hppa64_use_struct_convention (int gcc_p, struct type *type) -{ - /* RM: struct upto 128 bits are returned in registers */ - return TYPE_LENGTH (type) > 16; + if (TYPE_CODE (type) == TYPE_CODE_FLT) + { + if (readbuf != NULL) + regcache_cooked_read_part (regcache, FP4_REGNUM, 0, + TYPE_LENGTH (type), readbuf); + if (writebuf != NULL) + regcache_cooked_write_part (regcache, FP4_REGNUM, 0, + TYPE_LENGTH (type), writebuf); + return RETURN_VALUE_REGISTER_CONVENTION; + } + if (TYPE_LENGTH (type) <= 2 * 4) + { + /* The value always lives in the right hand end of the register + (or register pair)? */ + int b; + int reg = 28; + int part = TYPE_LENGTH (type) % 4; + /* The left hand register contains only part of the value, + transfer that first so that the rest can be xfered as entire + 4-byte registers. */ + if (part > 0) + { + if (readbuf != NULL) + regcache_cooked_read_part (regcache, reg, 4 - part, + part, readbuf); + if (writebuf != NULL) + regcache_cooked_write_part (regcache, reg, 4 - part, + part, writebuf); + reg++; + } + /* Now transfer the remaining register values. */ + for (b = part; b < TYPE_LENGTH (type); b += 4) + { + if (readbuf != NULL) + regcache_cooked_read (regcache, reg, (char *) readbuf + b); + if (writebuf != NULL) + regcache_cooked_write (regcache, reg, (const char *) writebuf + b); + reg++; + } + return RETURN_VALUE_REGISTER_CONVENTION; + } + else + return RETURN_VALUE_STRUCT_CONVENTION; +} + +static enum return_value_convention +hppa64_return_value (struct gdbarch *gdbarch, + struct type *type, struct regcache *regcache, + void *readbuf, const void *writebuf) +{ + /* RM: Floats are returned in FR4R, doubles in FR4. Integral values + are in r28, padded on the left. Aggregates less that 65 bits are + in r28, right padded. Aggregates upto 128 bits are in r28 and + r29, right padded. */ + if (TYPE_CODE (type) == TYPE_CODE_FLT + && TYPE_LENGTH (type) <= 8) + { + /* Floats are right aligned? */ + int offset = register_size (gdbarch, FP4_REGNUM) - TYPE_LENGTH (type); + if (readbuf != NULL) + regcache_cooked_read_part (regcache, FP4_REGNUM, offset, + TYPE_LENGTH (type), readbuf); + if (writebuf != NULL) + regcache_cooked_write_part (regcache, FP4_REGNUM, offset, + TYPE_LENGTH (type), writebuf); + return RETURN_VALUE_REGISTER_CONVENTION; + } + else if (TYPE_LENGTH (type) <= 8 && is_integral_type (type)) + { + /* Integrals are right aligned. */ + int offset = register_size (gdbarch, FP4_REGNUM) - TYPE_LENGTH (type); + if (readbuf != NULL) + regcache_cooked_read_part (regcache, 28, offset, + TYPE_LENGTH (type), readbuf); + if (writebuf != NULL) + regcache_cooked_write_part (regcache, 28, offset, + TYPE_LENGTH (type), writebuf); + return RETURN_VALUE_REGISTER_CONVENTION; + } + else if (TYPE_LENGTH (type) <= 2 * 8) + { + /* Composite values are left aligned. */ + int b; + for (b = 0; b < TYPE_LENGTH (type); b += 8) + { + int part = min (8, TYPE_LENGTH (type) - b); + if (readbuf != NULL) + regcache_cooked_read_part (regcache, 28 + b / 8, 0, part, + (char *) readbuf + b); + if (writebuf != NULL) + regcache_cooked_write_part (regcache, 28 + b / 8, 0, part, + (const char *) writebuf + b); + } + return RETURN_VALUE_REGISTER_CONVENTION; + } + else + return RETURN_VALUE_STRUCT_CONVENTION; } /* Routines to extract various sized constants out of hppa @@ -310,16 +337,6 @@ extract_14 (unsigned word) return low_sign_extend (word & MASK_14, 14); } -/* deposit a 14 bit constant in a word */ - -static unsigned -deposit_14 (int opnd, unsigned word) -{ - unsigned sign = (opnd < 0 ? 1 : 0); - - return word | ((unsigned) opnd << 1 & MASK_14) | sign; -} - /* extract a 21 bit constant */ static int @@ -341,27 +358,6 @@ extract_21 (unsigned word) return sign_extend (val, 21) << 11; } -/* deposit a 21 bit constant in a word. Although 21 bit constants are - usually the top 21 bits of a 32 bit constant, we assume that only - the low 21 bits of opnd are relevant */ - -static unsigned -deposit_21 (unsigned opnd, unsigned word) -{ - unsigned val = 0; - - val |= get_field (opnd, 11 + 14, 11 + 18); - val <<= 2; - val |= get_field (opnd, 11 + 12, 11 + 13); - val <<= 2; - val |= get_field (opnd, 11 + 19, 11 + 20); - val <<= 11; - val |= get_field (opnd, 11 + 1, 11 + 11); - val <<= 1; - val |= get_field (opnd, 11 + 0, 11 + 0); - return word | val; -} - /* extract a 17 bit constant from branch instructions, returning the 19 bit signed value. */ @@ -699,7 +695,7 @@ find_unwind_entry (CORE_ADDR pc) const unsigned char * hppa_breakpoint_from_pc (CORE_ADDR *pc, int *len) { - static const char breakpoint[] = {0x00, 0x01, 0x00, 0x04}; + static const unsigned char breakpoint[] = {0x00, 0x01, 0x00, 0x04}; (*len) = sizeof (breakpoint); return breakpoint; } @@ -804,1045 +800,121 @@ hpread_adjust_stack_address (CORE_ADDR func_addr) return u->Total_frame_size << 3; } -/* Called to determine if PC is in an interrupt handler of some - kind. */ - -static int -pc_in_interrupt_handler (CORE_ADDR pc) -{ - struct unwind_table_entry *u; - struct minimal_symbol *msym_us; - - u = find_unwind_entry (pc); - if (!u) - return 0; - - /* Oh joys. HPUX sets the interrupt bit for _sigreturn even though - its frame isn't a pure interrupt frame. Deal with this. */ - msym_us = lookup_minimal_symbol_by_pc (pc); - - return (u->HP_UX_interrupt_marker - && !PC_IN_SIGTRAMP (pc, DEPRECATED_SYMBOL_NAME (msym_us))); -} - -/* Called when no unwind descriptor was found for PC. Returns 1 if it - appears that PC is in a linker stub. - - ?!? Need to handle stubs which appear in PA64 code. */ - -static int -pc_in_linker_stub (CORE_ADDR pc) -{ - int found_magic_instruction = 0; - int i; - char buf[4]; - - /* If unable to read memory, assume pc is not in a linker stub. */ - if (target_read_memory (pc, buf, 4) != 0) - return 0; - - /* We are looking for something like - - ; $$dyncall jams RP into this special spot in the frame (RP') - ; before calling the "call stub" - ldw -18(sp),rp - - ldsid (rp),r1 ; Get space associated with RP into r1 - mtsp r1,sp ; Move it into space register 0 - be,n 0(sr0),rp) ; back to your regularly scheduled program */ - - /* Maximum known linker stub size is 4 instructions. Search forward - from the given PC, then backward. */ - for (i = 0; i < 4; i++) - { - /* If we hit something with an unwind, stop searching this direction. */ - - if (find_unwind_entry (pc + i * 4) != 0) - break; - - /* Check for ldsid (rp),r1 which is the magic instruction for a - return from a cross-space function call. */ - if (read_memory_integer (pc + i * 4, 4) == 0x004010a1) - { - found_magic_instruction = 1; - break; - } - /* Add code to handle long call/branch and argument relocation stubs - here. */ - } - - if (found_magic_instruction != 0) - return 1; - - /* Now look backward. */ - for (i = 0; i < 4; i++) - { - /* If we hit something with an unwind, stop searching this direction. */ - - if (find_unwind_entry (pc - i * 4) != 0) - break; - - /* Check for ldsid (rp),r1 which is the magic instruction for a - return from a cross-space function call. */ - if (read_memory_integer (pc - i * 4, 4) == 0x004010a1) - { - found_magic_instruction = 1; - break; - } - /* Add code to handle long call/branch and argument relocation stubs - here. */ - } - return found_magic_instruction; -} - -static int -find_return_regnum (CORE_ADDR pc) -{ - struct unwind_table_entry *u; - - u = find_unwind_entry (pc); - - if (!u) - return RP_REGNUM; - - if (u->Millicode) - return 31; - - return RP_REGNUM; -} - -/* Return size of frame, or -1 if we should use a frame pointer. */ -static int -find_proc_framesize (CORE_ADDR pc) -{ - struct unwind_table_entry *u; - struct minimal_symbol *msym_us; - - /* This may indicate a bug in our callers... */ - if (pc == (CORE_ADDR) 0) - return -1; - - u = find_unwind_entry (pc); - - if (!u) - { - if (pc_in_linker_stub (pc)) - /* Linker stubs have a zero size frame. */ - return 0; - else - return -1; - } - - msym_us = lookup_minimal_symbol_by_pc (pc); - - /* If Save_SP is set, and we're not in an interrupt or signal caller, - then we have a frame pointer. Use it. */ - if (u->Save_SP - && !pc_in_interrupt_handler (pc) - && msym_us - && !PC_IN_SIGTRAMP (pc, DEPRECATED_SYMBOL_NAME (msym_us))) - return -1; - - return u->Total_frame_size << 3; -} - -/* Return offset from sp at which rp is saved, or 0 if not saved. */ -static int rp_saved (CORE_ADDR); - -static int -rp_saved (CORE_ADDR pc) -{ - struct unwind_table_entry *u; - - /* A function at, and thus a return PC from, address 0? Not in HP-UX! */ - if (pc == (CORE_ADDR) 0) - return 0; - - u = find_unwind_entry (pc); - - if (!u) - { - if (pc_in_linker_stub (pc)) - /* This is the so-called RP'. */ - return -24; - else - return 0; - } - - if (u->Save_RP) - return (TARGET_PTR_BIT == 64 ? -16 : -20); - else if (u->stub_unwind.stub_type != 0) - { - switch (u->stub_unwind.stub_type) - { - case EXPORT: - case IMPORT: - return -24; - case PARAMETER_RELOCATION: - return -8; - default: - return 0; - } - } - else - return 0; -} - -int -hppa_frameless_function_invocation (struct frame_info *frame) -{ - struct unwind_table_entry *u; - - u = find_unwind_entry (get_frame_pc (frame)); - - if (u == 0) - return 0; - - return (u->Total_frame_size == 0 && u->stub_unwind.stub_type == 0); -} - -/* Immediately after a function call, return the saved pc. - Can't go through the frames for this because on some machines - the new frame is not set up until the new function executes - some instructions. */ - -CORE_ADDR -hppa_saved_pc_after_call (struct frame_info *frame) -{ - int ret_regnum; - CORE_ADDR pc; - struct unwind_table_entry *u; +/* This function pushes a stack frame with arguments as part of the + inferior function calling mechanism. - ret_regnum = find_return_regnum (get_frame_pc (frame)); - pc = read_register (ret_regnum) & ~0x3; + This is the version of the function for the 32-bit PA machines, in + which later arguments appear at lower addresses. (The stack always + grows towards higher addresses.) - /* If PC is in a linker stub, then we need to dig the address - the stub will return to out of the stack. */ - u = find_unwind_entry (pc); - if (u && u->stub_unwind.stub_type != 0) - return DEPRECATED_FRAME_SAVED_PC (frame); - else - return pc; -} - + We simply allocate the appropriate amount of stack space and put + arguments into their proper slots. */ + CORE_ADDR -hppa_frame_saved_pc (struct frame_info *frame) -{ - CORE_ADDR pc = get_frame_pc (frame); - struct unwind_table_entry *u; - CORE_ADDR old_pc = 0; - int spun_around_loop = 0; - int rp_offset = 0; - - /* BSD, HPUX & OSF1 all lay out the hardware state in the same manner - at the base of the frame in an interrupt handler. Registers within - are saved in the exact same order as GDB numbers registers. How - convienent. */ - if (pc_in_interrupt_handler (pc)) - return read_memory_integer (get_frame_base (frame) + PC_REGNUM * 4, - TARGET_PTR_BIT / 8) & ~0x3; - - if ((get_frame_pc (frame) >= get_frame_base (frame) - && (get_frame_pc (frame) - <= (get_frame_base (frame) - /* A call dummy is sized in words, but it is actually a - series of instructions. Account for that scaling - factor. */ - + ((DEPRECATED_REGISTER_SIZE / INSTRUCTION_SIZE) - * DEPRECATED_CALL_DUMMY_LENGTH) - /* Similarly we have to account for 64bit wide register - saves. */ - + (32 * DEPRECATED_REGISTER_SIZE) - /* We always consider FP regs 8 bytes long. */ - + (NUM_REGS - FP0_REGNUM) * 8 - /* Similarly we have to account for 64bit wide register - saves. */ - + (6 * DEPRECATED_REGISTER_SIZE))))) - { - return read_memory_integer ((get_frame_base (frame) - + (TARGET_PTR_BIT == 64 ? -16 : -20)), - TARGET_PTR_BIT / 8) & ~0x3; - } - -#ifdef FRAME_SAVED_PC_IN_SIGTRAMP - /* Deal with signal handler caller frames too. */ - if ((get_frame_type (frame) == SIGTRAMP_FRAME)) - { - CORE_ADDR rp; - FRAME_SAVED_PC_IN_SIGTRAMP (frame, &rp); - return rp & ~0x3; - } -#endif - - if (hppa_frameless_function_invocation (frame)) - { - int ret_regnum; - - ret_regnum = find_return_regnum (pc); - - /* If the next frame is an interrupt frame or a signal - handler caller, then we need to look in the saved - register area to get the return pointer (the values - in the registers may not correspond to anything useful). */ - if (get_next_frame (frame) - && ((get_frame_type (get_next_frame (frame)) == SIGTRAMP_FRAME) - || pc_in_interrupt_handler (get_frame_pc (get_next_frame (frame))))) - { - CORE_ADDR *saved_regs; - hppa_frame_init_saved_regs (get_next_frame (frame)); - saved_regs = deprecated_get_frame_saved_regs (get_next_frame (frame)); - if (read_memory_integer (saved_regs[FLAGS_REGNUM], - TARGET_PTR_BIT / 8) & 0x2) +hppa32_push_dummy_call (struct gdbarch *gdbarch, CORE_ADDR func_addr, + struct regcache *regcache, CORE_ADDR bp_addr, + int nargs, struct value **args, CORE_ADDR sp, + int struct_return, CORE_ADDR struct_addr) +{ + /* NOTE: cagney/2004-02-27: This is a guess - its implemented by + reverse engineering testsuite failures. */ + + /* Stack base address at which any pass-by-reference parameters are + stored. */ + CORE_ADDR struct_end = 0; + /* Stack base address at which the first parameter is stored. */ + CORE_ADDR param_end = 0; + + /* The inner most end of the stack after all the parameters have + been pushed. */ + CORE_ADDR new_sp = 0; + + /* Two passes. First pass computes the location of everything, + second pass writes the bytes out. */ + int write_pass; + for (write_pass = 0; write_pass < 2; write_pass++) + { + CORE_ADDR struct_ptr = 0; + CORE_ADDR param_ptr = 0; + int reg = 27; /* NOTE: Registers go down. */ + int i; + for (i = 0; i < nargs; i++) + { + struct value *arg = args[i]; + struct type *type = check_typedef (VALUE_TYPE (arg)); + /* The corresponding parameter that is pushed onto the + stack, and [possibly] passed in a register. */ + char param_val[8]; + int param_len; + memset (param_val, 0, sizeof param_val); + if (TYPE_LENGTH (type) > 8) { - pc = read_memory_integer (saved_regs[31], - TARGET_PTR_BIT / 8) & ~0x3; - - /* Syscalls are really two frames. The syscall stub itself - with a return pointer in %rp and the kernel call with - a return pointer in %r31. We return the %rp variant - if %r31 is the same as frame->pc. */ - if (pc == get_frame_pc (frame)) - pc = read_memory_integer (saved_regs[RP_REGNUM], - TARGET_PTR_BIT / 8) & ~0x3; + /* Large parameter, pass by reference. Store the value + in "struct" area and then pass its address. */ + param_len = 4; + struct_ptr += align_up (TYPE_LENGTH (type), 8); + if (write_pass) + write_memory (struct_end - struct_ptr, VALUE_CONTENTS (arg), + TYPE_LENGTH (type)); + store_unsigned_integer (param_val, 4, struct_end - struct_ptr); } - else - pc = read_memory_integer (saved_regs[RP_REGNUM], - TARGET_PTR_BIT / 8) & ~0x3; - } - else - pc = read_register (ret_regnum) & ~0x3; - } - else - { - spun_around_loop = 0; - old_pc = pc; - - restart: - rp_offset = rp_saved (pc); - - /* Similar to code in frameless function case. If the next - frame is a signal or interrupt handler, then dig the right - information out of the saved register info. */ - if (rp_offset == 0 - && get_next_frame (frame) - && ((get_frame_type (get_next_frame (frame)) == SIGTRAMP_FRAME) - || pc_in_interrupt_handler (get_frame_pc (get_next_frame (frame))))) - { - CORE_ADDR *saved_regs; - hppa_frame_init_saved_regs (get_next_frame (frame)); - saved_regs = deprecated_get_frame_saved_regs (get_next_frame (frame)); - if (read_memory_integer (saved_regs[FLAGS_REGNUM], - TARGET_PTR_BIT / 8) & 0x2) + else if (TYPE_CODE (type) == TYPE_CODE_INT + || TYPE_CODE (type) == TYPE_CODE_ENUM) { - pc = read_memory_integer (saved_regs[31], - TARGET_PTR_BIT / 8) & ~0x3; - - /* Syscalls are really two frames. The syscall stub itself - with a return pointer in %rp and the kernel call with - a return pointer in %r31. We return the %rp variant - if %r31 is the same as frame->pc. */ - if (pc == get_frame_pc (frame)) - pc = read_memory_integer (saved_regs[RP_REGNUM], - TARGET_PTR_BIT / 8) & ~0x3; + /* Integer value store, right aligned. "unpack_long" + takes care of any sign-extension problems. */ + param_len = align_up (TYPE_LENGTH (type), 4); + store_unsigned_integer (param_val, param_len, + unpack_long (type, + VALUE_CONTENTS (arg))); } else - pc = read_memory_integer (saved_regs[RP_REGNUM], - TARGET_PTR_BIT / 8) & ~0x3; - } - else if (rp_offset == 0) - { - old_pc = pc; - pc = read_register (RP_REGNUM) & ~0x3; - } - else - { - old_pc = pc; - pc = read_memory_integer (get_frame_base (frame) + rp_offset, - TARGET_PTR_BIT / 8) & ~0x3; - } - } - - /* If PC is inside a linker stub, then dig out the address the stub - will return to. - - Don't do this for long branch stubs. Why? For some unknown reason - _start is marked as a long branch stub in hpux10. */ - u = find_unwind_entry (pc); - if (u && u->stub_unwind.stub_type != 0 - && u->stub_unwind.stub_type != LONG_BRANCH) - { - unsigned int insn; - - /* If this is a dynamic executable, and we're in a signal handler, - then the call chain will eventually point us into the stub for - _sigreturn. Unlike most cases, we'll be pointed to the branch - to the real sigreturn rather than the code after the real branch!. - - Else, try to dig the address the stub will return to in the normal - fashion. */ - insn = read_memory_integer (pc, 4); - if ((insn & 0xfc00e000) == 0xe8000000) - return (pc + extract_17 (insn) + 8) & ~0x3; - else - { - if (old_pc == pc) - spun_around_loop++; - - if (spun_around_loop > 1) - { - /* We're just about to go around the loop again with - no more hope of success. Die. */ - error ("Unable to find return pc for this frame"); - } - else - goto restart; - } - } - - return pc; -} - -/* We need to correct the PC and the FP for the outermost frame when we are - in a system call. */ - -void -hppa_init_extra_frame_info (int fromleaf, struct frame_info *frame) -{ - int flags; - int framesize; - - if (get_next_frame (frame) && !fromleaf) - return; - - /* If the next frame represents a frameless function invocation then - we have to do some adjustments that are normally done by - DEPRECATED_FRAME_CHAIN. (DEPRECATED_FRAME_CHAIN is not called in - this case.) */ - if (fromleaf) - { - /* Find the framesize of *this* frame without peeking at the PC - in the current frame structure (it isn't set yet). */ - framesize = find_proc_framesize (DEPRECATED_FRAME_SAVED_PC (get_next_frame (frame))); - - /* Now adjust our base frame accordingly. If we have a frame pointer - use it, else subtract the size of this frame from the current - frame. (we always want frame->frame to point at the lowest address - in the frame). */ - if (framesize == -1) - deprecated_update_frame_base_hack (frame, deprecated_read_fp ()); - else - deprecated_update_frame_base_hack (frame, get_frame_base (frame) - framesize); - return; - } - - flags = read_register (FLAGS_REGNUM); - if (flags & 2) /* In system call? */ - deprecated_update_frame_pc_hack (frame, read_register (31) & ~0x3); - - /* The outermost frame is always derived from PC-framesize - - One might think frameless innermost frames should have - a frame->frame that is the same as the parent's frame->frame. - That is wrong; frame->frame in that case should be the *high* - address of the parent's frame. It's complicated as hell to - explain, but the parent *always* creates some stack space for - the child. So the child actually does have a frame of some - sorts, and its base is the high address in its parent's frame. */ - framesize = find_proc_framesize (get_frame_pc (frame)); - if (framesize == -1) - deprecated_update_frame_base_hack (frame, deprecated_read_fp ()); - else - deprecated_update_frame_base_hack (frame, read_register (SP_REGNUM) - framesize); -} - -/* Given a GDB frame, determine the address of the calling function's - frame. This will be used to create a new GDB frame struct, and - then DEPRECATED_INIT_EXTRA_FRAME_INFO and DEPRECATED_INIT_FRAME_PC - will be called for the new frame. - - This may involve searching through prologues for several functions - at boundaries where GCC calls HP C code, or where code which has - a frame pointer calls code without a frame pointer. */ - -CORE_ADDR -hppa_frame_chain (struct frame_info *frame) -{ - int my_framesize, caller_framesize; - struct unwind_table_entry *u; - CORE_ADDR frame_base; - struct frame_info *tmp_frame; - - /* A frame in the current frame list, or zero. */ - struct frame_info *saved_regs_frame = 0; - /* Where the registers were saved in saved_regs_frame. If - saved_regs_frame is zero, this is garbage. */ - CORE_ADDR *saved_regs = NULL; - - CORE_ADDR caller_pc; - - struct minimal_symbol *min_frame_symbol; - struct symbol *frame_symbol; - char *frame_symbol_name; - - /* If this is a threaded application, and we see the - routine "__pthread_exit", treat it as the stack root - for this thread. */ - min_frame_symbol = lookup_minimal_symbol_by_pc (get_frame_pc (frame)); - frame_symbol = find_pc_function (get_frame_pc (frame)); - - if ((min_frame_symbol != 0) /* && (frame_symbol == 0) */ ) - { - /* The test above for "no user function name" would defend - against the slim likelihood that a user might define a - routine named "__pthread_exit" and then try to debug it. - - If it weren't commented out, and you tried to debug the - pthread library itself, you'd get errors. - - So for today, we don't make that check. */ - frame_symbol_name = DEPRECATED_SYMBOL_NAME (min_frame_symbol); - if (frame_symbol_name != 0) - { - if (0 == strncmp (frame_symbol_name, - THREAD_INITIAL_FRAME_SYMBOL, - THREAD_INITIAL_FRAME_SYM_LEN)) - { - /* Pretend we've reached the bottom of the stack. */ - return (CORE_ADDR) 0; - } - } - } /* End of hacky code for threads. */ - - /* Handle HPUX, BSD, and OSF1 style interrupt frames first. These - are easy; at *sp we have a full save state strucutre which we can - pull the old stack pointer from. Also see frame_saved_pc for - code to dig a saved PC out of the save state structure. */ - if (pc_in_interrupt_handler (get_frame_pc (frame))) - frame_base = read_memory_integer (get_frame_base (frame) + SP_REGNUM * 4, - TARGET_PTR_BIT / 8); -#ifdef FRAME_BASE_BEFORE_SIGTRAMP - else if ((get_frame_type (frame) == SIGTRAMP_FRAME)) - { - FRAME_BASE_BEFORE_SIGTRAMP (frame, &frame_base); - } -#endif - else - frame_base = get_frame_base (frame); - - /* Get frame sizes for the current frame and the frame of the - caller. */ - my_framesize = find_proc_framesize (get_frame_pc (frame)); - caller_pc = DEPRECATED_FRAME_SAVED_PC (frame); - - /* If we can't determine the caller's PC, then it's not likely we can - really determine anything meaningful about its frame. We'll consider - this to be stack bottom. */ - if (caller_pc == (CORE_ADDR) 0) - return (CORE_ADDR) 0; - - caller_framesize = find_proc_framesize (DEPRECATED_FRAME_SAVED_PC (frame)); - - /* If caller does not have a frame pointer, then its frame - can be found at current_frame - caller_framesize. */ - if (caller_framesize != -1) - { - return frame_base - caller_framesize; - } - /* Both caller and callee have frame pointers and are GCC compiled - (SAVE_SP bit in unwind descriptor is on for both functions. - The previous frame pointer is found at the top of the current frame. */ - if (caller_framesize == -1 && my_framesize == -1) - { - return read_memory_integer (frame_base, TARGET_PTR_BIT / 8); - } - /* Caller has a frame pointer, but callee does not. This is a little - more difficult as GCC and HP C lay out locals and callee register save - areas very differently. - - The previous frame pointer could be in a register, or in one of - several areas on the stack. - - Walk from the current frame to the innermost frame examining - unwind descriptors to determine if %r3 ever gets saved into the - stack. If so return whatever value got saved into the stack. - If it was never saved in the stack, then the value in %r3 is still - valid, so use it. - - We use information from unwind descriptors to determine if %r3 - is saved into the stack (Entry_GR field has this information). */ - - for (tmp_frame = frame; tmp_frame; tmp_frame = get_next_frame (tmp_frame)) - { - u = find_unwind_entry (get_frame_pc (tmp_frame)); - - if (!u) - { - /* We could find this information by examining prologues. I don't - think anyone has actually written any tools (not even "strip") - which leave them out of an executable, so maybe this is a moot - point. */ - /* ??rehrauer: Actually, it's quite possible to stepi your way into - code that doesn't have unwind entries. For example, stepping into - the dynamic linker will give you a PC that has none. Thus, I've - disabled this warning. */ -#if 0 - warning ("Unable to find unwind for PC 0x%x -- Help!", get_frame_pc (tmp_frame)); -#endif - return (CORE_ADDR) 0; - } - - if (u->Save_SP - || (get_frame_type (tmp_frame) == SIGTRAMP_FRAME) - || pc_in_interrupt_handler (get_frame_pc (tmp_frame))) - break; - - /* Entry_GR specifies the number of callee-saved general registers - saved in the stack. It starts at %r3, so %r3 would be 1. */ - if (u->Entry_GR >= 1) - { - /* The unwind entry claims that r3 is saved here. However, - in optimized code, GCC often doesn't actually save r3. - We'll discover this if we look at the prologue. */ - hppa_frame_init_saved_regs (tmp_frame); - saved_regs = deprecated_get_frame_saved_regs (tmp_frame); - saved_regs_frame = tmp_frame; - - /* If we have an address for r3, that's good. */ - if (saved_regs[DEPRECATED_FP_REGNUM]) - break; - } - } - - if (tmp_frame) - { - /* We may have walked down the chain into a function with a frame - pointer. */ - if (u->Save_SP - && !(get_frame_type (tmp_frame) == SIGTRAMP_FRAME) - && !pc_in_interrupt_handler (get_frame_pc (tmp_frame))) - { - return read_memory_integer (get_frame_base (tmp_frame), TARGET_PTR_BIT / 8); - } - /* %r3 was saved somewhere in the stack. Dig it out. */ - else - { - /* Sick. - - For optimization purposes many kernels don't have the - callee saved registers into the save_state structure upon - entry into the kernel for a syscall; the optimization - is usually turned off if the process is being traced so - that the debugger can get full register state for the - process. - - This scheme works well except for two cases: - - * Attaching to a process when the process is in the - kernel performing a system call (debugger can't get - full register state for the inferior process since - the process wasn't being traced when it entered the - system call). - - * Register state is not complete if the system call - causes the process to core dump. - - - The following heinous code is an attempt to deal with - the lack of register state in a core dump. It will - fail miserably if the function which performs the - system call has a variable sized stack frame. */ - - if (tmp_frame != saved_regs_frame) { - hppa_frame_init_saved_regs (tmp_frame); - saved_regs = deprecated_get_frame_saved_regs (tmp_frame); + /* Small struct value, store right aligned? */ + param_len = align_up (TYPE_LENGTH (type), 4); + memcpy (param_val + param_len - TYPE_LENGTH (type), + VALUE_CONTENTS (arg), TYPE_LENGTH (type)); } - - /* Abominable hack. */ - if (current_target.to_has_execution == 0 - && ((saved_regs[FLAGS_REGNUM] - && (read_memory_integer (saved_regs[FLAGS_REGNUM], - TARGET_PTR_BIT / 8) - & 0x2)) - || (saved_regs[FLAGS_REGNUM] == 0 - && read_register (FLAGS_REGNUM) & 0x2))) + param_ptr += param_len; + reg -= param_len / 4; + if (write_pass) { - u = find_unwind_entry (DEPRECATED_FRAME_SAVED_PC (frame)); - if (!u) + write_memory (param_end - param_ptr, param_val, param_len); + if (reg >= 23) { - return read_memory_integer (saved_regs[DEPRECATED_FP_REGNUM], - TARGET_PTR_BIT / 8); + regcache_cooked_write (regcache, reg, param_val); + if (param_len > 4) + regcache_cooked_write (regcache, reg + 1, param_val + 4); } - else - { - return frame_base - (u->Total_frame_size << 3); - } - } - - return read_memory_integer (saved_regs[DEPRECATED_FP_REGNUM], - TARGET_PTR_BIT / 8); - } - } - else - { - /* Get the innermost frame. */ - tmp_frame = frame; - while (get_next_frame (tmp_frame) != NULL) - tmp_frame = get_next_frame (tmp_frame); - - if (tmp_frame != saved_regs_frame) - { - hppa_frame_init_saved_regs (tmp_frame); - saved_regs = deprecated_get_frame_saved_regs (tmp_frame); - } - - /* Abominable hack. See above. */ - if (current_target.to_has_execution == 0 - && ((saved_regs[FLAGS_REGNUM] - && (read_memory_integer (saved_regs[FLAGS_REGNUM], - TARGET_PTR_BIT / 8) - & 0x2)) - || (saved_regs[FLAGS_REGNUM] == 0 - && read_register (FLAGS_REGNUM) & 0x2))) - { - u = find_unwind_entry (DEPRECATED_FRAME_SAVED_PC (frame)); - if (!u) - { - return read_memory_integer (saved_regs[DEPRECATED_FP_REGNUM], - TARGET_PTR_BIT / 8); - } - else - { - return frame_base - (u->Total_frame_size << 3); } } - /* The value in %r3 was never saved into the stack (thus %r3 still - holds the value of the previous frame pointer). */ - return deprecated_read_fp (); - } -} - - -/* To see if a frame chain is valid, see if the caller looks like it - was compiled with gcc. */ - -int -hppa_frame_chain_valid (CORE_ADDR chain, struct frame_info *thisframe) -{ - struct minimal_symbol *msym_us; - struct minimal_symbol *msym_start; - struct unwind_table_entry *u, *next_u = NULL; - struct frame_info *next; - - u = find_unwind_entry (get_frame_pc (thisframe)); - - if (u == NULL) - return 1; - - /* We can't just check that the same of msym_us is "_start", because - someone idiotically decided that they were going to make a Ltext_end - symbol with the same address. This Ltext_end symbol is totally - indistinguishable (as nearly as I can tell) from the symbol for a function - which is (legitimately, since it is in the user's namespace) - named Ltext_end, so we can't just ignore it. */ - msym_us = lookup_minimal_symbol_by_pc (DEPRECATED_FRAME_SAVED_PC (thisframe)); - msym_start = lookup_minimal_symbol ("_start", NULL, NULL); - if (msym_us - && msym_start - && SYMBOL_VALUE_ADDRESS (msym_us) == SYMBOL_VALUE_ADDRESS (msym_start)) - return 0; - - /* Grrrr. Some new idiot decided that they don't want _start for the - PRO configurations; $START$ calls main directly.... Deal with it. */ - msym_start = lookup_minimal_symbol ("$START$", NULL, NULL); - if (msym_us - && msym_start - && SYMBOL_VALUE_ADDRESS (msym_us) == SYMBOL_VALUE_ADDRESS (msym_start)) - return 0; - - next = get_next_frame (thisframe); - if (next) - next_u = find_unwind_entry (get_frame_pc (next)); - - /* If this frame does not save SP, has no stack, isn't a stub, - and doesn't "call" an interrupt routine or signal handler caller, - then its not valid. */ - if (u->Save_SP || u->Total_frame_size || u->stub_unwind.stub_type != 0 - || (get_next_frame (thisframe) && (get_frame_type (get_next_frame (thisframe)) == SIGTRAMP_FRAME)) - || (next_u && next_u->HP_UX_interrupt_marker)) - return 1; - - if (pc_in_linker_stub (get_frame_pc (thisframe))) - return 1; - - return 0; -} - -/* These functions deal with saving and restoring register state - around a function call in the inferior. They keep the stack - double-word aligned; eventually, on an hp700, the stack will have - to be aligned to a 64-byte boundary. */ - -void -hppa_push_dummy_frame (void) -{ - CORE_ADDR sp, pc, pcspace; - int regnum; - CORE_ADDR int_buffer; - double freg_buffer; - - pc = hppa_target_read_pc (inferior_ptid); - int_buffer = read_register (FLAGS_REGNUM); - if (int_buffer & 0x2) - { - const unsigned int sid = (pc >> 30) & 0x3; - if (sid == 0) - pcspace = read_register (SR4_REGNUM); - else - pcspace = read_register (SR4_REGNUM + 4 + sid); - } - else - pcspace = read_register (PCSQ_HEAD_REGNUM); - - /* Space for "arguments"; the RP goes in here. */ - sp = read_register (SP_REGNUM) + 48; - int_buffer = read_register (RP_REGNUM) | 0x3; - - /* The 32bit and 64bit ABIs save the return pointer into different - stack slots. */ - if (DEPRECATED_REGISTER_SIZE == 8) - write_memory (sp - 16, (char *) &int_buffer, DEPRECATED_REGISTER_SIZE); - else - write_memory (sp - 20, (char *) &int_buffer, DEPRECATED_REGISTER_SIZE); - - int_buffer = deprecated_read_fp (); - write_memory (sp, (char *) &int_buffer, DEPRECATED_REGISTER_SIZE); - - write_register (DEPRECATED_FP_REGNUM, sp); - - sp += 2 * DEPRECATED_REGISTER_SIZE; - - for (regnum = 1; regnum < 32; regnum++) - if (regnum != RP_REGNUM && regnum != DEPRECATED_FP_REGNUM) - sp = push_word (sp, read_register (regnum)); - - /* This is not necessary for the 64bit ABI. In fact it is dangerous. */ - if (DEPRECATED_REGISTER_SIZE != 8) - sp += 4; - - for (regnum = FP0_REGNUM; regnum < NUM_REGS; regnum++) - { - deprecated_read_register_bytes (DEPRECATED_REGISTER_BYTE (regnum), - (char *) &freg_buffer, 8); - sp = push_bytes (sp, (char *) &freg_buffer, 8); - } - sp = push_word (sp, read_register (IPSW_REGNUM)); - sp = push_word (sp, read_register (SAR_REGNUM)); - sp = push_word (sp, pc); - sp = push_word (sp, pcspace); - sp = push_word (sp, pc + 4); - sp = push_word (sp, pcspace); - write_register (SP_REGNUM, sp); -} - -static void -find_dummy_frame_regs (struct frame_info *frame, - CORE_ADDR frame_saved_regs[]) -{ - CORE_ADDR fp = get_frame_base (frame); - int i; - - /* The 32bit and 64bit ABIs save RP into different locations. */ - if (DEPRECATED_REGISTER_SIZE == 8) - frame_saved_regs[RP_REGNUM] = (fp - 16) & ~0x3; - else - frame_saved_regs[RP_REGNUM] = (fp - 20) & ~0x3; - - frame_saved_regs[DEPRECATED_FP_REGNUM] = fp; - - frame_saved_regs[1] = fp + (2 * DEPRECATED_REGISTER_SIZE); - - for (fp += 3 * DEPRECATED_REGISTER_SIZE, i = 3; i < 32; i++) - { - if (i != DEPRECATED_FP_REGNUM) + /* Update the various stack pointers. */ + if (!write_pass) { - frame_saved_regs[i] = fp; - fp += DEPRECATED_REGISTER_SIZE; + struct_end = sp + struct_ptr; + /* PARAM_PTR already accounts for all the arguments passed + by the user. However, the ABI mandates minimum stack + space allocations for outgoing arguments. The ABI also + mandates minimum stack alignments which we must + preserve. */ + param_end = struct_end + max (align_up (param_ptr, 8), + REG_PARM_STACK_SPACE); } } - /* This is not necessary or desirable for the 64bit ABI. */ - if (DEPRECATED_REGISTER_SIZE != 8) - fp += 4; - - for (i = FP0_REGNUM; i < NUM_REGS; i++, fp += 8) - frame_saved_regs[i] = fp; - - frame_saved_regs[IPSW_REGNUM] = fp; - frame_saved_regs[SAR_REGNUM] = fp + DEPRECATED_REGISTER_SIZE; - frame_saved_regs[PCOQ_HEAD_REGNUM] = fp + 2 * DEPRECATED_REGISTER_SIZE; - frame_saved_regs[PCSQ_HEAD_REGNUM] = fp + 3 * DEPRECATED_REGISTER_SIZE; - frame_saved_regs[PCOQ_TAIL_REGNUM] = fp + 4 * DEPRECATED_REGISTER_SIZE; - frame_saved_regs[PCSQ_TAIL_REGNUM] = fp + 5 * DEPRECATED_REGISTER_SIZE; -} - -void -hppa_pop_frame (void) -{ - struct frame_info *frame = get_current_frame (); - CORE_ADDR fp, npc, target_pc; - int regnum; - CORE_ADDR *fsr; - double freg_buffer; - - fp = get_frame_base (frame); - hppa_frame_init_saved_regs (frame); - fsr = deprecated_get_frame_saved_regs (frame); - -#ifndef NO_PC_SPACE_QUEUE_RESTORE - if (fsr[IPSW_REGNUM]) /* Restoring a call dummy frame */ - restore_pc_queue (fsr); -#endif - - for (regnum = 31; regnum > 0; regnum--) - if (fsr[regnum]) - write_register (regnum, read_memory_integer (fsr[regnum], - DEPRECATED_REGISTER_SIZE)); - - for (regnum = NUM_REGS - 1; regnum >= FP0_REGNUM; regnum--) - if (fsr[regnum]) - { - read_memory (fsr[regnum], (char *) &freg_buffer, 8); - deprecated_write_register_bytes (DEPRECATED_REGISTER_BYTE (regnum), - (char *) &freg_buffer, 8); - } - - if (fsr[IPSW_REGNUM]) - write_register (IPSW_REGNUM, - read_memory_integer (fsr[IPSW_REGNUM], - DEPRECATED_REGISTER_SIZE)); - - if (fsr[SAR_REGNUM]) - write_register (SAR_REGNUM, - read_memory_integer (fsr[SAR_REGNUM], - DEPRECATED_REGISTER_SIZE)); - - /* If the PC was explicitly saved, then just restore it. */ - if (fsr[PCOQ_TAIL_REGNUM]) - { - npc = read_memory_integer (fsr[PCOQ_TAIL_REGNUM], - DEPRECATED_REGISTER_SIZE); - write_register (PCOQ_TAIL_REGNUM, npc); - } - /* Else use the value in %rp to set the new PC. */ - else - { - npc = read_register (RP_REGNUM); - write_pc (npc); - } - - write_register (DEPRECATED_FP_REGNUM, read_memory_integer (fp, DEPRECATED_REGISTER_SIZE)); - - if (fsr[IPSW_REGNUM]) /* call dummy */ - write_register (SP_REGNUM, fp - 48); - else - write_register (SP_REGNUM, fp); - - /* The PC we just restored may be inside a return trampoline. If so - we want to restart the inferior and run it through the trampoline. - - Do this by setting a momentary breakpoint at the location the - trampoline returns to. - - Don't skip through the trampoline if we're popping a dummy frame. */ - target_pc = SKIP_TRAMPOLINE_CODE (npc & ~0x3) & ~0x3; - if (target_pc && !fsr[IPSW_REGNUM]) - { - struct symtab_and_line sal; - struct breakpoint *breakpoint; - struct cleanup *old_chain; - - /* Set up our breakpoint. Set it to be silent as the MI code - for "return_command" will print the frame we returned to. */ - sal = find_pc_line (target_pc, 0); - sal.pc = target_pc; - breakpoint = set_momentary_breakpoint (sal, null_frame_id, bp_finish); - breakpoint->silent = 1; - - /* So we can clean things up. */ - old_chain = make_cleanup_delete_breakpoint (breakpoint); - - /* Start up the inferior. */ - clear_proceed_status (); - proceed_to_finish = 1; - proceed ((CORE_ADDR) -1, TARGET_SIGNAL_DEFAULT, 0); - - /* Perform our cleanups. */ - do_cleanups (old_chain); - } - flush_cached_frames (); -} + /* If a structure has to be returned, set up register 28 to hold its + address */ + if (struct_return) + write_register (28, struct_addr); -/* After returning to a dummy on the stack, restore the instruction - queue space registers. */ + /* Set the return address. */ + regcache_cooked_write_unsigned (regcache, RP_REGNUM, bp_addr); -static int -restore_pc_queue (CORE_ADDR *fsr) -{ - CORE_ADDR pc = read_pc (); - CORE_ADDR new_pc = read_memory_integer (fsr[PCOQ_HEAD_REGNUM], - TARGET_PTR_BIT / 8); - struct target_waitstatus w; - int insn_count; - - /* Advance past break instruction in the call dummy. */ - write_register (PCOQ_HEAD_REGNUM, pc + 4); - write_register (PCOQ_TAIL_REGNUM, pc + 8); - - /* HPUX doesn't let us set the space registers or the space - registers of the PC queue through ptrace. Boo, hiss. - Conveniently, the call dummy has this sequence of instructions - after the break: - mtsp r21, sr0 - ble,n 0(sr0, r22) - - So, load up the registers and single step until we are in the - right place. */ - - write_register (21, read_memory_integer (fsr[PCSQ_HEAD_REGNUM], - DEPRECATED_REGISTER_SIZE)); - write_register (22, new_pc); - - for (insn_count = 0; insn_count < 3; insn_count++) - { - /* FIXME: What if the inferior gets a signal right now? Want to - merge this into wait_for_inferior (as a special kind of - watchpoint? By setting a breakpoint at the end? Is there - any other choice? Is there *any* way to do this stuff with - ptrace() or some equivalent?). */ - resume (1, 0); - target_wait (inferior_ptid, &w); - - if (w.kind == TARGET_WAITKIND_SIGNALLED) - { - stop_signal = w.value.sig; - terminal_ours_for_output (); - printf_unfiltered ("\nProgram terminated with signal %s, %s.\n", - target_signal_to_name (stop_signal), - target_signal_to_string (stop_signal)); - gdb_flush (gdb_stdout); - return 0; - } - } - target_terminal_ours (); - target_fetch_registers (-1); - return 1; + /* The stack will have 32 bytes of additional space for a frame marker. */ + return param_end + 32; } - -#ifdef PA20W_CALLING_CONVENTIONS - /* This function pushes a stack frame with arguments as part of the inferior function calling mechanism. @@ -1851,214 +923,136 @@ restore_pc_queue (CORE_ADDR *fsr) addresses.) We simply allocate the appropriate amount of stack space and put - arguments into their proper slots. The call dummy code will copy - arguments into registers as needed by the ABI. + arguments into their proper slots. This ABI also requires that the caller provide an argument pointer to the callee, so we do that too. */ CORE_ADDR -hppa_push_arguments (int nargs, struct value **args, CORE_ADDR sp, - int struct_return, CORE_ADDR struct_addr) -{ - /* array of arguments' offsets */ - int *offset = (int *) alloca (nargs * sizeof (int)); - - /* array of arguments' lengths: real lengths in bytes, not aligned to - word size */ - int *lengths = (int *) alloca (nargs * sizeof (int)); - - /* The value of SP as it was passed into this function after - aligning. */ - CORE_ADDR orig_sp = DEPRECATED_STACK_ALIGN (sp); - - /* The number of stack bytes occupied by the current argument. */ - int bytes_reserved; - - /* The total number of bytes reserved for the arguments. */ - int cum_bytes_reserved = 0; - - /* Similarly, but aligned. */ - int cum_bytes_aligned = 0; - int i; - - /* Iterate over each argument provided by the user. */ - for (i = 0; i < nargs; i++) - { - struct type *arg_type = VALUE_TYPE (args[i]); - - /* Integral scalar values smaller than a register are padded on - the left. We do this by promoting them to full-width, - although the ABI says to pad them with garbage. */ - if (is_integral_type (arg_type) - && TYPE_LENGTH (arg_type) < DEPRECATED_REGISTER_SIZE) - { - args[i] = value_cast ((TYPE_UNSIGNED (arg_type) - ? builtin_type_unsigned_long - : builtin_type_long), - args[i]); - arg_type = VALUE_TYPE (args[i]); +hppa64_push_dummy_call (struct gdbarch *gdbarch, CORE_ADDR func_addr, + struct regcache *regcache, CORE_ADDR bp_addr, + int nargs, struct value **args, CORE_ADDR sp, + int struct_return, CORE_ADDR struct_addr) +{ + /* NOTE: cagney/2004-02-27: This is a guess - its implemented by + reverse engineering testsuite failures. */ + + /* Stack base address at which any pass-by-reference parameters are + stored. */ + CORE_ADDR struct_end = 0; + /* Stack base address at which the first parameter is stored. */ + CORE_ADDR param_end = 0; + + /* The inner most end of the stack after all the parameters have + been pushed. */ + CORE_ADDR new_sp = 0; + + /* Two passes. First pass computes the location of everything, + second pass writes the bytes out. */ + int write_pass; + for (write_pass = 0; write_pass < 2; write_pass++) + { + CORE_ADDR struct_ptr = 0; + CORE_ADDR param_ptr = 0; + int i; + for (i = 0; i < nargs; i++) + { + struct value *arg = args[i]; + struct type *type = check_typedef (VALUE_TYPE (arg)); + if ((TYPE_CODE (type) == TYPE_CODE_INT + || TYPE_CODE (type) == TYPE_CODE_ENUM) + && TYPE_LENGTH (type) <= 8) + { + /* Integer value store, right aligned. "unpack_long" + takes care of any sign-extension problems. */ + param_ptr += 8; + if (write_pass) + { + ULONGEST val = unpack_long (type, VALUE_CONTENTS (arg)); + int reg = 27 - param_ptr / 8; + write_memory_unsigned_integer (param_end - param_ptr, + val, 8); + if (reg >= 19) + regcache_cooked_write_unsigned (regcache, reg, val); + } + } + else + { + /* Small struct value, store left aligned? */ + int reg; + if (TYPE_LENGTH (type) > 8) + { + param_ptr = align_up (param_ptr, 16); + reg = 26 - param_ptr / 8; + param_ptr += align_up (TYPE_LENGTH (type), 16); + } + else + { + param_ptr = align_up (param_ptr, 8); + reg = 26 - param_ptr / 8; + param_ptr += align_up (TYPE_LENGTH (type), 8); + } + if (write_pass) + { + int byte; + write_memory (param_end - param_ptr, VALUE_CONTENTS (arg), + TYPE_LENGTH (type)); + for (byte = 0; byte < TYPE_LENGTH (type); byte += 8) + { + if (reg >= 19) + { + int len = min (8, TYPE_LENGTH (type) - byte); + regcache_cooked_write_part (regcache, reg, 0, len, + VALUE_CONTENTS (arg) + byte); + } + reg--; + } + } + } } - - lengths[i] = TYPE_LENGTH (arg_type); - - /* Align the size of the argument to the word size for this - target. */ - bytes_reserved = (lengths[i] + DEPRECATED_REGISTER_SIZE - 1) & -DEPRECATED_REGISTER_SIZE; - - offset[i] = cum_bytes_reserved; - - /* Aggregates larger than eight bytes (the only types larger - than eight bytes we have) are aligned on a 16-byte boundary, - possibly padded on the right with garbage. This may leave an - empty word on the stack, and thus an unused register, as per - the ABI. */ - if (bytes_reserved > 8) + /* Update the various stack pointers. */ + if (!write_pass) { - /* Round up the offset to a multiple of two slots. */ - int new_offset = ((offset[i] + 2*DEPRECATED_REGISTER_SIZE-1) - & -(2*DEPRECATED_REGISTER_SIZE)); - - /* Note the space we've wasted, if any. */ - bytes_reserved += new_offset - offset[i]; - offset[i] = new_offset; + struct_end = sp + struct_ptr; + /* PARAM_PTR already accounts for all the arguments passed + by the user. However, the ABI mandates minimum stack + space allocations for outgoing arguments. The ABI also + mandates minimum stack alignments which we must + preserve. */ + param_end = struct_end + max (align_up (param_ptr, 16), + REG_PARM_STACK_SPACE); } - - cum_bytes_reserved += bytes_reserved; } - /* CUM_BYTES_RESERVED already accounts for all the arguments - passed by the user. However, the ABIs mandate minimum stack space - allocations for outgoing arguments. - - The ABIs also mandate minimum stack alignments which we must - preserve. */ - cum_bytes_aligned = DEPRECATED_STACK_ALIGN (cum_bytes_reserved); - sp += max (cum_bytes_aligned, REG_PARM_STACK_SPACE); - - /* Now write each of the args at the proper offset down the stack. */ - for (i = 0; i < nargs; i++) - write_memory (orig_sp + offset[i], VALUE_CONTENTS (args[i]), lengths[i]); - /* If a structure has to be returned, set up register 28 to hold its address */ if (struct_return) write_register (28, struct_addr); - /* For the PA64 we must pass a pointer to the outgoing argument list. - The ABI mandates that the pointer should point to the first byte of - storage beyond the register flushback area. - - However, the call dummy expects the outgoing argument pointer to - be passed in register %r4. */ - write_register (4, orig_sp + REG_PARM_STACK_SPACE); + /* Set the return address. */ + regcache_cooked_write_unsigned (regcache, RP_REGNUM, bp_addr); - /* ?!? This needs further work. We need to set up the global data - pointer for this procedure. This assumes the same global pointer - for every procedure. The call dummy expects the dp value to - be passed in register %r6. */ - write_register (6, read_register (27)); - - /* The stack will have 64 bytes of additional space for a frame marker. */ - return sp + 64; + /* The stack will have 32 bytes of additional space for a frame marker. */ + return param_end + 64; } -#else - -/* This function pushes a stack frame with arguments as part of the - inferior function calling mechanism. - - This is the version of the function for the 32-bit PA machines, in - which later arguments appear at lower addresses. (The stack always - grows towards higher addresses.) - - We simply allocate the appropriate amount of stack space and put - arguments into their proper slots. The call dummy code will copy - arguments into registers as needed by the ABI. */ - -CORE_ADDR -hppa_push_arguments (int nargs, struct value **args, CORE_ADDR sp, - int struct_return, CORE_ADDR struct_addr) +static CORE_ADDR +hppa32_frame_align (struct gdbarch *gdbarch, CORE_ADDR addr) { - /* array of arguments' offsets */ - int *offset = (int *) alloca (nargs * sizeof (int)); - - /* array of arguments' lengths: real lengths in bytes, not aligned to - word size */ - int *lengths = (int *) alloca (nargs * sizeof (int)); - - /* The number of stack bytes occupied by the current argument. */ - int bytes_reserved; - - /* The total number of bytes reserved for the arguments. */ - int cum_bytes_reserved = 0; - - /* Similarly, but aligned. */ - int cum_bytes_aligned = 0; - int i; - - /* Iterate over each argument provided by the user. */ - for (i = 0; i < nargs; i++) - { - lengths[i] = TYPE_LENGTH (VALUE_TYPE (args[i])); - - /* Align the size of the argument to the word size for this - target. */ - bytes_reserved = (lengths[i] + DEPRECATED_REGISTER_SIZE - 1) & -DEPRECATED_REGISTER_SIZE; - - offset[i] = (cum_bytes_reserved - + (lengths[i] > 4 ? bytes_reserved : lengths[i])); - - /* If the argument is a double word argument, then it needs to be - double word aligned. */ - if ((bytes_reserved == 2 * DEPRECATED_REGISTER_SIZE) - && (offset[i] % 2 * DEPRECATED_REGISTER_SIZE)) - { - int new_offset = 0; - /* BYTES_RESERVED is already aligned to the word, so we put - the argument at one word more down the stack. - - This will leave one empty word on the stack, and one unused - register as mandated by the ABI. */ - new_offset = ((offset[i] + 2 * DEPRECATED_REGISTER_SIZE - 1) - & -(2 * DEPRECATED_REGISTER_SIZE)); - - if ((new_offset - offset[i]) >= 2 * DEPRECATED_REGISTER_SIZE) - { - bytes_reserved += DEPRECATED_REGISTER_SIZE; - offset[i] += DEPRECATED_REGISTER_SIZE; - } - } - - cum_bytes_reserved += bytes_reserved; - - } - - /* CUM_BYTES_RESERVED already accounts for all the arguments passed - by the user. However, the ABI mandates minimum stack space - allocations for outgoing arguments. - - The ABI also mandates minimum stack alignments which we must - preserve. */ - cum_bytes_aligned = DEPRECATED_STACK_ALIGN (cum_bytes_reserved); - sp += max (cum_bytes_aligned, REG_PARM_STACK_SPACE); - - /* Now write each of the args at the proper offset down the stack. - ?!? We need to promote values to a full register instead of skipping - words in the stack. */ - for (i = 0; i < nargs; i++) - write_memory (sp - offset[i], VALUE_CONTENTS (args[i]), lengths[i]); + /* HP frames are 64-byte (or cache line) aligned (yes that's _byte_ + and not _bit_)! */ + return align_up (addr, 64); +} - /* If a structure has to be returned, set up register 28 to hold its - address */ - if (struct_return) - write_register (28, struct_addr); +/* Force all frames to 16-byte alignment. Better safe than sorry. */ - /* The stack will have 32 bytes of additional space for a frame marker. */ - return sp + 32; +static CORE_ADDR +hppa64_frame_align (struct gdbarch *gdbarch, CORE_ADDR addr) +{ + /* Just always 16-byte align. */ + return align_up (addr, 16); } -#endif /* elz: Used to lookup a symbol in the shared libraries. This function calls shl_findsym, indirectly through a @@ -2156,425 +1150,6 @@ cover_find_stub_with_shl_get (void *args_untyped) return 0; } -/* Insert the specified number of args and function address - into a call sequence of the above form stored at DUMMYNAME. - - On the hppa we need to call the stack dummy through $$dyncall. - Therefore our version of DEPRECATED_FIX_CALL_DUMMY takes an extra - argument, real_pc, which is the location where gdb should start up - the inferior to do the function call. - - This has to work across several versions of hpux, bsd, osf1. It has to - work regardless of what compiler was used to build the inferior program. - It should work regardless of whether or not end.o is available. It has - to work even if gdb can not call into the dynamic loader in the inferior - to query it for symbol names and addresses. - - Yes, all those cases should work. Luckily code exists to handle most - of them. The complexity is in selecting exactly what scheme should - be used to perform the inferior call. - - At the current time this routine is known not to handle cases where - the program was linked with HP's compiler without including end.o. - - Please contact Jeff Law (law@cygnus.com) before changing this code. */ - -CORE_ADDR -hppa_fix_call_dummy (char *dummy, CORE_ADDR pc, CORE_ADDR fun, int nargs, - struct value **args, struct type *type, int gcc_p) -{ - CORE_ADDR dyncall_addr; - struct minimal_symbol *msymbol; - struct minimal_symbol *trampoline; - int flags = read_register (FLAGS_REGNUM); - struct unwind_table_entry *u = NULL; - CORE_ADDR new_stub = 0; - CORE_ADDR solib_handle = 0; - - /* Nonzero if we will use GCC's PLT call routine. This routine must be - passed an import stub, not a PLABEL. It is also necessary to set %r19 - (the PIC register) before performing the call. - - If zero, then we are using __d_plt_call (HP's PLT call routine) or we - are calling the target directly. When using __d_plt_call we want to - use a PLABEL instead of an import stub. */ - int using_gcc_plt_call = 1; - -#ifdef GDB_TARGET_IS_HPPA_20W - /* We currently use completely different code for the PA2.0W inferior - function call sequences. This needs to be cleaned up. */ - { - CORE_ADDR pcsqh, pcsqt, pcoqh, pcoqt, sr5; - struct target_waitstatus w; - int inst1, inst2; - char buf[4]; - int status; - struct objfile *objfile; - - /* We can not modify the PC space queues directly, so we start - up the inferior and execute a couple instructions to set the - space queues so that they point to the call dummy in the stack. */ - pcsqh = read_register (PCSQ_HEAD_REGNUM); - sr5 = read_register (SR5_REGNUM); - if (1) - { - pcoqh = read_register (PCOQ_HEAD_REGNUM); - pcoqt = read_register (PCOQ_TAIL_REGNUM); - if (target_read_memory (pcoqh, buf, 4) != 0) - error ("Couldn't modify space queue\n"); - inst1 = extract_unsigned_integer (buf, 4); - - if (target_read_memory (pcoqt, buf, 4) != 0) - error ("Couldn't modify space queue\n"); - inst2 = extract_unsigned_integer (buf, 4); - - /* BVE (r1) */ - *((int *) buf) = 0xe820d000; - if (target_write_memory (pcoqh, buf, 4) != 0) - error ("Couldn't modify space queue\n"); - - /* NOP */ - *((int *) buf) = 0x08000240; - if (target_write_memory (pcoqt, buf, 4) != 0) - { - *((int *) buf) = inst1; - target_write_memory (pcoqh, buf, 4); - error ("Couldn't modify space queue\n"); - } - - write_register (1, pc); - - /* Single step twice, the BVE instruction will set the space queue - such that it points to the PC value written immediately above - (ie the call dummy). */ - resume (1, 0); - target_wait (inferior_ptid, &w); - resume (1, 0); - target_wait (inferior_ptid, &w); - - /* Restore the two instructions at the old PC locations. */ - *((int *) buf) = inst1; - target_write_memory (pcoqh, buf, 4); - *((int *) buf) = inst2; - target_write_memory (pcoqt, buf, 4); - } - - /* The call dummy wants the ultimate destination address initially - in register %r5. */ - write_register (5, fun); - - /* We need to see if this objfile has a different DP value than our - own (it could be a shared library for example). */ - ALL_OBJFILES (objfile) - { - struct obj_section *s; - obj_private_data_t *obj_private; - - /* See if FUN is in any section within this shared library. */ - for (s = objfile->sections; s < objfile->sections_end; s++) - if (s->addr <= fun && fun < s->endaddr) - break; - - if (s >= objfile->sections_end) - continue; - - obj_private = (obj_private_data_t *) objfile->obj_private; - - /* The DP value may be different for each objfile. But within an - objfile each function uses the same dp value. Thus we do not need - to grope around the opd section looking for dp values. - - ?!? This is not strictly correct since we may be in a shared library - and want to call back into the main program. To make that case - work correctly we need to set obj_private->dp for the main program's - objfile, then remove this conditional. */ - if (obj_private->dp) - write_register (27, obj_private->dp); - break; - } - return pc; - } -#endif - -#ifndef GDB_TARGET_IS_HPPA_20W - /* Prefer __gcc_plt_call over the HP supplied routine because - __gcc_plt_call works for any number of arguments. */ - trampoline = NULL; - if (lookup_minimal_symbol ("__gcc_plt_call", NULL, NULL) == NULL) - using_gcc_plt_call = 0; - - msymbol = lookup_minimal_symbol ("$$dyncall", NULL, NULL); - if (msymbol == NULL) - error ("Can't find an address for $$dyncall trampoline"); - - dyncall_addr = SYMBOL_VALUE_ADDRESS (msymbol); - - /* FUN could be a procedure label, in which case we have to get - its real address and the value of its GOT/DP if we plan to - call the routine via gcc_plt_call. */ - if ((fun & 0x2) && using_gcc_plt_call) - { - /* Get the GOT/DP value for the target function. It's - at *(fun+4). Note the call dummy is *NOT* allowed to - trash %r19 before calling the target function. */ - write_register (19, read_memory_integer ((fun & ~0x3) + 4, - DEPRECATED_REGISTER_SIZE)); - - /* Now get the real address for the function we are calling, it's - at *fun. */ - fun = (CORE_ADDR) read_memory_integer (fun & ~0x3, - TARGET_PTR_BIT / 8); - } - else - { - -#ifndef GDB_TARGET_IS_PA_ELF - /* FUN could be an export stub, the real address of a function, or - a PLABEL. When using gcc's PLT call routine we must call an import - stub rather than the export stub or real function for lazy binding - to work correctly - - If we are using the gcc PLT call routine, then we need to - get the import stub for the target function. */ - if (using_gcc_plt_call && som_solib_get_got_by_pc (fun)) - { - struct objfile *objfile; - struct minimal_symbol *funsymbol, *stub_symbol; - CORE_ADDR newfun = 0; - - funsymbol = lookup_minimal_symbol_by_pc (fun); - if (!funsymbol) - error ("Unable to find minimal symbol for target function.\n"); - - /* Search all the object files for an import symbol with the - right name. */ - ALL_OBJFILES (objfile) - { - stub_symbol - = lookup_minimal_symbol_solib_trampoline - (DEPRECATED_SYMBOL_NAME (funsymbol), objfile); - - if (!stub_symbol) - stub_symbol = lookup_minimal_symbol (DEPRECATED_SYMBOL_NAME (funsymbol), - NULL, objfile); - - /* Found a symbol with the right name. */ - if (stub_symbol) - { - struct unwind_table_entry *u; - /* It must be a shared library trampoline. */ - if (MSYMBOL_TYPE (stub_symbol) != mst_solib_trampoline) - continue; - - /* It must also be an import stub. */ - u = find_unwind_entry (SYMBOL_VALUE (stub_symbol)); - if (u == NULL - || (u->stub_unwind.stub_type != IMPORT -#ifdef GDB_NATIVE_HPUX_11 - /* Sigh. The hpux 10.20 dynamic linker will blow - chunks if we perform a call to an unbound function - via the IMPORT_SHLIB stub. The hpux 11.00 dynamic - linker will blow chunks if we do not call the - unbound function via the IMPORT_SHLIB stub. - - We currently have no way to select bevahior on just - the target. However, we only support HPUX/SOM in - native mode. So we conditinalize on a native - #ifdef. Ugly. Ugly. Ugly */ - && u->stub_unwind.stub_type != IMPORT_SHLIB -#endif - )) - continue; - - /* OK. Looks like the correct import stub. */ - newfun = SYMBOL_VALUE (stub_symbol); - fun = newfun; - - /* If we found an IMPORT stub, then we want to stop - searching now. If we found an IMPORT_SHLIB, we want - to continue the search in the hopes that we will find - an IMPORT stub. */ - if (u->stub_unwind.stub_type == IMPORT) - break; - } - } - - /* Ouch. We did not find an import stub. Make an attempt to - do the right thing instead of just croaking. Most of the - time this will actually work. */ - if (newfun == 0) - write_register (19, som_solib_get_got_by_pc (fun)); - - u = find_unwind_entry (fun); - if (u - && (u->stub_unwind.stub_type == IMPORT - || u->stub_unwind.stub_type == IMPORT_SHLIB)) - trampoline = lookup_minimal_symbol ("__gcc_plt_call", NULL, NULL); - - /* If we found the import stub in the shared library, then we have - to set %r19 before we call the stub. */ - if (u && u->stub_unwind.stub_type == IMPORT_SHLIB) - write_register (19, som_solib_get_got_by_pc (fun)); - } -#endif - } - - /* If we are calling into another load module then have sr4export call the - magic __d_plt_call routine which is linked in from end.o. - - You can't use _sr4export to make the call as the value in sp-24 will get - fried and you end up returning to the wrong location. You can't call the - target as the code to bind the PLT entry to a function can't return to a - stack address. - - Also, query the dynamic linker in the inferior to provide a suitable - PLABEL for the target function. */ - if (!using_gcc_plt_call) - { - CORE_ADDR new_fun; - - /* Get a handle for the shared library containing FUN. Given the - handle we can query the shared library for a PLABEL. */ - solib_handle = som_solib_get_solib_by_pc (fun); - - if (solib_handle) - { - struct minimal_symbol *fmsymbol = lookup_minimal_symbol_by_pc (fun); - - trampoline = lookup_minimal_symbol ("__d_plt_call", NULL, NULL); - - if (trampoline == NULL) - { - error ("Can't find an address for __d_plt_call or __gcc_plt_call trampoline\nSuggest linking executable with -g or compiling with gcc."); - } - - /* This is where sr4export will jump to. */ - new_fun = SYMBOL_VALUE_ADDRESS (trampoline); - - /* If the function is in a shared library, then call __d_shl_get to - get a PLABEL for the target function. */ - new_stub = find_stub_with_shl_get (fmsymbol, solib_handle); - - if (new_stub == 0) - error ("Can't find an import stub for %s", DEPRECATED_SYMBOL_NAME (fmsymbol)); - - /* We have to store the address of the stub in __shlib_funcptr. */ - msymbol = lookup_minimal_symbol ("__shlib_funcptr", NULL, - (struct objfile *) NULL); - - if (msymbol == NULL) - error ("Can't find an address for __shlib_funcptr"); - target_write_memory (SYMBOL_VALUE_ADDRESS (msymbol), - (char *) &new_stub, 4); - - /* We want sr4export to call __d_plt_call, so we claim it is - the final target. Clear trampoline. */ - fun = new_fun; - trampoline = NULL; - } - } - - /* Store upper 21 bits of function address into ldil. fun will either be - the final target (most cases) or __d_plt_call when calling into a shared - library and __gcc_plt_call is not available. */ - store_unsigned_integer - (&dummy[FUNC_LDIL_OFFSET], - INSTRUCTION_SIZE, - deposit_21 (fun >> 11, - extract_unsigned_integer (&dummy[FUNC_LDIL_OFFSET], - INSTRUCTION_SIZE))); - - /* Store lower 11 bits of function address into ldo */ - store_unsigned_integer - (&dummy[FUNC_LDO_OFFSET], - INSTRUCTION_SIZE, - deposit_14 (fun & MASK_11, - extract_unsigned_integer (&dummy[FUNC_LDO_OFFSET], - INSTRUCTION_SIZE))); -#ifdef SR4EXPORT_LDIL_OFFSET - - { - CORE_ADDR trampoline_addr; - - /* We may still need sr4export's address too. */ - - if (trampoline == NULL) - { - msymbol = lookup_minimal_symbol ("_sr4export", NULL, NULL); - if (msymbol == NULL) - error ("Can't find an address for _sr4export trampoline"); - - trampoline_addr = SYMBOL_VALUE_ADDRESS (msymbol); - } - else - trampoline_addr = SYMBOL_VALUE_ADDRESS (trampoline); - - - /* Store upper 21 bits of trampoline's address into ldil */ - store_unsigned_integer - (&dummy[SR4EXPORT_LDIL_OFFSET], - INSTRUCTION_SIZE, - deposit_21 (trampoline_addr >> 11, - extract_unsigned_integer (&dummy[SR4EXPORT_LDIL_OFFSET], - INSTRUCTION_SIZE))); - - /* Store lower 11 bits of trampoline's address into ldo */ - store_unsigned_integer - (&dummy[SR4EXPORT_LDO_OFFSET], - INSTRUCTION_SIZE, - deposit_14 (trampoline_addr & MASK_11, - extract_unsigned_integer (&dummy[SR4EXPORT_LDO_OFFSET], - INSTRUCTION_SIZE))); - } -#endif - - write_register (22, pc); - - /* If we are in a syscall, then we should call the stack dummy - directly. $$dyncall is not needed as the kernel sets up the - space id registers properly based on the value in %r31. In - fact calling $$dyncall will not work because the value in %r22 - will be clobbered on the syscall exit path. - - Similarly if the current PC is in a shared library. Note however, - this scheme won't work if the shared library isn't mapped into - the same space as the stack. */ - if (flags & 2) - return pc; -#ifndef GDB_TARGET_IS_PA_ELF - else if (som_solib_get_got_by_pc (hppa_target_read_pc (inferior_ptid))) - return pc; -#endif - else - return dyncall_addr; -#endif -} - -/* If the pid is in a syscall, then the FP register is not readable. - We'll return zero in that case, rather than attempting to read it - and cause a warning. */ - -CORE_ADDR -hppa_read_fp (int pid) -{ - int flags = read_register (FLAGS_REGNUM); - - if (flags & 2) - { - return (CORE_ADDR) 0; - } - - /* This is the only site that may directly read_register () the FP - register. All others must use deprecated_read_fp (). */ - return read_register (DEPRECATED_FP_REGNUM); -} - -CORE_ADDR -hppa_target_read_fp (void) -{ - return hppa_read_fp (PIDGET (inferior_ptid)); -} - /* Get the PC from %r31 if currently in a syscall. Also mask out privilege bits. */ @@ -2589,7 +1164,7 @@ hppa_target_read_pc (ptid_t ptid) if (flags & 2) return read_register_pid (31, ptid) & ~0x3; - return read_register_pid (PC_REGNUM, ptid) & ~0x3; + return read_register_pid (PCOQ_HEAD_REGNUM, ptid) & ~0x3; } /* Write out the PC. If currently in a syscall, then also write the new @@ -2608,7 +1183,7 @@ hppa_target_write_pc (CORE_ADDR v, ptid_t ptid) if (flags & 2) write_register_pid (31, v | 0x3, ptid); - write_register_pid (PC_REGNUM, v, ptid); + write_register_pid (PCOQ_HEAD_REGNUM, v, ptid); write_register_pid (PCOQ_TAIL_REGNUM, v + 4, ptid); } @@ -2647,390 +1222,6 @@ hppa_alignof (struct type *type) } } -/* Print the register regnum, or all registers if regnum is -1 */ - -void -pa_do_registers_info (int regnum, int fpregs) -{ - char *raw_regs = alloca (DEPRECATED_REGISTER_BYTES); - int i; - - /* Make a copy of gdb's save area (may cause actual - reads from the target). */ - for (i = 0; i < NUM_REGS; i++) - frame_register_read (deprecated_selected_frame, i, - raw_regs + DEPRECATED_REGISTER_BYTE (i)); - - if (regnum == -1) - pa_print_registers (raw_regs, regnum, fpregs); - else if (regnum < FP4_REGNUM) - { - long reg_val[2]; - - /* Why is the value not passed through "extract_signed_integer" - as in "pa_print_registers" below? */ - pa_register_look_aside (raw_regs, regnum, ®_val[0]); - - if (!is_pa_2) - { - printf_unfiltered ("%s %lx\n", REGISTER_NAME (regnum), reg_val[1]); - } - else - { - /* Fancy % formats to prevent leading zeros. */ - if (reg_val[0] == 0) - printf_unfiltered ("%s %lx\n", REGISTER_NAME (regnum), reg_val[1]); - else - printf_unfiltered ("%s %lx%8.8lx\n", REGISTER_NAME (regnum), - reg_val[0], reg_val[1]); - } - } - else - /* Note that real floating point values only start at - FP4_REGNUM. FP0 and up are just status and error - registers, which have integral (bit) values. */ - pa_print_fp_reg (regnum); -} - -/********** new function ********************/ -void -pa_do_strcat_registers_info (int regnum, int fpregs, struct ui_file *stream, - enum precision_type precision) -{ - char *raw_regs = alloca (DEPRECATED_REGISTER_BYTES); - int i; - - /* Make a copy of gdb's save area (may cause actual - reads from the target). */ - for (i = 0; i < NUM_REGS; i++) - frame_register_read (deprecated_selected_frame, i, - raw_regs + DEPRECATED_REGISTER_BYTE (i)); - - if (regnum == -1) - pa_strcat_registers (raw_regs, regnum, fpregs, stream); - - else if (regnum < FP4_REGNUM) - { - long reg_val[2]; - - /* Why is the value not passed through "extract_signed_integer" - as in "pa_print_registers" below? */ - pa_register_look_aside (raw_regs, regnum, ®_val[0]); - - if (!is_pa_2) - { - fprintf_unfiltered (stream, "%s %lx", REGISTER_NAME (regnum), reg_val[1]); - } - else - { - /* Fancy % formats to prevent leading zeros. */ - if (reg_val[0] == 0) - fprintf_unfiltered (stream, "%s %lx", REGISTER_NAME (regnum), - reg_val[1]); - else - fprintf_unfiltered (stream, "%s %lx%8.8lx", REGISTER_NAME (regnum), - reg_val[0], reg_val[1]); - } - } - else - /* Note that real floating point values only start at - FP4_REGNUM. FP0 and up are just status and error - registers, which have integral (bit) values. */ - pa_strcat_fp_reg (regnum, stream, precision); -} - -/* If this is a PA2.0 machine, fetch the real 64-bit register - value. Otherwise use the info from gdb's saved register area. - - Note that reg_val is really expected to be an array of longs, - with two elements. */ -static void -pa_register_look_aside (char *raw_regs, int regnum, long *raw_val) -{ - static int know_which = 0; /* False */ - - int regaddr; - unsigned int offset; - int i; - int start; - - - char buf[MAX_REGISTER_SIZE]; - long long reg_val; - - if (!know_which) - { - if (CPU_PA_RISC2_0 == sysconf (_SC_CPU_VERSION)) - { - is_pa_2 = (1 == 1); - } - - know_which = 1; /* True */ - } - - raw_val[0] = 0; - raw_val[1] = 0; - - if (!is_pa_2) - { - raw_val[1] = *(long *) (raw_regs + DEPRECATED_REGISTER_BYTE (regnum)); - return; - } - - /* Code below copied from hppah-nat.c, with fixes for wide - registers, using different area of save_state, etc. */ - if (regnum == FLAGS_REGNUM || regnum >= FP0_REGNUM || - !HAVE_STRUCT_SAVE_STATE_T || !HAVE_STRUCT_MEMBER_SS_WIDE) - { - /* Use narrow regs area of save_state and default macro. */ - offset = U_REGS_OFFSET; - regaddr = register_addr (regnum, offset); - start = 1; - } - else - { - /* Use wide regs area, and calculate registers as 8 bytes wide. - - We'd like to do this, but current version of "C" doesn't - permit "offsetof": - - offset = offsetof(save_state_t, ss_wide); - - Note that to avoid "C" doing typed pointer arithmetic, we - have to cast away the type in our offset calculation: - otherwise we get an offset of 1! */ - - /* NB: save_state_t is not available before HPUX 9. - The ss_wide field is not available previous to HPUX 10.20, - so to avoid compile-time warnings, we only compile this for - PA 2.0 processors. This control path should only be followed - if we're debugging a PA 2.0 processor, so this should not cause - problems. */ - - /* #if the following code out so that this file can still be - compiled on older HPUX boxes (< 10.20) which don't have - this structure/structure member. */ -#if HAVE_STRUCT_SAVE_STATE_T == 1 && HAVE_STRUCT_MEMBER_SS_WIDE == 1 - save_state_t temp; - - offset = ((int) &temp.ss_wide) - ((int) &temp); - regaddr = offset + regnum * 8; - start = 0; -#endif - } - - for (i = start; i < 2; i++) - { - errno = 0; - raw_val[i] = call_ptrace (PT_RUREGS, PIDGET (inferior_ptid), - (PTRACE_ARG3_TYPE) regaddr, 0); - if (errno != 0) - { - /* Warning, not error, in case we are attached; sometimes the - kernel doesn't let us at the registers. */ - char *err = safe_strerror (errno); - char *msg = alloca (strlen (err) + 128); - sprintf (msg, "reading register %s: %s", REGISTER_NAME (regnum), err); - warning (msg); - goto error_exit; - } - - regaddr += sizeof (long); - } - - if (regnum == PCOQ_HEAD_REGNUM || regnum == PCOQ_TAIL_REGNUM) - raw_val[1] &= ~0x3; /* I think we're masking out space bits */ - -error_exit: - ; -} - -/* "Info all-reg" command */ - -static void -pa_print_registers (char *raw_regs, int regnum, int fpregs) -{ - int i, j; - /* Alas, we are compiled so that "long long" is 32 bits */ - long raw_val[2]; - long long_val; - int rows = 48, columns = 2; - - for (i = 0; i < rows; i++) - { - for (j = 0; j < columns; j++) - { - /* We display registers in column-major order. */ - int regnum = i + j * rows; - - /* Q: Why is the value passed through "extract_signed_integer", - while above, in "pa_do_registers_info" it isn't? - A: ? */ - pa_register_look_aside (raw_regs, regnum, &raw_val[0]); - - /* Even fancier % formats to prevent leading zeros - and still maintain the output in columns. */ - if (!is_pa_2) - { - /* Being big-endian, on this machine the low bits - (the ones we want to look at) are in the second longword. */ - long_val = extract_signed_integer (&raw_val[1], 4); - printf_filtered ("%10.10s: %8lx ", - REGISTER_NAME (regnum), long_val); - } - else - { - /* raw_val = extract_signed_integer(&raw_val, 8); */ - if (raw_val[0] == 0) - printf_filtered ("%10.10s: %8lx ", - REGISTER_NAME (regnum), raw_val[1]); - else - printf_filtered ("%10.10s: %8lx%8.8lx ", - REGISTER_NAME (regnum), - raw_val[0], raw_val[1]); - } - } - printf_unfiltered ("\n"); - } - - if (fpregs) - for (i = FP4_REGNUM; i < NUM_REGS; i++) /* FP4_REGNUM == 72 */ - pa_print_fp_reg (i); -} - -/************* new function ******************/ -static void -pa_strcat_registers (char *raw_regs, int regnum, int fpregs, - struct ui_file *stream) -{ - int i, j; - long raw_val[2]; /* Alas, we are compiled so that "long long" is 32 bits */ - long long_val; - enum precision_type precision; - - precision = unspecified_precision; - - for (i = 0; i < 18; i++) - { - for (j = 0; j < 4; j++) - { - /* Q: Why is the value passed through "extract_signed_integer", - while above, in "pa_do_registers_info" it isn't? - A: ? */ - pa_register_look_aside (raw_regs, i + (j * 18), &raw_val[0]); - - /* Even fancier % formats to prevent leading zeros - and still maintain the output in columns. */ - if (!is_pa_2) - { - /* Being big-endian, on this machine the low bits - (the ones we want to look at) are in the second longword. */ - long_val = extract_signed_integer (&raw_val[1], 4); - fprintf_filtered (stream, "%8.8s: %8lx ", - REGISTER_NAME (i + (j * 18)), long_val); - } - else - { - /* raw_val = extract_signed_integer(&raw_val, 8); */ - if (raw_val[0] == 0) - fprintf_filtered (stream, "%8.8s: %8lx ", - REGISTER_NAME (i + (j * 18)), raw_val[1]); - else - fprintf_filtered (stream, "%8.8s: %8lx%8.8lx ", - REGISTER_NAME (i + (j * 18)), raw_val[0], - raw_val[1]); - } - } - fprintf_unfiltered (stream, "\n"); - } - - if (fpregs) - for (i = FP4_REGNUM; i < NUM_REGS; i++) /* FP4_REGNUM == 72 */ - pa_strcat_fp_reg (i, stream, precision); -} - -static void -pa_print_fp_reg (int i) -{ - char raw_buffer[MAX_REGISTER_SIZE]; - char virtual_buffer[MAX_REGISTER_SIZE]; - - /* Get 32bits of data. */ - frame_register_read (deprecated_selected_frame, i, raw_buffer); - - /* Put it in the buffer. No conversions are ever necessary. */ - memcpy (virtual_buffer, raw_buffer, DEPRECATED_REGISTER_RAW_SIZE (i)); - - fputs_filtered (REGISTER_NAME (i), gdb_stdout); - print_spaces_filtered (8 - strlen (REGISTER_NAME (i)), gdb_stdout); - fputs_filtered ("(single precision) ", gdb_stdout); - - val_print (DEPRECATED_REGISTER_VIRTUAL_TYPE (i), virtual_buffer, 0, 0, gdb_stdout, 0, - 1, 0, Val_pretty_default); - printf_filtered ("\n"); - - /* If "i" is even, then this register can also be a double-precision - FP register. Dump it out as such. */ - if ((i % 2) == 0) - { - /* Get the data in raw format for the 2nd half. */ - frame_register_read (deprecated_selected_frame, i + 1, raw_buffer); - - /* Copy it into the appropriate part of the virtual buffer. */ - memcpy (virtual_buffer + DEPRECATED_REGISTER_RAW_SIZE (i), raw_buffer, - DEPRECATED_REGISTER_RAW_SIZE (i)); - - /* Dump it as a double. */ - fputs_filtered (REGISTER_NAME (i), gdb_stdout); - print_spaces_filtered (8 - strlen (REGISTER_NAME (i)), gdb_stdout); - fputs_filtered ("(double precision) ", gdb_stdout); - - val_print (builtin_type_double, virtual_buffer, 0, 0, gdb_stdout, 0, - 1, 0, Val_pretty_default); - printf_filtered ("\n"); - } -} - -/*************** new function ***********************/ -static void -pa_strcat_fp_reg (int i, struct ui_file *stream, enum precision_type precision) -{ - char raw_buffer[MAX_REGISTER_SIZE]; - char virtual_buffer[MAX_REGISTER_SIZE]; - - fputs_filtered (REGISTER_NAME (i), stream); - print_spaces_filtered (8 - strlen (REGISTER_NAME (i)), stream); - - /* Get 32bits of data. */ - frame_register_read (deprecated_selected_frame, i, raw_buffer); - - /* Put it in the buffer. No conversions are ever necessary. */ - memcpy (virtual_buffer, raw_buffer, DEPRECATED_REGISTER_RAW_SIZE (i)); - - if (precision == double_precision && (i % 2) == 0) - { - - char raw_buf[MAX_REGISTER_SIZE]; - - /* Get the data in raw format for the 2nd half. */ - frame_register_read (deprecated_selected_frame, i + 1, raw_buf); - - /* Copy it into the appropriate part of the virtual buffer. */ - memcpy (virtual_buffer + DEPRECATED_REGISTER_RAW_SIZE (i), raw_buf, - DEPRECATED_REGISTER_RAW_SIZE (i)); - - val_print (builtin_type_double, virtual_buffer, 0, 0, stream, 0, - 1, 0, Val_pretty_default); - - } - else - { - val_print (DEPRECATED_REGISTER_VIRTUAL_TYPE (i), virtual_buffer, 0, 0, stream, 0, - 1, 0, Val_pretty_default); - } - -} - /* Return one if PC is in the call path of a trampoline, else return zero. Note we return one for *any* call trampoline (long-call, arg-reloc), not @@ -3504,7 +1695,7 @@ hppa_skip_trampoline_code (CORE_ADDR pc) rp from sp - 8. */ if (prev_inst == 0x4bc23ff1) return (read_memory_integer - (read_register (SP_REGNUM) - 8, 4)) & ~0x3; + (read_register (HPPA_SP_REGNUM) - 8, 4)) & ~0x3; else { warning ("Unable to find restore of %%rp before bv (%%rp)."); @@ -3518,7 +1709,7 @@ hppa_skip_trampoline_code (CORE_ADDR pc) else if ((curr_inst & 0xffe0f000) == 0xe840d000) { return (read_memory_integer - (read_register (SP_REGNUM) - 24, TARGET_PTR_BIT / 8)) & ~0x3; + (read_register (HPPA_SP_REGNUM) - 24, TARGET_PTR_BIT / 8)) & ~0x3; } /* What about be,n 0(sr0,%rp)? It's just another way we return to @@ -3530,7 +1721,7 @@ hppa_skip_trampoline_code (CORE_ADDR pc) I guess we could check for the previous instruction being mtsp %r1,%sr0 if we want to do sanity checking. */ return (read_memory_integer - (read_register (SP_REGNUM) - 24, TARGET_PTR_BIT / 8)) & ~0x3; + (read_register (HPPA_SP_REGNUM) - 24, TARGET_PTR_BIT / 8)) & ~0x3; } /* Haven't found the branch yet, but we're still in the stub. @@ -3717,7 +1908,7 @@ restart: for (i = 3; i < u->Entry_GR + 3; i++) { /* Frame pointer gets saved into a special location. */ - if (u->Save_SP && i == DEPRECATED_FP_REGNUM) + if (u->Save_SP && i == HPPA_FP_REGNUM) continue; save_gr |= (1 << i); @@ -3978,111 +2169,49 @@ hppa_skip_prologue (CORE_ADDR pc) return (skip_prologue_hard_way (pc)); } -/* Put here the code to store, into the SAVED_REGS, the addresses of - the saved registers of frame described by FRAME_INFO. This - includes special registers such as pc and fp saved in special ways - in the stack frame. sp is even more special: the address we return - for it IS the sp for the next frame. */ +struct hppa_frame_cache +{ + CORE_ADDR base; + struct trad_frame_saved_reg *saved_regs; +}; -void -hppa_frame_find_saved_regs (struct frame_info *frame_info, - CORE_ADDR frame_saved_regs[]) +static struct hppa_frame_cache * +hppa_frame_cache (struct frame_info *next_frame, void **this_cache) { - CORE_ADDR pc; + struct hppa_frame_cache *cache; + long saved_gr_mask; + long saved_fr_mask; + CORE_ADDR this_sp; + long frame_size; struct unwind_table_entry *u; - unsigned long inst, stack_remaining, save_gr, save_fr, save_rp, save_sp; - int status, i, reg; - char buf[4]; - int fp_loc = -1; - int final_iteration; - - /* Zero out everything. */ - memset (frame_saved_regs, '\0', SIZEOF_FRAME_SAVED_REGS); - - /* Call dummy frames always look the same, so there's no need to - examine the dummy code to determine locations of saved registers; - instead, let find_dummy_frame_regs fill in the correct offsets - for the saved registers. */ - if ((get_frame_pc (frame_info) >= get_frame_base (frame_info) - && (get_frame_pc (frame_info) - <= (get_frame_base (frame_info) - /* A call dummy is sized in words, but it is actually a - series of instructions. Account for that scaling - factor. */ - + ((DEPRECATED_REGISTER_SIZE / INSTRUCTION_SIZE) - * DEPRECATED_CALL_DUMMY_LENGTH) - /* Similarly we have to account for 64bit wide register - saves. */ - + (32 * DEPRECATED_REGISTER_SIZE) - /* We always consider FP regs 8 bytes long. */ - + (NUM_REGS - FP0_REGNUM) * 8 - /* Similarly we have to account for 64bit wide register - saves. */ - + (6 * DEPRECATED_REGISTER_SIZE))))) - find_dummy_frame_regs (frame_info, frame_saved_regs); - - /* Interrupt handlers are special too. They lay out the register - state in the exact same order as the register numbers in GDB. */ - if (pc_in_interrupt_handler (get_frame_pc (frame_info))) - { - for (i = 0; i < NUM_REGS; i++) - { - /* SP is a little special. */ - if (i == SP_REGNUM) - frame_saved_regs[SP_REGNUM] - = read_memory_integer (get_frame_base (frame_info) + SP_REGNUM * 4, - TARGET_PTR_BIT / 8); - else - frame_saved_regs[i] = get_frame_base (frame_info) + i * 4; - } - return; - } - -#ifdef FRAME_FIND_SAVED_REGS_IN_SIGTRAMP - /* Handle signal handler callers. */ - if ((get_frame_type (frame_info) == SIGTRAMP_FRAME)) - { - FRAME_FIND_SAVED_REGS_IN_SIGTRAMP (frame_info, frame_saved_regs); - return; - } -#endif + int i; - /* Get the starting address of the function referred to by the PC - saved in frame. */ - pc = get_frame_func (frame_info); + if ((*this_cache) != NULL) + return (*this_cache); + cache = FRAME_OBSTACK_ZALLOC (struct hppa_frame_cache); + (*this_cache) = cache; + cache->saved_regs = trad_frame_alloc_saved_regs (next_frame); /* Yow! */ - u = find_unwind_entry (pc); + u = find_unwind_entry (frame_func_unwind (next_frame)); if (!u) - return; - - /* This is how much of a frame adjustment we need to account for. */ - stack_remaining = u->Total_frame_size << 3; - - /* Magic register saves we want to know about. */ - save_rp = u->Save_RP; - save_sp = u->Save_SP; + return (*this_cache); /* Turn the Entry_GR field into a bitmask. */ - save_gr = 0; + saved_gr_mask = 0; for (i = 3; i < u->Entry_GR + 3; i++) { /* Frame pointer gets saved into a special location. */ - if (u->Save_SP && i == DEPRECATED_FP_REGNUM) + if (u->Save_SP && i == HPPA_FP_REGNUM) continue; - - save_gr |= (1 << i); + + saved_gr_mask |= (1 << i); } /* Turn the Entry_FR field into a bitmask too. */ - save_fr = 0; + saved_fr_mask = 0; for (i = 12; i < u->Entry_FR + 12; i++) - save_fr |= (1 << i); - - /* The frame always represents the value of %sp at entry to the - current function (and is thus equivalent to the "saved" stack - pointer. */ - frame_saved_regs[SP_REGNUM] = get_frame_base (frame_info); + saved_fr_mask |= (1 << i); /* Loop until we find everything of interest or hit a branch. @@ -4098,140 +2227,266 @@ hppa_frame_find_saved_regs (struct frame_info *frame_info, Some unexpected things are expected with debugging optimized code, so we allow this routine to walk past user instructions in optimized GCC code. */ - final_iteration = 0; - while ((save_gr || save_fr || save_rp || save_sp || stack_remaining > 0) - && pc <= get_frame_pc (frame_info)) - { - status = target_read_memory (pc, buf, 4); - inst = extract_unsigned_integer (buf, 4); - - /* Yow! */ - if (status != 0) - return; - - /* Note the interesting effects of this instruction. */ - stack_remaining -= prologue_inst_adjust_sp (inst); - - /* There are limited ways to store the return pointer into the - stack. */ - if (inst == 0x6bc23fd9) /* stw rp,-0x14(sr0,sp) */ - { - save_rp = 0; - frame_saved_regs[RP_REGNUM] = get_frame_base (frame_info) - 20; - } - else if (inst == 0x0fc212c1) /* std rp,-0x10(sr0,sp) */ - { - save_rp = 0; - frame_saved_regs[RP_REGNUM] = get_frame_base (frame_info) - 16; - } + { + int final_iteration = 0; + CORE_ADDR pc; + CORE_ADDR end_pc = skip_prologue_using_sal (pc); + int looking_for_sp = u->Save_SP; + int looking_for_rp = u->Save_RP; + int fp_loc = -1; + if (end_pc == 0) + end_pc = frame_pc_unwind (next_frame); + frame_size = 0; + for (pc = frame_func_unwind (next_frame); + ((saved_gr_mask || saved_fr_mask + || looking_for_sp || looking_for_rp + || frame_size < (u->Total_frame_size << 3)) + && pc <= end_pc); + pc += 4) + { + int reg; + char buf4[4]; + long status = target_read_memory (pc, buf4, sizeof buf4); + long inst = extract_unsigned_integer (buf4, sizeof buf4); + + /* Note the interesting effects of this instruction. */ + frame_size += prologue_inst_adjust_sp (inst); + + /* There are limited ways to store the return pointer into the + stack. */ + if (inst == 0x6bc23fd9) /* stw rp,-0x14(sr0,sp) */ + { + looking_for_rp = 0; + cache->saved_regs[RP_REGNUM].addr = -20; + } + else if (inst == 0x0fc212c1) /* std rp,-0x10(sr0,sp) */ + { + looking_for_rp = 0; + cache->saved_regs[RP_REGNUM].addr = -16; + } + + /* Check to see if we saved SP into the stack. This also + happens to indicate the location of the saved frame + pointer. */ + if ((inst & 0xffffc000) == 0x6fc10000 /* stw,ma r1,N(sr0,sp) */ + || (inst & 0xffffc00c) == 0x73c10008) /* std,ma r1,N(sr0,sp) */ + { + looking_for_sp = 0; + cache->saved_regs[HPPA_FP_REGNUM].addr = 0; + } + + /* Account for general and floating-point register saves. */ + reg = inst_saves_gr (inst); + if (reg >= 3 && reg <= 18 + && (!u->Save_SP || reg != HPPA_FP_REGNUM)) + { + saved_gr_mask &= ~(1 << reg); + if ((inst >> 26) == 0x1b && extract_14 (inst) >= 0) + /* stwm with a positive displacement is a _post_ + _modify_. */ + cache->saved_regs[reg].addr = 0; + else if ((inst & 0xfc00000c) == 0x70000008) + /* A std has explicit post_modify forms. */ + cache->saved_regs[reg].addr = 0; + else + { + CORE_ADDR offset; + + if ((inst >> 26) == 0x1c) + offset = (inst & 0x1 ? -1 << 13 : 0) | (((inst >> 4) & 0x3ff) << 3); + else if ((inst >> 26) == 0x03) + offset = low_sign_extend (inst & 0x1f, 5); + else + offset = extract_14 (inst); + + /* Handle code with and without frame pointers. */ + if (u->Save_SP) + cache->saved_regs[reg].addr = offset; + else + cache->saved_regs[reg].addr = (u->Total_frame_size << 3) + offset; + } + } - /* Note if we saved SP into the stack. This also happens to indicate - the location of the saved frame pointer. */ - if ( (inst & 0xffffc000) == 0x6fc10000 /* stw,ma r1,N(sr0,sp) */ - || (inst & 0xffffc00c) == 0x73c10008) /* std,ma r1,N(sr0,sp) */ - { - frame_saved_regs[DEPRECATED_FP_REGNUM] = get_frame_base (frame_info); - save_sp = 0; - } + /* GCC handles callee saved FP regs a little differently. + + It emits an instruction to put the value of the start of + the FP store area into %r1. It then uses fstds,ma with a + basereg of %r1 for the stores. - /* Account for general and floating-point register saves. */ - reg = inst_saves_gr (inst); - if (reg >= 3 && reg <= 18 - && (!u->Save_SP || reg != DEPRECATED_FP_REGNUM)) - { - save_gr &= ~(1 << reg); - - /* stwm with a positive displacement is a *post modify*. */ - if ((inst >> 26) == 0x1b - && extract_14 (inst) >= 0) - frame_saved_regs[reg] = get_frame_base (frame_info); - /* A std has explicit post_modify forms. */ - else if ((inst & 0xfc00000c0) == 0x70000008) - frame_saved_regs[reg] = get_frame_base (frame_info); - else - { - CORE_ADDR offset; + HP CC emits them at the current stack pointer modifying the + stack pointer as it stores each register. */ + + /* ldo X(%r3),%r1 or ldo X(%r30),%r1. */ + if ((inst & 0xffffc000) == 0x34610000 + || (inst & 0xffffc000) == 0x37c10000) + fp_loc = extract_14 (inst); + + reg = inst_saves_fr (inst); + if (reg >= 12 && reg <= 21) + { + /* Note +4 braindamage below is necessary because the FP + status registers are internally 8 registers rather than + the expected 4 registers. */ + saved_fr_mask &= ~(1 << reg); + if (fp_loc == -1) + { + /* 1st HP CC FP register store. After this + instruction we've set enough state that the GCC and + HPCC code are both handled in the same manner. */ + cache->saved_regs[reg + FP4_REGNUM + 4].addr = 0; + fp_loc = 8; + } + else + { + cache->saved_regs[reg + HPPA_FP0_REGNUM + 4].addr = fp_loc; + fp_loc += 8; + } + } + + /* Quit if we hit any kind of branch the previous iteration. */ + if (final_iteration) + break; + /* We want to look precisely one instruction beyond the branch + if we have not found everything yet. */ + if (is_branch (inst)) + final_iteration = 1; + } + } - if ((inst >> 26) == 0x1c) - offset = (inst & 0x1 ? -1 << 13 : 0) | (((inst >> 4) & 0x3ff) << 3); - else if ((inst >> 26) == 0x03) - offset = low_sign_extend (inst & 0x1f, 5); - else - offset = extract_14 (inst); + { + /* The frame base always represents the value of %sp at entry to + the current function (and is thus equivalent to the "saved" + stack pointer. */ + CORE_ADDR this_sp = frame_unwind_register_unsigned (next_frame, HPPA_SP_REGNUM); + /* FIXME: cagney/2004-02-22: This assumes that the frame has been + created. If it hasn't everything will be out-of-wack. */ + if (u->Save_SP && trad_frame_addr_p (cache->saved_regs, HPPA_SP_REGNUM)) + /* Both we're expecting the SP to be saved and the SP has been + saved. The entry SP value is saved at this frame's SP + address. */ + cache->base = read_memory_integer (this_sp, TARGET_PTR_BIT / 8); + else + /* The prologue has been slowly allocating stack space. Adjust + the SP back. */ + cache->base = this_sp - frame_size; + trad_frame_set_value (cache->saved_regs, HPPA_SP_REGNUM, cache->base); + } - /* Handle code with and without frame pointers. */ - if (u->Save_SP) - frame_saved_regs[reg] - = get_frame_base (frame_info) + offset; - else - frame_saved_regs[reg] - = (get_frame_base (frame_info) + (u->Total_frame_size << 3) - + offset); - } - } + /* The PC is found in the "return register", "Millicode" uses "r31" + as the return register while normal code uses "rp". */ + if (u->Millicode) + cache->saved_regs[PCOQ_HEAD_REGNUM] = cache->saved_regs[31]; + else + cache->saved_regs[PCOQ_HEAD_REGNUM] = cache->saved_regs[RP_REGNUM]; + { + /* Convert all the offsets into addresses. */ + int reg; + for (reg = 0; reg < NUM_REGS; reg++) + { + if (trad_frame_addr_p (cache->saved_regs, reg)) + cache->saved_regs[reg].addr += cache->base; + } + } - /* GCC handles callee saved FP regs a little differently. + return (*this_cache); +} - It emits an instruction to put the value of the start of - the FP store area into %r1. It then uses fstds,ma with - a basereg of %r1 for the stores. +static void +hppa_frame_this_id (struct frame_info *next_frame, void **this_cache, + struct frame_id *this_id) +{ + struct hppa_frame_cache *info = hppa_frame_cache (next_frame, this_cache); + (*this_id) = frame_id_build (info->base, frame_func_unwind (next_frame)); +} - HP CC emits them at the current stack pointer modifying - the stack pointer as it stores each register. */ +static void +hppa_frame_prev_register (struct frame_info *next_frame, + void **this_cache, + int regnum, int *optimizedp, + enum lval_type *lvalp, CORE_ADDR *addrp, + int *realnump, void *valuep) +{ + struct hppa_frame_cache *info = hppa_frame_cache (next_frame, this_cache); + struct gdbarch *gdbarch = get_frame_arch (next_frame); + if (regnum == PCOQ_TAIL_REGNUM) + { + /* The PCOQ TAIL, or NPC, needs to be computed from the unwound + PC register. */ + *optimizedp = 0; + *lvalp = not_lval; + *addrp = 0; + *realnump = 0; + if (valuep) + { + int regsize = register_size (gdbarch, PCOQ_HEAD_REGNUM); + CORE_ADDR pc; + int optimized; + enum lval_type lval; + CORE_ADDR addr; + int realnum; + bfd_byte value[MAX_REGISTER_SIZE]; + trad_frame_prev_register (next_frame, info->saved_regs, + PCOQ_HEAD_REGNUM, &optimized, &lval, &addr, + &realnum, &value); + pc = extract_unsigned_integer (&value, regsize); + store_unsigned_integer (valuep, regsize, pc + 4); + } + } + else + { + trad_frame_prev_register (next_frame, info->saved_regs, regnum, + optimizedp, lvalp, addrp, realnump, valuep); + } +} - /* ldo X(%r3),%r1 or ldo X(%r30),%r1. */ - if ((inst & 0xffffc000) == 0x34610000 - || (inst & 0xffffc000) == 0x37c10000) - fp_loc = extract_14 (inst); +static const struct frame_unwind hppa_frame_unwind = +{ + NORMAL_FRAME, + hppa_frame_this_id, + hppa_frame_prev_register +}; - reg = inst_saves_fr (inst); - if (reg >= 12 && reg <= 21) - { - /* Note +4 braindamage below is necessary because the FP status - registers are internally 8 registers rather than the expected - 4 registers. */ - save_fr &= ~(1 << reg); - if (fp_loc == -1) - { - /* 1st HP CC FP register store. After this instruction - we've set enough state that the GCC and HPCC code are - both handled in the same manner. */ - frame_saved_regs[reg + FP4_REGNUM + 4] = get_frame_base (frame_info); - fp_loc = 8; - } - else - { - frame_saved_regs[reg + FP0_REGNUM + 4] - = get_frame_base (frame_info) + fp_loc; - fp_loc += 8; - } - } +static const struct frame_unwind * +hppa_frame_unwind_sniffer (struct frame_info *next_frame) +{ + return &hppa_frame_unwind; +} - /* Quit if we hit any kind of branch the previous iteration. */ - if (final_iteration) - break; +static CORE_ADDR +hppa_frame_base_address (struct frame_info *next_frame, + void **this_cache) +{ + struct hppa_frame_cache *info = hppa_frame_cache (next_frame, + this_cache); + return info->base; +} - /* We want to look precisely one instruction beyond the branch - if we have not found everything yet. */ - if (is_branch (inst)) - final_iteration = 1; +static const struct frame_base hppa_frame_base = { + &hppa_frame_unwind, + hppa_frame_base_address, + hppa_frame_base_address, + hppa_frame_base_address +}; - /* Bump the PC. */ - pc += 4; - } +static const struct frame_base * +hppa_frame_base_sniffer (struct frame_info *next_frame) +{ + return &hppa_frame_base; } -/* XXX - deprecated. This is a compatibility function for targets - that do not yet implement DEPRECATED_FRAME_INIT_SAVED_REGS. */ -/* Find the addresses in which registers are saved in FRAME. */ +static struct frame_id +hppa_unwind_dummy_id (struct gdbarch *gdbarch, struct frame_info *next_frame) +{ + return frame_id_build (frame_unwind_register_unsigned (next_frame, + HPPA_SP_REGNUM), + frame_pc_unwind (next_frame)); +} -void -hppa_frame_init_saved_regs (struct frame_info *frame) +static CORE_ADDR +hppa_unwind_pc (struct gdbarch *gdbarch, struct frame_info *next_frame) { - if (deprecated_get_frame_saved_regs (frame) == NULL) - frame_saved_regs_zalloc (frame); - hppa_frame_find_saved_regs (frame, deprecated_get_frame_saved_regs (frame)); + return frame_unwind_register_signed (next_frame, PCOQ_HEAD_REGNUM) & ~3; } /* Exception handling support for the HP-UX ANSI C++ compiler. @@ -4785,108 +3040,6 @@ hppa_skip_permanent_breakpoint (void) /* We can leave the tail's space the same, since there's no jump. */ } -/* Copy the function value from VALBUF into the proper location - for a function return. - - Called only in the context of the "return" command. */ - -void -hppa32_store_return_value (struct type *type, char *valbuf) -{ - /* For software floating point, the return value goes into the - integer registers. But we do not have any flag to key this on, - so we always store the value into the integer registers. - - If its a float value, then we also store it into the floating - point registers. */ - deprecated_write_register_bytes (DEPRECATED_REGISTER_BYTE (28) - + (TYPE_LENGTH (type) > 4 - ? (8 - TYPE_LENGTH (type)) - : (4 - TYPE_LENGTH (type))), - valbuf, TYPE_LENGTH (type)); - if (TYPE_CODE (type) == TYPE_CODE_FLT) - deprecated_write_register_bytes (DEPRECATED_REGISTER_BYTE (FP4_REGNUM), - valbuf, TYPE_LENGTH (type)); -} - -/* Same as hppa32_store_return_value(), but for the PA64 ABI. */ - -void -hppa64_store_return_value (struct type *type, char *valbuf) -{ - if (TYPE_CODE (type) == TYPE_CODE_FLT) - deprecated_write_register_bytes - (DEPRECATED_REGISTER_BYTE (FP4_REGNUM) - + DEPRECATED_REGISTER_SIZE - TYPE_LENGTH (type), - valbuf, TYPE_LENGTH (type)); - else if (is_integral_type(type)) - deprecated_write_register_bytes - (DEPRECATED_REGISTER_BYTE (28) - + DEPRECATED_REGISTER_SIZE - TYPE_LENGTH (type), - valbuf, TYPE_LENGTH (type)); - else if (TYPE_LENGTH (type) <= 8) - deprecated_write_register_bytes - (DEPRECATED_REGISTER_BYTE (28),valbuf, TYPE_LENGTH (type)); - else if (TYPE_LENGTH (type) <= 16) - { - deprecated_write_register_bytes (DEPRECATED_REGISTER_BYTE (28),valbuf, 8); - deprecated_write_register_bytes - (DEPRECATED_REGISTER_BYTE (29), valbuf + 8, TYPE_LENGTH (type) - 8); - } -} - -/* Copy the function's return value into VALBUF. - - This function is called only in the context of "target function calls", - ie. when the debugger forces a function to be called in the child, and - when the debugger forces a fucntion to return prematurely via the - "return" command. */ - -void -hppa32_extract_return_value (struct type *type, char *regbuf, char *valbuf) -{ - if (TYPE_CODE (type) == TYPE_CODE_FLT) - memcpy (valbuf, regbuf + DEPRECATED_REGISTER_BYTE (FP4_REGNUM), TYPE_LENGTH (type)); - else - memcpy (valbuf, - (regbuf - + DEPRECATED_REGISTER_BYTE (28) - + (TYPE_LENGTH (type) > 4 - ? (8 - TYPE_LENGTH (type)) - : (4 - TYPE_LENGTH (type)))), - TYPE_LENGTH (type)); -} - -/* Same as hppa32_extract_return_value but for the PA64 ABI case. */ - -void -hppa64_extract_return_value (struct type *type, char *regbuf, char *valbuf) -{ - /* RM: Floats are returned in FR4R, doubles in FR4. - Integral values are in r28, padded on the left. - Aggregates less that 65 bits are in r28, right padded. - Aggregates upto 128 bits are in r28 and r29, right padded. */ - if (TYPE_CODE (type) == TYPE_CODE_FLT) - memcpy (valbuf, - regbuf + DEPRECATED_REGISTER_BYTE (FP4_REGNUM) - + DEPRECATED_REGISTER_SIZE - TYPE_LENGTH (type), - TYPE_LENGTH (type)); - else if (is_integral_type(type)) - memcpy (valbuf, - regbuf + DEPRECATED_REGISTER_BYTE (28) - + DEPRECATED_REGISTER_SIZE - TYPE_LENGTH (type), - TYPE_LENGTH (type)); - else if (TYPE_LENGTH (type) <= 8) - memcpy (valbuf, regbuf + DEPRECATED_REGISTER_BYTE (28), - TYPE_LENGTH (type)); - else if (TYPE_LENGTH (type) <= 16) - { - memcpy (valbuf, regbuf + DEPRECATED_REGISTER_BYTE (28), 8); - memcpy (valbuf + 8, regbuf + DEPRECATED_REGISTER_BYTE (29), - TYPE_LENGTH (type) - 8); - } -} - int hppa_reg_struct_has_addr (int gcc_p, struct type *type) { @@ -4902,22 +3055,6 @@ hppa_inner_than (CORE_ADDR lhs, CORE_ADDR rhs) return (lhs > rhs); } -CORE_ADDR -hppa32_stack_align (CORE_ADDR sp) -{ - /* elz: adjust the quantity to the next highest value which is - 64-bit aligned. This is used in valops.c, when the sp is adjusted. - On hppa the sp must always be kept 64-bit aligned */ - return ((sp % 8) ? (sp + 7) & -8 : sp); -} - -CORE_ADDR -hppa64_stack_align (CORE_ADDR sp) -{ - /* The PA64 ABI mandates a 16 byte stack alignment. */ - return ((sp % 16) ? (sp + 15) & -16 : sp); -} - int hppa_pc_requires_run_before_use (CORE_ADDR pc) { @@ -4958,56 +3095,30 @@ hppa_instruction_nullified (void) return ((ipsw & 0x00200000) && !(flags & 0x2)); } -int -hppa_register_raw_size (int reg_nr) -{ - /* All registers have the same size. */ - return DEPRECATED_REGISTER_SIZE; -} - -/* Index within the register vector of the first byte of the space i - used for register REG_NR. */ - -int -hppa_register_byte (int reg_nr) -{ - struct gdbarch_tdep *tdep = gdbarch_tdep (current_gdbarch); - - return reg_nr * tdep->bytes_per_address; -} - /* Return the GDB type object for the "standard" data type of data in register N. */ -struct type * -hppa32_register_virtual_type (int reg_nr) +static struct type * +hppa32_register_type (struct gdbarch *gdbarch, int reg_nr) { if (reg_nr < FP4_REGNUM) - return builtin_type_int; + return builtin_type_uint32; else - return builtin_type_float; + return builtin_type_ieee_single_big; } /* Return the GDB type object for the "standard" data type of data in register N. hppa64 version. */ -struct type * -hppa64_register_virtual_type (int reg_nr) +static struct type * +hppa64_register_type (struct gdbarch *gdbarch, int reg_nr) { if (reg_nr < FP4_REGNUM) - return builtin_type_unsigned_long_long; + return builtin_type_uint64; else - return builtin_type_double; + return builtin_type_ieee_double_big; } -/* Store the address of the place in which to copy the structure the - subroutine will return. This is called from call_function. */ - -void -hppa_store_struct_return (CORE_ADDR addr, CORE_ADDR sp) -{ - write_register (28, addr); -} /* Return True if REGNUM is not a register available to the user through ptrace(). */ @@ -5118,24 +3229,18 @@ hppa_gdbarch_init (struct gdbarch_info info, struct gdbarch_list *arches) case 4: set_gdbarch_num_regs (gdbarch, hppa32_num_regs); set_gdbarch_register_name (gdbarch, hppa32_register_name); - set_gdbarch_deprecated_register_virtual_type - (gdbarch, hppa32_register_virtual_type); + set_gdbarch_register_type (gdbarch, hppa32_register_type); break; case 8: set_gdbarch_num_regs (gdbarch, hppa64_num_regs); set_gdbarch_register_name (gdbarch, hppa64_register_name); - set_gdbarch_deprecated_register_virtual_type - (gdbarch, hppa64_register_virtual_type); + set_gdbarch_register_type (gdbarch, hppa64_register_type); break; default: internal_error (__FILE__, __LINE__, "Unsupported address size: %d", tdep->bytes_per_address); } - /* The following gdbarch vector elements depend on other parts of this - vector which have been set above, depending on the ABI. */ - set_gdbarch_deprecated_register_bytes - (gdbarch, gdbarch_num_regs (gdbarch) * tdep->bytes_per_address); set_gdbarch_long_bit (gdbarch, tdep->bytes_per_address * TARGET_CHAR_BIT); set_gdbarch_ptr_bit (gdbarch, tdep->bytes_per_address * TARGET_CHAR_BIT); @@ -5153,23 +3258,14 @@ hppa_gdbarch_init (struct gdbarch_info info, struct gdbarch_list *arches) set_gdbarch_in_solib_return_trampoline (gdbarch, hppa_in_solib_return_trampoline); set_gdbarch_inner_than (gdbarch, hppa_inner_than); - set_gdbarch_deprecated_register_size (gdbarch, tdep->bytes_per_address); - set_gdbarch_deprecated_fp_regnum (gdbarch, 3); - set_gdbarch_sp_regnum (gdbarch, 30); - set_gdbarch_fp0_regnum (gdbarch, 64); - set_gdbarch_pc_regnum (gdbarch, PCOQ_HEAD_REGNUM); - set_gdbarch_deprecated_register_raw_size (gdbarch, hppa_register_raw_size); - set_gdbarch_deprecated_register_byte (gdbarch, hppa_register_byte); - set_gdbarch_deprecated_register_virtual_size (gdbarch, hppa_register_raw_size); - set_gdbarch_deprecated_max_register_raw_size (gdbarch, tdep->bytes_per_address); - set_gdbarch_deprecated_max_register_virtual_size (gdbarch, 8); + set_gdbarch_sp_regnum (gdbarch, HPPA_SP_REGNUM); + set_gdbarch_fp0_regnum (gdbarch, HPPA_FP0_REGNUM); set_gdbarch_cannot_store_register (gdbarch, hppa_cannot_store_register); set_gdbarch_addr_bits_remove (gdbarch, hppa_smash_text_address); set_gdbarch_smash_text_address (gdbarch, hppa_smash_text_address); set_gdbarch_believe_pcc_promotion (gdbarch, 1); set_gdbarch_read_pc (gdbarch, hppa_target_read_pc); set_gdbarch_write_pc (gdbarch, hppa_target_write_pc); - set_gdbarch_deprecated_target_read_fp (gdbarch, hppa_target_read_fp); /* Helper for function argument information. */ set_gdbarch_fetch_pointer_argument (gdbarch, hppa_fetch_pointer_argument); @@ -5183,44 +3279,38 @@ hppa_gdbarch_init (struct gdbarch_info info, struct gdbarch_list *arches) set_gdbarch_have_nonsteppable_watchpoint (gdbarch, 1); /* Inferior function call methods. */ -#if 0 -#else switch (tdep->bytes_per_address) { case 4: - set_gdbarch_deprecated_call_dummy_length (gdbarch, hppa32_call_dummy_length); - set_gdbarch_deprecated_stack_align (gdbarch, hppa32_stack_align); - set_gdbarch_deprecated_reg_struct_has_addr (gdbarch, hppa_reg_struct_has_addr); - set_gdbarch_deprecated_extract_return_value (gdbarch, hppa32_extract_return_value); - set_gdbarch_use_struct_convention (gdbarch, hppa32_use_struct_convention); - set_gdbarch_deprecated_store_return_value (gdbarch, hppa32_store_return_value); + set_gdbarch_push_dummy_call (gdbarch, hppa32_push_dummy_call); + set_gdbarch_frame_align (gdbarch, hppa32_frame_align); break; case 8: - set_gdbarch_deprecated_call_dummy_breakpoint_offset (gdbarch, hppa64_call_dummy_breakpoint_offset); - set_gdbarch_deprecated_call_dummy_length (gdbarch, hppa64_call_dummy_length); - set_gdbarch_deprecated_stack_align (gdbarch, hppa64_stack_align); - set_gdbarch_deprecated_extract_return_value (gdbarch, hppa64_extract_return_value); - set_gdbarch_use_struct_convention (gdbarch, hppa64_use_struct_convention); - set_gdbarch_deprecated_store_return_value (gdbarch, hppa64_store_return_value); + set_gdbarch_push_dummy_call (gdbarch, hppa64_push_dummy_call); + set_gdbarch_frame_align (gdbarch, hppa64_frame_align); break; + default: + internal_error (__FILE__, __LINE__, "bad switch"); } - set_gdbarch_deprecated_store_struct_return (gdbarch, hppa_store_struct_return); - set_gdbarch_deprecated_push_dummy_frame (gdbarch, hppa_push_dummy_frame); - /* set_gdbarch_deprecated_fix_call_dummy (gdbarch, hppa_fix_call_dummy); */ - set_gdbarch_deprecated_push_arguments (gdbarch, hppa_push_arguments); -#endif - + + /* Struct return methods. */ + switch (tdep->bytes_per_address) + { + case 4: + set_gdbarch_return_value (gdbarch, hppa32_return_value); + break; + case 8: + set_gdbarch_return_value (gdbarch, hppa64_return_value); + break; + default: + internal_error (__FILE__, __LINE__, "bad switch"); + } + /* Frame unwind methods. */ -#if 0 -#else - set_gdbarch_deprecated_saved_pc_after_call (gdbarch, hppa_saved_pc_after_call); - set_gdbarch_deprecated_init_extra_frame_info (gdbarch, hppa_init_extra_frame_info); - set_gdbarch_deprecated_frame_chain (gdbarch, hppa_frame_chain); - set_gdbarch_deprecated_frame_chain_valid (gdbarch, hppa_frame_chain_valid); - set_gdbarch_deprecated_frameless_function_invocation (gdbarch, hppa_frameless_function_invocation); - set_gdbarch_deprecated_frame_saved_pc (gdbarch, hppa_frame_saved_pc); - set_gdbarch_deprecated_pop_frame (gdbarch, hppa_pop_frame); -#endif + set_gdbarch_unwind_dummy_id (gdbarch, hppa_unwind_dummy_id); + set_gdbarch_unwind_pc (gdbarch, hppa_unwind_pc); + frame_unwind_append_sniffer (gdbarch, hppa_frame_unwind_sniffer); + frame_base_append_sniffer (gdbarch, hppa_frame_base_sniffer); /* Hook in ABI-specific overrides, if they have been registered. */ gdbarch_init_osabi (info, gdbarch); |