Commit b46a23dd by Andrew Haley Committed by Andrew Haley

interpret.cc (check_handler): Fix bit rot.

2011-07-12  Andrew Haley  <aph@redhat.com>

        * interpret.cc (check_handler): Fix bit rot.
        (breakpoint_at): Likewise.

From-SVN: r176200
parent 2558c605
2011-07-12 Andrew Haley <aph@redhat.com> 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 * java/lang/natClass.cc (finalize): Make sure that the class
really has an engine. really has an engine.
......
...@@ -1474,7 +1474,7 @@ _Jv_InterpMethod::check_handler (pc_t *pc, _Jv_InterpMethod *meth, ...@@ -1474,7 +1474,7 @@ _Jv_InterpMethod::check_handler (pc_t *pc, _Jv_InterpMethod *meth,
if (exc[i].handler_type.i != 0) if (exc[i].handler_type.i != 0)
handler handler
= (_Jv_Linker::resolve_pool_entry (meth->defining_class, = (_Jv_Linker::resolve_pool_entry (meth->defining_class,
ex$ exc[i].handler_type.i)).clazz;
#endif /* DIRECT_THREADED */ #endif /* DIRECT_THREADED */
if (handler == NULL || handler->isAssignableFrom (exc_class)) if (handler == NULL || handler->isAssignableFrom (exc_class))
{ {
...@@ -1626,7 +1626,7 @@ _Jv_InterpMethod::breakpoint_at (jlong index) ...@@ -1626,7 +1626,7 @@ _Jv_InterpMethod::breakpoint_at (jlong index)
return (insn->insn == breakpoint_insn->insn); return (insn->insn == breakpoint_insn->insn);
#else #else
pc_t code = reinterpret_cast<pc_t> (bytecode ()); pc_t code = reinterpret_cast<pc_t> (bytecode ());
return (code[index] == breakpoint_insn); return (code[index] == bp_insn_opcode);
#endif #endif
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment