/* DWARF 2 Expression Evaluator.
- Copyright (C) 2001, 2002, 2003, 2005, 2007, 2008, 2009, 2010, 2011
- Free Software Foundation, Inc.
+ Copyright (C) 2001-2020 Free Software Foundation, Inc.
Contributed by Daniel Berlin (dan@dberlin.org)
#include "gdbcore.h"
#include "dwarf2.h"
#include "dwarf2expr.h"
-#include "gdb_assert.h"
-
-/* Local prototypes. */
-
-static void execute_stack_op (struct dwarf_expr_context *,
- const gdb_byte *, const gdb_byte *);
+#include "dwarf2loc.h"
+#include "gdbsupport/underlying.h"
+#include "gdbarch.h"
/* Cookie for gdbarch data. */
unspecified in the DWARF spec. Only certain sizes are
supported. */
-static struct type *
-dwarf_expr_address_type (struct dwarf_expr_context *ctx)
+struct type *
+dwarf_expr_context::address_type () const
{
- struct dwarf_gdbarch_types *types = gdbarch_data (ctx->gdbarch,
- dwarf_arch_cookie);
+ struct dwarf_gdbarch_types *types
+ = (struct dwarf_gdbarch_types *) gdbarch_data (this->gdbarch,
+ dwarf_arch_cookie);
int ndx;
- if (ctx->addr_size == 2)
+ if (this->addr_size == 2)
ndx = 0;
- else if (ctx->addr_size == 4)
+ else if (this->addr_size == 4)
ndx = 1;
- else if (ctx->addr_size == 8)
+ else if (this->addr_size == 8)
ndx = 2;
else
error (_("Unsupported address size in DWARF expressions: %d bits"),
- 8 * ctx->addr_size);
+ 8 * this->addr_size);
if (types->dw_types[ndx] == NULL)
types->dw_types[ndx]
- = arch_integer_type (ctx->gdbarch,
- 8 * ctx->addr_size,
+ = arch_integer_type (this->gdbarch,
+ 8 * this->addr_size,
0, "<signed DWARF address type>");
return types->dw_types[ndx];
/* Create a new context for the expression evaluator. */
-struct dwarf_expr_context *
-new_dwarf_expr_context (void)
+dwarf_expr_context::dwarf_expr_context ()
+: gdbarch (NULL),
+ addr_size (0),
+ ref_addr_size (0),
+ offset (0),
+ recursion_depth (0),
+ max_recursion_depth (0x100),
+ location (DWARF_VALUE_MEMORY),
+ len (0),
+ data (NULL),
+ initialized (0)
{
- struct dwarf_expr_context *retval;
-
- retval = xcalloc (1, sizeof (struct dwarf_expr_context));
- retval->stack_len = 0;
- retval->stack_allocated = 10;
- retval->stack = xmalloc (retval->stack_allocated
- * sizeof (struct dwarf_stack_value));
- retval->num_pieces = 0;
- retval->pieces = 0;
- retval->max_recursion_depth = 0x100;
- return retval;
}
-/* Release the memory allocated to CTX. */
+/* Push VALUE onto the stack. */
void
-free_dwarf_expr_context (struct dwarf_expr_context *ctx)
-{
- xfree (ctx->stack);
- xfree (ctx->pieces);
- xfree (ctx);
-}
-
-/* Helper for make_cleanup_free_dwarf_expr_context. */
-
-static void
-free_dwarf_expr_context_cleanup (void *arg)
-{
- free_dwarf_expr_context (arg);
-}
-
-/* Return a cleanup that calls free_dwarf_expr_context. */
-
-struct cleanup *
-make_cleanup_free_dwarf_expr_context (struct dwarf_expr_context *ctx)
-{
- return make_cleanup (free_dwarf_expr_context_cleanup, ctx);
-}
-
-/* Expand the memory allocated to CTX's stack to contain at least
- NEED more elements than are currently used. */
-
-static void
-dwarf_expr_grow_stack (struct dwarf_expr_context *ctx, size_t need)
-{
- if (ctx->stack_len + need > ctx->stack_allocated)
- {
- size_t newlen = ctx->stack_len + need + 10;
-
- ctx->stack = xrealloc (ctx->stack,
- newlen * sizeof (struct dwarf_stack_value));
- ctx->stack_allocated = newlen;
- }
-}
-
-/* Push VALUE onto CTX's stack. */
-
-static void
-dwarf_expr_push (struct dwarf_expr_context *ctx, struct value *value,
- int in_stack_memory)
+dwarf_expr_context::push (struct value *value, bool in_stack_memory)
{
- struct dwarf_stack_value *v;
-
- dwarf_expr_grow_stack (ctx, 1);
- v = &ctx->stack[ctx->stack_len++];
- v->value = value;
- v->in_stack_memory = in_stack_memory;
+ stack.emplace_back (value, in_stack_memory);
}
-/* Push VALUE onto CTX's stack. */
+/* Push VALUE onto the stack. */
void
-dwarf_expr_push_address (struct dwarf_expr_context *ctx, CORE_ADDR value,
- int in_stack_memory)
+dwarf_expr_context::push_address (CORE_ADDR value, bool in_stack_memory)
{
- dwarf_expr_push (ctx,
- value_from_ulongest (dwarf_expr_address_type (ctx), value),
- in_stack_memory);
+ push (value_from_ulongest (address_type (), value), in_stack_memory);
}
-/* Pop the top item off of CTX's stack. */
+/* Pop the top item off of the stack. */
-static void
-dwarf_expr_pop (struct dwarf_expr_context *ctx)
+void
+dwarf_expr_context::pop ()
{
- if (ctx->stack_len <= 0)
+ if (stack.empty ())
error (_("dwarf expression stack underflow"));
- ctx->stack_len--;
+
+ stack.pop_back ();
}
-/* Retrieve the N'th item on CTX's stack. */
+/* Retrieve the N'th item on the stack. */
struct value *
-dwarf_expr_fetch (struct dwarf_expr_context *ctx, int n)
+dwarf_expr_context::fetch (int n)
{
- if (ctx->stack_len <= n)
+ if (stack.size () <= n)
error (_("Asked for position %d of stack, "
- "stack only has %d elements on it."),
- n, ctx->stack_len);
- return ctx->stack[ctx->stack_len - (1 + n)].value;
+ "stack only has %zu elements on it."),
+ n, stack.size ());
+ return stack[stack.size () - (1 + n)].value;
}
/* Require that TYPE be an integral type; throw an exception if not. */
}
}
-/* Retrieve the N'th item on CTX's stack, converted to an address. */
+/* Retrieve the N'th item on the stack, converted to an address. */
CORE_ADDR
-dwarf_expr_fetch_address (struct dwarf_expr_context *ctx, int n)
+dwarf_expr_context::fetch_address (int n)
{
- struct value *result_val = dwarf_expr_fetch (ctx, n);
- enum bfd_endian byte_order = gdbarch_byte_order (ctx->gdbarch);
+ struct value *result_val = fetch (n);
+ enum bfd_endian byte_order = gdbarch_byte_order (this->gdbarch);
ULONGEST result;
dwarf_require_integral (value_type (result_val));
extract_unsigned_integer() will not produce a correct
result. Make sure we invoke gdbarch_integer_to_address()
for those architectures which require it. */
- if (gdbarch_integer_to_address_p (ctx->gdbarch))
+ if (gdbarch_integer_to_address_p (this->gdbarch))
{
- gdb_byte *buf = alloca (ctx->addr_size);
- struct type *int_type = get_unsigned_type (ctx->gdbarch,
+ gdb_byte *buf = (gdb_byte *) alloca (this->addr_size);
+ struct type *int_type = get_unsigned_type (this->gdbarch,
value_type (result_val));
- store_unsigned_integer (buf, ctx->addr_size, byte_order, result);
- return gdbarch_integer_to_address (ctx->gdbarch, int_type, buf);
+ store_unsigned_integer (buf, this->addr_size, byte_order, result);
+ return gdbarch_integer_to_address (this->gdbarch, int_type, buf);
}
return (CORE_ADDR) result;
}
-/* Retrieve the in_stack_memory flag of the N'th item on CTX's stack. */
+/* Retrieve the in_stack_memory flag of the N'th item on the stack. */
-int
-dwarf_expr_fetch_in_stack_memory (struct dwarf_expr_context *ctx, int n)
+bool
+dwarf_expr_context::fetch_in_stack_memory (int n)
{
- if (ctx->stack_len <= n)
+ if (stack.size () <= n)
error (_("Asked for position %d of stack, "
- "stack only has %d elements on it."),
- n, ctx->stack_len);
- return ctx->stack[ctx->stack_len - (1 + n)].in_stack_memory;
+ "stack only has %zu elements on it."),
+ n, stack.size ());
+ return stack[stack.size () - (1 + n)].in_stack_memory;
}
/* Return true if the expression stack is empty. */
-static int
-dwarf_expr_stack_empty_p (struct dwarf_expr_context *ctx)
+bool
+dwarf_expr_context::stack_empty_p () const
{
- return ctx->stack_len == 0;
+ return stack.empty ();
}
-/* Add a new piece to CTX's piece list. */
-static void
-add_piece (struct dwarf_expr_context *ctx, ULONGEST size, ULONGEST offset)
+/* Add a new piece to the dwarf_expr_context's piece list. */
+void
+dwarf_expr_context::add_piece (ULONGEST size, ULONGEST offset)
{
- struct dwarf_expr_piece *p;
-
- ctx->num_pieces++;
+ this->pieces.emplace_back ();
+ dwarf_expr_piece &p = this->pieces.back ();
- ctx->pieces = xrealloc (ctx->pieces,
- (ctx->num_pieces
- * sizeof (struct dwarf_expr_piece)));
+ p.location = this->location;
+ p.size = size;
+ p.offset = offset;
- p = &ctx->pieces[ctx->num_pieces - 1];
- p->location = ctx->location;
- p->size = size;
- p->offset = offset;
-
- if (p->location == DWARF_VALUE_LITERAL)
+ if (p.location == DWARF_VALUE_LITERAL)
{
- p->v.literal.data = ctx->data;
- p->v.literal.length = ctx->len;
+ p.v.literal.data = this->data;
+ p.v.literal.length = this->len;
}
- else if (dwarf_expr_stack_empty_p (ctx))
+ else if (stack_empty_p ())
{
- p->location = DWARF_VALUE_OPTIMIZED_OUT;
+ p.location = DWARF_VALUE_OPTIMIZED_OUT;
/* Also reset the context's location, for our callers. This is
a somewhat strange approach, but this lets us avoid setting
the location to DWARF_VALUE_MEMORY in all the individual
cases in the evaluator. */
- ctx->location = DWARF_VALUE_OPTIMIZED_OUT;
+ this->location = DWARF_VALUE_OPTIMIZED_OUT;
}
- else if (p->location == DWARF_VALUE_MEMORY)
+ else if (p.location == DWARF_VALUE_MEMORY)
{
- p->v.mem.addr = dwarf_expr_fetch_address (ctx, 0);
- p->v.mem.in_stack_memory = dwarf_expr_fetch_in_stack_memory (ctx, 0);
+ p.v.mem.addr = fetch_address (0);
+ p.v.mem.in_stack_memory = fetch_in_stack_memory (0);
}
- else if (p->location == DWARF_VALUE_IMPLICIT_POINTER)
+ else if (p.location == DWARF_VALUE_IMPLICIT_POINTER)
{
- p->v.ptr.die = ctx->len;
- p->v.ptr.offset = value_as_long (dwarf_expr_fetch (ctx, 0));
+ p.v.ptr.die_sect_off = (sect_offset) this->len;
+ p.v.ptr.offset = value_as_long (fetch (0));
}
- else if (p->location == DWARF_VALUE_REGISTER)
- p->v.regno = value_as_long (dwarf_expr_fetch (ctx, 0));
+ else if (p.location == DWARF_VALUE_REGISTER)
+ p.v.regno = value_as_long (fetch (0));
else
{
- p->v.value = dwarf_expr_fetch (ctx, 0);
+ p.v.value = fetch (0);
}
}
-/* Evaluate the expression at ADDR (LEN bytes long) using the context
- CTX. */
+/* Evaluate the expression at ADDR (LEN bytes long). */
void
-dwarf_expr_eval (struct dwarf_expr_context *ctx, const gdb_byte *addr,
- size_t len)
+dwarf_expr_context::eval (const gdb_byte *addr, size_t len)
{
- int old_recursion_depth = ctx->recursion_depth;
+ int old_recursion_depth = this->recursion_depth;
- execute_stack_op (ctx, addr, addr + len);
+ execute_stack_op (addr, addr + len);
- /* CTX RECURSION_DEPTH becomes invalid if an exception was thrown here. */
+ /* RECURSION_DEPTH becomes invalid if an exception was thrown here. */
- gdb_assert (ctx->recursion_depth == old_recursion_depth);
+ gdb_assert (this->recursion_depth == old_recursion_depth);
}
-/* Decode the unsigned LEB128 constant at BUF into the variable pointed to
- by R, and return the new value of BUF. Verify that it doesn't extend
- past BUF_END. */
+/* Helper to read a uleb128 value or throw an error. */
const gdb_byte *
-read_uleb128 (const gdb_byte *buf, const gdb_byte *buf_end, ULONGEST * r)
+safe_read_uleb128 (const gdb_byte *buf, const gdb_byte *buf_end,
+ uint64_t *r)
{
- unsigned shift = 0;
- ULONGEST result = 0;
- gdb_byte byte;
-
- while (1)
- {
- if (buf >= buf_end)
- error (_("read_uleb128: Corrupted DWARF expression."));
-
- byte = *buf++;
- result |= ((ULONGEST) (byte & 0x7f)) << shift;
- if ((byte & 0x80) == 0)
- break;
- shift += 7;
- }
- *r = result;
+ buf = gdb_read_uleb128 (buf, buf_end, r);
+ if (buf == NULL)
+ error (_("DWARF expression error: ran off end of buffer reading uleb128 value"));
return buf;
}
-/* Decode the signed LEB128 constant at BUF into the variable pointed to
- by R, and return the new value of BUF. Verify that it doesn't extend
- past BUF_END. */
+/* Helper to read a sleb128 value or throw an error. */
const gdb_byte *
-read_sleb128 (const gdb_byte *buf, const gdb_byte *buf_end, LONGEST * r)
+safe_read_sleb128 (const gdb_byte *buf, const gdb_byte *buf_end,
+ int64_t *r)
{
- unsigned shift = 0;
- LONGEST result = 0;
- gdb_byte byte;
-
- while (1)
- {
- if (buf >= buf_end)
- error (_("read_sleb128: Corrupted DWARF expression."));
-
- byte = *buf++;
- result |= ((ULONGEST) (byte & 0x7f)) << shift;
- shift += 7;
- if ((byte & 0x80) == 0)
- break;
- }
- if (shift < (sizeof (*r) * 8) && (byte & 0x40) != 0)
- result |= -(1 << shift);
+ buf = gdb_read_sleb128 (buf, buf_end, r);
+ if (buf == NULL)
+ error (_("DWARF expression error: ran off end of buffer reading sleb128 value"));
+ return buf;
+}
- *r = result;
+const gdb_byte *
+safe_skip_leb128 (const gdb_byte *buf, const gdb_byte *buf_end)
+{
+ buf = gdb_skip_leb128 (buf, buf_end);
+ if (buf == NULL)
+ error (_("DWARF expression error: ran off end of buffer reading leb128 value"));
return buf;
}
\f
/* Check that the current operator is either at the end of an
- expression, or that it is followed by a composition operator. */
+ expression, or that it is followed by a composition operator or by
+ DW_OP_GNU_uninit (which should terminate the expression). */
void
dwarf_expr_require_composition (const gdb_byte *op_ptr, const gdb_byte *op_end,
const char *op_name)
{
- /* It seems like DW_OP_GNU_uninit should be handled here. However,
- it doesn't seem to make sense for DW_OP_*_value, and it was not
- checked at the other place that this function is called. */
- if (op_ptr != op_end && *op_ptr != DW_OP_piece && *op_ptr != DW_OP_bit_piece)
+ if (op_ptr != op_end && *op_ptr != DW_OP_piece && *op_ptr != DW_OP_bit_piece
+ && *op_ptr != DW_OP_GNU_uninit)
error (_("DWARF-2 expression error: `%s' operations must be "
"used either alone or in conjunction with DW_OP_piece "
"or DW_OP_bit_piece."),
return TYPE_LENGTH (t1) == TYPE_LENGTH (t2);
}
-/* A convenience function to call get_base_type on CTX and return the
- result. DIE is the DIE whose type we need. SIZE is non-zero if
- this function should verify that the resulting type has the correct
- size. */
+/* If <BUF..BUF_END] contains DW_FORM_block* with single DW_OP_reg* return the
+ DWARF register number. Otherwise return -1. */
-static struct type *
-dwarf_get_base_type (struct dwarf_expr_context *ctx, ULONGEST die, int size)
+int
+dwarf_block_to_dwarf_reg (const gdb_byte *buf, const gdb_byte *buf_end)
+{
+ uint64_t dwarf_reg;
+
+ if (buf_end <= buf)
+ return -1;
+ if (*buf >= DW_OP_reg0 && *buf <= DW_OP_reg31)
+ {
+ if (buf_end - buf != 1)
+ return -1;
+ return *buf - DW_OP_reg0;
+ }
+
+ if (*buf == DW_OP_regval_type || *buf == DW_OP_GNU_regval_type)
+ {
+ buf++;
+ buf = gdb_read_uleb128 (buf, buf_end, &dwarf_reg);
+ if (buf == NULL)
+ return -1;
+ buf = gdb_skip_leb128 (buf, buf_end);
+ if (buf == NULL)
+ return -1;
+ }
+ else if (*buf == DW_OP_regx)
+ {
+ buf++;
+ buf = gdb_read_uleb128 (buf, buf_end, &dwarf_reg);
+ if (buf == NULL)
+ return -1;
+ }
+ else
+ return -1;
+ if (buf != buf_end || (int) dwarf_reg != dwarf_reg)
+ return -1;
+ return dwarf_reg;
+}
+
+/* If <BUF..BUF_END] contains DW_FORM_block* with just DW_OP_breg*(0) and
+ DW_OP_deref* return the DWARF register number. Otherwise return -1.
+ DEREF_SIZE_RETURN contains -1 for DW_OP_deref; otherwise it contains the
+ size from DW_OP_deref_size. */
+
+int
+dwarf_block_to_dwarf_reg_deref (const gdb_byte *buf, const gdb_byte *buf_end,
+ CORE_ADDR *deref_size_return)
{
- struct type *result;
+ uint64_t dwarf_reg;
+ int64_t offset;
+
+ if (buf_end <= buf)
+ return -1;
+
+ if (*buf >= DW_OP_breg0 && *buf <= DW_OP_breg31)
+ {
+ dwarf_reg = *buf - DW_OP_breg0;
+ buf++;
+ if (buf >= buf_end)
+ return -1;
+ }
+ else if (*buf == DW_OP_bregx)
+ {
+ buf++;
+ buf = gdb_read_uleb128 (buf, buf_end, &dwarf_reg);
+ if (buf == NULL)
+ return -1;
+ if ((int) dwarf_reg != dwarf_reg)
+ return -1;
+ }
+ else
+ return -1;
+
+ buf = gdb_read_sleb128 (buf, buf_end, &offset);
+ if (buf == NULL)
+ return -1;
+ if (offset != 0)
+ return -1;
- if (ctx->get_base_type)
+ if (*buf == DW_OP_deref)
{
- result = ctx->get_base_type (ctx, die);
- if (result == NULL)
- error (_("Could not find type for DW_OP_GNU_const_type"));
- if (size != 0 && TYPE_LENGTH (result) != size)
- error (_("DW_OP_GNU_const_type has different sizes for type and data"));
+ buf++;
+ *deref_size_return = -1;
+ }
+ else if (*buf == DW_OP_deref_size)
+ {
+ buf++;
+ if (buf >= buf_end)
+ return -1;
+ *deref_size_return = *buf++;
}
else
- /* Anything will do. */
- result = builtin_type (ctx->gdbarch)->builtin_int;
+ return -1;
- return result;
+ if (buf != buf_end)
+ return -1;
+
+ return dwarf_reg;
}
-/* The engine for the expression evaluator. Using the context in CTX,
- evaluate the expression between OP_PTR and OP_END. */
+/* If <BUF..BUF_END] contains DW_FORM_block* with single DW_OP_fbreg(X) fill
+ in FB_OFFSET_RETURN with the X offset and return 1. Otherwise return 0. */
-static void
-execute_stack_op (struct dwarf_expr_context *ctx,
- const gdb_byte *op_ptr, const gdb_byte *op_end)
+int
+dwarf_block_to_fb_offset (const gdb_byte *buf, const gdb_byte *buf_end,
+ CORE_ADDR *fb_offset_return)
+{
+ int64_t fb_offset;
+
+ if (buf_end <= buf)
+ return 0;
+
+ if (*buf != DW_OP_fbreg)
+ return 0;
+ buf++;
+
+ buf = gdb_read_sleb128 (buf, buf_end, &fb_offset);
+ if (buf == NULL)
+ return 0;
+ *fb_offset_return = fb_offset;
+ if (buf != buf_end || fb_offset != (LONGEST) *fb_offset_return)
+ return 0;
+
+ return 1;
+}
+
+/* If <BUF..BUF_END] contains DW_FORM_block* with single DW_OP_bregSP(X) fill
+ in SP_OFFSET_RETURN with the X offset and return 1. Otherwise return 0.
+ The matched SP register number depends on GDBARCH. */
+
+int
+dwarf_block_to_sp_offset (struct gdbarch *gdbarch, const gdb_byte *buf,
+ const gdb_byte *buf_end, CORE_ADDR *sp_offset_return)
+{
+ uint64_t dwarf_reg;
+ int64_t sp_offset;
+
+ if (buf_end <= buf)
+ return 0;
+ if (*buf >= DW_OP_breg0 && *buf <= DW_OP_breg31)
+ {
+ dwarf_reg = *buf - DW_OP_breg0;
+ buf++;
+ }
+ else
+ {
+ if (*buf != DW_OP_bregx)
+ return 0;
+ buf++;
+ buf = gdb_read_uleb128 (buf, buf_end, &dwarf_reg);
+ if (buf == NULL)
+ return 0;
+ }
+
+ if (dwarf_reg_to_regnum (gdbarch, dwarf_reg)
+ != gdbarch_sp_regnum (gdbarch))
+ return 0;
+
+ buf = gdb_read_sleb128 (buf, buf_end, &sp_offset);
+ if (buf == NULL)
+ return 0;
+ *sp_offset_return = sp_offset;
+ if (buf != buf_end || sp_offset != (LONGEST) *sp_offset_return)
+ return 0;
+
+ return 1;
+}
+
+/* The engine for the expression evaluator. Using the context in this
+ object, evaluate the expression between OP_PTR and OP_END. */
+
+void
+dwarf_expr_context::execute_stack_op (const gdb_byte *op_ptr,
+ const gdb_byte *op_end)
{
- enum bfd_endian byte_order = gdbarch_byte_order (ctx->gdbarch);
+ enum bfd_endian byte_order = gdbarch_byte_order (this->gdbarch);
/* Old-style "untyped" DWARF values need special treatment in a
couple of places, specifically DW_OP_mod and DW_OP_shr. We need
a special type for these values so we can distinguish them from
values do not need special treatment. This special type must be
different (in the `==' sense) from any base type coming from the
CU. */
- struct type *address_type = dwarf_expr_address_type (ctx);
+ struct type *address_type = this->address_type ();
- ctx->location = DWARF_VALUE_MEMORY;
- ctx->initialized = 1; /* Default is initialized. */
+ this->location = DWARF_VALUE_MEMORY;
+ this->initialized = 1; /* Default is initialized. */
- if (ctx->recursion_depth > ctx->max_recursion_depth)
+ if (this->recursion_depth > this->max_recursion_depth)
error (_("DWARF-2 expression error: Loop detected (%d)."),
- ctx->recursion_depth);
- ctx->recursion_depth++;
+ this->recursion_depth);
+ this->recursion_depth++;
while (op_ptr < op_end)
{
- enum dwarf_location_atom op = *op_ptr++;
+ enum dwarf_location_atom op = (enum dwarf_location_atom) *op_ptr++;
ULONGEST result;
/* Assume the value is not in stack memory.
- Code that knows otherwise sets this to 1.
+ Code that knows otherwise sets this to true.
Some arithmetic on stack addresses can probably be assumed to still
be a stack address, but we skip this complication for now.
This is just an optimization, so it's always ok to punt
- and leave this as 0. */
- int in_stack_memory = 0;
- ULONGEST uoffset, reg;
- LONGEST offset;
+ and leave this as false. */
+ bool in_stack_memory = false;
+ uint64_t uoffset, reg;
+ int64_t offset;
struct value *result_val = NULL;
+ /* The DWARF expression might have a bug causing an infinite
+ loop. In that case, quitting is the only way out. */
+ QUIT;
+
switch (op)
{
case DW_OP_lit0:
case DW_OP_addr:
result = extract_unsigned_integer (op_ptr,
- ctx->addr_size, byte_order);
- op_ptr += ctx->addr_size;
+ this->addr_size, byte_order);
+ op_ptr += this->addr_size;
/* Some versions of GCC emit DW_OP_addr before
DW_OP_GNU_push_tls_address. In this case the value is an
index, not an address. We don't support things like
branching between the address and the TLS op. */
if (op_ptr >= op_end || *op_ptr != DW_OP_GNU_push_tls_address)
- result += ctx->offset;
+ result += this->offset;
+ result_val = value_from_ulongest (address_type, result);
+ break;
+
+ case DW_OP_addrx:
+ case DW_OP_GNU_addr_index:
+ op_ptr = safe_read_uleb128 (op_ptr, op_end, &uoffset);
+ result = this->get_addr_index (uoffset);
+ result += this->offset;
+ result_val = value_from_ulongest (address_type, result);
+ break;
+ case DW_OP_GNU_const_index:
+ op_ptr = safe_read_uleb128 (op_ptr, op_end, &uoffset);
+ result = this->get_addr_index (uoffset);
result_val = value_from_ulongest (address_type, result);
break;
op_ptr += 8;
break;
case DW_OP_constu:
- op_ptr = read_uleb128 (op_ptr, op_end, &uoffset);
+ op_ptr = safe_read_uleb128 (op_ptr, op_end, &uoffset);
result = uoffset;
result_val = value_from_ulongest (address_type, result);
break;
case DW_OP_consts:
- op_ptr = read_sleb128 (op_ptr, op_end, &offset);
+ op_ptr = safe_read_sleb128 (op_ptr, op_end, &offset);
result = offset;
result_val = value_from_ulongest (address_type, result);
break;
case DW_OP_reg29:
case DW_OP_reg30:
case DW_OP_reg31:
- if (op_ptr != op_end
- && *op_ptr != DW_OP_piece
- && *op_ptr != DW_OP_bit_piece
- && *op_ptr != DW_OP_GNU_uninit)
- error (_("DWARF-2 expression error: DW_OP_reg operations must be "
- "used either alone or in conjunction with DW_OP_piece "
- "or DW_OP_bit_piece."));
+ dwarf_expr_require_composition (op_ptr, op_end, "DW_OP_reg");
result = op - DW_OP_reg0;
result_val = value_from_ulongest (address_type, result);
- ctx->location = DWARF_VALUE_REGISTER;
+ this->location = DWARF_VALUE_REGISTER;
break;
case DW_OP_regx:
- op_ptr = read_uleb128 (op_ptr, op_end, ®);
+ op_ptr = safe_read_uleb128 (op_ptr, op_end, ®);
dwarf_expr_require_composition (op_ptr, op_end, "DW_OP_regx");
result = reg;
result_val = value_from_ulongest (address_type, result);
- ctx->location = DWARF_VALUE_REGISTER;
+ this->location = DWARF_VALUE_REGISTER;
break;
case DW_OP_implicit_value:
{
- ULONGEST len;
+ uint64_t len;
- op_ptr = read_uleb128 (op_ptr, op_end, &len);
+ op_ptr = safe_read_uleb128 (op_ptr, op_end, &len);
if (op_ptr + len > op_end)
error (_("DW_OP_implicit_value: too few bytes available."));
- ctx->len = len;
- ctx->data = op_ptr;
- ctx->location = DWARF_VALUE_LITERAL;
+ this->len = len;
+ this->data = op_ptr;
+ this->location = DWARF_VALUE_LITERAL;
op_ptr += len;
dwarf_expr_require_composition (op_ptr, op_end,
"DW_OP_implicit_value");
goto no_push;
case DW_OP_stack_value:
- ctx->location = DWARF_VALUE_STACK;
+ this->location = DWARF_VALUE_STACK;
dwarf_expr_require_composition (op_ptr, op_end, "DW_OP_stack_value");
goto no_push;
+ case DW_OP_implicit_pointer:
case DW_OP_GNU_implicit_pointer:
{
- ULONGEST die;
- LONGEST len;
+ int64_t len;
- /* The referred-to DIE. */
- ctx->len = extract_unsigned_integer (op_ptr, ctx->addr_size,
+ if (this->ref_addr_size == -1)
+ error (_("DWARF-2 expression error: DW_OP_implicit_pointer "
+ "is not allowed in frame context"));
+
+ /* The referred-to DIE of sect_offset kind. */
+ this->len = extract_unsigned_integer (op_ptr, this->ref_addr_size,
byte_order);
- op_ptr += ctx->addr_size;
+ op_ptr += this->ref_addr_size;
/* The byte offset into the data. */
- op_ptr = read_sleb128 (op_ptr, op_end, &len);
+ op_ptr = safe_read_sleb128 (op_ptr, op_end, &len);
result = (ULONGEST) len;
result_val = value_from_ulongest (address_type, result);
- ctx->location = DWARF_VALUE_IMPLICIT_POINTER;
+ this->location = DWARF_VALUE_IMPLICIT_POINTER;
dwarf_expr_require_composition (op_ptr, op_end,
- "DW_OP_GNU_implicit_pointer");
+ "DW_OP_implicit_pointer");
}
break;
case DW_OP_breg30:
case DW_OP_breg31:
{
- op_ptr = read_sleb128 (op_ptr, op_end, &offset);
- result = (ctx->read_reg) (ctx->baton, op - DW_OP_breg0);
+ op_ptr = safe_read_sleb128 (op_ptr, op_end, &offset);
+ result = this->read_addr_from_reg (op - DW_OP_breg0);
result += offset;
result_val = value_from_ulongest (address_type, result);
}
break;
case DW_OP_bregx:
{
- op_ptr = read_uleb128 (op_ptr, op_end, ®);
- op_ptr = read_sleb128 (op_ptr, op_end, &offset);
- result = (ctx->read_reg) (ctx->baton, reg);
+ op_ptr = safe_read_uleb128 (op_ptr, op_end, ®);
+ op_ptr = safe_read_sleb128 (op_ptr, op_end, &offset);
+ result = this->read_addr_from_reg (reg);
result += offset;
result_val = value_from_ulongest (address_type, result);
}
{
const gdb_byte *datastart;
size_t datalen;
- unsigned int before_stack_len;
- op_ptr = read_sleb128 (op_ptr, op_end, &offset);
+ op_ptr = safe_read_sleb128 (op_ptr, op_end, &offset);
+
/* Rather than create a whole new context, we simply
- record the stack length before execution, then reset it
- afterwards, effectively erasing whatever the recursive
- call put there. */
- before_stack_len = ctx->stack_len;
+ backup the current stack locally and install a new empty stack,
+ then reset it afterwards, effectively erasing whatever the
+ recursive call put there. */
+ std::vector<dwarf_stack_value> saved_stack = std::move (stack);
+ stack.clear ();
+
/* FIXME: cagney/2003-03-26: This code should be using
get_frame_base_address(), and then implement a dwarf2
specific this_base method. */
- (ctx->get_frame_base) (ctx->baton, &datastart, &datalen);
- dwarf_expr_eval (ctx, datastart, datalen);
- if (ctx->location == DWARF_VALUE_MEMORY)
- result = dwarf_expr_fetch_address (ctx, 0);
- else if (ctx->location == DWARF_VALUE_REGISTER)
- result
- = (ctx->read_reg) (ctx->baton,
- value_as_long (dwarf_expr_fetch (ctx, 0)));
+ this->get_frame_base (&datastart, &datalen);
+ eval (datastart, datalen);
+ if (this->location == DWARF_VALUE_MEMORY)
+ result = fetch_address (0);
+ else if (this->location == DWARF_VALUE_REGISTER)
+ result = this->read_addr_from_reg (value_as_long (fetch (0)));
else
error (_("Not implemented: computing frame "
"base using explicit value operator"));
result = result + offset;
result_val = value_from_ulongest (address_type, result);
- in_stack_memory = 1;
- ctx->stack_len = before_stack_len;
- ctx->location = DWARF_VALUE_MEMORY;
+ in_stack_memory = true;
+
+ /* Restore the content of the original stack. */
+ stack = std::move (saved_stack);
+
+ this->location = DWARF_VALUE_MEMORY;
}
break;
case DW_OP_dup:
- result_val = dwarf_expr_fetch (ctx, 0);
- in_stack_memory = dwarf_expr_fetch_in_stack_memory (ctx, 0);
+ result_val = fetch (0);
+ in_stack_memory = fetch_in_stack_memory (0);
break;
case DW_OP_drop:
- dwarf_expr_pop (ctx);
+ pop ();
goto no_push;
case DW_OP_pick:
offset = *op_ptr++;
- result_val = dwarf_expr_fetch (ctx, offset);
- in_stack_memory = dwarf_expr_fetch_in_stack_memory (ctx, offset);
+ result_val = fetch (offset);
+ in_stack_memory = fetch_in_stack_memory (offset);
break;
case DW_OP_swap:
{
- struct dwarf_stack_value t1, t2;
-
- if (ctx->stack_len < 2)
+ if (stack.size () < 2)
error (_("Not enough elements for "
- "DW_OP_swap. Need 2, have %d."),
- ctx->stack_len);
- t1 = ctx->stack[ctx->stack_len - 1];
- t2 = ctx->stack[ctx->stack_len - 2];
- ctx->stack[ctx->stack_len - 1] = t2;
- ctx->stack[ctx->stack_len - 2] = t1;
+ "DW_OP_swap. Need 2, have %zu."),
+ stack.size ());
+
+ dwarf_stack_value &t1 = stack[stack.size () - 1];
+ dwarf_stack_value &t2 = stack[stack.size () - 2];
+ std::swap (t1, t2);
goto no_push;
}
case DW_OP_over:
- result_val = dwarf_expr_fetch (ctx, 1);
- in_stack_memory = dwarf_expr_fetch_in_stack_memory (ctx, 1);
+ result_val = fetch (1);
+ in_stack_memory = fetch_in_stack_memory (1);
break;
case DW_OP_rot:
{
- struct dwarf_stack_value t1, t2, t3;
-
- if (ctx->stack_len < 3)
+ if (stack.size () < 3)
error (_("Not enough elements for "
- "DW_OP_rot. Need 3, have %d."),
- ctx->stack_len);
- t1 = ctx->stack[ctx->stack_len - 1];
- t2 = ctx->stack[ctx->stack_len - 2];
- t3 = ctx->stack[ctx->stack_len - 3];
- ctx->stack[ctx->stack_len - 1] = t2;
- ctx->stack[ctx->stack_len - 2] = t3;
- ctx->stack[ctx->stack_len - 3] = t1;
+ "DW_OP_rot. Need 3, have %zu."),
+ stack.size ());
+
+ dwarf_stack_value temp = stack[stack.size () - 1];
+ stack[stack.size () - 1] = stack[stack.size () - 2];
+ stack[stack.size () - 2] = stack[stack.size () - 3];
+ stack[stack.size () - 3] = temp;
goto no_push;
}
case DW_OP_deref:
case DW_OP_deref_size:
+ case DW_OP_deref_type:
case DW_OP_GNU_deref_type:
{
- int addr_size = (op == DW_OP_deref ? ctx->addr_size : *op_ptr++);
- gdb_byte *buf = alloca (addr_size);
- CORE_ADDR addr = dwarf_expr_fetch_address (ctx, 0);
+ int addr_size = (op == DW_OP_deref ? this->addr_size : *op_ptr++);
+ gdb_byte *buf = (gdb_byte *) alloca (addr_size);
+ CORE_ADDR addr = fetch_address (0);
struct type *type;
- dwarf_expr_pop (ctx);
+ pop ();
- if (op == DW_OP_GNU_deref_type)
+ if (op == DW_OP_deref_type || op == DW_OP_GNU_deref_type)
{
- ULONGEST type_die;
-
- op_ptr = read_uleb128 (op_ptr, op_end, &type_die);
- type = dwarf_get_base_type (ctx, type_die, 0);
+ op_ptr = safe_read_uleb128 (op_ptr, op_end, &uoffset);
+ cu_offset type_die_cu_off = (cu_offset) uoffset;
+ type = get_base_type (type_die_cu_off, 0);
}
else
type = address_type;
- (ctx->read_mem) (ctx->baton, buf, addr, addr_size);
+ this->read_mem (buf, addr, addr_size);
/* If the size of the object read from memory is different
from the type length, we need to zero-extend it. */
if (TYPE_LENGTH (type) != addr_size)
{
- ULONGEST result =
+ ULONGEST datum =
extract_unsigned_integer (buf, addr_size, byte_order);
- buf = alloca (TYPE_LENGTH (type));
+ buf = (gdb_byte *) alloca (TYPE_LENGTH (type));
store_unsigned_integer (buf, TYPE_LENGTH (type),
- byte_order, result);
+ byte_order, datum);
}
result_val = value_from_contents_and_address (type, buf, addr);
case DW_OP_plus_uconst:
{
/* Unary operations. */
- result_val = dwarf_expr_fetch (ctx, 0);
- dwarf_expr_pop (ctx);
+ result_val = fetch (0);
+ pop ();
switch (op)
{
case DW_OP_plus_uconst:
dwarf_require_integral (value_type (result_val));
result = value_as_long (result_val);
- op_ptr = read_uleb128 (op_ptr, op_end, ®);
+ op_ptr = safe_read_uleb128 (op_ptr, op_end, ®);
result += reg;
result_val = value_from_ulongest (address_type, result);
break;
/* Binary operations. */
struct value *first, *second;
- second = dwarf_expr_fetch (ctx, 0);
- dwarf_expr_pop (ctx);
+ second = fetch (0);
+ pop ();
- first = dwarf_expr_fetch (ctx, 0);
- dwarf_expr_pop (ctx);
+ first = fetch (0);
+ pop ();
if (! base_types_equal_p (value_type (first), value_type (second)))
error (_("Incompatible types on DWARF stack"));
if (orig_type == address_type)
{
struct type *utype
- = get_unsigned_type (ctx->gdbarch, orig_type);
+ = get_unsigned_type (this->gdbarch, orig_type);
cast_back = 1;
first = value_cast (utype, first);
if (!TYPE_UNSIGNED (value_type (first)))
{
struct type *utype
- = get_unsigned_type (ctx->gdbarch, value_type (first));
+ = get_unsigned_type (this->gdbarch, value_type (first));
first = value_cast (utype, first);
}
if (TYPE_UNSIGNED (value_type (first)))
{
struct type *stype
- = get_signed_type (ctx->gdbarch, value_type (first));
+ = get_signed_type (this->gdbarch, value_type (first));
first = value_cast (stype, first);
}
break;
case DW_OP_call_frame_cfa:
- result = (ctx->get_frame_cfa) (ctx->baton);
+ result = this->get_frame_cfa ();
result_val = value_from_ulongest (address_type, result);
- in_stack_memory = 1;
+ in_stack_memory = true;
break;
case DW_OP_GNU_push_tls_address:
+ case DW_OP_form_tls_address:
/* Variable is at a constant offset in the thread-local
storage block into the objfile for the current thread and
the dynamic linker module containing this expression. Here
control block at which the variable is located. Nothing
should follow this operator, so the top of stack would be
returned. */
- result = value_as_long (dwarf_expr_fetch (ctx, 0));
- dwarf_expr_pop (ctx);
- result = (ctx->get_tls_address) (ctx->baton, result);
+ result = value_as_long (fetch (0));
+ pop ();
+ result = this->get_tls_address (result);
result_val = value_from_ulongest (address_type, result);
break;
offset = extract_signed_integer (op_ptr, 2, byte_order);
op_ptr += 2;
- val = dwarf_expr_fetch (ctx, 0);
+ val = fetch (0);
dwarf_require_integral (value_type (val));
if (value_as_long (val) != 0)
op_ptr += offset;
- dwarf_expr_pop (ctx);
+ pop ();
}
goto no_push;
case DW_OP_piece:
{
- ULONGEST size;
+ uint64_t size;
/* Record the piece. */
- op_ptr = read_uleb128 (op_ptr, op_end, &size);
- add_piece (ctx, 8 * size, 0);
+ op_ptr = safe_read_uleb128 (op_ptr, op_end, &size);
+ add_piece (8 * size, 0);
/* Pop off the address/regnum, and reset the location
type. */
- if (ctx->location != DWARF_VALUE_LITERAL
- && ctx->location != DWARF_VALUE_OPTIMIZED_OUT)
- dwarf_expr_pop (ctx);
- ctx->location = DWARF_VALUE_MEMORY;
+ if (this->location != DWARF_VALUE_LITERAL
+ && this->location != DWARF_VALUE_OPTIMIZED_OUT)
+ pop ();
+ this->location = DWARF_VALUE_MEMORY;
}
goto no_push;
case DW_OP_bit_piece:
{
- ULONGEST size, offset;
+ uint64_t size, uleb_offset;
/* Record the piece. */
- op_ptr = read_uleb128 (op_ptr, op_end, &size);
- op_ptr = read_uleb128 (op_ptr, op_end, &offset);
- add_piece (ctx, size, offset);
+ op_ptr = safe_read_uleb128 (op_ptr, op_end, &size);
+ op_ptr = safe_read_uleb128 (op_ptr, op_end, &uleb_offset);
+ add_piece (size, uleb_offset);
/* Pop off the address/regnum, and reset the location
type. */
- if (ctx->location != DWARF_VALUE_LITERAL
- && ctx->location != DWARF_VALUE_OPTIMIZED_OUT)
- dwarf_expr_pop (ctx);
- ctx->location = DWARF_VALUE_MEMORY;
+ if (this->location != DWARF_VALUE_LITERAL
+ && this->location != DWARF_VALUE_OPTIMIZED_OUT)
+ pop ();
+ this->location = DWARF_VALUE_MEMORY;
}
goto no_push;
error (_("DWARF-2 expression error: DW_OP_GNU_uninit must always "
"be the very last op."));
- ctx->initialized = 0;
+ this->initialized = 0;
goto no_push;
case DW_OP_call2:
- result = extract_unsigned_integer (op_ptr, 2, byte_order);
- op_ptr += 2;
- ctx->dwarf_call (ctx, result);
+ {
+ cu_offset cu_off
+ = (cu_offset) extract_unsigned_integer (op_ptr, 2, byte_order);
+ op_ptr += 2;
+ this->dwarf_call (cu_off);
+ }
goto no_push;
case DW_OP_call4:
- result = extract_unsigned_integer (op_ptr, 4, byte_order);
- op_ptr += 4;
- ctx->dwarf_call (ctx, result);
+ {
+ cu_offset cu_off
+ = (cu_offset) extract_unsigned_integer (op_ptr, 4, byte_order);
+ op_ptr += 4;
+ this->dwarf_call (cu_off);
+ }
goto no_push;
+
+ case DW_OP_GNU_variable_value:
+ {
+ sect_offset sect_off
+ = (sect_offset) extract_unsigned_integer (op_ptr,
+ this->ref_addr_size,
+ byte_order);
+ op_ptr += this->ref_addr_size;
+ result_val = this->dwarf_variable_value (sect_off);
+ }
+ break;
+ case DW_OP_entry_value:
case DW_OP_GNU_entry_value:
- /* This operation is not yet supported by GDB. */
- ctx->location = DWARF_VALUE_OPTIMIZED_OUT;
- ctx->stack_len = 0;
- ctx->num_pieces = 0;
- goto abort_expression;
+ {
+ uint64_t len;
+ CORE_ADDR deref_size;
+ union call_site_parameter_u kind_u;
+
+ op_ptr = safe_read_uleb128 (op_ptr, op_end, &len);
+ if (op_ptr + len > op_end)
+ error (_("DW_OP_entry_value: too few bytes available."));
+
+ kind_u.dwarf_reg = dwarf_block_to_dwarf_reg (op_ptr, op_ptr + len);
+ if (kind_u.dwarf_reg != -1)
+ {
+ op_ptr += len;
+ this->push_dwarf_reg_entry_value (CALL_SITE_PARAMETER_DWARF_REG,
+ kind_u,
+ -1 /* deref_size */);
+ goto no_push;
+ }
+
+ kind_u.dwarf_reg = dwarf_block_to_dwarf_reg_deref (op_ptr,
+ op_ptr + len,
+ &deref_size);
+ if (kind_u.dwarf_reg != -1)
+ {
+ if (deref_size == -1)
+ deref_size = this->addr_size;
+ op_ptr += len;
+ this->push_dwarf_reg_entry_value (CALL_SITE_PARAMETER_DWARF_REG,
+ kind_u, deref_size);
+ goto no_push;
+ }
+ error (_("DWARF-2 expression error: DW_OP_entry_value is "
+ "supported only for single DW_OP_reg* "
+ "or for DW_OP_breg*(0)+DW_OP_deref*"));
+ }
+
+ case DW_OP_GNU_parameter_ref:
+ {
+ union call_site_parameter_u kind_u;
+
+ kind_u.param_cu_off
+ = (cu_offset) extract_unsigned_integer (op_ptr, 4, byte_order);
+ op_ptr += 4;
+ this->push_dwarf_reg_entry_value (CALL_SITE_PARAMETER_PARAM_OFFSET,
+ kind_u,
+ -1 /* deref_size */);
+ }
+ goto no_push;
+
+ case DW_OP_const_type:
case DW_OP_GNU_const_type:
{
- ULONGEST type_die;
int n;
const gdb_byte *data;
struct type *type;
- op_ptr = read_uleb128 (op_ptr, op_end, &type_die);
+ op_ptr = safe_read_uleb128 (op_ptr, op_end, &uoffset);
+ cu_offset type_die_cu_off = (cu_offset) uoffset;
+
n = *op_ptr++;
data = op_ptr;
op_ptr += n;
- type = dwarf_get_base_type (ctx, type_die, n);
+ type = get_base_type (type_die_cu_off, n);
result_val = value_from_contents (type, data);
}
break;
+ case DW_OP_regval_type:
case DW_OP_GNU_regval_type:
{
- ULONGEST type_die;
struct type *type;
- op_ptr = read_uleb128 (op_ptr, op_end, ®);
- op_ptr = read_uleb128 (op_ptr, op_end, &type_die);
+ op_ptr = safe_read_uleb128 (op_ptr, op_end, ®);
+ op_ptr = safe_read_uleb128 (op_ptr, op_end, &uoffset);
+ cu_offset type_die_cu_off = (cu_offset) uoffset;
- type = dwarf_get_base_type (ctx, type_die, 0);
- result = (ctx->read_reg) (ctx->baton, reg);
- result_val = value_from_ulongest (type, result);
+ type = get_base_type (type_die_cu_off, 0);
+ result_val = this->get_reg_value (type, reg);
}
break;
+ case DW_OP_convert:
case DW_OP_GNU_convert:
+ case DW_OP_reinterpret:
case DW_OP_GNU_reinterpret:
{
- ULONGEST type_die;
struct type *type;
- op_ptr = read_uleb128 (op_ptr, op_end, &type_die);
+ op_ptr = safe_read_uleb128 (op_ptr, op_end, &uoffset);
+ cu_offset type_die_cu_off = (cu_offset) uoffset;
- if (type_die == 0)
+ if (to_underlying (type_die_cu_off) == 0)
type = address_type;
else
- type = dwarf_get_base_type (ctx, type_die, 0);
+ type = get_base_type (type_die_cu_off, 0);
- result_val = dwarf_expr_fetch (ctx, 0);
- dwarf_expr_pop (ctx);
+ result_val = fetch (0);
+ pop ();
- if (op == DW_OP_GNU_convert)
+ if (op == DW_OP_convert || op == DW_OP_GNU_convert)
result_val = value_cast (type, result_val);
else if (type == value_type (result_val))
{
}
else if (TYPE_LENGTH (type)
!= TYPE_LENGTH (value_type (result_val)))
- error (_("DW_OP_GNU_reinterpret has wrong size"));
+ error (_("DW_OP_reinterpret has wrong size"));
else
result_val
= value_from_contents (type,
}
break;
+ case DW_OP_push_object_address:
+ /* Return the address of the object we are currently observing. */
+ result = this->get_object_address ();
+ result_val = value_from_ulongest (address_type, result);
+ break;
+
default:
error (_("Unhandled dwarf expression opcode 0x%x"), op);
}
/* Most things push a result value. */
gdb_assert (result_val != NULL);
- dwarf_expr_push (ctx, result_val, in_stack_memory);
+ push (result_val, in_stack_memory);
no_push:
;
}
/* To simplify our main caller, if the result is an implicit
pointer, then make a pieced value. This is ok because we can't
have implicit pointers in contexts where pieces are invalid. */
- if (ctx->location == DWARF_VALUE_IMPLICIT_POINTER)
- add_piece (ctx, 8 * ctx->addr_size, 0);
+ if (this->location == DWARF_VALUE_IMPLICIT_POINTER)
+ add_piece (8 * this->addr_size, 0);
-abort_expression:
- ctx->recursion_depth--;
- gdb_assert (ctx->recursion_depth >= 0);
+ this->recursion_depth--;
+ gdb_assert (this->recursion_depth >= 0);
}
void