Index: hppa-tdep.c
===================================================================
RCS file: /cvs/src/src/gdb/hppa-tdep.c,v
retrieving revision 1.41
retrieving revision 1.42
diff -c -3 -p -r1.41 -r1.42
*** hppa-tdep.c	16 Dec 2002 16:51:45 -0000	1.41
--- hppa-tdep.c	26 Dec 2002 09:36:41 -0000	1.42
*************** int hppa_inner_than (CORE_ADDR lhs, CORE
*** 139,144 ****
--- 139,145 ----
  CORE_ADDR hppa_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 * hppa_register_virtual_type (int reg_nr);
  void hppa_store_struct_return (CORE_ADDR addr, CORE_ADDR sp);
*************** hppa_instruction_nullified (void)
*** 4810,4815 ****
--- 4811,4823 ----
    const int flags = (int) read_register (FLAGS_REGNUM);
  
    return ((ipsw & 0x00200000) && !(flags & 0x2));
+ }
+ 
+ int
+ hppa_register_raw_size (int reg_nr)
+ {
+   /* All registers have the same size.  */
+   return REGISTER_SIZE;
  }
  
  /* Index within the register vector of the first byte of the space i
Index: hppa-hpux-tdep.c
===================================================================
RCS file: /cvs/src/src/gdb/hppa-hpux-tdep.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -c -3 -p -r1.2 -r1.3
*** hppa-hpux-tdep.c	21 Dec 2002 19:58:07 -0000	1.2
--- hppa-hpux-tdep.c	26 Dec 2002 09:36:41 -0000	1.3
*************** Foundation, Inc., 59 Temple Place - Suit
*** 19,29 ****
--- 19,97 ----
  
  #include "defs.h"
  #include "arch-utils.h"
+ #include "gdbcore.h"
  #include "osabi.h"
  
  /* Forward declarations.  */
  extern void _initialize_hppa_hpux_tdep (void);
  extern initialize_file_ftype _initialize_hppa_hpux_tdep;
+ 
+ /* FIXME: brobecker 2002-12-25.  The following functions will eventually
+    become static, after the multiarching conversion is done.  */
+ int hppa_hpux_pc_in_sigtramp (CORE_ADDR pc, char *name);
+ void hppa_hpux_frame_saved_pc_in_sigtramp (struct frame_info *fi,
+                                            CORE_ADDR *tmp);
+ void hppa_hpux_frame_base_before_sigtramp (struct frame_info *fi,
+                                            CORE_ADDR *tmp);
+ void hppa_hpux_frame_find_saved_regs_in_sigtramp
+       (struct frame_info *fi, struct frame_saved_regs *fsr);
+ 
+ int
+ hppa_hpux_pc_in_sigtramp (CORE_ADDR pc, char *name)
+ {
+   /* Actually, for a PA running HPUX the kernel calls the signal handler
+      without an intermediate trampoline.  Luckily the kernel always sets
+      the return pointer for the signal handler to point to _sigreturn.  */
+   return (name && (strcmp ("_sigreturn", name) == 0));
+ }
+ 
+ /* For hppa_hpux_frame_saved_pc_in_sigtramp, 
+    hppa_hpux_frame_base_before_sigtramp and
+    hppa_hpux_frame_find_saved_regs_in_sigtramp:
+ 
+    The signal context structure pointer is always saved at the base
+    of the frame which "calls" the signal handler.  We only want to find
+    the hardware save state structure, which lives 10 32bit words into
+    sigcontext structure.
+ 
+    Within the hardware save state structure, registers are found in the
+    same order as the register numbers in GDB.
+ 
+    At one time we peeked at %r31 rather than the PC queues to determine
+    what instruction took the fault.  This was done on purpose, but I don't
+    remember why.  Looking at the PC queues is really the right way, and
+    I don't remember why that didn't work when this code was originally
+    written.  */
+ 
+ void
+ hppa_hpux_frame_saved_pc_in_sigtramp (struct frame_info *fi, CORE_ADDR *tmp)
+ {
+   *tmp = read_memory_integer (fi->frame + (43 * 4), 4);
+ }
+ 
+ void
+ hppa_hpux_frame_base_before_sigtramp (struct frame_info *fi,
+                                       CORE_ADDR *tmp)
+ {
+   *tmp = read_memory_integer (fi->frame + (40 * 4), 4);
+ }
+ 
+ void
+ hppa_hpux_frame_find_saved_regs_in_sigtramp (struct frame_info *fi,
+                                              struct frame_saved_regs *fsr)
+ {
+   int i;
+   const CORE_ADDR tmp = (fi)->frame + (10 * 4);
+ 
+   for (i = 0; i < NUM_REGS; i++)
+     {
+       if (i == SP_REGNUM)
+ 	(fsr)->regs[SP_REGNUM] = read_memory_integer (tmp + SP_REGNUM * 4, 4);
+       else
+ 	(fsr)->regs[i] = tmp + i * 4;
+     }
+ }
+ 
  
  static void
  hppa_hpux_som_init_abi (struct gdbarch_info info, struct gdbarch *gdbarch)
