diff options
author | Vladimir Marko <vmarko@google.com> | 2014-04-09 18:45:35 +0100 |
---|---|---|
committer | Vladimir Marko <vmarko@google.com> | 2014-04-25 12:24:46 +0100 |
commit | 8a630577ed2d9e9571c3434c505e5de223b23c07 (patch) | |
tree | 106367100c639011f0abb72b3b0e227c0764e8e0 /runtime/oat_file.h | |
parent | 96c6ab93336b972a38bd2448bcccf19188b8389b (diff) | |
download | art-8a630577ed2d9e9571c3434c505e5de223b23c07.tar.gz art-8a630577ed2d9e9571c3434c505e5de223b23c07.tar.bz2 art-8a630577ed2d9e9571c3434c505e5de223b23c07.zip |
Move mapping table and vmap table offsets to OatMethodHeader.
This change has a libcore/ companion CL
"Remove ArtMethod's quick fields mapping table and vmap table."
https://android-review.googlesource.com/91254
Bug: 11767815
Change-Id: I46ce2067e1ecd915da3890606498e31ffc332813
Diffstat (limited to 'runtime/oat_file.h')
-rw-r--r-- | runtime/oat_file.h | 21 |
1 files changed, 5 insertions, 16 deletions
diff --git a/runtime/oat_file.h b/runtime/oat_file.h index 10f64cc91e..5f6cb1ec31 100644 --- a/runtime/oat_file.h +++ b/runtime/oat_file.h @@ -87,12 +87,6 @@ class OatFile { uint32_t GetFpSpillMask() const { return fp_spill_mask_; } - uint32_t GetMappingTableOffset() const { - return mapping_table_offset_; - } - uint32_t GetVmapTableOffset() const { - return vmap_table_offset_; - } uint32_t GetNativeGcMapOffset() const { return native_gc_map_offset_; } @@ -122,16 +116,15 @@ class OatFile { } uint32_t GetQuickCodeSize() const; - const uint8_t* GetMappingTable() const { - return GetOatPointer<const uint8_t*>(mapping_table_offset_); - } - const uint8_t* GetVmapTable() const { - return GetOatPointer<const uint8_t*>(vmap_table_offset_); - } const uint8_t* GetNativeGcMap() const { return GetOatPointer<const uint8_t*>(native_gc_map_offset_); } + uint32_t GetMappingTableOffset() const; + uint32_t GetVmapTableOffset() const; + const uint8_t* GetMappingTable() const; + const uint8_t* GetVmapTable() const; + ~OatMethod(); // Create an OatMethod with offsets relative to the given base address @@ -140,8 +133,6 @@ class OatFile { const size_t frame_size_in_bytes, const uint32_t core_spill_mask, const uint32_t fp_spill_mask, - const uint32_t mapping_table_offset, - const uint32_t vmap_table_offset, const uint32_t gc_map_offset); private: @@ -159,8 +150,6 @@ class OatFile { size_t frame_size_in_bytes_; uint32_t core_spill_mask_; uint32_t fp_spill_mask_; - uint32_t mapping_table_offset_; - uint32_t vmap_table_offset_; uint32_t native_gc_map_offset_; friend class OatClass; |