commit f8bbb8448c733e9e3ad43aad69774c37888329b1
author Brian Carlstrom <bdc@google.com> Wed Mar 14 03:01:42 2012 -0700
committer Brian Carlstrom <bdc@google.com> Thu Mar 15 03:30:20 2012 -0700
tree b0f488b0d95c1fe79bc0473e4a98670ceb905139
parent 98d39884f64d13aada5e716bb38e2f069c7ad0a7

Add code size to oat files

Change-Id: Ic2519551864dd7090ba98f2fc92318f95f92947f

src/exception_test.cc

diff --git a/src/exception_test.cc b/src/exception_test.cc
index eebba9d..120f16a 100644
--- a/src/exception_test.cc
+++ b/src/exception_test.cc
@@ -38,8 +38,13 @@
 
     dex_ = &Runtime::Current()->GetClassLinker()->FindDexFile(my_klass_->GetDexCache());
 
-    for (size_t i = 0 ; i < 12; i++) {
-      fake_code_.push_back(0x70000000 | i);
+    uint32_t code_size = 12;
+    fake_code_.push_back((code_size >> 24) & 0xFF);
+    fake_code_.push_back((code_size >> 16) & 0xFF);
+    fake_code_.push_back((code_size >>  8) & 0xFF);
+    fake_code_.push_back((code_size >>  0) & 0xFF);
+    for (size_t i = 0 ; i < code_size; i++) {
+      fake_code_.push_back(0x70 | i);
     }
 
     fake_mapping_data_.push_back(2);  // first element is count of remaining elements
@@ -49,13 +54,13 @@
     method_f_ = my_klass_->FindVirtualMethod("f", "()I");
     ASSERT_TRUE(method_f_ != NULL);
     method_f_->SetFrameSizeInBytes(kStackAlignment);
-    method_f_->SetCode(CompiledMethod::CodePointer(&fake_code_[0], kThumb2));
+    method_f_->SetCode(CompiledMethod::CodePointer(&fake_code_[sizeof(code_size)], kThumb2));
     method_f_->SetMappingTable(&fake_mapping_data_[0]);
 
     method_g_ = my_klass_->FindVirtualMethod("g", "(I)V");
     ASSERT_TRUE(method_g_ != NULL);
     method_g_->SetFrameSizeInBytes(kStackAlignment);
-    method_g_->SetCode(CompiledMethod::CodePointer(&fake_code_[0], kThumb2));
+    method_g_->SetCode(CompiledMethod::CodePointer(&fake_code_[sizeof(code_size)], kThumb2));
     method_g_->SetMappingTable(&fake_mapping_data_[0]);
   }