summaryrefslogtreecommitdiffstats
path: root/compiler/utils/assembler.h
diff options
context:
space:
mode:
authorIan Rogers <irogers@google.com>2014-11-05 23:46:43 -0800
committerIan Rogers <irogers@google.com>2014-11-13 16:17:46 -0800
commitd582fa4ea62083a7598dded5b82dc2198b3daac7 (patch)
treec76704c266ef4687eab425612ddf3fd24f93fe8d /compiler/utils/assembler.h
parentf20076ff813b8012096ff31af236d59db3c0f4e1 (diff)
downloadandroid_art-d582fa4ea62083a7598dded5b82dc2198b3daac7.tar.gz
android_art-d582fa4ea62083a7598dded5b82dc2198b3daac7.tar.bz2
android_art-d582fa4ea62083a7598dded5b82dc2198b3daac7.zip
Instruction set features for ARM64, MIPS and X86.
Also, refactor how feature strings are handled so they are additive or subtractive. Make MIPS have features for FPU 32-bit and MIPS v2. Use in the quick compiler rather than #ifdefs that wouldn't have worked in cross-compilation. Add SIMD features for x86/x86-64 proposed in: https://android-review.googlesource.com/#/c/112370/ Bug: 18056890 Change-Id: Ic88ff84a714926bd277beb74a430c5c7d5ed7666
Diffstat (limited to 'compiler/utils/assembler.h')
-rw-r--r--compiler/utils/assembler.h8
1 files changed, 4 insertions, 4 deletions
diff --git a/compiler/utils/assembler.h b/compiler/utils/assembler.h
index ad7e98d906..67711e312c 100644
--- a/compiler/utils/assembler.h
+++ b/compiler/utils/assembler.h
@@ -19,16 +19,16 @@
#include <vector>
+#include "arch/instruction_set.h"
#include "base/logging.h"
#include "base/macros.h"
#include "arm/constants_arm.h"
-#include "mips/constants_mips.h"
-#include "x86/constants_x86.h"
-#include "x86_64/constants_x86_64.h"
-#include "instruction_set.h"
#include "managed_register.h"
#include "memory_region.h"
+#include "mips/constants_mips.h"
#include "offsets.h"
+#include "x86/constants_x86.h"
+#include "x86_64/constants_x86_64.h"
namespace art {