commit ae826983f7903bc0a6bbbe8426bf393fb2f6d747
author Brian Carlstrom <bdc@google.com> Wed Nov 09 01:33:42 2011 -0800
committer Brian Carlstrom <bdc@google.com> Tue Nov 29 13:46:50 2011 -0800
tree 6fb83f2b19a1a50ade3c93cbf10485cd8fbc793f
parent 8aa6fc39f5cc0279d4ba2ee064de9758560dfedd

Add --image-classes to dex2oat

Change-Id: Ia88f9d302e0f9cd72be2199ee46d212d99864c67

src/oat_test.cc

diff --git a/src/oat_test.cc b/src/oat_test.cc
index 17a00e4..e4af31e 100644
--- a/src/oat_test.cc
+++ b/src/oat_test.cc
@@ -15,7 +15,7 @@
 
   SirtRef<ClassLoader> class_loader(NULL);
   if (compile) {
-    compiler_.reset(new Compiler(kThumb2, false));
+    compiler_.reset(new Compiler(kThumb2, false, NULL));
     compiler_->CompileAll(class_loader.get(), class_linker->GetBootClassPath());
   }
 
@@ -56,12 +56,12 @@
                                                                  method->GetDexMethodIndex()));
 
       if (compiled_method == NULL) {
-        EXPECT_TRUE(oat_method.code_ == NULL) << PrettyMethod(method) << " " << oat_method.code_;
-        EXPECT_EQ(oat_method.frame_size_in_bytes_, static_cast<uint32_t>(kStackAlignment));
-        EXPECT_EQ(oat_method.core_spill_mask_, 0U);
-        EXPECT_EQ(oat_method.fp_spill_mask_, 0U);
+        EXPECT_TRUE(oat_method.GetCode() == NULL) << PrettyMethod(method) << " " << oat_method.GetCode();
+        EXPECT_EQ(oat_method.GetFrameSizeInBytes(), static_cast<uint32_t>(kStackAlignment));
+        EXPECT_EQ(oat_method.GetCoreSpillMask(), 0U);
+        EXPECT_EQ(oat_method.GetFpSpillMask(), 0U);
       } else {
-        const void* oat_code = oat_method.code_;
+        const void* oat_code = oat_method.GetCode();
         uintptr_t oat_code_aligned = RoundDown(reinterpret_cast<uintptr_t>(oat_code), 2);
         oat_code = reinterpret_cast<const void*>(oat_code_aligned);
 
@@ -70,9 +70,9 @@
         EXPECT_EQ(0, memcmp(oat_code, &code[0], code_size))
             << PrettyMethod(method) << " " << code_size;
         CHECK_EQ(0, memcmp(oat_code, &code[0], code_size));
-        EXPECT_EQ(oat_method.frame_size_in_bytes_, compiled_method->GetFrameSizeInBytes());
-        EXPECT_EQ(oat_method.core_spill_mask_, compiled_method->GetCoreSpillMask());
-        EXPECT_EQ(oat_method.fp_spill_mask_, compiled_method->GetFpSpillMask());
+        EXPECT_EQ(oat_method.GetFrameSizeInBytes(), compiled_method->GetFrameSizeInBytes());
+        EXPECT_EQ(oat_method.GetCoreSpillMask(), compiled_method->GetCoreSpillMask());
+        EXPECT_EQ(oat_method.GetFpSpillMask(), compiled_method->GetFpSpillMask());
       }
     }
     for (size_t i = 0; i < num_virtual_methods; i++, method_index++) {
@@ -83,12 +83,12 @@
                                                                  method->GetDexMethodIndex()));
 
       if (compiled_method == NULL) {
-        EXPECT_TRUE(oat_method.code_ == NULL) << PrettyMethod(method) << " " << oat_method.code_;
-        EXPECT_EQ(oat_method.frame_size_in_bytes_, static_cast<uint32_t>(kStackAlignment));
-        EXPECT_EQ(oat_method.core_spill_mask_, 0U);
-        EXPECT_EQ(oat_method.fp_spill_mask_, 0U);
+        EXPECT_TRUE(oat_method.GetCode() == NULL) << PrettyMethod(method) << " " << oat_method.GetCode();
+        EXPECT_EQ(oat_method.GetFrameSizeInBytes(), static_cast<uint32_t>(kStackAlignment));
+        EXPECT_EQ(oat_method.GetCoreSpillMask(), 0U);
+        EXPECT_EQ(oat_method.GetFpSpillMask(), 0U);
       } else {
-        const void* oat_code = oat_method.code_;
+        const void* oat_code = oat_method.GetCode();
         EXPECT_TRUE(oat_code != NULL) << PrettyMethod(method);
         uintptr_t oat_code_aligned = RoundDown(reinterpret_cast<uintptr_t>(oat_code), 2);
         oat_code = reinterpret_cast<const void*>(oat_code_aligned);
@@ -98,9 +98,9 @@
         EXPECT_EQ(0, memcmp(oat_code, &code[0], code_size))
             << PrettyMethod(method) << " " << code_size;
         CHECK_EQ(0, memcmp(oat_code, &code[0], code_size));
-        EXPECT_EQ(oat_method.frame_size_in_bytes_, compiled_method->GetFrameSizeInBytes());
-        EXPECT_EQ(oat_method.core_spill_mask_, compiled_method->GetCoreSpillMask());
-        EXPECT_EQ(oat_method.fp_spill_mask_, compiled_method->GetFpSpillMask());
+        EXPECT_EQ(oat_method.GetFrameSizeInBytes(), compiled_method->GetFrameSizeInBytes());
+        EXPECT_EQ(oat_method.GetCoreSpillMask(), compiled_method->GetCoreSpillMask());
+        EXPECT_EQ(oat_method.GetFpSpillMask(), compiled_method->GetFpSpillMask());
       }
     }
   }