harmony-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ge...@apache.org
Subject svn commit: r449246 - /incubator/harmony/enhanced/drlvm/trunk/vm/interpreter/src/interpreter.cpp
Date Sat, 23 Sep 2006 14:10:06 GMT
Author: geirm
Date: Sat Sep 23 07:10:05 2006
New Revision: 449246

URL: http://svn.apache.org/viewvc?view=rev&rev=449246
Log:
HARMONY-1553

M2N_FREE_MACRO is missing before the return statement in interpreter() - leads to stalled
memory references
Pop frame handles should be called again after single step event handler.

Ubuntu 6 - smoke, c-unit


Modified:
    incubator/harmony/enhanced/drlvm/trunk/vm/interpreter/src/interpreter.cpp

Modified: incubator/harmony/enhanced/drlvm/trunk/vm/interpreter/src/interpreter.cpp
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/drlvm/trunk/vm/interpreter/src/interpreter.cpp?view=diff&rev=449246&r1=449245&r2=449246
==============================================================================
--- incubator/harmony/enhanced/drlvm/trunk/vm/interpreter/src/interpreter.cpp (original)
+++ incubator/harmony/enhanced/drlvm/trunk/vm/interpreter/src/interpreter.cpp Sat Sep 23 07:10:05
2006
@@ -2563,6 +2563,7 @@
                     vm_monitor_exit_wrapper(ml->monitor);
                     ml = ml->next;
                 }
+                M2N_FREE_MACRO;
                 return;
             }
             if (!breakpoint_processed &&
@@ -2570,6 +2571,15 @@
                     & INTERPRETER_TI_SINGLE_STEP_EVENT) {
                 breakpoint_processed = false;
                 single_step_callback(frame);
+            }
+            if (frame.jvmti_pop_frame == POP_FRAME_NOW) {
+                MonitorList *ml = frame.locked_monitors;
+                while(ml) {
+                    vm_monitor_exit_wrapper(ml->monitor);
+                    ml = ml->next;
+                }
+                M2N_FREE_MACRO;
+                return;
             }
             //assert(!exn_raised());
             if (get_thread_ptr()->p_exception_object_ti || exn_raised()) {



Mime
View raw message