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 1058685 - IonMonkey MIPS: Fix warnings and style in MIPS code. r=bbouvier

Browse Source
This commit is contained in:
Branislav Rankov 2014-08-27 13:42:59 +02:00
parent a29e748c52
commit cc662609cb
7 changed files with 8 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
js/src/jit/mips/Assembler-mips.cpp
View File

@ -1408,7 +1408,6 @@ Assembler::retarget(Label *label, Label *target)
} }
void dbg_break() {} void dbg_break() {}
static int stopBKPT = -1;
void void
Assembler::as_break(uint32_t code) Assembler::as_break(uint32_t code)
{ {
@ -1578,9 +1577,9 @@ InstImm Assembler::invertBranch(InstImm branch, BOffImm16 skipOffset)
else else
branch.setRT((RTField) ((rt | 0x1) << RTShift)); branch.setRT((RTField) ((rt | 0x1) << RTShift));
return branch; return branch;
default:
MOZ_CRASH("Error creating long branch.");
} }
MOZ_CRASH("Error creating long branch.");
} }
void void

2
js/src/jit/mips/Assembler-mips.h
View File

@ -240,7 +240,7 @@ static const uint32_t FunctionMask = ((1 << FunctionBits) - 1) << FunctionShift;
static const uint32_t RegMask = Registers::Total - 1; static const uint32_t RegMask = Registers::Total - 1;
static const uint32_t StackAlignmentMask = StackAlignment - 1; static const uint32_t StackAlignmentMask = StackAlignment - 1;
static const int32_t MAX_BREAK_CODE = 1024 - 1; static const uint32_t MAX_BREAK_CODE = 1024 - 1;
class Instruction; class Instruction;
class InstReg; class InstReg;

4
js/src/jit/mips/Bailouts-mips.h
View File

@ -16,9 +16,9 @@ namespace jit {
class BailoutStack class BailoutStack
{ {
uintptr_t frameClassId_; uintptr_t frameClassId_;
// This is pushed in the bailout handler. Both entry points into the // This is pushed in the bailout handler. Both entry points into the
// handler inserts their own value int lr, which is then placed onto the // handler inserts their own value int lr, which is then placed onto the
// stack along with frameClassId_ above. This should be migrated to ip. // stack along with frameClassId_ above. This should be migrated to ip.
public: public:
union { union {
uintptr_t frameSize_; uintptr_t frameSize_;

1
js/src/jit/mips/BaselineIC-mips.cpp
View File

@ -83,7 +83,6 @@ ICBinaryArith_Int32::Compiler::generateStubCode(MacroAssembler &masm)
// DIV and MOD need an extra non-volatile ValueOperand to hold R0. // DIV and MOD need an extra non-volatile ValueOperand to hold R0.
GeneralRegisterSet savedRegs = availableGeneralRegs(2); GeneralRegisterSet savedRegs = availableGeneralRegs(2);
savedRegs = GeneralRegisterSet::Intersect(GeneralRegisterSet::NonVolatile(), savedRegs); savedRegs = GeneralRegisterSet::Intersect(GeneralRegisterSet::NonVolatile(), savedRegs);
ValueOperand savedValue = savedRegs.takeAnyValue();
Label goodMul, divTest1, divTest2; Label goodMul, divTest1, divTest2;
switch(op_) { switch(op_) {

3
js/src/jit/mips/Simulator-mips.cpp
View File

@ -850,7 +850,8 @@ DisassembleInstruction(uint32_t pc)
sprintf(llvmcmd, "bash -c \"echo -n '%p'; echo '%s' | " sprintf(llvmcmd, "bash -c \"echo -n '%p'; echo '%s' | "
"llvm-mc -disassemble -arch=mipsel -mcpu=mips32r2 | " "llvm-mc -disassemble -arch=mipsel -mcpu=mips32r2 | "
"grep -v pure_instructions | grep -v .text\"", static_cast<void*>(bytes), hexbytes); "grep -v pure_instructions | grep -v .text\"", static_cast<void*>(bytes), hexbytes);
system(llvmcmd); if (system(llvmcmd))
printf("Cannot disassemble instruction.\n");
} }
void void

2
js/src/jit/mips/Simulator-mips.h
View File

@ -96,7 +96,7 @@ const uint32_t kMaxStopCode = 127;
// ----------------------------------------------------------------------------- // -----------------------------------------------------------------------------
// Utility functions // Utility functions
typedef int32_t Instr; typedef uint32_t Instr;
class SimInstruction; class SimInstruction;
class Simulator { class Simulator {

1
js/src/jit/mips/Trampoline-mips.cpp
View File

@ -340,7 +340,6 @@ JitRuntime::generateInvalidator(JSContext *cx)
// Save floating point registers // Save floating point registers
// We can use as_sd because stack is alligned. // We can use as_sd because stack is alligned.
uint32_t increment = 2;
for (uint32_t i = 0; i < FloatRegisters::TotalDouble; i ++) for (uint32_t i = 0; i < FloatRegisters::TotalDouble; i ++)
masm.as_sd(FloatRegister::FromIndex(i, FloatRegister::Double), StackPointer, masm.as_sd(FloatRegister::FromIndex(i, FloatRegister::Double), StackPointer,
InvalidationBailoutStack::offsetOfFpRegs() + i * sizeof(double)); InvalidationBailoutStack::offsetOfFpRegs() + i * sizeof(double));