Remove ExtractCodeAndPrelink and switch Portable to MCLinker
Change-Id: Ia2459c7da6b79e0a1c0f1148c6e28ad9cbbe27a2
diff --git a/src/compiler/dex/quick/codegen.h b/src/compiler/dex/quick/codegen.h
index 63c8460..21290ca 100644
--- a/src/compiler/dex/quick/codegen.h
+++ b/src/compiler/dex/quick/codegen.h
@@ -17,6 +17,8 @@
#ifndef ART_SRC_COMPILER_DEX_QUICK_CODEGEN_H_
#define ART_SRC_COMPILER_DEX_QUICK_CODEGEN_H_
+#include "invoke_type.h"
+#include "compiler/dex/compiler_enums.h"
#include "compiler/dex/compiler_ir.h"
namespace art {
@@ -82,6 +84,14 @@
#define REG_USE12 (REG_USE1 | REG_USE2)
#define REG_USE23 (REG_USE2 | REG_USE3)
+struct BasicBlock;
+struct CallInfo;
+struct CompilationUnit;
+struct LIR;
+struct MIR;
+struct RegLocation;
+struct RegisterInfo;
+
typedef int (*NextCallInsn)(CompilationUnit*, CallInfo*, int, uint32_t dex_idx,
uint32_t method_idx, uintptr_t direct_code,
uintptr_t direct_method, InvokeType type);
diff --git a/src/compiler/dex/quick/codegen_util.cc b/src/compiler/dex/quick/codegen_util.cc
index 5f8f6ef..110146f 100644
--- a/src/compiler/dex/quick/codegen_util.cc
+++ b/src/compiler/dex/quick/codegen_util.cc
@@ -54,10 +54,7 @@
bool FastInstance(CompilationUnit* cu, uint32_t field_idx,
int& field_offset, bool& is_volatile, bool is_put)
{
- DexCompilationUnit m_unit(cu->class_loader, cu->class_linker,
- *cu->dex_file, cu->code_item,
- cu->class_def_idx, cu->method_idx,
- cu->access_flags);
+ DexCompilationUnit m_unit(cu);
return cu->compiler_driver->ComputeInstanceFieldInfo(field_idx, &m_unit,
field_offset, is_volatile, is_put);
}
diff --git a/src/compiler/dex/quick/gen_common.cc b/src/compiler/dex/quick/gen_common.cc
index f14d6cf..a289252 100644
--- a/src/compiler/dex/quick/gen_common.cc
+++ b/src/compiler/dex/quick/gen_common.cc
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-#include "codegen_util.h"
+#include "compiler/dex/quick/codegen_util.h"
#include "compiler/dex/compiler_ir.h"
#include "oat/runtime/oat_support_entrypoints.h"
#include "ralloc_util.h"
@@ -354,8 +354,7 @@
bool is_volatile;
bool is_referrers_class;
- DexCompilationUnit m_unit(cu->class_loader, cu->class_linker, *cu->dex_file, cu->code_item,
- cu->class_def_idx, cu->method_idx, cu->access_flags);
+ DexCompilationUnit m_unit(cu);
bool fast_path =
cu->compiler_driver->ComputeStaticFieldInfo(field_idx, &m_unit,
@@ -446,10 +445,7 @@
bool is_volatile;
bool is_referrers_class;
- DexCompilationUnit m_unit(cu->class_loader, cu->class_linker,
- *cu->dex_file, cu->code_item,
- cu->class_def_idx, cu->method_idx,
- cu->access_flags);
+ DexCompilationUnit m_unit(cu);
bool fast_path =
cu->compiler_driver->ComputeStaticFieldInfo(field_idx, &m_unit,
diff --git a/src/compiler/dex/quick/gen_invoke.cc b/src/compiler/dex/quick/gen_invoke.cc
index 2c01c19..1ae29be 100644
--- a/src/compiler/dex/quick/gen_invoke.cc
+++ b/src/compiler/dex/quick/gen_invoke.cc
@@ -16,6 +16,7 @@
#include "codegen_util.h"
#include "compiler/dex/compiler_ir.h"
+#include "invoke_type.h"
#include "oat/runtime/oat_support_entrypoints.h"
#include "ralloc_util.h"
#include "x86/codegen_x86.h"
@@ -1335,10 +1336,7 @@
// Explicit register usage
LockCallTemps(cu);
- DexCompilationUnit m_unit(cu->class_loader, cu->class_linker,
- *cu->dex_file, cu->code_item,
- cu->class_def_idx, cu->method_idx,
- cu->access_flags);
+ DexCompilationUnit m_unit(cu);
uint32_t dex_method_idx = info->index;
int vtable_idx;
diff --git a/src/compiler/dex/quick/gen_loadstore.cc b/src/compiler/dex/quick/gen_loadstore.cc
index b945e31..a7baea4 100644
--- a/src/compiler/dex/quick/gen_loadstore.cc
+++ b/src/compiler/dex/quick/gen_loadstore.cc
@@ -14,8 +14,9 @@
* limitations under the License.
*/
-#include "codegen_util.h"
+#include "compiler/dex/quick/codegen_util.h"
#include "compiler/dex/compiler_ir.h"
+#include "invoke_type.h"
#include "ralloc_util.h"
namespace art {
diff --git a/src/compiler/dex/quick/ralloc_util.cc b/src/compiler/dex/quick/ralloc_util.cc
index a782264..5b7de2c 100644
--- a/src/compiler/dex/quick/ralloc_util.cc
+++ b/src/compiler/dex/quick/ralloc_util.cc
@@ -16,10 +16,10 @@
/* This file contains register alloction support. */
-#include "codegen_util.h"
#include "compiler/dex/compiler_ir.h"
#include "compiler/dex/compiler_utility.h"
#include "compiler/dex/dataflow.h"
+#include "compiler/dex/quick/codegen_util.h"
#include "ralloc_util.h"
namespace art {