wine/gecko
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-gecko.git synced 2024-09-13 09:24:08 -07:00
Code Issues Packages Projects Releases Wiki Activity

Bug 1014083: drive-by cleanups; r=luke

Browse Source
This commit is contained in:
Benjamin Bouvier 2014-05-28 19:31:01 +02:00
parent 129544d38c
commit 5b5a0e19f2
2 changed files with 4 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
js/src/jit/CodeGenerator.cpp
View File

@ -8463,10 +8463,10 @@ CodeGenerator::visitAsmJSCall(LAsmJSCall *ins)
}
#endif
if (mir->spIncrement())
if (mir->spIncrement())
masm.freeStack(mir->spIncrement());
JS_ASSERT((AlignmentAtPrologue + masm.framePushed()) % StackAlignment == 0);
JS_ASSERT((AlignmentAtPrologue + masm.framePushed()) % StackAlignment == 0);
#ifdef DEBUG
Label ok;

10
js/src/jit/shared/MoveEmitter-x86-shared.cpp
View File

@ -241,8 +241,8 @@ MoveEmitterX86::breakCycle(const MoveOperand &to, MoveOp::Type type)
masm.storeDouble(to.floatReg(), cycleSlot());
}
break;
#ifdef JS_CODEGEN_X64
case MoveOp::INT32:
#ifdef JS_CODEGEN_X64
// x64 can't pop to a 32-bit destination, so don't push.
if (to.isMemory()) {
masm.load32(toAddress(to), ScratchReg);
@ -251,9 +251,6 @@ MoveEmitterX86::breakCycle(const MoveOperand &to, MoveOp::Type type)
masm.store32(to.reg(), cycleSlot());
}
break;
#endif
#ifndef JS_CODEGEN_X64
case MoveOp::INT32:
#endif
case MoveOp::GENERAL:
masm.Push(toOperand(to));
@ -293,8 +290,8 @@ MoveEmitterX86::completeCycle(const MoveOperand &to, MoveOp::Type type)
masm.loadDouble(cycleSlot(), to.floatReg());
}
break;
#ifdef JS_CODEGEN_X64
case MoveOp::INT32:
#ifdef JS_CODEGEN_X64
JS_ASSERT(pushedAtCycle_ != -1);
JS_ASSERT(pushedAtCycle_ - pushedAtStart_ >= sizeof(int32_t));
// x64 can't pop to a 32-bit destination.
@ -305,9 +302,6 @@ MoveEmitterX86::completeCycle(const MoveOperand &to, MoveOp::Type type)
masm.load32(cycleSlot(), to.reg());
}
break;
#endif
#ifndef JS_CODEGEN_X64
case MoveOp::INT32:
#endif
case MoveOp::GENERAL:
JS_ASSERT(masm.framePushed() - pushedAtStart_ >= sizeof(intptr_t));