diff options
| author | Ian Rogers <irogers@google.com> | 2014-11-22 01:32:30 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2014-11-22 01:32:30 +0000 |
| commit | 124cd8f768436e082ca0dfed8f1e4f4713220e44 (patch) | |
| tree | c81d24102cfc8a0346dc7ed67ace964ebcd6fa8c /runtime/entrypoints/quick | |
| parent | da4b7e8979e9b7de634aecee62da6ce867ccaa8d (diff) | |
| parent | 735b8559d6dd26c610d4b97d72f25a092d9c8947 (diff) | |
| download | art-124cd8f768436e082ca0dfed8f1e4f4713220e44.tar.gz art-124cd8f768436e082ca0dfed8f1e4f4713220e44.tar.bz2 art-124cd8f768436e082ca0dfed8f1e4f4713220e44.zip | |
Merge "Add JNI trampoline for mips32."
Diffstat (limited to 'runtime/entrypoints/quick')
| -rw-r--r-- | runtime/entrypoints/quick/quick_trampoline_entrypoints.cc | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/runtime/entrypoints/quick/quick_trampoline_entrypoints.cc b/runtime/entrypoints/quick/quick_trampoline_entrypoints.cc index 0b7d382deb..93dc62a094 100644 --- a/runtime/entrypoints/quick/quick_trampoline_entrypoints.cc +++ b/runtime/entrypoints/quick/quick_trampoline_entrypoints.cc @@ -919,17 +919,16 @@ template<class T> class BuildNativeCallFrameStateMachine { static constexpr bool kAlignLongOnStack = false; static constexpr bool kAlignDoubleOnStack = false; #elif defined(__mips__) - // TODO: These are all dummy values! static constexpr bool kNativeSoftFloatAbi = true; // This is a hard float ABI. - static constexpr size_t kNumNativeGprArgs = 0; // 6 arguments passed in GPRs. - static constexpr size_t kNumNativeFprArgs = 0; // 8 arguments passed in FPRs. + static constexpr size_t kNumNativeGprArgs = 4; // 4 arguments passed in GPRs. + static constexpr size_t kNumNativeFprArgs = 0; // 0 arguments passed in FPRs. static constexpr size_t kRegistersNeededForLong = 2; static constexpr size_t kRegistersNeededForDouble = 2; static constexpr bool kMultiRegistersAligned = true; static constexpr bool kMultiRegistersWidened = true; - static constexpr bool kAlignLongOnStack = false; - static constexpr bool kAlignDoubleOnStack = false; + static constexpr bool kAlignLongOnStack = true; + static constexpr bool kAlignDoubleOnStack = true; #elif defined(__i386__) // TODO: Check these! static constexpr bool kNativeSoftFloatAbi = false; // Not using int registers for fp |