harmony-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From var...@apache.org
Subject svn commit: r649083 [3/3] - in /harmony/enhanced/drlvm/trunk/vm: em/src/ gc_gen/src/common/ gc_gen/src/jni/ include/ include/open/ interpreter/src/ jitrino/src/codegenerator/ia32/ jitrino/src/jet/ jitrino/src/optimizer/ jitrino/src/vm/ vmcore/build/ vm...
Date Thu, 17 Apr 2008 13:10:32 GMT
Modified: harmony/enhanced/drlvm/trunk/vm/vmcore/src/reflection/reflection.cpp
URL: http://svn.apache.org/viewvc/harmony/enhanced/drlvm/trunk/vm/vmcore/src/reflection/reflection.cpp?rev=649083&r1=649082&r2=649083&view=diff
==============================================================================
--- harmony/enhanced/drlvm/trunk/vm/vmcore/src/reflection/reflection.cpp (original)
+++ harmony/enhanced/drlvm/trunk/vm/vmcore/src/reflection/reflection.cpp Thu Apr 17 06:10:05
2008
@@ -34,6 +34,7 @@
 #include "open/vm_type_access.h"
 #include "open/vm_field_access.h"
 #include "open/vm_method_access.h"
+#include "open/vm_class_info.h"
 
 #include "exceptions.h"
 #include "heap.h"

Modified: harmony/enhanced/drlvm/trunk/vm/vmcore/src/stack/stack_trace.cpp
URL: http://svn.apache.org/viewvc/harmony/enhanced/drlvm/trunk/vm/vmcore/src/stack/stack_trace.cpp?rev=649083&r1=649082&r2=649083&view=diff
==============================================================================
--- harmony/enhanced/drlvm/trunk/vm/vmcore/src/stack/stack_trace.cpp (original)
+++ harmony/enhanced/drlvm/trunk/vm/vmcore/src/stack/stack_trace.cpp Thu Apr 17 06:10:05 2008
@@ -22,6 +22,7 @@
 #define LOG_DOMAIN "vm.stack"
 #include "cxxlog.h"
 #include "vm_log.h"
+#include "open/vm_class_info.h"
 
 #include "open/vm_method_access.h"
 #include "m2n.h"

Modified: harmony/enhanced/drlvm/trunk/vm/vmcore/src/thread/thread_manager.cpp
URL: http://svn.apache.org/viewvc/harmony/enhanced/drlvm/trunk/vm/vmcore/src/thread/thread_manager.cpp?rev=649083&r1=649082&r2=649083&view=diff
==============================================================================
--- harmony/enhanced/drlvm/trunk/vm/vmcore/src/thread/thread_manager.cpp (original)
+++ harmony/enhanced/drlvm/trunk/vm/vmcore/src/thread/thread_manager.cpp Thu Apr 17 06:10:05
2008
@@ -39,7 +39,7 @@
 #include "exceptions.h"
 #include "Class.h"
 #include "environment.h"
-
+#include "vtable.h"
 #include "open/vm_util.h"
 #include "nogc.h"
 #include "sync_bits.h"

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?rev=649083&r1=649082&r2=649083&view=diff
==============================================================================
--- 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
Thu Apr 17 06:10:05 2008
@@ -610,13 +610,3 @@
     lil_free_code_stub(cs);
     return addr;
 }
-
-
-Boolean jit_may_inline_object_synchronization(unsigned * UNREF thread_id_register,
-                                              unsigned * UNREF sync_header_offset,
-                                              unsigned * UNREF sync_header_width,
-                                              unsigned * UNREF lock_owner_offset,
-                                              unsigned * UNREF lock_owner_width,
-                                              Boolean  * UNREF jit_clears_ccv) {
-    return FALSE;
-}

Modified: harmony/enhanced/drlvm/trunk/vm/vmcore/src/util/ia32/base/jit_lock_rt_support_ia32.cpp
URL: http://svn.apache.org/viewvc/harmony/enhanced/drlvm/trunk/vm/vmcore/src/util/ia32/base/jit_lock_rt_support_ia32.cpp?rev=649083&r1=649082&r2=649083&view=diff
==============================================================================
--- harmony/enhanced/drlvm/trunk/vm/vmcore/src/util/ia32/base/jit_lock_rt_support_ia32.cpp
(original)
+++ harmony/enhanced/drlvm/trunk/vm/vmcore/src/util/ia32/base/jit_lock_rt_support_ia32.cpp
Thu Apr 17 06:10:05 2008
@@ -410,12 +410,3 @@
     return addr;
 } //getaddress__vm_monitor_exit_static_naked
 
-Boolean jit_may_inline_object_synchronization(unsigned * UNREF thread_id_register,
-                                              unsigned * UNREF sync_header_offset,
-                                              unsigned * UNREF sync_header_width,
-                                              unsigned * UNREF lock_owner_offset,
-                                              unsigned * UNREF lock_owner_width,
-                                              Boolean  * UNREF jit_clears_ccv)
-{
-    return FALSE;
-}

