2006-03-27 Michael Snyder <msnyder@redhat.com>

	* xstormy16-tdep.c (xstormy16_return_value, xstormy16_push_dummy_call,
	xstormy16_pointer_to_address, xstormy16_address_to_pointer,
	xstormy16_frame_prev_register): Change void* to gdb_byte*.
	(xstormy16_push_dummy_call): Add block-local char* val,
	to avoid type conflict with outer scope variable.

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 35cefc29e365ccaf985bf7b86746056f37da4668..d88dce2e56b4c4c7ac98a3723dfe01fd26997991 100644 (file)
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,11 @@
+2006-03-27  Michael Snyder  <msnyder@redhat.com>
+
+       * xstormy16-tdep.c (xstormy16_return_value, xstormy16_push_dummy_call,
+       xstormy16_pointer_to_address, xstormy16_address_to_pointer, 
+       xstormy16_frame_prev_register): Change void* to gdb_byte*.
+       (xstormy16_push_dummy_call): Add block-local char* val, 
+       to avoid type conflict with outer scope variable.
+
 2006-03-27  Andrew Stubbs  <andrew.stubbs@st.com>
 
        * sh-tdep.c (sh_gdbarch_init): Add missing architectures.

diff --git a/gdb/xstormy16-tdep.c b/gdb/xstormy16-tdep.c
index 172e12d6d700720d625670d9053ea15f823bbe19..81b16698382ae8d303a2fbdfc00c77f5a9278ca8 100644 (file)
--- a/gdb/xstormy16-tdep.c
+++ b/gdb/xstormy16-tdep.c
@@ -202,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;
@@ -239,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
@@ -278,6 +278,8 @@ xstormy16_push_dummy_call (struct gdbarch *gdbarch,
      wordaligned.  */
   for (j = nargs - 1; j >= i; j--)
     {
+      char *val;
+
       typelen = TYPE_LENGTH (value_enclosing_type (args[j]));
       slacklen = typelen & 1;
       val = alloca (typelen + slacklen);
@@ -588,7 +590,7 @@ xstormy16_skip_trampoline_code (CORE_ADDR pc)
    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));
@@ -604,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));
 
@@ -671,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);