diff options
| author | Per Bothner <per@bothner.com> | 2005-06-13 12:30:47 -0700 |
|---|---|---|
| committer | Per Bothner <bothner@gcc.gnu.org> | 2005-06-13 12:30:47 -0700 |
| commit | 885beb81abe41d740e709e42f1d288910bfd1c73 (patch) | |
| tree | 381fbfa6314b752218f977d1bb3a01148c26892e /gcc/java/expr.c | |
| parent | a1b6a5910bb7a4db753e0cbc28e4c9496e40fc13 (diff) | |
| download | gcc-885beb81abe41d740e709e42f1d288910bfd1c73.zip gcc-885beb81abe41d740e709e42f1d288910bfd1c73.tar.gz gcc-885beb81abe41d740e709e42f1d288910bfd1c73.tar.bz2 | |
expr.c (int highest_label_pc_this_method, [...]): New globals.
* expr.c (int highest_label_pc_this_method,
start_label_pc_this_method): New globals.
(lookup_label): Add start_label_pc_this_method to pc for label, and
update highest_label_pc_this_method. This prevents conflicts between
labels from different methods.
* java-tree.h: Declare new globals.
* jcf-parse.c (parse_class_file): If needed bump
start_label_pc_this_method and reset highest_label_pc_this_method.
From-SVN: r100896
Diffstat (limited to 'gcc/java/expr.c')
| -rw-r--r-- | gcc/java/expr.c | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/gcc/java/expr.c b/gcc/java/expr.c index b488471..90f8ff4 100644 --- a/gcc/java/expr.c +++ b/gcc/java/expr.c @@ -138,6 +138,12 @@ int stack_pointer; const unsigned char *linenumber_table; int linenumber_count; +/* Largest pc so far in this method that has been passed to lookup_label. */ +int highest_label_pc_this_method = -1; + +/* Base value for this method to add to pc to get generated label. */ +int start_label_pc_this_method = 0; + void init_expr_processing (void) { @@ -1766,7 +1772,9 @@ lookup_label (int pc) { tree name; char buf[32]; - ASM_GENERATE_INTERNAL_LABEL(buf, "LJpc=", pc); + if (pc > highest_label_pc_this_method) + highest_label_pc_this_method = pc; + ASM_GENERATE_INTERNAL_LABEL(buf, "LJpc=", start_label_pc_this_method + pc); name = get_identifier (buf); if (IDENTIFIER_LOCAL_VALUE (name)) return IDENTIFIER_LOCAL_VALUE (name); |