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 1020359 - IonMonkey MIPS: Fix latest build issues. r=jandem

Browse Source
This commit is contained in:
Branislav Rankov 2014-07-08 16:08:47 +02:00
parent fe3e5550aa
commit b2143c523a
5 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
js/src/jit/mips/Architecture-mips.cpp
View File

@ -9,6 +9,8 @@
#include <fcntl.h>
#include <unistd.h>
#include "jit/RegisterSets.h"
#define HWCAP_MIPS (1 << 31)
#define HWCAP_FPU (1 << 0)

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

@ -7,6 +7,8 @@
#ifndef jit_mips_Architecture_mips_h
#define jit_mips_Architecture_mips_h
#include "mozilla/MathAlgorithms.h"
#include <limits.h>
#include <stdint.h>

4
js/src/jit/mips/MacroAssembler-mips.cpp
View File

@ -1529,7 +1529,7 @@ MacroAssemblerMIPSCompat::callIon(Register callee)
void
MacroAssemblerMIPSCompat::callIonFromAsmJS(Register callee)
{
ma_callIonNoPush(reg);
ma_callIonNoPush(callee);
// The Ion ABI has the callee pop the return address off the stack.
// The asm.js caller assumes that the call leaves sp unchanged, so bump
@ -3507,7 +3507,7 @@ MacroAssemblerMIPSCompat::toggledCall(JitCode *target, bool enabled)
as_nop();
as_nop();
}
MOZ_ASSERT(nextOffset().getOffset() - offset.offset() == ToggledCallSize());
MOZ_ASSERT(nextOffset().getOffset() - offset.offset() == ToggledCallSize(nullptr));
return offset;
}

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

@ -485,7 +485,7 @@ class MacroAssemblerMIPSCompat : public MacroAssemblerMIPS
// this instruction.
CodeOffsetLabel toggledCall(JitCode *target, bool enabled);
static size_t ToggledCallSize() {
static size_t ToggledCallSize(uint8_t *code) {
// Four instructions used in: MacroAssemblerMIPSCompat::toggledCall
return 4 * sizeof(uint32_t);
}

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

@ -3310,7 +3310,7 @@ Simulator::execute()
int32_t rpc = resume_pc_;
if (MOZ_UNLIKELY(rpc != 0)) {
// AsmJS signal handler ran and we have to adjust the pc.
activation->setInterrupted((void *)get_pc());
activation->setResumePC((void *)get_pc());
set_pc(rpc);
resume_pc_ = 0;
}