* amd64-tdep.c (amd64_return_value): Revert previous change

        that used TYPE_LENGTH directly.
        * bfin-tdep.c (bfin_extract_return_value): Likewise.
        (bfin_store_return_value): Likewise.
        * cris-tdep.c (cris_store_return_value): Likewise.
        (cris_extract_return_value): Likewise.
        * h8300-tdep.c (h8300_extract_return_value): Likewise.
        * hppa-tdep.c (hppa64_return_value): Likewise.
        * lm32-tdep.c (lm32_store_return_value): Likewise.
        * microblaze-tdep.c (microblaze_store_return_value): Likewise.
        * spu-tdep.c (spu_value_from_register): Likewise.
        * vax-tdep.c (vax_return_value): Likewise.

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 26aeafbca04325c25a9d9f4335fab50658149245..f66812097fcd0aab6b9a96514c686d0ca28cbeb5 100644 (file)
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,18 @@
+2012-09-27  Siddhesh Poyarekar  <siddhesh@redhat.com>
+
+       * amd64-tdep.c (amd64_return_value): Revert previous change
+       that used TYPE_LENGTH directly.
+       * bfin-tdep.c (bfin_extract_return_value): Likewise.
+       (bfin_store_return_value): Likewise.
+       * cris-tdep.c (cris_store_return_value): Likewise.
+       (cris_extract_return_value): Likewise.
+       * h8300-tdep.c (h8300_extract_return_value): Likewise.
+       * hppa-tdep.c (hppa64_return_value): Likewise.
+       * lm32-tdep.c (lm32_store_return_value): Likewise.
+       * microblaze-tdep.c (microblaze_store_return_value): Likewise.
+       * spu-tdep.c (spu_value_from_register): Likewise.
+       * vax-tdep.c (vax_return_value): Likewise.
+
 2012-09-27  Siddhesh Poyarekar  <siddhesh@redhat.com>
 
        * gdbtypes.c (lookup_array_range_type): Expand parameters

diff --git a/gdb/amd64-tdep.c b/gdb/amd64-tdep.c
index 16c3ee4d271fc9b8d2787d3c2dc11f76494c53be..8c5b6cc50797f37b0fded73a5277d0b35d854a8e 100644 (file)
--- a/gdb/amd64-tdep.c
+++ b/gdb/amd64-tdep.c
@@ -637,7 +637,7 @@ amd64_return_value (struct gdbarch *gdbarch, struct value *function,
     }
 
   gdb_assert (class[1] != AMD64_MEMORY);
