Skip to content

Commit

Permalink
Fix Pulley TrapIf patch offset (#9647)
Browse files Browse the repository at this point in the history 
* Fix Pulley `TrapIf` patch offset

A missing `+N` meant that the instruction opcode was overwritten rather
than the relative jump offset.

* Fix tests
  • Loading branch information
@alexcrichton
alexcrichton authored Nov 21, 2024
1 parent 57cd5a9 commit 642ee73
Show file tree
Hide file tree
Showing 4 changed files with 65 additions and 13 deletions.
2 changes: 1 addition & 1 deletion cranelift/codegen/src/isa/pulley_shared/inst/emit.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -149,7 +149,7 @@ fn pulley_emit<P>(
let label = sink.defer_trap(*code);

let cur_off = sink.cur_offset();
sink.use_label_at_offset(cur_off, label, LabelUse::Jump(3));
sink.use_label_at_offset(cur_off + 3, label, LabelUse::Jump(3));

use ir::condcodes::IntCC::*;
use OperandSize::*;
Expand Down
12 changes: 6 additions & 6 deletions cranelift/filetests/filetests/isa/pulley32/trap.clif
View file
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ block0(v0: i64):
;
; Disassembled:
; 0: 14 02 2a xconst8 x2, 42
; 3: 0b 00 00 00 00 00 00 br_if_xeq64 x0, x0, 0x0 // target = 0x3
; 3: 0b 00 02 08 00 00 00 br_if_xeq64 x0, x2, 0x8 // target = 0xb
; a: 00 ret
; b: 00 ret

Expand All @@ -49,7 +49,7 @@ block0(v0: i64):
;
; Disassembled:
; 0: 14 02 2a xconst8 x2, 42
; 3: 0b 00 00 00 00 00 00 br_if_xeq64 x0, x0, 0x0 // target = 0x3
; 3: 0c 00 02 08 00 00 00 br_if_xneq64 x0, x2, 0x8 // target = 0xb
; a: 00 ret
; b: 00 ret

Expand All @@ -69,7 +69,7 @@ block0(v0: i64):
;
; Disassembled:
; 0: 14 02 2a xconst8 x2, 42
; 3: 0b 00 00 00 00 00 00 br_if_xeq64 x0, x0, 0x0 // target = 0x3
; 3: 0b 00 02 08 00 00 00 br_if_xeq64 x0, x2, 0x8 // target = 0xb
; a: 00 ret
; b: 00 ret

Expand All @@ -89,7 +89,7 @@ block0(v0: i64):
;
; Disassembled:
; 0: 14 02 2a xconst8 x2, 42
; 3: 0b 00 00 00 00 00 00 br_if_xeq64 x0, x0, 0x0 // target = 0x3
; 3: 0c 00 02 08 00 00 00 br_if_xneq64 x0, x2, 0x8 // target = 0xb
; a: 00 ret
; b: 00 ret

Expand Down Expand Up @@ -124,7 +124,7 @@ block2:
; 6: 00 ret
; 7: 14 05 2a xconst8 x5, 42
; a: 14 06 00 xconst8 x6, 0
; d: 0b 00 00 00 00 00 00 br_if_xeq64 x0, x0, 0x0 // target = 0xd
; d: 0c 05 06 08 00 00 00 br_if_xneq64 x5, x6, 0x8 // target = 0x15
; 14: 00 ret
; 15: 00 ret

Expand Down Expand Up @@ -158,7 +158,7 @@ block2:
; 0: 03 00 14 00 00 00 br_if x0, 0x14 // target = 0x14
; 6: 14 04 00 xconst8 x4, 0
; 9: 14 05 00 xconst8 x5, 0
; c: 0c 00 00 00 00 00 00 br_if_xneq64 x0, x0, 0x0 // target = 0xc
; c: 0b 04 05 09 00 00 00 br_if_xeq64 x4, x5, 0x9 // target = 0x15
; 13: 00 ret
; 14: 00 ret
; 15: 00 ret
Expand Down
12 changes: 6 additions & 6 deletions cranelift/filetests/filetests/isa/pulley64/trap.clif
View file
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ block0(v0: i64):
;
; Disassembled:
; 0: 14 02 2a xconst8 x2, 42
; 3: 0b 00 00 00 00 00 00 br_if_xeq64 x0, x0, 0x0 // target = 0x3
; 3: 0b 00 02 08 00 00 00 br_if_xeq64 x0, x2, 0x8 // target = 0xb
; a: 00 ret
; b: 00 ret

Expand All @@ -49,7 +49,7 @@ block0(v0: i64):
;
; Disassembled:
; 0: 14 02 2a xconst8 x2, 42
; 3: 0b 00 00 00 00 00 00 br_if_xeq64 x0, x0, 0x0 // target = 0x3
; 3: 0c 00 02 08 00 00 00 br_if_xneq64 x0, x2, 0x8 // target = 0xb
; a: 00 ret
; b: 00 ret

Expand All @@ -69,7 +69,7 @@ block0(v0: i64):
;
; Disassembled:
; 0: 14 02 2a xconst8 x2, 42
; 3: 0b 00 00 00 00 00 00 br_if_xeq64 x0, x0, 0x0 // target = 0x3
; 3: 0b 00 02 08 00 00 00 br_if_xeq64 x0, x2, 0x8 // target = 0xb
; a: 00 ret
; b: 00 ret

Expand All @@ -89,7 +89,7 @@ block0(v0: i64):
;
; Disassembled:
; 0: 14 02 2a xconst8 x2, 42
; 3: 0b 00 00 00 00 00 00 br_if_xeq64 x0, x0, 0x0 // target = 0x3
; 3: 0c 00 02 08 00 00 00 br_if_xneq64 x0, x2, 0x8 // target = 0xb
; a: 00 ret
; b: 00 ret

Expand Down Expand Up @@ -124,7 +124,7 @@ block2:
; 6: 00 ret
; 7: 14 05 2a xconst8 x5, 42
; a: 14 06 00 xconst8 x6, 0
; d: 0b 00 00 00 00 00 00 br_if_xeq64 x0, x0, 0x0 // target = 0xd
; d: 0c 05 06 08 00 00 00 br_if_xneq64 x5, x6, 0x8 // target = 0x15
; 14: 00 ret
; 15: 00 ret

Expand Down Expand Up @@ -158,7 +158,7 @@ block2:
; 0: 03 00 14 00 00 00 br_if x0, 0x14 // target = 0x14
; 6: 14 04 00 xconst8 x4, 0
; 9: 14 05 00 xconst8 x5, 0
; c: 0c 00 00 00 00 00 00 br_if_xneq64 x0, x0, 0x0 // target = 0xc
; c: 0b 04 05 09 00 00 00 br_if_xeq64 x4, x5, 0x9 // target = 0x15
; 13: 00 ret
; 14: 00 ret
; 15: 00 ret
Expand Down
52 changes: 52 additions & 0 deletions tests/disas/pulley/loads.wat
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,52 @@
;;! target = "pulley32"
;;! test = "compile"
;;! flags = "-Ccranelift-enable-heap-access-spectre-mitigation=no"

(module
(memory 0)
(func $i32 (param i32) (result i32)
local.get 0
i32.load
)

(func $i64 (param i32) (result i64)
local.get 0
i64.load
)
)

;; wasm[0]::function[0]::i32:
;; xconst8 spilltmp0, -16
;; xadd32 sp, sp, spilltmp0
;; store64_offset8 sp, 8, lr
;; store64 sp, fp
;; xmov fp, sp
;; load32_u_offset8 x6, x0, 52
;; br_if_xult32 x6, x2, 0x1f // target = 0x33
;; 1b: load32_u_offset8 x7, x0, 48
;; xadd32 x7, x7, x2
;; load32_u x0, x7
;; load64_offset8 lr, sp, 8
;; load64 fp, sp
;; xconst8 spilltmp0, 16
;; xadd32 sp, sp, spilltmp0
;; ret
;; 33: ret
;;
;; wasm[0]::function[1]::i64:
;; xconst8 spilltmp0, -16
;; xadd32 sp, sp, spilltmp0
;; store64_offset8 sp, 8, lr
;; store64 sp, fp
;; xmov fp, sp
;; load32_u_offset8 x6, x0, 52
;; br_if_xult32 x6, x2, 0x1f // target = 0x33
;; 1b: load32_u_offset8 x7, x0, 48
;; xadd32 x7, x7, x2
;; load64 x0, x7
;; load64_offset8 lr, sp, 8
;; load64 fp, sp
;; xconst8 spilltmp0, 16
;; xadd32 sp, sp, spilltmp0
;; ret
;; 33: ret

0 comments on commit 642ee73

Please sign in to comment.