summaryrefslogtreecommitdiffstats
path: root/runtime/entrypoints
diff options
context:
space:
mode:
authorDouglas Leung <douglas.leung@imgtec.com>2014-10-31 12:21:40 -0700
committerDouglas Leung <douglas.leung@imgtec.com>2014-10-31 12:29:40 -0700
commit735b8559d6dd26c610d4b97d72f25a092d9c8947 (patch)
tree49f4bf27ba2c332b74a70a6c4f3d9938cb07720b /runtime/entrypoints
parent57b4d1c44e246dfd4aaef2d23b20a696a0c5e57e (diff)
downloadart-735b8559d6dd26c610d4b97d72f25a092d9c8947.tar.gz
art-735b8559d6dd26c610d4b97d72f25a092d9c8947.tar.bz2
art-735b8559d6dd26c610d4b97d72f25a092d9c8947.zip
Add JNI trampoline for mips32.
This patch allows the browser to come up. Change-Id: Icad9da868be76d6a08e615807fad8678ac0a110f
Diffstat (limited to 'runtime/entrypoints')
-rw-r--r--runtime/entrypoints/quick/quick_trampoline_entrypoints.cc9
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 e0aab75ddf..e067f3a0de 100644
--- a/runtime/entrypoints/quick/quick_trampoline_entrypoints.cc
+++ b/runtime/entrypoints/quick/quick_trampoline_entrypoints.cc
@@ -926,17 +926,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