2004-04-03 Andrew Cagney <cagney@redhat.com>

	* config/pa/tm-hppa.h (REG_PARM_STACK_SPACE): Delete.
	* config/pa/tm-hppa64.h (PA20W_CALLING_CONVENTIONS)
	(REG_PARM_STACK_SPACE): Delete.
	* hppa-tdep.c (hppa64_push_dummy_call, hppa32_push_dummy_call):
	Inline reference to REG_PARM_STACK_SPACE.

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 618ea23eb55e25d8ceef02938f856aacdfee03ad..0120a5af7ddda51355896209aec7c8a97173efbb 100644 (file)
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,5 +1,11 @@
 2004-04-03  Andrew Cagney  <cagney@redhat.com>
 
+       * config/pa/tm-hppa.h (REG_PARM_STACK_SPACE): Delete.
+       * config/pa/tm-hppa64.h (PA20W_CALLING_CONVENTIONS) 
+       (REG_PARM_STACK_SPACE): Delete.
+       * hppa-tdep.c (hppa64_push_dummy_call, hppa32_push_dummy_call):
+       Inline reference to REG_PARM_STACK_SPACE.
+
        * config/pa/tm-hppah.h (FRAME_SAVED_PC_IN_SIGTRAMP)
        (FRAME_FIND_SAVED_REGS_IN_SIGTRAMP)
        (hppa32_hpux_frame_find_saved_regs_in_sigtramp)

diff --git a/gdb/config/pa/tm-hppa.h b/gdb/config/pa/tm-hppa.h
index 1a78c6ceb6fa6a12f9502b6e338cd416e891cb92..b3fd8c546adeea6e7a2f05381fe0ab5d6e58dc41 100644 (file)
--- a/gdb/config/pa/tm-hppa.h
+++ b/gdb/config/pa/tm-hppa.h
@@ -101,8 +101,6 @@ extern int hppa_instruction_nullified (void);
 
 #define INSTRUCTION_SIZE 4
 
-#define REG_PARM_STACK_SPACE 16
-
 /*
  * Unwind table and descriptor.
  */

diff --git a/gdb/config/pa/tm-hppa64.h b/gdb/config/pa/tm-hppa64.h
index 89c9993820fa315b07d316cf6d511c920c55f1c4..a7162604da4a49ceb308f642dbc05be4bc2af46d 100644 (file)
--- a/gdb/config/pa/tm-hppa64.h
+++ b/gdb/config/pa/tm-hppa64.h
@@ -57,14 +57,6 @@ extern int hpread_adjust_stack_address (CORE_ADDR);
 
 /* jimb: omitted dynamic linking stuff here */
 
-/* The PA64 ABI reserves 64 bytes of stack space for outgoing register
-   parameters.  */
-#undef REG_PARM_STACK_SPACE
-#define REG_PARM_STACK_SPACE 64
-
-/* Use the 64-bit calling conventions designed for the PA2.0 in wide mode.  */
-#define PA20W_CALLING_CONVENTIONS
-
 #undef FUNC_LDIL_OFFSET
 #undef FUNC_LDO_OFFSET
 #undef SR4EXPORT_LDIL_OFFSET

diff --git a/gdb/hppa-tdep.c b/gdb/hppa-tdep.c
index 432507169bbecb01dee143df38fc63db31a38809..b238d37b09414ad93ef181c82f883ad4d2685a86 100644 (file)
--- a/gdb/hppa-tdep.c
+++ b/gdb/hppa-tdep.c
@@ -898,8 +898,7 @@ hppa32_push_dummy_call (struct gdbarch *gdbarch, CORE_ADDR func_addr,
             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);
+         param_end = struct_end + max (align_up (param_ptr, 8), 16);
        }
     }
 
@@ -1022,8 +1021,7 @@ hppa64_push_dummy_call (struct gdbarch *gdbarch, CORE_ADDR func_addr,
             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);
+         param_end = struct_end + max (align_up (param_ptr, 16), 64);
        }
     }