summaryrefslogtreecommitdiffstats
path: root/runtime/entrypoints
diff options
context:
space:
mode:
authorAndreas Gampe <agampe@google.com>2015-01-16 20:09:14 +0000
committerGerrit Code Review <noreply-gerritcodereview@google.com>2015-01-16 20:09:14 +0000
commitfa04842818fe2d0086872dea311db14a732d52f0 (patch)
treeb78db37592b811712017bf73cff5a491e2fc1760 /runtime/entrypoints
parentd16d76ac64b1b9ed17e9cc17a6afb85f16ce4b51 (diff)
parentc6d86725521841637bdd9564e71be3d9691db20f (diff)
downloadart-fa04842818fe2d0086872dea311db14a732d52f0.zip
art-fa04842818fe2d0086872dea311db14a732d52f0.tar.gz
art-fa04842818fe2d0086872dea311db14a732d52f0.tar.bz2
Merge "Fix refs_and_args callee save order for Mips32."
Diffstat (limited to 'runtime/entrypoints')
-rw-r--r--runtime/entrypoints/quick/quick_trampoline_entrypoints.cc2
1 files changed, 1 insertions, 1 deletions
diff --git a/runtime/entrypoints/quick/quick_trampoline_entrypoints.cc b/runtime/entrypoints/quick/quick_trampoline_entrypoints.cc
index cd34d88..9947b55 100644
--- a/runtime/entrypoints/quick/quick_trampoline_entrypoints.cc
+++ b/runtime/entrypoints/quick/quick_trampoline_entrypoints.cc
@@ -132,7 +132,7 @@ class QuickArgumentVisitor {
static constexpr size_t kNumQuickFprArgs = 0; // 0 arguments passed in FPRs.
static constexpr bool kGprFprLockstep = false;
static constexpr size_t kQuickCalleeSaveFrame_RefAndArgs_Fpr1Offset = 0; // Offset of first FPR arg.
- static constexpr size_t kQuickCalleeSaveFrame_RefAndArgs_Gpr1Offset = 4; // Offset of first GPR arg.
+ static constexpr size_t kQuickCalleeSaveFrame_RefAndArgs_Gpr1Offset = 16; // Offset of first GPR arg.
static constexpr size_t kQuickCalleeSaveFrame_RefAndArgs_LrOffset = 60; // Offset of return address.
static size_t GprIndexToGprOffset(uint32_t gpr_index) {
return gpr_index * GetBytesPerGprSpillLocation(kRuntimeISA);