summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPaul Brook <paul@codesourcery.com>2006-03-08 14:23:31 +0000
committerPaul Brook <paul@codesourcery.com>2006-03-08 14:23:31 +0000
commit3b5523feb62288960e78ec3ae8e8f2701a46eaa7 (patch)
tree0535777e8b3af1370e3aa5d6ceb420b0965f5de7
parent4fe26b40d2f357f1f103ed8cc14e6e71d03191e0 (diff)
downloadgdb-3b5523feb62288960e78ec3ae8e8f2701a46eaa7.tar.gz
2006-03-08 Paul Brook <paul@codesourcery.com>
Backport from mainline. * gdb/arm-tdep.c (arm_push_dummy_call): Remove stack alignment. (arm_frame_align): New function. (arm_gdbarch_init): Use it.
-rw-r--r--ChangeLog.csl7
-rw-r--r--gdb/arm-tdep.c17
2 files changed, 19 insertions, 5 deletions
diff --git a/ChangeLog.csl b/ChangeLog.csl
index caf863b80c5..0ce4f4ccfbb 100644
--- a/ChangeLog.csl
+++ b/ChangeLog.csl
@@ -1,3 +1,10 @@
+2006-03-08 Paul Brook <paul@codesourcery.com>
+
+ Backport from mainline.
+ * gdb/arm-tdep.c (arm_push_dummy_call): Remove stack alignment.
+ (arm_frame_align): New function.
+ (arm_gdbarch_init): Use it.
+
2006-03-07 Paul Brook <paul@codesourcery.com>
Backport from mainline.
diff --git a/gdb/arm-tdep.c b/gdb/arm-tdep.c
index 652be4b7234..cb3c2615910 100644
--- a/gdb/arm-tdep.c
+++ b/gdb/arm-tdep.c
@@ -1173,11 +1173,6 @@ arm_push_dummy_call (struct gdbarch *gdbarch, struct value *function,
argreg = ARM_A1_REGNUM;
nstack = 0;
- /* Some platforms require a double-word aligned stack. Make sure sp
- is correctly aligned before we start. We always do this even if
- it isn't really needed -- it can never hurt things. */
- sp &= ~(CORE_ADDR)(2 * DEPRECATED_REGISTER_SIZE - 1);
-
/* The struct_return pointer occupies the first parameter
passing register. */
if (struct_return)
@@ -1299,6 +1294,17 @@ arm_push_dummy_call (struct gdbarch *gdbarch, struct value *function,
return sp;
}
+
+/* Always align the frame to an 8-byte boundary. This is required on
+ some platforms and harmless on the rest. */
+
+static CORE_ADDR
+arm_frame_align (struct gdbarch *gdbarch, CORE_ADDR sp)
+{
+ /* Align the stack to eight bytes. */
+ return sp & ~ (CORE_ADDR) 7;
+}
+
static void
print_fpu_flags (int flags)
{
@@ -2738,6 +2744,7 @@ arm_gdbarch_init (struct gdbarch_info info, struct gdbarch_list *arches)
tdep->jb_pc = -1; /* Longjump support not enabled by default. */
set_gdbarch_push_dummy_call (gdbarch, arm_push_dummy_call);
+ set_gdbarch_frame_align (gdbarch, arm_frame_align);
set_gdbarch_write_pc (gdbarch, arm_write_pc);