gold/

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

diff --git a/gdb/cris-tdep.c b/gdb/cris-tdep.c
index 91eefb479abcd008838fe06fc9a64dc972be9fb1..03041e44040d6babc8cfc9b3039a99f1d5cc084c 100644 (file)
--- a/gdb/cris-tdep.c
+++ b/gdb/cris-tdep.c
@@ -1,6 +1,6 @@
 /* Target dependent code for CRIS, for GDB, the GNU debugger.
 
 /* Target dependent code for CRIS, for GDB, the GNU debugger.
 

-   Copyright (C) 2001-2012 Free Software Foundation, Inc.
+   Copyright (C) 2001-2013 Free Software Foundation, Inc.

 
    Contributed by Axis Communications AB.
    Written by Hendrik Ruijter, Stefan Andersson, and Orjan Friberg.
 
    Contributed by Axis Communications AB.
    Written by Hendrik Ruijter, Stefan Andersson, and Orjan Friberg.


@@ -144,7 +144,7 @@ extern const struct cris_spec_reg cris_spec_regs[];
 
 /* CRIS version, set via the user command 'set cris-version'.  Affects
    register names and sizes.  */
 
 /* CRIS version, set via the user command 'set cris-version'.  Affects
    register names and sizes.  */

-static int usr_cmd_cris_version;
+static unsigned int usr_cmd_cris_version;

 
 /* Indicates whether to trust the above variable.  */
 static int usr_cmd_cris_version_valid = 0;
 
 /* Indicates whether to trust the above variable.  */
 static int usr_cmd_cris_version_valid = 0;


@@ -167,7 +167,7 @@ static int usr_cmd_cris_dwarf2_cfi = 1;
 /* CRIS architecture specific information.  */
 struct gdbarch_tdep
 {
 /* CRIS architecture specific information.  */
 struct gdbarch_tdep
 {

-  int cris_version;
+  unsigned int cris_version;

   const char *cris_mode;
   int cris_dwarf2_cfi;
 };
   const char *cris_mode;
   int cris_dwarf2_cfi;
 };


@@ -261,7 +261,7 @@ cris_sigcontext_addr (struct frame_info *this_frame)
   enum bfd_endian byte_order = gdbarch_byte_order (gdbarch);
   CORE_ADDR pc;
   CORE_ADDR sp;
   enum bfd_endian byte_order = gdbarch_byte_order (gdbarch);
   CORE_ADDR pc;
   CORE_ADDR sp;

-  char buf[4];
+  gdb_byte buf[4];

 
   get_frame_register (this_frame, gdbarch_sp_regnum (gdbarch), buf);
   sp = extract_unsigned_integer (buf, 4, byte_order);
 
   get_frame_register (this_frame, gdbarch_sp_regnum (gdbarch), buf);
   sp = extract_unsigned_integer (buf, 4, byte_order);


@@ -322,10 +322,8 @@ cris_sigtramp_frame_unwind_cache (struct frame_info *this_frame,
   struct gdbarch_tdep *tdep = gdbarch_tdep (gdbarch);
   enum bfd_endian byte_order = gdbarch_byte_order (gdbarch);
   struct cris_unwind_cache *info;
   struct gdbarch_tdep *tdep = gdbarch_tdep (gdbarch);
   enum bfd_endian byte_order = gdbarch_byte_order (gdbarch);
   struct cris_unwind_cache *info;

-  CORE_ADDR pc;
-  CORE_ADDR sp;

   CORE_ADDR addr;
   CORE_ADDR addr;

-  char buf[4];
+  gdb_byte buf[4];

   int i;
 
   if ((*this_cache))
   int i;
 
   if ((*this_cache))


@@ -678,7 +676,7 @@ struct stack_item
 };
 
 static struct stack_item *
 };
 
 static struct stack_item *

