OSDN Git Service

2011-07-12 Andrew Haley <aph@redhat.com>
authoraph <aph@138bc75d-0d04-0410-961f-82ee72b054a4>
Tue, 12 Jul 2011 12:56:50 +0000 (12:56 +0000)
committeraph <aph@138bc75d-0d04-0410-961f-82ee72b054a4>
Tue, 12 Jul 2011 12:56:50 +0000 (12:56 +0000)
        * interpret.cc (check_handler): Fix bit rot.
        (breakpoint_at): Likewise.

git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@176200 138bc75d-0d04-0410-961f-82ee72b054a4

libjava/ChangeLog
libjava/interpret.cc

index 4715590..98b72f5 100644 (file)
@@ -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.
 
index 3f690d7..ab28836 100644 (file)
@@ -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
     }