harmony-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ge...@apache.org
Subject svn commit: r447025 - in /incubator/harmony/enhanced/drlvm/trunk/vm: interpreter/src/interpreter.cpp vmcore/include/version_svn_tag.h vmcore/src/jvmti/jvmti_capability.cpp
Date Sun, 17 Sep 2006 09:28:14 GMT
Author: geirm
Date: Sun Sep 17 02:28:13 2006
New Revision: 447025

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

This patch handles exception processing rosen inside safe_points.
This functionality is the part of Thread.stop() implementation.

Also jvmti capability to turn on "can_signal_thread" during live phase
was switched on.

Tested on ubuntu - smoke, c-unit


Modified:
    incubator/harmony/enhanced/drlvm/trunk/vm/interpreter/src/interpreter.cpp
    incubator/harmony/enhanced/drlvm/trunk/vm/vmcore/include/version_svn_tag.h
    incubator/harmony/enhanced/drlvm/trunk/vm/vmcore/src/jvmti/jvmti_capability.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=447025&r1=447024&r2=447025
==============================================================================
--- incubator/harmony/enhanced/drlvm/trunk/vm/interpreter/src/interpreter.cpp (original)
+++ incubator/harmony/enhanced/drlvm/trunk/vm/interpreter/src/interpreter.cpp Sun Sep 17 02:28:13
2006
@@ -2567,8 +2567,8 @@
                     & INTERPRETER_TI_SINGLE_STEP_EVENT) {
                 single_step_callback(frame);
             }
-            assert(!exn_raised());
-            if (get_thread_ptr()->p_exception_object_ti) {
+            //assert(!exn_raised());
+            if (get_thread_ptr()->p_exception_object_ti || exn_raised()) {
                 frame.exc = get_current_thread_exception();
                 goto got_exception;
             }

Modified: incubator/harmony/enhanced/drlvm/trunk/vm/vmcore/include/version_svn_tag.h
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/drlvm/trunk/vm/vmcore/include/version_svn_tag.h?view=diff&rev=447025&r1=447024&r2=447025
==============================================================================
--- incubator/harmony/enhanced/drlvm/trunk/vm/vmcore/include/version_svn_tag.h (original)
+++ incubator/harmony/enhanced/drlvm/trunk/vm/vmcore/include/version_svn_tag.h Sun Sep 17
02:28:13 2006
@@ -17,6 +17,6 @@
 #ifndef _VERSION_SVN_TAG_
 #define _VERSION_SVN_TAG_
 
-#define VERSION_SVN_TAG  "446666"
+#define VERSION_SVN_TAG  "447024"
 
 #endif // _VERSION_SVN_TAG_

Modified: incubator/harmony/enhanced/drlvm/trunk/vm/vmcore/src/jvmti/jvmti_capability.cpp
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/drlvm/trunk/vm/vmcore/src/jvmti/jvmti_capability.cpp?view=diff&rev=447025&r1=447024&r2=447025
==============================================================================
--- incubator/harmony/enhanced/drlvm/trunk/vm/vmcore/src/jvmti/jvmti_capability.cpp (original)
+++ incubator/harmony/enhanced/drlvm/trunk/vm/vmcore/src/jvmti/jvmti_capability.cpp Sun Sep
17 02:28:13 2006
@@ -116,7 +116,7 @@
     1, // can_get_monitor_info
     0, // can_pop_frame
     0, // can_redefine_classes
-    0, // can_signal_thread
+    1, // can_signal_thread
     1, // can_get_source_file_name
     1, // can_get_line_numbers
     1, // can_get_source_debug_extension



Mime
View raw message