From 8dbb708c7dc05c786329eb5c3fff3194ab6472ac Mon Sep 17 00:00:00 2001 From: Logan Chien Date: Fri, 25 Jan 2013 20:31:17 +0800 Subject: Rename run-time functions to distinguish art_quick_[name] vs art_portable_[name]. We have two different sets of run-time functions: (1) the one used by quick compiler, and (2) the one used by portable compiler. Previosuly, the one used by quick compiler is placed in ``extern "C"'', and the one used by portable compiler is placed in ``namespace art''. That's why we can link them together in the past. From the point of view of the linker, they had different names: (1) Quick RT: art_set32_static_from_code (2) LLVM RT: _ZN3art27art_set32_static_from_codeEjPNS_14AbstractMethodEi Previously for portable, ExtractCodeAndPrelink would have translated the art_module.ll names referenced by portable code at compile time to point to a runtime table populated with the mangled names. However, when using MCLinker linker to link the object images generated by the portable compiler, the linker will only see the unmangled names. So now the have to be unique between quick and portable, so we've adopted the naming convention of: (1) Quick RT: art_quick_set32_static_from_code (2) LLVM RT: art_portable_set32_static_from_code Change-Id: Id5bb9f8f1574433ada6b1d6734f509cca26b98a5 --- src/compiler/codegen/gen_invoke.cc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/compiler/codegen/gen_invoke.cc') diff --git a/src/compiler/codegen/gen_invoke.cc b/src/compiler/codegen/gen_invoke.cc index 816927f75d..712e44b4c6 100644 --- a/src/compiler/codegen/gen_invoke.cc +++ b/src/compiler/codegen/gen_invoke.cc @@ -456,7 +456,7 @@ static int NextVCallInsn(CompilationUnit* cu, CallInfo* info, } /* - * All invoke-interface calls bounce off of art_invoke_interface_trampoline, + * All invoke-interface calls bounce off of art_quick_invoke_interface_trampoline, * which will locate the target and continue on via a tail call. */ static int NextInterfaceCallInsn(CompilationUnit* cu, CallInfo* info, int state, -- cgit v1.2.3-59-g8ed1b