-push_stack_item (struct stack_item *prev, void *contents, int len)
+push_stack_item (struct stack_item *prev, const gdb_byte *contents, int len)

 {
   struct stack_item *si;
   si = xmalloc (sizeof (struct stack_item));
 {
   struct stack_item *si;
   si = xmalloc (sizeof (struct stack_item));


@@ -711,9 +709,7 @@ cris_frame_unwind_cache (struct frame_info *this_frame,
 {
   struct gdbarch *gdbarch = get_frame_arch (this_frame);
   struct gdbarch_tdep *tdep = gdbarch_tdep (gdbarch);
 {
   struct gdbarch *gdbarch = get_frame_arch (this_frame);
   struct gdbarch_tdep *tdep = gdbarch_tdep (gdbarch);

-  CORE_ADDR pc;

   struct cris_unwind_cache *info;
   struct cris_unwind_cache *info;

-  int i;

 
   if ((*this_prologue_cache))
     return (*this_prologue_cache);
 
   if ((*this_prologue_cache))
     return (*this_prologue_cache);


@@ -823,13 +819,10 @@ cris_push_dummy_call (struct gdbarch *gdbarch, struct value *function,
                      int struct_return, CORE_ADDR struct_addr)
 {
   enum bfd_endian byte_order = gdbarch_byte_order (gdbarch);
                      int struct_return, CORE_ADDR struct_addr)
 {
   enum bfd_endian byte_order = gdbarch_byte_order (gdbarch);

-  int stack_alloc;

   int stack_offset;
   int argreg;
   int argnum;
 
   int stack_offset;
   int argreg;
   int argnum;
 

-  CORE_ADDR regval;
-

   /* The function's arguments and memory allocated by gdb for the arguments to
      point at reside in separate areas on the stack.
      Both frame pointers grow toward higher addresses.  */
   /* The function's arguments and memory allocated by gdb for the arguments to
      point at reside in separate areas on the stack.
      Both frame pointers grow toward higher addresses.  */


@@ -857,12 +850,12 @@ cris_push_dummy_call (struct gdbarch *gdbarch, struct value *function,
   for (argnum = 0; argnum < nargs; argnum++)
     {
       int len;
   for (argnum = 0; argnum < nargs; argnum++)
     {
       int len;

-      char *val;
+      const gdb_byte *val;

       int reg_demand;
       int i;
       
       len = TYPE_LENGTH (value_type (args[argnum]));
       int reg_demand;
       int i;
       
       len = TYPE_LENGTH (value_type (args[argnum]));

-      val = (char *) value_contents (args[argnum]);
+      val = value_contents (args[argnum]);

       
       /* How may registers worth of storage do we need for this argument?  */
       reg_demand = (len / 4) + (len % 4 != 0 ? 1 : 0);
       
       /* How may registers worth of storage do we need for this argument?  */
       reg_demand = (len / 4) + (len % 4 != 0 ? 1 : 0);


@@ -1446,7 +1439,7 @@ cris_spec_reg_applicable (struct gdbarch *gdbarch,
                          struct cris_spec_reg spec_reg)
 {
   struct gdbarch_tdep *tdep = gdbarch_tdep (gdbarch);
                          struct cris_spec_reg spec_reg)
 {
   struct gdbarch_tdep *tdep = gdbarch_tdep (gdbarch);

-  int version = tdep->cris_version;
+  unsigned int version = tdep->cris_version;

   
   switch (spec_reg.applicable_version)
     {
   
   switch (spec_reg.applicable_version)
     {


@@ -1664,7 +1657,7 @@ crisv32_register_type (struct gdbarch *gdbarch, int regno)
 
 static void
 cris_store_return_value (struct type *type, struct regcache *regcache,
 
 static void
 cris_store_return_value (struct type *type, struct regcache *regcache,

-                        const void *valbuf)
+                        const gdb_byte *valbuf)

 {
   struct gdbarch *gdbarch = get_regcache_arch (regcache);
   enum bfd_endian byte_order = gdbarch_byte_order (gdbarch);
 {
   struct gdbarch *gdbarch = get_regcache_arch (regcache);
   enum bfd_endian byte_order = gdbarch_byte_order (gdbarch);


@@ -1682,7 +1675,7 @@ cris_store_return_value (struct type *type, struct regcache *regcache,
       /* Put the return value in R10 and R11.  */
       val = extract_unsigned_integer (valbuf, 4, byte_order);
       regcache_cooked_write_unsigned (regcache, ARG1_REGNUM, val);
       /* Put the return value in R10 and R11.  */
       val = extract_unsigned_integer (valbuf, 4, byte_order);
       regcache_cooked_write_unsigned (regcache, ARG1_REGNUM, val);

-      val = extract_unsigned_integer ((char *)valbuf + 4, len - 4, byte_order);
+      val = extract_unsigned_integer (valbuf + 4, len - 4, byte_order);

       regcache_cooked_write_unsigned (regcache, ARG2_REGNUM, val);
     }
   else
       regcache_cooked_write_unsigned (regcache, ARG2_REGNUM, val);
     }
   else


@@ -1835,7 +1828,7 @@ cris_dwarf2_frame_init_reg (struct gdbarch *gdbarch, int regnum,
 
 static void
 cris_extract_return_value (struct type *type, struct regcache *regcache,
 
 static void
 cris_extract_return_value (struct type *type, struct regcache *regcache,

-                          void *valbuf)
+                          gdb_byte *valbuf)

 {
   struct gdbarch *gdbarch = get_regcache_arch (regcache);
   enum bfd_endian byte_order = gdbarch_byte_order (gdbarch);
 {
   struct gdbarch *gdbarch = get_regcache_arch (regcache);
   enum bfd_endian byte_order = gdbarch_byte_order (gdbarch);


@@ -1854,7 +1847,7 @@ cris_extract_return_value (struct type *type, struct regcache *regcache,
       regcache_cooked_read_unsigned (regcache, ARG1_REGNUM, &val);
       store_unsigned_integer (valbuf, 4, byte_order, val);
       regcache_cooked_read_unsigned (regcache, ARG2_REGNUM, &val);
       regcache_cooked_read_unsigned (regcache, ARG1_REGNUM, &val);
       store_unsigned_integer (valbuf, 4, byte_order, val);
       regcache_cooked_read_unsigned (regcache, ARG2_REGNUM, &val);

-      store_unsigned_integer ((char *)valbuf + 4, len - 4, byte_order, val);
+      store_unsigned_integer (valbuf + 4, len - 4, byte_order, val);

     }
   else
     error (_("cris_extract_return_value: type length too large"));
     }
   else
     error (_("cris_extract_return_value: type length too large"));


@@ -1886,13 +1879,13 @@ cris_return_value (struct gdbarch *gdbarch, struct value *function,
    instruction.  It stems from cris_constraint, found in cris-dis.c.  */
 
 static int
    instruction.  It stems from cris_constraint, found in cris-dis.c.  */
 
 static int

-constraint (unsigned int insn, const signed char *inst_args, 
+constraint (unsigned int insn, const char *inst_args,

             inst_env_type *inst_env)
 {
   int retval = 0;
   int tmp, i;
 
             inst_env_type *inst_env)
 {
   int retval = 0;
   int tmp, i;
 

-  const char *s = inst_args;
+  const gdb_byte *s = (const gdb_byte *) inst_args;

 
   for (; *s; s++)
     switch (*s) 
 
   for (; *s; s++)
     switch (*s) 


@@ -2189,9 +2182,6 @@ static unsigned long get_data_from_address (unsigned short *inst,
 static void
 bdap_prefix (unsigned short inst, inst_env_type *inst_env)
 {
 static void
 bdap_prefix (unsigned short inst, inst_env_type *inst_env)
 {

-
-  long offset;
-

   /* It's invalid to be in a delay slot.  */
   if (inst_env->slot_needed || inst_env->prefix_found)
     {
   /* It's invalid to be in a delay slot.  */
   if (inst_env->slot_needed || inst_env->prefix_found)
     {


@@ -3924,17 +3914,17 @@ _initialize_cris_tdep (void)
   gdbarch_register (bfd_arch_cris, cris_gdbarch_init, cris_dump_tdep);
   
   /* CRIS-specific user-commands.  */
   gdbarch_register (bfd_arch_cris, cris_gdbarch_init, cris_dump_tdep);
   
   /* CRIS-specific user-commands.  */

-  add_setshow_uinteger_cmd ("cris-version", class_support, 
-                           &usr_cmd_cris_version, 
-                           _("Set the current CRIS version."),
-                           _("Show the current CRIS version."),
-                           _("\
+  add_setshow_zuinteger_cmd ("cris-version", class_support,
+                            &usr_cmd_cris_version,
+                            _("Set the current CRIS version."),
+                            _("Show the current CRIS version."),
+                            _("\

 Set to 10 for CRISv10 or 32 for CRISv32 if autodetection fails.\n\
 Defaults to 10. "),
 Set to 10 for CRISv10 or 32 for CRISv32 if autodetection fails.\n\
 Defaults to 10. "),

-                           set_cris_version,
-                           NULL, /* FIXME: i18n: Current CRIS version
-                                    is %s.  */
-                           &setlist, &showlist);
+                            set_cris_version,
+                            NULL, /* FIXME: i18n: Current CRIS version
+                                     is %s.  */
+                            &setlist, &showlist);

 
   add_setshow_enum_cmd ("cris-mode", class_support, 
                        cris_modes, &usr_cmd_cris_mode, 
 
   add_setshow_enum_cmd ("cris-mode", class_support, 
                        cris_modes, &usr_cmd_cris_mode, 


@@ -4023,7 +4013,7 @@ cris_gdbarch_init (struct gdbarch_info info, struct gdbarch_list *arches)
 {
   struct gdbarch *gdbarch;
   struct gdbarch_tdep *tdep;
 {
   struct gdbarch *gdbarch;
   struct gdbarch_tdep *tdep;

-  int cris_version;
+  unsigned int cris_version;

 
   if (usr_cmd_cris_version_valid)
     {
 
   if (usr_cmd_cris_version_valid)
     {