* hppa-tdep.c (deposit_17): New routine to deposit 17 bit

	constants into PA instructions.
	* Put #ifdefs around all signal handling code.  Not generally
	needed for embedded boards.
	* (hppa_fix_call_dummy):  Parameterize offsets into call dummy to
	allow different dummys to be used by this code.  Use
	INSTRUCTION_SIZE instead of REGISTER_SIZE for things.
	Conditionalize setup of _sr4export fixup.  Improve comments.
	* config/pa/tm-hppa.h:  Define INSTRUCTION_SIZE.  Use a different
	call dummy if PA_LEVEL_0 is defined.  Better comments for call
	dummys.  Define offsets for LDIL/LDO instructions which load
	function addresses.
	* config/pa/tm-pro.h:  Get rid of signal handling stuff.  Define
	PA_LEVEL_0 to disable mucking with space regs and such.

4 files changed, 157 insertions, 77 deletions

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 53e1649..2dcfe69 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,28 @@
+Wed Apr 19 16:58:11 1995  Stu Grossman  (grossman@andros.cygnus.com)
+
+	* hppa-tdep.c (deposit_17):  New routine to deposit 17 bit
+	constants into PA instructions.
+	* Put #ifdefs around all signal handling code.  Not generally
+	needed for embedded boards.
+	* (hppa_fix_call_dummy):  Parameterize offsets into call dummy to
+	allow different dummys to be used by this code.  Use
+	INSTRUCTION_SIZE instead of REGISTER_SIZE for things.
+	Conditionalize setup of _sr4export fixup.  Improve comments.
+	* config/pa/tm-hppa.h:  Define INSTRUCTION_SIZE.  Use a different
+	call dummy if PA_LEVEL_0 is defined.  Better comments for call
+	dummys.  Define offsets for LDIL/LDO instructions which load
+	function addresses.
+	* config/pa/tm-pro.h:  Get rid of signal handling stuff.  Define
+	PA_LEVEL_0 to disable mucking with space regs and such.
+
+Mon Apr 17 15:37:08 1995  Stu Grossman  (grossman@andros.cygnus.com)
+
+	* cpu32bug-rom.c monitor.h op50-rom.c remote-est.c rom68k-rom.c
+	w89k-rom.c:  Remove loadtypes, loadprotos and baudrates.
+	* op50-rom.c:  Fix copyrights and add load routine to op50n_cmds.
+	* rom68k-rom.c (_initialize_rom68k):  Don't set baud rate.
+	* w89k-rom.c:  Fix copyrights.
+
 Sun Apr 16 14:00:55 1995  Stu Grossman  (grossman@andros.cygnus.com)
 
 	* monitor.c:  Move all xmodem stuff into xmodem.[ch].  Remove
diff --git a/gdb/config/pa/tm-hppa.h b/gdb/config/pa/tm-hppa.h
index 3dc838d..e346f3a 100644
--- a/gdb/config/pa/tm-hppa.h
+++ b/gdb/config/pa/tm-hppa.h
@@ -149,17 +149,26 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.  */
    to be actual register numbers as far as the user is concerned
    but do serve to get the desired values when passed to read_register.  */
 
+#define R0_REGNUM 0		/* Doesn't actually exist, used as base for
+				   other r registers.  */
 #define FLAGS_REGNUM 0		/* Various status flags */
 #define RP_REGNUM 2		/* return pointer */
 #define FP_REGNUM 3		/* Contains address of executing stack */
 				/* frame */
 #define SP_REGNUM 30		/* Contains address of top of stack */
-#define SAR_REGNUM 32		/* shift amount register */
-#define IPSW_REGNUM 41		/* processor status word. ? */
+#define SAR_REGNUM 32		/* Shift Amount Register */
+#define IPSW_REGNUM 41		/* Interrupt Processor Status Word */
 #define PCOQ_HEAD_REGNUM 33	/* instruction offset queue head */
 #define PCSQ_HEAD_REGNUM 34	/* instruction space queue head */
 #define PCOQ_TAIL_REGNUM 35	/* instruction offset queue tail */
 #define PCSQ_TAIL_REGNUM 36	/* instruction space queue tail */
+#define EIEM_REGNUM 37		/* External Interrupt Enable Mask */
+#define IIR_REGNUM 38		/* Interrupt Instruction Register */
+#define IOR_REGNUM 40		/* Interrupt Offset Register */
+#define SR4_REGNUM 43		/* space register 4 */
+#define RCR_REGNUM 51		/* Recover Counter (also known as cr0) */
+#define CCR_REGNUM 54		/* Coprocessor Configuration Register */
+#define TR0_REGNUM 57		/* Temporary Registers (cr24 -> cr31) */
 #define FP0_REGNUM 64		/* floating point reg. 0 */
 #define FP4_REGNUM 72
 
