bfd/

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

diff --git a/gdb/xstormy16-tdep.c b/gdb/xstormy16-tdep.c
index 28f5d002af62904a78cafcc99906181d59371a36..81b16698382ae8d303a2fbdfc00c77f5a9278ca8 100644 (file)
--- a/gdb/xstormy16-tdep.c
+++ b/gdb/xstormy16-tdep.c
@@ -1,6 +1,7 @@
 /* Target-dependent code for the Sanyo Xstormy16a (LC590000) processor.
 
-   Copyright 2001, 2002, 2003, 2004 Free Software Foundation, Inc.
+   Copyright (C) 2001, 2002, 2003, 2004, 2005 Free Software Foundation,
+   Inc.
 
    This file is part of GDB.
 
@@ -16,8 +17,8 @@
 
    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.  */
+   Foundation, Inc., 51 Franklin Street, Fifth Floor,
+   Boston, MA 02110-1301, USA.  */
 
 #include "defs.h"
 #include "frame.h"
@@ -115,7 +116,7 @@ xstormy16_register_name (int regnum)
 
   if (regnum < 0 || regnum >= E_NUM_REGS)
     internal_error (__FILE__, __LINE__,
-                   "xstormy16_register_name: illegal register number %d",
+                   _("xstormy16_register_name: illegal register number %d"),
                    regnum);
   else
     return register_names[regnum];
@@ -201,7 +202,7 @@ xstormy16_store_return_value (struct type *type, struct regcache *regcache,
 static enum return_value_convention
 xstormy16_return_value (struct gdbarch *gdbarch, struct type *type,
                        struct regcache *regcache,
-                       void *readbuf, const void *writebuf)
+                       gdb_byte *readbuf, const gdb_byte *writebuf)
 {
   if (xstormy16_use_struct_convention (type))
     return RETURN_VALUE_STRUCT_CONVENTION;
@@ -238,7 +239,7 @@ xstormy16_push_dummy_call (struct gdbarch *gdbarch,
   int argreg = E_1ST_ARG_REGNUM;
   int i, j;
   int typelen, slacklen;
-  char *val;
+  const gdb_byte *val;
   char buf[xstormy16_pc_size];
 
   /* If struct_return is true, then the struct return address will
@@ -256,12 +257,12 @@ xstormy16_push_dummy_call (struct gdbarch *gdbarch,
      would fit in the remaining unused registers.  */
   for (i = 0; i < nargs && argreg <= E_LST_ARG_REGNUM; i++)
     {
-      typelen = TYPE_LENGTH (VALUE_ENCLOSING_TYPE (args[i]));
+      typelen = TYPE_LENGTH (value_enclosing_type (args[i]));
       if (typelen > E_MAX_RETTYPE_SIZE (argreg))
        break;
 
       /* Put argument into registers wordwise. */
-      val = VALUE_CONTENTS (args[i]);
+      val = value_contents (args[i]);
       for (j = 0; j < typelen; j += xstormy16_reg_size)
        regcache_cooked_write_unsigned (regcache, argreg++,
                        extract_unsigned_integer (val + j,
@@ -277,10 +278,12 @@ xstormy16_push_dummy_call (struct gdbarch *gdbarch,
      wordaligned.  */
   for (j = nargs - 1; j >= i; j--)
     {
-      typelen = TYPE_LENGTH (VALUE_ENCLOSING_TYPE (args[j]));
+      char *val;
+
+      typelen = TYPE_LENGTH (value_enclosing_type (args[j]));
       slacklen = typelen & 1;
       val = alloca (typelen + slacklen);
-      memcpy (val, VALUE_CONTENTS (args[j]), typelen);
+      memcpy (val, value_contents (args[j]), typelen);
       memset (val + typelen, 0, slacklen);
 
       /* Now write this data to the stack. The stack grows upwards. */
@@ -414,6 +417,8 @@ xstormy16_skip_prologue (CORE_ADDR pc)
       struct symbol *sym;
       struct xstormy16_frame_cache cache;
 
+      memset (&cache, 0, sizeof cache);
+
       /* Don't trust line number debug info in frameless functions. */
       CORE_ADDR plg_end = xstormy16_analyze_prologue (func_addr, func_end,
                                                      &cache, NULL);
@@ -577,12 +582,6 @@ xstormy16_skip_trampoline_code (CORE_ADDR pc)
   return 0;
 }
 
-static int
-xstormy16_in_solib_call_trampoline (CORE_ADDR pc, char *name)
-{
-  return xstormy16_skip_trampoline_code (pc) != 0;
-}
-
 /* Function pointers are 16 bit.  The address space is 24 bit, using
    32 bit addresses.  Pointers to functions on the XStormy16 are implemented
    by using 16 bit pointers, which are either direct pointers in case the
@@ -591,7 +590,7 @@ xstormy16_in_solib_call_trampoline (CORE_ADDR pc, char *name)
    and vice versa.  */
 
 static CORE_ADDR
-xstormy16_pointer_to_address (struct type *type, const void *buf)
+xstormy16_pointer_to_address (struct type *type, const gdb_byte *buf)
 {
   enum type_code target = TYPE_CODE (TYPE_TARGET_TYPE (type));
   CORE_ADDR addr = extract_unsigned_integer (buf, TYPE_LENGTH (type));
@@ -607,7 +606,7 @@ xstormy16_pointer_to_address (struct type *type, const void *buf)
 }
 
 static void
-xstormy16_address_to_pointer (struct type *type, void *buf, CORE_ADDR addr)
+xstormy16_address_to_pointer (struct type *type, gdb_byte *buf, CORE_ADDR addr)
 {
   enum type_code target = TYPE_CODE (TYPE_TARGET_TYPE (type));
 
@@ -674,10 +673,11 @@ xstormy16_frame_cache (struct frame_info *next_frame, void **this_cache)
 }
 
 static void
-xstormy16_frame_prev_register (struct frame_info *next_frame, void **this_cache,
+xstormy16_frame_prev_register (struct frame_info *next_frame, 
+                              void **this_cache,
                               int regnum, int *optimizedp,
                               enum lval_type *lvalp, CORE_ADDR *addrp,
-                              int *realnump, void *valuep)
+                              int *realnump, gdb_byte *valuep)
 {
   struct xstormy16_frame_cache *cache = xstormy16_frame_cache (next_frame,
                                                                this_cache);
@@ -712,8 +712,12 @@ xstormy16_frame_prev_register (struct frame_info *next_frame, void **this_cache,
       return;
     }
 
-  frame_register_unwind (next_frame, regnum,
-                         optimizedp, lvalp, addrp, realnump, valuep);
+  *optimizedp = 0;
+  *lvalp = lval_register;
+  *addrp = 0;
+  *realnump = regnum;
+  if (valuep)
+    frame_unwind_register (next_frame, (*realnump), valuep);
 }
 
 static void
@@ -845,8 +849,6 @@ xstormy16_gdbarch_init (struct gdbarch_info info, struct gdbarch_list *arches)
   set_gdbarch_return_value (gdbarch, xstormy16_return_value);
 
   set_gdbarch_skip_trampoline_code (gdbarch, xstormy16_skip_trampoline_code);
-  set_gdbarch_in_solib_call_trampoline (gdbarch,
-                                       xstormy16_in_solib_call_trampoline);
 
   set_gdbarch_print_insn (gdbarch, print_insn_xstormy16);