commit edcc09c737b00462881f147602656739d029571e
author Elliott Hughes <enh@google.com> Sun Aug 21 18:47:05 2011 -0700
committer Elliott Hughes <enh@google.com> Sun Aug 21 18:47:05 2011 -0700
tree 06f763e94567b687c229743f884ce87deee818ed
parent c143c55718342519db5398e41dda31422cf16c79

Cleanup.

Change-Id: I15704e76662bcf9bc10560679500c98a4baa68ab

src/jni_compiler.cc

diff --git a/src/jni_compiler.cc b/src/jni_compiler.cc
index 4215031..626de8c 100644
--- a/src/jni_compiler.cc
+++ b/src/jni_compiler.cc
@@ -292,7 +292,6 @@
   size_t cs = jni_asm->CodeSize();
   MemoryRegion code(AllocateCode(cs), cs);
   jni_asm->FinalizeInstructions(code);
-  // TODO: need to ask jni_asm what instruction set used
   native_method->SetCode(reinterpret_cast<byte*>(code.pointer()), cs,
       jni_asm->GetInstructionSet());
 }

src/jni_internal.cc

diff --git a/src/jni_internal.cc b/src/jni_internal.cc
index bfbd83e..9539b64 100644
--- a/src/jni_internal.cc
+++ b/src/jni_internal.cc
@@ -553,7 +553,7 @@
     ClassLinker* class_linker = Runtime::Current()->GetClassLinker();
     std::string descriptor(NormalizeJniClassDescriptor(name));
     // TODO: need to get the appropriate ClassLoader.
-    ClassLoader* cl = (ClassLoader*) ts.Self()->GetClassLoaderOverride(); // TODO: fix type in Thread
+    ClassLoader* cl = ts.Self()->GetClassLoaderOverride();
     Class* c = class_linker->FindClass(descriptor, cl);
     return AddLocalReference<jclass>(ts, c);
   }

src/object.h

diff --git a/src/object.h b/src/object.h
index 5d781e4..6322b8d 100644
--- a/src/object.h
+++ b/src/object.h
@@ -544,6 +544,7 @@
     code_instruction_set_ = set;
     code_area_.reset(MemMap::Map(byte_count,
         PROT_READ | PROT_WRITE | PROT_EXEC));
+    CHECK(code_area_.get());
     byte* code = code_area_->GetAddress();
     memcpy(code, compiled_code, byte_count);
     __builtin___clear_cache(code, code + byte_count);

src/thread.h

diff --git a/src/thread.h b/src/thread.h
index d511f04..993327d 100644
--- a/src/thread.h
+++ b/src/thread.h
@@ -17,6 +17,7 @@
 
 namespace art {
 
+class ClassLoader;
 class Method;
 class Object;
 class Runtime;
@@ -317,11 +318,11 @@
     top_of_managed_stack_ = record.last_top_of_managed_stack;
   }
 
-  Object* GetClassLoaderOverride() {
+  ClassLoader* GetClassLoaderOverride() {
     return class_loader_override_;
   }
 
-  void SetClassLoaderOverride(Object* class_loader_override) {
+  void SetClassLoaderOverride(ClassLoader* class_loader_override) {
     class_loader_override_ = class_loader_override;
   }
 
@@ -386,7 +387,9 @@
   // at the next poll.
   int suspend_count_;
 
-  Object* class_loader_override_;
+  // Needed to get the right ClassLoader in JNI_OnLoad, but also
+  // useful for testing.
+  ClassLoader* class_loader_override_;
 
   // The memory mapping of the stack for non-attached threads.
   scoped_ptr<MemMap> stack_;