* gdb.texinfo: Fix typo, $bpnum is set to last breakpoint number.

[deliverable/binutils-gdb.git] / gdb / z8k-tdep.c

diff --git a/gdb/z8k-tdep.c b/gdb/z8k-tdep.c
index 0b5c1c29aff1bfadd10d4da00b7dc136a4324f9c..67982c0c7d2824dbc70553f70abcbd0cdb501912 100644 (file)
--- a/gdb/z8k-tdep.c
+++ b/gdb/z8k-tdep.c
@@ -1,25 +1,26 @@
 /* Target-machine dependent code for Zilog Z8000, for GDB.
    Copyright (C) 1992, 1993, 1994 Free Software Foundation, Inc.
 
-This file is part of GDB.
+   This file is part of GDB.
 
-This program is free software; you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2 of the License, or
-(at your option) any later version.
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 2 of the License, or
+   (at your option) any later version.
 
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
 
-You should have received a copy of the GNU General Public License
-along with this program; if not, write to the Free Software
-Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software
+   Foundation, Inc., 59 Temple Place - Suite 330,
+   Boston, MA 02111-1307, USA.  */
 
 /*
- Contributed by Steve Chamberlain
-                sac@cygnus.com
+   Contributed by Steve Chamberlain
+   sac@cygnus.com
  */
 
 #include "defs.h"
@@ -31,6 +32,10 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
 #include "dis-asm.h"
 #include "gdbcore.h"
 
+#include "value.h" /* For read_register() */
+
+
+static int read_memory_pointer (CORE_ADDR x);
 
 /* Return the saved PC from this frame.
 
@@ -38,7 +43,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
    just use the register SRP_REGNUM itself.  */
 
 CORE_ADDR
-frame_saved_pc (frame)
+z8k_frame_saved_pc (frame)
      struct frame_info *frame;
 {
   return read_memory_pointer (frame->frame + (BIG ? 4 : 2));
@@ -80,7 +85,7 @@ skip_adjust (pc, size)
   return pc;
 }
 
-static CORE_ADDR examine_frame PARAMS ((CORE_ADDR, CORE_ADDR *regs, CORE_ADDR));
+static CORE_ADDR examine_frame (CORE_ADDR, CORE_ADDR * regs, CORE_ADDR);
 static CORE_ADDR
 examine_frame (pc, regs, sp)
      CORE_ADDR pc;
@@ -120,8 +125,8 @@ examine_frame (pc, regs, sp)
   else if (IS_SUB_SP (w))
     {
       /* Subtracting a value from the sp, so were in a function
-       which needs stack space for locals, but has no fp.  We fake up
-       the values as if we had an fp */
+         which needs stack space for locals, but has no fp.  We fake up
+         the values as if we had an fp */
       regs[FP_REGNUM] = sp;
     }
   else
@@ -130,7 +135,7 @@ examine_frame (pc, regs, sp)
       regs[SP_REGNUM] = sp;
     }
   /* stack pointer contains address of next frame */
-  /*  regs[fp_regnum()] = fp;*/
+  /*  regs[fp_regnum()] = fp; */
   regs[SP_REGNUM] = sp;
   return pc;
 }
@@ -151,15 +156,14 @@ z8k_addr_bits_remove (addr)
   return (addr & PTR_MASK);
 }
 
-int
-read_memory_pointer (x)
-     CORE_ADDR x;
+static int
+read_memory_pointer (CORE_ADDR x)
 {
   return read_memory_integer (ADDR_BITS_REMOVE (x), BIG ? 4 : 2);
 }
 
 CORE_ADDR
-frame_chain (thisframe)
+z8k_frame_chain (thisframe)
      struct frame_info *thisframe;
 {
   if (thisframe->prev == 0)
@@ -220,7 +224,7 @@ gdb_print_insn_z8k (memaddr, info)
 /* Fetch the instruction at ADDR, returning 0 if ADDR is beyond LIM or
    is not the address of a valid instruction, the address of the next
    instruction beyond ADDR otherwise.  *PWORD1 receives the first word
-   of the instruction.*/
+   of the instruction. */
 
 CORE_ADDR
 NEXT_PROLOGUE_INSN (addr, lim, pword1)
@@ -294,9 +298,9 @@ frame_find_saved_regs (fip, fsrp)
 #endif
 
 int
-saved_pc_after_call ()
+z8k_saved_pc_after_call (struct frame_info *frame)
 {
-  return ADDR_BITS_REMOVE 
+  return ADDR_BITS_REMOVE
     (read_memory_integer (read_register (SP_REGNUM), PTR_SIZE));
 }
 
@@ -329,7 +333,7 @@ write_return_value (type, valbuf)
   int len;
 
   for (len = 0; len < TYPE_LENGTH (type); len += 2)
-    write_register_bytes (REGISTER_BYTE (len / 2  + 2), valbuf + len, 2);
+    write_register_bytes (REGISTER_BYTE (len / 2 + 2), valbuf + len, 2);
 }
 
 void
@@ -342,7 +346,7 @@ store_struct_return (addr, sp)
 
 
 void
-print_register_hook (regno)
+z8k_print_register_hook (regno)
      int regno;
 {
   if ((regno & 1) == 0 && regno < 16)
@@ -377,7 +381,8 @@ print_register_hook (regno)
       printf_unfiltered ("\n");
       for (i = 0; i < 10; i += 2)
        {
-         printf_unfiltered ("(sp+%d=%04x)", i, read_memory_short (rval + i));
+         printf_unfiltered ("(sp+%d=%04x)", i,
+                            (unsigned int)read_memory_short (rval + i));
        }
     }
 
@@ -408,6 +413,11 @@ z8k_set_pointer_size (newsize)
        {
          BIG = 0;
        }
+      /* FIXME: This code should be using the GDBARCH framework to
+         handle changed type sizes.  If this problem is ever fixed
+         (the direct reference to _initialize_gdbtypes() below
+         eliminated) then Makefile.in should be updated so that
+         z8k-tdep.c is again compiled with -Werror. */
       _initialize_gdbtypes ();
     }
 }