import gdb-19990504 snapshot

[deliverable/binutils-gdb.git] / gdb / config / ns32k / tm-merlin.h

diff --git a/gdb/config/ns32k/tm-merlin.h b/gdb/config/ns32k/tm-merlin.h
index f90c5e797787ca9eaea60d4511a2d8ba285eac39..d5864307162b132b9059f3fe33ea7c52be73e531 100644 (file)
--- a/gdb/config/ns32k/tm-merlin.h
+++ b/gdb/config/ns32k/tm-merlin.h
@@ -27,14 +27,8 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
 /* Advance PC across any function entry prologue instructions
    to reach some "real" code.  */
 
-#define SKIP_PROLOGUE(pc)                              \
-{ register int op = read_memory_integer (pc, 1);       \
-  if (op == 0x82)                                      \
-    { op = read_memory_integer (pc+2,1);               \
-      if ((op & 0x80) == 0) pc += 3;                   \
-      else if ((op & 0xc0) == 0x80) pc += 4;           \
-      else pc += 6;                                    \
-    }}
+extern CORE_ADDR merlin_skip_prologue PARAMS ((CORE_ADDR));
+#define SKIP_PROLOGUE(pc) (merlin_skip_prologue (pc))
 
 /* Immediately after a function call, return the saved pc.
    Can't always go through the frames for this because on some machines