Modified: harmony/enhanced/drlvm/trunk/vm/vmcore/src/util/ia32/base/jit_runtime_support_ia32.cpp
URL: http://svn.apache.org/viewvc/harmony/enhanced/drlvm/trunk/vm/vmcore/src/util/ia32/base/jit_runtime_support_ia32.cpp?rev=649083&r1=649082&r2=649083&view=diff
==============================================================================
--- harmony/enhanced/drlvm/trunk/vm/vmcore/src/util/ia32/base/jit_runtime_support_ia32.cpp
(original)
+++ harmony/enhanced/drlvm/trunk/vm/vmcore/src/util/ia32/base/jit_runtime_support_ia32.cpp
Thu Apr 17 06:10:05 2008
@@ -30,7 +30,7 @@
 #include "open/types.h"
 #include "open/gc.h"
 #include "open/vm_class_manipulation.h"
-
+#include "vtable.h"
 #include "environment.h"
 #include "Class.h"
 #include "object_layout.h"

Modified: harmony/enhanced/drlvm/trunk/vm/vmcore/src/util/ia32/base/optimize_ia32.cpp
URL: http://svn.apache.org/viewvc/harmony/enhanced/drlvm/trunk/vm/vmcore/src/util/ia32/base/optimize_ia32.cpp?rev=649083&r1=649082&r2=649083&view=diff
==============================================================================
--- harmony/enhanced/drlvm/trunk/vm/vmcore/src/util/ia32/base/optimize_ia32.cpp (original)
+++ harmony/enhanced/drlvm/trunk/vm/vmcore/src/util/ia32/base/optimize_ia32.cpp Thu Apr 17
06:10:05 2008
@@ -31,11 +31,12 @@
 #include "cxxlog.h"
 
 #include "open/types.h"
+#include "open/vm_ee.h"
 #include "environment.h"
 #include "encoder.h"
 #include "open/vm_util.h"
 #include "compile.h"
-
+#include "vtable.h"
 // *** This is for readInternal override
 #include "jni_utils.h"
 #include "vm_arrays.h"

Modified: harmony/enhanced/drlvm/trunk/vm/vmcore/src/util/ipf/base/compile_ipf.cpp
URL: http://svn.apache.org/viewvc/harmony/enhanced/drlvm/trunk/vm/vmcore/src/util/ipf/base/compile_ipf.cpp?rev=649083&r1=649082&r2=649083&view=diff
==============================================================================
--- harmony/enhanced/drlvm/trunk/vm/vmcore/src/util/ipf/base/compile_ipf.cpp (original)
+++ harmony/enhanced/drlvm/trunk/vm/vmcore/src/util/ipf/base/compile_ipf.cpp Thu Apr 17 06:10:05
2008
@@ -194,7 +194,7 @@
 
         emitter.ipf_adds(SCRATCH_GENERAL_REG2, (int)offset_allocation_handle, SCRATCH_GENERAL_REG7,
SCRATCH_PRED_REG3);
         emitter.ipf_ld(int_mem_size_8, mem_ld_none, mem_none, SCRATCH_GENERAL_REG3, SCRATCH_GENERAL_REG2,
SCRATCH_PRED_REG3);
-        if (vm_vtable_pointers_are_compressed())
+        if (vm_is_vtable_compressed())
         {
             emitter.ipf_st(int_mem_size_4, mem_st_none, mem_none, RETURN_VALUE_REG,     SCRATCH_GENERAL_REG3,
SCRATCH_PRED_REG3);
         }

Modified: harmony/enhanced/drlvm/trunk/vm/vmcore/src/util/ipf/base/ini_ipf.cpp
URL: http://svn.apache.org/viewvc/harmony/enhanced/drlvm/trunk/vm/vmcore/src/util/ipf/base/ini_ipf.cpp?rev=649083&r1=649082&r2=649083&view=diff
==============================================================================
--- harmony/enhanced/drlvm/trunk/vm/vmcore/src/util/ipf/base/ini_ipf.cpp (original)
+++ harmony/enhanced/drlvm/trunk/vm/vmcore/src/util/ipf/base/ini_ipf.cpp Thu Apr 17 06:10:05
2008
@@ -97,7 +97,7 @@
     emitter.ipf_mov(saved_heap_base, HEAP_BASE_REG);
     emitter.ipf_mov(THREAD_PTR_REG, thread_pointer);
     emitter.ipf_mov(THREAD_ID_REG, thread_id);
-    emit_mov_imm_compactor(emitter, HEAP_BASE_REG, (uint64)vm_heap_base_address());
+    emit_mov_imm_compactor(emitter, HEAP_BASE_REG, (uint64)vm_get_heap_base_address());
 
     /////// begin get args
     // First move int args to stacked registers

