diff options
| author | Mark P Mendell <mark.p.mendell@intel.com> | 2015-01-27 15:45:27 +0000 |
|---|---|---|
| committer | Mark Mendell <mark.p.mendell@intel.com> | 2015-01-27 17:00:21 -0500 |
| commit | 966c3ae95d3c699ee9fbdbccc1acdaaf02325faf (patch) | |
| tree | 7a9bd5dbfb8b02f8bb7e3387876be0c1f7844063 /runtime/mirror | |
| parent | 85ed6bdd890c08f50c205d7f0604b5a35603b13e (diff) | |
| download | art-966c3ae95d3c699ee9fbdbccc1acdaaf02325faf.tar.gz art-966c3ae95d3c699ee9fbdbccc1acdaaf02325faf.tar.bz2 art-966c3ae95d3c699ee9fbdbccc1acdaaf02325faf.zip | |
Revert "Revert "ART: Implement X86 hard float (Quick/JNI/Baseline)""
This reverts commit 949c91fb91f40a4a80b2b492913cf8541008975e.
This time, don't clobber EBX before saving it.
Redo some of the macros to make register usage explicit.
Change-Id: I8db8662877cd006816e16a28f42444ab7c36bfef
Diffstat (limited to 'runtime/mirror')
| -rw-r--r-- | runtime/mirror/art_method.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/runtime/mirror/art_method.cc b/runtime/mirror/art_method.cc index 288f6a60bb..b2016dcc82 100644 --- a/runtime/mirror/art_method.cc +++ b/runtime/mirror/art_method.cc @@ -41,7 +41,7 @@ namespace mirror { extern "C" void art_quick_invoke_stub(ArtMethod*, uint32_t*, uint32_t, Thread*, JValue*, const char*); -#if defined(__LP64__) || defined(__arm__) +#if defined(__LP64__) || defined(__arm__) || defined(__i386__) extern "C" void art_quick_invoke_static_stub(ArtMethod*, uint32_t*, uint32_t, Thread*, JValue*, const char*); #endif @@ -415,7 +415,7 @@ void ArtMethod::Invoke(Thread* self, uint32_t* args, uint32_t args_size, JValue* << "Don't call compiled code when -Xint " << PrettyMethod(this); } -#if defined(__LP64__) || defined(__arm__) +#if defined(__LP64__) || defined(__arm__) || defined(__i386__) if (!IsStatic()) { (*art_quick_invoke_stub)(this, args, args_size, self, result, shorty); } else { |