diff options
| author | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2018-10-24 11:30:15 +0200 |
|---|---|---|
| committer | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2018-10-30 12:56:19 +0000 |
| commit | 6036726eb981b6c4b42047513b9d3f4ac865daac (patch) | |
| tree | 673593e70678e7789766d1f732eb51f613a2703b /chromium/v8/src/builtins/mips64 | |
| parent | 466052c4e7c052268fd931888cd58961da94c586 (diff) | |
| download | qtwebengine-chromium-6036726eb981b6c4b42047513b9d3f4ac865daac.tar.gz | |
BASELINE: Update Chromium to 70.0.3538.78
Change-Id: Ie634710bf039e26c1957f4ae45e101bd4c434ae7
Reviewed-by: Michael Brüning <michael.bruning@qt.io>
Diffstat (limited to 'chromium/v8/src/builtins/mips64')
| -rw-r--r-- | chromium/v8/src/builtins/mips64/OWNERS | 5 | ||||
| -rw-r--r-- | chromium/v8/src/builtins/mips64/builtins-mips64.cc | 11 |
2 files changed, 8 insertions, 8 deletions
diff --git a/chromium/v8/src/builtins/mips64/OWNERS b/chromium/v8/src/builtins/mips64/OWNERS index 4ce9d7f91da..8bbcab4c2d0 100644 --- a/chromium/v8/src/builtins/mips64/OWNERS +++ b/chromium/v8/src/builtins/mips64/OWNERS @@ -1,3 +1,2 @@ -ivica.bogosavljevic@mips.com -Miran.Karic@mips.com -sreten.kovacevic@mips.com
\ No newline at end of file +ibogosavljevic@wavecomp.com +skovacevic@wavecomp.com
\ No newline at end of file diff --git a/chromium/v8/src/builtins/mips64/builtins-mips64.cc b/chromium/v8/src/builtins/mips64/builtins-mips64.cc index a93c75b2fce..d59f7c0ce5c 100644 --- a/chromium/v8/src/builtins/mips64/builtins-mips64.cc +++ b/chromium/v8/src/builtins/mips64/builtins-mips64.cc @@ -13,7 +13,9 @@ #include "src/frames.h" #include "src/mips64/constants-mips64.h" #include "src/objects-inl.h" +#include "src/objects/js-generator.h" #include "src/runtime/runtime.h" +#include "src/wasm/wasm-objects.h" namespace v8 { namespace internal { @@ -2288,7 +2290,7 @@ void Builtins::Generate_WasmCompileLazy(MacroAssembler* masm) { // Convert to Smi for the runtime call __ SmiTag(t0); { - TrapOnAbortScope trap_on_abort_scope(masm); // Avoid calls to Abort. + HardAbortScope hard_abort(masm); // Avoid calls to Abort. FrameScope scope(masm, StackFrame::WASM_COMPILE_LAZY); // Save all parameter registers (see wasm-linkage.cc). They might be @@ -2382,10 +2384,9 @@ void Builtins::Generate_CEntry(MacroAssembler* masm, int result_size, if (kArchVariant >= kMips64r6) { __ addiupc(ra, kNumInstructionsToJump + 1); } else { - // This branch-and-link sequence is needed to find the current PC on mips - // before r6, saved to the ra register. - __ bal(&find_ra); // bal exposes branch delay slot. - __ Daddu(ra, ra, kNumInstructionsToJump * Instruction::kInstrSize); + // This no-op-and-link sequence saves PC + 8 in ra register on pre-r6 MIPS + __ nal(); // nal has branch delay slot. + __ Daddu(ra, ra, kNumInstructionsToJump * kInstrSize); } __ bind(&find_ra); |