-  gdb_assert (TYPE_LENGTH (type) <= 16);
+  gdb_assert (len <= 16);
 
   for (i = 0; len > 0; i++, len -= 8)
     {

diff --git a/gdb/bfin-tdep.c b/gdb/bfin-tdep.c
index 6d4859a082b3092f968663d8aecfa57f9bc08df2..4eb5763c0f29ca23ed0d3596241c671d4f935891 100644 (file)
--- a/gdb/bfin-tdep.c
+++ b/gdb/bfin-tdep.c
@@ -615,7 +615,7 @@ bfin_extract_return_value (struct type *type,
   ULONGEST tmp;
   int regno = BFIN_R0_REGNUM;
 
-  gdb_assert (TYPE_LENGTH (type) <= 8);
+  gdb_assert (len <= 8);
 
   while (len > 0)
     {
@@ -643,7 +643,7 @@ bfin_store_return_value (struct type *type,
   int len = TYPE_LENGTH (type);
   int regno = BFIN_R0_REGNUM;
 
-  gdb_assert (TYPE_LENGTH (type) <= 8);
+  gdb_assert (len <= 8);
 
   while (len > 0)
     {

diff --git a/gdb/cris-tdep.c b/gdb/cris-tdep.c
index 48c8f9432f84e03fbe1732b61240da7d4331e4af..67390379f9862b006e6ad15cb4a3e92dc2886a81 100644 (file)
--- a/gdb/cris-tdep.c
+++ b/gdb/cris-tdep.c
@@ -1662,20 +1662,20 @@ cris_store_return_value (struct type *type, struct regcache *regcache,
   struct gdbarch *gdbarch = get_regcache_arch (regcache);
   enum bfd_endian byte_order = gdbarch_byte_order (gdbarch);
   ULONGEST val;
+  int len = TYPE_LENGTH (type);
   
-  if (TYPE_LENGTH (type) <= 4)
+  if (len <= 4)
     {
       /* Put the return value in R10.  */
-      val = extract_unsigned_integer (valbuf, TYPE_LENGTH (type), byte_order);
+      val = extract_unsigned_integer (valbuf, len, byte_order);
       regcache_cooked_write_unsigned (regcache, ARG1_REGNUM, val);
     }
-  else if (TYPE_LENGTH (type) <= 8)
+  else if (len <= 8)
     {
       /* 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,
-                                     TYPE_LENGTH (type) - 4, byte_order);
+      val = extract_unsigned_integer ((char *)valbuf + 4, len - 4, byte_order);
       regcache_cooked_write_unsigned (regcache, ARG2_REGNUM, val);
     }
   else
@@ -1833,21 +1833,21 @@ cris_extract_return_value (struct type *type, struct regcache *regcache,
   struct gdbarch *gdbarch = get_regcache_arch (regcache);
   enum bfd_endian byte_order = gdbarch_byte_order (gdbarch);
   ULONGEST val;
+  int len = TYPE_LENGTH (type);
   
-  if (TYPE_LENGTH (type) <= 4)
+  if (len <= 4)
     {
       /* Get the return value from R10.  */
       regcache_cooked_read_unsigned (regcache, ARG1_REGNUM, &val);
-      store_unsigned_integer (valbuf, TYPE_LENGTH (type), byte_order, val);
+      store_unsigned_integer (valbuf, len, byte_order, val);
     }
-  else if (TYPE_LENGTH (type) <= 8)
+  else if (len <= 8)
     {
       /* Get the return value from R10 and R11.  */
       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, TYPE_LENGTH (type) - 4,
-                             byte_order, val);
+      store_unsigned_integer ((char *)valbuf + 4, len - 4, byte_order, val);
     }
   else
     error (_("cris_extract_return_value: type length too large"));

diff --git a/gdb/h8300-tdep.c b/gdb/h8300-tdep.c
index bcb5b342cf75c3333e6e2abbc047e9fab04ac51f..4e98a8f7128a8cc576440f28a250b159d5b0851c 100644 (file)
--- a/gdb/h8300-tdep.c
+++ b/gdb/h8300-tdep.c
@@ -751,12 +751,12 @@ h8300_extract_return_value (struct type *type, struct regcache *regcache,
   int len = TYPE_LENGTH (type);
   ULONGEST c, addr;
 
-  switch (TYPE_LENGTH (type))
+  switch (len)
     {
     case 1:
     case 2:
       regcache_cooked_read_unsigned (regcache, E_RET0_REGNUM, &c);
-      store_unsigned_integer (valbuf, TYPE_LENGTH (type), byte_order, c);
+      store_unsigned_integer (valbuf, len, byte_order, c);
       break;
     case 4:                    /* Needs two registers on plain H8/300 */
       regcache_cooked_read_unsigned (regcache, E_RET0_REGNUM, &c);
@@ -768,9 +768,8 @@ h8300_extract_return_value (struct type *type, struct regcache *regcache,
       if (TYPE_CODE (type) == TYPE_CODE_INT)
        {
          regcache_cooked_read_unsigned (regcache, E_RET0_REGNUM, &addr);
-         c = read_memory_unsigned_integer ((CORE_ADDR) addr,
-                                           TYPE_LENGTH (type), byte_order);
-         store_unsigned_integer (valbuf, TYPE_LENGTH (type), byte_order, c);
+         c = read_memory_unsigned_integer ((CORE_ADDR) addr, len, byte_order);
+         store_unsigned_integer (valbuf, len, byte_order, c);
        }
       else
        {

diff --git a/gdb/hppa-tdep.c b/gdb/hppa-tdep.c
index d5798cffbd6f4bad8577ebfe329545e7e7ae2340..581ffc7aad87c7989aa7e03def6c33120f409989 100644 (file)
--- a/gdb/hppa-tdep.c
+++ b/gdb/hppa-tdep.c
@@ -1160,7 +1160,7 @@ hppa64_return_value (struct gdbarch *gdbarch, struct value *function,
   int len = TYPE_LENGTH (type);
   int regnum, offset;
 
-  if (TYPE_LENGTH (type) > 16)
+  if (len > 16)
     {
       /* All return values larget than 128 bits must be aggregate
          return values.  */

diff --git a/gdb/lm32-tdep.c b/gdb/lm32-tdep.c
index dd5eae8900f6cc814c796387383aff65684d8c27..725ce5bf0e216719d01a0dacc77f0f9707819494 100644 (file)
--- a/gdb/lm32-tdep.c
+++ b/gdb/lm32-tdep.c
@@ -349,18 +349,18 @@ lm32_store_return_value (struct type *type, struct regcache *regcache,
   struct gdbarch *gdbarch = get_regcache_arch (regcache);
   enum bfd_endian byte_order = gdbarch_byte_order (gdbarch);
   ULONGEST val;
+  int len = TYPE_LENGTH (type);
 
-  if (TYPE_LENGTH (type) <= 4)
+  if (len <= 4)
     {
-      val = extract_unsigned_integer (valbuf, TYPE_LENGTH (type), byte_order);
+      val = extract_unsigned_integer (valbuf, len, byte_order);
       regcache_cooked_write_unsigned (regcache, SIM_LM32_R1_REGNUM, val);
     }
-  else if (TYPE_LENGTH (type) <= 8)
+  else if (len <= 8)
     {
       val = extract_unsigned_integer (valbuf, 4, byte_order);
       regcache_cooked_write_unsigned (regcache, SIM_LM32_R1_REGNUM, val);
-      val = extract_unsigned_integer (valbuf + 4, TYPE_LENGTH (type) - 4,
-                                     byte_order);
+      val = extract_unsigned_integer (valbuf + 4, len - 4, byte_order);
       regcache_cooked_write_unsigned (regcache, SIM_LM32_R2_REGNUM, val);
     }
   else

diff --git a/gdb/microblaze-tdep.c b/gdb/microblaze-tdep.c
index 9b1ff468a574928130fc7731a7a35c6f5d0d754c..965840040194dd085782d87eb68400b88f7fd192 100644 (file)
--- a/gdb/microblaze-tdep.c
+++ b/gdb/microblaze-tdep.c
@@ -590,21 +590,22 @@ static void
 microblaze_store_return_value (struct type *type, struct regcache *regcache,
                               const gdb_byte *valbuf)
 {
+  int len = TYPE_LENGTH (type);
   gdb_byte buf[8];
 
   memset (buf, 0, sizeof(buf));
 
   /* Integral and pointer return values.  */
 
-  if (TYPE_LENGTH (type) > 4)
+  if (len > 4)
     {
-       gdb_assert (TYPE_LENGTH (type) == 8);
+       gdb_assert (len == 8);
        memcpy (buf, valbuf, 8);
        regcache_cooked_write (regcache, MICROBLAZE_RETVAL_REGNUM+1, buf + 4);
     }
   else
     /* ??? Do we need to do any sign-extension here?  */
-    memcpy (buf + 4 - TYPE_LENGTH (type), valbuf, TYPE_LENGTH (type));
+    memcpy (buf + 4 - len, valbuf, len);
 
   regcache_cooked_write (regcache, MICROBLAZE_RETVAL_REGNUM, buf);
 }

diff --git a/gdb/spu-tdep.c b/gdb/spu-tdep.c
index 619a947aa11be4fcf67b45afe0cefe10ee9ee887..8419a5a7124ef5ff1903d04352a1b4d6dfdc3d27 100644 (file)
--- a/gdb/spu-tdep.c
+++ b/gdb/spu-tdep.c
@@ -316,10 +316,11 @@ spu_value_from_register (struct type *type, int regnum,
                         struct frame_info *frame)
 {
   struct value *value = default_value_from_register (type, regnum, frame);
+  int len = TYPE_LENGTH (type);
 
-  if (regnum < SPU_NUM_GPRS && TYPE_LENGTH (type) < 16)
+  if (regnum < SPU_NUM_GPRS && len < 16)
     {
-      int preferred_slot = TYPE_LENGTH (type) < 4 ? 4 - TYPE_LENGTH (type) : 0;
+      int preferred_slot = len < 4 ? 4 - len : 0;
       set_value_offset (value, preferred_slot);
     }
 

diff --git a/gdb/vax-tdep.c b/gdb/vax-tdep.c
index e3ac15d62375aa12e64a7ce1c5d44ad3a8c80c71..550b56b37881b38d300707a441d9dd5c79a1555b 100644 (file)
--- a/gdb/vax-tdep.c
+++ b/gdb/vax-tdep.c
@@ -208,6 +208,7 @@ vax_return_value (struct gdbarch *gdbarch, struct value *function,
                  struct type *type, struct regcache *regcache,
                  gdb_byte *readbuf, const gdb_byte *writebuf)
 {
+  int len = TYPE_LENGTH (type);
   gdb_byte buf[8];
 
   if (TYPE_CODE (type) == TYPE_CODE_STRUCT
@@ -223,7 +224,7 @@ vax_return_value (struct gdbarch *gdbarch, struct value *function,
          ULONGEST addr;
 
          regcache_raw_read_unsigned (regcache, VAX_R0_REGNUM, &addr);
-         read_memory (addr, readbuf, TYPE_LENGTH (type));
+         read_memory (addr, readbuf, len);
        }
 
       return RETURN_VALUE_ABI_RETURNS_ADDRESS;
@@ -233,16 +234,16 @@ vax_return_value (struct gdbarch *gdbarch, struct value *function,
     {
       /* Read the contents of R0 and (if necessary) R1.  */
       regcache_cooked_read (regcache, VAX_R0_REGNUM, buf);
-      if (TYPE_LENGTH (type) > 4)
+      if (len > 4)
        regcache_cooked_read (regcache, VAX_R1_REGNUM, buf + 4);
-      memcpy (readbuf, buf, TYPE_LENGTH (type));
+      memcpy (readbuf, buf, len);
     }
   if (writebuf)
     {
       /* Read the contents to R0 and (if necessary) R1.  */
-      memcpy (buf, writebuf, TYPE_LENGTH (type));
+      memcpy (buf, writebuf, len);
       regcache_cooked_write (regcache, VAX_R0_REGNUM, buf);
-      if (TYPE_LENGTH (type) > 4)
+      if (len > 4)
        regcache_cooked_write (regcache, VAX_R1_REGNUM, buf + 4);
     }