diff options
author | Vladimir Marko <vmarko@google.com> | 2014-04-08 14:00:50 +0100 |
---|---|---|
committer | Vladimir Marko <vmarko@google.com> | 2014-04-22 17:50:49 +0100 |
commit | 96c6ab93336b972a38bd2448bcccf19188b8389b (patch) | |
tree | 87c4904182d6b087e59a7c18d4a6b5b42275ef45 /runtime/oat.cc | |
parent | 82b1a81890970a8b07f9132aeae537a6c43df6b0 (diff) | |
download | art-96c6ab93336b972a38bd2448bcccf19188b8389b.zip art-96c6ab93336b972a38bd2448bcccf19188b8389b.tar.gz art-96c6ab93336b972a38bd2448bcccf19188b8389b.tar.bz2 |
Separate maps from code in oat file.
Write all GC maps first, then all mapping tables and then
all vmap tables and only then align the offset to page size
and write all method code chunks with headers.
Bug: 11767815
Change-Id: Ic83555c8303c5be119afc43e95e58c0a32ff2a4f
Diffstat (limited to 'runtime/oat.cc')
-rw-r--r-- | runtime/oat.cc | 12 |
1 files changed, 11 insertions, 1 deletions
diff --git a/runtime/oat.cc b/runtime/oat.cc index 246e090..d01dc72 100644 --- a/runtime/oat.cc +++ b/runtime/oat.cc @@ -22,7 +22,7 @@ namespace art { const uint8_t OatHeader::kOatMagic[] = { 'o', 'a', 't', '\n' }; -const uint8_t OatHeader::kOatVersion[] = { '0', '2', '0', '\0' }; +const uint8_t OatHeader::kOatVersion[] = { '0', '2', '1', '\0' }; OatHeader::OatHeader() { memset(this, 0, sizeof(*this)); @@ -372,4 +372,14 @@ OatMethodOffsets::OatMethodOffsets(uint32_t code_offset, OatMethodOffsets::~OatMethodOffsets() {} +OatMethodHeader::OatMethodHeader() + : code_size_(0) +{} + +OatMethodHeader::OatMethodHeader(uint32_t code_size) + : code_size_(code_size) +{} + +OatMethodHeader::~OatMethodHeader() {} + } // namespace art |