@@ -321,12 +330,19 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.  */
 
 /* Push an empty stack frame, to record the current PC, etc. */
 
-#define PUSH_DUMMY_FRAME push_dummy_frame ()
+#define PUSH_DUMMY_FRAME push_dummy_frame (&inf_status)
 
 /* Discard from the stack the innermost frame, 
    restoring all saved registers.  */
 #define POP_FRAME  hppa_pop_frame ()
 
+#define INSTRUCTION_SIZE 4
+
+#ifndef PA_LEVEL_0
+
+/* Non-level zero PA's have space registers (but they don't always have
+   floating-point, do they????  */
+
 /* This sequence of words is the instructions
 
 ; Call stack frame has already been built by gdb. Since we could be calling 
@@ -343,11 +359,11 @@ call_dummy
 	fldds -4(0, r1), fr5
 	fldws -8(0, r1), fr6
 	fldds -12(0, r1), fr7
-	ldil 0, r22			; target will be placed here.
-	ldo 0(r22), r22
+	ldil 0, r22			; FUNC_LDIL_OFFSET must point here
+	ldo 0(r22), r22			; FUNC_LDO_OFFSET must point here
 	ldsid (0,r22), r4
-	ldil 0, r1			; _sr4export will be placed here.
-	ldo 0(r1), r1
+	ldil 0, r1			; SR4EXPORT_LDIL_OFFSET must point here
+	ldo 0(r1), r1			; SR4EXPORT_LDO_OFFSET must point here
 	ldsid (0,r1), r20
 	combt,=,n r4, r20, text_space	; If target is in data space, do a
 	ble 0(sr5, r22)			; "normal" procedure call
@@ -389,6 +405,14 @@ text_space				; Otherwise, go through _sr4export,
    avoid the kernel bug.  The second NOP is needed to keep the call
    dummy 8 byte aligned.  */
 
+/* Define offsets into the call dummy for the target function address */
+#define FUNC_LDIL_OFFSET (INSTRUCTION_SIZE * 9)
+#define FUNC_LDO_OFFSET (INSTRUCTION_SIZE * 10)
+
+/* Define offsets into the call dummy for the _sr4export address */
+#define SR4EXPORT_LDIL_OFFSET (INSTRUCTION_SIZE * 12)
+#define SR4EXPORT_LDO_OFFSET (INSTRUCTION_SIZE * 13)
+
 #define CALL_DUMMY {0x4BDA3FB9, 0x4BD93FB1, 0x4BD83FA9, 0x4BD73FA1,\
                     0x37C13FB9, 0x24201004, 0x2C391005, 0x24311006,\
                     0x2C291007, 0x22C00000, 0x36D60000, 0x02C010A4,\
@@ -397,7 +421,39 @@ text_space				; Otherwise, go through _sr4export,
                     0xe6c00002, 0xe4202000, 0x6bdf3fd1, 0x00010004,\
                     0x00151820, 0xe6c00002, 0x08000240, 0x08000240}
 
-#define CALL_DUMMY_LENGTH 112
+#define CALL_DUMMY_LENGTH (INSTRUCTION_SIZE * 28)
+
+#else /* defined PA_LEVEL_0 */
+
+/* This is the call dummy for a level 0 PA.  Level 0's don't have space
+   registers (or floating point??), so we skip all that inter-space call stuff,
+   and avoid touching the fp regs.
+
+call_dummy
+
+	ldw -36(%sp), %arg0
+	ldw -40(%sp), %arg1
+	ldw -44(%sp), %arg2
+	ldw -48(%sp), %arg3
+	ldil 0, %r31			; FUNC_LDIL_OFFSET must point here
+	ldo 0(%r31), %r31		; FUNC_LDO_OFFSET must point here
+	ble 0(0,%r31)
+	copy %r31, %r2
+	break 4, 8 
+*/
+
+/* Define offsets into the call dummy for the target function address */
+#define FUNC_LDIL_OFFSET (INSTRUCTION_SIZE * 4)
+#define FUNC_LDO_OFFSET (INSTRUCTION_SIZE * 5)
+
+#define CALL_DUMMY {0x4bda3fb9, 0x4bd93fb1, 0x4bd83fa9, 0x4bd73fa1,\
+		    0x23e00000, 0x37ff0000, 0xe7e00000, 0x081f0242,\
+		    0x00010004}
+
+#define CALL_DUMMY_LENGTH (INSTRUCTION_SIZE * 9)
+
+#endif
+
 #define CALL_DUMMY_START_OFFSET 0
 
 /*
@@ -518,6 +574,7 @@ struct obj_unwind_info {
 
 extern CORE_ADDR target_read_pc PARAMS ((int));
 extern void target_write_pc PARAMS ((CORE_ADDR, int));
+extern CORE_ADDR skip_trampoline_code PARAMS ((CORE_ADDR, char *));
 
 #define TARGET_READ_PC(pid) target_read_pc (pid)
 #define TARGET_WRITE_PC(v,pid) target_write_pc (v,pid)
diff --git a/gdb/config/pa/tm-pro.h b/gdb/config/pa/tm-pro.h
index 97fb94a..59d825a 100644
--- a/gdb/config/pa/tm-pro.h
+++ b/gdb/config/pa/tm-pro.h
@@ -1,48 +1,9 @@
-/* Parameters for execution on an HP PA-RISC machine running a ROM monitor,
-   for GDB. This is based on tm-hppab.h.
+/* Parameters for execution on an HP PA-RISC level 0 embedded system.
+   This is based on tm-hppab.h.
    Contributed by the Center for Software Science at the
    University of Utah (pa-gdb-bugs@cs.utah.edu).  */
 
