Move DexFiles to be allocated on the heap
Removed pointer from DexFile to RawDexfile to allow heap allocation of
DexFile. DexFile is now an ObjectArray of ObjectArrays. Removing the
pointer from DexFile to RawDexfile meant adding arguments to pass the
RawDexfile along to ClassLinker::LoadClass, LoadInterfaces, LoadField,
LoadMethod, LinkClass, LinkInterfaces, ResolveClass to avoid the need
to look a RawDexfile up from a DexFile. ClassLinker::CreateArrayClass
now takes the raw_dex_file to assist in looking up the component class
from the proper source. Moved Method::HasSame* methods to ClassLinker
since for access to the RawDexfile (and tests of HasSame from
ObjectTest to ClassLinkerTest.
src/dex_file.cc
src/dex_file.h
src/class_linker.cc
src/class_linker.h
src/object.h
RunTime::Create/RunTime::Init/ClassLinker::Create/ClassLinker::Init
now take the boot class path. A boot class path with
Ljava/lang/Object; must be provided to initalize [Ljava/lang/Object;
during startup in order to heap allocate DexFiles.
src/class_linker.cc
src/class_linker.h
src/runtime.cc
src/runtime.h
Restored FindClass to load from a specific dex file. This is for use
by class loaders, otherwise it is assumed the caller wants to use the
boot classpath. We now distinguish and track the boot classpath as
separate from other dex files known to the class linker. Renamed
AppendToClassPath to AppendToBootClassPath and FindInClassPath to
FindInBootClassPath to clarify.
src/class_linker.cc
src/class_linker.h
Cleaned up AllocCharArray to generic AllocArray and added
AllocObjectArray. Added a functional ObjectArray implementation and a
ObjectTest to cover it.
src/heap.h
src/object.h
src/object_test.cc
Switched more Object* downcasting to down_cast
src/class_linker.cc
Switched order of arguments for DexFile::SetResolved to follow more
conventional collection ordering ( "(index, value)" vs "(value, index)" )
src/dex_file.h
src/class_linker.cc
src/class_linker.h
Added class_linker_ and java_lang_raw_dex_file_ to RuntimeTest as
convenience to test subclasses. ClassLinkerTest now can use these to
simplify its ::Assert* methods. JniCompilerTest now uses it for
setting up its boot class path. Removed now unneeded
OpenDexFileBase64.
src/common_test.h
src/class_linker_test.cc
src/jni_compiler_test.cc
Add external/gtest/include to non-test include path so FRIEND_TEST can be used.
Add src to include path to remove the need of using in in art/src files.
build/Android.libart.host.mk
build/Android.libart.mk
src/assembler.cc
src/assembler.h
src/assembler_arm.cc
src/assembler_arm.h
src/assembler_x86.cc
src/assembler_x86.h
src/assembler_x86_test.cc
src/base64.cc
src/base64.h
src/calling_convention.cc
src/calling_convention.h
src/calling_convention_arm.cc
src/calling_convention_x86.cc
src/casts.h
src/class_linker.h
src/class_linker_test.cc
src/common_test.h
src/constants.h
src/constants_arm.h
src/constants_x86.h
src/dex_file.cc
src/dex_file.h
src/dex_file_test.cc
src/dex_instruction.cc
src/dex_instruction.h
src/dex_instruction_visitor.h
src/dex_instruction_visitor_test.cc
src/dex_verifier.cc
src/dex_verifier.h
src/heap.cc
src/heap.h
src/jni_compiler.cc
src/jni_compiler_test.cc
src/jni_internal.cc
src/jni_internal.h
src/leb128.h
src/managed_register.h
src/managed_register_arm.cc
src/managed_register_arm.h
src/managed_register_arm_test.cc
src/managed_register_x86.cc
src/managed_register_x86.h
src/managed_register_x86_test.cc
src/mark_stack.cc
src/mark_stack.h
src/mark_sweep.cc
src/mark_sweep.h
src/memory_region.cc
src/memory_region.h
src/monitor.h
src/object.cc
src/object.h
src/object_bitmap.cc
src/object_bitmap.h
src/object_test.cc
src/offsets.cc
src/offsets.h
src/raw_dex_file.cc
src/raw_dex_file.h
src/raw_dex_file_test.cc
src/runtime.cc
src/runtime.h
src/scoped_ptr.h
src/space.cc
src/space.h
src/space_test.cc
src/stringpiece.cc
src/thread.cc
src/thread.h
src/thread_arm.cc
src/thread_x86.cc
src/utils.h
Change-Id: Ib633cea878c36921e9037b0464cb903aec318c3e
diff --git a/src/runtime.h b/src/runtime.h
index cbccccb..69f6228 100644
--- a/src/runtime.h
+++ b/src/runtime.h
@@ -3,9 +3,12 @@
#ifndef ART_SRC_RUNTIME_H_
#define ART_SRC_RUNTIME_H_
-#include "src/globals.h"
-#include "src/macros.h"
-#include "src/stringpiece.h"
+#include <vector>
+
+#include "globals.h"
+#include "macros.h"
+#include "raw_dex_file.h"
+#include "stringpiece.h"
namespace art {
@@ -16,7 +19,7 @@
class Runtime {
public:
// Creates and initializes a new runtime.
- static Runtime* Create();
+ static Runtime* Create(std::vector<RawDexFile*> boot_class_path);
// Compiles a dex file.
static void Compile(const StringPiece& filename);
@@ -42,7 +45,7 @@
Runtime() : class_linker_(NULL), thread_list_(NULL) {}
// Initializes a new uninitialized runtime.
- bool Init();
+ bool Init(std::vector<RawDexFile*> boot_class_path);
ClassLinker* class_linker_;