Modified: harmony/enhanced/drlvm/trunk/vm/vmcore/src/util/ipf/base/jit_runtime_support_ipf.cpp
URL: http://svn.apache.org/viewvc/harmony/enhanced/drlvm/trunk/vm/vmcore/src/util/ipf/base/jit_runtime_support_ipf.cpp?rev=649083&r1=649082&r2=649083&view=diff
==============================================================================
--- harmony/enhanced/drlvm/trunk/vm/vmcore/src/util/ipf/base/jit_runtime_support_ipf.cpp (original)
+++ harmony/enhanced/drlvm/trunk/vm/vmcore/src/util/ipf/base/jit_runtime_support_ipf.cpp Thu
Apr 17 06:10:05 2008
@@ -679,11 +679,11 @@
     // sc6 = super_class->get_offset_of_depth()
     // sc4 = offset(superclasses) - 8
     emitter.ipf_adds(sc1, offset_is_suitable, super_class);
-    if (vm_vtable_pointers_are_compressed())
+    if (vm_is_vtable_compressed())
     {
         emitter.ipf_ld(int_mem_size_4, mem_ld_none, mem_none, sc3, sub_object);
         emitter.ipf_adds(sc6, offset_depth, super_class);
-        emit_mov_imm_compactor(emitter, sc4, offset_superclasses + vm_get_vtable_base());
+        emit_mov_imm_compactor(emitter, sc4, offset_superclasses + vm_get_vtable_base_address());
     }
     else
     {
@@ -734,7 +734,7 @@
         (void **)p_class_is_subtype,
         out0, save_pfs, save_b0, save_gp);
     // sc3 contains the vtable pointer or the vtable offset
-    emit_mov_imm_compactor(emitter, sc2, (vm_vtable_pointers_are_compressed() ? vm_get_vtable_base()
: 0) + offset_clss);
+    emit_mov_imm_compactor(emitter, sc2, (vm_is_vtable_compressed() ? vm_get_vtable_base_address()
: 0) + offset_clss);
     emitter.ipf_add(sc1, sc2, sc3);
     emitter.ipf_ld(int_mem_size_8, mem_ld_none, mem_none, out0+0, sc1);
     emitter.ipf_mov(out0+1, super_class);
@@ -962,10 +962,10 @@
     VTable *dummy_vtable = NULL;
     const int offset_clss = (int) ((Byte*)&dummy_vtable->clss - (Byte*)dummy_vtable);
 
-    if (vm_vtable_pointers_are_compressed())
+    if (vm_is_vtable_compressed())
     {
         emitter.ipf_ld(int_mem_size_4, mem_ld_none, mem_none, sc5, src);
-        emit_mov_imm_compactor(emitter, sc1, vm_get_vtable_base() + offset_clss);
+        emit_mov_imm_compactor(emitter, sc1, vm_get_vtable_base_address() + offset_clss);
     }
     else
     {
@@ -1117,33 +1117,6 @@
     void *vt = vm_get_interface_vtable(object, clss);
     return vt;
 } //vm_rt_get_interface_vtable
-
-
-
-
-Boolean jit_may_inline_object_synchronization(unsigned *thread_id_register,
-                                              unsigned *sync_header_offset,
-                                              unsigned *sync_header_width,
-                                              unsigned *lock_owner_offset,
-                                              unsigned *lock_owner_width,
-                                              Boolean  *jit_clears_ccv)
-{
-    // FIXME: code outdated
-    assert(0);
-    abort();
-#if 0
-    if (!vm_get_boolean_property_value_with_default("vm.jit_may_inline_sync"))
-         return FALSE;
-
-    *thread_id_register = THREAD_ID_REG;
-    *sync_header_offset = ManagedObject::header_offset();
-    *sync_header_width = 4;
-    *lock_owner_offset = ManagedObject::header_offset() + STACK_KEY_OFFSET;
-    *lock_owner_width = 2;
-    *jit_clears_ccv = jit_clears_ccv_in_monitor_enter();
-    return TRUE;
-#endif
-}
 
 
 

Modified: harmony/enhanced/drlvm/trunk/vm/vmcore/src/util/vm_stats.cpp
URL: http://svn.apache.org/viewvc/harmony/enhanced/drlvm/trunk/vm/vmcore/src/util/vm_stats.cpp?rev=649083&r1=649082&r2=649083&view=diff
==============================================================================
--- harmony/enhanced/drlvm/trunk/vm/vmcore/src/util/vm_stats.cpp (original)
+++ harmony/enhanced/drlvm/trunk/vm/vmcore/src/util/vm_stats.cpp Thu Apr 17 06:10:05 2008
@@ -24,6 +24,7 @@
 #define LOG_DOMAIN "vm.stats"
 #include "cxxlog.h"
 
+#include "vtable.h"
 #include "environment.h"
 #include "open/vm_util.h"
 #include "jit_runtime_support.h"



Mime
View raw message