From: Mark Kettenis <kettenis@gnu.org>
Date: Mon, 15 Sep 2008 20:14:04 +0000 (+0000)
Subject: * infcall.c (generic_push_dummy_code): Remove.
X-Git-Url: http://drtracing.org/?a=commitdiff_plain;h=50a834af8a15b94a1394520b9122757990b5f823;p=deliverable%2Fbinutils-gdb.git

* infcall.c (generic_push_dummy_code): Remove.
(push_dummy_code): Unconditionally call gdbarch_push_dummy_code.
---

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 9aa5285c24..825ddc453d 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,8 @@
+2008-09-15  Mark Kettenis  <kettenis@gnu.org>
+
+	* infcall.c (generic_push_dummy_code): Remove.
+	(push_dummy_code): Unconditionally call gdbarch_push_dummy_code.
+
 2008-09-15  Doug Evans  <dje@google.com>
 
 	* dwarf2read.c (struct abbrev_info): Make members name, form 16 bits.
diff --git a/gdb/infcall.c b/gdb/infcall.c
index 4880447bbe..5cc068a9cc 100644
--- a/gdb/infcall.c
+++ b/gdb/infcall.c
@@ -270,43 +270,6 @@ breakpoint_auto_delete_contents (void *arg)
     breakpoint_auto_delete (inferior_thread ()->stop_bpstat);
 }
 
-static CORE_ADDR
-generic_push_dummy_code (struct gdbarch *gdbarch,
-			 CORE_ADDR sp, CORE_ADDR funaddr,
-			 struct value **args, int nargs,
-			 struct type *value_type,
-			 CORE_ADDR *real_pc, CORE_ADDR *bp_addr,
-			 struct regcache *regcache)
-{
-  /* Something here to findout the size of a breakpoint and then
-     allocate space for it on the stack.  */
-  int bplen;
-  /* This code assumes frame align.  */
-  gdb_assert (gdbarch_frame_align_p (gdbarch));
-  /* Force the stack's alignment.  The intent is to ensure that the SP
-     is aligned to at least a breakpoint instruction's boundary.  */
-  sp = gdbarch_frame_align (gdbarch, sp);
-  /* Allocate space for, and then position the breakpoint on the
-     stack.  */
-  if (gdbarch_inner_than (gdbarch, 1, 2))
-    {
-      CORE_ADDR bppc = sp;
-      gdbarch_breakpoint_from_pc (gdbarch, &bppc, &bplen);
-      sp = gdbarch_frame_align (gdbarch, sp - bplen);
-      (*bp_addr) = sp;
-      /* Should the breakpoint size/location be re-computed here?  */
-    }      
-  else
-    {
-      (*bp_addr) = sp;
-      gdbarch_breakpoint_from_pc (gdbarch, bp_addr, &bplen);
-      sp = gdbarch_frame_align (gdbarch, sp + bplen);
-    }
-  /* Inferior resumes at the function entry point.  */
-  (*real_pc) = funaddr;
-  return sp;
-}
-
 /* For CALL_DUMMY_ON_STACK, push a breakpoint sequence that the called
    function returns to.  */
 
@@ -318,14 +281,11 @@ push_dummy_code (struct gdbarch *gdbarch,
 		 CORE_ADDR *real_pc, CORE_ADDR *bp_addr,
 		 struct regcache *regcache)
 {
-  if (gdbarch_push_dummy_code_p (gdbarch))
-    return gdbarch_push_dummy_code (gdbarch, sp, funaddr,
-				    args, nargs, value_type, real_pc, bp_addr,
-				    regcache);
-  else    
-    return generic_push_dummy_code (gdbarch, sp, funaddr,
-				    args, nargs, value_type, real_pc, bp_addr,
-				    regcache);
+  gdb_assert (gdbarch_push_dummy_code_p (gdbarch));
+
+  return gdbarch_push_dummy_code (gdbarch, sp, funaddr,
+				  args, nargs, value_type, real_pc, bp_addr,
+				  regcache);
 }
 
 /* All this stuff with a dummy frame may seem unnecessarily complicated