-/* For BSD:
-
-   The signal context structure pointer is always saved at the base
-   of the frame + 0x4.
-
-   We get the PC & SP directly from the sigcontext structure itself.
-   For other registers we have to dive in a little deeper: 
-
-   The hardware save state pointer is at offset 0x10 within the 
-   signal context structure.
-
-   Within the hardware save state, registers are found in the same order
-   as the register numbers in GDB. */
-
-#define FRAME_SAVED_PC_IN_SIGTRAMP(FRAME, TMP) \
-{ \
-  *(TMP) = read_memory_integer ((FRAME)->frame + 0x4, 4); \
-  *(TMP) = read_memory_integer (*(TMP) + 0x18, 4); \
-}
-
-#define FRAME_BASE_BEFORE_SIGTRAMP(FRAME, TMP) \
-{ \
-  *(TMP) = read_memory_integer ((FRAME)->frame + 0x4, 4); \
-  *(TMP) = read_memory_integer (*(TMP) + 0x8, 4); \
-}
-
-#define FRAME_FIND_SAVED_REGS_IN_SIGTRAMP(FRAME, FSR) \
-{ \
-  int i; \
-  CORE_ADDR TMP; \
-  TMP = read_memory_integer ((FRAME)->frame + 0x4, 4); \
-  TMP = read_memory_integer (TMP + 0x10, 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; \
-    } \
-}
+#define PA_LEVEL_0		/* Disables touching space regs and fp */
 
 /* It's mostly just the common stuff.  */
 #include "pa/tm-hppa.h"
diff --git a/gdb/hppa-tdep.c b/gdb/hppa-tdep.c
index 3187644..042a07f 100644
--- a/gdb/hppa-tdep.c
+++ b/gdb/hppa-tdep.c
@@ -251,6 +251,20 @@ extract_12 (word)
 		      (word & 0x1) << 11, 12) << 2;
 }
 
+/* Deposit a 17 bit constant in an instruction (like bl). */
+
+unsigned int
+deposit_17 (opnd, word)
+     unsigned opnd, word;
+{
+  word |= GET_FIELD (opnd, 15 + 0, 15 + 0); /* w */
+  word |= GET_FIELD (opnd, 15 + 1, 15 + 5) << 16; /* w1 */
+  word |= GET_FIELD (opnd, 15 + 6, 15 + 6) << 2; /* w2[10] */
+  word |= GET_FIELD (opnd, 15 + 7, 15 + 16) << 3; /* w2[0..9] */
+
+  return word;
+}
+
 /* extract a 17 bit constant from branch instructions, returning the
    19 bit signed value. */
 
@@ -767,6 +781,7 @@ frame_saved_pc (frame)
   if (pc_in_interrupt_handler (pc))
     return read_memory_integer (frame->frame + PC_REGNUM * 4, 4) & ~0x3;
 
+#ifdef FRAME_SAVED_PC_IN_SIGTRAMP
   /* Deal with signal handler caller frames too.  */
   if (frame->signal_handler_caller)
     {
@@ -774,6 +789,7 @@ frame_saved_pc (frame)
       FRAME_SAVED_PC_IN_SIGTRAMP (frame, &rp);
       return rp & ~0x3;
     }
