Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-10-08 10:44:56 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 1353352: Always flush constant pools at the end of stubs; r=luke

Browse Source 
MozReview-Commit-ID: 8t597CFnKUz

--HG--
extra : rebase_source : 47ab1689381f026f4f4f955afc6bc5a724becf91
This commit is contained in:
Benjamin Bouvier 2017-04-04 16:11:44 +02:00
parent 81b3915feb
commit 680f9a05c8
2 changed files with 19 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
js/src/wasm/WasmGenerator.cpp
View File

@ -414,6 +414,7 @@ ModuleGenerator::patchCallSites()
}
}
masm_.flushBuffer();
return true;
}

27
js/src/wasm/WasmStubs.cpp
View File

@ -31,6 +31,15 @@ using namespace js::wasm;
using mozilla::ArrayLength;
static void
FinishOffsets(MacroAssembler& masm, Offsets* offsets)
{
// On old ARM hardware, constant pools could be inserted and they need to
// be flushed before considering the size of the masm.
masm.flushBuffer();
offsets->end = masm.size();
}
static void
AssertStackAlignment(MacroAssembler& masm, uint32_t alignment, uint32_t addBeforeAssert = 0)
{
@ -331,7 +340,7 @@ wasm::GenerateEntry(MacroAssembler& masm, const FuncExport& fe)
masm.move32(Imm32(true), ReturnReg);
masm.ret();
offsets.end = masm.currentOffset();
FinishOffsets(masm, &offsets);
return offsets;
}
@ -498,7 +507,7 @@ wasm::GenerateImportFunction(jit::MacroAssembler& masm, const FuncImport& fi, Si
masm.wasmEmitTrapOutOfLineCode();
offsets.end = masm.currentOffset();
FinishOffsets(masm, &offsets);
return offsets;
}
@ -625,7 +634,7 @@ wasm::GenerateImportInterpExit(MacroAssembler& masm, const FuncImport& fi, uint3
GenerateExitEpilogue(masm, framePushed, ExitReason::ImportInterp, &offsets);
offsets.end = masm.currentOffset();
FinishOffsets(masm, &offsets);
return offsets;
}
@ -858,7 +867,7 @@ wasm::GenerateImportJitExit(MacroAssembler& masm, const FuncImport& fi, Label* t
MOZ_ASSERT(masm.framePushed() == 0);
offsets.end = masm.currentOffset();
FinishOffsets(masm, &offsets);
return offsets;
}
@ -896,7 +905,7 @@ wasm::GenerateTrapExit(MacroAssembler& masm, Trap trap, Label* throwLabel)
GenerateExitEpilogue(masm, framePushed, ExitReason::Trap, &offsets);
offsets.end = masm.currentOffset();
FinishOffsets(masm, &offsets);
return offsets;
}
@ -926,7 +935,7 @@ GenerateGenericMemoryAccessTrap(MacroAssembler& masm, SymbolicAddress reporter,
masm.call(reporter);
masm.jump(throwLabel);
offsets.end = masm.currentOffset();
FinishOffsets(masm, &offsets);
return offsets;
}
@ -1109,7 +1118,7 @@ wasm::GenerateInterruptExit(MacroAssembler& masm, Label* throwLabel)
# error "Unknown architecture!"
#endif
offsets.end = masm.currentOffset();
FinishOffsets(masm, &offsets);
return offsets;
}
@ -1147,7 +1156,7 @@ wasm::GenerateThrowStub(MacroAssembler& masm, Label* throwLabel)
masm.mov(ImmWord(0), ReturnReg);
masm.ret();
offsets.end = masm.currentOffset();
FinishOffsets(masm, &offsets);
return offsets;
}
@ -1198,6 +1207,6 @@ wasm::GenerateDebugTrapStub(MacroAssembler& masm, Label* throwLabel)
GenerateExitEpilogue(masm, 0, ExitReason::DebugTrap, &offsets);
offsets.end = masm.currentOffset();
FinishOffsets(masm, &offsets);
return offsets;
}