* dwarf2cfi.c: Include "gcore.h".

(execute_stack_op): Fix implementation of the
DW_OP_deref and DW_OP_deref_size operators by letting do their
lookup in the target.

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 2515ed1948c97b893f79a5a861061d8cbaa8d631..eb6b039fc22801484a5bd31989aeb2994f02f0ef 100644 (file)
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,10 @@
+2002-07-08  Mark Kettenis  <kettenis@gnu.org>
+
+       * dwarf2cfi.c: Include "gcore.h".
+       (execute_stack_op): Fix implementation of the
+       DW_OP_deref and DW_OP_deref_size operators by letting do their
+       lookup in the target.
+
 2002-07-07  Mark Kettenis  <kettenis@gnu.org>
 
        From Peter Schauer <Peter.Schauer@regent.e-technik.tu-muenchen.de>:

diff --git a/gdb/dwarf2cfi.c b/gdb/dwarf2cfi.c
index 7302b45bcdde686506d0c5b40030529d96d15974..8d9567f4af72729270a035b84e3abeec58beb132 100644 (file)
--- a/gdb/dwarf2cfi.c
+++ b/gdb/dwarf2cfi.c
@@ -21,6 +21,7 @@
    Boston, MA 02111-1307, USA.  */
 
 #include "defs.h"
+#include "gdbcore.h"
 #include "symtab.h"
 #include "symfile.h"
 #include "objfiles.h"
@@ -1119,32 +1120,21 @@ execute_stack_op (struct objfile *objfile,
            {
            case DW_OP_deref:
              {
-               char *ptr = (char *) result;
-               result = read_pointer (objfile->obfd, &ptr);
+               int len = TARGET_ADDR_BIT / TARGET_CHAR_BIT;
+               if (len != 4 && len != 8)
+                 internal_error (__FILE__, __LINE__,
+                                 "execute_stack_op error");
+               result = read_memory_unsigned_integer (result, len);
              }
              break;
 
            case DW_OP_deref_size:
              {
-               char *ptr = (char *) result;
-               switch (*op_ptr++)
-                 {
-                 case 1:
-                   result = read_1u (objfile->obfd, &ptr);
-                   break;
-                 case 2:
-                   result = read_2u (objfile->obfd, &ptr);
-                   break;
-                 case 4:
-                   result = read_4u (objfile->obfd, &ptr);
-                   break;
-                 case 8:
-                   result = read_8u (objfile->obfd, &ptr);
-                   break;
-                 default:
-                   internal_error (__FILE__, __LINE__,
-                                   "execute_stack_op error");
-                 }
+               int len = *op_ptr++;
+               if (len != 1 && len != 2 && len != 4 && len !=8)
+                 internal_error (__FILE__, __LINE__,
+                                 "execute_stack_op error");
+               result = read_memory_unsigned_integer (result, len);
              }
              break;