diff --git a/enhanced/drlvm/trunk/vm/interpreter/src/interp_native_em64t.cpp b/enhanced/drlvm/trunk/vm/interpreter/src/interp_native_em64t.cpp index 79f989e..c56cb93 100644 --- a/enhanced/drlvm/trunk/vm/interpreter/src/interp_native_em64t.cpp +++ b/enhanced/drlvm/trunk/vm/interpreter/src/interp_native_em64t.cpp @@ -75,7 +75,7 @@ interpreter_execute_native_method( assert(!hythread_is_suspend_enabled()); DEBUG_TRACE("\n<<< interpreter_invoke_native: " - << method->get_class()->name->bytes << " " + << method->get_class()->get_name()->bytes << " " << method->get_name()->bytes << method->get_descriptor()->bytes << endl); @@ -102,7 +102,7 @@ interpreter_execute_native_method( jobject _this; if (method->is_static()) { - _this = (jobject) method->get_class()->class_handle; + _this = (jobject) method->get_class()->get_class_handle(); } else { _this = args[pos++].l; } @@ -276,12 +276,12 @@ interpreterInvokeStaticNative(StackFrame } DEBUG_TRACE("\n<<< native_invoke_static : " - << method->get_class()->name->bytes << " " + << method->get_class()->get_name()->bytes << " " << method->get_name()->bytes << method->get_descriptor()->bytes << endl); DEBUG_TRACE_PLAIN("interpreter static native: " - << frame.method->get_class()->name->bytes + << frame.method->get_class()->get_name()->bytes << " " << frame.method->get_name()->bytes << frame.method->get_descriptor()->bytes << endl); @@ -297,7 +297,7 @@ interpreterInvokeStaticNative(StackFrame uword *ints = fps + 8; uword *stacks = ints + 6; - frame.This = *(method->get_class()->class_handle); + frame.This = *(method->get_class()->get_class_handle()); ints[n_ints++] = (uword) get_jni_native_intf(); ints[n_ints++] = (uword) &frame.This; word pos = sz - 1; @@ -441,7 +441,7 @@ interpreterInvokeStaticNative(StackFrame DEBUG2( "VM WARNING: Reference with null value returned from jni function:\n" "VM WARNING: Method name: " - << method->get_class()->name->bytes + << method->get_class()->get_name()->bytes << "/" << method->get_name()->bytes << method->get_descriptor()->bytes << "\nVM WARNING: Not allowed, return NULL (0) instead\n"); @@ -559,12 +559,12 @@ interpreterInvokeVirtualNative(StackFram assert(!method->is_static()); DEBUG_TRACE_PLAIN("interpreter virtual native: " - << frame.method->get_class()->name->bytes + << frame.method->get_class()->get_name()->bytes << " " << frame.method->get_name()->bytes << frame.method->get_descriptor()->bytes << endl); DEBUG_TRACE("\n<<< native_invoke_virtual: " - << method->get_class()->name->bytes << " " + << method->get_class()->get_name()->bytes << " " << method->get_name()->bytes << method->get_descriptor()->bytes << endl); @@ -723,7 +723,7 @@ interpreterInvokeVirtualNative(StackFram DEBUG2( "VM WARNING: Reference with null value returned from jni function:\n" "VM WARNING: Method name: " - << method->get_class()->name->bytes + << method->get_class()->get_name()->bytes << "/" << method->get_name()->bytes << method->get_descriptor()->bytes << "\nVM WARNING: Not allowed, return NULL (0) instead\n"); diff --git a/enhanced/drlvm/trunk/vm/port/src/lil/em64t/pim/stack_iterator_em64t.cpp b/enhanced/drlvm/trunk/vm/port/src/lil/em64t/pim/stack_iterator_em64t.cpp index bd453e4..ca7b6f7 100644 --- a/enhanced/drlvm/trunk/vm/port/src/lil/em64t/pim/stack_iterator_em64t.cpp +++ b/enhanced/drlvm/trunk/vm/port/src/lil/em64t/pim/stack_iterator_em64t.cpp @@ -31,6 +31,7 @@ #include "m2n_em64t_internal.h" #include "nogc.h" #include "interpreter.h" // for ASSERT_NO_INTERPRETER +#include "cci.h" #include "dump.h" #include "vm_stats.h" diff --git a/enhanced/drlvm/trunk/vm/vmcore/src/util/em64t/base/ini_em64t.cpp b/enhanced/drlvm/trunk/vm/vmcore/src/util/em64t/base/ini_em64t.cpp index 85f665a..e123bba 100644 --- a/enhanced/drlvm/trunk/vm/vmcore/src/util/em64t/base/ini_em64t.cpp +++ b/enhanced/drlvm/trunk/vm/vmcore/src/util/em64t/base/ini_em64t.cpp @@ -199,7 +199,7 @@ void JIT_execute_method_default(JIT_Hand int64 arg_num = 0; TRACE2("invoke", "enter method " - << method->get_class()->name->bytes << " " + << method->get_class()->get_name()->bytes << " " << method->get_name()->bytes << " " << method->get_descriptor()); @@ -226,7 +226,7 @@ void JIT_execute_method_default(JIT_Hand // only compressed references are supported yet assert(VM_Global_State::loader_env->compress_references); // convert from native to managed NULL - ref = ref ? ref : (uint64) Class::managed_null; + ref = ref ? ref : (uint64) VM_Global_State::loader_env->managed_null; if (gr_nargs < MAX_GR) { gr_args[gr_nargs++] = ref; } else { @@ -323,7 +323,7 @@ void JIT_execute_method_default(JIT_Hand // only compressed references are supported yet assert(VM_Global_State::loader_env->compress_references); // convert from managed to native NULL - ref = ref != (uint64) Class::managed_null ? ref : (uint64) NULL; + ref = ref != (uint64) VM_Global_State::loader_env->managed_null ? ref : (uint64) NULL; if (ref) { handle = oh_allocate_local_handle(); handle->object = (ManagedObject*) ref; @@ -357,7 +357,7 @@ void JIT_execute_method_default(JIT_Hand STD_FREE(stack_args); TRACE2("invoke", "exit method " - << method->get_class()->name->bytes << " " + << method->get_class()->get_name()->bytes << " " << method->get_name()->bytes << " " << method->get_descriptor()); } diff --git a/enhanced/drlvm/trunk/vm/vmcore/src/util/em64t/base/jit_lock_rt_support_em64t.cpp b/enhanced/drlvm/trunk/vm/vmcore/src/util/em64t/base/jit_lock_rt_support_em64t.cpp index b13c743..e26fdd4 100644 --- a/enhanced/drlvm/trunk/vm/vmcore/src/util/em64t/base/jit_lock_rt_support_em64t.cpp +++ b/enhanced/drlvm/trunk/vm/vmcore/src/util/em64t/base/jit_lock_rt_support_em64t.cpp @@ -124,7 +124,7 @@ NativeCodePtr rth_get_lil_monitor_enter( "jc i0 = %0i:ref, throw_null_pointer;" "locals 1;" "l0 = i0;", - (ManagedObject *) Class::managed_null + (ManagedObject *) VM_Global_State::loader_env->managed_null ); assert(cs); @@ -262,7 +262,7 @@ NativeCodePtr rth_get_lil_monitor_exit() cs = lil_parse_onto_end(cs, "jc i0 = %0i:ref, throw_null_pointer;" "in2out platform:g4;", - (ManagedObject *) Class::managed_null + (ManagedObject *) VM_Global_State::loader_env->managed_null ); assert(cs);