diff options
| author | Ian Rogers <irogers@google.com> | 2014-11-05 23:46:43 -0800 |
|---|---|---|
| committer | Ian Rogers <irogers@google.com> | 2014-11-13 16:17:46 -0800 |
| commit | d582fa4ea62083a7598dded5b82dc2198b3daac7 (patch) | |
| tree | c76704c266ef4687eab425612ddf3fd24f93fe8d /runtime/native | |
| parent | f20076ff813b8012096ff31af236d59db3c0f4e1 (diff) | |
| download | art-d582fa4ea62083a7598dded5b82dc2198b3daac7.zip art-d582fa4ea62083a7598dded5b82dc2198b3daac7.tar.gz art-d582fa4ea62083a7598dded5b82dc2198b3daac7.tar.bz2 | |
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 'runtime/native')
| -rw-r--r-- | runtime/native/dalvik_system_VMRuntime.cc | 14 | ||||
| -rw-r--r-- | runtime/native/dalvik_system_ZygoteHooks.cc | 2 |
2 files changed, 8 insertions, 8 deletions
diff --git a/runtime/native/dalvik_system_VMRuntime.cc b/runtime/native/dalvik_system_VMRuntime.cc index f6e2b21..d40d64b 100644 --- a/runtime/native/dalvik_system_VMRuntime.cc +++ b/runtime/native/dalvik_system_VMRuntime.cc @@ -17,8 +17,14 @@ #include "dalvik_system_VMRuntime.h" #include <limits.h> +#include <ScopedUtfChars.h> -#include "ScopedUtfChars.h" +#pragma GCC diagnostic push +#pragma GCC diagnostic ignored "-Wshadow" +#include "toStringArray.h" +#pragma GCC diagnostic pop + +#include "arch/instruction_set.h" #include "class_linker-inl.h" #include "common_throws.h" #include "debugger.h" @@ -28,7 +34,6 @@ #include "gc/heap.h" #include "gc/space/dlmalloc_space.h" #include "gc/space/image_space.h" -#include "instruction_set.h" #include "intern_table.h" #include "jni_internal.h" #include "mirror/art_method-inl.h" @@ -41,11 +46,6 @@ #include "thread.h" #include "thread_list.h" -#pragma GCC diagnostic push -#pragma GCC diagnostic ignored "-Wshadow" -#include "toStringArray.h" -#pragma GCC diagnostic pop - namespace art { static jfloat VMRuntime_getTargetHeapUtilization(JNIEnv*, jobject) { diff --git a/runtime/native/dalvik_system_ZygoteHooks.cc b/runtime/native/dalvik_system_ZygoteHooks.cc index 0966954..f1a04cb 100644 --- a/runtime/native/dalvik_system_ZygoteHooks.cc +++ b/runtime/native/dalvik_system_ZygoteHooks.cc @@ -18,8 +18,8 @@ #include <stdlib.h> +#include "arch/instruction_set.h" #include "debugger.h" -#include "instruction_set.h" #include "java_vm_ext.h" #include "jni_internal.h" #include "JNIHelp.h" |