diff options
Diffstat (limited to 'runtime/oat.h')
| -rw-r--r-- | runtime/oat.h | 22 |
1 files changed, 10 insertions, 12 deletions
diff --git a/runtime/oat.h b/runtime/oat.h index e9dfae9..7be768c 100644 --- a/runtime/oat.h +++ b/runtime/oat.h @@ -22,6 +22,7 @@ #include "base/macros.h" #include "dex_file.h" #include "instruction_set.h" +#include "quick/quick_method_frame_info.h" namespace art { @@ -137,34 +138,31 @@ class PACKED(4) OatMethodOffsets { 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); ~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_; }; -// OatMethodHeader precedes the raw code chunk generated by the Quick compiler. -class PACKED(4) OatMethodHeader { +// OatQuickMethodHeader precedes the raw code chunk generated by the Quick compiler. +class PACKED(4) OatQuickMethodHeader { public: - OatMethodHeader(); + OatQuickMethodHeader(); - explicit OatMethodHeader(uint32_t mapping_table_offset, uint32_t vmap_table_offset, - uint32_t code_size); + explicit 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); - ~OatMethodHeader(); + ~OatQuickMethodHeader(); // The offset in bytes from the start of the mapping table to the end of the header. uint32_t mapping_table_offset_; // The offset in bytes from the start of the vmap table to the end of the header. uint32_t vmap_table_offset_; + // The stack frame information. + QuickMethodFrameInfo frame_info_; // The code size in bytes. uint32_t code_size_; }; |