ada_value_assign: Correct big-endian case to take into account the bitsize

  of the 'from' operand.

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index d8994756c1b9a05398af902b8394e5d511993c0e..f17ed4007b947fdbbba9c7a8f31e9dd1fed84b21 100644 (file)
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,8 @@
+2008-06-06  Paul N. Hilfinger  <hilfinger@adacore.com>
+
+       * ada-lang.c (ada_value_assign): Correct big-endian case to take into
+       account the bitsize of the 'from' operand.
+
 2008-06-06  Pedro Alves  <pedro@codesourcery.com>
 
        * annotate.h (annotate_thread_changed): Declare.

diff --git a/gdb/ada-lang.c b/gdb/ada-lang.c
index ea55bbce9a727eb31df4753813d9cd40fe42bace..cb85617fac94ccdd447a9d5f81c8115d5ce885ba 100644 (file)
--- a/gdb/ada-lang.c
+++ b/gdb/ada-lang.c
@@ -2252,6 +2252,7 @@ ada_value_assign (struct value *toval, struct value *fromval)
     {
       int len = (value_bitpos (toval)
                 + bits + HOST_CHAR_BIT - 1) / HOST_CHAR_BIT;
+      int from_size;
       char *buffer = (char *) alloca (len);
       struct value *val;
       CORE_ADDR to_addr = VALUE_ADDRESS (toval) + value_offset (toval);
@@ -2260,11 +2261,12 @@ ada_value_assign (struct value *toval, struct value *fromval)
         fromval = value_cast (type, fromval);
 
       read_memory (to_addr, buffer, len);
+      from_size = value_bitsize (fromval);
+      if (from_size == 0)
+       from_size = TYPE_LENGTH (value_type (fromval)) * TARGET_CHAR_BIT;
       if (gdbarch_bits_big_endian (current_gdbarch))
         move_bits (buffer, value_bitpos (toval),
-                   value_contents (fromval),
-                   TYPE_LENGTH (value_type (fromval)) * TARGET_CHAR_BIT -
-                   bits, bits);
+                  value_contents (fromval), from_size - bits, bits);
       else
         move_bits (buffer, value_bitpos (toval), value_contents (fromval),
                    0, bits);