diff options
| author | Vladimir Marko <vmarko@google.com> | 2014-05-02 14:40:15 +0100 |
|---|---|---|
| committer | Vladimir Marko <vmarko@google.com> | 2014-05-13 11:43:22 +0100 |
| commit | 7624d25dad2d1ba25969ae704fccf68649103ae5 (patch) | |
| tree | de72194b76a4e23e0b15ec4085447ae7e4425815 /runtime/oat.cc | |
| parent | e1910f1d802dff79bba5ef61e1c4fd0b95f6e5b0 (diff) | |
| download | art-7624d25dad2d1ba25969ae704fccf68649103ae5.zip art-7624d25dad2d1ba25969ae704fccf68649103ae5.tar.gz art-7624d25dad2d1ba25969ae704fccf68649103ae5.tar.bz2 | |
Move quick frame info to OatQuickMethodHeader.
Rename OatMethodHeader to OatQuickMethodHeader, move frame
info from OatMethodOffsets to OatQuickMethodHeader. Retrieve
the info from other places for non-quick methods (portable
compiled bytecode or jni stub, generic jni, runtime,
abstract and proxy).
This change has a libcore/ companion CL
"Remove ArtMethod's quick fields for frame size and spills."
https://android-review.googlesource.com/94164
Bug: 11767815
Change-Id: I0e31a7875d76732e1ec479c86b9b5ca01203507f
Diffstat (limited to 'runtime/oat.cc')
| -rw-r--r-- | runtime/oat.cc | 22 |
1 files changed, 8 insertions, 14 deletions
diff --git a/runtime/oat.cc b/runtime/oat.cc index a1f4fd0..cb9334a 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', '7', '\0' }; +const uint8_t OatHeader::kOatVersion[] = { '0', '2', '8', '\0' }; OatHeader::OatHeader() { memset(this, 0, sizeof(*this)); @@ -345,40 +345,34 @@ std::string OatHeader::GetImageFileLocation() const { OatMethodOffsets::OatMethodOffsets() : code_offset_(0), - frame_size_in_bytes_(0), - core_spill_mask_(0), - fp_spill_mask_(0), gc_map_offset_(0) {} OatMethodOffsets::OatMethodOffsets(uint32_t code_offset, - uint32_t frame_size_in_bytes, - uint32_t core_spill_mask, - uint32_t fp_spill_mask, uint32_t gc_map_offset ) : code_offset_(code_offset), - frame_size_in_bytes_(frame_size_in_bytes), - core_spill_mask_(core_spill_mask), - fp_spill_mask_(fp_spill_mask), gc_map_offset_(gc_map_offset) {} OatMethodOffsets::~OatMethodOffsets() {} -OatMethodHeader::OatMethodHeader() +OatQuickMethodHeader::OatQuickMethodHeader() : mapping_table_offset_(0), vmap_table_offset_(0), + frame_info_(0, 0, 0), code_size_(0) {} -OatMethodHeader::OatMethodHeader(uint32_t vmap_table_offset, uint32_t mapping_table_offset, - uint32_t code_size) +OatQuickMethodHeader::OatQuickMethodHeader( + uint32_t mapping_table_offset, uint32_t vmap_table_offset, uint32_t frame_size_in_bytes, + uint32_t core_spill_mask, uint32_t fp_spill_mask, uint32_t code_size) : mapping_table_offset_(mapping_table_offset), vmap_table_offset_(vmap_table_offset), + frame_info_(frame_size_in_bytes, core_spill_mask, fp_spill_mask), code_size_(code_size) {} -OatMethodHeader::~OatMethodHeader() {} +OatQuickMethodHeader::~OatQuickMethodHeader() {} } // namespace art |