* m68hc11-tdep.c (M6812_OP_PSHX, M6812_OP_PSHY): New defines.

	(m6812_prolog): They can appear in 68HC12 function prologue.
	(m68hc11_frame_chain): Cleanup.

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 21c8a944bcd928da61bf1f677f2c38864302b4a4..d7209ae00f247209d90ee274a561b3d9e0f003d8 100644 (file)
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,9 @@
+2002-08-13  Stephane Carrez  <stcarrez@nerim.fr>
+
+       * m68hc11-tdep.c (M6812_OP_PSHX, M6812_OP_PSHY): New defines.
+       (m6812_prolog): They can appear in 68HC12 function prologue.
+       (m68hc11_frame_chain): Cleanup.
+
 2002-08-12  Andrew Cagney  <cagney@redhat.com>
 
        * i386-tdep.h (i386_register_byte, i386_register_raw_size): Delete

diff --git a/gdb/m68hc11-tdep.c b/gdb/m68hc11-tdep.c
index c4389145e7900c89cceda8a44db4d5b76889087c..125d40f2f1a953d0b37a7418fd86039fa693872e 100644 (file)
--- a/gdb/m68hc11-tdep.c
+++ b/gdb/m68hc11-tdep.c
@@ -1,6 +1,6 @@
 /* Target-dependent code for Motorola 68HC11 & 68HC12
    Copyright 1999, 2000, 2001, 2002 Free Software Foundation, Inc.
-   Contributed by Stephane Carrez, stcarrez@worldnet.fr
+   Contributed by Stephane Carrez, stcarrez@nerim.fr
 
 This file is part of GDB.
 
@@ -364,6 +364,8 @@ m68hc11_pop_frame (void)
 #define M6812_PB_PSHW  (0xae)
 #define M6812_OP_STS   (0x7f)
 #define M6812_OP_LEAS  (0x1b)
+#define M6812_OP_PSHX  (0x34)
+#define M6812_OP_PSHY  (0x35)
 
 /* Operand extraction.  */
 #define OP_DIRECT      (0x100) /* 8-byte direct addressing.  */
@@ -423,6 +425,8 @@ static struct insn_sequence m6812_prologue[] = {
                       OP_IMM_HIGH, OP_IMM_LOW } },
   { P_SET_FRAME, 3, { M6812_OP_STS, OP_IMM_HIGH, OP_IMM_LOW } },
   { P_LOCAL_N,   2, { M6812_OP_LEAS, OP_PBYTE } },
+  { P_LOCAL_2,   1, { M6812_OP_PSHX } },
+  { P_LOCAL_2,   1, { M6812_OP_PSHY } },
   { P_LAST, 0 }
 };
 
@@ -686,11 +690,6 @@ m68hc11_frame_chain (struct frame_info *frame)
 
   addr = frame->frame + frame->extra_info->size + STACK_CORRECTION - 2;
   addr = read_memory_unsigned_integer (addr, 2) & 0x0FFFF;
-  if (addr == 0)
-    {
-      return (CORE_ADDR) 0;
-    }
-    
   return addr;
 }