diff options
| -rw-r--r-- | libjava/ChangeLog | 5 | ||||
| -rw-r--r-- | libjava/interpret.cc | 4 |
2 files changed, 7 insertions, 2 deletions
diff --git a/libjava/ChangeLog b/libjava/ChangeLog index 4715590d9e7..98b72f501fe 100644 --- a/libjava/ChangeLog +++ b/libjava/ChangeLog @@ -1,5 +1,10 @@ 2011-07-12 Andrew Haley <aph@redhat.com> + * interpret.cc (check_handler): Fix bit rot. + (breakpoint_at): Likewise. + +2011-07-12 Andrew Haley <aph@redhat.com> + * java/lang/natClass.cc (finalize): Make sure that the class really has an engine. diff --git a/libjava/interpret.cc b/libjava/interpret.cc index 3f690d7b27c..ab28836293e 100644 --- a/libjava/interpret.cc +++ b/libjava/interpret.cc @@ -1474,7 +1474,7 @@ _Jv_InterpMethod::check_handler (pc_t *pc, _Jv_InterpMethod *meth, if (exc[i].handler_type.i != 0) handler = (_Jv_Linker::resolve_pool_entry (meth->defining_class, - ex$ + exc[i].handler_type.i)).clazz; #endif /* DIRECT_THREADED */ if (handler == NULL || handler->isAssignableFrom (exc_class)) { @@ -1626,7 +1626,7 @@ _Jv_InterpMethod::breakpoint_at (jlong index) return (insn->insn == breakpoint_insn->insn); #else pc_t code = reinterpret_cast<pc_t> (bytecode ()); - return (code[index] == breakpoint_insn); + return (code[index] == bp_insn_opcode); #endif } |