diff options
| author | Ian Rogers <irogers@google.com> | 2014-10-14 17:41:57 -0700 |
|---|---|---|
| committer | Ian Rogers <irogers@google.com> | 2014-10-16 19:27:28 -0700 |
| commit | 6f3dbbadf4ce66982eb3d400e0a74cb73eb034f3 (patch) | |
| tree | f7a20779e4d665f948c5fbcd26dac0071dafb8d4 /runtime/oat.h | |
| parent | 2df6840f68dd18d7dd8dbf53f8b6181bbfdc4fc4 (diff) | |
| download | art-6f3dbbadf4ce66982eb3d400e0a74cb73eb034f3.tar.gz art-6f3dbbadf4ce66982eb3d400e0a74cb73eb034f3.tar.bz2 art-6f3dbbadf4ce66982eb3d400e0a74cb73eb034f3.zip | |
Make ART compile with GCC -O0 again.
Tidy up InstructionSetFeatures so that it has a type hierarchy dependent on
architecture.
Add to instruction_set_test to warn when InstructionSetFeatures don't agree
with ones from system properties, AT_HWCAP and /proc/cpuinfo.
Clean-up class linker entry point logic to not return entry points but to
test whether the passed code is the particular entrypoint. This works around
image trampolines that replicate entrypoints.
Bug: 17993736
Change-Id: I5f4b49e88c3b02a79f9bee04f83395146ed7be23
Diffstat (limited to 'runtime/oat.h')
| -rw-r--r-- | runtime/oat.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/runtime/oat.h b/runtime/oat.h index 6a32e3e56e..92b98b1be5 100644 --- a/runtime/oat.h +++ b/runtime/oat.h @@ -37,7 +37,7 @@ class PACKED(4) OatHeader { static constexpr const char* kDex2OatHostKey = "dex2oat-host"; static OatHeader* Create(InstructionSet instruction_set, - const InstructionSetFeatures& instruction_set_features, + const InstructionSetFeatures* instruction_set_features, const std::vector<const DexFile*>* dex_files, uint32_t image_file_location_oat_checksum, uint32_t image_file_location_oat_data_begin, @@ -93,7 +93,7 @@ class PACKED(4) OatHeader { void SetImagePatchDelta(int32_t off); InstructionSet GetInstructionSet() const; - const InstructionSetFeatures& GetInstructionSetFeatures() const; + uint32_t GetInstructionSetFeaturesBitmap() const; uint32_t GetImageFileLocationOatChecksum() const; uint32_t GetImageFileLocationOatDataBegin() const; @@ -106,7 +106,7 @@ class PACKED(4) OatHeader { private: OatHeader(InstructionSet instruction_set, - const InstructionSetFeatures& instruction_set_features, + const InstructionSetFeatures* instruction_set_features, const std::vector<const DexFile*>* dex_files, uint32_t image_file_location_oat_checksum, uint32_t image_file_location_oat_data_begin, @@ -119,7 +119,7 @@ class PACKED(4) OatHeader { uint32_t adler32_checksum_; InstructionSet instruction_set_; - InstructionSetFeatures instruction_set_features_; + uint32_t instruction_set_features_bitmap_; uint32_t dex_file_count_; uint32_t executable_offset_; uint32_t interpreter_to_interpreter_bridge_offset_; |