A lightweight WebAssembly runtime that is fast, secure, and standards-compliant
aarch64: Disable csdb emission by default (#12932)
Alex Crichtonbac0e78fbdfa
diff --git a/cranelift/codegen/meta/src/isa/arm64.rs b/cranelift/codegen/meta/src/isa/arm64.rsindex afad7d1546..e43b74bc2e 100644--- a/cranelift/codegen/meta/src/isa/arm64.rs+++ b/cranelift/codegen/meta/src/isa/arm64.rs@@ -54,6 +54,12 @@ pub(crate) fn define() -> TargetIsa {"",false,);+ settings.add_bool(+ "use_csdb",+ "Use the `csdb` instruction when spectre mitigations are enabled",+ "",+ false,+ );TargetIsa::new("arm64", settings.build())}diff --git a/cranelift/codegen/src/isa/aarch64/inst.isle b/cranelift/codegen/src/isa/aarch64/inst.isleindex 8607a0344d..3be84db617 100644--- a/cranelift/codegen/src/isa/aarch64/inst.isle+++ b/cranelift/codegen/src/isa/aarch64/inst.isle@@ -1822,6 +1822,9 @@(decl pure use_fp16 () bool)(extern constructor use_fp16 use_fp16)+(decl pure use_csdb () bool)+(extern constructor use_csdb use_csdb)+;; Extractor helpers for various immediate constants ;;;;;;;;;;;;;;;;;;;;;;;;;;(decl pure partial move_wide_const_from_u64 (Type u64) MoveWideConst)diff --git a/cranelift/codegen/src/isa/aarch64/inst/emit.rs b/cranelift/codegen/src/isa/aarch64/inst/emit.rsindex 9914c2613f..51776985ac 100644--- a/cranelift/codegen/src/isa/aarch64/inst/emit.rs+++ b/cranelift/codegen/src/isa/aarch64/inst/emit.rs@@ -3,6 +3,7 @@use cranelift_control::ControlPlane;use crate::ir::{self, types::*};+use crate::isa::aarch64;use crate::isa::aarch64::inst::*;use crate::trace;@@ -711,12 +712,15 @@ impl EmitState {}/// Constant state used during function compilation.-pub struct EmitInfo(settings::Flags);+pub struct EmitInfo {+ flags: settings::Flags,+ isa_flags: aarch64::settings::Flags,+}impl EmitInfo {/// Create a constant state for emission of instructions.- pub fn new(flags: settings::Flags) -> Self {- Self(flags)+ pub fn new(flags: settings::Flags, isa_flags: aarch64::settings::Flags) -> Self {+ Self { flags, isa_flags }}}@@ -3188,7 +3192,9 @@ impl MachInstEmit for Inst {inst.emit(sink, emit_info, state);// Prevent any data value speculation if spectre mitigations are// enabled.- if emit_info.0.enable_table_access_spectre_mitigation() {+ if emit_info.flags.enable_table_access_spectre_mitigation()+ && emit_info.isa_flags.use_csdb()+ {Inst::Csdb.emit(sink, emit_info, state);}@@ -3560,7 +3566,7 @@ impl MachInstEmit for Inst {}&Inst::StackProbeLoop { start, end, step } => {- assert!(emit_info.0.enable_probestack());+ assert!(emit_info.flags.enable_probestack());// The loop generated here uses `start` as a counter register to// count backwards until negating it exceeds `end`. In other@@ -3647,9 +3653,11 @@ fn emit_return_call_common_sequence<T>(state: &mut EmitState,info: &ReturnCallInfo<T>,) {- for inst in- AArch64MachineDeps::gen_clobber_restore(CallConv::Tail, &emit_info.0, state.frame_layout())- {+ for inst in AArch64MachineDeps::gen_clobber_restore(+ CallConv::Tail,+ &emit_info.flags,+ state.frame_layout(),+ ) {inst.emit(sink, emit_info, state);}diff --git a/cranelift/codegen/src/isa/aarch64/inst/emit_tests.rs b/cranelift/codegen/src/isa/aarch64/inst/emit_tests.rsindex d8e6cd6a20..f64f603606 100644--- a/cranelift/codegen/src/isa/aarch64/inst/emit_tests.rs+++ b/cranelift/codegen/src/isa/aarch64/inst/emit_tests.rs@@ -1,5 +1,6 @@use crate::ir::types::*;use crate::ir::{ExternalName, TrapCode};+use crate::isa::aarch64;use crate::isa::aarch64::inst::*;use alloc::boxed::Box;@@ -7929,7 +7930,8 @@ fn test_aarch64_binemit() {insns.push((Inst::Fence {}, "BF3B03D5", "dmb ish"));let flags = settings::Flags::new(settings::builder());- let emit_info = EmitInfo::new(flags);+ let isa_flags = aarch64::settings::Flags::new(&flags, &aarch64::settings::builder());+ let emit_info = EmitInfo::new(flags, isa_flags);for (insn, expected_encoding, expected_printing) in insns {println!("AArch64: {insn:?}, {expected_encoding}, {expected_printing}");diff --git a/cranelift/codegen/src/isa/aarch64/lower.isle b/cranelift/codegen/src/isa/aarch64/lower.isleindex 57ed70a4bf..13c35b4bbc 100644--- a/cranelift/codegen/src/isa/aarch64/lower.isle+++ b/cranelift/codegen/src/isa/aarch64/lower.isle@@ -2266,6 +2266,14 @@;;;; Rules for `select_spectre_guard` ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;+(decl maybe_csdb_after_select (ValueRegs) ValueRegs)+(rule (maybe_csdb_after_select dst)+ (if-let true (use_csdb))+ (let ((_ InstOutput (side_effect (csdb)))) dst))+(rule (maybe_csdb_after_select dst)+ (if-let false (use_csdb))+ dst)+(rule (lower (has_type ty(select_spectre_guard _ (maybe_uextend (icmp _ cc x @ (value_type in_ty) y))if_true@@ -2276,9 +2284,8 @@(cond_code (flags_and_cc_cc comparison))tyif_true- if_false))- (_ InstOutput (side_effect (csdb))))- dst))+ if_false)))+ (maybe_csdb_after_select dst)))(rule -1 (lower (has_type ty (select_spectre_guard _ rcond @ (value_type (fits_in_64 _)) rn rm)))(let ((rcond Reg (put_in_reg_zext64 rcond)))diff --git a/cranelift/codegen/src/isa/aarch64/lower/isle.rs b/cranelift/codegen/src/isa/aarch64/lower/isle.rsindex c48a50007a..b7f6b84e94 100644--- a/cranelift/codegen/src/isa/aarch64/lower/isle.rs+++ b/cranelift/codegen/src/isa/aarch64/lower/isle.rs@@ -181,6 +181,10 @@ impl Context for IsleContext<'_, '_, MInst, AArch64Backend> {self.backend.isa_flags.has_fp16()}+ fn use_csdb(&mut self) -> bool {+ self.backend.isa_flags.use_csdb()+ }+fn move_wide_const_from_u64(&mut self, ty: Type, n: u64) -> Option<MoveWideConst> {let bits = ty.bits();let n = if bits < 64 {diff --git a/cranelift/codegen/src/isa/aarch64/mod.rs b/cranelift/codegen/src/isa/aarch64/mod.rsindex b6030697c8..c1b0746b34 100644--- a/cranelift/codegen/src/isa/aarch64/mod.rs+++ b/cranelift/codegen/src/isa/aarch64/mod.rs@@ -59,7 +59,7 @@ impl AArch64Backend {domtree: &DominatorTree,ctrl_plane: &mut ControlPlane,) -> CodegenResult<(VCode<inst::Inst>, regalloc2::Output)> {- let emit_info = EmitInfo::new(self.flags.clone());+ let emit_info = EmitInfo::new(self.flags.clone(), self.isa_flags.clone());let sigs = SigSet::new::<abi::AArch64MachineDeps>(func, &self.flags)?;let abi = abi::AArch64Callee::new(func, self, &self.isa_flags, &sigs)?;compile::compile::<AArch64Backend>(func, domtree, self, abi, emit_info, sigs, ctrl_plane)diff --git a/cranelift/codegen/src/machinst/buffer.rs b/cranelift/codegen/src/machinst/buffer.rsindex 2f9251e0bf..33f836874d 100644--- a/cranelift/codegen/src/machinst/buffer.rs+++ b/cranelift/codegen/src/machinst/buffer.rs@@ -2518,6 +2518,7 @@ mod test {use super::*;use crate::ir::UserExternalNameRef;+ use crate::isa::aarch64;use crate::isa::aarch64::inst::{BranchTarget, CondBrKind, EmitInfo, Inst};use crate::isa::aarch64::inst::{OperandSize, xreg};use crate::machinst::{MachInstEmit, MachInstEmitState};@@ -2530,9 +2531,15 @@ mod test {BranchTarget::Label(label(n))}+ fn emit_info() -> EmitInfo {+ let flags = settings::Flags::new(settings::builder());+ let isa_flags = aarch64::settings::Flags::new(&flags, &aarch64::settings::builder());+ EmitInfo::new(flags, isa_flags)+ }+#[test]fn test_elide_jump_to_next() {- let info = EmitInfo::new(settings::Flags::new(settings::builder()));+ let info = emit_info();let mut buf = MachBuffer::new();let mut state = <Inst as MachInstEmit>::State::default();let constants = Default::default();@@ -2548,7 +2555,7 @@ mod test {#[test]fn test_elide_trivial_jump_blocks() {- let info = EmitInfo::new(settings::Flags::new(settings::builder()));+ let info = emit_info();let mut buf = MachBuffer::new();let mut state = <Inst as MachInstEmit>::State::default();let constants = Default::default();@@ -2579,7 +2586,7 @@ mod test {#[test]fn test_flip_cond() {- let info = EmitInfo::new(settings::Flags::new(settings::builder()));+ let info = emit_info();let mut buf = MachBuffer::new();let mut state = <Inst as MachInstEmit>::State::default();let constants = Default::default();@@ -2625,7 +2632,7 @@ mod test {#[test]fn test_island() {- let info = EmitInfo::new(settings::Flags::new(settings::builder()));+ let info = emit_info();let mut buf = MachBuffer::new();let mut state = <Inst as MachInstEmit>::State::default();let constants = Default::default();@@ -2694,7 +2701,7 @@ mod test {#[test]fn test_island_backward() {- let info = EmitInfo::new(settings::Flags::new(settings::builder()));+ let info = emit_info();let mut buf = MachBuffer::new();let mut state = <Inst as MachInstEmit>::State::default();let constants = Default::default();@@ -2780,7 +2787,7 @@ mod test {// label7:// ret- let info = EmitInfo::new(settings::Flags::new(settings::builder()));+ let info = emit_info();let mut buf = MachBuffer::new();let mut state = <Inst as MachInstEmit>::State::default();let constants = Default::default();@@ -2857,7 +2864,7 @@ mod test {//// label0, label1, ..., label4:// b label0- let info = EmitInfo::new(settings::Flags::new(settings::builder()));+ let info = emit_info();let mut buf = MachBuffer::new();let mut state = <Inst as MachInstEmit>::State::default();let constants = Default::default();diff --git a/cranelift/filetests/filetests/isa/aarch64/bti.clif b/cranelift/filetests/filetests/isa/aarch64/bti.clifindex f2ba08c270..72c7e648c3 100644--- a/cranelift/filetests/filetests/isa/aarch64/bti.clif+++ b/cranelift/filetests/filetests/isa/aarch64/bti.clif@@ -57,31 +57,30 @@ block5(v5: i32):; hint #0x22; block1: ; offset 0x4; cmp w0, #3-; b.hs #0x54+; b.hs #0x50; csel x11, xzr, x0, hs-; csdb-; adr x10, #0x24+; adr x10, #0x20; ldrsw x11, [x10, w11, uxtw #2]; add x10, x10, x11; br x10; .byte 0x24, 0x00, 0x00, 0x00; .byte 0x18, 0x00, 0x00, 0x00; .byte 0x0c, 0x00, 0x00, 0x00-; block2: ; offset 0x30+; block2: ; offset 0x2c; hint #0x24; mov w5, #3-; b #0x58-; block3: ; offset 0x3c+; b #0x54+; block3: ; offset 0x38; hint #0x24; mov w5, #2-; b #0x58-; block4: ; offset 0x48+; b #0x54+; block4: ; offset 0x44; hint #0x24; mov w5, #1-; b #0x58-; block5: ; offset 0x54+; b #0x54+; block5: ; offset 0x50; mov w5, #4-; block6: ; offset 0x58+; block6: ; offset 0x54; add w0, w0, w5; ret@@ -124,20 +123,19 @@ block2:; ldr x5, [x0]; mov x8, x5; cmp w0, #1-; b.hs #0x40+; b.hs #0x3c; csel x7, xzr, x0, hs-; csdb-; adr x6, #0x2c+; adr x6, #0x28; ldrsw x7, [x6, w7, uxtw #2]; add x6, x6, x7; br x6; .byte 0x04, 0x00, 0x00, 0x00-; block2: ; offset 0x30+; block2: ; offset 0x2c; hint #0x24; mov x0, x8; add x0, x0, #0x2a; ret-; block3: ; offset 0x40+; block3: ; offset 0x3c; mov x0, x8; retdiff --git a/cranelift/filetests/filetests/isa/aarch64/bti_with_csdb.clif b/cranelift/filetests/filetests/isa/aarch64/bti_with_csdb.clifnew file mode 100644index 0000000000..3c00aee534--- /dev/null+++ b/cranelift/filetests/filetests/isa/aarch64/bti_with_csdb.clif@@ -0,0 +1,174 @@+test compile precise-output+set unwind_info=false+target aarch64 use_bti use_csdb++function %f1(i32) -> i32 {+block0(v0: i32):+ br_table v0, block4, [block1, block2, block3]++block1:+ v1 = iconst.i32 1+ jump block5(v1)++block2:+ v2 = iconst.i32 2+ jump block5(v2)++block3:+ v3 = iconst.i32 3+ jump block5(v3)++block4:+ v4 = iconst.i32 4+ jump block5(v4)++block5(v5: i32):+ v6 = iadd.i32 v0, v5+ return v6+}++; VCode:+; bti c+; block0:+; emit_island 44+; subs wzr, w0, #3+; b.hs label4 ; csel x11, xzr, x0, hs ; csdb ; adr x10, pc+16 ; ldrsw x11, [x10, x11, uxtw #2] ; add x10, x10, x11 ; br x10 ; jt_entries [MachLabel(3), MachLabel(2), MachLabel(1)]+; block1:+; bti j+; movz w5, #3+; b label5+; block2:+; bti j+; movz w5, #2+; b label5+; block3:+; bti j+; movz w5, #1+; b label5+; block4:+; movz w5, #4+; b label5+; block5:+; add w0, w0, w5+; ret+;+; Disassembled:+; block0: ; offset 0x0+; hint #0x22+; block1: ; offset 0x4+; cmp w0, #3+; b.hs #0x54+; csel x11, xzr, x0, hs+; csdb+; adr x10, #0x24+; ldrsw x11, [x10, w11, uxtw #2]+; add x10, x10, x11+; br x10+; .byte 0x24, 0x00, 0x00, 0x00+; .byte 0x18, 0x00, 0x00, 0x00+; .byte 0x0c, 0x00, 0x00, 0x00+; block2: ; offset 0x30+; hint #0x24+; mov w5, #3+; b #0x58+; block3: ; offset 0x3c+; hint #0x24+; mov w5, #2+; b #0x58+; block4: ; offset 0x48+; hint #0x24+; mov w5, #1+; b #0x58+; block5: ; offset 0x54+; mov w5, #4+; block6: ; offset 0x58+; add w0, w0, w5+; ret++function %f2(i64) -> i64 {+block0(v0: i64):+ v1 = ireduce.i32 v0+ v2 = load.i64 notrap aligned table v0+ br_table v1, block1, [block2]++block1:+ return v2++block2:+ v3 = iconst.i64 42+ v4 = iadd.i64 v2, v3+ return v4+}++; VCode:+; bti c+; block0:+; ldr x5, [x0]+; mov x8, x5+; emit_island 36+; subs wzr, w0, #1+; b.hs label2 ; csel x7, xzr, x0, hs ; csdb ; adr x6, pc+16 ; ldrsw x7, [x6, x7, uxtw #2] ; add x6, x6, x7 ; br x6 ; jt_entries [MachLabel(1)]+; block1:+; bti j+; mov x0, x8+; add x0, x0, #42+; ret+; block2:+; mov x0, x8+; ret+;+; Disassembled:+; block0: ; offset 0x0+; hint #0x22+; block1: ; offset 0x4+; ldr x5, [x0]+; mov x8, x5+; cmp w0, #1+; b.hs #0x40+; csel x7, xzr, x0, hs+; csdb+; adr x6, #0x2c+; ldrsw x7, [x6, w7, uxtw #2]+; add x6, x6, x7+; br x6+; .byte 0x04, 0x00, 0x00, 0x00+; block2: ; offset 0x30+; hint #0x24+; mov x0, x8+; add x0, x0, #0x2a+; ret+; block3: ; offset 0x40+; mov x0, x8+; ret++function %f3(i64) -> i64 {+ fn0 = %g(i64) -> i64++block0(v0: i64):+ v1 = call fn0(v0)+ return v1+}++; VCode:+; bti c+; stp fp, lr, [sp, #-16]!+; mov fp, sp+; block0:+; load_ext_name_far x3, TestCase(%g)+0+; blr x3+; ldp fp, lr, [sp], #16+; ret+;+; Disassembled:+; block0: ; offset 0x0+; hint #0x22+; stp x29, x30, [sp, #-0x10]!+; mov x29, sp+; block1: ; offset 0xc+; ldr x3, #0x14+; b #0x1c+; .byte 0x00, 0x00, 0x00, 0x00 ; reloc_external Abs8 %g 0+; .byte 0x00, 0x00, 0x00, 0x00+; blr x3+; ldp x29, x30, [sp], #0x10+; retdiff --git a/cranelift/filetests/filetests/isa/aarch64/condops-with-csdb.clif b/cranelift/filetests/filetests/isa/aarch64/condops-with-csdb.clifnew file mode 100644index 0000000000..55f22b8750--- /dev/null+++ b/cranelift/filetests/filetests/isa/aarch64/condops-with-csdb.clif@@ -0,0 +1,1282 @@+test compile precise-output+set unwind_info=false+target aarch64 use_csdb++function %f(i8, i8, i8) -> i8 {+block0(v0: i8, v1: i8, v2: i8):+ v3 = iconst.i8 42+ v4 = icmp eq v0, v3+ v5 = select v4, v1, v2+ return v5+}++; VCode:+; block0:+; uxtb w4, w0+; subs wzr, w4, #42+; csel x0, x1, x2, eq+; ret+;+; Disassembled:+; block0: ; offset 0x0+; uxtb w4, w0+; cmp w4, #0x2a+; csel x0, x1, x2, eq+; ret++function %f(i8, i16, i16) -> i16 {+block0(v0: i8, v1: i16, v2: i16):+ v3 = iconst.i8 42+ v4 = icmp eq v0, v3+ v5 = select v4, v1, v2+ return v5+}++; VCode:+; block0:+; uxtb w4, w0+; subs wzr, w4, #42+; csel x0, x1, x2, eq+; ret+;+; Disassembled:+; block0: ; offset 0x0+; uxtb w4, w0+; cmp w4, #0x2a+; csel x0, x1, x2, eq+; ret++function %f(i8, i32, i32) -> i32 {+block0(v0: i8, v1: i32, v2: i32):+ v3 = iconst.i8 42+ v4 = icmp eq v0, v3+ v5 = select v4, v1, v2+ return v5+}++; VCode:+; block0:+; uxtb w4, w0+; subs wzr, w4, #42+; csel x0, x1, x2, eq+; ret+;+; Disassembled:+; block0: ; offset 0x0+; uxtb w4, w0+; cmp w4, #0x2a+; csel x0, x1, x2, eq+; ret++function %f(i8, i64, i64) -> i64 {+block0(v0: i8, v1: i64, v2: i64):+ v3 = iconst.i8 42+ v4 = icmp eq v0, v3+ v5 = select v4, v1, v2+ return v5+}++; VCode:+; block0:+; uxtb w4, w0+; subs wzr, w4, #42+; csel x0, x1, x2, eq+; ret+;+; Disassembled:+; block0: ; offset 0x0+; uxtb w4, w0+; cmp w4, #0x2a+; csel x0, x1, x2, eq+; ret++function %f(i8, i128, i128) -> i128 {+block0(v0: i8, v1: i128, v2: i128):+ v3 = iconst.i8 42+ v4 = icmp eq v0, v3+ v5 = select v4, v1, v2+ return v5+}++; VCode:+; block0:+; uxtb w6, w0+; subs wzr, w6, #42+; csel x0, x2, x4, eq+; csel x1, x3, x5, eq+; ret+;+; Disassembled:+; block0: ; offset 0x0+; uxtb w6, w0+; cmp w6, #0x2a+; csel x0, x2, x4, eq+; csel x1, x3, x5, eq+; ret++function %f(i16, i8, i8) -> i8 {+block0(v0: i16, v1: i8, v2: i8):+ v3 = iconst.i16 42+ v4 = icmp eq v0, v3+ v5 = select v4, v1, v2+ return v5+}++; VCode:+; block0:+; uxth w4, w0+; subs wzr, w4, #42+; csel x0, x1, x2, eq+; ret+;+; Disassembled:+; block0: ; offset 0x0+; uxth w4, w0+; cmp w4, #0x2a+; csel x0, x1, x2, eq+; ret++function %f(i16, i16, i16) -> i16 {+block0(v0: i16, v1: i16, v2: i16):+ v3 = iconst.i16 42+ v4 = icmp eq v0, v3+ v5 = select v4, v1, v2+ return v5+}++; VCode:+; block0:+; uxth w4, w0+; subs wzr, w4, #42+; csel x0, x1, x2, eq+; ret+;+; Disassembled:+; block0: ; offset 0x0+; uxth w4, w0+; cmp w4, #0x2a+; csel x0, x1, x2, eq+; ret++function %f(i16, i32, i32) -> i32 {+block0(v0: i16, v1: i32, v2: i32):+ v3 = iconst.i16 42+ v4 = icmp eq v0, v3+ v5 = select v4, v1, v2+ return v5+}++; VCode:+; block0:+; uxth w4, w0+; subs wzr, w4, #42+; csel x0, x1, x2, eq+; ret+;+; Disassembled:+; block0: ; offset 0x0+; uxth w4, w0+; cmp w4, #0x2a+; csel x0, x1, x2, eq+; ret++function %f(i16, i64, i64) -> i64 {+block0(v0: i16, v1: i64, v2: i64):+ v3 = iconst.i16 42+ v4 = icmp eq v0, v3+ v5 = select v4, v1, v2+ return v5+}++; VCode:+; block0:+; uxth w4, w0+; subs wzr, w4, #42+; csel x0, x1, x2, eq+; ret+;+; Disassembled:+; block0: ; offset 0x0+; uxth w4, w0+; cmp w4, #0x2a+; csel x0, x1, x2, eq+; ret++function %f(i16, i128, i128) -> i128 {+block0(v0: i16, v1: i128, v2: i128):+ v3 = iconst.i16 42+ v4 = icmp eq v0, v3+ v5 = select v4, v1, v2+ return v5+}++; VCode:+; block0:+; uxth w6, w0+; subs wzr, w6, #42+; csel x0, x2, x4, eq+; csel x1, x3, x5, eq+; ret+;+; Disassembled:+; block0: ; offset 0x0+; uxth w6, w0+; cmp w6, #0x2a+; csel x0, x2, x4, eq+; csel x1, x3, x5, eq+; ret++function %f(i32, i8, i8) -> i8 {+block0(v0: i32, v1: i8, v2: i8):+ v3 = iconst.i32 42+ v4 = icmp eq v0, v3+ v5 = select v4, v1, v2+ return v5+}++; VCode:+; block0:+; subs wzr, w0, #42+; csel x0, x1, x2, eq+; ret+;+; Disassembled:+; block0: ; offset 0x0+; cmp w0, #0x2a+; csel x0, x1, x2, eq+; ret++function %f(i32, i16, i16) -> i16 {+block0(v0: i32, v1: i16, v2: i16):+ v3 = iconst.i32 42+ v4 = icmp eq v0, v3+ v5 = select v4, v1, v2+ return v5+}++; VCode:+; block0:+; subs wzr, w0, #42+; csel x0, x1, x2, eq+; ret+;+; Disassembled:+; block0: ; offset 0x0+; cmp w0, #0x2a+; csel x0, x1, x2, eq+; ret++function %f(i32, i32, i32) -> i32 {+block0(v0: i32, v1: i32, v2: i32):+ v3 = iconst.i32 42+ v4 = icmp eq v0, v3+ v5 = select v4, v1, v2+ return v5+}++; VCode:+; block0:+; subs wzr, w0, #42+; csel x0, x1, x2, eq+; ret+;+; Disassembled:+; block0: ; offset 0x0+; cmp w0, #0x2a+; csel x0, x1, x2, eq+; ret++function %f(i32, i64, i64) -> i64 {+block0(v0: i32, v1: i64, v2: i64):+ v3 = iconst.i32 42+ v4 = icmp eq v0, v3+ v5 = select v4, v1, v2+ return v5+}++; VCode:+; block0:+; subs wzr, w0, #42+; csel x0, x1, x2, eq+; ret+;+; Disassembled:+; block0: ; offset 0x0+; cmp w0, #0x2a+; csel x0, x1, x2, eq+; ret++function %f(i32, i128, i128) -> i128 {+block0(v0: i32, v1: i128, v2: i128):+ v3 = iconst.i32 42+ v4 = icmp eq v0, v3+ v5 = select v4, v1, v2+ return v5+}++; VCode:+; block0:+; subs wzr, w0, #42+; csel x0, x2, x4, eq+; csel x1, x3, x5, eq+; ret+;+; Disassembled:+; block0: ; offset 0x0+; cmp w0, #0x2a+; csel x0, x2, x4, eq+; csel x1, x3, x5, eq+; ret++function %f(i64, i8, i8) -> i8 {+block0(v0: i64, v1: i8, v2: i8):+ v3 = iconst.i64 42+ v4 = icmp eq v0, v3+ v5 = select v4, v1, v2+ return v5+}++; VCode:+; block0:+; subs xzr, x0, #42+; csel x0, x1, x2, eq+; ret+;+; Disassembled:+; block0: ; offset 0x0+; cmp x0, #0x2a+; csel x0, x1, x2, eq+; ret++function %f(i64, i16, i16) -> i16 {+block0(v0: i64, v1: i16, v2: i16):+ v3 = iconst.i64 42+ v4 = icmp eq v0, v3+ v5 = select v4, v1, v2+ return v5+}++; VCode:+; block0:+; subs xzr, x0, #42+; csel x0, x1, x2, eq+; ret+;+; Disassembled:+; block0: ; offset 0x0+; cmp x0, #0x2a+; csel x0, x1, x2, eq+; ret++function %f(i64, i32, i32) -> i32 {+block0(v0: i64, v1: i32, v2: i32):+ v3 = iconst.i64 42+ v4 = icmp eq v0, v3+ v5 = select v4, v1, v2+ return v5+}++; VCode:+; block0:+; subs xzr, x0, #42+; csel x0, x1, x2, eq+; ret+;+; Disassembled:+; block0: ; offset 0x0+; cmp x0, #0x2a+; csel x0, x1, x2, eq+; ret++function %f(i64, i64, i64) -> i64 {+block0(v0: i64, v1: i64, v2: i64):+ v3 = iconst.i64 42+ v4 = icmp eq v0, v3+ v5 = select v4, v1, v2+ return v5+}++; VCode:+; block0:+; subs xzr, x0, #42+; csel x0, x1, x2, eq+; ret+;+; Disassembled:+; block0: ; offset 0x0+; cmp x0, #0x2a+; csel x0, x1, x2, eq+; ret++function %f(i64, i128, i128) -> i128 {+block0(v0: i64, v1: i128, v2: i128):+ v3 = iconst.i64 42+ v4 = icmp eq v0, v3+ v5 = select v4, v1, v2+ return v5+}++; VCode:+; block0:+; subs xzr, x0, #42+; csel x0, x2, x4, eq+; csel x1, x3, x5, eq+; ret+;+; Disassembled:+; block0: ; offset 0x0+; cmp x0, #0x2a+; csel x0, x2, x4, eq+; csel x1, x3, x5, eq+; ret++function %f(i128, i8, i8) -> i8 {+block0(v0: i128, v1: i8, v2: i8):+ v3 = iconst.i64 42+ v4 = uextend.i128 v3+ v5 = icmp eq v0, v4+ v6 = select.i8 v5, v1, v2+ return v6+}++; VCode:+; block0:+; movz x7, #42+; movz x8, #0+; subs xzr, x0, x7+; ccmp x1, x8, #nzcv, eq+; csel x0, x2, x3, eq+; ret+;+; Disassembled:+; block0: ; offset 0x0+; mov x7, #0x2a+; mov x8, #0+; cmp x0, x7+; ccmp x1, x8, #0, eq+; csel x0, x2, x3, eq+; ret++function %f(i128, i16, i16) -> i16 {+block0(v0: i128, v1: i16, v2: i16):+ v3 = iconst.i64 42+ v4 = uextend.i128 v3+ v5 = icmp eq v0, v4+ v6 = select.i16 v5, v1, v2+ return v6+}++; VCode:+; block0:+; movz x7, #42+; movz x8, #0+; subs xzr, x0, x7+; ccmp x1, x8, #nzcv, eq+; csel x0, x2, x3, eq+; ret+;+; Disassembled:+; block0: ; offset 0x0+; mov x7, #0x2a+; mov x8, #0+; cmp x0, x7+; ccmp x1, x8, #0, eq+; csel x0, x2, x3, eq+; ret++function %f(i128, i32, i32) -> i32 {+block0(v0: i128, v1: i32, v2: i32):+ v3 = iconst.i64 42+ v4 = uextend.i128 v3+ v5 = icmp eq v0, v4+ v6 = select.i32 v5, v1, v2+ return v6+}++; VCode:+; block0:+; movz x7, #42+; movz x8, #0+; subs xzr, x0, x7+; ccmp x1, x8, #nzcv, eq+; csel x0, x2, x3, eq+; ret+;+; Disassembled:+; block0: ; offset 0x0+; mov x7, #0x2a+; mov x8, #0+; cmp x0, x7+; ccmp x1, x8, #0, eq+; csel x0, x2, x3, eq+; ret++function %f(i128, i64, i64) -> i64 {+block0(v0: i128, v1: i64, v2: i64):+ v3 = iconst.i64 42+ v4 = uextend.i128 v3+ v5 = icmp eq v0, v4+ v6 = select.i64 v5, v1, v2+ return v6+}++; VCode:+; block0:+; movz x7, #42+; movz x8, #0+; subs xzr, x0, x7+; ccmp x1, x8, #nzcv, eq+; csel x0, x2, x3, eq+; ret+;+; Disassembled:+; block0: ; offset 0x0+; mov x7, #0x2a+; mov x8, #0+; cmp x0, x7+; ccmp x1, x8, #0, eq+; csel x0, x2, x3, eq+; ret++function %f(i128, i128, i128) -> i128 {+block0(v0: i128, v1: i128, v2: i128):+ v3 = iconst.i64 42+ v4 = uextend.i128 v3+ v5 = icmp eq v0, v4+ v6 = select.i128 v5, v1, v2+ return v6+}++; VCode:+; block0:+; movz x10, #42+; movz x11, #0+; subs xzr, x0, x10+; ccmp x1, x11, #nzcv, eq+; csel x0, x2, x4, eq+; csel x1, x3, x5, eq+; ret+;+; Disassembled:+; block0: ; offset 0x0+; mov x10, #0x2a+; mov x11, #0+; cmp x0, x10+; ccmp x1, x11, #0, eq+; csel x0, x2, x4, eq+; csel x1, x3, x5, eq+; ret++function %f(i8, i8, i8) -> i8 {+block0(v0: i8, v1: i8, v2: i8):+ v3 = iconst.i8 42+ v4 = icmp eq v0, v3+ v5 = select_spectre_guard.i8 v4, v1, v2+ return v5+}++; VCode:+; block0:+; uxtb w4, w0+; subs wzr, w4, #42+; csel x0, x1, x2, eq+; csdb+; ret+;+; Disassembled:+; block0: ; offset 0x0+; uxtb w4, w0+; cmp w4, #0x2a+; csel x0, x1, x2, eq+; csdb+; ret++function %f(i8, i16, i16) -> i16 {+block0(v0: i8, v1: i16, v2: i16):+ v3 = iconst.i8 42+ v4 = icmp eq v0, v3+ v5 = select_spectre_guard.i16 v4, v1, v2+ return v5+}++; VCode:+; block0:+; uxtb w4, w0+; subs wzr, w4, #42+; csel x0, x1, x2, eq+; csdb+; ret+;+; Disassembled:+; block0: ; offset 0x0+; uxtb w4, w0+; cmp w4, #0x2a+; csel x0, x1, x2, eq+; csdb+; ret++function %f(i8, i32, i32) -> i32 {+block0(v0: i8, v1: i32, v2: i32):+ v3 = iconst.i8 42+ v4 = icmp eq v0, v3+ v5 = select_spectre_guard.i32 v4, v1, v2+ return v5+}++; VCode:+; block0:+; uxtb w4, w0+; subs wzr, w4, #42+; csel x0, x1, x2, eq+; csdb+; ret+;+; Disassembled:+; block0: ; offset 0x0+; uxtb w4, w0+; cmp w4, #0x2a+; csel x0, x1, x2, eq+; csdb+; ret++function %f(i8, i64, i64) -> i64 {+block0(v0: i8, v1: i64, v2: i64):+ v3 = iconst.i8 42+ v4 = icmp eq v0, v3+ v5 = select_spectre_guard.i64 v4, v1, v2+ return v5+}++; VCode:+; block0:+; uxtb w4, w0+; subs wzr, w4, #42+; csel x0, x1, x2, eq+; csdb+; ret+;+; Disassembled:+; block0: ; offset 0x0+; uxtb w4, w0+; cmp w4, #0x2a+; csel x0, x1, x2, eq+; csdb+; ret++function %f(i8, i128, i128) -> i128 {+block0(v0: i8, v1: i128, v2: i128):+ v3 = iconst.i8 42+ v4 = icmp eq v0, v3+ v5 = select_spectre_guard.i128 v4, v1, v2+ return v5+}++; VCode:+; block0:+; uxtb w6, w0+; subs wzr, w6, #42+; csel x0, x2, x4, eq+; csel x1, x3, x5, eq+; csdb+; ret+;+; Disassembled:+; block0: ; offset 0x0+; uxtb w6, w0+; cmp w6, #0x2a+; csel x0, x2, x4, eq+; csel x1, x3, x5, eq+; csdb+; ret++function %f(i16, i8, i8) -> i8 {+block0(v0: i16, v1: i8, v2: i8):+ v3 = iconst.i16 42+ v4 = icmp eq v0, v3+ v5 = select_spectre_guard.i8 v4, v1, v2+ return v5+}++; VCode:+; block0:+; uxth w4, w0+; subs wzr, w4, #42+; csel x0, x1, x2, eq+; csdb+; ret+;+; Disassembled:+; block0: ; offset 0x0+; uxth w4, w0+; cmp w4, #0x2a+; csel x0, x1, x2, eq+; csdb+; ret++function %f(i16, i16, i16) -> i16 {+block0(v0: i16, v1: i16, v2: i16):+ v3 = iconst.i16 42+ v4 = icmp eq v0, v3+ v5 = select_spectre_guard.i16 v4, v1, v2+ return v5+}++; VCode:+; block0:+; uxth w4, w0+; subs wzr, w4, #42+; csel x0, x1, x2, eq+; csdb+; ret+;+; Disassembled:+; block0: ; offset 0x0+; uxth w4, w0+; cmp w4, #0x2a+; csel x0, x1, x2, eq+; csdb+; ret++function %f(i16, i32, i32) -> i32 {+block0(v0: i16, v1: i32, v2: i32):+ v3 = iconst.i16 42+ v4 = icmp eq v0, v3+ v5 = select_spectre_guard.i32 v4, v1, v2+ return v5+}++; VCode:+; block0:+; uxth w4, w0+; subs wzr, w4, #42+; csel x0, x1, x2, eq+; csdb+; ret+;+; Disassembled:+; block0: ; offset 0x0+; uxth w4, w0+; cmp w4, #0x2a+; csel x0, x1, x2, eq+; csdb+; ret++function %f(i16, i64, i64) -> i64 {+block0(v0: i16, v1: i64, v2: i64):+ v3 = iconst.i16 42+ v4 = icmp eq v0, v3+ v5 = select_spectre_guard.i64 v4, v1, v2+ return v5+}++; VCode:+; block0:+; uxth w4, w0+; subs wzr, w4, #42+; csel x0, x1, x2, eq+; csdb+; ret+;+; Disassembled:+; block0: ; offset 0x0+; uxth w4, w0+; cmp w4, #0x2a+; csel x0, x1, x2, eq+; csdb+; ret++function %f(i16, i128, i128) -> i128 {+block0(v0: i16, v1: i128, v2: i128):+ v3 = iconst.i16 42+ v4 = icmp eq v0, v3+ v5 = select_spectre_guard.i128 v4, v1, v2+ return v5+}++; VCode:+; block0:+; uxth w6, w0+; subs wzr, w6, #42+; csel x0, x2, x4, eq+; csel x1, x3, x5, eq+; csdb+; ret+;+; Disassembled:+; block0: ; offset 0x0+; uxth w6, w0+; cmp w6, #0x2a+; csel x0, x2, x4, eq+; csel x1, x3, x5, eq+; csdb+; ret++function %f(i32, i8, i8) -> i8 {+block0(v0: i32, v1: i8, v2: i8):+ v3 = iconst.i32 42+ v4 = icmp eq v0, v3+ v5 = select_spectre_guard.i8 v4, v1, v2+ return v5+}++; VCode:+; block0:+; subs wzr, w0, #42+; csel x0, x1, x2, eq+; csdb+; ret+;+; Disassembled:+; block0: ; offset 0x0+; cmp w0, #0x2a+; csel x0, x1, x2, eq+; csdb+; ret++function %f(i32, i16, i16) -> i16 {+block0(v0: i32, v1: i16, v2: i16):+ v3 = iconst.i32 42+ v4 = icmp eq v0, v3+ v5 = select_spectre_guard.i16 v4, v1, v2+ return v5+}++; VCode:+; block0:+; subs wzr, w0, #42+; csel x0, x1, x2, eq+; csdb+; ret+;+; Disassembled:+; block0: ; offset 0x0+; cmp w0, #0x2a+; csel x0, x1, x2, eq+; csdb+; ret++function %f(i32, i32, i32) -> i32 {+block0(v0: i32, v1: i32, v2: i32):+ v3 = iconst.i32 42+ v4 = icmp eq v0, v3+ v5 = select_spectre_guard.i32 v4, v1, v2+ return v5+}++; VCode:+; block0:+; subs wzr, w0, #42+; csel x0, x1, x2, eq+; csdb+; ret+;+; Disassembled:+; block0: ; offset 0x0+; cmp w0, #0x2a+; csel x0, x1, x2, eq+; csdb+; ret++function %f(i32, i64, i64) -> i64 {+block0(v0: i32, v1: i64, v2: i64):+ v3 = iconst.i32 42+ v4 = icmp eq v0, v3+ v5 = select_spectre_guard.i64 v4, v1, v2+ return v5+}++; VCode:+; block0:+; subs wzr, w0, #42+; csel x0, x1, x2, eq+; csdb+; ret+;+; Disassembled:+; block0: ; offset 0x0+; cmp w0, #0x2a+; csel x0, x1, x2, eq+; csdb+; ret++function %f(i32, i128, i128) -> i128 {+block0(v0: i32, v1: i128, v2: i128):+ v3 = iconst.i32 42+ v4 = icmp eq v0, v3+ v5 = select_spectre_guard.i128 v4, v1, v2+ return v5+}++; VCode:+; block0:+; subs wzr, w0, #42+; csel x0, x2, x4, eq+; csel x1, x3, x5, eq+; csdb+; ret+;+; Disassembled:+; block0: ; offset 0x0+; cmp w0, #0x2a+; csel x0, x2, x4, eq+; csel x1, x3, x5, eq+; csdb+; ret++function %f(i64, i8, i8) -> i8 {+block0(v0: i64, v1: i8, v2: i8):+ v3 = iconst.i64 42+ v4 = icmp eq v0, v3+ v5 = select_spectre_guard.i8 v4, v1, v2+ return v5+}++; VCode:+; block0:+; subs xzr, x0, #42+; csel x0, x1, x2, eq+; csdb+; ret+;+; Disassembled:+; block0: ; offset 0x0+; cmp x0, #0x2a+; csel x0, x1, x2, eq+; csdb+; ret++function %f(i64, i16, i16) -> i16 {+block0(v0: i64, v1: i16, v2: i16):+ v3 = iconst.i64 42+ v4 = icmp eq v0, v3+ v5 = select_spectre_guard.i16 v4, v1, v2+ return v5+}++; VCode:+; block0:+; subs xzr, x0, #42+; csel x0, x1, x2, eq+; csdb+; ret+;+; Disassembled:+; block0: ; offset 0x0+; cmp x0, #0x2a+; csel x0, x1, x2, eq+; csdb+; ret++function %f(i64, i32, i32) -> i32 {+block0(v0: i64, v1: i32, v2: i32):+ v3 = iconst.i64 42+ v4 = icmp eq v0, v3+ v5 = select_spectre_guard.i32 v4, v1, v2+ return v5+}++; VCode:+; block0:+; subs xzr, x0, #42+; csel x0, x1, x2, eq+; csdb+; ret+;+; Disassembled:+; block0: ; offset 0x0+; cmp x0, #0x2a+; csel x0, x1, x2, eq+; csdb+; ret++function %f(i64, i64, i64) -> i64 {+block0(v0: i64, v1: i64, v2: i64):+ v3 = iconst.i64 42+ v4 = icmp eq v0, v3+ v5 = select_spectre_guard.i64 v4, v1, v2+ return v5+}++; VCode:+; block0:+; subs xzr, x0, #42+; csel x0, x1, x2, eq+; csdb+; ret+;+; Disassembled:+; block0: ; offset 0x0+; cmp x0, #0x2a+; csel x0, x1, x2, eq+; csdb+; ret++function %f(i64, i128, i128) -> i128 {+block0(v0: i64, v1: i128, v2: i128):+ v3 = iconst.i64 42+ v4 = icmp eq v0, v3+ v5 = select_spectre_guard.i128 v4, v1, v2+ return v5+}++; VCode:+; block0:+; subs xzr, x0, #42+; csel x0, x2, x4, eq+; csel x1, x3, x5, eq+; csdb+; ret+;+; Disassembled:+; block0: ; offset 0x0+; cmp x0, #0x2a+; csel x0, x2, x4, eq+; csel x1, x3, x5, eq+; csdb+; ret++function %f(i128, i8, i8) -> i8 {+block0(v0: i128, v1: i8, v2: i8):+ v3 = iconst.i64 42+ v4 = uextend.i128 v3+ v5 = icmp eq v0, v4+ v6 = select_spectre_guard.i8 v5, v1, v2+ return v6+}++; VCode:+; block0:+; movz x7, #42+; movz x8, #0+; subs xzr, x0, x7+; ccmp x1, x8, #nzcv, eq+; csel x0, x2, x3, eq+; csdb+; ret+;+; Disassembled:+; block0: ; offset 0x0+; mov x7, #0x2a+; mov x8, #0+; cmp x0, x7+; ccmp x1, x8, #0, eq+; csel x0, x2, x3, eq+; csdb+; ret++function %f(i128, i16, i16) -> i16 {+block0(v0: i128, v1: i16, v2: i16):+ v3 = iconst.i64 42+ v4 = uextend.i128 v3+ v5 = icmp eq v0, v4+ v6 = select_spectre_guard.i16 v5, v1, v2+ return v6+}++; VCode:+; block0:+; movz x7, #42+; movz x8, #0+; subs xzr, x0, x7+; ccmp x1, x8, #nzcv, eq+; csel x0, x2, x3, eq+; csdb+; ret+;+; Disassembled:+; block0: ; offset 0x0+; mov x7, #0x2a+; mov x8, #0+; cmp x0, x7+; ccmp x1, x8, #0, eq+; csel x0, x2, x3, eq+; csdb+; ret++function %f(i128, i32, i32) -> i32 {+block0(v0: i128, v1: i32, v2: i32):+ v3 = iconst.i64 42+ v4 = uextend.i128 v3+ v5 = icmp eq v0, v4+ v6 = select_spectre_guard.i32 v5, v1, v2+ return v6+}++; VCode:+; block0:+; movz x7, #42+; movz x8, #0+; subs xzr, x0, x7+; ccmp x1, x8, #nzcv, eq+; csel x0, x2, x3, eq+; csdb+; ret+;+; Disassembled:+; block0: ; offset 0x0+; mov x7, #0x2a+; mov x8, #0+; cmp x0, x7+; ccmp x1, x8, #0, eq+; csel x0, x2, x3, eq+; csdb+; ret++function %f(i128, i64, i64) -> i64 {+block0(v0: i128, v1: i64, v2: i64):+ v3 = iconst.i64 42+ v4 = uextend.i128 v3+ v5 = icmp eq v0, v4+ v6 = select_spectre_guard.i64 v5, v1, v2+ return v6+}++; VCode:+; block0:+; movz x7, #42+; movz x8, #0+; subs xzr, x0, x7+; ccmp x1, x8, #nzcv, eq+; csel x0, x2, x3, eq+; csdb+; ret+;+; Disassembled:+; block0: ; offset 0x0+; mov x7, #0x2a+; mov x8, #0+; cmp x0, x7+; ccmp x1, x8, #0, eq+; csel x0, x2, x3, eq+; csdb+; ret++function %f(i128, i128, i128) -> i128 {+block0(v0: i128, v1: i128, v2: i128):+ v3 = iconst.i64 42+ v4 = uextend.i128 v3+ v5 = icmp eq v0, v4+ v6 = select_spectre_guard.i128 v5, v1, v2+ return v6+}++; VCode:+; block0:+; movz x10, #42+; movz x11, #0+; subs xzr, x0, x10+; ccmp x1, x11, #nzcv, eq+; csel x0, x2, x4, eq+; csel x1, x3, x5, eq+; csdb+; ret+;+; Disassembled:+; block0: ; offset 0x0+; mov x10, #0x2a+; mov x11, #0+; cmp x0, x10+; ccmp x1, x11, #0, eq+; csel x0, x2, x4, eq+; csel x1, x3, x5, eq+; csdb+; ret++function %g(i8) -> i8 {+block0(v0: i8):+ v3 = iconst.i8 42+ v4 = icmp eq v0, v3+ return v4+}++; VCode:+; block0:+; uxtb w2, w0+; subs wzr, w2, #42+; cset x0, eq+; ret+;+; Disassembled:+; block0: ; offset 0x0+; uxtb w2, w0+; cmp w2, #0x2a+; cset x0, eq+; ret++function %h(i8, i8, i8) -> i8 {+block0(v0: i8, v1: i8, v2: i8):+ v3 = bitselect.i8 v0, v1, v2+ return v3+}++; VCode:+; block0:+; and w4, w1, w0+; bic w6, w2, w0+; orr w0, w4, w6+; ret+;+; Disassembled:+; block0: ; offset 0x0+; and w4, w1, w0+; bic w6, w2, w0+; orr w0, w4, w6+; ret++function %i(i8, i8, i8) -> i8 {+block0(v0: i8, v1: i8, v2: i8):+ v3 = select.i8 v0, v1, v2+ return v3+}++; VCode:+; block0:+; ands wzr, w0, #255+; csel x0, x1, x2, ne+; ret+;+; Disassembled:+; block0: ; offset 0x0+; tst w0, #0xff+; csel x0, x1, x2, ne+; ret++function %i(i32, i8, i8) -> i8 {+block0(v0: i32, v1: i8, v2: i8):+ v3 = iconst.i32 42+ v4 = icmp.i32 eq v0, v3+ v5 = select.i8 v4, v1, v2+ return v5+}++; VCode:+; block0:+; subs wzr, w0, #42+; csel x0, x1, x2, eq+; ret+;+; Disassembled:+; block0: ; offset 0x0+; cmp w0, #0x2a+; csel x0, x1, x2, eq+; ret++function %i128_select(i8, i128, i128) -> i128 {+block0(v0: i8, v1: i128, v2: i128):+ v3 = select.i128 v0, v1, v2+ return v3+}++; VCode:+; block0:+; ands wzr, w0, #255+; csel x0, x2, x4, ne+; csel x1, x3, x5, ne+; ret+;+; Disassembled:+; block0: ; offset 0x0+; tst w0, #0xff+; csel x0, x2, x4, ne+; csel x1, x3, x5, ne+; retdiff --git a/cranelift/filetests/filetests/isa/aarch64/condops.clif b/cranelift/filetests/filetests/isa/aarch64/condops.clifindex 63917f0951..38e78fdf0b 100644--- a/cranelift/filetests/filetests/isa/aarch64/condops.clif+++ b/cranelift/filetests/filetests/isa/aarch64/condops.clif@@ -580,7 +580,6 @@ block0(v0: i8, v1: i8, v2: i8):; uxtb w4, w0; subs wzr, w4, #42; csel x0, x1, x2, eq-; csdb; ret;; Disassembled:@@ -588,7 +587,6 @@ block0(v0: i8, v1: i8, v2: i8):; uxtb w4, w0; cmp w4, #0x2a; csel x0, x1, x2, eq-; csdb; retfunction %f(i8, i16, i16) -> i16 {@@ -604,7 +602,6 @@ block0(v0: i8, v1: i16, v2: i16):; uxtb w4, w0; subs wzr, w4, #42; csel x0, x1, x2, eq-; csdb; ret;; Disassembled:@@ -612,7 +609,6 @@ block0(v0: i8, v1: i16, v2: i16):; uxtb w4, w0; cmp w4, #0x2a; csel x0, x1, x2, eq-; csdb; retfunction %f(i8, i32, i32) -> i32 {@@ -628,7 +624,6 @@ block0(v0: i8, v1: i32, v2: i32):; uxtb w4, w0; subs wzr, w4, #42; csel x0, x1, x2, eq-; csdb; ret;; Disassembled:@@ -636,7 +631,6 @@ block0(v0: i8, v1: i32, v2: i32):; uxtb w4, w0; cmp w4, #0x2a; csel x0, x1, x2, eq-; csdb; retfunction %f(i8, i64, i64) -> i64 {@@ -652,7 +646,6 @@ block0(v0: i8, v1: i64, v2: i64):; uxtb w4, w0; subs wzr, w4, #42; csel x0, x1, x2, eq-; csdb; ret;; Disassembled:@@ -660,7 +653,6 @@ block0(v0: i8, v1: i64, v2: i64):; uxtb w4, w0; cmp w4, #0x2a; csel x0, x1, x2, eq-; csdb; retfunction %f(i8, i128, i128) -> i128 {@@ -677,7 +669,6 @@ block0(v0: i8, v1: i128, v2: i128):; subs wzr, w6, #42; csel x0, x2, x4, eq; csel x1, x3, x5, eq-; csdb; ret;; Disassembled:@@ -686,7 +677,6 @@ block0(v0: i8, v1: i128, v2: i128):; cmp w6, #0x2a; csel x0, x2, x4, eq; csel x1, x3, x5, eq-; csdb; retfunction %f(i16, i8, i8) -> i8 {@@ -702,7 +692,6 @@ block0(v0: i16, v1: i8, v2: i8):; uxth w4, w0; subs wzr, w4, #42; csel x0, x1, x2, eq-; csdb; ret;; Disassembled:@@ -710,7 +699,6 @@ block0(v0: i16, v1: i8, v2: i8):; uxth w4, w0; cmp w4, #0x2a; csel x0, x1, x2, eq-; csdb; retfunction %f(i16, i16, i16) -> i16 {@@ -726,7 +714,6 @@ block0(v0: i16, v1: i16, v2: i16):; uxth w4, w0; subs wzr, w4, #42; csel x0, x1, x2, eq-; csdb; ret;; Disassembled:@@ -734,7 +721,6 @@ block0(v0: i16, v1: i16, v2: i16):; uxth w4, w0; cmp w4, #0x2a; csel x0, x1, x2, eq-; csdb; retfunction %f(i16, i32, i32) -> i32 {@@ -750,7 +736,6 @@ block0(v0: i16, v1: i32, v2: i32):; uxth w4, w0; subs wzr, w4, #42; csel x0, x1, x2, eq-; csdb; ret;; Disassembled:@@ -758,7 +743,6 @@ block0(v0: i16, v1: i32, v2: i32):; uxth w4, w0; cmp w4, #0x2a; csel x0, x1, x2, eq-; csdb; retfunction %f(i16, i64, i64) -> i64 {@@ -774,7 +758,6 @@ block0(v0: i16, v1: i64, v2: i64):; uxth w4, w0; subs wzr, w4, #42; csel x0, x1, x2, eq-; csdb; ret;; Disassembled:@@ -782,7 +765,6 @@ block0(v0: i16, v1: i64, v2: i64):; uxth w4, w0; cmp w4, #0x2a; csel x0, x1, x2, eq-; csdb; retfunction %f(i16, i128, i128) -> i128 {@@ -799,7 +781,6 @@ block0(v0: i16, v1: i128, v2: i128):; subs wzr, w6, #42; csel x0, x2, x4, eq; csel x1, x3, x5, eq-; csdb; ret;; Disassembled:@@ -808,7 +789,6 @@ block0(v0: i16, v1: i128, v2: i128):; cmp w6, #0x2a; csel x0, x2, x4, eq; csel x1, x3, x5, eq-; csdb; retfunction %f(i32, i8, i8) -> i8 {@@ -823,14 +803,12 @@ block0(v0: i32, v1: i8, v2: i8):; block0:; subs wzr, w0, #42; csel x0, x1, x2, eq-; csdb; ret;; Disassembled:; block0: ; offset 0x0; cmp w0, #0x2a; csel x0, x1, x2, eq-; csdb; retfunction %f(i32, i16, i16) -> i16 {@@ -845,14 +823,12 @@ block0(v0: i32, v1: i16, v2: i16):; block0:; subs wzr, w0, #42; csel x0, x1, x2, eq-; csdb; ret;; Disassembled:; block0: ; offset 0x0; cmp w0, #0x2a; csel x0, x1, x2, eq-; csdb; retfunction %f(i32, i32, i32) -> i32 {@@ -867,14 +843,12 @@ block0(v0: i32, v1: i32, v2: i32):; block0:; subs wzr, w0, #42; csel x0, x1, x2, eq-; csdb; ret;; Disassembled:; block0: ; offset 0x0; cmp w0, #0x2a; csel x0, x1, x2, eq-; csdb; retfunction %f(i32, i64, i64) -> i64 {@@ -889,14 +863,12 @@ block0(v0: i32, v1: i64, v2: i64):; block0:; subs wzr, w0, #42; csel x0, x1, x2, eq-; csdb; ret;; Disassembled:; block0: ; offset 0x0; cmp w0, #0x2a; csel x0, x1, x2, eq-; csdb; retfunction %f(i32, i128, i128) -> i128 {@@ -912,7 +884,6 @@ block0(v0: i32, v1: i128, v2: i128):; subs wzr, w0, #42; csel x0, x2, x4, eq; csel x1, x3, x5, eq-; csdb; ret;; Disassembled:@@ -920,7 +891,6 @@ block0(v0: i32, v1: i128, v2: i128):; cmp w0, #0x2a; csel x0, x2, x4, eq; csel x1, x3, x5, eq-; csdb; retfunction %f(i64, i8, i8) -> i8 {@@ -935,14 +905,12 @@ block0(v0: i64, v1: i8, v2: i8):; block0:; subs xzr, x0, #42; csel x0, x1, x2, eq-; csdb; ret;; Disassembled:; block0: ; offset 0x0; cmp x0, #0x2a; csel x0, x1, x2, eq-; csdb; retfunction %f(i64, i16, i16) -> i16 {@@ -957,14 +925,12 @@ block0(v0: i64, v1: i16, v2: i16):; block0:; subs xzr, x0, #42; csel x0, x1, x2, eq-; csdb; ret;; Disassembled:; block0: ; offset 0x0; cmp x0, #0x2a; csel x0, x1, x2, eq-; csdb; retfunction %f(i64, i32, i32) -> i32 {@@ -979,14 +945,12 @@ block0(v0: i64, v1: i32, v2: i32):; block0:; subs xzr, x0, #42; csel x0, x1, x2, eq-; csdb; ret;; Disassembled:; block0: ; offset 0x0; cmp x0, #0x2a; csel x0, x1, x2, eq-; csdb; retfunction %f(i64, i64, i64) -> i64 {@@ -1001,14 +965,12 @@ block0(v0: i64, v1: i64, v2: i64):; block0:; subs xzr, x0, #42; csel x0, x1, x2, eq-; csdb; ret;; Disassembled:; block0: ; offset 0x0; cmp x0, #0x2a; csel x0, x1, x2, eq-; csdb; retfunction %f(i64, i128, i128) -> i128 {@@ -1024,7 +986,6 @@ block0(v0: i64, v1: i128, v2: i128):; subs xzr, x0, #42; csel x0, x2, x4, eq; csel x1, x3, x5, eq-; csdb; ret;; Disassembled:@@ -1032,7 +993,6 @@ block0(v0: i64, v1: i128, v2: i128):; cmp x0, #0x2a; csel x0, x2, x4, eq; csel x1, x3, x5, eq-; csdb; retfunction %f(i128, i8, i8) -> i8 {@@ -1051,7 +1011,6 @@ block0(v0: i128, v1: i8, v2: i8):; subs xzr, x0, x7; ccmp x1, x8, #nzcv, eq; csel x0, x2, x3, eq-; csdb; ret;; Disassembled:@@ -1061,7 +1020,6 @@ block0(v0: i128, v1: i8, v2: i8):; cmp x0, x7; ccmp x1, x8, #0, eq; csel x0, x2, x3, eq-; csdb; retfunction %f(i128, i16, i16) -> i16 {@@ -1080,7 +1038,6 @@ block0(v0: i128, v1: i16, v2: i16):; subs xzr, x0, x7; ccmp x1, x8, #nzcv, eq; csel x0, x2, x3, eq-; csdb; ret;; Disassembled:@@ -1090,7 +1047,6 @@ block0(v0: i128, v1: i16, v2: i16):; cmp x0, x7; ccmp x1, x8, #0, eq; csel x0, x2, x3, eq-; csdb; retfunction %f(i128, i32, i32) -> i32 {@@ -1109,7 +1065,6 @@ block0(v0: i128, v1: i32, v2: i32):; subs xzr, x0, x7; ccmp x1, x8, #nzcv, eq; csel x0, x2, x3, eq-; csdb; ret;; Disassembled:@@ -1119,7 +1074,6 @@ block0(v0: i128, v1: i32, v2: i32):; cmp x0, x7; ccmp x1, x8, #0, eq; csel x0, x2, x3, eq-; csdb; retfunction %f(i128, i64, i64) -> i64 {@@ -1138,7 +1092,6 @@ block0(v0: i128, v1: i64, v2: i64):; subs xzr, x0, x7; ccmp x1, x8, #nzcv, eq; csel x0, x2, x3, eq-; csdb; ret;; Disassembled:@@ -1148,7 +1101,6 @@ block0(v0: i128, v1: i64, v2: i64):; cmp x0, x7; ccmp x1, x8, #0, eq; csel x0, x2, x3, eq-; csdb; retfunction %f(i128, i128, i128) -> i128 {@@ -1168,7 +1120,6 @@ block0(v0: i128, v1: i128, v2: i128):; ccmp x1, x11, #nzcv, eq; csel x0, x2, x4, eq; csel x1, x3, x5, eq-; csdb; ret;; Disassembled:@@ -1179,7 +1130,6 @@ block0(v0: i128, v1: i128, v2: i128):; ccmp x1, x11, #0, eq; csel x0, x2, x4, eq; csel x1, x3, x5, eq-; csdb; retfunction %g(i8) -> i8 {diff --git a/cranelift/filetests/filetests/isa/aarch64/jumptable.clif b/cranelift/filetests/filetests/isa/aarch64/jumptable.clifindex d400f74eda..999ac448d2 100644--- a/cranelift/filetests/filetests/isa/aarch64/jumptable.clif+++ b/cranelift/filetests/filetests/isa/aarch64/jumptable.clif@@ -51,28 +51,27 @@ block5(v5: i32):; Disassembled:; block0: ; offset 0x0; cmp w0, #3-; b.hs #0x44+; b.hs #0x40; csel x11, xzr, x0, hs-; csdb-; adr x10, #0x20+; adr x10, #0x1c; ldrsw x11, [x10, w11, uxtw #2]; add x10, x10, x11; br x10; .byte 0x1c, 0x00, 0x00, 0x00; .byte 0x14, 0x00, 0x00, 0x00; .byte 0x0c, 0x00, 0x00, 0x00-; block1: ; offset 0x2c+; block1: ; offset 0x28; mov w5, #3-; b #0x48-; block2: ; offset 0x34+; b #0x44+; block2: ; offset 0x30; mov w5, #2-; b #0x48-; block3: ; offset 0x3c+; b #0x44+; block3: ; offset 0x38; mov w5, #1-; b #0x48-; block4: ; offset 0x44+; b #0x44+; block4: ; offset 0x40; mov w5, #4-; block5: ; offset 0x48+; block5: ; offset 0x44; add w0, w0, w5; retdiff --git a/cranelift/filetests/filetests/isa/aarch64/jumptable_with_csdb.clif b/cranelift/filetests/filetests/isa/aarch64/jumptable_with_csdb.clifnew file mode 100644index 0000000000..3712b4fef9--- /dev/null+++ b/cranelift/filetests/filetests/isa/aarch64/jumptable_with_csdb.clif@@ -0,0 +1,78 @@+test compile precise-output+set unwind_info=false+target aarch64 use_csdb++function %f(i32) -> i32 {+block0(v0: i32):+ br_table v0, block4, [block1, block2, block3]++block1:+ v1 = iconst.i32 1+ jump block5(v1)++block2:+ v2 = iconst.i32 2+ jump block5(v2)++block3:+ v3 = iconst.i32 3+ jump block5(v3)++block4:+ v4 = iconst.i32 4+ jump block5(v4)++block5(v5: i32):+ v6 = iadd.i32 v0, v5+ return v6+}++; VCode:+; block0:+; emit_island 44+; subs wzr, w0, #3+; b.hs label4 ; csel x11, xzr, x0, hs ; csdb ; adr x10, pc+16 ; ldrsw x11, [x10, x11, uxtw #2] ; add x10, x10, x11 ; br x10 ; jt_entries [MachLabel(3), MachLabel(2), MachLabel(1)]+; block1:+; movz w5, #3+; b label5+; block2:+; movz w5, #2+; b label5+; block3:+; movz w5, #1+; b label5+; block4:+; movz w5, #4+; b label5+; block5:+; add w0, w0, w5+; ret+;+; Disassembled:+; block0: ; offset 0x0+; cmp w0, #3+; b.hs #0x44+; csel x11, xzr, x0, hs+; csdb+; adr x10, #0x20+; ldrsw x11, [x10, w11, uxtw #2]+; add x10, x10, x11+; br x10+; .byte 0x1c, 0x00, 0x00, 0x00+; .byte 0x14, 0x00, 0x00, 0x00+; .byte 0x0c, 0x00, 0x00, 0x00+; block1: ; offset 0x2c+; mov w5, #3+; b #0x48+; block2: ; offset 0x34+; mov w5, #2+; b #0x48+; block3: ; offset 0x3c+; mov w5, #1+; b #0x48+; block4: ; offset 0x44+; mov w5, #4+; block5: ; offset 0x48+; add w0, w0, w5+; ret+diff --git a/docs/security.md b/docs/security.mdindex 77c527c0a4..94228f10ca 100644--- a/docs/security.md+++ b/docs/security.md@@ -134,3 +134,7 @@ Wasmtime implements a few forms of basic spectre mitigations at this time:Mitigating Spectre continues to be a subject of ongoing research, and Wasmtimewill likely grow more mitigations in the future as well.++Note that on aarch64 the `csdb` instruction is disabled by default due to its+significant performance penalty, but this can be additionally enabled through+the `use_csdb` Cranelift setting.diff --git a/tests/disas/load-store/aarch64/load_store_dynamic_kind_i32_index_0_guard_yes_spectre_i32_access_0_offset.wat b/tests/disas/load-store/aarch64/load_store_dynamic_kind_i32_index_0_guard_yes_spectre_i32_access_0_offset.watindex 7736a2d45a..65bd508f8c 100644--- a/tests/disas/load-store/aarch64/load_store_dynamic_kind_i32_index_0_guard_yes_spectre_i32_access_0_offset.wat+++ b/tests/disas/load-store/aarch64/load_store_dynamic_kind_i32_index_0_guard_yes_spectre_i32_access_0_offset.wat@@ -29,7 +29,6 @@;; add x10, x10, w4, uxtw;; cmp x11, x12;; csel x11, x13, x10, hi-;; csdb;; str w5, [x11];; ldp x29, x30, [sp], #0x10;; ret@@ -45,7 +44,6 @@;; add x10, x10, w4, uxtw;; cmp x11, x12;; csel x11, x13, x10, hi-;; csdb;; ldr w2, [x11];; ldp x29, x30, [sp], #0x10;; retdiff --git a/tests/disas/load-store/aarch64/load_store_dynamic_kind_i32_index_0_guard_yes_spectre_i32_access_0x1000_offset.wat b/tests/disas/load-store/aarch64/load_store_dynamic_kind_i32_index_0_guard_yes_spectre_i32_access_0x1000_offset.watindex 6e03ce14ab..b70e3416d8 100644--- a/tests/disas/load-store/aarch64/load_store_dynamic_kind_i32_index_0_guard_yes_spectre_i32_access_0x1000_offset.wat+++ b/tests/disas/load-store/aarch64/load_store_dynamic_kind_i32_index_0_guard_yes_spectre_i32_access_0x1000_offset.wat@@ -31,7 +31,6 @@;; add x13, x13, #1, lsl #12;; cmp x12, x14;; csel x13, x15, x13, hi-;; csdb;; str w5, [x13];; ldp x29, x30, [sp], #0x10;; ret@@ -49,7 +48,6 @@;; add x13, x13, #1, lsl #12;; cmp x12, x14;; csel x13, x15, x13, hi-;; csdb;; ldr w2, [x13];; ldp x29, x30, [sp], #0x10;; retdiff --git a/tests/disas/load-store/aarch64/load_store_dynamic_kind_i32_index_0_guard_yes_spectre_i32_access_0xffff0000_offset.wat b/tests/disas/load-store/aarch64/load_store_dynamic_kind_i32_index_0_guard_yes_spectre_i32_access_0xffff0000_offset.watindex 24858e5c0b..ee47f4d59f 100644--- a/tests/disas/load-store/aarch64/load_store_dynamic_kind_i32_index_0_guard_yes_spectre_i32_access_0xffff0000_offset.wat+++ b/tests/disas/load-store/aarch64/load_store_dynamic_kind_i32_index_0_guard_yes_spectre_i32_access_0xffff0000_offset.wat@@ -24,7 +24,7 @@;; mov w13, w4;; mov w14, #-0xfffc;; adds x13, x13, x14-;; b.hs #0x48+;; b.hs #0x44;; 18: ldr x14, [x2, #0x40];; ldr x0, [x2, #0x38];; mov x15, #0@@ -33,11 +33,10 @@;; add x0, x0, x1;; cmp x13, x14;; csel x15, x15, x0, hi-;; csdb;; str w5, [x15];; ldp x29, x30, [sp], #0x10;; ret-;; 48: .byte 0x1f, 0xc1, 0x00, 0x00+;; 44: .byte 0x1f, 0xc1, 0x00, 0x00;;;; wasm[0]::function[1]:;; stp x29, x30, [sp, #-0x10]!@@ -45,7 +44,7 @@;; mov w13, w4;; mov w14, #-0xfffc;; adds x13, x13, x14-;; b.hs #0xa8+;; b.hs #0xa4;; 78: ldr x14, [x2, #0x40];; ldr x0, [x2, #0x38];; mov x15, #0@@ -54,8 +53,7 @@;; add x0, x0, x1;; cmp x13, x14;; csel x15, x15, x0, hi-;; csdb;; ldr w2, [x15];; ldp x29, x30, [sp], #0x10;; ret-;; a8: .byte 0x1f, 0xc1, 0x00, 0x00+;; a4: .byte 0x1f, 0xc1, 0x00, 0x00diff --git a/tests/disas/load-store/aarch64/load_store_dynamic_kind_i32_index_0_guard_yes_spectre_i8_access_0_offset.wat b/tests/disas/load-store/aarch64/load_store_dynamic_kind_i32_index_0_guard_yes_spectre_i8_access_0_offset.watindex b667159bcd..17f3f1c074 100644--- a/tests/disas/load-store/aarch64/load_store_dynamic_kind_i32_index_0_guard_yes_spectre_i8_access_0_offset.wat+++ b/tests/disas/load-store/aarch64/load_store_dynamic_kind_i32_index_0_guard_yes_spectre_i8_access_0_offset.wat@@ -28,7 +28,6 @@;; add x10, x10, w4, uxtw;; cmp x11, x9;; csel x10, x12, x10, hs-;; csdb;; strb w5, [x10];; ldp x29, x30, [sp], #0x10;; ret@@ -43,7 +42,6 @@;; add x10, x10, w4, uxtw;; cmp x11, x9;; csel x10, x12, x10, hs-;; csdb;; ldrb w2, [x10];; ldp x29, x30, [sp], #0x10;; retdiff --git a/tests/disas/load-store/aarch64/load_store_dynamic_kind_i32_index_0_guard_yes_spectre_i8_access_0x1000_offset.wat b/tests/disas/load-store/aarch64/load_store_dynamic_kind_i32_index_0_guard_yes_spectre_i8_access_0x1000_offset.watindex a57dbb5a06..f141fa08f4 100644--- a/tests/disas/load-store/aarch64/load_store_dynamic_kind_i32_index_0_guard_yes_spectre_i8_access_0x1000_offset.wat+++ b/tests/disas/load-store/aarch64/load_store_dynamic_kind_i32_index_0_guard_yes_spectre_i8_access_0x1000_offset.wat@@ -31,7 +31,6 @@;; add x13, x13, #1, lsl #12;; cmp x12, x14;; csel x13, x15, x13, hi-;; csdb;; strb w5, [x13];; ldp x29, x30, [sp], #0x10;; ret@@ -49,7 +48,6 @@;; add x13, x13, #1, lsl #12;; cmp x12, x14;; csel x13, x15, x13, hi-;; csdb;; ldrb w2, [x13];; ldp x29, x30, [sp], #0x10;; retdiff --git a/tests/disas/load-store/aarch64/load_store_dynamic_kind_i32_index_0_guard_yes_spectre_i8_access_0xffff0000_offset.wat b/tests/disas/load-store/aarch64/load_store_dynamic_kind_i32_index_0_guard_yes_spectre_i8_access_0xffff0000_offset.watindex bb8679d715..314b3796f4 100644--- a/tests/disas/load-store/aarch64/load_store_dynamic_kind_i32_index_0_guard_yes_spectre_i8_access_0xffff0000_offset.wat+++ b/tests/disas/load-store/aarch64/load_store_dynamic_kind_i32_index_0_guard_yes_spectre_i8_access_0xffff0000_offset.wat@@ -24,7 +24,7 @@;; mov w13, w4;; mov w14, #-0xffff;; adds x13, x13, x14-;; b.hs #0x48+;; b.hs #0x44;; 18: ldr x14, [x2, #0x40];; ldr x0, [x2, #0x38];; mov x15, #0@@ -33,11 +33,10 @@;; add x0, x0, x1;; cmp x13, x14;; csel x15, x15, x0, hi-;; csdb;; strb w5, [x15];; ldp x29, x30, [sp], #0x10;; ret-;; 48: .byte 0x1f, 0xc1, 0x00, 0x00+;; 44: .byte 0x1f, 0xc1, 0x00, 0x00;;;; wasm[0]::function[1]:;; stp x29, x30, [sp, #-0x10]!@@ -45,7 +44,7 @@;; mov w13, w4;; mov w14, #-0xffff;; adds x13, x13, x14-;; b.hs #0xa8+;; b.hs #0xa4;; 78: ldr x14, [x2, #0x40];; ldr x0, [x2, #0x38];; mov x15, #0@@ -54,8 +53,7 @@;; add x0, x0, x1;; cmp x13, x14;; csel x15, x15, x0, hi-;; csdb;; ldrb w2, [x15];; ldp x29, x30, [sp], #0x10;; ret-;; a8: .byte 0x1f, 0xc1, 0x00, 0x00+;; a4: .byte 0x1f, 0xc1, 0x00, 0x00diff --git a/tests/disas/load-store/aarch64/load_store_dynamic_kind_i32_index_0xffffffff_guard_yes_spectre_i32_access_0_offset.wat b/tests/disas/load-store/aarch64/load_store_dynamic_kind_i32_index_0xffffffff_guard_yes_spectre_i32_access_0_offset.watindex 56047348c5..0d65b1b28a 100644--- a/tests/disas/load-store/aarch64/load_store_dynamic_kind_i32_index_0xffffffff_guard_yes_spectre_i32_access_0_offset.wat+++ b/tests/disas/load-store/aarch64/load_store_dynamic_kind_i32_index_0xffffffff_guard_yes_spectre_i32_access_0_offset.wat@@ -28,7 +28,6 @@;; add x10, x10, w4, uxtw;; cmp x11, x9;; csel x10, x12, x10, hi-;; csdb;; str w5, [x10];; ldp x29, x30, [sp], #0x10;; ret@@ -43,7 +42,6 @@;; add x10, x10, w4, uxtw;; cmp x11, x9;; csel x10, x12, x10, hi-;; csdb;; ldr w2, [x10];; ldp x29, x30, [sp], #0x10;; retdiff --git a/tests/disas/load-store/aarch64/load_store_dynamic_kind_i32_index_0xffffffff_guard_yes_spectre_i32_access_0x1000_offset.wat b/tests/disas/load-store/aarch64/load_store_dynamic_kind_i32_index_0xffffffff_guard_yes_spectre_i32_access_0x1000_offset.watindex 3c8effba97..75b0cb0fd3 100644--- a/tests/disas/load-store/aarch64/load_store_dynamic_kind_i32_index_0xffffffff_guard_yes_spectre_i32_access_0x1000_offset.wat+++ b/tests/disas/load-store/aarch64/load_store_dynamic_kind_i32_index_0xffffffff_guard_yes_spectre_i32_access_0x1000_offset.wat@@ -29,7 +29,6 @@;; add x13, x13, #1, lsl #12;; cmp x11, x10;; csel x11, x12, x13, hi-;; csdb;; str w5, [x11];; ldp x29, x30, [sp], #0x10;; ret@@ -45,7 +44,6 @@;; add x13, x13, #1, lsl #12;; cmp x11, x10;; csel x11, x12, x13, hi-;; csdb;; ldr w2, [x11];; ldp x29, x30, [sp], #0x10;; retdiff --git a/tests/disas/load-store/aarch64/load_store_dynamic_kind_i32_index_0xffffffff_guard_yes_spectre_i32_access_0xffff0000_offset.wat b/tests/disas/load-store/aarch64/load_store_dynamic_kind_i32_index_0xffffffff_guard_yes_spectre_i32_access_0xffff0000_offset.watindex 004f672725..41da5bd96b 100644--- a/tests/disas/load-store/aarch64/load_store_dynamic_kind_i32_index_0xffffffff_guard_yes_spectre_i32_access_0xffff0000_offset.wat+++ b/tests/disas/load-store/aarch64/load_store_dynamic_kind_i32_index_0xffffffff_guard_yes_spectre_i32_access_0xffff0000_offset.wat@@ -30,7 +30,6 @@;; add x14, x14, x15;; cmp x12, x11;; csel x12, x13, x14, hi-;; csdb;; str w5, [x12];; ldp x29, x30, [sp], #0x10;; ret@@ -47,7 +46,6 @@;; add x14, x14, x15;; cmp x12, x11;; csel x12, x13, x14, hi-;; csdb;; ldr w2, [x12];; ldp x29, x30, [sp], #0x10;; retdiff --git a/tests/disas/load-store/aarch64/load_store_dynamic_kind_i32_index_0xffffffff_guard_yes_spectre_i8_access_0_offset.wat b/tests/disas/load-store/aarch64/load_store_dynamic_kind_i32_index_0xffffffff_guard_yes_spectre_i8_access_0_offset.watindex 51c21fb136..b9546ed02d 100644--- a/tests/disas/load-store/aarch64/load_store_dynamic_kind_i32_index_0xffffffff_guard_yes_spectre_i8_access_0_offset.wat+++ b/tests/disas/load-store/aarch64/load_store_dynamic_kind_i32_index_0xffffffff_guard_yes_spectre_i8_access_0_offset.wat@@ -28,7 +28,6 @@;; add x10, x10, w4, uxtw;; cmp x11, x9;; csel x10, x12, x10, hs-;; csdb;; strb w5, [x10];; ldp x29, x30, [sp], #0x10;; ret@@ -43,7 +42,6 @@;; add x10, x10, w4, uxtw;; cmp x11, x9;; csel x10, x12, x10, hs-;; csdb;; ldrb w2, [x10];; ldp x29, x30, [sp], #0x10;; retdiff --git a/tests/disas/load-store/aarch64/load_store_dynamic_kind_i32_index_0xffffffff_guard_yes_spectre_i8_access_0x1000_offset.wat b/tests/disas/load-store/aarch64/load_store_dynamic_kind_i32_index_0xffffffff_guard_yes_spectre_i8_access_0x1000_offset.watindex 0bef145203..375341e898 100644--- a/tests/disas/load-store/aarch64/load_store_dynamic_kind_i32_index_0xffffffff_guard_yes_spectre_i8_access_0x1000_offset.wat+++ b/tests/disas/load-store/aarch64/load_store_dynamic_kind_i32_index_0xffffffff_guard_yes_spectre_i8_access_0x1000_offset.wat@@ -29,7 +29,6 @@;; add x13, x13, #1, lsl #12;; cmp x11, x10;; csel x11, x12, x13, hi-;; csdb;; strb w5, [x11];; ldp x29, x30, [sp], #0x10;; ret@@ -45,7 +44,6 @@;; add x13, x13, #1, lsl #12;; cmp x11, x10;; csel x11, x12, x13, hi-;; csdb;; ldrb w2, [x11];; ldp x29, x30, [sp], #0x10;; retdiff --git a/tests/disas/load-store/aarch64/load_store_dynamic_kind_i32_index_0xffffffff_guard_yes_spectre_i8_access_0xffff0000_offset.wat b/tests/disas/load-store/aarch64/load_store_dynamic_kind_i32_index_0xffffffff_guard_yes_spectre_i8_access_0xffff0000_offset.watindex 03997b946f..a82d8d3a1e 100644--- a/tests/disas/load-store/aarch64/load_store_dynamic_kind_i32_index_0xffffffff_guard_yes_spectre_i8_access_0xffff0000_offset.wat+++ b/tests/disas/load-store/aarch64/load_store_dynamic_kind_i32_index_0xffffffff_guard_yes_spectre_i8_access_0xffff0000_offset.wat@@ -30,7 +30,6 @@;; add x14, x14, x15;; cmp x12, x11;; csel x12, x13, x14, hi-;; csdb;; strb w5, [x12];; ldp x29, x30, [sp], #0x10;; ret@@ -47,7 +46,6 @@;; add x14, x14, x15;; cmp x12, x11;; csel x12, x13, x14, hi-;; csdb;; ldrb w2, [x12];; ldp x29, x30, [sp], #0x10;; retdiff --git a/tests/disas/load-store/aarch64/load_store_dynamic_kind_i64_index_0_guard_yes_spectre_i32_access_0_offset.wat b/tests/disas/load-store/aarch64/load_store_dynamic_kind_i64_index_0_guard_yes_spectre_i32_access_0_offset.watindex af827a3c91..5773dcb877 100644--- a/tests/disas/load-store/aarch64/load_store_dynamic_kind_i64_index_0_guard_yes_spectre_i32_access_0_offset.wat+++ b/tests/disas/load-store/aarch64/load_store_dynamic_kind_i64_index_0_guard_yes_spectre_i32_access_0_offset.wat@@ -28,7 +28,6 @@;; add x9, x9, x4;; cmp x4, x10;; csel x10, x11, x9, hi-;; csdb;; str w5, [x10];; ldp x29, x30, [sp], #0x10;; ret@@ -43,7 +42,6 @@;; add x9, x9, x4;; cmp x4, x10;; csel x10, x11, x9, hi-;; csdb;; ldr w2, [x10];; ldp x29, x30, [sp], #0x10;; retdiff --git a/tests/disas/load-store/aarch64/load_store_dynamic_kind_i64_index_0_guard_yes_spectre_i32_access_0x1000_offset.wat b/tests/disas/load-store/aarch64/load_store_dynamic_kind_i64_index_0_guard_yes_spectre_i32_access_0x1000_offset.watindex b6d0059abf..4fb641a58e 100644--- a/tests/disas/load-store/aarch64/load_store_dynamic_kind_i64_index_0_guard_yes_spectre_i32_access_0x1000_offset.wat+++ b/tests/disas/load-store/aarch64/load_store_dynamic_kind_i64_index_0_guard_yes_spectre_i32_access_0x1000_offset.wat@@ -30,7 +30,6 @@;; add x11, x11, #1, lsl #12;; cmp x4, x12;; csel x12, x13, x11, hi-;; csdb;; str w5, [x12];; ldp x29, x30, [sp], #0x10;; ret@@ -47,7 +46,6 @@;; add x11, x11, #1, lsl #12;; cmp x4, x12;; csel x12, x13, x11, hi-;; csdb;; ldr w2, [x12];; ldp x29, x30, [sp], #0x10;; retdiff --git a/tests/disas/load-store/aarch64/load_store_dynamic_kind_i64_index_0_guard_yes_spectre_i32_access_0xffff0000_offset.wat b/tests/disas/load-store/aarch64/load_store_dynamic_kind_i64_index_0_guard_yes_spectre_i32_access_0xffff0000_offset.watindex b68ac42f36..2478ba87f3 100644--- a/tests/disas/load-store/aarch64/load_store_dynamic_kind_i64_index_0_guard_yes_spectre_i32_access_0xffff0000_offset.wat+++ b/tests/disas/load-store/aarch64/load_store_dynamic_kind_i64_index_0_guard_yes_spectre_i32_access_0xffff0000_offset.wat@@ -23,7 +23,7 @@;; mov x29, sp;; mov w12, #-0xfffc;; adds x12, x4, x12-;; b.hs #0x44+;; b.hs #0x40;; 14: ldr x13, [x2, #0x40];; ldr x15, [x2, #0x38];; mov x14, #0@@ -32,18 +32,17 @@;; add x15, x15, x0;; cmp x12, x13;; csel x14, x14, x15, hi-;; csdb;; str w5, [x14];; ldp x29, x30, [sp], #0x10;; ret-;; 44: .byte 0x1f, 0xc1, 0x00, 0x00+;; 40: .byte 0x1f, 0xc1, 0x00, 0x00;;;; wasm[0]::function[1]:;; stp x29, x30, [sp, #-0x10]!;; mov x29, sp;; mov w12, #-0xfffc;; adds x12, x4, x12-;; b.hs #0xa4+;; b.hs #0xa0;; 74: ldr x13, [x2, #0x40];; ldr x15, [x2, #0x38];; mov x14, #0@@ -52,8 +51,7 @@;; add x15, x15, x0;; cmp x12, x13;; csel x14, x14, x15, hi-;; csdb;; ldr w2, [x14];; ldp x29, x30, [sp], #0x10;; ret-;; a4: .byte 0x1f, 0xc1, 0x00, 0x00+;; a0: .byte 0x1f, 0xc1, 0x00, 0x00diff --git a/tests/disas/load-store/aarch64/load_store_dynamic_kind_i64_index_0_guard_yes_spectre_i8_access_0_offset.wat b/tests/disas/load-store/aarch64/load_store_dynamic_kind_i64_index_0_guard_yes_spectre_i8_access_0_offset.watindex f33da88164..9495b09c9c 100644--- a/tests/disas/load-store/aarch64/load_store_dynamic_kind_i64_index_0_guard_yes_spectre_i8_access_0_offset.wat+++ b/tests/disas/load-store/aarch64/load_store_dynamic_kind_i64_index_0_guard_yes_spectre_i8_access_0_offset.wat@@ -27,7 +27,6 @@;; add x10, x10, x4;; cmp x4, x8;; csel x9, x9, x10, hs-;; csdb;; strb w5, [x9];; ldp x29, x30, [sp], #0x10;; ret@@ -41,7 +40,6 @@;; add x10, x10, x4;; cmp x4, x8;; csel x9, x9, x10, hs-;; csdb;; ldrb w2, [x9];; ldp x29, x30, [sp], #0x10;; retdiff --git a/tests/disas/load-store/aarch64/load_store_dynamic_kind_i64_index_0_guard_yes_spectre_i8_access_0x1000_offset.wat b/tests/disas/load-store/aarch64/load_store_dynamic_kind_i64_index_0_guard_yes_spectre_i8_access_0x1000_offset.watindex c4dd713c92..58fee0976d 100644--- a/tests/disas/load-store/aarch64/load_store_dynamic_kind_i64_index_0_guard_yes_spectre_i8_access_0x1000_offset.wat+++ b/tests/disas/load-store/aarch64/load_store_dynamic_kind_i64_index_0_guard_yes_spectre_i8_access_0x1000_offset.wat@@ -30,7 +30,6 @@;; add x11, x11, #1, lsl #12;; cmp x4, x12;; csel x12, x13, x11, hi-;; csdb;; strb w5, [x12];; ldp x29, x30, [sp], #0x10;; ret@@ -47,7 +46,6 @@;; add x11, x11, #1, lsl #12;; cmp x4, x12;; csel x12, x13, x11, hi-;; csdb;; ldrb w2, [x12];; ldp x29, x30, [sp], #0x10;; retdiff --git a/tests/disas/load-store/aarch64/load_store_dynamic_kind_i64_index_0_guard_yes_spectre_i8_access_0xffff0000_offset.wat b/tests/disas/load-store/aarch64/load_store_dynamic_kind_i64_index_0_guard_yes_spectre_i8_access_0xffff0000_offset.watindex d930f4c431..e95a0dfd4e 100644--- a/tests/disas/load-store/aarch64/load_store_dynamic_kind_i64_index_0_guard_yes_spectre_i8_access_0xffff0000_offset.wat+++ b/tests/disas/load-store/aarch64/load_store_dynamic_kind_i64_index_0_guard_yes_spectre_i8_access_0xffff0000_offset.wat@@ -23,7 +23,7 @@;; mov x29, sp;; mov w12, #-0xffff;; adds x12, x4, x12-;; b.hs #0x44+;; b.hs #0x40;; 14: ldr x13, [x2, #0x40];; ldr x15, [x2, #0x38];; mov x14, #0@@ -32,18 +32,17 @@;; add x15, x15, x0;; cmp x12, x13;; csel x14, x14, x15, hi-;; csdb;; strb w5, [x14];; ldp x29, x30, [sp], #0x10;; ret-;; 44: .byte 0x1f, 0xc1, 0x00, 0x00+;; 40: .byte 0x1f, 0xc1, 0x00, 0x00;;;; wasm[0]::function[1]:;; stp x29, x30, [sp, #-0x10]!;; mov x29, sp;; mov w12, #-0xffff;; adds x12, x4, x12-;; b.hs #0xa4+;; b.hs #0xa0;; 74: ldr x13, [x2, #0x40];; ldr x15, [x2, #0x38];; mov x14, #0@@ -52,8 +51,7 @@;; add x15, x15, x0;; cmp x12, x13;; csel x14, x14, x15, hi-;; csdb;; ldrb w2, [x14];; ldp x29, x30, [sp], #0x10;; ret-;; a4: .byte 0x1f, 0xc1, 0x00, 0x00+;; a0: .byte 0x1f, 0xc1, 0x00, 0x00diff --git a/tests/disas/load-store/aarch64/load_store_dynamic_kind_i64_index_0xffffffff_guard_yes_spectre_i32_access_0_offset.wat b/tests/disas/load-store/aarch64/load_store_dynamic_kind_i64_index_0xffffffff_guard_yes_spectre_i32_access_0_offset.watindex 634de74c09..8da282884f 100644--- a/tests/disas/load-store/aarch64/load_store_dynamic_kind_i64_index_0xffffffff_guard_yes_spectre_i32_access_0_offset.wat+++ b/tests/disas/load-store/aarch64/load_store_dynamic_kind_i64_index_0xffffffff_guard_yes_spectre_i32_access_0_offset.wat@@ -27,7 +27,6 @@;; add x10, x10, x4;; cmp x4, x8;; csel x9, x9, x10, hi-;; csdb;; str w5, [x9];; ldp x29, x30, [sp], #0x10;; ret@@ -41,7 +40,6 @@;; add x10, x10, x4;; cmp x4, x8;; csel x9, x9, x10, hi-;; csdb;; ldr w2, [x9];; ldp x29, x30, [sp], #0x10;; retdiff --git a/tests/disas/load-store/aarch64/load_store_dynamic_kind_i64_index_0xffffffff_guard_yes_spectre_i32_access_0x1000_offset.wat b/tests/disas/load-store/aarch64/load_store_dynamic_kind_i64_index_0xffffffff_guard_yes_spectre_i32_access_0x1000_offset.watindex 4ffa6a1846..77ed273b9e 100644--- a/tests/disas/load-store/aarch64/load_store_dynamic_kind_i64_index_0xffffffff_guard_yes_spectre_i32_access_0x1000_offset.wat+++ b/tests/disas/load-store/aarch64/load_store_dynamic_kind_i64_index_0xffffffff_guard_yes_spectre_i32_access_0x1000_offset.wat@@ -28,7 +28,6 @@;; add x11, x11, #1, lsl #12;; cmp x4, x9;; csel x10, x10, x11, hi-;; csdb;; str w5, [x10];; ldp x29, x30, [sp], #0x10;; ret@@ -43,7 +42,6 @@;; add x11, x11, #1, lsl #12;; cmp x4, x9;; csel x10, x10, x11, hi-;; csdb;; ldr w2, [x10];; ldp x29, x30, [sp], #0x10;; retdiff --git a/tests/disas/load-store/aarch64/load_store_dynamic_kind_i64_index_0xffffffff_guard_yes_spectre_i32_access_0xffff0000_offset.wat b/tests/disas/load-store/aarch64/load_store_dynamic_kind_i64_index_0xffffffff_guard_yes_spectre_i32_access_0xffff0000_offset.watindex 0ef43edcb8..8feb01e699 100644--- a/tests/disas/load-store/aarch64/load_store_dynamic_kind_i64_index_0xffffffff_guard_yes_spectre_i32_access_0xffff0000_offset.wat+++ b/tests/disas/load-store/aarch64/load_store_dynamic_kind_i64_index_0xffffffff_guard_yes_spectre_i32_access_0xffff0000_offset.wat@@ -29,7 +29,6 @@;; add x12, x12, x13;; cmp x4, x10;; csel x11, x11, x12, hi-;; csdb;; str w5, [x11];; ldp x29, x30, [sp], #0x10;; ret@@ -45,7 +44,6 @@;; add x12, x12, x13;; cmp x4, x10;; csel x11, x11, x12, hi-;; csdb;; ldr w2, [x11];; ldp x29, x30, [sp], #0x10;; retdiff --git a/tests/disas/load-store/aarch64/load_store_dynamic_kind_i64_index_0xffffffff_guard_yes_spectre_i8_access_0_offset.wat b/tests/disas/load-store/aarch64/load_store_dynamic_kind_i64_index_0xffffffff_guard_yes_spectre_i8_access_0_offset.watindex 7629b826eb..03d19995a9 100644--- a/tests/disas/load-store/aarch64/load_store_dynamic_kind_i64_index_0xffffffff_guard_yes_spectre_i8_access_0_offset.wat+++ b/tests/disas/load-store/aarch64/load_store_dynamic_kind_i64_index_0xffffffff_guard_yes_spectre_i8_access_0_offset.wat@@ -27,7 +27,6 @@;; add x10, x10, x4;; cmp x4, x8;; csel x9, x9, x10, hs-;; csdb;; strb w5, [x9];; ldp x29, x30, [sp], #0x10;; ret@@ -41,7 +40,6 @@;; add x10, x10, x4;; cmp x4, x8;; csel x9, x9, x10, hs-;; csdb;; ldrb w2, [x9];; ldp x29, x30, [sp], #0x10;; retdiff --git a/tests/disas/load-store/aarch64/load_store_dynamic_kind_i64_index_0xffffffff_guard_yes_spectre_i8_access_0x1000_offset.wat b/tests/disas/load-store/aarch64/load_store_dynamic_kind_i64_index_0xffffffff_guard_yes_spectre_i8_access_0x1000_offset.watindex 73b2d55a72..526cfecde2 100644--- a/tests/disas/load-store/aarch64/load_store_dynamic_kind_i64_index_0xffffffff_guard_yes_spectre_i8_access_0x1000_offset.wat+++ b/tests/disas/load-store/aarch64/load_store_dynamic_kind_i64_index_0xffffffff_guard_yes_spectre_i8_access_0x1000_offset.wat@@ -28,7 +28,6 @@;; add x11, x11, #1, lsl #12;; cmp x4, x9;; csel x10, x10, x11, hi-;; csdb;; strb w5, [x10];; ldp x29, x30, [sp], #0x10;; ret@@ -43,7 +42,6 @@;; add x11, x11, #1, lsl #12;; cmp x4, x9;; csel x10, x10, x11, hi-;; csdb;; ldrb w2, [x10];; ldp x29, x30, [sp], #0x10;; retdiff --git a/tests/disas/load-store/aarch64/load_store_dynamic_kind_i64_index_0xffffffff_guard_yes_spectre_i8_access_0xffff0000_offset.wat b/tests/disas/load-store/aarch64/load_store_dynamic_kind_i64_index_0xffffffff_guard_yes_spectre_i8_access_0xffff0000_offset.watindex a1b8aa5ae3..1037dc48a0 100644--- a/tests/disas/load-store/aarch64/load_store_dynamic_kind_i64_index_0xffffffff_guard_yes_spectre_i8_access_0xffff0000_offset.wat+++ b/tests/disas/load-store/aarch64/load_store_dynamic_kind_i64_index_0xffffffff_guard_yes_spectre_i8_access_0xffff0000_offset.wat@@ -29,7 +29,6 @@;; add x12, x12, x13;; cmp x4, x10;; csel x11, x11, x12, hi-;; csdb;; strb w5, [x11];; ldp x29, x30, [sp], #0x10;; ret@@ -45,7 +44,6 @@;; add x12, x12, x13;; cmp x4, x10;; csel x11, x11, x12, hi-;; csdb;; ldrb w2, [x11];; ldp x29, x30, [sp], #0x10;; retdiff --git a/tests/disas/load-store/aarch64/load_store_static_kind_i32_index_0_guard_yes_spectre_i32_access_0_offset.wat b/tests/disas/load-store/aarch64/load_store_static_kind_i32_index_0_guard_yes_spectre_i32_access_0_offset.watindex 0446500ca6..cc9c511d13 100644--- a/tests/disas/load-store/aarch64/load_store_static_kind_i32_index_0_guard_yes_spectre_i32_access_0_offset.wat+++ b/tests/disas/load-store/aarch64/load_store_static_kind_i32_index_0_guard_yes_spectre_i32_access_0_offset.wat@@ -28,7 +28,6 @@;; orr x8, xzr, #0xfffffffc;; cmp x9, x8;; csel x11, x10, x11, hi-;; csdb;; str w5, [x11];; ldp x29, x30, [sp], #0x10;; ret@@ -43,7 +42,6 @@;; orr x8, xzr, #0xfffffffc;; cmp x9, x8;; csel x11, x10, x11, hi-;; csdb;; ldr w2, [x11];; ldp x29, x30, [sp], #0x10;; retdiff --git a/tests/disas/load-store/aarch64/load_store_static_kind_i32_index_0_guard_yes_spectre_i32_access_0x1000_offset.wat b/tests/disas/load-store/aarch64/load_store_static_kind_i32_index_0_guard_yes_spectre_i32_access_0x1000_offset.watindex dd4db91be0..9ca5ac98cf 100644--- a/tests/disas/load-store/aarch64/load_store_static_kind_i32_index_0_guard_yes_spectre_i32_access_0x1000_offset.wat+++ b/tests/disas/load-store/aarch64/load_store_static_kind_i32_index_0_guard_yes_spectre_i32_access_0x1000_offset.wat@@ -29,7 +29,6 @@;; mov w9, #-0x1004;; cmp x10, x9;; csel x12, x11, x12, hi-;; csdb;; str w5, [x12];; ldp x29, x30, [sp], #0x10;; ret@@ -45,7 +44,6 @@;; mov w9, #-0x1004;; cmp x10, x9;; csel x12, x11, x12, hi-;; csdb;; ldr w2, [x12];; ldp x29, x30, [sp], #0x10;; retdiff --git a/tests/disas/load-store/aarch64/load_store_static_kind_i32_index_0_guard_yes_spectre_i32_access_0xffff0000_offset.wat b/tests/disas/load-store/aarch64/load_store_static_kind_i32_index_0_guard_yes_spectre_i32_access_0xffff0000_offset.watindex 9f8198c9e0..f04fa8ccfb 100644--- a/tests/disas/load-store/aarch64/load_store_static_kind_i32_index_0_guard_yes_spectre_i32_access_0xffff0000_offset.wat+++ b/tests/disas/load-store/aarch64/load_store_static_kind_i32_index_0_guard_yes_spectre_i32_access_0xffff0000_offset.wat@@ -30,7 +30,6 @@;; mov x10, #0xfffc;; cmp x11, x10;; csel x13, x12, x13, hi-;; csdb;; str w5, [x13];; ldp x29, x30, [sp], #0x10;; ret@@ -47,7 +46,6 @@;; mov x10, #0xfffc;; cmp x11, x10;; csel x13, x12, x13, hi-;; csdb;; ldr w2, [x13];; ldp x29, x30, [sp], #0x10;; retdiff --git a/tests/disas/load-store/aarch64/load_store_static_kind_i32_index_0_guard_yes_spectre_i8_access_0x1000_offset.wat b/tests/disas/load-store/aarch64/load_store_static_kind_i32_index_0_guard_yes_spectre_i8_access_0x1000_offset.watindex 4f9c799d9f..b5c70c117e 100644--- a/tests/disas/load-store/aarch64/load_store_static_kind_i32_index_0_guard_yes_spectre_i8_access_0x1000_offset.wat+++ b/tests/disas/load-store/aarch64/load_store_static_kind_i32_index_0_guard_yes_spectre_i8_access_0x1000_offset.wat@@ -29,7 +29,6 @@;; mov w9, #-0x1001;; cmp x10, x9;; csel x12, x11, x12, hi-;; csdb;; strb w5, [x12];; ldp x29, x30, [sp], #0x10;; ret@@ -45,7 +44,6 @@;; mov w9, #-0x1001;; cmp x10, x9;; csel x12, x11, x12, hi-;; csdb;; ldrb w2, [x12];; ldp x29, x30, [sp], #0x10;; retdiff --git a/tests/disas/load-store/aarch64/load_store_static_kind_i32_index_0_guard_yes_spectre_i8_access_0xffff0000_offset.wat b/tests/disas/load-store/aarch64/load_store_static_kind_i32_index_0_guard_yes_spectre_i8_access_0xffff0000_offset.watindex de1c151c5c..d1531625f3 100644--- a/tests/disas/load-store/aarch64/load_store_static_kind_i32_index_0_guard_yes_spectre_i8_access_0xffff0000_offset.wat+++ b/tests/disas/load-store/aarch64/load_store_static_kind_i32_index_0_guard_yes_spectre_i8_access_0xffff0000_offset.wat@@ -30,7 +30,6 @@;; mov x10, #0xffff;; cmp x11, x10;; csel x13, x12, x13, hi-;; csdb;; strb w5, [x13];; ldp x29, x30, [sp], #0x10;; ret@@ -47,7 +46,6 @@;; mov x10, #0xffff;; cmp x11, x10;; csel x13, x12, x13, hi-;; csdb;; ldrb w2, [x13];; ldp x29, x30, [sp], #0x10;; retdiff --git a/tests/disas/load-store/aarch64/load_store_static_kind_i64_index_0_guard_yes_spectre_i32_access_0_offset.wat b/tests/disas/load-store/aarch64/load_store_static_kind_i64_index_0_guard_yes_spectre_i32_access_0_offset.watindex 34c1118ced..379d5253ef 100644--- a/tests/disas/load-store/aarch64/load_store_static_kind_i64_index_0_guard_yes_spectre_i32_access_0_offset.wat+++ b/tests/disas/load-store/aarch64/load_store_static_kind_i64_index_0_guard_yes_spectre_i32_access_0_offset.wat@@ -27,7 +27,6 @@;; orr x7, xzr, #0xfffffffc;; cmp x4, x7;; csel x10, x8, x9, hi-;; csdb;; str w5, [x10];; ldp x29, x30, [sp], #0x10;; ret@@ -41,7 +40,6 @@;; orr x7, xzr, #0xfffffffc;; cmp x4, x7;; csel x10, x8, x9, hi-;; csdb;; ldr w2, [x10];; ldp x29, x30, [sp], #0x10;; retdiff --git a/tests/disas/load-store/aarch64/load_store_static_kind_i64_index_0_guard_yes_spectre_i32_access_0x1000_offset.wat b/tests/disas/load-store/aarch64/load_store_static_kind_i64_index_0_guard_yes_spectre_i32_access_0x1000_offset.watindex 48310d04d7..f41234ca1a 100644--- a/tests/disas/load-store/aarch64/load_store_static_kind_i64_index_0_guard_yes_spectre_i32_access_0x1000_offset.wat+++ b/tests/disas/load-store/aarch64/load_store_static_kind_i64_index_0_guard_yes_spectre_i32_access_0x1000_offset.wat@@ -28,7 +28,6 @@;; mov w8, #-0x1004;; cmp x4, x8;; csel x11, x9, x10, hi-;; csdb;; str w5, [x11];; ldp x29, x30, [sp], #0x10;; ret@@ -43,7 +42,6 @@;; mov w8, #-0x1004;; cmp x4, x8;; csel x11, x9, x10, hi-;; csdb;; ldr w2, [x11];; ldp x29, x30, [sp], #0x10;; retdiff --git a/tests/disas/load-store/aarch64/load_store_static_kind_i64_index_0_guard_yes_spectre_i32_access_0xffff0000_offset.wat b/tests/disas/load-store/aarch64/load_store_static_kind_i64_index_0_guard_yes_spectre_i32_access_0xffff0000_offset.watindex 76f563a371..658fe36dbd 100644--- a/tests/disas/load-store/aarch64/load_store_static_kind_i64_index_0_guard_yes_spectre_i32_access_0xffff0000_offset.wat+++ b/tests/disas/load-store/aarch64/load_store_static_kind_i64_index_0_guard_yes_spectre_i32_access_0xffff0000_offset.wat@@ -29,7 +29,6 @@;; mov x9, #0xfffc;; cmp x4, x9;; csel x12, x10, x11, hi-;; csdb;; str w5, [x12];; ldp x29, x30, [sp], #0x10;; ret@@ -45,7 +44,6 @@;; mov x9, #0xfffc;; cmp x4, x9;; csel x12, x10, x11, hi-;; csdb;; ldr w2, [x12];; ldp x29, x30, [sp], #0x10;; retdiff --git a/tests/disas/load-store/aarch64/load_store_static_kind_i64_index_0_guard_yes_spectre_i8_access_0_offset.wat b/tests/disas/load-store/aarch64/load_store_static_kind_i64_index_0_guard_yes_spectre_i8_access_0_offset.watindex c2aea12a5e..3b2ee334d7 100644--- a/tests/disas/load-store/aarch64/load_store_static_kind_i64_index_0_guard_yes_spectre_i8_access_0_offset.wat+++ b/tests/disas/load-store/aarch64/load_store_static_kind_i64_index_0_guard_yes_spectre_i8_access_0_offset.wat@@ -27,7 +27,6 @@;; orr x7, xzr, #0xffffffff;; cmp x4, x7;; csel x10, x8, x9, hi-;; csdb;; strb w5, [x10];; ldp x29, x30, [sp], #0x10;; ret@@ -41,7 +40,6 @@;; orr x7, xzr, #0xffffffff;; cmp x4, x7;; csel x10, x8, x9, hi-;; csdb;; ldrb w2, [x10];; ldp x29, x30, [sp], #0x10;; retdiff --git a/tests/disas/load-store/aarch64/load_store_static_kind_i64_index_0_guard_yes_spectre_i8_access_0x1000_offset.wat b/tests/disas/load-store/aarch64/load_store_static_kind_i64_index_0_guard_yes_spectre_i8_access_0x1000_offset.watindex 0a3fa6bcec..657709d778 100644--- a/tests/disas/load-store/aarch64/load_store_static_kind_i64_index_0_guard_yes_spectre_i8_access_0x1000_offset.wat+++ b/tests/disas/load-store/aarch64/load_store_static_kind_i64_index_0_guard_yes_spectre_i8_access_0x1000_offset.wat@@ -28,7 +28,6 @@;; mov w8, #-0x1001;; cmp x4, x8;; csel x11, x9, x10, hi-;; csdb;; strb w5, [x11];; ldp x29, x30, [sp], #0x10;; ret@@ -43,7 +42,6 @@;; mov w8, #-0x1001;; cmp x4, x8;; csel x11, x9, x10, hi-;; csdb;; ldrb w2, [x11];; ldp x29, x30, [sp], #0x10;; retdiff --git a/tests/disas/load-store/aarch64/load_store_static_kind_i64_index_0_guard_yes_spectre_i8_access_0xffff0000_offset.wat b/tests/disas/load-store/aarch64/load_store_static_kind_i64_index_0_guard_yes_spectre_i8_access_0xffff0000_offset.watindex a1d37b4ba7..2f54120b85 100644--- a/tests/disas/load-store/aarch64/load_store_static_kind_i64_index_0_guard_yes_spectre_i8_access_0xffff0000_offset.wat+++ b/tests/disas/load-store/aarch64/load_store_static_kind_i64_index_0_guard_yes_spectre_i8_access_0xffff0000_offset.wat@@ -29,7 +29,6 @@;; mov x9, #0xffff;; cmp x4, x9;; csel x12, x10, x11, hi-;; csdb;; strb w5, [x12];; ldp x29, x30, [sp], #0x10;; ret@@ -45,7 +44,6 @@;; mov x9, #0xffff;; cmp x4, x9;; csel x12, x10, x11, hi-;; csdb;; ldrb w2, [x12];; ldp x29, x30, [sp], #0x10;; retdiff --git a/tests/disas/load-store/aarch64/load_store_static_kind_i64_index_0xffffffff_guard_yes_spectre_i32_access_0_offset.wat b/tests/disas/load-store/aarch64/load_store_static_kind_i64_index_0xffffffff_guard_yes_spectre_i32_access_0_offset.watindex 79ebebdd8b..94f32cd105 100644--- a/tests/disas/load-store/aarch64/load_store_static_kind_i64_index_0xffffffff_guard_yes_spectre_i32_access_0_offset.wat+++ b/tests/disas/load-store/aarch64/load_store_static_kind_i64_index_0xffffffff_guard_yes_spectre_i32_access_0_offset.wat@@ -27,7 +27,6 @@;; orr x7, xzr, #0xfffffffc;; cmp x4, x7;; csel x10, x8, x9, hi-;; csdb;; str w5, [x10];; ldp x29, x30, [sp], #0x10;; ret@@ -41,7 +40,6 @@;; orr x7, xzr, #0xfffffffc;; cmp x4, x7;; csel x10, x8, x9, hi-;; csdb;; ldr w2, [x10];; ldp x29, x30, [sp], #0x10;; retdiff --git a/tests/disas/load-store/aarch64/load_store_static_kind_i64_index_0xffffffff_guard_yes_spectre_i32_access_0x1000_offset.wat b/tests/disas/load-store/aarch64/load_store_static_kind_i64_index_0xffffffff_guard_yes_spectre_i32_access_0x1000_offset.watindex 2a8cf00801..38547bbbb8 100644--- a/tests/disas/load-store/aarch64/load_store_static_kind_i64_index_0xffffffff_guard_yes_spectre_i32_access_0x1000_offset.wat+++ b/tests/disas/load-store/aarch64/load_store_static_kind_i64_index_0xffffffff_guard_yes_spectre_i32_access_0x1000_offset.wat@@ -28,7 +28,6 @@;; mov w8, #-0x1004;; cmp x4, x8;; csel x11, x9, x10, hi-;; csdb;; str w5, [x11];; ldp x29, x30, [sp], #0x10;; ret@@ -43,7 +42,6 @@;; mov w8, #-0x1004;; cmp x4, x8;; csel x11, x9, x10, hi-;; csdb;; ldr w2, [x11];; ldp x29, x30, [sp], #0x10;; retdiff --git a/tests/disas/load-store/aarch64/load_store_static_kind_i64_index_0xffffffff_guard_yes_spectre_i32_access_0xffff0000_offset.wat b/tests/disas/load-store/aarch64/load_store_static_kind_i64_index_0xffffffff_guard_yes_spectre_i32_access_0xffff0000_offset.watindex 36d33b5bcd..498cbce907 100644--- a/tests/disas/load-store/aarch64/load_store_static_kind_i64_index_0xffffffff_guard_yes_spectre_i32_access_0xffff0000_offset.wat+++ b/tests/disas/load-store/aarch64/load_store_static_kind_i64_index_0xffffffff_guard_yes_spectre_i32_access_0xffff0000_offset.wat@@ -29,7 +29,6 @@;; mov x9, #0xfffc;; cmp x4, x9;; csel x12, x10, x11, hi-;; csdb;; str w5, [x12];; ldp x29, x30, [sp], #0x10;; ret@@ -45,7 +44,6 @@;; mov x9, #0xfffc;; cmp x4, x9;; csel x12, x10, x11, hi-;; csdb;; ldr w2, [x12];; ldp x29, x30, [sp], #0x10;; retdiff --git a/tests/disas/load-store/aarch64/load_store_static_kind_i64_index_0xffffffff_guard_yes_spectre_i8_access_0_offset.wat b/tests/disas/load-store/aarch64/load_store_static_kind_i64_index_0xffffffff_guard_yes_spectre_i8_access_0_offset.watindex 27bd62dab2..d64e5ca52e 100644--- a/tests/disas/load-store/aarch64/load_store_static_kind_i64_index_0xffffffff_guard_yes_spectre_i8_access_0_offset.wat+++ b/tests/disas/load-store/aarch64/load_store_static_kind_i64_index_0xffffffff_guard_yes_spectre_i8_access_0_offset.wat@@ -27,7 +27,6 @@;; orr x7, xzr, #0xffffffff;; cmp x4, x7;; csel x10, x8, x9, hi-;; csdb;; strb w5, [x10];; ldp x29, x30, [sp], #0x10;; ret@@ -41,7 +40,6 @@;; orr x7, xzr, #0xffffffff;; cmp x4, x7;; csel x10, x8, x9, hi-;; csdb;; ldrb w2, [x10];; ldp x29, x30, [sp], #0x10;; retdiff --git a/tests/disas/load-store/aarch64/load_store_static_kind_i64_index_0xffffffff_guard_yes_spectre_i8_access_0x1000_offset.wat b/tests/disas/load-store/aarch64/load_store_static_kind_i64_index_0xffffffff_guard_yes_spectre_i8_access_0x1000_offset.watindex a30c28908b..eef9360b4e 100644--- a/tests/disas/load-store/aarch64/load_store_static_kind_i64_index_0xffffffff_guard_yes_spectre_i8_access_0x1000_offset.wat+++ b/tests/disas/load-store/aarch64/load_store_static_kind_i64_index_0xffffffff_guard_yes_spectre_i8_access_0x1000_offset.wat@@ -28,7 +28,6 @@;; mov w8, #-0x1001;; cmp x4, x8;; csel x11, x9, x10, hi-;; csdb;; strb w5, [x11];; ldp x29, x30, [sp], #0x10;; ret@@ -43,7 +42,6 @@;; mov w8, #-0x1001;; cmp x4, x8;; csel x11, x9, x10, hi-;; csdb;; ldrb w2, [x11];; ldp x29, x30, [sp], #0x10;; retdiff --git a/tests/disas/load-store/aarch64/load_store_static_kind_i64_index_0xffffffff_guard_yes_spectre_i8_access_0xffff0000_offset.wat b/tests/disas/load-store/aarch64/load_store_static_kind_i64_index_0xffffffff_guard_yes_spectre_i8_access_0xffff0000_offset.watindex a5344f78e3..ebbe9aec48 100644--- a/tests/disas/load-store/aarch64/load_store_static_kind_i64_index_0xffffffff_guard_yes_spectre_i8_access_0xffff0000_offset.wat+++ b/tests/disas/load-store/aarch64/load_store_static_kind_i64_index_0xffffffff_guard_yes_spectre_i8_access_0xffff0000_offset.wat@@ -29,7 +29,6 @@;; mov x9, #0xffff;; cmp x4, x9;; csel x12, x10, x11, hi-;; csdb;; strb w5, [x12];; ldp x29, x30, [sp], #0x10;; ret@@ -45,7 +44,6 @@;; mov x9, #0xffff;; cmp x4, x9;; csel x12, x10, x11, hi-;; csdb;; ldrb w2, [x12];; ldp x29, x30, [sp], #0x10;; retdiff --git a/tests/disas/winch/aarch64/br_table/large.wat b/tests/disas/winch/aarch64/br_table/large.watindex d6112bd1c5..c83e5a99bb 100644--- a/tests/disas/winch/aarch64/br_table/large.wat+++ b/tests/disas/winch/aarch64/br_table/large.wat@@ -749,7 +749,7 @@;; movk x17, #0x18;; add x16, x16, x17;; cmp sp, x16-;; b.lo #0x1812c+;; b.lo #0x18128;; 2c: mov x9, x0;; sub x28, x28, #0x18;; mov sp, x28@@ -759,14 +759,13 @@;; ldur w0, [x28, #4];; mov x1, #0x6027;; cmp w0, w1, uxtx-;; b.hs #0x18110+;; b.hs #0x1810c;; 54: csel x1, xzr, x0, hs-;; csdb-;; adr x16, #0x6c+;; adr x16, #0x68;; ldrsw x1, [x16, w1, uxtw #2];; add x16, x16, x1;; br x16-;; 6c: .byte 0x9c, 0x80, 0x01, 0x00+;; 68: .byte 0x9c, 0x80, 0x01, 0x00;; .byte 0xa4, 0x80, 0x01, 0x00;; .byte 0x9c, 0x80, 0x01, 0x00;; .byte 0xa4, 0x80, 0x01, 0x00@@ -25382,12 +25381,12 @@;; .byte 0xa4, 0x80, 0x01, 0x00;; .byte 0x9c, 0x80, 0x01, 0x00;; mov x0, #0-;; b #0x18114-;; 18110: mov x0, #1+;; b #0x18110+;; 1810c: mov x0, #1;; add x28, x28, #0x18;; mov sp, x28;; mov sp, x28;; ldr x28, [sp], #0x10;; ldp x29, x30, [sp], #0x10;; ret-;; 1812c: .byte 0x1f, 0xc1, 0x00, 0x00+;; 18128: .byte 0x1f, 0xc1, 0x00, 0x00diff --git a/tests/disas/winch/aarch64/br_table/nested_br_table_loop_block.wat b/tests/disas/winch/aarch64/br_table/nested_br_table_loop_block.watindex e156b44413..97ae340c35 100644--- a/tests/disas/winch/aarch64/br_table/nested_br_table_loop_block.wat+++ b/tests/disas/winch/aarch64/br_table/nested_br_table_loop_block.wat@@ -29,7 +29,7 @@;; movk x17, #0x18;; add x16, x16, x17;; cmp sp, x16-;; b.lo #0xcc+;; b.lo #0xc4;; 2c: mov x9, x0;; sub x28, x28, #0x18;; mov sp, x28@@ -39,30 +39,28 @@;; ldur w0, [x28, #4];; mov x1, #2;; cmp w0, w1, uxtx-;; b.hs #0x78+;; b.hs #0x74;; 54: csel x1, xzr, x0, hs-;; csdb-;; adr x16, #0x6c+;; adr x16, #0x68;; ldrsw x1, [x16, w1, uxtw #2];; add x16, x16, x1;; br x16-;; 6c: .byte 0xd8, 0xff, 0xff, 0xff+;; 68: .byte 0xdc, 0xff, 0xff, 0xff;; .byte 0x0c, 0x00, 0x00, 0x00;; b #0x44-;; 78: mov x0, #0+;; 74: mov x0, #0;; stur w0, [x28, #4];; ldur w0, [x28, #4];; mov x1, #2;; cmp w0, w1, uxtx-;; b.hs #0x80-;; 90: csel x1, xzr, x0, hs-;; csdb-;; adr x16, #0xa8+;; b.hs #0x7c+;; 8c: csel x1, xzr, x0, hs+;; adr x16, #0xa0;; ldrsw x1, [x16, w1, uxtw #2];; add x16, x16, x1;; br x16-;; a8: .byte 0x08, 0x00, 0x00, 0x00-;; .byte 0xd8, 0xff, 0xff, 0xff+;; a0: .byte 0x08, 0x00, 0x00, 0x00+;; .byte 0xdc, 0xff, 0xff, 0xff;; mov x0, #3;; add x28, x28, #0x18;; mov sp, x28@@ -70,4 +68,4 @@;; ldr x28, [sp], #0x10;; ldp x29, x30, [sp], #0x10;; ret-;; cc: .byte 0x1f, 0xc1, 0x00, 0x00+;; c4: .byte 0x1f, 0xc1, 0x00, 0x00diff --git a/winch/codegen/src/isa/aarch64/asm.rs b/winch/codegen/src/isa/aarch64/asm.rsindex cc6694a1c6..e7a3f49df1 100644--- a/winch/codegen/src/isa/aarch64/asm.rs+++ b/winch/codegen/src/isa/aarch64/asm.rs@@ -12,6 +12,7 @@ use crate::{reg::{Reg, WritableReg, writable},};+use cranelift_codegen::isa::aarch64;use cranelift_codegen::isa::aarch64::inst::emit::{enc_arith_rrr, enc_move_wide, enc_movk};use cranelift_codegen::isa::aarch64::inst::{ASIMDFPModImm, FpuToIntOp, MoveWideConst, NZCV, UImm5,@@ -112,11 +113,11 @@ pub(crate) struct Assembler {impl Assembler {/// Create a new Aarch64 assembler.- pub fn new(shared_flags: settings::Flags) -> Self {+ pub fn new(shared_flags: settings::Flags, isa_flags: aarch64::settings::Flags) -> Self {Self {buffer: MachBuffer::<Inst>::new(),emit_state: Default::default(),- emit_info: EmitInfo::new(shared_flags),+ emit_info: EmitInfo::new(shared_flags, isa_flags),pool: ConstantPool::new(),}}diff --git a/winch/codegen/src/isa/aarch64/masm.rs b/winch/codegen/src/isa/aarch64/masm.rsindex 0ab6e78100..26948ed15f 100644--- a/winch/codegen/src/isa/aarch64/masm.rs+++ b/winch/codegen/src/isa/aarch64/masm.rs@@ -31,6 +31,7 @@ use cranelift_codegen::{Final, MachBufferFinalized, MachLabel,binemit::CodeOffset,ir::{MemFlags, RelSourceLoc, SourceLoc, types},+ isa::aarch64,isa::aarch64::inst::{self, Cond, Imm12, ImmLogic, ImmShift, SImm7Scaled, SImm9, VectorSize},settings,};@@ -62,11 +63,15 @@ pub(crate) struct MacroAssembler {impl MacroAssembler {/// Create an Aarch64 MacroAssembler.- pub fn new(ptr_size: impl PtrSize, shared_flags: settings::Flags) -> Result<Self> {+ pub fn new(+ ptr_size: impl PtrSize,+ shared_flags: settings::Flags,+ isa_flags: aarch64::settings::Flags,+ ) -> Result<Self> {Ok(Self {sp_max: 0,stack_max_use_add: None,- asm: Assembler::new(shared_flags),+ asm: Assembler::new(shared_flags, isa_flags),sp_offset: 0u32,ptr_size: ptr_type_from_ptr_size(ptr_size.size()).try_into()?,scratch_scope: RegAlloc::from(scratch_gpr_bitset(), scratch_fpr_bitset()),diff --git a/winch/codegen/src/isa/aarch64/mod.rs b/winch/codegen/src/isa/aarch64/mod.rsindex 98f1e93d30..2c564b02a7 100644--- a/winch/codegen/src/isa/aarch64/mod.rs+++ b/winch/codegen/src/isa/aarch64/mod.rs@@ -92,7 +92,11 @@ impl TargetIsa for Aarch64 {let pointer_bytes = self.pointer_bytes();let vmoffsets = VMOffsets::new(pointer_bytes, &translation.module);let mut body = body.get_binary_reader();- let mut masm = Aarch64Masm::new(pointer_bytes, self.shared_flags.clone())?;+ let mut masm = Aarch64Masm::new(+ pointer_bytes,+ self.shared_flags.clone(),+ self.isa_flags.clone(),+ )?;let stack = Stack::new();let abi_sig = wasm_sig::<abi::Aarch64ABI>(sig)?;