From f208c3f8e83c20431e2c8329424fedbde27db7d9 Mon Sep 17 00:00:00 2001 From: brobecke Date: Fri, 8 Aug 2003 22:10:48 +0000 Subject: [PATCH] * config/pa/tm-hppa64.h: Remove lots of macros that are no longer necessary now that hppa64 is partially multiarch'ed. --- gdb/ChangeLog | 5 + gdb/config/pa/tm-hppa64.h | 310 +--------------------------------------------- 2 files changed, 6 insertions(+), 309 deletions(-) diff --git a/gdb/ChangeLog b/gdb/ChangeLog index 207eff5467..72ab0eb480 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,3 +1,8 @@ +2003-08-08 J. Brobecker + + * config/pa/tm-hppa64.h: Remove lots of macros that are no + longer necessary now that hppa64 is partially multiarch'ed. + 2003-08-08 Andrew Cagney * interps.c (interp_set): Check for a NULL "old_interp". diff --git a/gdb/config/pa/tm-hppa64.h b/gdb/config/pa/tm-hppa64.h index 8d19a45cb6..98d0497eac 100644 --- a/gdb/config/pa/tm-hppa64.h +++ b/gdb/config/pa/tm-hppa64.h @@ -36,319 +36,11 @@ struct frame_info; hppa64-hp-hpux11.00; GDB managed to build / start / break main / run with multi-arch enabled. Not sure about much else as there appears to be an unrelated problem in the SOM symbol table reader - causing GDB to loose line number information. Since prior to this + causing GDB to lose line number information. Since prior to this switch and a other recent tweaks, 64 bit PA hadn't been building for some months, this is probably the lesser of several evils. */ #define GDB_MULTI_ARCH GDB_MULTI_ARCH_PARTIAL -/* FIXME: brobecker 2003-05-22: All the definition from this point until - the include of pa/tm-hppah.h are extracted from tm-hppa.h and tm-hppah.h. - They have been temporarily moved here, until hppa64 is multiarched too. */ - -#if !GDB_MULTI_ARCH -extern int hppa_hpux_pc_in_sigtramp (CORE_ADDR pc, char *name); -#define PC_IN_SIGTRAMP(pc, name) hppa_hpux_pc_in_sigtramp (pc, name) -#endif - -#if !GDB_MULTI_ARCH -extern int hppa_reg_struct_has_addr (int gcc_p, struct type *type); -#define REG_STRUCT_HAS_ADDR(gcc_p,type) hppa_reg_struct_has_addr (gcc_p,type) -#endif - -/* Offset from address of function to start of its code. - Zero on most machines. */ - -#if !GDB_MULTI_ARCH -#define FUNCTION_START_OFFSET 0 -#endif - -/* Advance PC across any function entry prologue instructions - to reach some "real" code. */ - -#if !GDB_MULTI_ARCH -extern CORE_ADDR hppa_skip_prologue (CORE_ADDR); -#define SKIP_PROLOGUE(pc) (hppa_skip_prologue (pc)) -#endif - -/* If PC is in some function-call trampoline code, return the PC - where the function itself actually starts. If not, return NULL. */ - -#if !GDB_MULTI_ARCH -#define SKIP_TRAMPOLINE_CODE(pc) hppa_skip_trampoline_code (pc) -extern CORE_ADDR hppa_skip_trampoline_code (CORE_ADDR); -#endif - -/* Return non-zero if we are in an appropriate trampoline. */ - -#if !GDB_MULTI_ARCH -#define IN_SOLIB_CALL_TRAMPOLINE(pc, name) \ - hppa_in_solib_call_trampoline (pc, name) -extern int hppa_in_solib_call_trampoline (CORE_ADDR, char *); -#endif - -#if !GDB_MULTI_ARCH -#define IN_SOLIB_RETURN_TRAMPOLINE(pc, name) \ - hppa_in_solib_return_trampoline (pc, name) -extern int hppa_in_solib_return_trampoline (CORE_ADDR, char *); -#endif - -#if !GDB_MULTI_ARCH -#undef DEPRECATED_SAVED_PC_AFTER_CALL -#define DEPRECATED_SAVED_PC_AFTER_CALL(frame) hppa_saved_pc_after_call (frame) -extern CORE_ADDR hppa_saved_pc_after_call (struct frame_info *); -#endif - -#if !GDB_MULTI_ARCH -extern int hppa_inner_than (CORE_ADDR lhs, CORE_ADDR rhs); -#define INNER_THAN(lhs,rhs) hppa_inner_than(lhs,rhs) -#endif - -#if !GDB_MULTI_ARCH -extern CORE_ADDR hppa_stack_align (CORE_ADDR sp); -#define STACK_ALIGN(sp) hppa_stack_align (sp) -#endif - -/* Amount PC must be decremented by after a breakpoint. This is often - the number of bytes returned by BREAKPOINT_FROM_PC but not always. - - Not on the PA-RISC */ - -#if !GDB_MULTI_ARCH -#define DECR_PC_AFTER_BREAK 0 -#endif - -/* Say how long (ordinary) registers are. This is a piece of bogosity - used in push_word and a few other places; REGISTER_RAW_SIZE is the - real way to know how big a register is. */ - -#if !GDB_MULTI_ARCH -#define DEPRECATED_REGISTER_SIZE 4 -#endif - -/* Number of machine registers */ - -#if !GDB_MULTI_ARCH -#define NUM_REGS 128 -#endif - -#if !GDB_MULTI_ARCH -#define DEPRECATED_FP_REGNUM 3 /* Contains address of executing stack */ - /* frame */ -#endif -#if !GDB_MULTI_ARCH -#define SP_REGNUM 30 /* Contains address of top of stack */ -#endif - -#if !GDB_MULTI_ARCH -#define FP0_REGNUM 64 /* floating point reg. 0 (fspr) */ -#endif - -/* compatibility with the rest of gdb. */ -#if !GDB_MULTI_ARCH -#define PC_REGNUM PCOQ_HEAD_REGNUM -#endif -#if !GDB_MULTI_ARCH -#define NPC_REGNUM PCOQ_TAIL_REGNUM -#endif - -/* Number of bytes of storage in the actual machine representation - for register N. On the PA-RISC, all regs are 4 bytes, including - the FP registers (they're accessed as two 4 byte halves). */ - -#if !GDB_MULTI_ARCH -extern int hppa_register_raw_size (int reg_nr); -#define REGISTER_RAW_SIZE(N) hppa_register_raw_size (N) -#endif - -/* Total amount of space needed to store our copies of the machine's - register state, the array `registers'. */ -#if !GDB_MULTI_ARCH -#define DEPRECATED_REGISTER_BYTES (NUM_REGS * 4) -#endif - -#if !GDB_MULTI_ARCH -extern int hppa_register_byte (int reg_nr); -#define REGISTER_BYTE(N) hppa_register_byte (N) -#endif - -/* Number of bytes of storage in the program's representation - for register N. */ - -#if !GDB_MULTI_ARCH -#define REGISTER_VIRTUAL_SIZE(N) REGISTER_RAW_SIZE(N) -#endif - -/* Largest value REGISTER_RAW_SIZE can have. */ - -#if !GDB_MULTI_ARCH -#define DEPRECATED_MAX_REGISTER_RAW_SIZE 4 -#endif - -/* Largest value REGISTER_VIRTUAL_SIZE can have. */ - -#if !GDB_MULTI_ARCH -#define DEPRECATED_MAX_REGISTER_VIRTUAL_SIZE 8 -#endif - -#if !GDB_MULTI_ARCH -extern struct type * hppa_register_virtual_type (int reg_nr); -#define REGISTER_VIRTUAL_TYPE(N) hppa_register_virtual_type (N) -#endif - -#if !GDB_MULTI_ARCH -extern void hppa_store_struct_return (CORE_ADDR addr, CORE_ADDR sp); -#define STORE_STRUCT_RETURN(ADDR, SP) hppa_store_struct_return (ADDR, SP) -#endif - -/* Extract from an array REGBUF containing the (raw) register state - a function return value of type TYPE, and copy that, in virtual format, - into VALBUF. */ - -#if !GDB_MULTI_ARCH -void hppa_extract_return_value (struct type *type, char *regbuf, char *valbuf); -#define DEPRECATED_EXTRACT_RETURN_VALUE(TYPE,REGBUF,VALBUF) \ - hppa_extract_return_value (TYPE, REGBUF, VALBUF); -#endif - - /* elz: decide whether the function returning a value of type type - will put it on the stack or in the registers. - The pa calling convention says that: - register 28 (called ret0 by gdb) contains any ASCII char, - and any non_floating point value up to 32-bits. - reg 28 and 29 contain non-floating point up tp 64 bits and larger - than 32 bits. (higer order word in reg 28). - fr4: floating point up to 64 bits - sr1: space identifier (32-bit) - stack: any lager than 64-bit, with the address in r28 - */ -#if !GDB_MULTI_ARCH -extern use_struct_convention_fn hppa_use_struct_convention; -#define USE_STRUCT_CONVENTION(gcc_p,type) hppa_use_struct_convention (gcc_p,type) -#endif - -/* Write into appropriate registers a function return value - of type TYPE, given in virtual format. */ - -#if !GDB_MULTI_ARCH -extern void hppa_store_return_value (struct type *type, char *valbuf); -#define DEPRECATED_STORE_RETURN_VALUE(TYPE,VALBUF) \ - hppa_store_return_value (TYPE, VALBUF); -#endif - -#if !GDB_MULTI_ARCH -extern CORE_ADDR hppa_extract_struct_value_address (char *regbuf); -#define DEPRECATED_EXTRACT_STRUCT_VALUE_ADDRESS(REGBUF) \ - hppa_extract_struct_value_address (REGBUF) -#endif - -#if !GDB_MULTI_ARCH -extern int hppa_cannot_store_register (int regnum); -#define CANNOT_STORE_REGISTER(regno) hppa_cannot_store_register (regno) -#endif - -#if !GDB_MULTI_ARCH -#define DEPRECATED_INIT_EXTRA_FRAME_INFO(fromleaf, frame) hppa_init_extra_frame_info (fromleaf, frame) -extern void hppa_init_extra_frame_info (int, struct frame_info *); -#endif - -/* Describe the pointer in each stack frame to the previous stack frame - (its caller). */ - -/* DEPRECATED_FRAME_CHAIN takes a frame's nominal address and produces - the frame's chain-pointer. */ - -/* In the case of the PA-RISC, the frame's nominal address - is the address of a 4-byte word containing the calling frame's - address (previous FP). */ - -#if !GDB_MULTI_ARCH -#define DEPRECATED_FRAME_CHAIN(thisframe) hppa_frame_chain (thisframe) -extern CORE_ADDR hppa_frame_chain (struct frame_info *); -#endif - -#if !GDB_MULTI_ARCH -extern int hppa_frame_chain_valid (CORE_ADDR, struct frame_info *); -#define DEPRECATED_FRAME_CHAIN_VALID(chain, thisframe) hppa_frame_chain_valid (chain, thisframe) -#endif - -/* Define other aspects of the stack frame. */ - -/* A macro that tells us whether the function invocation represented - by FI does not have a frame on the stack associated with it. If it - does not, FRAMELESS is set to 1, else 0. */ -#if !GDB_MULTI_ARCH -#define FRAMELESS_FUNCTION_INVOCATION(FI) \ - (hppa_frameless_function_invocation (FI)) -extern int hppa_frameless_function_invocation (struct frame_info *); -#endif - -#if !GDB_MULTI_ARCH -extern CORE_ADDR hppa_frame_saved_pc (struct frame_info *frame); -#define DEPRECATED_FRAME_SAVED_PC(FRAME) hppa_frame_saved_pc (FRAME) -#endif - -#if !GDB_MULTI_ARCH -extern CORE_ADDR hppa_frame_locals_address (struct frame_info *fi); -#define DEPRECATED_FRAME_LOCALS_ADDRESS(fi) hppa_frame_locals_address (fi) -#endif - -#if !GDB_MULTI_ARCH -#define FRAME_ARGS_SKIP 0 -#endif - -/* Things needed for making the inferior call functions. */ - -#if !GDB_MULTI_ARCH -#define DEPRECATED_PUSH_DUMMY_FRAME hppa_push_dummy_frame () -extern void hppa_push_dummy_frame (void); -#endif - -/* Discard from the stack the innermost frame, - restoring all saved registers. */ -#if !GDB_MULTI_ARCH -#define DEPRECATED_POP_FRAME hppa_pop_frame () -extern void hppa_pop_frame (void); -#endif - -#if !GDB_MULTI_ARCH -#define DEPRECATED_CALL_DUMMY_LENGTH (INSTRUCTION_SIZE * 28) -#endif - -#if !GDB_MULTI_ARCH -#define DEPRECATED_CALL_DUMMY_START_OFFSET 0 -#endif - -#if !GDB_MULTI_ARCH -#define DEPRECATED_PUSH_ARGUMENTS(nargs, args, sp, struct_return, struct_addr) \ - (hppa_push_arguments((nargs), (args), (sp), (struct_return), (struct_addr))) -extern CORE_ADDR hppa_push_arguments (int, struct value **, CORE_ADDR, int, - CORE_ADDR); -#endif - -#if !GDB_MULTI_ARCH -extern CORE_ADDR hppa_smash_text_address (CORE_ADDR addr); -#define SMASH_TEXT_ADDRESS(addr) hppa_smash_text_address (addr) -#endif - -#if !GDB_MULTI_ARCH -#define BELIEVE_PCC_PROMOTION 1 -#endif - -#if !GDB_MULTI_ARCH -#define TARGET_READ_PC(pid) hppa_target_read_pc (pid) -extern CORE_ADDR hppa_target_read_pc (ptid_t); -#endif - -#if !GDB_MULTI_ARCH -#define TARGET_WRITE_PC(v,pid) hppa_target_write_pc (v,pid) -extern void hppa_target_write_pc (CORE_ADDR, ptid_t); -#endif - -#if !GDB_MULTI_ARCH -#define DEPRECATED_TARGET_READ_FP() hppa_target_read_fp () -extern CORE_ADDR hppa_target_read_fp (void); -#endif - #include "pa/tm-hppah.h" #define HPUX_1100 1 -- 2.11.0