diff options
| author | Keith Seitz <keiths@redhat.com> | 2006-09-30 19:20:16 +0000 |
|---|---|---|
| committer | Keith Seitz <kseitz@gcc.gnu.org> | 2006-09-30 19:20:16 +0000 |
| commit | 19add4f7e416da5706eb0e0a0cbbd980a74f4b86 (patch) | |
| tree | b484dd0bd0295d212071fc7b2fc86b6422a1732f /libjava/interpret-run.cc | |
| parent | 05c1e3a7a94397c4ce9ef29cefec2eeebc2cdb53 (diff) | |
| download | gcc-19add4f7e416da5706eb0e0a0cbbd980a74f4b86.zip gcc-19add4f7e416da5706eb0e0a0cbbd980a74f4b86.tar.gz gcc-19add4f7e416da5706eb0e0a0cbbd980a74f4b86.tar.bz2 | |
java-interp.h (prepared): Change type to pc_t.
* include/java-interp.h (prepared): Change type to pc_t.
(insn_index): Define for both DIRECT_THREADED and bytecode interpreters.
* interpret.cc [!DIRECT_THREADED] (POKEI): Fix typo.
(insn_index): Implement for bytecode interpreter.
* interpret-run.cc [!DIRECT_THREADED] (AVAL1U): Add _Jv_Linker class
qualifier to resolve_pool_entry.
[!DIRECT_THREADED] (AVAL2U): Likewise.
[!DIRECT_THREADED] bytecode() cannot be called without an object.
Changed all typos.
[!DIRECT_THREADED] Likewise for defining_class.
From-SVN: r117333
Diffstat (limited to 'libjava/interpret-run.cc')
| -rw-r--r-- | libjava/interpret-run.cc | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/libjava/interpret-run.cc b/libjava/interpret-run.cc index ee9fcad..afabad2 100644 --- a/libjava/interpret-run.cc +++ b/libjava/interpret-run.cc @@ -291,10 +291,10 @@ details. */ // class'. #define AVAL1U() \ ({ int index = get1u (pc++); \ - resolve_pool_entry (meth->defining_class, index).o; }) + _Jv_Linker::resolve_pool_entry (meth->defining_class, index).o; }) #define AVAL2U() \ ({ int index = get2u (pc); pc += 2; \ - resolve_pool_entry (meth->defining_class, index).o; }) + _Jv_Linker::resolve_pool_entry (meth->defining_class, index).o; }) // Note that we don't need to resolve the pool entry here as class // constants are never wide. #define AVAL2UP() ({ int index = get2u (pc); pc += 2; &pool_data[index]; }) @@ -303,7 +303,7 @@ details. */ #define PCVAL(unionval) unionval.i #define AMPAMP(label) NULL - pc = bytecode (); + pc = meth->bytecode (); #endif /* DIRECT_THREADED */ @@ -1545,7 +1545,7 @@ details. */ pc_t base_pc = pc - 1; int index = POPI (); - pc_t base = (pc_t) bytecode (); + pc_t base = (pc_t) meth->bytecode (); while ((pc - base) % 4 != 0) ++pc; @@ -1601,7 +1601,7 @@ details. */ unsigned char *base_pc = pc-1; int index = POPI(); - unsigned char* base = bytecode (); + unsigned char* base = meth->bytecode (); while ((pc-base) % 4 != 0) ++pc; @@ -2469,7 +2469,7 @@ details. */ #ifdef DIRECT_THREADED void *logical_pc = (void *) ((insn_slot *) pc - 1); #else - int logical_pc = pc - 1 - bytecode (); + int logical_pc = pc - 1 - meth->bytecode (); #endif _Jv_InterpException *exc = meth->exceptions (); jclass exc_class = ex->getClass (); @@ -2484,8 +2484,8 @@ details. */ #else jclass handler = NULL; if (exc[i].handler_type.i != 0) - handler = (_Jv_Linker::resolve_pool_entry (defining_class, - exc[i].handler_type.i)).clazz; + handler = (_Jv_Linker::resolve_pool_entry (meth->defining_class, + exc[i].handler_type.i)).clazz; #endif /* DIRECT_THREADED */ if (handler == NULL || handler->isAssignableFrom (exc_class)) @@ -2494,7 +2494,7 @@ details. */ #ifdef DIRECT_THREADED pc = (insn_slot *) exc[i].handler_pc.p; #else - pc = bytecode () + exc[i].handler_pc.i; + pc = meth->bytecode () + exc[i].handler_pc.i; #endif /* DIRECT_THREADED */ sp = stack; sp++->o = ex; // Push exception. |