diff options
| author | Keith Seitz <keiths@redhat.com> | 2007-06-15 03:53:52 +0000 |
|---|---|---|
| committer | Keith Seitz <kseitz@gcc.gnu.org> | 2007-06-15 03:53:52 +0000 |
| commit | 7dace0ca518e0561b71691938e5402acf58f641c (patch) | |
| tree | 16c0ed1aafda743e1a3cf2417a076930ebfb39d5 /libjava/defineclass.cc | |
| parent | e89993b3f2085c19cda293fc0476ba2c7da3107d (diff) | |
| download | gcc-7dace0ca518e0561b71691938e5402acf58f641c.zip gcc-7dace0ca518e0561b71691938e5402acf58f641c.tar.gz gcc-7dace0ca518e0561b71691938e5402acf58f641c.tar.bz2 | |
java-interp.h (_Jv_LocalVarTableEntry): Add union for bytecode_pc and direct-threaded pc.
* include/java-interp.h (_Jv_LocalVarTableEntry): Add union
for bytecode_pc and direct-threaded pc.
Add field descriptions inline.
* defineclass.cc (read_one_code_attribute): Change from
bytecode_start_pc to bytecode_pc.
Remove unused variable "len".
* interpret.cc (compile): Remap the variable table, too.
(get_local_var_table) [DIRECT_THREADED]: Use insn_index on the
start location to map from pc_t to code index.
From-SVN: r125734
Diffstat (limited to 'libjava/defineclass.cc')
| -rw-r--r-- | libjava/defineclass.cc | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/libjava/defineclass.cc b/libjava/defineclass.cc index 0f0da77..2024fb6 100644 --- a/libjava/defineclass.cc +++ b/libjava/defineclass.cc @@ -1009,11 +1009,10 @@ void _Jv_ClassReader::read_one_code_attribute (int method_index) for (int i = 0; i < table_len; i++) { - table[i].bytecode_start_pc = read2u (); + table[i].bytecode_pc = read2u (); table[i].length = read2u (); - int len; - len = pool_Utf8_to_char_arr (read2u (), &table[i].name); - len = pool_Utf8_to_char_arr (read2u (), &table[i].descriptor); + pool_Utf8_to_char_arr (read2u (), &table[i].name); + pool_Utf8_to_char_arr (read2u (), &table[i].descriptor); table[i].slot = read2u (); if (table[i].slot > method->max_locals || table[i].slot < 0) |