diff options
| author | Jeff Hao <jeffhao@google.com> | 2014-07-16 23:28:05 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2014-07-16 16:25:15 +0000 |
| commit | 9791bb427fd812c1268edab6fb3ac7b82ad9fb93 (patch) | |
| tree | 9467ee834502643a3b8b2261f0242a5f58ad61f9 /runtime/arch | |
| parent | ebe8f799c5053f85adffee23cb46851efebbfd92 (diff) | |
| parent | d9cb8ae2ed78f957a773af61759432d7a7bf78af (diff) | |
| download | art-9791bb427fd812c1268edab6fb3ac7b82ad9fb93.zip art-9791bb427fd812c1268edab6fb3ac7b82ad9fb93.tar.gz art-9791bb427fd812c1268edab6fb3ac7b82ad9fb93.tar.bz2 | |
Merge "Fix art test failures for Mips."
Diffstat (limited to 'runtime/arch')
| -rw-r--r-- | runtime/arch/mips/entrypoints_init_mips.cc | 13 |
1 files changed, 9 insertions, 4 deletions
diff --git a/runtime/arch/mips/entrypoints_init_mips.cc b/runtime/arch/mips/entrypoints_init_mips.cc index 7a2e961..d3e7d5e 100644 --- a/runtime/arch/mips/entrypoints_init_mips.cc +++ b/runtime/arch/mips/entrypoints_init_mips.cc @@ -21,6 +21,7 @@ #include "entrypoints/quick/quick_entrypoints.h" #include "entrypoints/entrypoint_utils.h" #include "entrypoints/math_entrypoints.h" +#include "atomic.h" namespace art { @@ -196,11 +197,11 @@ void InitEntryPoints(InterpreterEntryPoints* ipoints, JniEntryPoints* jpoints, qpoints->pCmplDouble = CmplDouble; qpoints->pCmplFloat = CmplFloat; qpoints->pFmod = fmod; - qpoints->pL2d = __floatdidf; + qpoints->pL2d = art_l2d; qpoints->pFmodf = fmodf; - qpoints->pL2f = __floatdisf; - qpoints->pD2iz = __fixdfsi; - qpoints->pF2iz = __fixsfsi; + qpoints->pL2f = art_l2f; + qpoints->pD2iz = art_d2i; + qpoints->pF2iz = art_f2i; qpoints->pIdivmod = NULL; qpoints->pD2l = art_d2l; qpoints->pF2l = art_f2l; @@ -236,6 +237,10 @@ void InitEntryPoints(InterpreterEntryPoints* ipoints, JniEntryPoints* jpoints, qpoints->pThrowNoSuchMethod = art_quick_throw_no_such_method; qpoints->pThrowNullPointer = art_quick_throw_null_pointer_exception; qpoints->pThrowStackOverflow = art_quick_throw_stack_overflow; + + // Atomic 64-bit load/store + qpoints->pA64Load = QuasiAtomic::Read64; + qpoints->pA64Store = QuasiAtomic::Write64; }; } // namespace art |