diff options
| author | Andreas Gampe <agampe@google.com> | 2014-04-11 12:07:48 -0700 |
|---|---|---|
| committer | Andreas Gampe <agampe@google.com> | 2014-04-14 11:39:45 -0700 |
| commit | af13ad9fd18b6f75fe82e7995224c55654594f93 (patch) | |
| tree | 11c1fcb73bd31f90216cb1b588f56ff6abf74b85 /compiler/driver | |
| parent | 9b417e4f0f87da6bfe8dc5f02c987acfcb6dca31 (diff) | |
| download | art-af13ad9fd18b6f75fe82e7995224c55654594f93.tar.gz art-af13ad9fd18b6f75fe82e7995224c55654594f93.tar.bz2 art-af13ad9fd18b6f75fe82e7995224c55654594f93.zip | |
Centralize instruction-set pointer-size, alignment, 64b-width code
in instruction_set.h/cc
This allows to clean up some places that currently make explicit
comparisons.
Change-Id: I0dcc924c52fa53306f706aceea93a2d4a655c5df
Diffstat (limited to 'compiler/driver')
| -rw-r--r-- | compiler/driver/compiler_driver.cc | 3 | ||||
| -rw-r--r-- | compiler/driver/compiler_driver.h | 1 |
2 files changed, 1 insertions, 3 deletions
diff --git a/compiler/driver/compiler_driver.cc b/compiler/driver/compiler_driver.cc index 2b20c6fc7..0ad30be3f 100644 --- a/compiler/driver/compiler_driver.cc +++ b/compiler/driver/compiler_driver.cc @@ -339,7 +339,6 @@ CompilerDriver::CompilerDriver(const CompilerOptions* compiler_options, compiler_(Compiler::Create(compiler_kind)), instruction_set_(instruction_set), instruction_set_features_(instruction_set_features), - instruction_set_is_64_bit_(instruction_set == kX86_64 || instruction_set == kArm64), freezing_constructor_lock_("freezing constructor lock"), compiled_classes_lock_("compiled classes lock"), compiled_methods_lock_("compiled method lock"), @@ -448,7 +447,7 @@ CompilerTls* CompilerDriver::GetTls() { } #define CREATE_TRAMPOLINE(type, abi, offset) \ - if (instruction_set_is_64_bit_) { \ + if (Is64BitInstructionSet(instruction_set_)) { \ return CreateTrampoline64(instruction_set_, abi, \ type ## _ENTRYPOINT_OFFSET(8, offset)); \ } else { \ diff --git a/compiler/driver/compiler_driver.h b/compiler/driver/compiler_driver.h index d49523a17..d7d40d554 100644 --- a/compiler/driver/compiler_driver.h +++ b/compiler/driver/compiler_driver.h @@ -692,7 +692,6 @@ class CompilerDriver { const InstructionSet instruction_set_; const InstructionSetFeatures instruction_set_features_; - const bool instruction_set_is_64_bit_; // All class references that require mutable ReaderWriterMutex freezing_constructor_lock_ DEFAULT_MUTEX_ACQUIRED_AFTER; |