Index: config/pa/tm-hppa.h
===================================================================
RCS file: /cvs/src/src/gdb/config/pa/tm-hppa.h,v
retrieving revision 1.26
retrieving revision 1.27
diff -c -3 -p -r1.26 -r1.27
*** config/pa/tm-hppa.h	11 Dec 2002 02:26:37 -0000	1.26
--- config/pa/tm-hppa.h	26 Dec 2002 09:36:42 -0000	1.27
*************** extern int hppa_instruction_nullified (v
*** 240,246 ****
     for register N.  On the PA-RISC, all regs are 4 bytes, including
     the FP registers (they're accessed as two 4 byte halves).  */
  
! #define REGISTER_RAW_SIZE(N) 4
  
  /* Total amount of space needed to store our copies of the machine's
     register state, the array `registers'.  */
--- 240,247 ----
     for register N.  On the PA-RISC, all regs are 4 bytes, including
     the FP registers (they're accessed as two 4 byte halves).  */
  
! extern int hppa_register_raw_size (int reg_nr);
! #define REGISTER_RAW_SIZE(N) hppa_register_raw_size (N)
  
  /* Total amount of space needed to store our copies of the machine's
     register state, the array `registers'.  */
Index: config/pa/tm-hppah.h
===================================================================
RCS file: /cvs/src/src/gdb/config/pa/tm-hppah.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -c -3 -p -r1.4 -r1.5
*** config/pa/tm-hppah.h	4 Dec 2002 17:37:58 -0000	1.4
--- config/pa/tm-hppah.h	26 Dec 2002 09:36:43 -0000	1.5
***************
*** 33,82 ****
  #include "somsolib.h"
  #endif
  
! /* Actually, for a PA running HPUX the kernel calls the signal handler
!    without an intermediate trampoline.  Luckily the kernel always sets
!    the return pointer for the signal handler to point to _sigreturn.  */
! #define PC_IN_SIGTRAMP(pc, name) (name && STREQ ("_sigreturn", name))
! 
! /* For HPUX:
! 
!    The signal context structure pointer is always saved at the base
!    of the frame which "calls" the signal handler.  We only want to find
!    the hardware save state structure, which lives 10 32bit words into
!    sigcontext structure.
! 
!    Within the hardware save state structure, registers are found in the
!    same order as the register numbers in GDB.
! 
!    At one time we peeked at %r31 rather than the PC queues to determine
!    what instruction took the fault.  This was done on purpose, but I don't
!    remember why.  Looking at the PC queues is really the right way, and
!    I don't remember why that didn't work when this code was originally
!    written.  */
  
  #define FRAME_SAVED_PC_IN_SIGTRAMP(FRAME, TMP) \
! { \
!   *(TMP) = read_memory_integer ((FRAME)->frame + (43 * 4) , 4); \
! }
  
  #define FRAME_BASE_BEFORE_SIGTRAMP(FRAME, TMP) \
! { \
!   *(TMP) = read_memory_integer ((FRAME)->frame + (40 * 4), 4); \
! }
  
  #define FRAME_FIND_SAVED_REGS_IN_SIGTRAMP(FRAME, FSR) \
! { \
!   int i; \
!   CORE_ADDR TMP; \
!   TMP = (FRAME)->frame + (10 * 4); \
!   for (i = 0; i < NUM_REGS; i++) \
!     { \
!       if (i == SP_REGNUM) \
! 	(FSR)->regs[SP_REGNUM] = read_memory_integer (TMP + SP_REGNUM * 4, 4); \
!       else \
! 	(FSR)->regs[i] = TMP + i * 4; \
!     } \
! }
  
  /* For HP-UX on PA-RISC we have an implementation
     for the exception handling target op (in hppa-tdep.c) */
--- 33,56 ----
  #include "somsolib.h"
  #endif
  
! 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)
  
+ extern void hppa_hpux_frame_saved_pc_in_sigtramp (struct frame_info *fi,
+                                                   CORE_ADDR *tmp);
  #define FRAME_SAVED_PC_IN_SIGTRAMP(FRAME, TMP) \
!   hppa_hpux_frame_saved_pc_in_sigtramp (FRAME, TMP)
  
+ extern void hppa_hpux_frame_base_before_sigtramp (struct frame_info *fi,
+                                                   CORE_ADDR *tmp);
  #define FRAME_BASE_BEFORE_SIGTRAMP(FRAME, TMP) \
!   hppa_hpux_frame_base_before_sigtramp (FRAME, TMP)
  
+ struct frame_saved_regs;
+ extern void hppa_hpux_frame_find_saved_regs_in_sigtramp
+               (struct frame_info *fi, struct frame_saved_regs *fsr);
  #define FRAME_FIND_SAVED_REGS_IN_SIGTRAMP(FRAME, FSR) \
!   hppa_hpux_frame_find_saved_regs_in_sigtramp (FRAME, FSR)
  
  /* For HP-UX on PA-RISC we have an implementation
     for the exception handling target op (in hppa-tdep.c) */
Index: Makefile.in
===================================================================
RCS file: /cvs/src/src/gdb/Makefile.in,v
retrieving revision 1.298
retrieving revision 1.299
diff -c -3 -p -r1.298 -r1.299
*** Makefile.in	24 Dec 2002 19:21:10 -0000	1.298
--- Makefile.in	26 Dec 2002 09:36:41 -0000	1.299
*************** hppa-tdep.o: hppa-tdep.c $(defs_h) $(fra
*** 1760,1766 ****
  	$(value_h) $(regcache_h) $(completer_h) $(symtab_h) $(a_out_encap_h) \
  	$(gdb_stat_h) $(gdb_wait_h) $(gdbcore_h) $(gdbcmd_h) $(target_h) \
  	$(symfile_h) $(objfiles_h) $(language_h) $(osabi_h)
! hppa-hpux-tdep.o: hppa-hpux-tdep.c $(defs_h) $(arch_utils_h) $(osabi_h)
  hppab-nat.o: hppab-nat.c $(defs_h) $(inferior_h) $(target_h) $(regcache_h)
  hppah-nat.o: hppah-nat.c $(defs_h) $(inferior_h) $(target_h) $(gdbcore_h) \
  	$(gdb_wait_h) $(regcache_h)
--- 1760,1767 ----
  	$(value_h) $(regcache_h) $(completer_h) $(symtab_h) $(a_out_encap_h) \
  	$(gdb_stat_h) $(gdb_wait_h) $(gdbcore_h) $(gdbcmd_h) $(target_h) \
  	$(symfile_h) $(objfiles_h) $(language_h) $(osabi_h)
! hppa-hpux-tdep.o: hppa-hpux-tdep.c $(defs_h) $(arch_utils_h) $(gdbcore_h) \
! 	$(osabi_h)
  hppab-nat.o: hppab-nat.c $(defs_h) $(inferior_h) $(target_h) $(regcache_h)
  hppah-nat.o: hppah-nat.c $(defs_h) $(inferior_h) $(target_h) $(gdbcore_h) \
  	$(gdb_wait_h) $(regcache_h)