diff options
| author | Elliott Hughes <enh@google.com> | 2012-11-27 14:37:03 -0800 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2012-11-27 14:37:03 -0800 |
| commit | 32155bb0b07f3865173978f488d775e59a471b81 (patch) | |
| tree | 819f32356a27d22bdb31e28f95e0e39b17a05554 /vm/mterp | |
| parent | 7f98dcfc19848e061ed1291190c5619b092a3fb0 (diff) | |
| parent | 46abe70f710c3e1b1c2ec1bd7fab35ed833ffba1 (diff) | |
| download | android_dalvik-32155bb0b07f3865173978f488d775e59a471b81.tar.gz android_dalvik-32155bb0b07f3865173978f488d775e59a471b81.tar.bz2 android_dalvik-32155bb0b07f3865173978f488d775e59a471b81.zip | |
Merge "[MIPS] Fix DDMS(profiling) bug."
Diffstat (limited to 'vm/mterp')
| -rw-r--r-- | vm/mterp/mips/OP_EXECUTE_INLINE.S | 6 | ||||
| -rw-r--r-- | vm/mterp/mips/OP_EXECUTE_INLINE_RANGE.S | 2 | ||||
| -rw-r--r-- | vm/mterp/out/InterpAsm-mips.S | 8 |
3 files changed, 8 insertions, 8 deletions
diff --git a/vm/mterp/mips/OP_EXECUTE_INLINE.S b/vm/mterp/mips/OP_EXECUTE_INLINE.S index cbc891711..34f23ea25 100644 --- a/vm/mterp/mips/OP_EXECUTE_INLINE.S +++ b/vm/mterp/mips/OP_EXECUTE_INLINE.S @@ -91,14 +91,14 @@ addu a1, rSELF, offThread_retval # a1<- &self->retval GET_OPB(a0) # a0 <- B # Stack should have 16/20 available - sw a1, 16(sp) # push &self->retval + sw a1, STACK_OFFSET_ARG04(sp) # push &self->retval BAL(.L${opcode}_continue) # make call; will return after lw gp, STACK_OFFSET_GP(sp) # restore gp move rINST, v0 # save result of inline move a0, rOBJ # a0<- method move a1, rSELF # a1<- self - JAL(dvmFastMethodTraceExit) # (method, self) - beqz v0, common_exceptionThrown # returned false, handle exception + JAL(dvmFastNativeMethodTraceExit) # (method, self) + beqz rINST, common_exceptionThrown # returned false, handle exception FETCH_ADVANCE_INST(3) # advance rPC, load rINST GET_INST_OPCODE(t0) # extract opcode from rINST GOTO_OPCODE(t0) # jump to next instruction diff --git a/vm/mterp/mips/OP_EXECUTE_INLINE_RANGE.S b/vm/mterp/mips/OP_EXECUTE_INLINE_RANGE.S index 3c95a8c5e..fd964f7c1 100644 --- a/vm/mterp/mips/OP_EXECUTE_INLINE_RANGE.S +++ b/vm/mterp/mips/OP_EXECUTE_INLINE_RANGE.S @@ -78,7 +78,7 @@ addu a1, rSELF, offThread_retval # a1<- &self->retval GET_OPA(a0) # a0 <- A # Stack should have 16/20 available - sw a1, 16(sp) # push &self->retval + sw a1, STACK_OFFSET_ARG04(sp) # push &self->retval move rINST, rOBJ # rINST<- method BAL(.L${opcode}_continue) # make call; will return after lw gp, STACK_OFFSET_GP(sp) # restore gp diff --git a/vm/mterp/out/InterpAsm-mips.S b/vm/mterp/out/InterpAsm-mips.S index 67cbdabd1..1a69dd463 100644 --- a/vm/mterp/out/InterpAsm-mips.S +++ b/vm/mterp/out/InterpAsm-mips.S @@ -10850,14 +10850,14 @@ d2l_doconv: addu a1, rSELF, offThread_retval # a1<- &self->retval GET_OPB(a0) # a0 <- B # Stack should have 16/20 available - sw a1, 16(sp) # push &self->retval + sw a1, STACK_OFFSET_ARG04(sp) # push &self->retval BAL(.LOP_EXECUTE_INLINE_continue) # make call; will return after lw gp, STACK_OFFSET_GP(sp) # restore gp move rINST, v0 # save result of inline move a0, rOBJ # a0<- method move a1, rSELF # a1<- self - JAL(dvmFastMethodTraceExit) # (method, self) - beqz v0, common_exceptionThrown # returned false, handle exception + JAL(dvmFastNativeMethodTraceExit) # (method, self) + beqz rINST, common_exceptionThrown # returned false, handle exception FETCH_ADVANCE_INST(3) # advance rPC, load rINST GET_INST_OPCODE(t0) # extract opcode from rINST GOTO_OPCODE(t0) # jump to next instruction @@ -10912,7 +10912,7 @@ d2l_doconv: addu a1, rSELF, offThread_retval # a1<- &self->retval GET_OPA(a0) # a0 <- A # Stack should have 16/20 available - sw a1, 16(sp) # push &self->retval + sw a1, STACK_OFFSET_ARG04(sp) # push &self->retval move rINST, rOBJ # rINST<- method BAL(.LOP_EXECUTE_INLINE_RANGE_continue) # make call; will return after lw gp, STACK_OFFSET_GP(sp) # restore gp |