commit ff1ed4770bf7ff024a807b9f909b1a26abb78341
author Ian Rogers <irogers@google.com> Tue Sep 20 13:46:24 2011 -0700
committer Ian Rogers <irogers@google.com> Thu Sep 22 11:08:56 2011 -0700
tree 40cda83cda306f4ade883141d3e0a40fb0790100
parent 49de87b5c118cc536f2bd68c4fd46fce3d3abcfc

Class cast, fill array and interface exception support.

This change uses the deliver exception mechanism to implement support
for a number of runtime exceptions. It also tidies up code in the
compiler and allocates a singular callee save method in the image.

Also adds a fix for JNI internal test where we weren't passing
Thread::Current() and that this value is now being used in generated code.

Change-Id: I57eefd9afe40e92fa3a7e737f1a2ed7e1094b5c1

src/runtime.cc

diff --git a/src/runtime.cc b/src/runtime.cc
index 790a700..e9b7fdc 100644
--- a/src/runtime.cc
+++ b/src/runtime.cc
@@ -31,6 +31,7 @@
       signal_catcher_(NULL),
       java_vm_(NULL),
       jni_stub_array_(NULL),
+      callee_save_method_(NULL),
       started_(false),
       vfprintf_(NULL),
       exit_(NULL),
@@ -579,12 +580,50 @@
   thread_list_->Unregister();
 }
 
+Method* Runtime::CreateCalleeSaveMethod(InstructionSet insns) {
+  Class* method_class = Method::GetMethodClass();
+  Method* method = down_cast<Method*>(method_class->AllocObject());
+  method->SetDeclaringClass(method_class);
+  method->SetName(intern_table_->InternStrong("$$$callee_save_method$$$"));
+  method->SetSignature(intern_table_->InternStrong("()V"));
+  method->SetCode(NULL, insns, NULL);
+  if ((insns == kThumb2) || (insns == kArm)) {
+    method->SetFrameSizeInBytes(64);
+    method->SetReturnPcOffsetInBytes(60);
+    method->SetCoreSpillMask((1 << art::arm::R1) |
+                             (1 << art::arm::R2) |
+                             (1 << art::arm::R3) |
+                             (1 << art::arm::R4) |
+                             (1 << art::arm::R5) |
+                             (1 << art::arm::R6) |
+                             (1 << art::arm::R7) |
+                             (1 << art::arm::R8) |
+                             (1 << art::arm::R9) |
+                             (1 << art::arm::R10) |
+                             (1 << art::arm::R11) |
+                             (1 << art::arm::LR));
+    method->SetFpSpillMask(0);
+  } else if (insns == kX86) {
+    method->SetFrameSizeInBytes(32);
+    method->SetReturnPcOffsetInBytes(28);
+    method->SetCoreSpillMask((1 << art::x86::EBX) |
+                             (1 << art::x86::EBP) |
+                             (1 << art::x86::ESI) |
+                             (1 << art::x86::EDI));
+    method->SetFpSpillMask(0);
+  } else {
+    UNIMPLEMENTED(FATAL);
+  }
+  return method;
+}
+
 void Runtime::VisitRoots(Heap::RootVisitor* visitor, void* arg) const {
   class_linker_->VisitRoots(visitor, arg);
   intern_table_->VisitRoots(visitor, arg);
   java_vm_->VisitRoots(visitor, arg);
   thread_list_->VisitRoots(visitor, arg);
   visitor(jni_stub_array_, arg);
+  visitor(callee_save_method_, arg);
 
   //(*visitor)(&gDvm.outOfMemoryObj, 0, ROOT_VM_INTERNAL, arg);
   //(*visitor)(&gDvm.internalErrorObj, 0, ROOT_VM_INTERNAL, arg);