Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1234)

Unified Diff: runtime/vm/assembler_mips.cc

Issue 14854010: On MIPS, keeps Object::null() in a register. (Closed) Base URL: http://dart.googlecode.com/svn/branches/bleeding_edge/dart/
Patch Set: Created 7 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « runtime/vm/assembler_mips.h ('k') | runtime/vm/assembler_mips_test.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: runtime/vm/assembler_mips.cc
===================================================================
--- runtime/vm/assembler_mips.cc (revision 22325)
+++ runtime/vm/assembler_mips.cc (working copy)
@@ -81,7 +81,7 @@
void Assembler::AdduDetectOverflow(Register rd, Register rs, Register rt,
- Register ro) {
+ Register ro, Register scratch) {
ASSERT(rd != ro);
ASSERT(rd != TMP1);
ASSERT(ro != TMP1);
@@ -89,12 +89,14 @@
ASSERT(ro != rt);
if ((rs == rt) && (rd == rs)) {
- ASSERT(rd != TMP2);
- ASSERT(ro != TMP2);
- ASSERT(rs != TMP2);
- ASSERT(rt != TMP2);
- mov(TMP2, rt);
- rt = TMP2;
+ ASSERT(scratch != kNoRegister);
+ ASSERT(scratch != TMP1);
+ ASSERT(rd != scratch);
+ ASSERT(ro != scratch);
+ ASSERT(rs != scratch);
+ ASSERT(rt != scratch);
+ mov(scratch, rt);
+ rt = scratch;
}
if (rd == rs) {
@@ -236,8 +238,8 @@
sll(TMP1, value, kObjectAlignmentLog2 - 1);
and_(TMP1, value, TMP1);
// And the result with the negated space bit of the object.
- nor(TMP2, ZR, object);
- and_(TMP1, TMP1, TMP2);
+ nor(CMPRES, ZR, object);
+ and_(TMP1, TMP1, CMPRES);
andi(TMP1, TMP1, Immediate(kNewObjectAlignmentOffset));
beq(TMP1, ZR, no_update);
}
@@ -438,15 +440,16 @@
}
-void Assembler::LeaveDartFrame() {
+void Assembler::LeaveDartFrameAndReturn() {
addiu(SP, FP, Immediate(-kWordSize));
lw(RA, Address(SP, 2 * kWordSize));
lw(FP, Address(SP, 1 * kWordSize));
lw(PP, Address(SP, 0 * kWordSize));
- // Adjust SP for PC pushed in EnterDartFrame.
- addiu(SP, SP, Immediate(4 * kWordSize));
+ // Adjust SP for PC pushed in EnterDartFrame, and return.
+ Ret();
+ delay_slot()->addiu(SP, SP, Immediate(4 * kWordSize));
}
« no previous file with comments | « runtime/vm/assembler_mips.h ('k') | runtime/vm/assembler_mips_test.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698