From cec90d9d386f57f116e114c50e4287281420f531 Mon Sep 17 00:00:00 2001 From: siddhesh Date: Thu, 27 Sep 2012 10:39:58 +0000 Subject: * 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. --- gdb/microblaze-tdep.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'gdb/microblaze-tdep.c') diff --git a/gdb/microblaze-tdep.c b/gdb/microblaze-tdep.c index 9b1ff468a57..96584004019 100644 --- 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); } -- cgit v1.2.1