Return-Path: Delivered-To: apmail-harmony-commits-archive@www.apache.org Received: (qmail 68090 invoked from network); 13 Mar 2008 12:00:09 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2) by minotaur.apache.org with SMTP; 13 Mar 2008 12:00:09 -0000 Received: (qmail 26095 invoked by uid 500); 13 Mar 2008 12:00:06 -0000 Delivered-To: apmail-harmony-commits-archive@harmony.apache.org Received: (qmail 26081 invoked by uid 500); 13 Mar 2008 12:00:06 -0000 Mailing-List: contact commits-help@harmony.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@harmony.apache.org Delivered-To: mailing list commits@harmony.apache.org Received: (qmail 26072 invoked by uid 99); 13 Mar 2008 12:00:06 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 13 Mar 2008 05:00:06 -0700 X-ASF-Spam-Status: No, hits=-2000.0 required=10.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.3] (HELO eris.apache.org) (140.211.11.3) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 13 Mar 2008 11:59:25 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 020B31A9832; Thu, 13 Mar 2008 04:59:43 -0700 (PDT) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r636735 - in /harmony/enhanced/drlvm/trunk/vm: include/ include/open/ jitrino/src/jet/ vmcore/src/init/ vmcore/src/jit/ vmcore/src/util/em64t/base/ vmcore/src/util/ia32/base/ vmcore/src/util/ipf/base/ Date: Thu, 13 Mar 2008 11:59:39 -0000 To: commits@harmony.apache.org From: varlax@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20080313115944.020B31A9832@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: varlax Date: Thu Mar 13 04:59:35 2008 New Revision: 636735 URL: http://svn.apache.org/viewvc?rev=636735&view=rev Log: Renamed "vm_get_rt_support_addr" => "vm_helper_get_addr" Modified: harmony/enhanced/drlvm/trunk/vm/include/jit_runtime_support.h harmony/enhanced/drlvm/trunk/vm/include/open/rt_helpers.h harmony/enhanced/drlvm/trunk/vm/include/open/vm_class_support.h harmony/enhanced/drlvm/trunk/vm/include/open/vm_interface.h harmony/enhanced/drlvm/trunk/vm/jitrino/src/jet/cg_instr.cpp harmony/enhanced/drlvm/trunk/vm/jitrino/src/jet/compiler.cpp harmony/enhanced/drlvm/trunk/vm/vmcore/src/init/vm_init.cpp harmony/enhanced/drlvm/trunk/vm/vmcore/src/jit/compile.cpp harmony/enhanced/drlvm/trunk/vm/vmcore/src/util/em64t/base/jit_runtime_support_em64t.cpp harmony/enhanced/drlvm/trunk/vm/vmcore/src/util/ia32/base/jit_runtime_support_ia32.cpp harmony/enhanced/drlvm/trunk/vm/vmcore/src/util/ipf/base/jit_runtime_support_ipf.cpp Modified: harmony/enhanced/drlvm/trunk/vm/include/jit_runtime_support.h URL: http://svn.apache.org/viewvc/harmony/enhanced/drlvm/trunk/vm/include/jit_runtime_support.h?rev=636735&r1=636734&r2=636735&view=diff ============================================================================== --- harmony/enhanced/drlvm/trunk/vm/include/jit_runtime_support.h (original) +++ harmony/enhanced/drlvm/trunk/vm/include/jit_runtime_support.h Thu Mar 13 04:59:35 2008 @@ -32,15 +32,15 @@ #endif -DECLARE_OPEN(void *, vm_get_rt_support_addr, (VM_RT_SUPPORT f)); +DECLARE_OPEN(void *, vm_helper_get_addr, (VM_RT_SUPPORT f)); /** * Temporary interface addition - * same as vm_get_rt_support_addr, but tries to optimize the stubs it creates, + * same as vm_helper_get_addr, but tries to optimize the stubs it creates, * by specializing them. */ -DECLARE_OPEN(void *, vm_get_rt_support_addr_optimized, (VM_RT_SUPPORT f, Class_Handle c)); +DECLARE_OPEN(void *, vm_helper_get_addr_optimized, (VM_RT_SUPPORT f, Class_Handle c)); /** * Checks if helper is a suspension point Modified: harmony/enhanced/drlvm/trunk/vm/include/open/rt_helpers.h URL: http://svn.apache.org/viewvc/harmony/enhanced/drlvm/trunk/vm/include/open/rt_helpers.h?rev=636735&r1=636734&r2=636735&view=diff ============================================================================== --- harmony/enhanced/drlvm/trunk/vm/include/open/rt_helpers.h (original) +++ harmony/enhanced/drlvm/trunk/vm/include/open/rt_helpers.h Thu Mar 13 04:59:35 2008 @@ -21,7 +21,7 @@ /** * This is a complete set of functions used by the code generated by the JIT. * The address of a function is obtained from the VM by invoking the - * function vm_get_rt_support_addr (see below). + * function vm_helper_get_addr. * * We should also note which exceptions can be thrown by each * of those function. Modified: harmony/enhanced/drlvm/trunk/vm/include/open/vm_class_support.h URL: http://svn.apache.org/viewvc/harmony/enhanced/drlvm/trunk/vm/include/open/vm_class_support.h?rev=636735&r1=636734&r2=636735&view=diff ============================================================================== --- harmony/enhanced/drlvm/trunk/vm/include/open/vm_class_support.h (original) +++ harmony/enhanced/drlvm/trunk/vm/include/open/vm_class_support.h Thu Mar 13 04:59:35 2008 @@ -73,20 +73,6 @@ void vm_register_jit_extended_class_callback(JIT_Handle jit, Class_Handle clss, void* callback_data); /** - * A set of functions is used by the code generated by the JIT. - * The address of a function is obtained from the VM by invoking the - * function vm_get_rt_support_addr (see below). - */ -void* vm_get_rt_support_addr(VM_RT_SUPPORT f); - -/** - * Temporary interface addition - * same as vm_get_rt_support_addr, but tries to optimize the stubs it creates, - * by specializing them. - */ -void* vm_get_rt_support_addr_optimized(VM_RT_SUPPORT f, Class_Handle c); - -/** * Set the information about an exception handler in the code generated by * the JIT. */ Modified: harmony/enhanced/drlvm/trunk/vm/include/open/vm_interface.h URL: http://svn.apache.org/viewvc/harmony/enhanced/drlvm/trunk/vm/include/open/vm_interface.h?rev=636735&r1=636734&r2=636735&view=diff ============================================================================== --- harmony/enhanced/drlvm/trunk/vm/include/open/vm_interface.h (original) +++ harmony/enhanced/drlvm/trunk/vm/include/open/vm_interface.h Thu Mar 13 04:59:35 2008 @@ -250,10 +250,6 @@ void* compileInfo, Method_Handle outer_method));//compiled_method_load -PROTOTYPE_WITH_NAME(void * , vm_helper_get_addr, (VM_RT_SUPPORT id));//void * vm_get_rt_support_addr(VM_RT_SUPPORT id) -PROTOTYPE_WITH_NAME(void * , vm_helper_get_addr_optimized, (VM_RT_SUPPORT id, Class_Handle ch));//void * vm_get_rt_support_addr_optimized(VM_RT_SUPPORT id, Class_Handle ch) - - /////////////////////////// temporary /////////////////////////// //VTable Modified: harmony/enhanced/drlvm/trunk/vm/jitrino/src/jet/cg_instr.cpp URL: http://svn.apache.org/viewvc/harmony/enhanced/drlvm/trunk/vm/jitrino/src/jet/cg_instr.cpp?rev=636735&r1=636734&r2=636735&view=diff ============================================================================== --- harmony/enhanced/drlvm/trunk/vm/jitrino/src/jet/cg_instr.cpp (original) +++ harmony/enhanced/drlvm/trunk/vm/jitrino/src/jet/cg_instr.cpp Thu Mar 13 04:59:35 2008 @@ -356,7 +356,7 @@ //(object written to, slot written to, value written to slot) static const CallSig wb4c_sig(CCONV_CDECL, jobj, jobj, jobj); //static char* wb4c_helper = xxx_gc_heap_slot_write_ref - static char* wb4c_helper = (char*)vm_get_rt_support_addr(VM_RT_GC_HEAP_WRITE_REF); + static char* wb4c_helper = (char*)vm_helper_get_addr(VM_RT_GC_HEAP_WRITE_REF); if (doGenWB4C && (NULL == wb4c_helper)) { // WB4C requested, but VM knows nothing about such helper Modified: harmony/enhanced/drlvm/trunk/vm/jitrino/src/jet/compiler.cpp URL: http://svn.apache.org/viewvc/harmony/enhanced/drlvm/trunk/vm/jitrino/src/jet/compiler.cpp?rev=636735&r1=636734&r2=636735&view=diff ============================================================================== --- harmony/enhanced/drlvm/trunk/vm/jitrino/src/jet/compiler.cpp (original) +++ harmony/enhanced/drlvm/trunk/vm/jitrino/src/jet/compiler.cpp Thu Mar 13 04:59:35 2008 @@ -1462,11 +1462,11 @@ // Collect addresses of runtime helpers // rt_helper_init_class = - (char*)vm_get_rt_support_addr(VM_RT_INITIALIZE_CLASS); + (char*)vm_helper_get_addr(VM_RT_INITIALIZE_CLASS); rt_helper_ldc_string = - (char*)vm_get_rt_support_addr(VM_RT_LDC_STRING); + (char*)vm_helper_get_addr(VM_RT_LDC_STRING); rt_helper_new = - (char*)vm_get_rt_support_addr(VM_RT_NEW_RESOLVED_USING_VTABLE_AND_SIZE); + (char*)vm_helper_get_addr(VM_RT_NEW_RESOLVED_USING_VTABLE_AND_SIZE); g_refs_squeeze = vm_references_are_compressed(); g_vtbl_squeeze = vm_vtable_pointers_are_compressed(); @@ -1477,79 +1477,79 @@ g_jvmtiMode = (bool)get_boolean_property("vm.jvmti.enabled", false, VM_PROPERTIES); rt_helper_monitor_enter = - (char*)vm_get_rt_support_addr(VM_RT_MONITOR_ENTER); + (char*)vm_helper_get_addr(VM_RT_MONITOR_ENTER); rt_helper_monitor_exit = - (char*)vm_get_rt_support_addr(VM_RT_MONITOR_EXIT); + (char*)vm_helper_get_addr(VM_RT_MONITOR_EXIT); rt_helper_monitor_enter_static = - (char*)vm_get_rt_support_addr(VM_RT_MONITOR_ENTER_STATIC); + (char*)vm_helper_get_addr(VM_RT_MONITOR_ENTER_STATIC); rt_helper_monitor_exit_static = - (char*)vm_get_rt_support_addr(VM_RT_MONITOR_EXIT_STATIC); + (char*)vm_helper_get_addr(VM_RT_MONITOR_EXIT_STATIC); rt_helper_new_array = - (char*)vm_get_rt_support_addr(VM_RT_NEW_VECTOR_USING_VTABLE); - rt_helper_aastore = (char*)vm_get_rt_support_addr(VM_RT_AASTORE); + (char*)vm_helper_get_addr(VM_RT_NEW_VECTOR_USING_VTABLE); + rt_helper_aastore = (char*)vm_helper_get_addr(VM_RT_AASTORE); rt_helper_get_vtable = - (char*)vm_get_rt_support_addr(VM_RT_GET_INTERFACE_VTABLE_VER0); + (char*)vm_helper_get_addr(VM_RT_GET_INTERFACE_VTABLE_VER0); rt_helper_throw_npe = - (char*)vm_get_rt_support_addr(VM_RT_NULL_PTR_EXCEPTION); + (char*)vm_helper_get_addr(VM_RT_NULL_PTR_EXCEPTION); rt_helper_throw = - (char*)vm_get_rt_support_addr(VM_RT_THROW); + (char*)vm_helper_get_addr(VM_RT_THROW); rt_helper_throw_out_of_bounds = - (char*)vm_get_rt_support_addr(VM_RT_IDX_OUT_OF_BOUNDS); + (char*)vm_helper_get_addr(VM_RT_IDX_OUT_OF_BOUNDS); rt_helper_throw_linking_exc = - (char*)vm_get_rt_support_addr(VM_RT_THROW_LINKING_EXCEPTION); + (char*)vm_helper_get_addr(VM_RT_THROW_LINKING_EXCEPTION); rt_helper_throw_div_by_zero_exc = - (char*)vm_get_rt_support_addr(VM_RT_DIVIDE_BY_ZERO_EXCEPTION); + (char*)vm_helper_get_addr(VM_RT_DIVIDE_BY_ZERO_EXCEPTION); rt_helper_checkcast = - (char*)vm_get_rt_support_addr(VM_RT_CHECKCAST); + (char*)vm_helper_get_addr(VM_RT_CHECKCAST); rt_helper_instanceof = - (char*)vm_get_rt_support_addr(VM_RT_INSTANCEOF); + (char*)vm_helper_get_addr(VM_RT_INSTANCEOF); rt_helper_multinewarray = - (char*)vm_get_rt_support_addr(VM_RT_MULTIANEWARRAY_RESOLVED); + (char*)vm_helper_get_addr(VM_RT_MULTIANEWARRAY_RESOLVED); rt_helper_gc_safepoint = - (char*)vm_get_rt_support_addr(VM_RT_GC_SAFE_POINT); + (char*)vm_helper_get_addr(VM_RT_GC_SAFE_POINT); rt_helper_get_tls_base_ptr= - (char*)vm_get_rt_support_addr(VM_RT_GC_GET_TLS_BASE); + (char*)vm_helper_get_addr(VM_RT_GC_GET_TLS_BASE); rt_helper_new_withresolve = - (char*)vm_get_rt_support_addr(VM_RT_NEWOBJ_WITHRESOLVE); + (char*)vm_helper_get_addr(VM_RT_NEWOBJ_WITHRESOLVE); rt_helper_new_array_withresolve = - (char*)vm_get_rt_support_addr(VM_RT_NEWARRAY_WITHRESOLVE); + (char*)vm_helper_get_addr(VM_RT_NEWARRAY_WITHRESOLVE); rt_helper_get_class_withresolve = - (char*)vm_get_rt_support_addr(VM_RT_INITIALIZE_CLASS_WITHRESOLVE); + (char*)vm_helper_get_addr(VM_RT_INITIALIZE_CLASS_WITHRESOLVE); rt_helper_checkcast_withresolve = - (char*)vm_get_rt_support_addr(VM_RT_CHECKCAST_WITHRESOLVE); + (char*)vm_helper_get_addr(VM_RT_CHECKCAST_WITHRESOLVE); rt_helper_instanceof_withresolve = - (char*)vm_get_rt_support_addr(VM_RT_INSTANCEOF_WITHRESOLVE); + (char*)vm_helper_get_addr(VM_RT_INSTANCEOF_WITHRESOLVE); rt_helper_field_get_offset_withresolve = - (char*)vm_get_rt_support_addr(VM_RT_GET_NONSTATIC_FIELD_OFFSET_WITHRESOLVE); + (char*)vm_helper_get_addr(VM_RT_GET_NONSTATIC_FIELD_OFFSET_WITHRESOLVE); rt_helper_field_get_address_withresolve = - (char*)vm_get_rt_support_addr(VM_RT_GET_STATIC_FIELD_ADDR_WITHRESOLVE); + (char*)vm_helper_get_addr(VM_RT_GET_STATIC_FIELD_ADDR_WITHRESOLVE); rt_helper_get_invokevirtual_addr_withresolve = - (char*)vm_get_rt_support_addr(VM_RT_GET_INVOKEVIRTUAL_ADDR_WITHRESOLVE); + (char*)vm_helper_get_addr(VM_RT_GET_INVOKEVIRTUAL_ADDR_WITHRESOLVE); rt_helper_get_invokespecial_addr_withresolve = - (char*)vm_get_rt_support_addr(VM_RT_GET_INVOKE_SPECIAL_ADDR_WITHRESOLVE); + (char*)vm_helper_get_addr(VM_RT_GET_INVOKE_SPECIAL_ADDR_WITHRESOLVE); rt_helper_get_invokestatic_addr_withresolve = - (char*)vm_get_rt_support_addr(VM_RT_GET_INVOKESTATIC_ADDR_WITHRESOLVE); + (char*)vm_helper_get_addr(VM_RT_GET_INVOKESTATIC_ADDR_WITHRESOLVE); rt_helper_get_invokeinterface_addr_withresolve = - (char*)vm_get_rt_support_addr(VM_RT_GET_INVOKEINTERFACE_ADDR_WITHRESOLVE); + (char*)vm_helper_get_addr(VM_RT_GET_INVOKEINTERFACE_ADDR_WITHRESOLVE); // rt_helper_ti_method_enter = - (char*)vm_get_rt_support_addr(VM_RT_JVMTI_METHOD_ENTER_CALLBACK); + (char*)vm_helper_get_addr(VM_RT_JVMTI_METHOD_ENTER_CALLBACK); rt_helper_ti_method_exit = - (char*)vm_get_rt_support_addr(VM_RT_JVMTI_METHOD_EXIT_CALLBACK); + (char*)vm_helper_get_addr(VM_RT_JVMTI_METHOD_EXIT_CALLBACK); rt_helper_ti_field_access = - (char*)vm_get_rt_support_addr(VM_RT_JVMTI_FIELD_ACCESS_CALLBACK); + (char*)vm_helper_get_addr(VM_RT_JVMTI_FIELD_ACCESS_CALLBACK); rt_helper_ti_field_modification = - (char*)vm_get_rt_support_addr(VM_RT_JVMTI_FIELD_MODIFICATION_CALLBACK);; + (char*)vm_helper_get_addr(VM_RT_JVMTI_FIELD_MODIFICATION_CALLBACK);; // Modified: harmony/enhanced/drlvm/trunk/vm/vmcore/src/init/vm_init.cpp URL: http://svn.apache.org/viewvc/harmony/enhanced/drlvm/trunk/vm/vmcore/src/init/vm_init.cpp?rev=636735&r1=636734&r2=636735&view=diff ============================================================================== --- harmony/enhanced/drlvm/trunk/vm/vmcore/src/init/vm_init.cpp (original) +++ harmony/enhanced/drlvm/trunk/vm/vmcore/src/init/vm_init.cpp Thu Mar 13 04:59:35 2008 @@ -210,10 +210,6 @@ return (void*)get_properties_keys_staring_with; } else if (strcmp(func_name,"vm_properties_get_value") == 0) { return (void*)get_property; - } else if (strcmp(func_name,"vm_helper_get_addr") == 0) { - return (void*)vm_get_rt_support_addr; - } else if (strcmp(func_name,"vm_helper_get_addr_optimized") == 0) { - return (void*)vm_get_rt_support_addr_optimized; } else { return NULL; } Modified: harmony/enhanced/drlvm/trunk/vm/vmcore/src/jit/compile.cpp URL: http://svn.apache.org/viewvc/harmony/enhanced/drlvm/trunk/vm/vmcore/src/jit/compile.cpp?rev=636735&r1=636734&r2=636735&view=diff ============================================================================== --- harmony/enhanced/drlvm/trunk/vm/vmcore/src/jit/compile.cpp (original) +++ harmony/enhanced/drlvm/trunk/vm/vmcore/src/jit/compile.cpp Thu Mar 13 04:59:35 2008 @@ -291,14 +291,14 @@ "o0=%0i;" "call %1i;", clss, - lil_npc_to_fp(vm_get_rt_support_addr(VM_RT_MONITOR_ENTER_STATIC))); + lil_npc_to_fp(vm_helper_get_addr(VM_RT_MONITOR_ENTER_STATIC))); assert(cs); } else { cs = lil_parse_onto_end(cs, "out stdcall:ref:void;" "o0=i0;" "call %0i;", - lil_npc_to_fp(vm_get_rt_support_addr(VM_RT_MONITOR_ENTER))); + lil_npc_to_fp(vm_helper_get_addr(VM_RT_MONITOR_ENTER))); assert(cs); } } @@ -457,13 +457,13 @@ "o0=%0i;" "call %1i;", clss, - lil_npc_to_fp(vm_get_rt_support_addr(VM_RT_MONITOR_EXIT_STATIC))); + lil_npc_to_fp(vm_helper_get_addr(VM_RT_MONITOR_EXIT_STATIC))); } else { cs = lil_parse_onto_end(cs, "ld l0,[l0+%0i:ref];" "out stdcall:ref:void; o0=l0; call %1i;", oh_get_handle_offset(0), - lil_npc_to_fp(vm_get_rt_support_addr(VM_RT_MONITOR_EXIT))); + lil_npc_to_fp(vm_helper_get_addr(VM_RT_MONITOR_EXIT))); } assert(cs); } Modified: harmony/enhanced/drlvm/trunk/vm/vmcore/src/util/em64t/base/jit_runtime_support_em64t.cpp URL: http://svn.apache.org/viewvc/harmony/enhanced/drlvm/trunk/vm/vmcore/src/util/em64t/base/jit_runtime_support_em64t.cpp?rev=636735&r1=636734&r2=636735&view=diff ============================================================================== --- harmony/enhanced/drlvm/trunk/vm/vmcore/src/util/em64t/base/jit_runtime_support_em64t.cpp (original) +++ harmony/enhanced/drlvm/trunk/vm/vmcore/src/util/em64t/base/jit_runtime_support_em64t.cpp Thu Mar 13 04:59:35 2008 @@ -300,7 +300,7 @@ void * getaddress__vm_monitor_exit_naked(); void * getaddress__vm_monitor_exit_static_naked(); -void * vm_get_rt_support_addr(VM_RT_SUPPORT f) { +void * vm_helper_get_addr(VM_RT_SUPPORT f) { #ifdef VM_STATS VM_Statistics::get_vm_stats().rt_function_requests.add((void *)f, 1, NULL); @@ -356,6 +356,6 @@ } } -void * vm_get_rt_support_addr_optimized(VM_RT_SUPPORT f, Class_Handle UNREF c) { - return vm_get_rt_support_addr(f); +void * vm_helper_get_addr_optimized(VM_RT_SUPPORT f, Class_Handle UNREF c) { + return vm_helper_get_addr(f); } 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=636735&r1=636734&r2=636735&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 Mar 13 04:59:35 2008 @@ -1168,7 +1168,7 @@ * Returns fast monitor exit static function. */ void * getaddress__vm_monitor_exit_static_naked(); -void *vm_get_rt_support_addr(VM_RT_SUPPORT f) +void *vm_helper_get_addr(VM_RT_SUPPORT f) { #ifdef VM_STATS register_request_for_rt_function(f); @@ -1269,7 +1269,7 @@ ABORT("Unexpected helper id"); return 0; } -} //vm_get_rt_support_addr +} //vm_helper_get_addr @@ -1281,28 +1281,28 @@ /* ? 03/07/30: temporary interface change!!! */ -void *vm_get_rt_support_addr_optimized(VM_RT_SUPPORT f, Class_Handle c) { +void *vm_helper_get_addr_optimized(VM_RT_SUPPORT f, Class_Handle c) { Class *clss = (Class*) c; if (clss == NULL) { - return vm_get_rt_support_addr(f); + return vm_helper_get_addr(f); } switch (f) { case VM_RT_CHECKCAST: - return vm_get_rt_support_addr(f); + return vm_helper_get_addr(f); // break; // remark #111: statement is unreachable case VM_RT_INSTANCEOF: - return vm_get_rt_support_addr(f); + return vm_helper_get_addr(f); // break;// remark #111: statement is unreachable case VM_RT_NEW_RESOLVED_USING_VTABLE_AND_SIZE: if (class_is_finalizable(c)) return getaddress__vm_alloc_java_object_resolved_using_vtable_and_size_naked(); else - return vm_get_rt_support_addr(f); + return vm_helper_get_addr(f); // break;// remark #111: statement is unreachable default: - return vm_get_rt_support_addr(f); + return vm_helper_get_addr(f); // break;// remark #111: statement is unreachable } } 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=636735&r1=636734&r2=636735&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 Mar 13 04:59:35 2008 @@ -2569,7 +2569,7 @@ -void *vm_get_rt_support_addr(VM_RT_SUPPORT f) +void *vm_helper_get_addr(VM_RT_SUPPORT f) { bool dereference_fptr = true; void *fptr = (void*)unimplemented_rt_support_func; // gashiman - added type conversion @@ -2722,7 +2722,7 @@ dereference_fptr = false; break; default: - printf("vm_get_rt_support_addr: unimplemented function on IPF: f=%d\n", f); + printf("vm_helper_get_addr: unimplemented function on IPF: f=%d\n", f); break; } assert(fptr); @@ -2744,14 +2744,14 @@ } else #endif // VM_STATS return helper; -} //vm_get_rt_support_addr +} //vm_helper_get_addr /* 03/07/30: temporary interface change!!! */ -void *vm_get_rt_support_addr_optimized(VM_RT_SUPPORT f, Class_Handle c) { +void *vm_helper_get_addr_optimized(VM_RT_SUPPORT f, Class_Handle c) { Class *clss = (Class*) c; if (clss == NULL) { - return vm_get_rt_support_addr(f); + return vm_helper_get_addr(f); } switch (f) { @@ -2759,10 +2759,10 @@ if (class_is_finalizable(c)) return get_vm_rt_new_resolved_using_vtable_address_and_size(false); // false == inline if possible (i.e., don't inline!) else - return vm_get_rt_support_addr(f); + return vm_helper_get_addr(f); break; default: - return vm_get_rt_support_addr(f); + return vm_helper_get_addr(f); break; } }