Andrew Geissler | eff2747 | 2021-10-29 15:35:00 -0500 | [diff] [blame] | 1 | From dc3652c0abcdf8573fd044907b19d8eda7ca1124 Mon Sep 17 00:00:00 2001 |
| 2 | From: Khem Raj <raj.khem@gmail.com> |
| 3 | Date: Wed, 20 Oct 2021 12:49:58 -0700 |
| 4 | Subject: [PATCH] [liftoff] Correct function signatures |
| 5 | |
| 6 | Fixes builds on mips where clang reports an error |
| 7 | ../deps/v8/src/wasm/baseline/mips/liftoff-assembler-mips.h:661:5: error: no matching member function for call to 'Move' |
| 8 | Move(tmp, src, type.value_type()); |
| 9 | ^~~~ |
| 10 | |
| 11 | Upstream-Status: Submitted [https://chromium-review.googlesource.com/c/v8/v8/+/3235674] |
Andrew Geissler | eff2747 | 2021-10-29 15:35:00 -0500 | [diff] [blame] | 12 | |
Andrew Geissler | c5535c9 | 2023-01-27 16:10:19 -0600 | [diff] [blame^] | 13 | Signed-off-by: Archana Polampalli <archana.polampalli@windriver.com> |
| 14 | --- |
| 15 | deps/v8/src/wasm/baseline/liftoff-assembler.h | 6 +++--- |
| 16 | deps/v8/src/wasm/baseline/mips/liftoff-assembler-mips.h | 2 +- |
| 17 | deps/v8/src/wasm/baseline/mips64/liftoff-assembler-mips64.h | 2 +- |
| 18 | .../src/wasm/baseline/riscv64/liftoff-assembler-riscv64.h | 2 +- |
| 19 | 4 files changed, 6 insertions(+), 6 deletions(-) |
| 20 | |
| 21 | diff --git a/deps/v8/src/wasm/baseline/liftoff-assembler.h b/deps/v8/src/wasm/baseline/liftoff-assembler.h |
| 22 | index 22c7f73a..db4cb168 100644 |
Andrew Geissler | eff2747 | 2021-10-29 15:35:00 -0500 | [diff] [blame] | 23 | --- a/deps/v8/src/wasm/baseline/liftoff-assembler.h |
| 24 | +++ b/deps/v8/src/wasm/baseline/liftoff-assembler.h |
Andrew Geissler | c5535c9 | 2023-01-27 16:10:19 -0600 | [diff] [blame^] | 25 | @@ -646,7 +646,7 @@ class LiftoffAssembler : public TurboAssembler { |
Andrew Geissler | eff2747 | 2021-10-29 15:35:00 -0500 | [diff] [blame] | 26 | void FinishCall(const ValueKindSig*, compiler::CallDescriptor*); |
| 27 | |
| 28 | // Move {src} into {dst}. {src} and {dst} must be different. |
| 29 | - void Move(LiftoffRegister dst, LiftoffRegister src, ValueKind); |
| 30 | + void Move(LiftoffRegister dst, LiftoffRegister src, ValueKind kind); |
| 31 | |
| 32 | // Parallel register move: For a list of tuples <dst, src, kind>, move the |
| 33 | // {src} register of kind {kind} into {dst}. If {src} equals {dst}, ignore |
Andrew Geissler | c5535c9 | 2023-01-27 16:10:19 -0600 | [diff] [blame^] | 34 | @@ -795,8 +795,8 @@ class LiftoffAssembler : public TurboAssembler { |
Andrew Geissler | eff2747 | 2021-10-29 15:35:00 -0500 | [diff] [blame] | 35 | inline void MoveStackValue(uint32_t dst_offset, uint32_t src_offset, |
| 36 | ValueKind); |
| 37 | |
| 38 | - inline void Move(Register dst, Register src, ValueKind); |
| 39 | - inline void Move(DoubleRegister dst, DoubleRegister src, ValueKind); |
| 40 | + inline void Move(Register dst, Register src, ValueKind kind); |
| 41 | + inline void Move(DoubleRegister dst, DoubleRegister src, ValueKind kind); |
| 42 | |
| 43 | inline void Spill(int offset, LiftoffRegister, ValueKind); |
| 44 | inline void Spill(int offset, WasmValue); |
Andrew Geissler | c5535c9 | 2023-01-27 16:10:19 -0600 | [diff] [blame^] | 45 | diff --git a/deps/v8/src/wasm/baseline/mips/liftoff-assembler-mips.h b/deps/v8/src/wasm/baseline/mips/liftoff-assembler-mips.h |
| 46 | index c76fd2f4..0fffe231 100644 |
Andrew Geissler | eff2747 | 2021-10-29 15:35:00 -0500 | [diff] [blame] | 47 | --- a/deps/v8/src/wasm/baseline/mips/liftoff-assembler-mips.h |
| 48 | +++ b/deps/v8/src/wasm/baseline/mips/liftoff-assembler-mips.h |
Andrew Geissler | c5535c9 | 2023-01-27 16:10:19 -0600 | [diff] [blame^] | 49 | @@ -661,7 +661,7 @@ void LiftoffAssembler::Store(Register dst_addr, Register offset_reg, |
| 50 | pinned = pinned | LiftoffRegList{dst_op.rm(), src}; |
Andrew Geissler | eff2747 | 2021-10-29 15:35:00 -0500 | [diff] [blame] | 51 | LiftoffRegister tmp = GetUnusedRegister(src.reg_class(), pinned); |
| 52 | // Save original value. |
| 53 | - Move(tmp, src, type.value_type()); |
| 54 | + Move(tmp, src, type.value_type().kind()); |
| 55 | |
| 56 | src = tmp; |
| 57 | pinned.set(tmp); |
Andrew Geissler | c5535c9 | 2023-01-27 16:10:19 -0600 | [diff] [blame^] | 58 | diff --git a/deps/v8/src/wasm/baseline/mips64/liftoff-assembler-mips64.h b/deps/v8/src/wasm/baseline/mips64/liftoff-assembler-mips64.h |
| 59 | index 36413545..48207337 100644 |
Andrew Geissler | eff2747 | 2021-10-29 15:35:00 -0500 | [diff] [blame] | 60 | --- a/deps/v8/src/wasm/baseline/mips64/liftoff-assembler-mips64.h |
| 61 | +++ b/deps/v8/src/wasm/baseline/mips64/liftoff-assembler-mips64.h |
Andrew Geissler | c5535c9 | 2023-01-27 16:10:19 -0600 | [diff] [blame^] | 62 | @@ -593,7 +593,7 @@ void LiftoffAssembler::Store(Register dst_addr, Register offset_reg, |
Andrew Geissler | eff2747 | 2021-10-29 15:35:00 -0500 | [diff] [blame] | 63 | pinned.set(dst_op.rm()); |
| 64 | LiftoffRegister tmp = GetUnusedRegister(src.reg_class(), pinned); |
| 65 | // Save original value. |
| 66 | - Move(tmp, src, type.value_type()); |
| 67 | + Move(tmp, src, type.value_type().kind()); |
| 68 | |
| 69 | src = tmp; |
| 70 | pinned.set(tmp); |
Andrew Geissler | c5535c9 | 2023-01-27 16:10:19 -0600 | [diff] [blame^] | 71 | diff --git a/deps/v8/src/wasm/baseline/riscv64/liftoff-assembler-riscv64.h b/deps/v8/src/wasm/baseline/riscv64/liftoff-assembler-riscv64.h |
| 72 | index 642a7d2a..56ffcc2a 100644 |
Andrew Geissler | eff2747 | 2021-10-29 15:35:00 -0500 | [diff] [blame] | 73 | --- a/deps/v8/src/wasm/baseline/riscv64/liftoff-assembler-riscv64.h |
| 74 | +++ b/deps/v8/src/wasm/baseline/riscv64/liftoff-assembler-riscv64.h |
Andrew Geissler | c5535c9 | 2023-01-27 16:10:19 -0600 | [diff] [blame^] | 75 | @@ -589,7 +589,7 @@ void LiftoffAssembler::Store(Register dst_addr, Register offset_reg, |
Andrew Geissler | eff2747 | 2021-10-29 15:35:00 -0500 | [diff] [blame] | 76 | pinned.set(dst_op.rm()); |
| 77 | LiftoffRegister tmp = GetUnusedRegister(src.reg_class(), pinned); |
| 78 | // Save original value. |
| 79 | - Move(tmp, src, type.value_type()); |
| 80 | + Move(tmp, src, type.value_type().kind()); |
| 81 | |
| 82 | src = tmp; |
| 83 | pinned.set(tmp); |
Andrew Geissler | c5535c9 | 2023-01-27 16:10:19 -0600 | [diff] [blame^] | 84 | -- |
| 85 | 2.34.1 |