diff options
| -rw-r--r-- | dwflpp.cxx | 3 | ||||
| -rw-r--r-- | loc2c-test.c | 7 | ||||
| -rw-r--r-- | loc2c.c | 19 | ||||
| -rw-r--r-- | loc2c.h | 3 |
4 files changed, 23 insertions, 9 deletions
@@ -2182,7 +2182,8 @@ dwflpp::express_as_string (string prelude, fprintf(memstream, "{\n"); fprintf(memstream, "%s", prelude.c_str()); - bool deref = c_emit_location (memstream, head, 1); + unsigned int stack_depth; + bool deref = c_emit_location (memstream, head, 1, &stack_depth); fprintf(memstream, "%s", postlude.c_str()); fprintf(memstream, " goto out;\n"); diff --git a/loc2c-test.c b/loc2c-test.c index 17edf1a8..9d4973ed 100644 --- a/loc2c-test.c +++ b/loc2c-test.c @@ -337,11 +337,14 @@ handle_variable (Dwarf_Die *lscopes, int lnscopes, int out, "{\n" " intptr_t value;"); - bool deref = c_emit_location (stdout, head, 1); + unsigned int stack_depth; + bool deref = c_emit_location (stdout, head, 1, &stack_depth); obstack_free (&pool, NULL); - puts (store ? " return;" : + printf (" /* max expression stack depth %u */\n", stack_depth); + + puts (store ? " return;" : " printk (\" ---> %ld\\n\", (unsigned long) value);\n" " return;"); @@ -2187,7 +2187,8 @@ emit_loc_address (FILE *out, struct location *loc, unsigned int indent, assign it to an address-sized value. */ static void emit_loc_value (FILE *out, struct location *loc, unsigned int indent, - const char *target, bool declare) + const char *target, bool declare, + bool *used_deref, unsigned int *max_stack) { if (declare) emit ("%*s%s %s;\n", indent * 2, "", STACK_TYPE, target); @@ -2207,6 +2208,9 @@ emit_loc_value (FILE *out, struct location *loc, unsigned int indent, case loc_address: case loc_value: emit_loc_address (out, loc, indent, target); + *used_deref = *used_deref || loc->address.used_deref; + if (loc->address.stack_depth > *max_stack) + *max_stack = loc->address.stack_depth; break; } @@ -2214,7 +2218,8 @@ emit_loc_value (FILE *out, struct location *loc, unsigned int indent, } bool -c_emit_location (FILE *out, struct location *loc, int indent) +c_emit_location (FILE *out, struct location *loc, int indent, + unsigned int *max_stack) { emit ("%*s{\n", indent * 2, ""); @@ -2250,9 +2255,11 @@ c_emit_location (FILE *out, struct location *loc, int indent) } bool deref = false; + *max_stack = 0; if (loc->frame_base != NULL) - emit_loc_value (out, loc->frame_base, indent, "frame_base", true); + emit_loc_value (out, loc->frame_base, indent, "frame_base", true, + &deref, max_stack); for (; loc->next != NULL; loc = loc->next) switch (loc->type) @@ -2260,8 +2267,7 @@ c_emit_location (FILE *out, struct location *loc, int indent) case loc_address: case loc_value: /* Emit the program fragment to calculate the address. */ - emit_loc_value (out, loc, indent + 1, "addr", false); - deref = deref || loc->address.used_deref; + emit_loc_value (out, loc, indent + 1, "addr", false, &deref, max_stack); break; case loc_fragment: @@ -2288,6 +2294,9 @@ c_emit_location (FILE *out, struct location *loc, int indent) emit ("%s%*s}\n", loc->address.program, indent * 2, ""); + if (loc->address.stack_depth > *max_stack) + *max_stack = loc->address.stack_depth; + return deref || loc->address.used_deref; } @@ -126,6 +126,7 @@ struct location *c_translate_argument (struct obstack *, Writes complete lines of C99, code forming a complete C block, to STREAM. Return value is true iff that code uses the `deref' runtime macros. */ -bool c_emit_location (FILE *stream, struct location *loc, int indent); +bool c_emit_location (FILE *stream, struct location *loc, int indent, + unsigned int *max_stack); /* vim: set sw=2 ts=8 cino=>4,n-2,{2,^-2,t0,(0,u0,w1,M1 : */ |