AuroraMiddleware/v8
1
0
Fork 0
Code Issues 2 Pull Requests Releases Wiki Activity

make kWasmCompileLazyFuncIndexRegister naming consistent

Browse Source 
R=titzer@chromium.org

Change-Id: Ia39d4ec981e6a539cc7466c7b20ff5bd85a49090
Reviewed-on: https://chromium-review.googlesource.com/c/1274266
Reviewed-by: Ben Titzer <titzer@chromium.org>
Commit-Queue: Junliang Yan <jyan@ca.ibm.com>
Cr-Commit-Position: refs/heads/master@{#56543}
This commit is contained in:
Junliang Yan 2018-10-10 15:06:46 -04:00 committed by Commit Bot
parent d8d2533d5b
commit d0b6bdfd83
4 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/arm/macro-assembler-arm.h
View File

@ -38,7 +38,7 @@ constexpr Register kRuntimeCallFunctionRegister = r1;
constexpr Register kRuntimeCallArgCountRegister = r0; constexpr Register kRuntimeCallArgCountRegister = r0;
constexpr Register kRuntimeCallArgvRegister = r2; constexpr Register kRuntimeCallArgvRegister = r2;
constexpr Register kWasmInstanceRegister = r3; constexpr Register kWasmInstanceRegister = r3;
constexpr Register kWasmLazyCompileFuncIndexRegister = r4; constexpr Register kWasmCompileLazyFuncIndexRegister = r4;
// ---------------------------------------------------------------------------- // ----------------------------------------------------------------------------
// Static helper functions // Static helper functions

6
src/builtins/arm/builtins-arm.cc
View File

@ -2189,8 +2189,8 @@ void Builtins::Generate_ArgumentsAdaptorTrampoline(MacroAssembler* masm) {
void Builtins::Generate_WasmCompileLazy(MacroAssembler* masm) { void Builtins::Generate_WasmCompileLazy(MacroAssembler* masm) {
// The function index was put in a register by the jump table trampoline. // The function index was put in a register by the jump table trampoline.
// Convert to Smi for the runtime call. // Convert to Smi for the runtime call.
__ SmiTag(kWasmLazyCompileFuncIndexRegister, __ SmiTag(kWasmCompileLazyFuncIndexRegister,
kWasmLazyCompileFuncIndexRegister); kWasmCompileLazyFuncIndexRegister);
{ {
HardAbortScope hard_abort(masm); // Avoid calls to Abort. HardAbortScope hard_abort(masm); // Avoid calls to Abort.
FrameAndConstantPoolScope scope(masm, StackFrame::WASM_COMPILE_LAZY); FrameAndConstantPoolScope scope(masm, StackFrame::WASM_COMPILE_LAZY);
@ -2208,7 +2208,7 @@ void Builtins::Generate_WasmCompileLazy(MacroAssembler* masm) {
// Pass instance and function index as explicit arguments to the runtime // Pass instance and function index as explicit arguments to the runtime
// function. // function.
__ push(kWasmInstanceRegister); __ push(kWasmInstanceRegister);
__ push(kWasmLazyCompileFuncIndexRegister); __ push(kWasmCompileLazyFuncIndexRegister);
// Load the correct CEntry builtin from the instance object. // Load the correct CEntry builtin from the instance object.
__ ldr(r2, FieldMemOperand(kWasmInstanceRegister, __ ldr(r2, FieldMemOperand(kWasmInstanceRegister,
WasmInstanceObject::kCEntryStubOffset)); WasmInstanceObject::kCEntryStubOffset));

4
src/builtins/s390/builtins-s390.cc
View File

@ -2276,8 +2276,8 @@ void Builtins::Generate_ArgumentsAdaptorTrampoline(MacroAssembler* masm) {
void Builtins::Generate_WasmCompileLazy(MacroAssembler* masm) { void Builtins::Generate_WasmCompileLazy(MacroAssembler* masm) {
// The function index was put in a register by the jump table trampoline. // The function index was put in a register by the jump table trampoline.
// Convert to Smi for the runtime call. // Convert to Smi for the runtime call.
__ SmiTag(kWasmLazyCompileFuncIndexRegister, __ SmiTag(kWasmCompileLazyFuncIndexRegister,
kWasmLazyCompileFuncIndexRegister); kWasmCompileLazyFuncIndexRegister);
{ {
HardAbortScope hard_abort(masm); // Avoid calls to Abort. HardAbortScope hard_abort(masm); // Avoid calls to Abort.
FrameAndConstantPoolScope scope(masm, StackFrame::WASM_COMPILE_LAZY); FrameAndConstantPoolScope scope(masm, StackFrame::WASM_COMPILE_LAZY);

2
src/wasm/jump-table-assembler.cc
View File

@ -72,7 +72,7 @@ void JumpTableAssembler::EmitLazyCompileJumpSlot(uint32_t func_index,
// Load function index to a register. // Load function index to a register.
// This generates [movw, movt] on ARMv7 and later, [ldr, constant pool marker, // This generates [movw, movt] on ARMv7 and later, [ldr, constant pool marker,
// constant] on ARMv6. // constant] on ARMv6.
Move32BitImmediate(kWasmLazyCompileFuncIndexRegister, Operand(func_index)); Move32BitImmediate(kWasmCompileLazyFuncIndexRegister, Operand(func_index));
// EmitJumpSlot emits either [b], [movw, movt, mov] (ARMv7+), or [ldr, // EmitJumpSlot emits either [b], [movw, movt, mov] (ARMv7+), or [ldr,
// constant]. // constant].
// In total, this is <=5 instructions on all architectures. // In total, this is <=5 instructions on all architectures.