From 61c65dc8a86545b3f6a3daaa360ad73ce97e7b0e Mon Sep 17 00:00:00 2001 From: Logan Chien Date: Wed, 29 Feb 2012 03:22:30 +0800 Subject: Remove CADMs from LLVM code generator. Change-Id: Iafe3ff9f528c6a1573b7358b16566af745ff3c9f --- src/compiler_llvm/method_compiler.h | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) (limited to 'src/compiler_llvm/method_compiler.h') diff --git a/src/compiler_llvm/method_compiler.h b/src/compiler_llvm/method_compiler.h index de60fa32dd..e75e945f57 100644 --- a/src/compiler_llvm/method_compiler.h +++ b/src/compiler_llvm/method_compiler.h @@ -232,8 +232,8 @@ class MethodCompiler { void EmitInsn_InvokeVirtual(GEN_INSN_ARGS, bool is_range); void EmitInsn_InvokeSuper(GEN_INSN_ARGS, bool is_range); void EmitInsn_InvokeStaticDirect(GEN_INSN_ARGS, - bool is_range, - bool is_static); + InvokeType invoke_type, + bool is_range); void EmitInsn_InvokeInterface(GEN_INSN_ARGS, bool is_range); // Unary instructions @@ -275,15 +275,12 @@ class MethodCompiler { // Dex cache code generation helper function llvm::Value* EmitLoadDexCacheAddr(MemberOffset dex_cache_offset); - void EmitLoadDexCacheCodeAndDirectMethodFieldAddr( - llvm::Value*& code_addr_field_addr, - llvm::Value*& method_field_addr, - uint32_t method_idx); - llvm::Value* EmitLoadDexCacheStaticStorageFieldAddr(uint32_t type_idx); llvm::Value* EmitLoadDexCacheResolvedTypeFieldAddr(uint32_t type_idx); + llvm::Value* EmitLoadDexCacheResolvedMethodFieldAddr(uint32_t method_idx); + llvm::Value* EmitLoadDexCacheStringFieldAddr(uint32_t string_idx); -- cgit v1.2.3-59-g8ed1b