+#endif
 
   if (frameless_function_invocation (frame))
     {
@@ -931,10 +947,12 @@ frame_chain (frame)
      code to dig a saved PC out of the save state structure.  */
   if (pc_in_interrupt_handler (frame->pc))
     frame_base = read_memory_integer (frame->frame + SP_REGNUM * 4, 4);
+#ifdef FRAME_BASE_BEFORE_SIGTRAMP
   else if (frame->signal_handler_caller)
     {
       FRAME_BASE_BEFORE_SIGTRAMP (frame, &frame_base);
     }
+#endif
   else
     frame_base = frame->frame;
 
@@ -1389,7 +1407,7 @@ hppa_fix_call_dummy (dummy, pc, fun, nargs, args, type, gcc_p)
      struct type *type;
      int gcc_p;
 {
-  CORE_ADDR dyncall_addr, sr4export_addr;
+  CORE_ADDR dyncall_addr;
   struct minimal_symbol *msymbol;
   int flags = read_register (FLAGS_REGNUM);
   struct unwind_table_entry *u;
@@ -1496,37 +1514,54 @@ hppa_fix_call_dummy (dummy, pc, fun, nargs, args, type, gcc_p)
       fun = new_fun;
     }
 
-  /* We still need sr4export's address too.  */
-  msymbol = lookup_minimal_symbol ("_sr4export", NULL, NULL);
-  if (msymbol == NULL)
-    error ("Can't find an address for _sr4export trampoline");
-
-  sr4export_addr = SYMBOL_VALUE_ADDRESS (msymbol);
+/* Store upper 21 bits of function address into ldil */
 
   store_unsigned_integer
-    (&dummy[9*REGISTER_SIZE],
-     REGISTER_SIZE,
+    (&dummy[FUNC_LDIL_OFFSET],
+     INSTRUCTION_SIZE,
      deposit_21 (fun >> 11,
-		 extract_unsigned_integer (&dummy[9*REGISTER_SIZE],
-					   REGISTER_SIZE)));
+		 extract_unsigned_integer (&dummy[FUNC_LDIL_OFFSET],
+					   INSTRUCTION_SIZE)));
+
+/* Store lower 11 bits of function address into ldo */
+
   store_unsigned_integer
-    (&dummy[10*REGISTER_SIZE],
-     REGISTER_SIZE,
+    (&dummy[FUNC_LDO_OFFSET],
+     INSTRUCTION_SIZE,
      deposit_14 (fun & MASK_11,
-		 extract_unsigned_integer (&dummy[10*REGISTER_SIZE],
-					   REGISTER_SIZE)));
-  store_unsigned_integer
-    (&dummy[12*REGISTER_SIZE],
-     REGISTER_SIZE,
-     deposit_21 (sr4export_addr >> 11,
-		 extract_unsigned_integer (&dummy[12*REGISTER_SIZE],
-					   REGISTER_SIZE)));
-  store_unsigned_integer
-    (&dummy[13*REGISTER_SIZE],
-     REGISTER_SIZE,
-     deposit_14 (sr4export_addr & MASK_11,
-		 extract_unsigned_integer (&dummy[13*REGISTER_SIZE],
-					   REGISTER_SIZE)));
+		 extract_unsigned_integer (&dummy[FUNC_LDO_OFFSET],
+					   INSTRUCTION_SIZE)));
+#ifdef SR4EXPORT_LDIL_OFFSET
+
+  {
+    CORE_ADDR sr4export_addr;
+
+    /* We still need sr4export's address too.  */
+
+    msymbol = lookup_minimal_symbol ("_sr4export", NULL, NULL);
+    if (msymbol == NULL)
+      error ("Can't find an address for _sr4export trampoline");
+
+    sr4export_addr = SYMBOL_VALUE_ADDRESS (msymbol);
+
+/* Store upper 21 bits of sr4export's address into ldil */
+
+    store_unsigned_integer
+      (&dummy[SR4EXPORT_LDIL_OFFSET],
+       INSTRUCTION_SIZE,
+       deposit_21 (sr4export_addr >> 11,
+		   extract_unsigned_integer (&dummy[SR4EXPORT_LDIL_OFFSET],
+					     INSTRUCTION_SIZE)));
+/* Store lower 11 bits of sr4export's address into ldo */
+
+    store_unsigned_integer
+      (&dummy[SR4EXPORT_LDO_OFFSET],
+       INSTRUCTION_SIZE,
+       deposit_14 (sr4export_addr & MASK_11,
+		   extract_unsigned_integer (&dummy[SR4EXPORT_LDO_OFFSET],
+					     INSTRUCTION_SIZE)));
+  }
+#endif
 
   write_register (22, pc);
 
@@ -2411,12 +2446,14 @@ hppa_frame_find_saved_regs (frame_info, frame_saved_regs)
       return;
     }
 
+#ifdef FRAME_FIND_SAVED_REGS_IN_SIGTRAMP
   /* Handle signal handler callers.  */
   if (frame_info->signal_handler_caller)
     {
       FRAME_FIND_SAVED_REGS_IN_SIGTRAMP (frame_info, frame_saved_regs);
       return;
     }
+#endif
 
   /* Get the starting address of the function referred to by the PC
      saved in frame.  */