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
This commit is contained in:
Keith Seitz 2007-06-15 03:53:52 +00:00 committed by Keith Seitz
parent e89993b3f2
commit 7dace0ca51
4 changed files with 56 additions and 13 deletions

View file

@ -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)