harmony-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From gshiman...@apache.org
Subject svn commit: r494447 - /harmony/enhanced/drlvm/trunk/vm/vmcore/src/util/em64t/base/jit_lock_rt_support_em64t.cpp
Date Tue, 09 Jan 2007 16:05:37 GMT
Author: gshimansky
Date: Tue Jan  9 08:05:36 2007
New Revision: 494447

URL: http://svn.apache.org/viewvc?view=rev&rev=494447
Log:
Applied HARMONY-2917 [drlvm][jvmti][em64t] Incorrect JVMTI monitor exit stub

The patch fixes failed assertion, but if JVMTI agent enables MethodEnter/Exit
capability the test crashes somewhere in JET. This is because JVMTI is not
yet fully implemented for x86_64.


Modified:
    harmony/enhanced/drlvm/trunk/vm/vmcore/src/util/em64t/base/jit_lock_rt_support_em64t.cpp

Modified: harmony/enhanced/drlvm/trunk/vm/vmcore/src/util/em64t/base/jit_lock_rt_support_em64t.cpp
URL: http://svn.apache.org/viewvc/harmony/enhanced/drlvm/trunk/vm/vmcore/src/util/em64t/base/jit_lock_rt_support_em64t.cpp?view=diff&rev=494447&r1=494446&r2=494447
==============================================================================
--- harmony/enhanced/drlvm/trunk/vm/vmcore/src/util/em64t/base/jit_lock_rt_support_em64t.cpp
(original)
+++ harmony/enhanced/drlvm/trunk/vm/vmcore/src/util/em64t/base/jit_lock_rt_support_em64t.cpp
Tue Jan  9 08:05:36 2007
@@ -198,13 +198,16 @@
         lil_npc_to_fp(exn_get_rth_throw_illegal_monitor_state()));
 }else{
     return lil_parse_onto_end(cs,
-        "push_m2n 0, 0;"
+        "locals 1;"
+        "l0 = o0;"
+        "push_m2n 0, %0i;"
         "out platform:ref:void;"
         "o0 = l0;"
-        "call %0i;"
+        "call %1i;"
         "pop_m2n;"
         "ret;",
-        vm_monitor_exit);    
+        FRAME_NON_UNWINDABLE,
+        vm_monitor_exit);
 }
 }
 



Mime
View raw message