commit f03c288c11ce3334fccab7fe31d8ebd14ad02157
author Brian Carlstrom <bdc@google.com> Mon Mar 05 20:29:06 2012 -0800
committer Brian Carlstrom <bdc@google.com> Mon Mar 05 20:45:30 2012 -0800
tree f726d1813d8fdb576eab842ba5b035d4898daa6a
parent 7638ae31e349f4d257d718f1cb62532ccf0a46a1

Remove redundant oat file fields

Change-Id: I2d48acec661c491a692971767694d13a2355e22a

src/oat_writer.cc

diff --git a/src/oat_writer.cc b/src/oat_writer.cc
index 9f416f1..5f97927 100644
--- a/src/oat_writer.cc
+++ b/src/oat_writer.cc
@@ -237,18 +237,7 @@
     frame_size_in_bytes = compiled_method->GetFrameSizeInBytes();
     core_spill_mask = compiled_method->GetCoreSpillMask();
     fp_spill_mask = compiled_method->GetFpSpillMask();
-  }
 
-  offset += sizeof(frame_size_in_bytes);
-  oat_header_->UpdateChecksum(&frame_size_in_bytes, sizeof(frame_size_in_bytes));
-
-  offset += sizeof(core_spill_mask);
-  oat_header_->UpdateChecksum(&core_spill_mask, sizeof(core_spill_mask));
-
-  offset += sizeof(fp_spill_mask);
-  oat_header_->UpdateChecksum(&fp_spill_mask, sizeof(fp_spill_mask));
-
-  if (compiled_method != NULL) {
     const std::vector<uint32_t>& mapping_table = compiled_method->GetMappingTable();
     size_t mapping_table_size = mapping_table.size() * sizeof(mapping_table[0]);
     mapping_table_offset = (mapping_table_size == 0) ? 0 : offset;
@@ -526,7 +515,7 @@
       if (static_cast<uint32_t>(new_offset) != aligned_code_offset) {
         PLOG(ERROR) << "Failed to seek to align oat code. Actual: " << new_offset
                     << " Expected: " << aligned_code_offset << " File: " << file->name();
-        return false;
+        return 0;
       }
       code_offset += aligned_code_delta;
       DCHECK_CODE_OFFSET();
@@ -548,7 +537,7 @@
              << PrettyMethod(method_idx, dex_file);
       if (!file->WriteFully(&code[0], code_size)) {
         ReportWriteFailure("method code", method_idx, dex_file, file);
-        return false;
+        return 0;
       }
       code_offset += code_size;
     }
@@ -556,25 +545,7 @@
     frame_size_in_bytes = compiled_method->GetFrameSizeInBytes();
     core_spill_mask = compiled_method->GetCoreSpillMask();
     fp_spill_mask = compiled_method->GetFpSpillMask();
-  }
 
-  if (!file->WriteFully(&frame_size_in_bytes, sizeof(frame_size_in_bytes))) {
-    ReportWriteFailure("method frame size", method_idx, dex_file, file);
-    return false;
-  }
-  code_offset += sizeof(frame_size_in_bytes);
-  if (!file->WriteFully(&core_spill_mask, sizeof(core_spill_mask))) {
-    ReportWriteFailure("method core spill mask", method_idx, dex_file, file);
-    return false;
-  }
-  code_offset += sizeof(core_spill_mask);
-  if (!file->WriteFully(&fp_spill_mask, sizeof(fp_spill_mask))) {
-    ReportWriteFailure("method fp spill mask", method_idx, dex_file, file);
-    return false;
-  }
-  code_offset += sizeof(fp_spill_mask);
-
-  if (compiled_method != NULL) {
     const std::vector<uint32_t>& mapping_table = compiled_method->GetMappingTable();
     size_t mapping_table_size = mapping_table.size() * sizeof(mapping_table[0]);
 
@@ -592,7 +563,7 @@
           << PrettyMethod(method_idx, dex_file);
       if (!file->WriteFully(&mapping_table[0], mapping_table_size)) {
         ReportWriteFailure("mapping table", method_idx, dex_file, file);
-        return false;
+        return 0;
       }
       code_offset += mapping_table_size;
     }
@@ -615,7 +586,7 @@
           << PrettyMethod(method_idx, dex_file);
       if (!file->WriteFully(&vmap_table[0], vmap_table_size)) {
         ReportWriteFailure("vmap table", method_idx, dex_file, file);
-        return false;
+        return 0;
       }
       code_offset += vmap_table_size;
     }
@@ -638,7 +609,7 @@
           << PrettyMethod(method_idx, dex_file);
       if (!file->WriteFully(&gc_map[0], gc_map_size)) {
         ReportWriteFailure("GC map", method_idx, dex_file, file);
-        return false;
+        return 0;
       }
       code_offset += gc_map_size;
     }
@@ -655,7 +626,7 @@
       if (static_cast<uint32_t>(new_offset) != aligned_code_offset) {
         PLOG(ERROR) << "Failed to seek to align invoke stub code. Actual: " << new_offset
                     << " Expected: " << aligned_code_offset;
-        return false;
+        return 0;
       }
       code_offset += aligned_code_delta;
       DCHECK_CODE_OFFSET();
@@ -678,7 +649,7 @@
           << PrettyMethod(method_idx, dex_file);
       if (!file->WriteFully(&invoke_stub[0], invoke_stub_size)) {
         ReportWriteFailure("invoke stub code", method_idx, dex_file, file);
-        return false;
+        return 0;
       }
       code_offset += invoke_stub_size;
     }

src/oat_writer.h

diff --git a/src/oat_writer.h b/src/oat_writer.h
index cdc061f..210a659 100644
--- a/src/oat_writer.h
+++ b/src/oat_writer.h
@@ -49,7 +49,7 @@
 // ...
 // OatClass[C]
 //
-// padding           if necessary so that the follow code will be page aligned
+// padding           if necessary so that the following code will be page aligned
 //
 // CompiledMethod    one variable sized blob with the contents of each CompiledMethod
 // CompiledMethod