Suggested by George Anzinger.

	* dwarf2expr.c (execute_stack_op): Fetch the second item from the
	correct stack offset.  Include unknown opcode numbers in the error
	message.

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index fb99958f7d693728268a6bf8fdd89bfd22929d00..66166b072a3836211286f483491f642e9095c989 100644 (file)
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,10 @@
+2004-01-17  Daniel Jacobowitz  <drow@mvista.com>
+
+       Suggested by George Anzinger.
+       * dwarf2expr.c (execute_stack_op): Fetch the second item from the
+       correct stack offset.  Include unknown opcode numbers in the error
+       message.
+
 2004-01-17  Andrew Cagney  <cagney@redhat.com>
 
        * x86-64-tdep.c (x86_64_init_abi): No need to clear

diff --git a/gdb/dwarf2expr.c b/gdb/dwarf2expr.c
index cf00929e2251f00ce6d4ba723ec5a644c4e9d709..50baced5f2e8d1c4ef232be52cb6633d55180cd3 100644 (file)
--- a/gdb/dwarf2expr.c
+++ b/gdb/dwarf2expr.c
@@ -562,7 +562,7 @@ execute_stack_op (struct dwarf_expr_context *ctx, unsigned char *op_ptr,
            second = dwarf_expr_fetch (ctx, 0);
            dwarf_expr_pop (ctx);
 
-           first = dwarf_expr_fetch (ctx, 1);
+           first = dwarf_expr_fetch (ctx, 0);
            dwarf_expr_pop (ctx);
 
            val1 = value_from_longest (unsigned_address_type (), first);
@@ -660,7 +660,7 @@ execute_stack_op (struct dwarf_expr_context *ctx, unsigned char *op_ptr,
          goto no_push;
 
        default:
-         error ("Unhandled dwarf expression opcode");
+         error ("Unhandled dwarf expression opcode 0x%x", op);
        }
 
       /* Most things push a result value.  */