A lightweight WebAssembly runtime that is fast, secure, and standards-compliant
cranelift: Rename `MemFlags` to `MemFlagsData` (#13353)
Nick Fitzgeralde1552f786247
diff --git a/cranelift/codegen/meta/src/shared/immediates.rs b/cranelift/codegen/meta/src/shared/immediates.rsindex e76b8040c1..37c17603ec 100644--- a/cranelift/codegen/meta/src/shared/immediates.rs+++ b/cranelift/codegen/meta/src/shared/immediates.rs@@ -161,7 +161,7 @@ impl Immediates {)},- memflags: new_imm("flags", "ir::MemFlags", "Memory operation flags"),+ memflags: new_imm("flags", "ir::MemFlagsData", "Memory operation flags"),trapcode: {let mut trapcode_values = HashMap::new();diff --git a/cranelift/codegen/meta/src/shared/instructions.rs b/cranelift/codegen/meta/src/shared/instructions.rsindex 29c5626610..ce59673420 100644--- a/cranelift/codegen/meta/src/shared/instructions.rs+++ b/cranelift/codegen/meta/src/shared/instructions.rs@@ -772,7 +772,7 @@ pub(crate) fn define(&formats.load,).operands_in(vec![- Operand::new("MemFlags", &imm.memflags),+ Operand::new("MemFlagsData", &imm.memflags),Operand::new("p", iAddr),Operand::new("Offset", &imm.offset32).with_doc("Byte offset from base address"),])@@ -792,7 +792,7 @@ pub(crate) fn define(&formats.store,).operands_in(vec![- Operand::new("MemFlags", &imm.memflags),+ Operand::new("MemFlagsData", &imm.memflags),Operand::new("x", Mem).with_doc("Value to be stored"),Operand::new("p", iAddr),Operand::new("Offset", &imm.offset32).with_doc("Byte offset from base address"),@@ -817,7 +817,7 @@ pub(crate) fn define(&formats.load,).operands_in(vec![- Operand::new("MemFlags", &imm.memflags),+ Operand::new("MemFlagsData", &imm.memflags),Operand::new("p", iAddr),Operand::new("Offset", &imm.offset32).with_doc("Byte offset from base address"),])@@ -836,7 +836,7 @@ pub(crate) fn define(&formats.load,).operands_in(vec![- Operand::new("MemFlags", &imm.memflags),+ Operand::new("MemFlagsData", &imm.memflags),Operand::new("p", iAddr),Operand::new("Offset", &imm.offset32).with_doc("Byte offset from base address"),])@@ -855,7 +855,7 @@ pub(crate) fn define(&formats.store,).operands_in(vec![- Operand::new("MemFlags", &imm.memflags),+ Operand::new("MemFlagsData", &imm.memflags),Operand::new("x", iExt8),Operand::new("p", iAddr),Operand::new("Offset", &imm.offset32).with_doc("Byte offset from base address"),@@ -880,7 +880,7 @@ pub(crate) fn define(&formats.load,).operands_in(vec![- Operand::new("MemFlags", &imm.memflags),+ Operand::new("MemFlagsData", &imm.memflags),Operand::new("p", iAddr),Operand::new("Offset", &imm.offset32).with_doc("Byte offset from base address"),])@@ -899,7 +899,7 @@ pub(crate) fn define(&formats.load,).operands_in(vec![- Operand::new("MemFlags", &imm.memflags),+ Operand::new("MemFlagsData", &imm.memflags),Operand::new("p", iAddr),Operand::new("Offset", &imm.offset32).with_doc("Byte offset from base address"),])@@ -918,7 +918,7 @@ pub(crate) fn define(&formats.store,).operands_in(vec![- Operand::new("MemFlags", &imm.memflags),+ Operand::new("MemFlagsData", &imm.memflags),Operand::new("x", iExt16),Operand::new("p", iAddr),Operand::new("Offset", &imm.offset32).with_doc("Byte offset from base address"),@@ -943,7 +943,7 @@ pub(crate) fn define(&formats.load,).operands_in(vec![- Operand::new("MemFlags", &imm.memflags),+ Operand::new("MemFlagsData", &imm.memflags),Operand::new("p", iAddr),Operand::new("Offset", &imm.offset32).with_doc("Byte offset from base address"),])@@ -962,7 +962,7 @@ pub(crate) fn define(&formats.load,).operands_in(vec![- Operand::new("MemFlags", &imm.memflags),+ Operand::new("MemFlagsData", &imm.memflags),Operand::new("p", iAddr),Operand::new("Offset", &imm.offset32).with_doc("Byte offset from base address"),])@@ -981,7 +981,7 @@ pub(crate) fn define(&formats.store,).operands_in(vec![- Operand::new("MemFlags", &imm.memflags),+ Operand::new("MemFlagsData", &imm.memflags),Operand::new("x", iExt32),Operand::new("p", iAddr),Operand::new("Offset", &imm.offset32).with_doc("Byte offset from base address"),@@ -1069,7 +1069,7 @@ pub(crate) fn define(&formats.load,).operands_in(vec![- Operand::new("MemFlags", &imm.memflags),+ Operand::new("MemFlagsData", &imm.memflags),Operand::new("p", iAddr),Operand::new("Offset", &imm.offset32).with_doc("Byte offset from base address"),])@@ -1087,7 +1087,7 @@ pub(crate) fn define(&formats.load,).operands_in(vec![- Operand::new("MemFlags", &imm.memflags),+ Operand::new("MemFlagsData", &imm.memflags),Operand::new("p", iAddr),Operand::new("Offset", &imm.offset32).with_doc("Byte offset from base address"),])@@ -1115,7 +1115,7 @@ pub(crate) fn define(&formats.load,).operands_in(vec![- Operand::new("MemFlags", &imm.memflags),+ Operand::new("MemFlagsData", &imm.memflags),Operand::new("p", iAddr),Operand::new("Offset", &imm.offset32).with_doc("Byte offset from base address"),])@@ -1133,7 +1133,7 @@ pub(crate) fn define(&formats.load,).operands_in(vec![- Operand::new("MemFlags", &imm.memflags),+ Operand::new("MemFlagsData", &imm.memflags),Operand::new("p", iAddr),Operand::new("Offset", &imm.offset32).with_doc("Byte offset from base address"),])@@ -1161,7 +1161,7 @@ pub(crate) fn define(&formats.load,).operands_in(vec![- Operand::new("MemFlags", &imm.memflags),+ Operand::new("MemFlagsData", &imm.memflags),Operand::new("p", iAddr),Operand::new("Offset", &imm.offset32).with_doc("Byte offset from base address"),])@@ -1179,7 +1179,7 @@ pub(crate) fn define(&formats.load,).operands_in(vec![- Operand::new("MemFlags", &imm.memflags),+ Operand::new("MemFlagsData", &imm.memflags),Operand::new("p", iAddr),Operand::new("Offset", &imm.offset32).with_doc("Byte offset from base address"),])@@ -3132,9 +3132,9 @@ pub(crate) fn define(The input and output types must be storable to memory and of the samesize. A bitcast is equivalent to storing one type and loading the other- type from the same address, both using the specified MemFlags.+ type from the same address, both using the specified MemFlagsData.- Note that this operation only supports the `big` or `little` MemFlags.+ Note that this operation only supports the `big` or `little` MemFlagsData.The specified byte order only affects the result in the case whereinput and output types differ in lane count/size. In this case, theoperation is only valid if a byte order specifier is provided.@@ -3142,7 +3142,7 @@ pub(crate) fn define(&formats.load_no_offset,).operands_in(vec![- Operand::new("MemFlags", &imm.memflags),+ Operand::new("MemFlagsData", &imm.memflags),Operand::new("x", Mem),]).operands_out(vec![@@ -3773,7 +3773,7 @@ pub(crate) fn define(&formats.atomic_rmw,).operands_in(vec![- Operand::new("MemFlags", &imm.memflags),+ Operand::new("MemFlagsData", &imm.memflags),Operand::new("AtomicRmwOp", &imm.atomic_rmw_op),Operand::new("p", iAddr),Operand::new("x", AtomicMem).with_doc("Value to be atomically stored"),@@ -3802,7 +3802,7 @@ pub(crate) fn define(&formats.atomic_cas,).operands_in(vec![- Operand::new("MemFlags", &imm.memflags),+ Operand::new("MemFlagsData", &imm.memflags),Operand::new("p", iAddr),Operand::new("e", AtomicMem).with_doc("Expected value in CAS"),Operand::new("x", AtomicMem).with_doc("Value to be atomically stored"),@@ -3830,7 +3830,7 @@ pub(crate) fn define(&formats.load_no_offset,).operands_in(vec![- Operand::new("MemFlags", &imm.memflags),+ Operand::new("MemFlagsData", &imm.memflags),Operand::new("p", iAddr),]).operands_out(vec![@@ -3855,7 +3855,7 @@ pub(crate) fn define(&formats.store_no_offset,).operands_in(vec![- Operand::new("MemFlags", &imm.memflags),+ Operand::new("MemFlagsData", &imm.memflags),Operand::new("x", AtomicMem).with_doc("Value to be atomically stored"),Operand::new("p", iAddr),])diff --git a/cranelift/codegen/src/alias_analysis.rs b/cranelift/codegen/src/alias_analysis.rsindex 8d1eca634b..5334803ba7 100644--- a/cranelift/codegen/src/alias_analysis.rs+++ b/cranelift/codegen/src/alias_analysis.rs@@ -10,7 +10,7 @@//! One never tracks which piece a concrete address belongs to at//! runtime; this is a purely static concept. Instead, all//! memory-accessing instructions (loads and stores) are labeled with-//! one of these four categories in the `MemFlags`. It is forbidden+//! one of these four categories in the `MemFlagsData`. It is forbidden//! for a load or store to access memory under one category and a//! later load or store to access the same memory under a different//! category. This is ensured to be true by construction duringdiff --git a/cranelift/codegen/src/ir/globalvalue.rs b/cranelift/codegen/src/ir/globalvalue.rsindex 89120c8b83..60c909cab9 100644--- a/cranelift/codegen/src/ir/globalvalue.rs+++ b/cranelift/codegen/src/ir/globalvalue.rs@@ -1,7 +1,7 @@//! Global values.use crate::ir::immediates::{Imm64, Offset32};-use crate::ir::{ExternalName, GlobalValue, MemFlags, Type};+use crate::ir::{ExternalName, GlobalValue, MemFlagsData, Type};use crate::isa::TargetIsa;use core::fmt;@@ -32,7 +32,7 @@ pub enum GlobalValueData {global_type: Type,/// Specifies the memory flags to be used by the load. Guaranteed to be notrap and aligned.- flags: MemFlags,+ flags: MemFlagsData,},/// Value is an offset from another global value.diff --git a/cranelift/codegen/src/ir/instructions.rs b/cranelift/codegen/src/ir/instructions.rsindex 80c04e48e6..3f043da7d2 100644--- a/cranelift/codegen/src/ir/instructions.rs+++ b/cranelift/codegen/src/ir/instructions.rs@@ -18,7 +18,7 @@ use serde_derive::{Deserialize, Serialize};use crate::bitset::ScalarBitSet;use crate::entity;use crate::ir::{- self, Block, ExceptionTable, ExceptionTables, FuncRef, MemFlags, SigRef, StackSlot, Type,+ self, Block, ExceptionTable, ExceptionTables, FuncRef, MemFlagsData, SigRef, StackSlot, Type,Value,condcodes::{FloatCC, IntCC},trapcode::TrapCode,@@ -557,7 +557,7 @@ impl InstructionData {}/// If this is a load/store instruction, return its memory flags.- pub fn memflags(&self) -> Option<MemFlags> {+ pub fn memflags(&self) -> Option<MemFlagsData> {match self {&InstructionData::Load { flags, .. }| &InstructionData::LoadNoOffset { flags, .. }diff --git a/cranelift/codegen/src/ir/memflags.rs b/cranelift/codegen/src/ir/memflags.rsindex 7e1f1cb438..3c3f61e767 100644--- a/cranelift/codegen/src/ir/memflags.rs+++ b/cranelift/codegen/src/ir/memflags.rs@@ -61,7 +61,7 @@ impl AliasRegion {/// semantics via the flags.#[derive(Clone, Copy, Debug, Hash, PartialEq, Eq)]#[cfg_attr(feature = "enable-serde", derive(Serialize, Deserialize))]-pub struct MemFlags {+pub struct MemFlagsData {// Initialized to all zeros to have all flags have their default value.// This is interpreted through various methods below. Currently the bits of// this are defined as:@@ -113,7 +113,7 @@ const TRAP_CODE_OFFSET: u16 = 7;/// control dependencies.const BIT_CAN_MOVE: u16 = 1 << 15;-impl MemFlags {+impl MemFlagsData {/// Create a new empty set of flags.pub const fn new() -> Self {Self { bits: 0 }.with_trap_code(Some(TrapCode::HEAP_OUT_OF_BOUNDS))@@ -130,7 +130,7 @@ impl MemFlags {self.bits & bit != 0}- /// Return a new `MemFlags` with this flag bit set.+ /// Return a new `MemFlagsData` with this flag bit set.const fn with_bit(mut self, bit: u16) -> Self {self.bits |= bit;self@@ -254,7 +254,7 @@ impl MemFlags {/// Test if this memory operation cannot trap.///- /// By default `MemFlags` will assume that any load/store can trap and is+ /// By default `MemFlagsData` will assume that any load/store can trap and is/// associated with a `TrapCode::HeapOutOfBounds` code. If the trap code is/// configured to `None` though then this method will return `true` and/// indicates that the memory operation will not trap.@@ -272,12 +272,12 @@ impl MemFlags {self.trap_code().is_none()}- /// Sets the trap code for this `MemFlags` to `None`.+ /// Sets the trap code for this `MemFlagsData` to `None`.pub fn set_notrap(&mut self) {*self = self.with_notrap();}- /// Sets the trap code for this `MemFlags` to `None`, returning the new+ /// Sets the trap code for this `MemFlagsData` to `None`, returning the new/// flags.pub const fn with_notrap(self) -> Self {self.with_trap_code(None)@@ -377,7 +377,7 @@ impl MemFlags {}}-impl fmt::Display for MemFlags {+impl fmt::Display for MemFlagsData {fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {match self.trap_code() {None => write!(f, " notrap")?,@@ -418,33 +418,33 @@ mod tests {#[test]fn roundtrip_traps() {for trap in TrapCode::non_user_traps().iter().copied() {- let flags = MemFlags::new().with_trap_code(Some(trap));+ let flags = MemFlagsData::new().with_trap_code(Some(trap));assert_eq!(flags.trap_code(), Some(trap));}- let flags = MemFlags::new().with_trap_code(None);+ let flags = MemFlagsData::new().with_trap_code(None);assert_eq!(flags.trap_code(), None);}#[test]fn cannot_set_big_and_little() {- let mut big = MemFlags::new().with_endianness(Endianness::Big);+ let mut big = MemFlagsData::new().with_endianness(Endianness::Big);assert!(big.set_by_name("little").is_err());- let mut little = MemFlags::new().with_endianness(Endianness::Little);+ let mut little = MemFlagsData::new().with_endianness(Endianness::Little);assert!(little.set_by_name("big").is_err());}#[test]fn only_one_region() {- let mut big = MemFlags::new().with_alias_region(Some(AliasRegion::Heap));+ let mut big = MemFlagsData::new().with_alias_region(Some(AliasRegion::Heap));assert!(big.set_by_name("table").is_err());assert!(big.set_by_name("vmctx").is_err());- let mut big = MemFlags::new().with_alias_region(Some(AliasRegion::Table));+ let mut big = MemFlagsData::new().with_alias_region(Some(AliasRegion::Table));assert!(big.set_by_name("heap").is_err());assert!(big.set_by_name("vmctx").is_err());- let mut big = MemFlags::new().with_alias_region(Some(AliasRegion::Vmctx));+ let mut big = MemFlagsData::new().with_alias_region(Some(AliasRegion::Vmctx));assert!(big.set_by_name("heap").is_err());assert!(big.set_by_name("table").is_err());}diff --git a/cranelift/codegen/src/ir/mod.rs b/cranelift/codegen/src/ir/mod.rsindex 3b9e540d48..3679948a29 100644--- a/cranelift/codegen/src/ir/mod.rs+++ b/cranelift/codegen/src/ir/mod.rs@@ -56,7 +56,7 @@ pub use crate::ir::jumptable::JumpTableData;pub use crate::ir::known_symbol::KnownSymbol;pub use crate::ir::layout::Layout;pub use crate::ir::libcall::{LibCall, get_probestack_funcref};-pub use crate::ir::memflags::{AliasRegion, Endianness, MemFlags};+pub use crate::ir::memflags::{AliasRegion, Endianness, MemFlagsData};pub use crate::ir::progpoint::ProgramPoint;pub use crate::ir::sourceloc::RelSourceLoc;pub use crate::ir::sourceloc::SourceLoc;diff --git a/cranelift/codegen/src/isa/aarch64/abi.rs b/cranelift/codegen/src/isa/aarch64/abi.rsindex 84f5df6d16..8acd997385 100644--- a/cranelift/codegen/src/isa/aarch64/abi.rs+++ b/cranelift/codegen/src/isa/aarch64/abi.rs@@ -2,7 +2,7 @@use crate::CodegenResult;use crate::ir;-use crate::ir::MemFlags;+use crate::ir::MemFlagsData;use crate::ir::types;use crate::ir::types::*;use crate::ir::{ExternalName, LibCall, Signature, dynamic_to_fixed};@@ -413,11 +413,11 @@ impl ABIMachineSpec for AArch64MachineDeps {}fn gen_load_stack(mem: StackAMode, into_reg: Writable<Reg>, ty: Type) -> Inst {- Inst::gen_load(into_reg, mem.into(), ty, MemFlags::trusted())+ Inst::gen_load(into_reg, mem.into(), ty, MemFlagsData::trusted())}fn gen_store_stack(mem: StackAMode, from_reg: Reg, ty: Type) -> Inst {- Inst::gen_store(mem.into(), from_reg, ty, MemFlags::trusted())+ Inst::gen_store(mem.into(), from_reg, ty, MemFlagsData::trusted())}fn gen_move(to_reg: Writable<Reg>, from_reg: Reg, ty: Type) -> Inst {@@ -518,7 +518,7 @@ impl ABIMachineSpec for AArch64MachineDeps {rn: base,off: offset as i64,};- Inst::gen_load(into_reg, mem, ty, MemFlags::trusted())+ Inst::gen_load(into_reg, mem, ty, MemFlagsData::trusted())}fn gen_store_base_offset(base: Reg, offset: i32, from_reg: Reg, ty: Type) -> Inst {@@ -526,7 +526,7 @@ impl ABIMachineSpec for AArch64MachineDeps {rn: base,off: offset as i64,};- Inst::gen_store(mem, from_reg, ty, MemFlags::trusted())+ Inst::gen_store(mem, from_reg, ty, MemFlagsData::trusted())}fn gen_sp_reg_adjust(amount: i32) -> SmallInstVec<Inst> {@@ -617,7 +617,7 @@ impl ABIMachineSpec for AArch64MachineDeps {mem: PairAMode::SPPreIndexed {simm7: SImm7Scaled::maybe_from_i64(-16, types::I64).unwrap(),},- flags: MemFlags::trusted(),+ flags: MemFlagsData::trusted(),});if flags.unwind_info() {@@ -666,7 +666,7 @@ impl ABIMachineSpec for AArch64MachineDeps {mem: PairAMode::SPPostIndexed {simm7: SImm7Scaled::maybe_from_i64(16, types::I64).unwrap(),},- flags: MemFlags::trusted(),+ flags: MemFlagsData::trusted(),});}@@ -760,7 +760,7 @@ impl ABIMachineSpec for AArch64MachineDeps {mem: AMode::SPOffset {off: i64::from(incoming_args_diff),},- flags: MemFlags::trusted(),+ flags: MemFlagsData::trusted(),});// Store the frame pointer and link register again at the new SP@@ -771,7 +771,7 @@ impl ABIMachineSpec for AArch64MachineDeps {reg: regs::stack_reg(),simm7: SImm7Scaled::maybe_from_i64(0, types::I64).unwrap(),},- flags: MemFlags::trusted(),+ flags: MemFlagsData::trusted(),});// Keep the frame pointer in sync@@ -821,7 +821,7 @@ impl ABIMachineSpec for AArch64MachineDeps {mem: AMode::SPPreIndexed {simm9: SImm9::maybe_from_i64(-clobber_offset_change).unwrap(),},- flags: MemFlags::trusted(),+ flags: MemFlagsData::trusted(),});if flags.unwind_info() {@@ -852,7 +852,7 @@ impl ABIMachineSpec for AArch64MachineDeps {mem: PairAMode::SPPreIndexed {simm7: SImm7Scaled::maybe_from_i64(-clobber_offset_change, types::I64).unwrap(),},- flags: MemFlags::trusted(),+ flags: MemFlagsData::trusted(),});if flags.unwind_info() {@@ -880,7 +880,7 @@ impl ABIMachineSpec for AArch64MachineDeps {mem: AMode::SPPreIndexed {simm9: SImm9::maybe_from_i64(-clobber_offset_change).unwrap(),},- flags: MemFlags::trusted(),+ flags: MemFlagsData::trusted(),};insts.push(inst);// N.B.: no unwind info: we don't have a way to@@ -892,7 +892,7 @@ impl ABIMachineSpec for AArch64MachineDeps {mem: AMode::SPPreIndexed {simm9: SImm9::maybe_from_i64(-clobber_offset_change).unwrap(),},- flags: MemFlags::trusted(),+ flags: MemFlagsData::trusted(),};let iter = clobbered_vec.chunks_exact(2);@@ -924,7 +924,7 @@ impl ABIMachineSpec for AArch64MachineDeps {simm7: SImm7Scaled::maybe_from_i64(-clobber_offset_change, F64).unwrap(),},- flags: MemFlags::trusted(),+ flags: MemFlagsData::trusted(),},clobber_offset_change as u32,)@@ -995,7 +995,7 @@ impl ABIMachineSpec for AArch64MachineDeps {mem: AMode::SPPostIndexed {simm9: SImm9::maybe_from_i64(16).unwrap(),},- flags: MemFlags::trusted(),+ flags: MemFlagsData::trusted(),};insts.push(inst);// N.B.: no unwind info; we don't have a way to@@ -1007,7 +1007,7 @@ impl ABIMachineSpec for AArch64MachineDeps {mem: AMode::SPPostIndexed {simm9: SImm9::maybe_from_i64(16).unwrap(),},- flags: MemFlags::trusted(),+ flags: MemFlagsData::trusted(),};let load_vec_reg_half_pair = |rt, rt2| Inst::FpuLoadP64 {rt,@@ -1015,7 +1015,7 @@ impl ABIMachineSpec for AArch64MachineDeps {mem: PairAMode::SPPostIndexed {simm7: SImm7Scaled::maybe_from_i64(16, F64).unwrap(),},- flags: MemFlags::trusted(),+ flags: MemFlagsData::trusted(),};let mut iter = clobbered_vec.chunks_exact(2);@@ -1054,7 +1054,7 @@ impl ABIMachineSpec for AArch64MachineDeps {mem: PairAMode::SPPostIndexed {simm7: SImm7Scaled::maybe_from_i64(16, I64).unwrap(),},- flags: MemFlags::trusted(),+ flags: MemFlagsData::trusted(),});}@@ -1070,7 +1070,7 @@ impl ABIMachineSpec for AArch64MachineDeps {mem: AMode::SPPostIndexed {simm9: SImm9::maybe_from_i64(16).unwrap(),},- flags: MemFlags::trusted(),+ flags: MemFlagsData::trusted(),});}@@ -1263,7 +1263,7 @@ impl AArch64MachineDeps {AMode::SPOffset { off: 0 },zero_reg(),I32,- MemFlags::trusted(),+ MemFlagsData::trusted(),));}diff --git a/cranelift/codegen/src/isa/aarch64/inst.isle b/cranelift/codegen/src/isa/aarch64/inst.isleindex d59429c538..49dc50d858 100644--- a/cranelift/codegen/src/isa/aarch64/inst.isle+++ b/cranelift/codegen/src/isa/aarch64/inst.isle@@ -80,81 +80,81 @@(ULoad8(rd WritableReg)(mem AMode)- (flags MemFlags))+ (flags MemFlagsData));; A signed (sign-extending) 8-bit load.(SLoad8(rd WritableReg)(mem AMode)- (flags MemFlags))+ (flags MemFlagsData));; An unsigned (zero-extending) 16-bit load.(ULoad16(rd WritableReg)(mem AMode)- (flags MemFlags))+ (flags MemFlagsData));; A signed (sign-extending) 16-bit load.(SLoad16(rd WritableReg)(mem AMode)- (flags MemFlags))+ (flags MemFlagsData));; An unsigned (zero-extending) 32-bit load.(ULoad32(rd WritableReg)(mem AMode)- (flags MemFlags))+ (flags MemFlagsData));; A signed (sign-extending) 32-bit load.(SLoad32(rd WritableReg)(mem AMode)- (flags MemFlags))+ (flags MemFlagsData));; A 64-bit load.(ULoad64(rd WritableReg)(mem AMode)- (flags MemFlags))+ (flags MemFlagsData));; An 8-bit store.(Store8(rd Reg)(mem AMode)- (flags MemFlags))+ (flags MemFlagsData));; A 16-bit store.(Store16(rd Reg)(mem AMode)- (flags MemFlags))+ (flags MemFlagsData));; A 32-bit store.(Store32(rd Reg)(mem AMode)- (flags MemFlags))+ (flags MemFlagsData));; A 64-bit store.(Store64(rd Reg)(mem AMode)- (flags MemFlags))+ (flags MemFlagsData));; A store of a pair of registers.(StoreP64(rt Reg)(rt2 Reg)(mem PairAMode)- (flags MemFlags))+ (flags MemFlagsData));; A load of a pair of registers.(LoadP64(rt WritableReg)(rt2 WritableReg)(mem PairAMode)- (flags MemFlags))+ (flags MemFlagsData));; A MOV instruction. These are encoded as ORR's (AluRRR form).;; The 32-bit version zeroes the top 32 bits of the@@ -257,7 +257,7 @@(AtomicRMWLoop(ty Type) ;; I8, I16, I32 or I64(op AtomicRMWLoopOp)- (flags MemFlags)+ (flags MemFlagsData)(addr Reg)(operand Reg)(oldval WritableReg)@@ -275,7 +275,7 @@;; x24 (wr) scratch reg; value afterwards has no meaning(AtomicCASLoop(ty Type) ;; I8, I16, I32 or I64- (flags MemFlags)+ (flags MemFlagsData)(addr Reg)(expected Reg)(replacement Reg)@@ -291,7 +291,7 @@(rt WritableReg)(rn Reg)(ty Type)- (flags MemFlags))+ (flags MemFlagsData));; An atomic compare-and-swap operation. These instructions require the;; Large System Extension (LSE) ISA support (FEAT_LSE). The instructions have@@ -304,7 +304,7 @@(rt Reg)(rn Reg)(ty Type)- (flags MemFlags))+ (flags MemFlagsData));; Read `access_ty` bits from address `rt`, either 8, 16, 32 or 64-bits, and put;; it in `rn`, optionally zero-extending to fill a word or double word result.@@ -313,7 +313,7 @@(access_ty Type) ;; I8, I16, I32 or I64(rt WritableReg)(rn Reg)- (flags MemFlags))+ (flags MemFlagsData));; Write the lowest `ty` bits of `rt` to address `rn`.;; This instruction is sequentially consistent.@@ -321,7 +321,7 @@(access_ty Type) ;; I8, I16, I32 or I64(rt Reg)(rn Reg)- (flags MemFlags))+ (flags MemFlagsData));; A memory fence. This must provide ordering to ensure that, at a minimum, neither loads;; nor stores may move forwards or backwards across the fence. Currently emitted as "dmb@@ -411,77 +411,77 @@(FpuLoad16(rd WritableReg)(mem AMode)- (flags MemFlags))+ (flags MemFlagsData));; Floating-point store, half-precision (16 bit).(FpuStore16(rd Reg)(mem AMode)- (flags MemFlags))+ (flags MemFlagsData));; Floating-point load, single-precision (32 bit).(FpuLoad32(rd WritableReg)(mem AMode)- (flags MemFlags))+ (flags MemFlagsData));; Floating-point store, single-precision (32 bit).(FpuStore32(rd Reg)(mem AMode)- (flags MemFlags))+ (flags MemFlagsData));; Floating-point load, double-precision (64 bit).(FpuLoad64(rd WritableReg)(mem AMode)- (flags MemFlags))+ (flags MemFlagsData));; Floating-point store, double-precision (64 bit).(FpuStore64(rd Reg)(mem AMode)- (flags MemFlags))+ (flags MemFlagsData));; Floating-point/vector load, 128 bit.(FpuLoad128(rd WritableReg)(mem AMode)- (flags MemFlags))+ (flags MemFlagsData));; Floating-point/vector store, 128 bit.(FpuStore128(rd Reg)(mem AMode)- (flags MemFlags))+ (flags MemFlagsData));; A load of a pair of floating-point registers, double precision (64-bit).(FpuLoadP64(rt WritableReg)(rt2 WritableReg)(mem PairAMode)- (flags MemFlags))+ (flags MemFlagsData));; A store of a pair of floating-point registers, double precision (64-bit).(FpuStoreP64(rt Reg)(rt2 Reg)(mem PairAMode)- (flags MemFlags))+ (flags MemFlagsData));; A load of a pair of floating-point registers, 128-bit.(FpuLoadP128(rt WritableReg)(rt2 WritableReg)(mem PairAMode)- (flags MemFlags))+ (flags MemFlagsData));; A store of a pair of floating-point registers, 128-bit.(FpuStoreP128(rt Reg)(rt2 Reg)(mem PairAMode)- (flags MemFlags))+ (flags MemFlagsData));; Conversion: FP -> integer.(FpuToInt@@ -784,7 +784,7 @@(rd WritableReg)(rn Reg)(size VectorSize)- (flags MemFlags))+ (flags MemFlagsData));; Vector conditional select, 128 bit. A synthetic instruction, which generates a 4-insn;; control-flow diamond.@@ -2638,14 +2638,14 @@dst));; Helper for emitting `MInst.LoadAcquire` instructions.-(decl load_acquire (Type MemFlags Reg) Reg)+(decl load_acquire (Type MemFlagsData Reg) Reg)(rule (load_acquire ty flags addr)(let ((dst WritableReg (temp_writable_reg $I64))(_ Unit (emit (MInst.LoadAcquire ty dst addr flags))))dst));; Helper for emitting `MInst.StoreRelease` instructions.-(decl store_release (Type MemFlags Reg Reg) SideEffectNoResult)+(decl store_release (Type MemFlagsData Reg Reg) SideEffectNoResult)(rule (store_release ty flags src addr)(SideEffectNoResult.Inst (MInst.StoreRelease ty src addr flags)))@@ -3425,7 +3425,7 @@;; Helpers for generating various load instructions, with varying;; widths and sign/zero-extending properties.-(decl aarch64_uload8 (AMode MemFlags) Reg)+(decl aarch64_uload8 (AMode MemFlagsData) Reg)(spec (aarch64_uload8 amode flags)(provide (= result (zero_ext 32 (load_effect flags 8 amode))))(require (= 32 (widthof result))))@@ -3433,12 +3433,12 @@(let ((dst WritableReg (temp_writable_reg $I64))(_ Unit (emit (MInst.ULoad8 dst amode flags))))dst))-(decl aarch64_sload8 (AMode MemFlags) Reg)+(decl aarch64_sload8 (AMode MemFlagsData) Reg)(rule (aarch64_sload8 amode flags)(let ((dst WritableReg (temp_writable_reg $I64))(_ Unit (emit (MInst.SLoad8 dst amode flags))))dst))-(decl aarch64_uload16 (AMode MemFlags) Reg)+(decl aarch64_uload16 (AMode MemFlagsData) Reg)(spec (aarch64_uload16 amode flags)(provide (= result (zero_ext 32 (load_effect flags 16 amode))))(require (= 32 (widthof result))))@@ -3446,12 +3446,12 @@(let ((dst WritableReg (temp_writable_reg $I64))(_ Unit (emit (MInst.ULoad16 dst amode flags))))dst))-(decl aarch64_sload16 (AMode MemFlags) Reg)+(decl aarch64_sload16 (AMode MemFlagsData) Reg)(rule (aarch64_sload16 amode flags)(let ((dst WritableReg (temp_writable_reg $I64))(_ Unit (emit (MInst.SLoad16 dst amode flags))))dst))-(decl aarch64_uload32 (AMode MemFlags) Reg)+(decl aarch64_uload32 (AMode MemFlagsData) Reg)(spec (aarch64_uload32 amode flags)(provide (= result (load_effect flags 32 amode)))(require (= 32 (widthof result))))@@ -3459,12 +3459,12 @@(let ((dst WritableReg (temp_writable_reg $I64))(_ Unit (emit (MInst.ULoad32 dst amode flags))))dst))-(decl aarch64_sload32 (AMode MemFlags) Reg)+(decl aarch64_sload32 (AMode MemFlagsData) Reg)(rule (aarch64_sload32 amode flags)(let ((dst WritableReg (temp_writable_reg $I64))(_ Unit (emit (MInst.SLoad32 dst amode flags))))dst))-(decl aarch64_uload64 (AMode MemFlags) Reg)+(decl aarch64_uload64 (AMode MemFlagsData) Reg)(spec (aarch64_uload64 amode flags)(provide (= result (load_effect flags 64 amode)))(require (= 64 (widthof result))))@@ -3472,27 +3472,27 @@(let ((dst WritableReg (temp_writable_reg $I64))(_ Unit (emit (MInst.ULoad64 dst amode flags))))dst))-(decl aarch64_fpuload16 (AMode MemFlags) Reg)+(decl aarch64_fpuload16 (AMode MemFlagsData) Reg)(rule (aarch64_fpuload16 amode flags)(let ((dst WritableReg (temp_writable_reg $F64))(_ Unit (emit (MInst.FpuLoad16 dst amode flags))))dst))-(decl aarch64_fpuload32 (AMode MemFlags) Reg)+(decl aarch64_fpuload32 (AMode MemFlagsData) Reg)(rule (aarch64_fpuload32 amode flags)(let ((dst WritableReg (temp_writable_reg $F64))(_ Unit (emit (MInst.FpuLoad32 dst amode flags))))dst))-(decl aarch64_fpuload64 (AMode MemFlags) Reg)+(decl aarch64_fpuload64 (AMode MemFlagsData) Reg)(rule (aarch64_fpuload64 amode flags)(let ((dst WritableReg (temp_writable_reg $F64))(_ Unit (emit (MInst.FpuLoad64 dst amode flags))))dst))-(decl aarch64_fpuload128 (AMode MemFlags) Reg)+(decl aarch64_fpuload128 (AMode MemFlagsData) Reg)(rule (aarch64_fpuload128 amode flags)(let ((dst WritableReg (temp_writable_reg $F64X2))(_ Unit (emit (MInst.FpuLoad128 dst amode flags))))dst))-(decl aarch64_loadp64 (PairAMode MemFlags) ValueRegs)+(decl aarch64_loadp64 (PairAMode MemFlagsData) ValueRegs)(rule (aarch64_loadp64 amode flags)(let ((dst1 WritableReg (temp_writable_reg $I64))(dst2 WritableReg (temp_writable_reg $I64))@@ -3501,39 +3501,39 @@;; Helpers for generating various store instructions with varying;; widths.-(decl aarch64_store8 (AMode MemFlags Reg) SideEffectNoResult)+(decl aarch64_store8 (AMode MemFlagsData Reg) SideEffectNoResult)(spec (aarch64_store8 amode flags val)(provide (= result (store_effect flags 8 (extract 7 0 val) amode))))(rule (aarch64_store8 amode flags val)(SideEffectNoResult.Inst (MInst.Store8 val amode flags)))-(decl aarch64_store16 (AMode MemFlags Reg) SideEffectNoResult)+(decl aarch64_store16 (AMode MemFlagsData Reg) SideEffectNoResult)(spec (aarch64_store16 amode flags val)(provide (= result (store_effect flags 16 (extract 15 0 val) amode))))(rule (aarch64_store16 amode flags val)(SideEffectNoResult.Inst (MInst.Store16 val amode flags)))-(decl aarch64_store32 (AMode MemFlags Reg) SideEffectNoResult)+(decl aarch64_store32 (AMode MemFlagsData Reg) SideEffectNoResult)(spec (aarch64_store32 amode flags val)(provide (= result (store_effect flags 32 (extract 31 0 val) amode))))(rule (aarch64_store32 amode flags val)(SideEffectNoResult.Inst (MInst.Store32 val amode flags)))-(decl aarch64_store64 (AMode MemFlags Reg) SideEffectNoResult)+(decl aarch64_store64 (AMode MemFlagsData Reg) SideEffectNoResult)(spec (aarch64_store64 amode flags val)(provide (= result (store_effect flags 64 val amode))))(rule (aarch64_store64 amode flags val)(SideEffectNoResult.Inst (MInst.Store64 val amode flags)))-(decl aarch64_fpustore16 (AMode MemFlags Reg) SideEffectNoResult)+(decl aarch64_fpustore16 (AMode MemFlagsData Reg) SideEffectNoResult)(rule (aarch64_fpustore16 amode flags val)(SideEffectNoResult.Inst (MInst.FpuStore16 val amode flags)))-(decl aarch64_fpustore32 (AMode MemFlags Reg) SideEffectNoResult)+(decl aarch64_fpustore32 (AMode MemFlagsData Reg) SideEffectNoResult)(rule (aarch64_fpustore32 amode flags val)(SideEffectNoResult.Inst (MInst.FpuStore32 val amode flags)))-(decl aarch64_fpustore64 (AMode MemFlags Reg) SideEffectNoResult)+(decl aarch64_fpustore64 (AMode MemFlagsData Reg) SideEffectNoResult)(rule (aarch64_fpustore64 amode flags val)(SideEffectNoResult.Inst (MInst.FpuStore64 val amode flags)))-(decl aarch64_fpustore128 (AMode MemFlags Reg) SideEffectNoResult)+(decl aarch64_fpustore128 (AMode MemFlagsData Reg) SideEffectNoResult)(rule (aarch64_fpustore128 amode flags val)(SideEffectNoResult.Inst (MInst.FpuStore128 val amode flags)))-(decl aarch64_storep64 (PairAMode MemFlags Reg Reg) SideEffectNoResult)+(decl aarch64_storep64 (PairAMode MemFlagsData Reg Reg) SideEffectNoResult)(rule (aarch64_storep64 amode flags val1 val2)(SideEffectNoResult.Inst (MInst.StoreP64 val1 val2 amode flags)))@@ -3804,7 +3804,7 @@(alu_rrr op ty x_hi y_hi))));; Helper for emitting `MInst.VecLoadReplicate` instructions.-(decl ld1r (Reg VectorSize MemFlags) Reg)+(decl ld1r (Reg VectorSize MemFlagsData) Reg)(rule (ld1r src size flags)(let ((dst WritableReg (temp_writable_reg $I8X16))(_ Unit (emit (MInst.VecLoadReplicate dst src size flags))))@@ -4202,7 +4202,7 @@(vec_misc (VecMisc2.Cmeq0) rn size));; Helper for emitting `MInst.AtomicRMW` instructions.-(decl lse_atomic_rmw (AtomicRMWOp Value Reg Type MemFlags) Reg)+(decl lse_atomic_rmw (AtomicRMWOp Value Reg Type MemFlagsData) Reg)(rule (lse_atomic_rmw op p r_arg2 ty flags)(let ((r_addr Reg p)@@ -4212,7 +4212,7 @@dst));; Helper for emitting `MInst.AtomicCAS` instructions.-(decl lse_atomic_cas (Reg Reg Reg Type MemFlags) Reg)+(decl lse_atomic_cas (Reg Reg Reg Type MemFlagsData) Reg)(rule (lse_atomic_cas addr expect replace ty flags)(let ((dst WritableReg (temp_writable_reg ty))@@ -4226,7 +4226,7 @@;; regs, and that's not guaranteed safe if either is in a real reg.;; - Move the args to the preordained AtomicRMW input regs;; - And finally, copy the preordained AtomicRMW output reg to its destination.-(decl atomic_rmw_loop (AtomicRMWLoopOp Reg Reg Type MemFlags) Reg)+(decl atomic_rmw_loop (AtomicRMWLoopOp Reg Reg Type MemFlagsData) Reg)(rule (atomic_rmw_loop op addr operand ty flags)(let ((dst WritableReg (temp_writable_reg $I64))(scratch1 WritableReg (temp_writable_reg $I64))@@ -4240,7 +4240,7 @@;; about zero-extending narrow (I8/I16/I32) values here.;; Make sure that all three args are in virtual regs. See corresponding comment;; for `atomic_rmw_loop` above.-(decl atomic_cas_loop (Reg Reg Reg Type MemFlags) Reg)+(decl atomic_cas_loop (Reg Reg Reg Type MemFlagsData) Reg)(rule (atomic_cas_loop addr expect replace ty flags)(let ((dst WritableReg (temp_writable_reg $I64))(scratch WritableReg (temp_writable_reg $I64))@@ -5122,14 +5122,14 @@dst));; Helper for creating a `FpuLoad64` instruction-(decl fpu_load64 (AMode MemFlags) Reg)+(decl fpu_load64 (AMode MemFlagsData) Reg)(rule (fpu_load64 amode flags)(let ((dst WritableReg (temp_writable_reg $I8X16))(_ Unit (emit (MInst.FpuLoad64 dst amode flags))))dst));; Helper for creating a `FpuLoad128` instruction-(decl fpu_load128 (AMode MemFlags) Reg)+(decl fpu_load128 (AMode MemFlagsData) Reg)(rule (fpu_load128 amode flags)(let ((dst WritableReg (temp_writable_reg $I8X16))(_ Unit (emit (MInst.FpuLoad128 dst amode flags))))diff --git a/cranelift/codegen/src/isa/aarch64/inst/emit.rs b/cranelift/codegen/src/isa/aarch64/inst/emit.rsindex 93ddd22e7f..008ee230bf 100644--- a/cranelift/codegen/src/isa/aarch64/inst/emit.rs+++ b/cranelift/codegen/src/isa/aarch64/inst/emit.rs@@ -3209,7 +3209,7 @@ impl MachInstEmit for Inst {rtmp2.to_reg(),ExtendOp::UXTW,),- flags: MemFlags::trusted(),+ flags: MemFlagsData::trusted(),};inst.emit(sink, emit_info, state);// Add base of jump table to jump-table-sourced block offset@@ -3263,7 +3263,7 @@ impl MachInstEmit for Inst {let inst = Inst::ULoad64 {rd,mem: AMode::reg(rd.to_reg()),- flags: MemFlags::trusted(),+ flags: MemFlagsData::trusted(),};inst.emit(sink, emit_info, state);}@@ -3312,7 +3312,7 @@ impl MachInstEmit for Inst {mem: AMode::Label {label: MemLabel::PCRel(8),},- flags: MemFlags::trusted(),+ flags: MemFlagsData::trusted(),};inst.emit(sink, emit_info, state);let inst = Inst::Jump {@@ -3466,7 +3466,7 @@ impl MachInstEmit for Inst {Inst::ULoad64 {rd: tmp,mem: AMode::reg(rd.to_reg()),- flags: MemFlags::trusted(),+ flags: MemFlagsData::trusted(),}.emit(sink, emit_info, state);@@ -3530,7 +3530,7 @@ impl MachInstEmit for Inst {Inst::ULoad64 {rd: rtmp,mem: AMode::reg(rd.to_reg()),- flags: MemFlags::trusted(),+ flags: MemFlagsData::trusted(),}.emit(sink, emit_info, state);@@ -3607,7 +3607,7 @@ impl MachInstEmit for Inst {rn: regs::stack_reg(),rm: start.to_reg(),},- flags: MemFlags::trusted(),+ flags: MemFlagsData::trusted(),}.emit(sink, emit_info, state);Inst::AluRRR {@@ -3677,7 +3677,7 @@ fn emit_return_call_common_sequence<T>(// https://developer.arm.com/documentation/ddi0596/2020-12/Base-Instructions/LDP--Load-Pair-of-Registers-simm7: SImm7Scaled::maybe_from_i64(i64::from(setup_area_size), types::I64).unwrap(),},- flags: MemFlags::trusted(),+ flags: MemFlagsData::trusted(),}.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 f64f603606..930080fd4c 100644--- a/cranelift/codegen/src/isa/aarch64/inst/emit_tests.rs+++ b/cranelift/codegen/src/isa/aarch64/inst/emit_tests.rs@@ -1457,7 +1457,7 @@ fn test_aarch64_binemit() {rn: xreg(2),simm9: simm9_zero(),},- flags: MemFlags::trusted(),+ flags: MemFlagsData::trusted(),},"41004038","ldurb w1, [x2]",@@ -1469,7 +1469,7 @@ fn test_aarch64_binemit() {rn: xreg(2),uimm12: UImm12Scaled::zero(I8),},- flags: MemFlags::trusted(),+ flags: MemFlagsData::trusted(),},"41004039","ldrb w1, [x2]",@@ -1481,7 +1481,7 @@ fn test_aarch64_binemit() {rn: xreg(2),rm: xreg(5),},- flags: MemFlags::trusted(),+ flags: MemFlagsData::trusted(),},"41686538","ldrb w1, [x2, x5]",@@ -1493,7 +1493,7 @@ fn test_aarch64_binemit() {rn: xreg(2),simm9: simm9_zero(),},- flags: MemFlags::trusted(),+ flags: MemFlagsData::trusted(),},"41008038","ldursb x1, [x2]",@@ -1505,7 +1505,7 @@ fn test_aarch64_binemit() {rn: xreg(2),uimm12: UImm12Scaled::maybe_from_i64(63, I8).unwrap(),},- flags: MemFlags::trusted(),+ flags: MemFlagsData::trusted(),},"41FC8039","ldrsb x1, [x2, #63]",@@ -1517,7 +1517,7 @@ fn test_aarch64_binemit() {rn: xreg(2),rm: xreg(5),},- flags: MemFlags::trusted(),+ flags: MemFlagsData::trusted(),},"4168A538","ldrsb x1, [x2, x5]",@@ -1529,7 +1529,7 @@ fn test_aarch64_binemit() {rn: xreg(2),simm9: SImm9::maybe_from_i64(5).unwrap(),},- flags: MemFlags::trusted(),+ flags: MemFlagsData::trusted(),},"41504078","ldurh w1, [x2, #5]",@@ -1541,7 +1541,7 @@ fn test_aarch64_binemit() {rn: xreg(2),uimm12: UImm12Scaled::maybe_from_i64(8, I16).unwrap(),},- flags: MemFlags::trusted(),+ flags: MemFlagsData::trusted(),},"41104079","ldrh w1, [x2, #8]",@@ -1553,7 +1553,7 @@ fn test_aarch64_binemit() {rn: xreg(2),rm: xreg(3),},- flags: MemFlags::trusted(),+ flags: MemFlagsData::trusted(),},"41786378","ldrh w1, [x2, x3, LSL #1]",@@ -1565,7 +1565,7 @@ fn test_aarch64_binemit() {rn: xreg(2),simm9: simm9_zero(),},- flags: MemFlags::trusted(),+ flags: MemFlagsData::trusted(),},"41008078","ldursh x1, [x2]",@@ -1577,7 +1577,7 @@ fn test_aarch64_binemit() {rn: xreg(20),uimm12: UImm12Scaled::maybe_from_i64(24, I16).unwrap(),},- flags: MemFlags::trusted(),+ flags: MemFlagsData::trusted(),},"9C328079","ldrsh x28, [x20, #24]",@@ -1589,7 +1589,7 @@ fn test_aarch64_binemit() {rn: xreg(20),rm: xreg(20),},- flags: MemFlags::trusted(),+ flags: MemFlagsData::trusted(),},"9C7AB478","ldrsh x28, [x20, x20, LSL #1]",@@ -1601,7 +1601,7 @@ fn test_aarch64_binemit() {rn: xreg(2),simm9: simm9_zero(),},- flags: MemFlags::trusted(),+ flags: MemFlagsData::trusted(),},"410040B8","ldur w1, [x2]",@@ -1613,7 +1613,7 @@ fn test_aarch64_binemit() {rn: xreg(0),uimm12: UImm12Scaled::maybe_from_i64(204, I32).unwrap(),},- flags: MemFlags::trusted(),+ flags: MemFlagsData::trusted(),},"0CCC40B9","ldr w12, [x0, #204]",@@ -1625,7 +1625,7 @@ fn test_aarch64_binemit() {rn: xreg(2),rm: xreg(12),},- flags: MemFlags::trusted(),+ flags: MemFlagsData::trusted(),},"41786CB8","ldr w1, [x2, x12, LSL #2]",@@ -1637,7 +1637,7 @@ fn test_aarch64_binemit() {rn: xreg(2),simm9: simm9_zero(),},- flags: MemFlags::trusted(),+ flags: MemFlagsData::trusted(),},"410080B8","ldursw x1, [x2]",@@ -1649,7 +1649,7 @@ fn test_aarch64_binemit() {rn: xreg(1),uimm12: UImm12Scaled::maybe_from_i64(16380, I32).unwrap(),},- flags: MemFlags::trusted(),+ flags: MemFlagsData::trusted(),},"2CFCBFB9","ldrsw x12, [x1, #16380]",@@ -1661,7 +1661,7 @@ fn test_aarch64_binemit() {rn: xreg(5),rm: xreg(1),},- flags: MemFlags::trusted(),+ flags: MemFlagsData::trusted(),},"A178A1B8","ldrsw x1, [x5, x1, LSL #2]",@@ -1673,7 +1673,7 @@ fn test_aarch64_binemit() {rn: xreg(2),simm9: simm9_zero(),},- flags: MemFlags::trusted(),+ flags: MemFlagsData::trusted(),},"410040F8","ldur x1, [x2]",@@ -1685,7 +1685,7 @@ fn test_aarch64_binemit() {rn: xreg(2),simm9: SImm9::maybe_from_i64(-256).unwrap(),},- flags: MemFlags::trusted(),+ flags: MemFlagsData::trusted(),},"410050F8","ldur x1, [x2, #-256]",@@ -1697,7 +1697,7 @@ fn test_aarch64_binemit() {rn: xreg(2),simm9: SImm9::maybe_from_i64(255).unwrap(),},- flags: MemFlags::trusted(),+ flags: MemFlagsData::trusted(),},"41F04FF8","ldur x1, [x2, #255]",@@ -1709,7 +1709,7 @@ fn test_aarch64_binemit() {rn: xreg(2),uimm12: UImm12Scaled::maybe_from_i64(32760, I64).unwrap(),},- flags: MemFlags::trusted(),+ flags: MemFlagsData::trusted(),},"41FC7FF9","ldr x1, [x2, #32760]",@@ -1721,7 +1721,7 @@ fn test_aarch64_binemit() {rn: xreg(2),rm: xreg(3),},- flags: MemFlags::trusted(),+ flags: MemFlagsData::trusted(),},"416863F8","ldr x1, [x2, x3]",@@ -1733,7 +1733,7 @@ fn test_aarch64_binemit() {rn: xreg(2),rm: xreg(3),},- flags: MemFlags::trusted(),+ flags: MemFlagsData::trusted(),},"417863F8","ldr x1, [x2, x3, LSL #3]",@@ -1746,7 +1746,7 @@ fn test_aarch64_binemit() {rm: xreg(3),extendop: ExtendOp::SXTW,},- flags: MemFlags::trusted(),+ flags: MemFlagsData::trusted(),},"41D863F8","ldr x1, [x2, w3, SXTW #3]",@@ -1759,7 +1759,7 @@ fn test_aarch64_binemit() {rm: xreg(3),extendop: ExtendOp::SXTW,},- flags: MemFlags::trusted(),+ flags: MemFlagsData::trusted(),},"41C863F8","ldr x1, [x2, w3, SXTW]",@@ -1770,7 +1770,7 @@ fn test_aarch64_binemit() {mem: AMode::Label {label: MemLabel::PCRel(64),},- flags: MemFlags::trusted(),+ flags: MemFlagsData::trusted(),},"01020058","ldr x1, pc+64",@@ -1781,7 +1781,7 @@ fn test_aarch64_binemit() {mem: AMode::SPPreIndexed {simm9: SImm9::maybe_from_i64(16).unwrap(),},- flags: MemFlags::trusted(),+ flags: MemFlagsData::trusted(),},"E10F41F8","ldr x1, [sp, #16]!",@@ -1792,7 +1792,7 @@ fn test_aarch64_binemit() {mem: AMode::SPPostIndexed {simm9: SImm9::maybe_from_i64(16).unwrap(),},- flags: MemFlags::trusted(),+ flags: MemFlagsData::trusted(),},"E10741F8","ldr x1, [sp], #16",@@ -1801,7 +1801,7 @@ fn test_aarch64_binemit() {Inst::ULoad64 {rd: writable_xreg(1),mem: AMode::FPOffset { off: 32768 },- flags: MemFlags::trusted(),+ flags: MemFlagsData::trusted(),},"100090D2A1EB70F8","movz x16, #32768 ; ldr x1, [fp, x16, SXTX]",@@ -1810,7 +1810,7 @@ fn test_aarch64_binemit() {Inst::ULoad64 {rd: writable_xreg(1),mem: AMode::FPOffset { off: -32768 },- flags: MemFlags::trusted(),+ flags: MemFlagsData::trusted(),},"F0FF8F92A1EB70F8","movn x16, #32767 ; ldr x1, [fp, x16, SXTX]",@@ -1819,7 +1819,7 @@ fn test_aarch64_binemit() {Inst::ULoad64 {rd: writable_xreg(1),mem: AMode::FPOffset { off: 1048576 }, // 2^20- flags: MemFlags::trusted(),+ flags: MemFlagsData::trusted(),},"1002A0D2A1EB70F8","movz x16, #16, LSL #16 ; ldr x1, [fp, x16, SXTX]",@@ -1828,7 +1828,7 @@ fn test_aarch64_binemit() {Inst::ULoad64 {rd: writable_xreg(1),mem: AMode::FPOffset { off: 1048576 + 1 }, // 2^20 + 1- flags: MemFlags::trusted(),+ flags: MemFlagsData::trusted(),},"300080521002A072A1EB70F8","movz w16, #1 ; movk w16, w16, #16, LSL #16 ; ldr x1, [fp, x16, SXTX]",@@ -1841,7 +1841,7 @@ fn test_aarch64_binemit() {rn: xreg(7),off: 8,},- flags: MemFlags::trusted(),+ flags: MemFlagsData::trusted(),},"E18040F8","ldr x1, [x7, #8]",@@ -1854,7 +1854,7 @@ fn test_aarch64_binemit() {rn: xreg(7),off: 1024,},- flags: MemFlags::trusted(),+ flags: MemFlagsData::trusted(),},"E10042F9","ldr x1, [x7, #1024]",@@ -1867,7 +1867,7 @@ fn test_aarch64_binemit() {rn: xreg(7),off: 1048576,},- flags: MemFlags::trusted(),+ flags: MemFlagsData::trusted(),},"1002A0D2E1E870F8","movz x16, #16, LSL #16 ; ldr x1, [x7, x16, SXTX]",@@ -1880,7 +1880,7 @@ fn test_aarch64_binemit() {rn: xreg(2),simm9: simm9_zero(),},- flags: MemFlags::trusted(),+ flags: MemFlagsData::trusted(),},"41000038","sturb w1, [x2]",@@ -1892,7 +1892,7 @@ fn test_aarch64_binemit() {rn: xreg(2),uimm12: UImm12Scaled::maybe_from_i64(4095, I8).unwrap(),},- flags: MemFlags::trusted(),+ flags: MemFlagsData::trusted(),},"41FC3F39","strb w1, [x2, #4095]",@@ -1904,7 +1904,7 @@ fn test_aarch64_binemit() {rn: xreg(2),simm9: simm9_zero(),},- flags: MemFlags::trusted(),+ flags: MemFlagsData::trusted(),},"41000078","sturh w1, [x2]",@@ -1916,7 +1916,7 @@ fn test_aarch64_binemit() {rn: xreg(2),uimm12: UImm12Scaled::maybe_from_i64(8190, I16).unwrap(),},- flags: MemFlags::trusted(),+ flags: MemFlagsData::trusted(),},"41FC3F79","strh w1, [x2, #8190]",@@ -1928,7 +1928,7 @@ fn test_aarch64_binemit() {rn: xreg(2),simm9: simm9_zero(),},- flags: MemFlags::trusted(),+ flags: MemFlagsData::trusted(),},"410000B8","stur w1, [x2]",@@ -1940,7 +1940,7 @@ fn test_aarch64_binemit() {rn: xreg(2),uimm12: UImm12Scaled::maybe_from_i64(16380, I32).unwrap(),},- flags: MemFlags::trusted(),+ flags: MemFlagsData::trusted(),},"41FC3FB9","str w1, [x2, #16380]",@@ -1952,7 +1952,7 @@ fn test_aarch64_binemit() {rn: xreg(2),simm9: simm9_zero(),},- flags: MemFlags::trusted(),+ flags: MemFlagsData::trusted(),},"410000F8","stur x1, [x2]",@@ -1964,7 +1964,7 @@ fn test_aarch64_binemit() {rn: xreg(2),uimm12: UImm12Scaled::maybe_from_i64(32760, I64).unwrap(),},- flags: MemFlags::trusted(),+ flags: MemFlagsData::trusted(),},"41FC3FF9","str x1, [x2, #32760]",@@ -1976,7 +1976,7 @@ fn test_aarch64_binemit() {rn: xreg(2),rm: xreg(3),},- flags: MemFlags::trusted(),+ flags: MemFlagsData::trusted(),},"416823F8","str x1, [x2, x3]",@@ -1988,7 +1988,7 @@ fn test_aarch64_binemit() {rn: xreg(2),rm: xreg(3),},- flags: MemFlags::trusted(),+ flags: MemFlagsData::trusted(),},"417823F8","str x1, [x2, x3, LSL #3]",@@ -2001,7 +2001,7 @@ fn test_aarch64_binemit() {rm: xreg(3),extendop: ExtendOp::UXTW,},- flags: MemFlags::trusted(),+ flags: MemFlagsData::trusted(),},"415823F8","str x1, [x2, w3, UXTW #3]",@@ -2014,7 +2014,7 @@ fn test_aarch64_binemit() {rm: xreg(3),extendop: ExtendOp::UXTW,},- flags: MemFlags::trusted(),+ flags: MemFlagsData::trusted(),},"414823F8","str x1, [x2, w3, UXTW]",@@ -2025,7 +2025,7 @@ fn test_aarch64_binemit() {mem: AMode::SPPreIndexed {simm9: SImm9::maybe_from_i64(16).unwrap(),},- flags: MemFlags::trusted(),+ flags: MemFlagsData::trusted(),},"E10F01F8","str x1, [sp, #16]!",@@ -2036,7 +2036,7 @@ fn test_aarch64_binemit() {mem: AMode::SPPostIndexed {simm9: SImm9::maybe_from_i64(16).unwrap(),},- flags: MemFlags::trusted(),+ flags: MemFlagsData::trusted(),},"E10701F8","str x1, [sp], #16",@@ -2050,7 +2050,7 @@ fn test_aarch64_binemit() {reg: xreg(10),simm7: simm7_scaled_zero(I64),},- flags: MemFlags::trusted(),+ flags: MemFlagsData::trusted(),},"482500A9","stp x8, x9, [x10]",@@ -2063,7 +2063,7 @@ fn test_aarch64_binemit() {reg: xreg(10),simm7: SImm7Scaled::maybe_from_i64(504, I64).unwrap(),},- flags: MemFlags::trusted(),+ flags: MemFlagsData::trusted(),},"48A51FA9","stp x8, x9, [x10, #504]",@@ -2076,7 +2076,7 @@ fn test_aarch64_binemit() {reg: xreg(10),simm7: SImm7Scaled::maybe_from_i64(-64, I64).unwrap(),},- flags: MemFlags::trusted(),+ flags: MemFlagsData::trusted(),},"48253CA9","stp x8, x9, [x10, #-64]",@@ -2089,7 +2089,7 @@ fn test_aarch64_binemit() {reg: xreg(1),simm7: SImm7Scaled::maybe_from_i64(-512, I64).unwrap(),},- flags: MemFlags::trusted(),+ flags: MemFlagsData::trusted(),},"357020A9","stp x21, x28, [x1, #-512]",@@ -2101,7 +2101,7 @@ fn test_aarch64_binemit() {mem: PairAMode::SPPreIndexed {simm7: SImm7Scaled::maybe_from_i64(-64, I64).unwrap(),},- flags: MemFlags::trusted(),+ flags: MemFlagsData::trusted(),},"E827BCA9","stp x8, x9, [sp, #-64]!",@@ -2113,7 +2113,7 @@ fn test_aarch64_binemit() {mem: PairAMode::SPPostIndexed {simm7: SImm7Scaled::maybe_from_i64(504, I64).unwrap(),},- flags: MemFlags::trusted(),+ flags: MemFlagsData::trusted(),},"EFC39FA8","stp x15, x16, [sp], #504",@@ -2127,7 +2127,7 @@ fn test_aarch64_binemit() {reg: xreg(10),simm7: simm7_scaled_zero(I64),},- flags: MemFlags::trusted(),+ flags: MemFlagsData::trusted(),},"482540A9","ldp x8, x9, [x10]",@@ -2140,7 +2140,7 @@ fn test_aarch64_binemit() {reg: xreg(10),simm7: SImm7Scaled::maybe_from_i64(504, I64).unwrap(),},- flags: MemFlags::trusted(),+ flags: MemFlagsData::trusted(),},"48A55FA9","ldp x8, x9, [x10, #504]",@@ -2153,7 +2153,7 @@ fn test_aarch64_binemit() {reg: xreg(10),simm7: SImm7Scaled::maybe_from_i64(-64, I64).unwrap(),},- flags: MemFlags::trusted(),+ flags: MemFlagsData::trusted(),},"48257CA9","ldp x8, x9, [x10, #-64]",@@ -2166,7 +2166,7 @@ fn test_aarch64_binemit() {reg: xreg(10),simm7: SImm7Scaled::maybe_from_i64(-512, I64).unwrap(),},- flags: MemFlags::trusted(),+ flags: MemFlagsData::trusted(),},"482560A9","ldp x8, x9, [x10, #-512]",@@ -2178,7 +2178,7 @@ fn test_aarch64_binemit() {mem: PairAMode::SPPreIndexed {simm7: SImm7Scaled::maybe_from_i64(-64, I64).unwrap(),},- flags: MemFlags::trusted(),+ flags: MemFlagsData::trusted(),},"E827FCA9","ldp x8, x9, [sp, #-64]!",@@ -2190,7 +2190,7 @@ fn test_aarch64_binemit() {mem: PairAMode::SPPostIndexed {simm7: SImm7Scaled::maybe_from_i64(504, I64).unwrap(),},- flags: MemFlags::trusted(),+ flags: MemFlagsData::trusted(),},"E8E7DFA8","ldp x8, x25, [sp], #504",@@ -5709,7 +5709,7 @@ fn test_aarch64_binemit() {rd: writable_vreg(31),rn: xreg(0),size: VectorSize::Size64x2,- flags: MemFlags::trusted(),+ flags: MemFlagsData::trusted(),},"1FCC404D","ld1r { v31.2d }, [x0]",@@ -5720,7 +5720,7 @@ fn test_aarch64_binemit() {rd: writable_vreg(0),rn: xreg(25),size: VectorSize::Size8x8,- flags: MemFlags::trusted(),+ flags: MemFlagsData::trusted(),},"20C3400D","ld1r { v0.8b }, [x25]",@@ -6720,7 +6720,7 @@ fn test_aarch64_binemit() {rn: xreg(8),rm: xreg(9),},- flags: MemFlags::trusted(),+ flags: MemFlagsData::trusted(),},"1079697C","ldr h16, [x8, x9, LSL #1]",@@ -6733,7 +6733,7 @@ fn test_aarch64_binemit() {rn: xreg(8),rm: xreg(9),},- flags: MemFlags::trusted(),+ flags: MemFlagsData::trusted(),},"107969BC","ldr s16, [x8, x9, LSL #2]",@@ -6746,7 +6746,7 @@ fn test_aarch64_binemit() {rn: xreg(8),rm: xreg(9),},- flags: MemFlags::trusted(),+ flags: MemFlagsData::trusted(),},"107969FC","ldr d16, [x8, x9, LSL #3]",@@ -6759,7 +6759,7 @@ fn test_aarch64_binemit() {rn: xreg(8),rm: xreg(9),},- flags: MemFlags::trusted(),+ flags: MemFlagsData::trusted(),},"1079E93C","ldr q16, [x8, x9, LSL #4]",@@ -6771,7 +6771,7 @@ fn test_aarch64_binemit() {mem: AMode::Label {label: MemLabel::PCRel(8),},- flags: MemFlags::trusted(),+ flags: MemFlagsData::trusted(),},"5000001C","ldr s16, pc+8",@@ -6783,7 +6783,7 @@ fn test_aarch64_binemit() {mem: AMode::Label {label: MemLabel::PCRel(8),},- flags: MemFlags::trusted(),+ flags: MemFlagsData::trusted(),},"5000005C","ldr d16, pc+8",@@ -6795,7 +6795,7 @@ fn test_aarch64_binemit() {mem: AMode::Label {label: MemLabel::PCRel(8),},- flags: MemFlags::trusted(),+ flags: MemFlagsData::trusted(),},"5000009C","ldr q16, pc+8",@@ -6808,7 +6808,7 @@ fn test_aarch64_binemit() {rn: xreg(8),rm: xreg(9),},- flags: MemFlags::trusted(),+ flags: MemFlagsData::trusted(),},"1079297C","str h16, [x8, x9, LSL #1]",@@ -6821,7 +6821,7 @@ fn test_aarch64_binemit() {rn: xreg(8),rm: xreg(9),},- flags: MemFlags::trusted(),+ flags: MemFlagsData::trusted(),},"107929BC","str s16, [x8, x9, LSL #2]",@@ -6834,7 +6834,7 @@ fn test_aarch64_binemit() {rn: xreg(8),rm: xreg(9),},- flags: MemFlags::trusted(),+ flags: MemFlagsData::trusted(),},"107929FC","str d16, [x8, x9, LSL #3]",@@ -6847,7 +6847,7 @@ fn test_aarch64_binemit() {rn: xreg(8),rm: xreg(9),},- flags: MemFlags::trusted(),+ flags: MemFlagsData::trusted(),},"1079A93C","str q16, [x8, x9, LSL #4]",@@ -6861,7 +6861,7 @@ fn test_aarch64_binemit() {reg: xreg(0),simm7: simm7_scaled_zero(F64),},- flags: MemFlags::trusted(),+ flags: MemFlagsData::trusted(),},"007C406D","ldp d0, d31, [x0]",@@ -6874,7 +6874,7 @@ fn test_aarch64_binemit() {mem: PairAMode::SPPreIndexed {simm7: SImm7Scaled::maybe_from_i64(-512, F64).unwrap(),},- flags: MemFlags::trusted(),+ flags: MemFlagsData::trusted(),},"F32FE06D","ldp d19, d11, [sp, #-512]!",@@ -6887,7 +6887,7 @@ fn test_aarch64_binemit() {mem: PairAMode::SPPostIndexed {simm7: SImm7Scaled::maybe_from_i64(64, F64).unwrap(),},- flags: MemFlags::trusted(),+ flags: MemFlagsData::trusted(),},"E753C46C","ldp d7, d20, [sp], #64",@@ -6901,7 +6901,7 @@ fn test_aarch64_binemit() {reg: stack_reg(),simm7: SImm7Scaled::maybe_from_i64(504, F64).unwrap(),},- flags: MemFlags::trusted(),+ flags: MemFlagsData::trusted(),},"E4EB1F6D","stp d4, d26, [sp, #504]",@@ -6914,7 +6914,7 @@ fn test_aarch64_binemit() {mem: PairAMode::SPPreIndexed {simm7: SImm7Scaled::maybe_from_i64(48, F64).unwrap(),},- flags: MemFlags::trusted(),+ flags: MemFlagsData::trusted(),},"F023836D","stp d16, d8, [sp, #48]!",@@ -6927,7 +6927,7 @@ fn test_aarch64_binemit() {mem: PairAMode::SPPostIndexed {simm7: SImm7Scaled::maybe_from_i64(-32, F64).unwrap(),},- flags: MemFlags::trusted(),+ flags: MemFlagsData::trusted(),},"E51BBE6C","stp d5, d6, [sp], #-32",@@ -6941,7 +6941,7 @@ fn test_aarch64_binemit() {reg: xreg(3),simm7: simm7_scaled_zero(I8X16),},- flags: MemFlags::trusted(),+ flags: MemFlagsData::trusted(),},"604440AD","ldp q0, q17, [x3]",@@ -6954,7 +6954,7 @@ fn test_aarch64_binemit() {mem: PairAMode::SPPreIndexed {simm7: SImm7Scaled::maybe_from_i64(-1024, I8X16).unwrap(),},- flags: MemFlags::trusted(),+ flags: MemFlagsData::trusted(),},"FD27E0AD","ldp q29, q9, [sp, #-1024]!",@@ -6967,7 +6967,7 @@ fn test_aarch64_binemit() {mem: PairAMode::SPPostIndexed {simm7: SImm7Scaled::maybe_from_i64(256, I8X16).unwrap(),},- flags: MemFlags::trusted(),+ flags: MemFlagsData::trusted(),},"EA53C8AC","ldp q10, q20, [sp], #256",@@ -6981,7 +6981,7 @@ fn test_aarch64_binemit() {reg: stack_reg(),simm7: SImm7Scaled::maybe_from_i64(1008, I8X16).unwrap(),},- flags: MemFlags::trusted(),+ flags: MemFlagsData::trusted(),},"E9FF1FAD","stp q9, q31, [sp, #1008]",@@ -6994,7 +6994,7 @@ fn test_aarch64_binemit() {mem: PairAMode::SPPreIndexed {simm7: SImm7Scaled::maybe_from_i64(-192, I8X16).unwrap(),},- flags: MemFlags::trusted(),+ flags: MemFlagsData::trusted(),},"FB37BAAD","stp q27, q13, [sp, #-192]!",@@ -7007,7 +7007,7 @@ fn test_aarch64_binemit() {mem: PairAMode::SPPostIndexed {simm7: SImm7Scaled::maybe_from_i64(304, I8X16).unwrap(),},- flags: MemFlags::trusted(),+ flags: MemFlagsData::trusted(),},"F2DB89AC","stp q18, q22, [sp], #304",@@ -7123,7 +7123,7 @@ fn test_aarch64_binemit() {Inst::AtomicRMWLoop {ty: I8,op: AtomicRMWLoopOp::Sub,- flags: MemFlags::trusted(),+ flags: MemFlagsData::trusted(),addr: xreg(25),operand: xreg(26),oldval: writable_xreg(27),@@ -7137,7 +7137,7 @@ fn test_aarch64_binemit() {Inst::AtomicRMWLoop {ty: I16,op: AtomicRMWLoopOp::Eor,- flags: MemFlags::trusted(),+ flags: MemFlagsData::trusted(),addr: xreg(25),operand: xreg(26),oldval: writable_xreg(27),@@ -7151,7 +7151,7 @@ fn test_aarch64_binemit() {Inst::AtomicRMWLoop {ty: I8,op: AtomicRMWLoopOp::Add,- flags: MemFlags::trusted(),+ flags: MemFlagsData::trusted(),addr: xreg(25),operand: xreg(26),oldval: writable_xreg(27),@@ -7165,7 +7165,7 @@ fn test_aarch64_binemit() {Inst::AtomicRMWLoop {ty: I32,op: AtomicRMWLoopOp::Orr,- flags: MemFlags::trusted(),+ flags: MemFlagsData::trusted(),addr: xreg(25),operand: xreg(26),oldval: writable_xreg(27),@@ -7179,7 +7179,7 @@ fn test_aarch64_binemit() {Inst::AtomicRMWLoop {ty: I64,op: AtomicRMWLoopOp::And,- flags: MemFlags::trusted(),+ flags: MemFlagsData::trusted(),addr: xreg(25),operand: xreg(26),oldval: writable_xreg(27),@@ -7193,7 +7193,7 @@ fn test_aarch64_binemit() {Inst::AtomicRMWLoop {ty: I8,op: AtomicRMWLoopOp::Xchg,- flags: MemFlags::trusted(),+ flags: MemFlagsData::trusted(),addr: xreg(25),operand: xreg(26),oldval: writable_xreg(27),@@ -7207,7 +7207,7 @@ fn test_aarch64_binemit() {Inst::AtomicRMWLoop {ty: I16,op: AtomicRMWLoopOp::Nand,- flags: MemFlags::trusted(),+ flags: MemFlagsData::trusted(),addr: xreg(25),operand: xreg(26),oldval: writable_xreg(27),@@ -7221,7 +7221,7 @@ fn test_aarch64_binemit() {Inst::AtomicRMWLoop {ty: I16,op: AtomicRMWLoopOp::Smin,- flags: MemFlags::trusted(),+ flags: MemFlagsData::trusted(),addr: xreg(25),operand: xreg(26),oldval: writable_xreg(27),@@ -7235,7 +7235,7 @@ fn test_aarch64_binemit() {Inst::AtomicRMWLoop {ty: I32,op: AtomicRMWLoopOp::Smin,- flags: MemFlags::trusted(),+ flags: MemFlagsData::trusted(),addr: xreg(25),operand: xreg(26),oldval: writable_xreg(27),@@ -7249,7 +7249,7 @@ fn test_aarch64_binemit() {Inst::AtomicRMWLoop {ty: I64,op: AtomicRMWLoopOp::Smax,- flags: MemFlags::trusted(),+ flags: MemFlagsData::trusted(),addr: xreg(25),operand: xreg(26),oldval: writable_xreg(27),@@ -7263,7 +7263,7 @@ fn test_aarch64_binemit() {Inst::AtomicRMWLoop {ty: I8,op: AtomicRMWLoopOp::Smax,- flags: MemFlags::trusted(),+ flags: MemFlagsData::trusted(),addr: xreg(25),operand: xreg(26),oldval: writable_xreg(27),@@ -7277,7 +7277,7 @@ fn test_aarch64_binemit() {Inst::AtomicRMWLoop {ty: I8,op: AtomicRMWLoopOp::Umin,- flags: MemFlags::trusted(),+ flags: MemFlagsData::trusted(),addr: xreg(25),operand: xreg(26),oldval: writable_xreg(27),@@ -7291,7 +7291,7 @@ fn test_aarch64_binemit() {Inst::AtomicRMWLoop {ty: I16,op: AtomicRMWLoopOp::Umax,- flags: MemFlags::trusted(),+ flags: MemFlagsData::trusted(),addr: xreg(25),operand: xreg(26),oldval: writable_xreg(27),@@ -7309,7 +7309,7 @@ fn test_aarch64_binemit() {rs: xreg(1),rt: writable_xreg(2),rn: xreg(3),- flags: MemFlags::trusted(),+ flags: MemFlagsData::trusted(),},"6200E138","ldaddalb w1, w2, [x3]",@@ -7321,7 +7321,7 @@ fn test_aarch64_binemit() {rs: xreg(4),rt: writable_xreg(5),rn: xreg(6),- flags: MemFlags::trusted(),+ flags: MemFlagsData::trusted(),},"C500E478","ldaddalh w4, w5, [x6]",@@ -7333,7 +7333,7 @@ fn test_aarch64_binemit() {rs: xreg(7),rt: writable_xreg(8),rn: xreg(9),- flags: MemFlags::trusted(),+ flags: MemFlagsData::trusted(),},"2801E7B8","ldaddal w7, w8, [x9]",@@ -7345,7 +7345,7 @@ fn test_aarch64_binemit() {rs: xreg(10),rt: writable_xreg(11),rn: xreg(12),- flags: MemFlags::trusted(),+ flags: MemFlagsData::trusted(),},"8B01EAF8","ldaddal x10, x11, [x12]",@@ -7357,7 +7357,7 @@ fn test_aarch64_binemit() {rs: xreg(13),rt: writable_xreg(14),rn: xreg(15),- flags: MemFlags::trusted(),+ flags: MemFlagsData::trusted(),},"EE11ED38","ldclralb w13, w14, [x15]",@@ -7369,7 +7369,7 @@ fn test_aarch64_binemit() {rs: xreg(16),rt: writable_xreg(17),rn: xreg(18),- flags: MemFlags::trusted(),+ flags: MemFlagsData::trusted(),},"5112F078","ldclralh w16, w17, [x18]",@@ -7381,7 +7381,7 @@ fn test_aarch64_binemit() {rs: xreg(19),rt: writable_xreg(20),rn: xreg(21),- flags: MemFlags::trusted(),+ flags: MemFlagsData::trusted(),},"B412F3B8","ldclral w19, w20, [x21]",@@ -7393,7 +7393,7 @@ fn test_aarch64_binemit() {rs: xreg(22),rt: writable_xreg(23),rn: xreg(24),- flags: MemFlags::trusted(),+ flags: MemFlagsData::trusted(),},"1713F6F8","ldclral x22, x23, [x24]",@@ -7405,7 +7405,7 @@ fn test_aarch64_binemit() {rs: xreg(25),rt: writable_xreg(26),rn: xreg(27),- flags: MemFlags::trusted(),+ flags: MemFlagsData::trusted(),},"7A23F938","ldeoralb w25, w26, [x27]",@@ -7417,7 +7417,7 @@ fn test_aarch64_binemit() {rs: xreg(28),rt: writable_xreg(29),rn: xreg(30),- flags: MemFlags::trusted(),+ flags: MemFlagsData::trusted(),},"DD23FC78","ldeoralh w28, fp, [lr]",@@ -7429,7 +7429,7 @@ fn test_aarch64_binemit() {rs: xreg(29),rt: writable_xreg(28),rn: xreg(27),- flags: MemFlags::trusted(),+ flags: MemFlagsData::trusted(),},"7C23FDB8","ldeoral fp, w28, [x27]",@@ -7441,7 +7441,7 @@ fn test_aarch64_binemit() {rs: xreg(26),rt: writable_xreg(25),rn: xreg(24),- flags: MemFlags::trusted(),+ flags: MemFlagsData::trusted(),},"1923FAF8","ldeoral x26, x25, [x24]",@@ -7453,7 +7453,7 @@ fn test_aarch64_binemit() {rs: xreg(23),rt: writable_xreg(22),rn: xreg(21),- flags: MemFlags::trusted(),+ flags: MemFlagsData::trusted(),},"B632F738","ldsetalb w23, w22, [x21]",@@ -7465,7 +7465,7 @@ fn test_aarch64_binemit() {rs: xreg(20),rt: writable_xreg(19),rn: xreg(18),- flags: MemFlags::trusted(),+ flags: MemFlagsData::trusted(),},"5332F478","ldsetalh w20, w19, [x18]",@@ -7477,7 +7477,7 @@ fn test_aarch64_binemit() {rs: xreg(17),rt: writable_xreg(16),rn: xreg(15),- flags: MemFlags::trusted(),+ flags: MemFlagsData::trusted(),},"F031F1B8","ldsetal w17, w16, [x15]",@@ -7489,7 +7489,7 @@ fn test_aarch64_binemit() {rs: xreg(14),rt: writable_xreg(13),rn: xreg(12),- flags: MemFlags::trusted(),+ flags: MemFlagsData::trusted(),},"8D31EEF8","ldsetal x14, x13, [x12]",@@ -7501,7 +7501,7 @@ fn test_aarch64_binemit() {rs: xreg(11),rt: writable_xreg(10),rn: xreg(9),- flags: MemFlags::trusted(),+ flags: MemFlagsData::trusted(),},"2A41EB38","ldsmaxalb w11, w10, [x9]",@@ -7513,7 +7513,7 @@ fn test_aarch64_binemit() {rs: xreg(8),rt: writable_xreg(7),rn: xreg(6),- flags: MemFlags::trusted(),+ flags: MemFlagsData::trusted(),},"C740E878","ldsmaxalh w8, w7, [x6]",@@ -7525,7 +7525,7 @@ fn test_aarch64_binemit() {rs: xreg(5),rt: writable_xreg(4),rn: xreg(3),- flags: MemFlags::trusted(),+ flags: MemFlagsData::trusted(),},"6440E5B8","ldsmaxal w5, w4, [x3]",@@ -7537,7 +7537,7 @@ fn test_aarch64_binemit() {rs: xreg(2),rt: writable_xreg(1),rn: xreg(0),- flags: MemFlags::trusted(),+ flags: MemFlagsData::trusted(),},"0140E2F8","ldsmaxal x2, x1, [x0]",@@ -7549,7 +7549,7 @@ fn test_aarch64_binemit() {rs: xreg(1),rt: writable_xreg(2),rn: xreg(3),- flags: MemFlags::trusted(),+ flags: MemFlagsData::trusted(),},"6250E138","ldsminalb w1, w2, [x3]",@@ -7561,7 +7561,7 @@ fn test_aarch64_binemit() {rs: xreg(4),rt: writable_xreg(5),rn: xreg(6),- flags: MemFlags::trusted(),+ flags: MemFlagsData::trusted(),},"C550E478","ldsminalh w4, w5, [x6]",@@ -7573,7 +7573,7 @@ fn test_aarch64_binemit() {rs: xreg(7),rt: writable_xreg(8),rn: xreg(9),- flags: MemFlags::trusted(),+ flags: MemFlagsData::trusted(),},"2851E7B8","ldsminal w7, w8, [x9]",@@ -7585,7 +7585,7 @@ fn test_aarch64_binemit() {rs: xreg(10),rt: writable_xreg(11),rn: xreg(12),- flags: MemFlags::trusted(),+ flags: MemFlagsData::trusted(),},"8B51EAF8","ldsminal x10, x11, [x12]",@@ -7597,7 +7597,7 @@ fn test_aarch64_binemit() {rs: xreg(13),rt: writable_xreg(14),rn: xreg(15),- flags: MemFlags::trusted(),+ flags: MemFlagsData::trusted(),},"EE61ED38","ldumaxalb w13, w14, [x15]",@@ -7609,7 +7609,7 @@ fn test_aarch64_binemit() {rs: xreg(16),rt: writable_xreg(17),rn: xreg(18),- flags: MemFlags::trusted(),+ flags: MemFlagsData::trusted(),},"5162F078","ldumaxalh w16, w17, [x18]",@@ -7621,7 +7621,7 @@ fn test_aarch64_binemit() {rs: xreg(19),rt: writable_xreg(20),rn: xreg(21),- flags: MemFlags::trusted(),+ flags: MemFlagsData::trusted(),},"B462F3B8","ldumaxal w19, w20, [x21]",@@ -7633,7 +7633,7 @@ fn test_aarch64_binemit() {rs: xreg(22),rt: writable_xreg(23),rn: xreg(24),- flags: MemFlags::trusted(),+ flags: MemFlagsData::trusted(),},"1763F6F8","ldumaxal x22, x23, [x24]",@@ -7645,7 +7645,7 @@ fn test_aarch64_binemit() {rs: xreg(16),rt: writable_xreg(17),rn: xreg(18),- flags: MemFlags::trusted(),+ flags: MemFlagsData::trusted(),},"5172F038","lduminalb w16, w17, [x18]",@@ -7657,7 +7657,7 @@ fn test_aarch64_binemit() {rs: xreg(19),rt: writable_xreg(20),rn: xreg(21),- flags: MemFlags::trusted(),+ flags: MemFlagsData::trusted(),},"B472F378","lduminalh w19, w20, [x21]",@@ -7669,7 +7669,7 @@ fn test_aarch64_binemit() {rs: xreg(22),rt: writable_xreg(23),rn: xreg(24),- flags: MemFlags::trusted(),+ flags: MemFlagsData::trusted(),},"1773F6B8","lduminal w22, w23, [x24]",@@ -7681,7 +7681,7 @@ fn test_aarch64_binemit() {rs: xreg(25),rt: writable_xreg(26),rn: xreg(27),- flags: MemFlags::trusted(),+ flags: MemFlagsData::trusted(),},"7A73F9F8","lduminal x25, x26, [x27]",@@ -7693,7 +7693,7 @@ fn test_aarch64_binemit() {rs: xreg(28),rt: writable_xreg(29),rn: xreg(30),- flags: MemFlags::trusted(),+ flags: MemFlagsData::trusted(),},"DD83FC38","swpalb w28, fp, [lr]",@@ -7705,7 +7705,7 @@ fn test_aarch64_binemit() {rs: xreg(0),rt: writable_xreg(1),rn: xreg(2),- flags: MemFlags::trusted(),+ flags: MemFlagsData::trusted(),},"4180E078","swpalh w0, w1, [x2]",@@ -7717,7 +7717,7 @@ fn test_aarch64_binemit() {rs: xreg(3),rt: writable_xreg(4),rn: xreg(5),- flags: MemFlags::trusted(),+ flags: MemFlagsData::trusted(),},"A480E3B8","swpal w3, w4, [x5]",@@ -7729,7 +7729,7 @@ fn test_aarch64_binemit() {rs: xreg(6),rt: writable_xreg(7),rn: xreg(8),- flags: MemFlags::trusted(),+ flags: MemFlagsData::trusted(),},"0781E6F8","swpal x6, x7, [x8]",@@ -7742,7 +7742,7 @@ fn test_aarch64_binemit() {rt: xreg(20),rn: xreg(10),ty: I8,- flags: MemFlags::trusted(),+ flags: MemFlagsData::trusted(),},"54FDFC08","casalb w28, w28, w20, [x10]",@@ -7754,7 +7754,7 @@ fn test_aarch64_binemit() {rt: xreg(19),rn: xreg(23),ty: I16,- flags: MemFlags::trusted(),+ flags: MemFlagsData::trusted(),},"F3FEE248","casalh w2, w2, w19, [x23]",@@ -7766,7 +7766,7 @@ fn test_aarch64_binemit() {rt: zero_reg(),rn: stack_reg(),ty: I32,- flags: MemFlags::trusted(),+ flags: MemFlagsData::trusted(),},"FFFFE088","casal w0, w0, wzr, [sp]",@@ -7778,7 +7778,7 @@ fn test_aarch64_binemit() {rt: xreg(15),rn: xreg(27),ty: I64,- flags: MemFlags::trusted(),+ flags: MemFlagsData::trusted(),},"6FFFE7C8","casal x7, x7, x15, [x27]",@@ -7786,7 +7786,7 @@ fn test_aarch64_binemit() {insns.push((Inst::AtomicCASLoop {ty: I8,- flags: MemFlags::trusted(),+ flags: MemFlagsData::trusted(),addr: xreg(25),expected: xreg(26),replacement: xreg(28),@@ -7800,7 +7800,7 @@ fn test_aarch64_binemit() {insns.push((Inst::AtomicCASLoop {ty: I16,- flags: MemFlags::trusted(),+ flags: MemFlagsData::trusted(),addr: xreg(25),expected: xreg(26),replacement: xreg(28),@@ -7814,7 +7814,7 @@ fn test_aarch64_binemit() {insns.push((Inst::AtomicCASLoop {ty: I32,- flags: MemFlags::trusted(),+ flags: MemFlagsData::trusted(),addr: xreg(25),expected: xreg(26),replacement: xreg(28),@@ -7828,7 +7828,7 @@ fn test_aarch64_binemit() {insns.push((Inst::AtomicCASLoop {ty: I64,- flags: MemFlags::trusted(),+ flags: MemFlagsData::trusted(),addr: xreg(25),expected: xreg(26),replacement: xreg(28),@@ -7844,7 +7844,7 @@ fn test_aarch64_binemit() {access_ty: I8,rt: writable_xreg(7),rn: xreg(28),- flags: MemFlags::trusted(),+ flags: MemFlagsData::trusted(),},"87FFDF08","ldarb w7, [x28]",@@ -7855,7 +7855,7 @@ fn test_aarch64_binemit() {access_ty: I16,rt: writable_xreg(2),rn: xreg(3),- flags: MemFlags::trusted(),+ flags: MemFlagsData::trusted(),},"62FCDF48","ldarh w2, [x3]",@@ -7866,7 +7866,7 @@ fn test_aarch64_binemit() {access_ty: I32,rt: writable_xreg(15),rn: xreg(0),- flags: MemFlags::trusted(),+ flags: MemFlagsData::trusted(),},"0FFCDF88","ldar w15, [x0]",@@ -7877,7 +7877,7 @@ fn test_aarch64_binemit() {access_ty: I64,rt: writable_xreg(28),rn: xreg(7),- flags: MemFlags::trusted(),+ flags: MemFlagsData::trusted(),},"FCFCDFC8","ldar x28, [x7]",@@ -7888,7 +7888,7 @@ fn test_aarch64_binemit() {access_ty: I8,rt: xreg(7),rn: xreg(28),- flags: MemFlags::trusted(),+ flags: MemFlagsData::trusted(),},"87FF9F08","stlrb w7, [x28]",@@ -7899,7 +7899,7 @@ fn test_aarch64_binemit() {access_ty: I16,rt: xreg(2),rn: xreg(3),- flags: MemFlags::trusted(),+ flags: MemFlagsData::trusted(),},"62FC9F48","stlrh w2, [x3]",@@ -7910,7 +7910,7 @@ fn test_aarch64_binemit() {access_ty: I32,rt: xreg(15),rn: xreg(0),- flags: MemFlags::trusted(),+ flags: MemFlagsData::trusted(),},"0FFC9F88","stlr w15, [x0]",@@ -7921,7 +7921,7 @@ fn test_aarch64_binemit() {access_ty: I64,rt: xreg(28),rn: xreg(7),- flags: MemFlags::trusted(),+ flags: MemFlagsData::trusted(),},"FCFC9FC8","stlr x28, [x7]",diff --git a/cranelift/codegen/src/isa/aarch64/inst/mod.rs b/cranelift/codegen/src/isa/aarch64/inst/mod.rsindex e1403f0030..8ec33bf2c8 100644--- a/cranelift/codegen/src/isa/aarch64/inst/mod.rs+++ b/cranelift/codegen/src/isa/aarch64/inst/mod.rs@@ -2,7 +2,7 @@use crate::binemit::{Addend, CodeOffset, Reloc};use crate::ir::types::{F16, F32, F64, F128, I8, I8X16, I16, I32, I64, I128};-use crate::ir::{MemFlags, Type, types};+use crate::ir::{MemFlagsData, Type, types};use crate::isa::{CallConv, FunctionAlignment};use crate::machinst::*;use crate::{CodegenError, CodegenResult, settings};@@ -206,7 +206,7 @@ impl Inst {}/// Generic constructor for a load (zero-extending where appropriate).- pub fn gen_load(into_reg: Writable<Reg>, mem: AMode, ty: Type, flags: MemFlags) -> Inst {+ pub fn gen_load(into_reg: Writable<Reg>, mem: AMode, ty: Type, flags: MemFlagsData) -> Inst {match ty {I8 => Inst::ULoad8 {rd: into_reg,@@ -248,7 +248,7 @@ impl Inst {}/// Generic constructor for a store.- pub fn gen_store(mem: AMode, from_reg: Reg, ty: Type, flags: MemFlags) -> Inst {+ pub fn gen_store(mem: AMode, from_reg: Reg, ty: Type, flags: MemFlagsData) -> Inst {match ty {I8 => Inst::Store8 {rd: from_reg,diff --git a/cranelift/codegen/src/isa/aarch64/lower.isle b/cranelift/codegen/src/isa/aarch64/lower.isleindex 7480255e60..dafd56631d 100644--- a/cranelift/codegen/src/isa/aarch64/lower.isle+++ b/cranelift/codegen/src/isa/aarch64/lower.isle@@ -1264,7 +1264,7 @@(let ((_ Unit (sink_inst inst)))(aarch64_uload in_ty (amode in_ty address offset) flags)))-(decl aarch64_uload (Type AMode MemFlags) Reg)+(decl aarch64_uload (Type AMode MemFlagsData) Reg)(rule (aarch64_uload $I8 amode flags) (aarch64_uload8 amode flags))(rule (aarch64_uload $I16 amode flags) (aarch64_uload16 amode flags))(rule (aarch64_uload $I32 amode flags) (aarch64_uload32 amode flags))@@ -1323,7 +1323,7 @@(let ((_ Unit (sink_inst inst)))(aarch64_sload in_ty (amode in_ty address offset) flags)))-(decl aarch64_sload (Type AMode MemFlags) Reg)+(decl aarch64_sload (Type AMode MemFlagsData) Reg)(rule (aarch64_sload $I8 amode flags) (aarch64_sload8 amode flags))(rule (aarch64_sload $I16 amode flags) (aarch64_sload16 amode flags))(rule (aarch64_sload $I32 amode flags) (aarch64_sload32 amode flags))diff --git a/cranelift/codegen/src/isa/aarch64/lower/isle.rs b/cranelift/codegen/src/isa/aarch64/lower/isle.rsindex b98436daac..eec13ba823 100644--- a/cranelift/codegen/src/isa/aarch64/lower/isle.rs+++ b/cranelift/codegen/src/isa/aarch64/lower/isle.rs@@ -20,7 +20,7 @@ use crate::machinst::isle::*;use crate::{binemit::CodeOffset,ir::{- AtomicRmwOp, BlockCall, ExternalName, Inst, InstructionData, MemFlags, TrapCode, Value,+ AtomicRmwOp, BlockCall, ExternalName, Inst, InstructionData, MemFlagsData, TrapCode, Value,ValueList, immediates::*, types::*,},isa::aarch64::abi::AArch64MachineDeps,diff --git a/cranelift/codegen/src/isa/pulley_shared/abi.rs b/cranelift/codegen/src/isa/pulley_shared/abi.rsindex 6e192c0239..ceebc15ab8 100644--- a/cranelift/codegen/src/isa/pulley_shared/abi.rs+++ b/cranelift/codegen/src/isa/pulley_shared/abi.rs@@ -4,7 +4,7 @@ use super::{PulleyFlags, PulleyTargetKind, inst::*};use crate::isa::pulley_shared::PointerWidth;use crate::{CodegenResult,- ir::{self, MemFlags, Signature, types::*},+ ir::{self, MemFlagsData, Signature, types::*},isa,machinst::*,settings,@@ -164,7 +164,7 @@ where}fn gen_load_stack(mem: StackAMode, into_reg: Writable<Reg>, ty: Type) -> Self::I {- let mut flags = MemFlags::trusted();+ let mut flags = MemFlagsData::trusted();// Stack loads/stores of vectors always use little-endianness to avoid// implementing a byte-swap of vectors on big-endian platforms.if ty.is_vector() {@@ -174,7 +174,7 @@ where}fn gen_store_stack(mem: StackAMode, from_reg: Reg, ty: Type) -> Self::I {- let mut flags = MemFlags::trusted();+ let mut flags = MemFlagsData::trusted();// Stack loads/stores of vectors always use little-endianness to avoid// implementing a byte-swap of vectors on big-endian platforms.if ty.is_vector() {@@ -261,13 +261,13 @@ wherefn gen_load_base_offset(into_reg: Writable<Reg>, base: Reg, offset: i32, ty: Type) -> Self::I {let base = XReg::try_from(base).unwrap();let mem = Amode::RegOffset { base, offset };- Inst::gen_load(into_reg, mem, ty, MemFlags::trusted()).into()+ Inst::gen_load(into_reg, mem, ty, MemFlagsData::trusted()).into()}fn gen_store_base_offset(base: Reg, offset: i32, from_reg: Reg, ty: Type) -> Self::I {let base = XReg::try_from(base).unwrap();let mem = Amode::RegOffset { base, offset };- Inst::gen_store(mem, from_reg, ty, MemFlags::trusted()).into()+ Inst::gen_store(mem, from_reg, ty, MemFlagsData::trusted()).into()}fn gen_sp_reg_adjust(amount: i32) -> SmallInstVec<Self::I> {@@ -344,7 +344,7 @@ where}for (offset, ty, reg) in frame_layout.manually_managed_clobbers(&style) {- let mut flags = MemFlags::trusted();+ let mut flags = MemFlagsData::trusted();if ty.is_vector() {flags.set_endianness(ir::Endianness::Little);}@@ -367,7 +367,7 @@ where// Restore clobbered registers that are manually managed in Cranelift.for (offset, ty, reg) in frame_layout.manually_managed_clobbers(&style) {- let mut flags = MemFlags::trusted();+ let mut flags = MemFlagsData::trusted();if ty.is_vector() {flags.set_endianness(ir::Endianness::Little);}diff --git a/cranelift/codegen/src/isa/pulley_shared/inst.isle b/cranelift/codegen/src/isa/pulley_shared/inst.isleindex 2fd938b50d..7324c34731 100644--- a/cranelift/codegen/src/isa/pulley_shared/inst.isle+++ b/cranelift/codegen/src/isa/pulley_shared/inst.isle@@ -74,14 +74,14 @@;;;; How much is written to the register is defined by `ExtKind`. The `flags`;; control behavior such as endianness.- (XLoad (dst WritableXReg) (mem Amode) (ty Type) (flags MemFlags))- (FLoad (dst WritableFReg) (mem Amode) (ty Type) (flags MemFlags))- (VLoad (dst WritableVReg) (mem Amode) (ty Type) (flags MemFlags))+ (XLoad (dst WritableXReg) (mem Amode) (ty Type) (flags MemFlagsData))+ (FLoad (dst WritableFReg) (mem Amode) (ty Type) (flags MemFlagsData))+ (VLoad (dst WritableVReg) (mem Amode) (ty Type) (flags MemFlagsData));; Stores.- (XStore (mem Amode) (src XReg) (ty Type) (flags MemFlags))- (FStore (mem Amode) (src FReg) (ty Type) (flags MemFlags))- (VStore (mem Amode) (src VReg) (ty Type) (flags MemFlags))+ (XStore (mem Amode) (src XReg) (ty Type) (flags MemFlagsData))+ (FStore (mem Amode) (src FReg) (ty Type) (flags MemFlagsData))+ (VStore (mem Amode) (src VReg) (ty Type) (flags MemFlagsData));; A raw pulley instruction generated at compile-time via Pulley's;; `for_each_op!` macro. This variant has `pulley_*` constructors to@@ -246,9 +246,9 @@(wasm_addr XReg)(offset u8))))-;; Helper to determine the endianness of `MemFlags` taking the current target+;; Helper to determine the endianness of `MemFlagsData` taking the current target;; into account.-(decl pure endianness (MemFlags) Endianness)+(decl pure endianness (MemFlagsData) Endianness)(extern constructor endianness endianness)(type Endianness extern (enum Little Big))@@ -295,13 +295,13 @@(decl pure pointer_width () PointerWidth)(extern constructor pointer_width pointer_width)-(decl pure memflags_nontrapping (MemFlags) bool)+(decl pure memflags_nontrapping (MemFlagsData) bool)(extern constructor memflags_nontrapping memflags_nontrapping)-(decl pure partial memflags_trapping (MemFlags) TrapCode)+(decl pure partial memflags_trapping (MemFlagsData) TrapCode)(extern constructor memflags_trapping memflags_trapping)-(decl pure memflags_is_wasm (MemFlags) bool)+(decl pure memflags_is_wasm (MemFlagsData) bool)(extern constructor memflags_is_wasm memflags_is_wasm);; Helper type to represent a "pending" `AddrG32` value.@@ -347,9 +347,9 @@;; Here the top-layer of this rule matches the `(select ...)` node where 0 is;; used if the oob condition is true. Otherwise the raw address is used for the;; load/store.-(decl pure partial wasm_g32 (Value Offset32 MemFlags Type) G32)+(decl pure partial wasm_g32 (Value Offset32 MemFlagsData Type) G32)(rule (wasm_g32 (select _ oob (u64_from_iconst 0) raw_addr) (offset32 0) flags ty)- ;; This must be a wasm load/store according to `MemFlags`, namely that it's+ ;; This must be a wasm load/store according to `MemFlagsData`, namely that it's;; got a "HEAP_OUT_OF_BOUNDS" trap code and it's little-endian.(if-let true (memflags_is_wasm flags));; Peel off the static wasm offset from `raw_addr`, if one is present. If@@ -665,33 +665,33 @@(rule (pulley_br_if cond taken not_taken)(SideEffectNoResult.Inst (MInst.BrIf cond taken not_taken)))-(decl pulley_xload (Amode Type MemFlags) XReg)+(decl pulley_xload (Amode Type MemFlagsData) XReg)(rule (pulley_xload amode ty flags)(let ((dst WritableXReg (temp_writable_xreg))(_ Unit (emit (MInst.XLoad dst amode ty flags))))dst))-(decl pulley_xstore (Amode XReg Type MemFlags) SideEffectNoResult)+(decl pulley_xstore (Amode XReg Type MemFlagsData) SideEffectNoResult)(rule (pulley_xstore amode src ty flags)(SideEffectNoResult.Inst (MInst.XStore amode src ty flags)))-(decl pulley_fload (Amode Type MemFlags) FReg)+(decl pulley_fload (Amode Type MemFlagsData) FReg)(rule (pulley_fload amode ty flags)(let ((dst WritableFReg (temp_writable_freg))(_ Unit (emit (MInst.FLoad dst amode ty flags))))dst))-(decl pulley_fstore (Amode FReg Type MemFlags) SideEffectNoResult)+(decl pulley_fstore (Amode FReg Type MemFlagsData) SideEffectNoResult)(rule (pulley_fstore amode src ty flags)(SideEffectNoResult.Inst (MInst.FStore amode src ty flags)))-(decl pulley_vload (Amode Type MemFlags) VReg)+(decl pulley_vload (Amode Type MemFlagsData) VReg)(rule (pulley_vload amode ty flags)(let ((dst WritableVReg (temp_writable_vreg))(_ Unit (emit (MInst.VLoad dst amode ty flags))))dst))-(decl pulley_vstore (Amode VReg Type MemFlags) SideEffectNoResult)+(decl pulley_vstore (Amode VReg Type MemFlagsData) SideEffectNoResult)(rule (pulley_vstore amode src ty flags)(SideEffectNoResult.Inst (MInst.VStore amode src ty flags)))diff --git a/cranelift/codegen/src/isa/pulley_shared/inst/emit.rs b/cranelift/codegen/src/isa/pulley_shared/inst/emit.rsindex d99f71caba..74bff5d97a 100644--- a/cranelift/codegen/src/isa/pulley_shared/inst/emit.rs+++ b/cranelift/codegen/src/isa/pulley_shared/inst/emit.rs@@ -29,7 +29,7 @@ impl EmitInfo {}}- fn endianness(&self, flags: MemFlags) -> Endianness {+ fn endianness(&self, flags: MemFlagsData) -> Endianness {flags.endianness(self.isa_flags.endianness())}}diff --git a/cranelift/codegen/src/isa/pulley_shared/inst/mod.rs b/cranelift/codegen/src/isa/pulley_shared/inst/mod.rsindex d76705a7fb..66861b4a38 100644--- a/cranelift/codegen/src/isa/pulley_shared/inst/mod.rs+++ b/cranelift/codegen/src/isa/pulley_shared/inst/mod.rs@@ -4,7 +4,7 @@ use core::marker::PhantomData;use crate::binemit::{Addend, CodeOffset, Reloc};use crate::ir::types::{self, F32, F64, I8, I8X16, I16, I32, I64, I128};-use crate::ir::{self, MemFlags, Type};+use crate::ir::{self, MemFlagsData, Type};use crate::isa::FunctionAlignment;use crate::isa::pulley_shared::abi::PulleyMachineDeps;use crate::{CodegenError, CodegenResult, settings};@@ -59,7 +59,7 @@ pub struct ReturnCallInfo<T> {impl Inst {/// Generic constructor for a load (zero-extending where appropriate).- pub fn gen_load(dst: Writable<Reg>, mem: Amode, ty: Type, flags: MemFlags) -> Inst {+ pub fn gen_load(dst: Writable<Reg>, mem: Amode, ty: Type, flags: MemFlagsData) -> Inst {if ty.is_vector() {assert_eq!(ty.bytes(), 16);Inst::VLoad {@@ -87,7 +87,7 @@ impl Inst {}/// Generic constructor for a store.- pub fn gen_store(mem: Amode, from_reg: Reg, ty: Type, flags: MemFlags) -> Inst {+ pub fn gen_store(mem: Amode, from_reg: Reg, ty: Type, flags: MemFlagsData) -> Inst {if ty.is_vector() {assert_eq!(ty.bytes(), 16);Inst::VStore {diff --git a/cranelift/codegen/src/isa/pulley_shared/lower.isle b/cranelift/codegen/src/isa/pulley_shared/lower.isleindex d31c7528fc..1b4560dca6 100644--- a/cranelift/codegen/src/isa/pulley_shared/lower.isle+++ b/cranelift/codegen/src/isa/pulley_shared/lower.isle@@ -1033,7 +1033,7 @@;; falls back to the pseudo-instruction `XLoad` which has code in `emit.rs` to;; emit lots of forms but it additionally supports more specific pattern-matched;; versions too.-(decl gen_xload (Value Offset32 MemFlags Type ExtKind) XReg)+(decl gen_xload (Value Offset32 MemFlagsData Type ExtKind) XReg);; Base case: use `pulley_xload` pseudo-inst for big-endian loads/stores with;; no extension. This should only be used for host-things on wasm and@@ -1165,7 +1165,7 @@(rule (emit_addrg32bne_xload addr $I64 _ext) (pulley_xload64le_g32bne addr));; Analog of `gen_xload`, but for floating-point registers-(decl gen_fload (Value Offset32 MemFlags Type) FReg)+(decl gen_fload (Value Offset32 MemFlagsData Type) FReg);; Base case: nontrapping loads/stores use the `fload` helper which bottoms out;; in `emit.rs` using the `*_o32` addressing mode.@@ -1202,7 +1202,7 @@(rule (emit_addrg32_fload addr $F64) (pulley_fload64le_g32 addr));; Analog of `gen_xload`, but for vector registers.-(decl gen_vload (Value Offset32 MemFlags Type VExtKind) VReg)+(decl gen_vload (Value Offset32 MemFlagsData Type VExtKind) VReg);; Base case: nontrapping loads/stores use the `*_o32` addressing mode through;; helpers in `emit.rs` and the `pulley_vload` pseudo-inst. Note that this@@ -1272,7 +1272,7 @@;; Helper to handle big/little endian to determine which order the lo/hi;; halves of the i128 are stored.-(decl emit_store_i128 (MemFlags XReg XReg Amode Amode) SideEffectNoResult)+(decl emit_store_i128 (MemFlagsData XReg XReg Amode Amode) SideEffectNoResult)(rule 0 (emit_store_i128 flags lo hi addrp0 addrp8)(if-let (Endianness.Little) (endianness flags))(let ((_ InstOutput (side_effect (pulley_xstore addrp0 lo $I64 flags))))@@ -1285,7 +1285,7 @@;; Helper function to store the first argument into the second argument. This;; only stores up to the width of the `Type` specified, regardless of what the;; type of the first argument is.-(decl gen_store (Value Value Offset32 MemFlags Type) SideEffectNoResult)+(decl gen_store (Value Value Offset32 MemFlagsData Type) SideEffectNoResult);; Base cases: normal typed loads/stores(rule 0 (gen_store src addr offset flags (ty_int ty))diff --git a/cranelift/codegen/src/isa/pulley_shared/lower/isle.rs b/cranelift/codegen/src/isa/pulley_shared/lower/isle.rsindex af900f72fa..3068fb1137 100644--- a/cranelift/codegen/src/isa/pulley_shared/lower/isle.rs+++ b/cranelift/codegen/src/isa/pulley_shared/lower/isle.rs@@ -260,7 +260,7 @@ whereU6::new(imm)}- fn endianness(&mut self, flags: MemFlags) -> Endianness {+ fn endianness(&mut self, flags: MemFlagsData) -> Endianness {flags.endianness(self.backend.isa_flags.endianness())}@@ -272,15 +272,15 @@ whereP::pointer_width()}- fn memflags_nontrapping(&mut self, flags: MemFlags) -> bool {+ fn memflags_nontrapping(&mut self, flags: MemFlagsData) -> bool {flags.trap_code().is_none()}- fn memflags_trapping(&mut self, flags: MemFlags) -> Option<TrapCode> {+ fn memflags_trapping(&mut self, flags: MemFlagsData) -> Option<TrapCode> {flags.trap_code()}- fn memflags_is_wasm(&mut self, flags: MemFlags) -> bool {+ fn memflags_is_wasm(&mut self, flags: MemFlagsData) -> bool {flags.trap_code() == Some(TrapCode::HEAP_OUT_OF_BOUNDS)&& self.endianness(flags) == Endianness::Little}diff --git a/cranelift/codegen/src/isa/riscv64/abi.rs b/cranelift/codegen/src/isa/riscv64/abi.rsindex ed7b863d68..ab815bbdf9 100644--- a/cranelift/codegen/src/isa/riscv64/abi.rs+++ b/cranelift/codegen/src/isa/riscv64/abi.rs@@ -194,11 +194,11 @@ impl ABIMachineSpec for Riscv64MachineDeps {}fn gen_load_stack(mem: StackAMode, into_reg: Writable<Reg>, ty: Type) -> Inst {- Inst::gen_load(into_reg, mem.into(), ty, MemFlags::trusted())+ Inst::gen_load(into_reg, mem.into(), ty, MemFlagsData::trusted())}fn gen_store_stack(mem: StackAMode, from_reg: Reg, ty: Type) -> Inst {- Inst::gen_store(mem.into(), from_reg, ty, MemFlags::trusted())+ Inst::gen_store(mem.into(), from_reg, ty, MemFlagsData::trusted())}fn gen_move(to_reg: Writable<Reg>, from_reg: Reg, ty: Type) -> Inst {@@ -292,12 +292,12 @@ impl ABIMachineSpec for Riscv64MachineDeps {fn gen_load_base_offset(into_reg: Writable<Reg>, base: Reg, offset: i32, ty: Type) -> Inst {let mem = AMode::RegOffset(base, offset as i64);- Inst::gen_load(into_reg, mem, ty, MemFlags::trusted())+ Inst::gen_load(into_reg, mem, ty, MemFlagsData::trusted())}fn gen_store_base_offset(base: Reg, offset: i32, from_reg: Reg, ty: Type) -> Inst {let mem = AMode::RegOffset(base, offset as i64);- Inst::gen_store(mem, from_reg, ty, MemFlags::trusted())+ Inst::gen_store(mem, from_reg, ty, MemFlagsData::trusted())}fn gen_sp_reg_adjust(amount: i32) -> SmallInstVec<Inst> {@@ -346,13 +346,13 @@ impl ABIMachineSpec for Riscv64MachineDeps {AMode::SPOffset(8),link_reg(),I64,- MemFlags::trusted(),+ MemFlagsData::trusted(),));insts.push(Inst::gen_store(AMode::SPOffset(0),fp_reg(),I64,- MemFlags::trusted(),+ MemFlagsData::trusted(),));if flags.unwind_info() {@@ -385,13 +385,13 @@ impl ABIMachineSpec for Riscv64MachineDeps {writable_link_reg(),AMode::SPOffset(8),I64,- MemFlags::trusted(),+ MemFlagsData::trusted(),));insts.push(Inst::gen_load(writable_fp_reg(),AMode::SPOffset(0),I64,- MemFlags::trusted(),+ MemFlagsData::trusted(),));insts.extend(Self::gen_sp_reg_adjust(16));}@@ -448,19 +448,19 @@ impl ABIMachineSpec for Riscv64MachineDeps {AMode::SPOffset(8),link_reg(),I64,- MemFlags::trusted(),+ MemFlagsData::trusted(),));insts.push(Inst::gen_load(writable_fp_reg(),AMode::SPOffset(i64::from(incoming_args_diff)),I64,- MemFlags::trusted(),+ MemFlagsData::trusted(),));insts.push(Inst::gen_store(AMode::SPOffset(0),fp_reg(),I64,- MemFlags::trusted(),+ MemFlagsData::trusted(),));// Finally, sync the frame pointer with SP@@ -503,7 +503,7 @@ impl ABIMachineSpec for Riscv64MachineDeps {AMode::SPOffset(i64::from(stack_size - cur_offset - ty.bytes())),Reg::from(reg.to_reg()),ty,- MemFlags::trusted(),+ MemFlagsData::trusted(),));if flags.unwind_info() {@@ -546,7 +546,7 @@ impl ABIMachineSpec for Riscv64MachineDeps {reg.map(Reg::from),AMode::SPOffset(i64::from(stack_size - cur_offset - ty.bytes())),ty,- MemFlags::trusted(),+ MemFlagsData::trusted(),));cur_offset += ty.bytes();}@@ -1117,7 +1117,7 @@ impl Riscv64MachineDeps {AMode::SPOffset(0),zero_reg(),I32,- MemFlags::trusted(),+ MemFlagsData::trusted(),));}diff --git a/cranelift/codegen/src/isa/riscv64/inst.isle b/cranelift/codegen/src/isa/riscv64/inst.isleindex f67cdc8332..f7a17d3c1c 100644--- a/cranelift/codegen/src/isa/riscv64/inst.isle+++ b/cranelift/codegen/src/isa/riscv64/inst.isle@@ -85,13 +85,13 @@(Load(rd WritableReg)(op LoadOP)- (flags MemFlags)+ (flags MemFlagsData)(from AMode));; An Store(Store(to AMode)(op StoreOP)- (flags MemFlags)+ (flags MemFlagsData)(src Reg));; A pseudo-instruction that captures register arguments in vregs.@@ -344,7 +344,7 @@(eew VecElementWidth)(to WritableReg)(from VecAMode)- (flags MemFlags)+ (flags MemFlagsData)(mask VecOpMasking)(vstate VState))@@ -352,7 +352,7 @@(eew VecElementWidth)(to VecAMode)(from Reg)- (flags MemFlags)+ (flags MemFlagsData)(mask VecOpMasking)(vstate VState))@@ -2481,7 +2481,7 @@(extern extractor sinkable_inst sinkable_inst);; Matches a sinkable load.-(decl sinkable_load (Inst Type MemFlags Value Offset32) Value)+(decl sinkable_load (Inst Type MemFlagsData Value Offset32) Value)(extractor (sinkable_load inst ty flags addr offset)(and(load _ (little_or_native_endian flags) addr offset)@@ -2498,7 +2498,7 @@;;;; Recursion: recursive rule can only match once, since it matches on;; `LoadOP.Flh` and emits `LoadOP.Lh`.-(decl rec gen_load (AMode LoadOP MemFlags) Reg)+(decl rec gen_load (AMode LoadOP MemFlagsData) Reg)(rule (gen_load amode op flags)(let ((dst WritableReg (temp_writable_reg (load_op_reg_type op)))(_ Unit (emit (MInst.Load dst op flags amode))))@@ -2511,7 +2511,7 @@;;;; This is only useful for load op's that perform some additional computation;; such as extending the loaded value.-(decl gen_sunk_load (Inst AMode LoadOP MemFlags) Reg)+(decl gen_sunk_load (Inst AMode LoadOP MemFlagsData) Reg)(rule (gen_sunk_load inst amode op flags)(let ((_ Unit (sink_inst inst)))(gen_load amode op flags)))@@ -2522,7 +2522,7 @@;; This helper contains a special-case for zero constants stored to memory to;; directly store the `zero` register to memory. See #7162 for some discussion;; on why this doesn't just fall out.-(decl gen_store (AMode MemFlags Value) InstOutput)+(decl gen_store (AMode MemFlagsData Value) InstOutput)(rule 2 (gen_store amode flags val @ (value_type $F16))(if-let false (has_zfhmin))(rv_store amode (StoreOP.Sh) flags (gen_bitcast val $F16 $I16)))@@ -2536,7 +2536,7 @@;;;; Note that the `src` operand must have the correct type for the `op`;; specified.-(decl rv_store (AMode StoreOP MemFlags Reg) InstOutput)+(decl rv_store (AMode StoreOP MemFlagsData Reg) InstOutput)(rule (rv_store amode op flags src)(side_effect (SideEffectNoResult.Inst (MInst.Store amode op flags src))))diff --git a/cranelift/codegen/src/isa/riscv64/inst/emit.rs b/cranelift/codegen/src/isa/riscv64/inst/emit.rsindex e89328cea1..fa922a6b6e 100644--- a/cranelift/codegen/src/isa/riscv64/inst/emit.rs+++ b/cranelift/codegen/src/isa/riscv64/inst/emit.rs@@ -900,7 +900,7 @@ impl Inst {Inst::Load {rd,op: LoadOP::from_type(ty),- flags: MemFlags::new(),+ flags: MemFlagsData::new(),from: AMode::Label(label_data),}.emit(sink, emit_info, state);@@ -1542,7 +1542,7 @@ impl Inst {amo,} => {// TODO: get flags from original CLIF atomic instruction- let flags = MemFlags::new();+ let flags = MemFlagsData::new();if let Some(trap_code) = flags.trap_code() {sink.add_trap(trap_code);}@@ -2038,7 +2038,7 @@ impl Inst {Inst::Load {rd,op: LoadOP::Ld,- flags: MemFlags::trusted(),+ flags: MemFlagsData::trusted(),from: AMode::RegOffset(rd.to_reg(), 0),}.emit_uncompressed(sink, emit_info, state, start_off);@@ -2067,7 +2067,7 @@ impl Inst {Inst::Load {rd,op: LoadOP::Ld,- flags: MemFlags::trusted(),+ flags: MemFlagsData::trusted(),from: AMode::Label(label_data),}.emit(sink, emit_info, state);@@ -2209,7 +2209,7 @@ impl Inst {Inst::Load {rd,op: LoadOP::from_type(ty),- flags: MemFlags::new(),+ flags: MemFlagsData::new(),from: AMode::RegOffset(p, 0),}.emit(sink, emit_info, state);@@ -2228,7 +2228,7 @@ impl Inst {Inst::Store {to: AMode::RegOffset(p, 0),op: StoreOP::from_type(ty),- flags: MemFlags::new(),+ flags: MemFlagsData::new(),src,}.emit(sink, emit_info, state);@@ -2576,7 +2576,7 @@ impl Inst {Inst::Store {to: AMode::RegOffset(spilltmp_reg2(), 0),op: StoreOP::Sb,- flags: MemFlags::new(),+ flags: MemFlagsData::new(),src: zero_reg(),}.emit(sink, emit_info, state);@@ -2839,7 +2839,7 @@ fn return_call_emit_impl<T>(reg.map(Reg::from),AMode::SPOffset(clobber_offset),ty,- MemFlags::trusted(),+ MemFlagsData::trusted(),).emit(sink, emit_info, state);@@ -2853,7 +2853,7 @@ fn return_call_emit_impl<T>(writable_link_reg(),AMode::SPOffset(sp_to_fp_offset + 8),I64,- MemFlags::trusted(),+ MemFlagsData::trusted(),).emit(sink, emit_info, state);@@ -2861,7 +2861,7 @@ fn return_call_emit_impl<T>(writable_fp_reg(),AMode::SPOffset(sp_to_fp_offset),I64,- MemFlags::trusted(),+ MemFlagsData::trusted(),).emit(sink, emit_info, state);}diff --git a/cranelift/codegen/src/isa/riscv64/inst/emit_tests.rs b/cranelift/codegen/src/isa/riscv64/inst/emit_tests.rsindex 3b0cf59b63..d1195420ce 100644--- a/cranelift/codegen/src/isa/riscv64/inst/emit_tests.rs+++ b/cranelift/codegen/src/isa/riscv64/inst/emit_tests.rs@@ -629,7 +629,7 @@ fn test_riscv64_binemit() {Inst::Load {rd: writable_a0(),op: LoadOP::Lb,- flags: MemFlags::new(),+ flags: MemFlagsData::new(),from: AMode::RegOffset(a1(), 100),},"lb a0,100(a1)",@@ -639,7 +639,7 @@ fn test_riscv64_binemit() {Inst::Load {rd: writable_a0(),op: LoadOP::Lh,- flags: MemFlags::new(),+ flags: MemFlagsData::new(),from: AMode::RegOffset(a1(), 100),},"lh a0,100(a1)",@@ -650,7 +650,7 @@ fn test_riscv64_binemit() {Inst::Load {rd: writable_a0(),op: LoadOP::Lw,- flags: MemFlags::new(),+ flags: MemFlagsData::new(),from: AMode::RegOffset(a1(), 100),},"lw a0,100(a1)",@@ -661,7 +661,7 @@ fn test_riscv64_binemit() {Inst::Load {rd: writable_a0(),op: LoadOP::Ld,- flags: MemFlags::new(),+ flags: MemFlagsData::new(),from: AMode::RegOffset(a1(), 100),},"ld a0,100(a1)",@@ -671,7 +671,7 @@ fn test_riscv64_binemit() {Inst::Load {rd: Writable::from_reg(fa0()),op: LoadOP::Flw,- flags: MemFlags::new(),+ flags: MemFlagsData::new(),from: AMode::RegOffset(a1(), 100),},"flw fa0,100(a1)",@@ -682,7 +682,7 @@ fn test_riscv64_binemit() {Inst::Load {rd: Writable::from_reg(fa0()),op: LoadOP::Fld,- flags: MemFlags::new(),+ flags: MemFlagsData::new(),from: AMode::RegOffset(a1(), 100),},"fld fa0,100(a1)",@@ -692,7 +692,7 @@ fn test_riscv64_binemit() {Inst::Store {to: AMode::SPOffset(100),op: StoreOP::Sb,- flags: MemFlags::new(),+ flags: MemFlagsData::new(),src: a0(),},"sb a0,100(sp)",@@ -702,7 +702,7 @@ fn test_riscv64_binemit() {Inst::Store {to: AMode::SPOffset(100),op: StoreOP::Sh,- flags: MemFlags::new(),+ flags: MemFlagsData::new(),src: a0(),},"sh a0,100(sp)",@@ -712,7 +712,7 @@ fn test_riscv64_binemit() {Inst::Store {to: AMode::SPOffset(100),op: StoreOP::Sw,- flags: MemFlags::new(),+ flags: MemFlagsData::new(),src: a0(),},"sw a0,100(sp)",@@ -722,7 +722,7 @@ fn test_riscv64_binemit() {Inst::Store {to: AMode::SPOffset(100),op: StoreOP::Sd,- flags: MemFlags::new(),+ flags: MemFlagsData::new(),src: a0(),},"sd a0,100(sp)",@@ -732,7 +732,7 @@ fn test_riscv64_binemit() {Inst::Store {to: AMode::SPOffset(100),op: StoreOP::Fsw,- flags: MemFlags::new(),+ flags: MemFlagsData::new(),src: fa0(),},"fsw fa0,100(sp)",@@ -742,7 +742,7 @@ fn test_riscv64_binemit() {Inst::Store {to: AMode::SPOffset(100),op: StoreOP::Fsd,- flags: MemFlags::new(),+ flags: MemFlagsData::new(),src: fa0(),},"fsd fa0,100(sp)",diff --git a/cranelift/codegen/src/isa/riscv64/inst/mod.rs b/cranelift/codegen/src/isa/riscv64/inst/mod.rsindex bea9a33bb4..8a7b413adc 100644--- a/cranelift/codegen/src/isa/riscv64/inst/mod.rs+++ b/cranelift/codegen/src/isa/riscv64/inst/mod.rs@@ -5,7 +5,7 @@ use crate::binemit::{Addend, CodeOffset, Reloc};pub use crate::ir::condcodes::IntCC;use crate::ir::types::{self, F16, F32, F64, F128, I8, I8X16, I16, I32, I64, I128};-pub use crate::ir::{ExternalName, MemFlags, Type};+pub use crate::ir::{ExternalName, MemFlagsData, Type};use crate::isa::{CallConv, FunctionAlignment};use crate::machinst::*;use crate::{CodegenError, CodegenResult, settings};@@ -209,7 +209,7 @@ impl Inst {}/// Generic constructor for a load (zero-extending where appropriate).- pub fn gen_load(into_reg: Writable<Reg>, mem: AMode, ty: Type, flags: MemFlags) -> Inst {+ pub fn gen_load(into_reg: Writable<Reg>, mem: AMode, ty: Type, flags: MemFlagsData) -> Inst {if ty.is_vector() {Inst::VecLoad {eew: VecElementWidth::from_type(ty),@@ -230,7 +230,7 @@ impl Inst {}/// Generic constructor for a store.- pub fn gen_store(mem: AMode, from_reg: Reg, ty: Type, flags: MemFlags) -> Inst {+ pub fn gen_store(mem: AMode, from_reg: Reg, ty: Type, flags: MemFlagsData) -> Inst {if ty.is_vector() {Inst::VecStore {eew: VecElementWidth::from_type(ty),diff --git a/cranelift/codegen/src/isa/riscv64/inst_vector.isle b/cranelift/codegen/src/isa/riscv64/inst_vector.isleindex 9a4034a13d..550236b14c 100644--- a/cranelift/codegen/src/isa/riscv64/inst_vector.isle+++ b/cranelift/codegen/src/isa/riscv64/inst_vector.isle@@ -421,14 +421,14 @@vd));; Helper for emitting `MInst.VecLoad` instructions.-(decl vec_load (VecElementWidth VecAMode MemFlags VecOpMasking VState) Reg)+(decl vec_load (VecElementWidth VecAMode MemFlagsData VecOpMasking VState) Reg)(rule (vec_load eew from flags mask vstate)(let ((vd WritableVReg (temp_writable_vreg))(_ Unit (emit (MInst.VecLoad eew vd from flags mask vstate))))vd));; Helper for emitting `MInst.VecStore` instructions.-(decl vec_store (VecElementWidth VecAMode VReg MemFlags VecOpMasking VState) InstOutput)+(decl vec_store (VecElementWidth VecAMode VReg MemFlagsData VecOpMasking VState) InstOutput)(rule (vec_store eew to from flags mask vstate)(side_effect(SideEffectNoResult.Inst (MInst.VecStore eew to from flags mask vstate))))diff --git a/cranelift/codegen/src/isa/riscv64/lower.isle b/cranelift/codegen/src/isa/riscv64/lower.isleindex 22ba0dfd0e..9966609ec6 100644--- a/cranelift/codegen/src/isa/riscv64/lower.isle+++ b/cranelift/codegen/src/isa/riscv64/lower.isle@@ -2168,7 +2168,7 @@;; do a SEW/2 extension. This only reads half width elements from the source vector register;; extends it, and writes the back the full register.-(decl gen_load64_extend (Type ExtendOp MemFlags AMode) VReg)+(decl gen_load64_extend (Type ExtendOp MemFlagsData AMode) VReg)(rule (gen_load64_extend ty (ExtendOp.Signed) flags amode)(let ((eew VecElementWidth (element_width_from_type $I64))diff --git a/cranelift/codegen/src/isa/riscv64/lower/isle.rs b/cranelift/codegen/src/isa/riscv64/lower/isle.rsindex 35c49ce2bb..a34f555bcf 100644--- a/cranelift/codegen/src/isa/riscv64/lower/isle.rs+++ b/cranelift/codegen/src/isa/riscv64/lower/isle.rs@@ -15,8 +15,8 @@ use crate::machinst::{CallInfo, MachInst, isle::*};use crate::machinst::{VCodeConstant, VCodeConstantData};use crate::{ir::{- AtomicRmwOp, BlockCall, ExternalName, Inst, InstructionData, MemFlags, Opcode, TrapCode,- Value, ValueList, immediates::*, types::*,+ AtomicRmwOp, BlockCall, ExternalName, Inst, InstructionData, MemFlagsData, Opcode,+ TrapCode, Value, ValueList, immediates::*, types::*,},isa::riscv64::inst::*,machinst::{ArgPair, CallArgList, CallRetList, InstOutput},@@ -286,7 +286,7 @@ impl generated_code::Context for RV64IsleContext<'_, '_, MInst, Riscv64Backend>self.emit(&MInst::Load {rd: tmp,op: LoadOP::Ld,- flags: MemFlags::trusted(),+ flags: MemFlagsData::trusted(),from: AMode::FPOffset(8),});tmp.to_reg()diff --git a/cranelift/codegen/src/isa/s390x/abi.rs b/cranelift/codegen/src/isa/s390x/abi.rsindex 7b128e3ff1..573e9c0833 100644--- a/cranelift/codegen/src/isa/s390x/abi.rs+++ b/cranelift/codegen/src/isa/s390x/abi.rs@@ -134,7 +134,7 @@use crate::CodegenResult;use crate::ir;-use crate::ir::MemFlags;+use crate::ir::MemFlagsData;use crate::ir::Signature;use crate::ir::Type;use crate::ir::condcodes::IntCC;@@ -526,7 +526,7 @@ impl ABIMachineSpec for S390xMachineDeps {base: from_reg,index: zero_reg(),disp: imm,- flags: MemFlags::trusted(),+ flags: MemFlagsData::trusted(),},});} else if let Some(imm) = SImm20::maybe_from_i64(imm as i64) {@@ -536,7 +536,7 @@ impl ABIMachineSpec for S390xMachineDeps {base: from_reg,index: zero_reg(),disp: imm,- flags: MemFlags::trusted(),+ flags: MemFlagsData::trusted(),},});} else {@@ -575,12 +575,12 @@ impl ABIMachineSpec for S390xMachineDeps {}fn gen_load_base_offset(into_reg: Writable<Reg>, base: Reg, offset: i32, ty: Type) -> Inst {- let mem = MemArg::reg_plus_off(base, offset.into(), MemFlags::trusted());+ let mem = MemArg::reg_plus_off(base, offset.into(), MemFlagsData::trusted());Inst::gen_load(into_reg, mem, ty)}fn gen_store_base_offset(base: Reg, offset: i32, from_reg: Reg, ty: Type) -> Inst {- let mem = MemArg::reg_plus_off(base, offset.into(), MemFlags::trusted());+ let mem = MemArg::reg_plus_off(base, offset.into(), MemFlagsData::trusted());Inst::gen_store(mem, from_reg, ty)}@@ -662,7 +662,7 @@ impl ABIMachineSpec for S390xMachineDeps {insts.push(Inst::StoreImm8 {imm: 0,- mem: MemArg::reg(stack_reg(), MemFlags::trusted()),+ mem: MemArg::reg(stack_reg(), MemFlagsData::trusted()),});}} else {@@ -729,7 +729,7 @@ impl ABIMachineSpec for S390xMachineDeps {insts.push(Inst::StoreMultiple64 {rt: gpr(first_clobbered_gpr),rt2: gpr(last_clobbered_gpr),- mem: MemArg::reg_plus_off(stack_reg(), offset, MemFlags::trusted()),+ mem: MemArg::reg_plus_off(stack_reg(), offset, MemFlagsData::trusted()),});if flags.unwind_info() {// Normally, we instruct the unwinder to restore the stack pointer@@ -789,7 +789,7 @@ impl ABIMachineSpec for S390xMachineDeps {if flags.preserve_frame_pointers() {insts.push(Inst::Store64 {rd: gpr(1),- mem: MemArg::reg_plus_off(stack_reg(), 0, MemFlags::trusted()),+ mem: MemArg::reg_plus_off(stack_reg(), 0, MemFlagsData::trusted()),});}@@ -812,7 +812,7 @@ impl ABIMachineSpec for S390xMachineDeps {+ (i as i64) * 16+ frame_layout.outgoing_args_size as i64+ frame_layout.fixed_frame_storage_size as i64,- MemFlags::trusted(),+ MemFlagsData::trusted(),),});}@@ -823,7 +823,7 @@ impl ABIMachineSpec for S390xMachineDeps {stack_reg(),frame_layout.outgoing_args_size as i64+ frame_layout.fixed_frame_storage_size as i64,- MemFlags::trusted(),+ MemFlagsData::trusted(),),});}@@ -838,7 +838,7 @@ impl ABIMachineSpec for S390xMachineDeps {(i * 8) as i64+ frame_layout.outgoing_args_size as i64+ frame_layout.fixed_frame_storage_size as i64,- MemFlags::trusted(),+ MemFlagsData::trusted(),),lane_imm: 0,});@@ -1262,7 +1262,7 @@ fn gen_restore_gprs(insts.push(Inst::LoadMultiple64 {rt: writable_gpr(first),rt2: writable_gpr(last),- mem: MemArg::reg_plus_off(reg, offset, MemFlags::trusted()),+ mem: MemArg::reg_plus_off(reg, offset, MemFlagsData::trusted()),});}@@ -1286,7 +1286,7 @@ fn gen_restore_fprs(frame_layout: &FrameLayout) -> SmallVec<[Inst; 16]> {(i * 8) as i64+ frame_layout.outgoing_args_size as i64+ frame_layout.fixed_frame_storage_size as i64,- MemFlags::trusted(),+ MemFlagsData::trusted(),),lane_imm: 0,});@@ -1307,7 +1307,7 @@ fn gen_restore_patchable(frame_layout: &FrameLayout) -> SmallVec<[Inst; 16]> {+ (i as i64) * 16+ frame_layout.outgoing_args_size as i64+ frame_layout.fixed_frame_storage_size as i64,- MemFlags::trusted(),+ MemFlagsData::trusted(),),});}@@ -1317,7 +1317,7 @@ fn gen_restore_patchable(frame_layout: &FrameLayout) -> SmallVec<[Inst; 16]> {mem: MemArg::reg_plus_off(stack_reg(),frame_layout.outgoing_args_size as i64 + frame_layout.fixed_frame_storage_size as i64,- MemFlags::trusted(),+ MemFlagsData::trusted(),),});diff --git a/cranelift/codegen/src/isa/s390x/inst.isle b/cranelift/codegen/src/isa/s390x/inst.isleindex c78297bce8..d3b3ba6b38 100644--- a/cranelift/codegen/src/isa/s390x/inst.isle+++ b/cranelift/codegen/src/isa/s390x/inst.isle@@ -1627,7 +1627,7 @@(rule (lane_order_equal (LaneOrder.BigEndian) (LaneOrder.BigEndian)) true);; Return lane order matching memory byte order.-(decl pure lane_order_from_memflags (MemFlags) LaneOrder)+(decl pure lane_order_from_memflags (MemFlagsData) LaneOrder)(rule 0 (lane_order_from_memflags (littleendian)) (LaneOrder.LittleEndian))(rule 1 (lane_order_from_memflags (bigendian)) (LaneOrder.BigEndian))@@ -1875,31 +1875,31 @@(decl pure partial memarg_imm_from_offset_plus_bias (Offset32 u8) SImm20)(extern constructor memarg_imm_from_offset_plus_bias memarg_imm_from_offset_plus_bias)-;; Accessors for `MemFlags`.+;; Accessors for `MemFlagsData`.-(decl littleendian () MemFlags)+(decl littleendian () MemFlagsData)(extern extractor littleendian littleendian)-(decl bigendian () MemFlags)+(decl bigendian () MemFlagsData)(extern extractor bigendian bigendian)-(decl memflags_trusted () MemFlags)+(decl memflags_trusted () MemFlagsData)(extern constructor memflags_trusted memflags_trusted);; Accessors for `MemArg`.(type MemArg extern (enum))-(decl memarg_reg_plus_reg_plus_off (Reg Reg SImm20 MemFlags) MemArg)+(decl memarg_reg_plus_reg_plus_off (Reg Reg SImm20 MemFlagsData) MemArg)(extern constructor memarg_reg_plus_reg_plus_off memarg_reg_plus_reg_plus_off)-(decl memarg_reg_plus_reg (Reg Reg u8 MemFlags) MemArg)+(decl memarg_reg_plus_reg (Reg Reg u8 MemFlagsData) MemArg)(extern constructor memarg_reg_plus_reg memarg_reg_plus_reg)-(decl memarg_reg_plus_off (Reg i64 u8 MemFlags) MemArg)+(decl memarg_reg_plus_off (Reg i64 u8 MemFlagsData) MemArg)(extern constructor memarg_reg_plus_off memarg_reg_plus_off)-(decl memarg_symbol (ExternalName i32 MemFlags) MemArg)+(decl memarg_symbol (ExternalName i32 MemFlagsData) MemArg)(extern constructor memarg_symbol memarg_symbol)(decl memarg_got () MemArg)@@ -1928,7 +1928,7 @@;; Lower an address into a `MemArg`.-(decl lower_address (MemFlags Value Offset32) MemArg)+(decl lower_address (MemFlagsData Value Offset32) MemArg)(rule (lower_address flags addr @ (value_type (ty_addr64 _)) (i64_from_offset offset))(memarg_reg_plus_off addr offset 0 flags))@@ -1972,7 +1972,7 @@;; Lower an address plus a small bias into a `MemArg`.-(decl lower_address_bias (MemFlags Value Offset32 u8) MemArg)+(decl lower_address_bias (MemFlagsData Value Offset32 u8) MemArg)(rule (lower_address_bias flags addr @ (value_type $I64) (i64_from_offset offset) bias)(memarg_reg_plus_off addr offset bias flags))@@ -3487,7 +3487,7 @@;; be written if the memory location still holds the old value in %r0.;; The result should be passed to "casloop_result" or (in the case of;; subword loops) to "casloop_rotate_result".-(decl casloop_emit (VecMInstBuilder Type MemFlags Reg Reg) PReg)+(decl casloop_emit (VecMInstBuilder Type MemFlagsData Reg Reg) PReg)(rule (casloop_emit ib ty flags aligned_addr val)(let (;; Construct a memory argument for the aligned word.@@ -3510,14 +3510,14 @@;; In the big-endian case, the value is already correct, but may need to be;; copied out of the hard register. In the little-endian case, we need to;; byte-swap since the compare-and-swap instruction is always big-endian.-(decl casloop_result (Type MemFlags PReg) Reg)+(decl casloop_result (Type MemFlagsData PReg) Reg)(rule 1 (casloop_result (ty_32_or_64 ty) (bigendian) result)(mov_preg result))(rule (casloop_result (ty_32_or_64 ty) (littleendian) result)(bswap_reg ty (preg_to_reg result)));; Emit a fullword compare-and-swap loop, returning the previous memory value.-(decl casloop (VecMInstBuilder Type MemFlags Reg Reg) Reg)+(decl casloop (VecMInstBuilder Type MemFlagsData Reg Reg) Reg)(rule (casloop ib ty flags aligned_addr val)(casloop_result ty flags (casloop_emit ib ty flags aligned_addr val)))@@ -3547,7 +3547,7 @@;; (This is somewhat arbitrary but chosen to allow the most efficient;; sequences to compute the various atomic operations.);; Note that $I8 accesses always use the big-endian case.-(decl casloop_rotate_in (VecMInstBuilder Type MemFlags Reg Reg) Reg)+(decl casloop_rotate_in (VecMInstBuilder Type MemFlagsData Reg Reg) Reg)(rule (casloop_rotate_in ib $I8 _ bitshift val)(push_rot_imm_reg ib $I32 (casloop_tmp_reg) val 0 bitshift))(rule 1 (casloop_rotate_in ib $I16 (bigendian) bitshift val)@@ -3560,7 +3560,7 @@;; optimization, we note that in the $I16 case the shift count can only;; take the values 0 or 16, both of which negate to themselves (mod 32),;; so the explicit negation operation can be omitted here.-(decl casloop_rotate_out (VecMInstBuilder Type MemFlags Reg Reg) Reg)+(decl casloop_rotate_out (VecMInstBuilder Type MemFlagsData Reg Reg) Reg)(rule (casloop_rotate_out ib $I8 _ bitshift val)(push_rot_imm_reg ib $I32 (casloop_tmp_reg) val 0 (neg_reg $I32 bitshift)))(rule 1 (casloop_rotate_out ib $I16 (bigendian) bitshift val)@@ -3575,7 +3575,7 @@;; endian case, we also need to byte-swap the result. Since we only have;; a 32-bit byte-swap instruction, we load the value to the high bytes in;; this case before performing the 32-bit byte-swap.-(decl casloop_rotate_result (Type MemFlags Reg Reg) Reg)+(decl casloop_rotate_result (Type MemFlagsData Reg Reg) Reg)(rule (casloop_rotate_result $I8 _ bitshift result)(rot_imm_reg $I32 result 8 bitshift))(rule 1 (casloop_rotate_result $I16 (bigendian) bitshift result)@@ -3584,7 +3584,7 @@(bswap_reg $I32 (rot_reg $I32 result bitshift)));; Emit a subword compare-and-swap loop, returning the previous memory value.-(decl casloop_subword (VecMInstBuilder Type MemFlags Reg Reg Reg) Reg)+(decl casloop_subword (VecMInstBuilder Type MemFlagsData Reg Reg Reg) Reg)(rule (casloop_subword ib ty flags aligned_addr bitshift val)(casloop_rotate_result ty flags bitshift(casloop_emit ib ty flags aligned_addr val)))diff --git a/cranelift/codegen/src/isa/s390x/inst/args.rs b/cranelift/codegen/src/isa/s390x/inst/args.rsindex 33e790673b..c4a97a958b 100644--- a/cranelift/codegen/src/isa/s390x/inst/args.rs+++ b/cranelift/codegen/src/isa/s390x/inst/args.rs@@ -1,6 +1,6 @@//! S390x ISA definitions: instruction arguments.-use crate::ir::MemFlags;+use crate::ir::MemFlagsData;use crate::ir::condcodes::{FloatCC, IntCC};use crate::isa::s390x::inst::*;@@ -18,7 +18,7 @@ pub enum MemArg {base: Reg,index: Reg,disp: UImm12,- flags: MemFlags,+ flags: MemFlagsData,},/// Base register, index register, and 20-bit signed displacement.@@ -26,7 +26,7 @@ pub enum MemArg {base: Reg,index: Reg,disp: SImm20,- flags: MemFlags,+ flags: MemFlagsData,},/// PC-relative Reference to a label.@@ -39,7 +39,7 @@ pub enum MemArg {Symbol {name: Box<ExternalName>,offset: i32,- flags: MemFlags,+ flags: MemFlagsData,},//@@ -47,7 +47,11 @@ pub enum MemArg {///// Arbitrary offset from a register. Converted to generation of large/// offsets with multiple instructions as necessary during code emission.- RegOffset { reg: Reg, off: i64, flags: MemFlags },+ RegOffset {+ reg: Reg,+ off: i64,+ flags: MemFlagsData,+ },/// Offset from the stack pointer at function entry.InitialSPOffset { off: i64 },@@ -76,7 +80,7 @@ pub enum MemArg {impl MemArg {/// Memory reference using an address in a register.- pub fn reg(reg: Reg, flags: MemFlags) -> MemArg {+ pub fn reg(reg: Reg, flags: MemFlagsData) -> MemArg {MemArg::BXD12 {base: reg,index: zero_reg(),@@ -86,7 +90,7 @@ impl MemArg {}/// Memory reference using the sum of two registers as an address.- pub fn reg_plus_reg(reg1: Reg, reg2: Reg, flags: MemFlags) -> MemArg {+ pub fn reg_plus_reg(reg1: Reg, reg2: Reg, flags: MemFlagsData) -> MemArg {MemArg::BXD12 {base: reg1,index: reg2,@@ -96,23 +100,23 @@ impl MemArg {}/// Memory reference using the sum of a register an offset as address.- pub fn reg_plus_off(reg: Reg, off: i64, flags: MemFlags) -> MemArg {+ pub fn reg_plus_off(reg: Reg, off: i64, flags: MemFlagsData) -> MemArg {MemArg::RegOffset { reg, off, flags }}- pub(crate) fn get_flags(&self) -> MemFlags {+ pub(crate) fn get_flags(&self) -> MemFlagsData {match self {MemArg::BXD12 { flags, .. } => *flags,MemArg::BXD20 { flags, .. } => *flags,MemArg::RegOffset { flags, .. } => *flags,- MemArg::Label { .. } => MemFlags::trusted(),- MemArg::Constant { .. } => MemFlags::trusted(),+ MemArg::Label { .. } => MemFlagsData::trusted(),+ MemArg::Constant { .. } => MemFlagsData::trusted(),MemArg::Symbol { flags, .. } => *flags,- MemArg::InitialSPOffset { .. } => MemFlags::trusted(),- MemArg::IncomingArgOffset { .. } => MemFlags::trusted(),- MemArg::OutgoingArgOffset { .. } => MemFlags::trusted(),- MemArg::SlotOffset { .. } => MemFlags::trusted(),- MemArg::SpillOffset { .. } => MemFlags::trusted(),+ MemArg::InitialSPOffset { .. } => MemFlagsData::trusted(),+ MemArg::IncomingArgOffset { .. } => MemFlagsData::trusted(),+ MemArg::OutgoingArgOffset { .. } => MemFlagsData::trusted(),+ MemArg::SlotOffset { .. } => MemFlagsData::trusted(),+ MemArg::SpillOffset { .. } => MemFlagsData::trusted(),}}}diff --git a/cranelift/codegen/src/isa/s390x/inst/emit.rs b/cranelift/codegen/src/isa/s390x/inst/emit.rsindex 5e2e42c186..10b4a9afff 100644--- a/cranelift/codegen/src/isa/s390x/inst/emit.rs+++ b/cranelift/codegen/src/isa/s390x/inst/emit.rs@@ -1,6 +1,6 @@//! S390x ISA: binary code emission.-use crate::ir::{self, LibCall, MemFlags, TrapCode};+use crate::ir::{self, LibCall, MemFlagsData, TrapCode};use crate::isa::CallConv;use crate::isa::s390x::abi::REG_SAVE_AREA_SIZE;use crate::isa::s390x::inst::*;@@ -2472,7 +2472,7 @@ impl Inst {sink.put8(0);let inst = Inst::Load64 {rd,- mem: MemArg::reg(reg, MemFlags::trusted()),+ mem: MemArg::reg(reg, MemFlagsData::trusted()),};inst.emit(sink, emit_info, state);}@@ -3659,7 +3659,7 @@ impl Inst {alu_op: ALUOp::Add64Ext32,rd: rtmp,ri: rtmp.to_reg(),- mem: MemArg::reg_plus_reg(rtmp.to_reg(), ridx, MemFlags::trusted()),+ mem: MemArg::reg_plus_reg(rtmp.to_reg(), ridx, MemFlagsData::trusted()),};inst.emit(sink, emit_info, state);@@ -3702,7 +3702,7 @@ impl Inst {// mvi 0(%r15), 0let inst = Inst::StoreImm8 {imm: 0,- mem: MemArg::reg(stack_reg(), MemFlags::trusted()),+ mem: MemArg::reg(stack_reg(), MemFlagsData::trusted()),};inst.emit(sink, emit_info, state);diff --git a/cranelift/codegen/src/isa/s390x/inst/emit_tests.rs b/cranelift/codegen/src/isa/s390x/inst/emit_tests.rsindex 5db0629932..ddc95fda64 100644--- a/cranelift/codegen/src/isa/s390x/inst/emit_tests.rs+++ b/cranelift/codegen/src/isa/s390x/inst/emit_tests.rs@@ -1,4 +1,4 @@-use crate::ir::{MemFlags, TrapCode};+use crate::ir::{MemFlagsData, TrapCode};use crate::isa::s390x::inst::*;use crate::isa::s390x::settings as s390x_settings;@@ -536,7 +536,7 @@ fn test_s390x_binemit() {base: gpr(2),index: zero_reg(),disp: UImm12::zero(),- flags: MemFlags::trusted(),+ flags: MemFlagsData::trusted(),},},"5A102000",@@ -551,7 +551,7 @@ fn test_s390x_binemit() {base: gpr(2),index: zero_reg(),disp: UImm12::zero(),- flags: MemFlags::trusted(),+ flags: MemFlagsData::trusted(),},},"4A102000",@@ -566,7 +566,7 @@ fn test_s390x_binemit() {base: gpr(2),index: zero_reg(),disp: simm20_zero(),- flags: MemFlags::trusted(),+ flags: MemFlagsData::trusted(),},},"E3102000005A",@@ -581,7 +581,7 @@ fn test_s390x_binemit() {base: gpr(2),index: zero_reg(),disp: simm20_zero(),- flags: MemFlags::trusted(),+ flags: MemFlagsData::trusted(),},},"E3102000007A",@@ -596,7 +596,7 @@ fn test_s390x_binemit() {base: gpr(2),index: zero_reg(),disp: UImm12::zero(),- flags: MemFlags::trusted(),+ flags: MemFlagsData::trusted(),},},"E31020000008",@@ -611,7 +611,7 @@ fn test_s390x_binemit() {base: gpr(2),index: zero_reg(),disp: UImm12::zero(),- flags: MemFlags::trusted(),+ flags: MemFlagsData::trusted(),},},"E31020000038",@@ -626,7 +626,7 @@ fn test_s390x_binemit() {base: gpr(2),index: zero_reg(),disp: UImm12::zero(),- flags: MemFlags::trusted(),+ flags: MemFlagsData::trusted(),},},"E31020000018",@@ -641,7 +641,7 @@ fn test_s390x_binemit() {base: gpr(2),index: zero_reg(),disp: UImm12::zero(),- flags: MemFlags::trusted(),+ flags: MemFlagsData::trusted(),},},"5E102000",@@ -656,7 +656,7 @@ fn test_s390x_binemit() {base: gpr(2),index: zero_reg(),disp: simm20_zero(),- flags: MemFlags::trusted(),+ flags: MemFlagsData::trusted(),},},"E3102000005E",@@ -671,7 +671,7 @@ fn test_s390x_binemit() {base: gpr(2),index: zero_reg(),disp: UImm12::zero(),- flags: MemFlags::trusted(),+ flags: MemFlagsData::trusted(),},},"E3102000000A",@@ -686,7 +686,7 @@ fn test_s390x_binemit() {base: gpr(2),index: zero_reg(),disp: UImm12::zero(),- flags: MemFlags::trusted(),+ flags: MemFlagsData::trusted(),},},"E3102000001A",@@ -701,7 +701,7 @@ fn test_s390x_binemit() {base: gpr(2),index: zero_reg(),disp: UImm12::zero(),- flags: MemFlags::trusted(),+ flags: MemFlagsData::trusted(),},},"5B102000",@@ -716,7 +716,7 @@ fn test_s390x_binemit() {base: gpr(2),index: zero_reg(),disp: UImm12::zero(),- flags: MemFlags::trusted(),+ flags: MemFlagsData::trusted(),},},"4B102000",@@ -731,7 +731,7 @@ fn test_s390x_binemit() {base: gpr(2),index: zero_reg(),disp: simm20_zero(),- flags: MemFlags::trusted(),+ flags: MemFlagsData::trusted(),},},"E3102000005B",@@ -746,7 +746,7 @@ fn test_s390x_binemit() {base: gpr(2),index: zero_reg(),disp: simm20_zero(),- flags: MemFlags::trusted(),+ flags: MemFlagsData::trusted(),},},"E3102000007B",@@ -761,7 +761,7 @@ fn test_s390x_binemit() {base: gpr(2),index: zero_reg(),disp: UImm12::zero(),- flags: MemFlags::trusted(),+ flags: MemFlagsData::trusted(),},},"E31020000009",@@ -776,7 +776,7 @@ fn test_s390x_binemit() {base: gpr(2),index: zero_reg(),disp: UImm12::zero(),- flags: MemFlags::trusted(),+ flags: MemFlagsData::trusted(),},},"E31020000039",@@ -791,7 +791,7 @@ fn test_s390x_binemit() {base: gpr(2),index: zero_reg(),disp: UImm12::zero(),- flags: MemFlags::trusted(),+ flags: MemFlagsData::trusted(),},},"E31020000019",@@ -806,7 +806,7 @@ fn test_s390x_binemit() {base: gpr(2),index: zero_reg(),disp: UImm12::zero(),- flags: MemFlags::trusted(),+ flags: MemFlagsData::trusted(),},},"5F102000",@@ -821,7 +821,7 @@ fn test_s390x_binemit() {base: gpr(2),index: zero_reg(),disp: simm20_zero(),- flags: MemFlags::trusted(),+ flags: MemFlagsData::trusted(),},},"E3102000005F",@@ -836,7 +836,7 @@ fn test_s390x_binemit() {base: gpr(2),index: zero_reg(),disp: UImm12::zero(),- flags: MemFlags::trusted(),+ flags: MemFlagsData::trusted(),},},"E3102000000B",@@ -851,7 +851,7 @@ fn test_s390x_binemit() {base: gpr(2),index: zero_reg(),disp: UImm12::zero(),- flags: MemFlags::trusted(),+ flags: MemFlagsData::trusted(),},},"E3102000001B",@@ -866,7 +866,7 @@ fn test_s390x_binemit() {base: gpr(2),index: zero_reg(),disp: UImm12::zero(),- flags: MemFlags::trusted(),+ flags: MemFlagsData::trusted(),},},"71102000",@@ -881,7 +881,7 @@ fn test_s390x_binemit() {base: gpr(2),index: zero_reg(),disp: UImm12::zero(),- flags: MemFlags::trusted(),+ flags: MemFlagsData::trusted(),},},"4C102000",@@ -896,7 +896,7 @@ fn test_s390x_binemit() {base: gpr(2),index: zero_reg(),disp: simm20_zero(),- flags: MemFlags::trusted(),+ flags: MemFlagsData::trusted(),},},"E31020000051",@@ -911,7 +911,7 @@ fn test_s390x_binemit() {base: gpr(2),index: zero_reg(),disp: simm20_zero(),- flags: MemFlags::trusted(),+ flags: MemFlagsData::trusted(),},},"E3102000007C",@@ -926,7 +926,7 @@ fn test_s390x_binemit() {base: gpr(2),index: zero_reg(),disp: UImm12::zero(),- flags: MemFlags::trusted(),+ flags: MemFlagsData::trusted(),},},"E3102000000C",@@ -941,7 +941,7 @@ fn test_s390x_binemit() {base: gpr(2),index: zero_reg(),disp: UImm12::zero(),- flags: MemFlags::trusted(),+ flags: MemFlagsData::trusted(),},},"E3102000003C",@@ -956,7 +956,7 @@ fn test_s390x_binemit() {base: gpr(2),index: zero_reg(),disp: UImm12::zero(),- flags: MemFlags::trusted(),+ flags: MemFlagsData::trusted(),},},"E3102000001C",@@ -971,7 +971,7 @@ fn test_s390x_binemit() {base: gpr(2),index: zero_reg(),disp: UImm12::zero(),- flags: MemFlags::trusted(),+ flags: MemFlagsData::trusted(),},},"54102000",@@ -986,7 +986,7 @@ fn test_s390x_binemit() {base: gpr(2),index: zero_reg(),disp: simm20_zero(),- flags: MemFlags::trusted(),+ flags: MemFlagsData::trusted(),},},"E31020000054",@@ -1001,7 +1001,7 @@ fn test_s390x_binemit() {base: gpr(2),index: zero_reg(),disp: UImm12::zero(),- flags: MemFlags::trusted(),+ flags: MemFlagsData::trusted(),},},"E31020000080",@@ -1016,7 +1016,7 @@ fn test_s390x_binemit() {base: gpr(2),index: zero_reg(),disp: UImm12::zero(),- flags: MemFlags::trusted(),+ flags: MemFlagsData::trusted(),},},"56102000",@@ -1031,7 +1031,7 @@ fn test_s390x_binemit() {base: gpr(2),index: zero_reg(),disp: simm20_zero(),- flags: MemFlags::trusted(),+ flags: MemFlagsData::trusted(),},},"E31020000056",@@ -1046,7 +1046,7 @@ fn test_s390x_binemit() {base: gpr(2),index: zero_reg(),disp: UImm12::zero(),- flags: MemFlags::trusted(),+ flags: MemFlagsData::trusted(),},},"E31020000081",@@ -1061,7 +1061,7 @@ fn test_s390x_binemit() {base: gpr(2),index: zero_reg(),disp: UImm12::zero(),- flags: MemFlags::trusted(),+ flags: MemFlagsData::trusted(),},},"57102000",@@ -1076,7 +1076,7 @@ fn test_s390x_binemit() {base: gpr(2),index: zero_reg(),disp: simm20_zero(),- flags: MemFlags::trusted(),+ flags: MemFlagsData::trusted(),},},"E31020000057",@@ -1091,7 +1091,7 @@ fn test_s390x_binemit() {base: gpr(2),index: zero_reg(),disp: UImm12::zero(),- flags: MemFlags::trusted(),+ flags: MemFlagsData::trusted(),},},"E31020000082",@@ -1725,7 +1725,7 @@ fn test_s390x_binemit() {base: gpr(2),index: zero_reg(),disp: UImm12::zero(),- flags: MemFlags::trusted(),+ flags: MemFlagsData::trusted(),},},"59102000",@@ -1739,7 +1739,7 @@ fn test_s390x_binemit() {base: gpr(2),index: zero_reg(),disp: simm20_zero(),- flags: MemFlags::trusted(),+ flags: MemFlagsData::trusted(),},},"E31020000059",@@ -1764,7 +1764,7 @@ fn test_s390x_binemit() {base: gpr(2),index: zero_reg(),disp: UImm12::zero(),- flags: MemFlags::trusted(),+ flags: MemFlagsData::trusted(),},},"49102000",@@ -1778,7 +1778,7 @@ fn test_s390x_binemit() {base: gpr(2),index: zero_reg(),disp: simm20_zero(),- flags: MemFlags::trusted(),+ flags: MemFlagsData::trusted(),},},"E31020000079",@@ -1803,7 +1803,7 @@ fn test_s390x_binemit() {base: gpr(2),index: zero_reg(),disp: UImm12::zero(),- flags: MemFlags::trusted(),+ flags: MemFlagsData::trusted(),},},"E31020000020",@@ -1828,7 +1828,7 @@ fn test_s390x_binemit() {base: gpr(2),index: zero_reg(),disp: UImm12::zero(),- flags: MemFlags::trusted(),+ flags: MemFlagsData::trusted(),},},"E31020000034",@@ -1853,7 +1853,7 @@ fn test_s390x_binemit() {base: gpr(2),index: zero_reg(),disp: UImm12::zero(),- flags: MemFlags::trusted(),+ flags: MemFlagsData::trusted(),},},"E31020000030",@@ -1878,7 +1878,7 @@ fn test_s390x_binemit() {base: gpr(2),index: zero_reg(),disp: UImm12::zero(),- flags: MemFlags::trusted(),+ flags: MemFlagsData::trusted(),},},"55102000",@@ -1892,7 +1892,7 @@ fn test_s390x_binemit() {base: gpr(2),index: zero_reg(),disp: simm20_zero(),- flags: MemFlags::trusted(),+ flags: MemFlagsData::trusted(),},},"E31020000055",@@ -1928,7 +1928,7 @@ fn test_s390x_binemit() {base: gpr(2),index: zero_reg(),disp: UImm12::zero(),- flags: MemFlags::trusted(),+ flags: MemFlagsData::trusted(),},},"E31020000021",@@ -1964,7 +1964,7 @@ fn test_s390x_binemit() {base: gpr(2),index: zero_reg(),disp: UImm12::zero(),- flags: MemFlags::trusted(),+ flags: MemFlagsData::trusted(),},},"E31020000031",@@ -2748,7 +2748,7 @@ fn test_s390x_binemit() {base: zero_reg(),index: zero_reg(),disp: SImm20::maybe_from_i64(-524288).unwrap(),- flags: MemFlags::trusted(),+ flags: MemFlagsData::trusted(),},},"EB45000080F8",@@ -2763,7 +2763,7 @@ fn test_s390x_binemit() {base: zero_reg(),index: zero_reg(),disp: SImm20::maybe_from_i64(524287).unwrap(),- flags: MemFlags::trusted(),+ flags: MemFlagsData::trusted(),},},"EB450FFF7FF8",@@ -2778,7 +2778,7 @@ fn test_s390x_binemit() {base: gpr(6),index: zero_reg(),disp: SImm20::maybe_from_i64(-524288).unwrap(),- flags: MemFlags::trusted(),+ flags: MemFlagsData::trusted(),},},"EB45600080F8",@@ -2793,7 +2793,7 @@ fn test_s390x_binemit() {base: gpr(6),index: zero_reg(),disp: SImm20::maybe_from_i64(524287).unwrap(),- flags: MemFlags::trusted(),+ flags: MemFlagsData::trusted(),},},"EB456FFF7FF8",@@ -2808,7 +2808,7 @@ fn test_s390x_binemit() {base: zero_reg(),index: zero_reg(),disp: SImm20::maybe_from_i64(-524288).unwrap(),- flags: MemFlags::trusted(),+ flags: MemFlagsData::trusted(),},},"EB45000080E8",@@ -2823,7 +2823,7 @@ fn test_s390x_binemit() {base: zero_reg(),index: zero_reg(),disp: SImm20::maybe_from_i64(524287).unwrap(),- flags: MemFlags::trusted(),+ flags: MemFlagsData::trusted(),},},"EB450FFF7FE8",@@ -2838,7 +2838,7 @@ fn test_s390x_binemit() {base: gpr(6),index: zero_reg(),disp: SImm20::maybe_from_i64(-524288).unwrap(),- flags: MemFlags::trusted(),+ flags: MemFlagsData::trusted(),},},"EB45600080E8",@@ -2853,7 +2853,7 @@ fn test_s390x_binemit() {base: gpr(6),index: zero_reg(),disp: SImm20::maybe_from_i64(524287).unwrap(),- flags: MemFlags::trusted(),+ flags: MemFlagsData::trusted(),},},"EB456FFF7FE8",@@ -2868,7 +2868,7 @@ fn test_s390x_binemit() {base: zero_reg(),index: zero_reg(),disp: SImm20::maybe_from_i64(-524288).unwrap(),- flags: MemFlags::trusted(),+ flags: MemFlagsData::trusted(),},},"EB45000080FA",@@ -2883,7 +2883,7 @@ fn test_s390x_binemit() {base: zero_reg(),index: zero_reg(),disp: SImm20::maybe_from_i64(524287).unwrap(),- flags: MemFlags::trusted(),+ flags: MemFlagsData::trusted(),},},"EB450FFF7FFA",@@ -2898,7 +2898,7 @@ fn test_s390x_binemit() {base: gpr(6),index: zero_reg(),disp: SImm20::maybe_from_i64(-524288).unwrap(),- flags: MemFlags::trusted(),+ flags: MemFlagsData::trusted(),},},"EB45600080FA",@@ -2913,7 +2913,7 @@ fn test_s390x_binemit() {base: gpr(6),index: zero_reg(),disp: SImm20::maybe_from_i64(524287).unwrap(),- flags: MemFlags::trusted(),+ flags: MemFlagsData::trusted(),},},"EB456FFF7FFA",@@ -2928,7 +2928,7 @@ fn test_s390x_binemit() {base: zero_reg(),index: zero_reg(),disp: SImm20::maybe_from_i64(-524288).unwrap(),- flags: MemFlags::trusted(),+ flags: MemFlagsData::trusted(),},},"EB45000080EA",@@ -2943,7 +2943,7 @@ fn test_s390x_binemit() {base: zero_reg(),index: zero_reg(),disp: SImm20::maybe_from_i64(524287).unwrap(),- flags: MemFlags::trusted(),+ flags: MemFlagsData::trusted(),},},"EB450FFF7FEA",@@ -2958,7 +2958,7 @@ fn test_s390x_binemit() {base: gpr(6),index: zero_reg(),disp: SImm20::maybe_from_i64(-524288).unwrap(),- flags: MemFlags::trusted(),+ flags: MemFlagsData::trusted(),},},"EB45600080EA",@@ -2973,7 +2973,7 @@ fn test_s390x_binemit() {base: gpr(6),index: zero_reg(),disp: SImm20::maybe_from_i64(524287).unwrap(),- flags: MemFlags::trusted(),+ flags: MemFlagsData::trusted(),},},"EB456FFF7FEA",@@ -2988,7 +2988,7 @@ fn test_s390x_binemit() {base: zero_reg(),index: zero_reg(),disp: SImm20::maybe_from_i64(-524288).unwrap(),- flags: MemFlags::trusted(),+ flags: MemFlagsData::trusted(),},},"EB45000080F4",@@ -3003,7 +3003,7 @@ fn test_s390x_binemit() {base: zero_reg(),index: zero_reg(),disp: SImm20::maybe_from_i64(524287).unwrap(),- flags: MemFlags::trusted(),+ flags: MemFlagsData::trusted(),},},"EB450FFF7FF4",@@ -3018,7 +3018,7 @@ fn test_s390x_binemit() {base: gpr(6),index: zero_reg(),disp: SImm20::maybe_from_i64(-524288).unwrap(),- flags: MemFlags::trusted(),+ flags: MemFlagsData::trusted(),},},"EB45600080F4",@@ -3033,7 +3033,7 @@ fn test_s390x_binemit() {base: gpr(6),index: zero_reg(),disp: SImm20::maybe_from_i64(524287).unwrap(),- flags: MemFlags::trusted(),+ flags: MemFlagsData::trusted(),},},"EB456FFF7FF4",@@ -3048,7 +3048,7 @@ fn test_s390x_binemit() {base: zero_reg(),index: zero_reg(),disp: SImm20::maybe_from_i64(-524288).unwrap(),- flags: MemFlags::trusted(),+ flags: MemFlagsData::trusted(),},},"EB45000080E4",@@ -3063,7 +3063,7 @@ fn test_s390x_binemit() {base: zero_reg(),index: zero_reg(),disp: SImm20::maybe_from_i64(524287).unwrap(),- flags: MemFlags::trusted(),+ flags: MemFlagsData::trusted(),},},"EB450FFF7FE4",@@ -3078,7 +3078,7 @@ fn test_s390x_binemit() {base: gpr(6),index: zero_reg(),disp: SImm20::maybe_from_i64(-524288).unwrap(),- flags: MemFlags::trusted(),+ flags: MemFlagsData::trusted(),},},"EB45600080E4",@@ -3093,7 +3093,7 @@ fn test_s390x_binemit() {base: gpr(6),index: zero_reg(),disp: SImm20::maybe_from_i64(524287).unwrap(),- flags: MemFlags::trusted(),+ flags: MemFlagsData::trusted(),},},"EB456FFF7FE4",@@ -3108,7 +3108,7 @@ fn test_s390x_binemit() {base: zero_reg(),index: zero_reg(),disp: SImm20::maybe_from_i64(-524288).unwrap(),- flags: MemFlags::trusted(),+ flags: MemFlagsData::trusted(),},},"EB45000080F6",@@ -3123,7 +3123,7 @@ fn test_s390x_binemit() {base: zero_reg(),index: zero_reg(),disp: SImm20::maybe_from_i64(524287).unwrap(),- flags: MemFlags::trusted(),+ flags: MemFlagsData::trusted(),},},"EB450FFF7FF6",@@ -3138,7 +3138,7 @@ fn test_s390x_binemit() {base: gpr(6),index: zero_reg(),disp: SImm20::maybe_from_i64(-524288).unwrap(),- flags: MemFlags::trusted(),+ flags: MemFlagsData::trusted(),},},"EB45600080F6",@@ -3153,7 +3153,7 @@ fn test_s390x_binemit() {base: gpr(6),index: zero_reg(),disp: SImm20::maybe_from_i64(524287).unwrap(),- flags: MemFlags::trusted(),+ flags: MemFlagsData::trusted(),},},"EB456FFF7FF6",@@ -3168,7 +3168,7 @@ fn test_s390x_binemit() {base: zero_reg(),index: zero_reg(),disp: SImm20::maybe_from_i64(-524288).unwrap(),- flags: MemFlags::trusted(),+ flags: MemFlagsData::trusted(),},},"EB45000080E6",@@ -3183,7 +3183,7 @@ fn test_s390x_binemit() {base: zero_reg(),index: zero_reg(),disp: SImm20::maybe_from_i64(524287).unwrap(),- flags: MemFlags::trusted(),+ flags: MemFlagsData::trusted(),},},"EB450FFF7FE6",@@ -3198,7 +3198,7 @@ fn test_s390x_binemit() {base: gpr(6),index: zero_reg(),disp: SImm20::maybe_from_i64(-524288).unwrap(),- flags: MemFlags::trusted(),+ flags: MemFlagsData::trusted(),},},"EB45600080E6",@@ -3213,7 +3213,7 @@ fn test_s390x_binemit() {base: gpr(6),index: zero_reg(),disp: SImm20::maybe_from_i64(524287).unwrap(),- flags: MemFlags::trusted(),+ flags: MemFlagsData::trusted(),},},"EB456FFF7FE6",@@ -3228,7 +3228,7 @@ fn test_s390x_binemit() {base: zero_reg(),index: zero_reg(),disp: SImm20::maybe_from_i64(-524288).unwrap(),- flags: MemFlags::trusted(),+ flags: MemFlagsData::trusted(),},},"EB45000080F7",@@ -3243,7 +3243,7 @@ fn test_s390x_binemit() {base: zero_reg(),index: zero_reg(),disp: SImm20::maybe_from_i64(524287).unwrap(),- flags: MemFlags::trusted(),+ flags: MemFlagsData::trusted(),},},"EB450FFF7FF7",@@ -3258,7 +3258,7 @@ fn test_s390x_binemit() {base: gpr(6),index: zero_reg(),disp: SImm20::maybe_from_i64(-524288).unwrap(),- flags: MemFlags::trusted(),+ flags: MemFlagsData::trusted(),},},"EB45600080F7",@@ -3273,7 +3273,7 @@ fn test_s390x_binemit() {base: gpr(6),index: zero_reg(),disp: SImm20::maybe_from_i64(524287).unwrap(),- flags: MemFlags::trusted(),+ flags: MemFlagsData::trusted(),},},"EB456FFF7FF7",@@ -3288,7 +3288,7 @@ fn test_s390x_binemit() {base: zero_reg(),index: zero_reg(),disp: SImm20::maybe_from_i64(-524288).unwrap(),- flags: MemFlags::trusted(),+ flags: MemFlagsData::trusted(),},},"EB45000080E7",@@ -3303,7 +3303,7 @@ fn test_s390x_binemit() {base: zero_reg(),index: zero_reg(),disp: SImm20::maybe_from_i64(524287).unwrap(),- flags: MemFlags::trusted(),+ flags: MemFlagsData::trusted(),},},"EB450FFF7FE7",@@ -3318,7 +3318,7 @@ fn test_s390x_binemit() {base: gpr(6),index: zero_reg(),disp: SImm20::maybe_from_i64(-524288).unwrap(),- flags: MemFlags::trusted(),+ flags: MemFlagsData::trusted(),},},"EB45600080E7",@@ -3333,7 +3333,7 @@ fn test_s390x_binemit() {base: gpr(6),index: zero_reg(),disp: SImm20::maybe_from_i64(524287).unwrap(),- flags: MemFlags::trusted(),+ flags: MemFlagsData::trusted(),},},"EB456FFF7FE7",@@ -3348,7 +3348,7 @@ fn test_s390x_binemit() {base: zero_reg(),index: zero_reg(),disp: UImm12::maybe_from_u64(0).unwrap(),- flags: MemFlags::trusted(),+ flags: MemFlagsData::trusted(),},},"BA450000",@@ -3363,7 +3363,7 @@ fn test_s390x_binemit() {base: zero_reg(),index: zero_reg(),disp: UImm12::maybe_from_u64(4095).unwrap(),- flags: MemFlags::trusted(),+ flags: MemFlagsData::trusted(),},},"BA450FFF",@@ -3378,7 +3378,7 @@ fn test_s390x_binemit() {base: zero_reg(),index: zero_reg(),disp: SImm20::maybe_from_i64(-524288).unwrap(),- flags: MemFlags::trusted(),+ flags: MemFlagsData::trusted(),},},"EB4500008014",@@ -3393,7 +3393,7 @@ fn test_s390x_binemit() {base: zero_reg(),index: zero_reg(),disp: SImm20::maybe_from_i64(524287).unwrap(),- flags: MemFlags::trusted(),+ flags: MemFlagsData::trusted(),},},"EB450FFF7F14",@@ -3408,7 +3408,7 @@ fn test_s390x_binemit() {base: gpr(6),index: zero_reg(),disp: UImm12::maybe_from_u64(0).unwrap(),- flags: MemFlags::trusted(),+ flags: MemFlagsData::trusted(),},},"BA456000",@@ -3423,7 +3423,7 @@ fn test_s390x_binemit() {base: gpr(6),index: zero_reg(),disp: UImm12::maybe_from_u64(4095).unwrap(),- flags: MemFlags::trusted(),+ flags: MemFlagsData::trusted(),},},"BA456FFF",@@ -3438,7 +3438,7 @@ fn test_s390x_binemit() {base: gpr(6),index: zero_reg(),disp: SImm20::maybe_from_i64(-524288).unwrap(),- flags: MemFlags::trusted(),+ flags: MemFlagsData::trusted(),},},"EB4560008014",@@ -3453,7 +3453,7 @@ fn test_s390x_binemit() {base: gpr(6),index: zero_reg(),disp: SImm20::maybe_from_i64(524287).unwrap(),- flags: MemFlags::trusted(),+ flags: MemFlagsData::trusted(),},},"EB456FFF7F14",@@ -3468,7 +3468,7 @@ fn test_s390x_binemit() {base: zero_reg(),index: zero_reg(),disp: SImm20::maybe_from_i64(-524288).unwrap(),- flags: MemFlags::trusted(),+ flags: MemFlagsData::trusted(),},},"EB4500008030",@@ -3483,7 +3483,7 @@ fn test_s390x_binemit() {base: zero_reg(),index: zero_reg(),disp: SImm20::maybe_from_i64(524287).unwrap(),- flags: MemFlags::trusted(),+ flags: MemFlagsData::trusted(),},},"EB450FFF7F30",@@ -3498,7 +3498,7 @@ fn test_s390x_binemit() {base: gpr(6),index: zero_reg(),disp: SImm20::maybe_from_i64(-524288).unwrap(),- flags: MemFlags::trusted(),+ flags: MemFlagsData::trusted(),},},"EB4560008030",@@ -3513,7 +3513,7 @@ fn test_s390x_binemit() {base: gpr(6),index: zero_reg(),disp: SImm20::maybe_from_i64(524287).unwrap(),- flags: MemFlags::trusted(),+ flags: MemFlagsData::trusted(),},},"EB456FFF7F30",@@ -3528,7 +3528,7 @@ fn test_s390x_binemit() {base: gpr(2),index: zero_reg(),disp: UImm12::zero(),- flags: MemFlags::trusted(),+ flags: MemFlagsData::trusted(),},},"58102000",@@ -3541,7 +3541,7 @@ fn test_s390x_binemit() {base: gpr(2),index: zero_reg(),disp: UImm12::maybe_from_u64(4095).unwrap(),- flags: MemFlags::trusted(),+ flags: MemFlagsData::trusted(),},},"58102FFF",@@ -3554,7 +3554,7 @@ fn test_s390x_binemit() {base: gpr(2),index: zero_reg(),disp: SImm20::maybe_from_i64(-524288).unwrap(),- flags: MemFlags::trusted(),+ flags: MemFlagsData::trusted(),},},"E31020008058",@@ -3567,7 +3567,7 @@ fn test_s390x_binemit() {base: gpr(2),index: zero_reg(),disp: SImm20::maybe_from_i64(524287).unwrap(),- flags: MemFlags::trusted(),+ flags: MemFlagsData::trusted(),},},"E3102FFF7F58",@@ -3580,7 +3580,7 @@ fn test_s390x_binemit() {base: gpr(3),index: gpr(2),disp: UImm12::zero(),- flags: MemFlags::trusted(),+ flags: MemFlagsData::trusted(),},},"58123000",@@ -3593,7 +3593,7 @@ fn test_s390x_binemit() {base: gpr(3),index: gpr(2),disp: UImm12::maybe_from_u64(4095).unwrap(),- flags: MemFlags::trusted(),+ flags: MemFlagsData::trusted(),},},"58123FFF",@@ -3606,7 +3606,7 @@ fn test_s390x_binemit() {base: gpr(3),index: gpr(2),disp: SImm20::maybe_from_i64(-524288).unwrap(),- flags: MemFlags::trusted(),+ flags: MemFlagsData::trusted(),},},"E31230008058",@@ -3619,7 +3619,7 @@ fn test_s390x_binemit() {base: gpr(3),index: gpr(2),disp: SImm20::maybe_from_i64(524287).unwrap(),- flags: MemFlags::trusted(),+ flags: MemFlagsData::trusted(),},},"E3123FFF7F58",@@ -3632,7 +3632,7 @@ fn test_s390x_binemit() {base: gpr(2),index: zero_reg(),disp: UImm12::zero(),- flags: MemFlags::trusted(),+ flags: MemFlagsData::trusted(),},},"E31020000094",@@ -3645,7 +3645,7 @@ fn test_s390x_binemit() {base: gpr(2),index: zero_reg(),disp: UImm12::maybe_from_u64(4095).unwrap(),- flags: MemFlags::trusted(),+ flags: MemFlagsData::trusted(),},},"E3102FFF0094",@@ -3658,7 +3658,7 @@ fn test_s390x_binemit() {base: gpr(2),index: zero_reg(),disp: SImm20::maybe_from_i64(-524288).unwrap(),- flags: MemFlags::trusted(),+ flags: MemFlagsData::trusted(),},},"E31020008094",@@ -3671,7 +3671,7 @@ fn test_s390x_binemit() {base: gpr(2),index: zero_reg(),disp: SImm20::maybe_from_i64(524287).unwrap(),- flags: MemFlags::trusted(),+ flags: MemFlagsData::trusted(),},},"E3102FFF7F94",@@ -3684,7 +3684,7 @@ fn test_s390x_binemit() {base: gpr(3),index: gpr(2),disp: UImm12::zero(),- flags: MemFlags::trusted(),+ flags: MemFlagsData::trusted(),},},"E31230000094",@@ -3697,7 +3697,7 @@ fn test_s390x_binemit() {base: gpr(3),index: gpr(2),disp: UImm12::maybe_from_u64(4095).unwrap(),- flags: MemFlags::trusted(),+ flags: MemFlagsData::trusted(),},},"E3123FFF0094",@@ -3710,7 +3710,7 @@ fn test_s390x_binemit() {base: gpr(3),index: gpr(2),disp: SImm20::maybe_from_i64(-524288).unwrap(),- flags: MemFlags::trusted(),+ flags: MemFlagsData::trusted(),},},"E31230008094",@@ -3723,7 +3723,7 @@ fn test_s390x_binemit() {base: gpr(3),index: gpr(2),disp: SImm20::maybe_from_i64(524287).unwrap(),- flags: MemFlags::trusted(),+ flags: MemFlagsData::trusted(),},},"E3123FFF7F94",@@ -3736,7 +3736,7 @@ fn test_s390x_binemit() {base: gpr(2),index: zero_reg(),disp: UImm12::zero(),- flags: MemFlags::trusted(),+ flags: MemFlagsData::trusted(),},},"E31020000076",@@ -3749,7 +3749,7 @@ fn test_s390x_binemit() {base: gpr(2),index: zero_reg(),disp: UImm12::maybe_from_u64(4095).unwrap(),- flags: MemFlags::trusted(),+ flags: MemFlagsData::trusted(),},},"E3102FFF0076",@@ -3762,7 +3762,7 @@ fn test_s390x_binemit() {base: gpr(2),index: zero_reg(),disp: SImm20::maybe_from_i64(-524288).unwrap(),- flags: MemFlags::trusted(),+ flags: MemFlagsData::trusted(),},},"E31020008076",@@ -3775,7 +3775,7 @@ fn test_s390x_binemit() {base: gpr(2),index: zero_reg(),disp: SImm20::maybe_from_i64(524287).unwrap(),- flags: MemFlags::trusted(),+ flags: MemFlagsData::trusted(),},},"E3102FFF7F76",@@ -3788,7 +3788,7 @@ fn test_s390x_binemit() {base: gpr(3),index: gpr(2),disp: UImm12::zero(),- flags: MemFlags::trusted(),+ flags: MemFlagsData::trusted(),},},"E31230000076",@@ -3801,7 +3801,7 @@ fn test_s390x_binemit() {base: gpr(3),index: gpr(2),disp: UImm12::maybe_from_u64(4095).unwrap(),- flags: MemFlags::trusted(),+ flags: MemFlagsData::trusted(),},},"E3123FFF0076",@@ -3814,7 +3814,7 @@ fn test_s390x_binemit() {base: gpr(3),index: gpr(2),disp: SImm20::maybe_from_i64(-524288).unwrap(),- flags: MemFlags::trusted(),+ flags: MemFlagsData::trusted(),},},"E31230008076",@@ -3827,7 +3827,7 @@ fn test_s390x_binemit() {base: gpr(3),index: gpr(2),disp: SImm20::maybe_from_i64(524287).unwrap(),- flags: MemFlags::trusted(),+ flags: MemFlagsData::trusted(),},},"E3123FFF7F76",@@ -3840,7 +3840,7 @@ fn test_s390x_binemit() {base: gpr(2),index: zero_reg(),disp: UImm12::zero(),- flags: MemFlags::trusted(),+ flags: MemFlagsData::trusted(),},},"E31020000095",@@ -3853,7 +3853,7 @@ fn test_s390x_binemit() {base: gpr(2),index: zero_reg(),disp: UImm12::maybe_from_u64(4095).unwrap(),- flags: MemFlags::trusted(),+ flags: MemFlagsData::trusted(),},},"E3102FFF0095",@@ -3866,7 +3866,7 @@ fn test_s390x_binemit() {base: gpr(2),index: zero_reg(),disp: SImm20::maybe_from_i64(-524288).unwrap(),- flags: MemFlags::trusted(),+ flags: MemFlagsData::trusted(),},},"E31020008095",@@ -3879,7 +3879,7 @@ fn test_s390x_binemit() {base: gpr(2),index: zero_reg(),disp: SImm20::maybe_from_i64(524287).unwrap(),- flags: MemFlags::trusted(),+ flags: MemFlagsData::trusted(),},},"E3102FFF7F95",@@ -3892,7 +3892,7 @@ fn test_s390x_binemit() {base: gpr(3),index: gpr(2),disp: UImm12::zero(),- flags: MemFlags::trusted(),+ flags: MemFlagsData::trusted(),},},"E31230000095",@@ -3905,7 +3905,7 @@ fn test_s390x_binemit() {base: gpr(3),index: gpr(2),disp: UImm12::maybe_from_u64(4095).unwrap(),- flags: MemFlags::trusted(),+ flags: MemFlagsData::trusted(),},},"E3123FFF0095",@@ -3918,7 +3918,7 @@ fn test_s390x_binemit() {base: gpr(3),index: gpr(2),disp: SImm20::maybe_from_i64(-524288).unwrap(),- flags: MemFlags::trusted(),+ flags: MemFlagsData::trusted(),},},"E31230008095",@@ -3931,7 +3931,7 @@ fn test_s390x_binemit() {base: gpr(3),index: gpr(2),disp: SImm20::maybe_from_i64(524287).unwrap(),- flags: MemFlags::trusted(),+ flags: MemFlagsData::trusted(),},},"E3123FFF7F95",@@ -3944,7 +3944,7 @@ fn test_s390x_binemit() {base: gpr(2),index: zero_reg(),disp: UImm12::zero(),- flags: MemFlags::trusted(),+ flags: MemFlagsData::trusted(),},},"48102000",@@ -3957,7 +3957,7 @@ fn test_s390x_binemit() {base: gpr(2),index: zero_reg(),disp: UImm12::maybe_from_u64(4095).unwrap(),- flags: MemFlags::trusted(),+ flags: MemFlagsData::trusted(),},},"48102FFF",@@ -3970,7 +3970,7 @@ fn test_s390x_binemit() {base: gpr(2),index: zero_reg(),disp: SImm20::maybe_from_i64(-524288).unwrap(),- flags: MemFlags::trusted(),+ flags: MemFlagsData::trusted(),},},"E31020008078",@@ -3983,7 +3983,7 @@ fn test_s390x_binemit() {base: gpr(2),index: zero_reg(),disp: SImm20::maybe_from_i64(524287).unwrap(),- flags: MemFlags::trusted(),+ flags: MemFlagsData::trusted(),},},"E3102FFF7F78",@@ -3996,7 +3996,7 @@ fn test_s390x_binemit() {base: gpr(3),index: gpr(2),disp: UImm12::zero(),- flags: MemFlags::trusted(),+ flags: MemFlagsData::trusted(),},},"48123000",@@ -4009,7 +4009,7 @@ fn test_s390x_binemit() {base: gpr(3),index: gpr(2),disp: UImm12::maybe_from_u64(4095).unwrap(),- flags: MemFlags::trusted(),+ flags: MemFlagsData::trusted(),},},"48123FFF",@@ -4022,7 +4022,7 @@ fn test_s390x_binemit() {base: gpr(3),index: gpr(2),disp: SImm20::maybe_from_i64(-524288).unwrap(),- flags: MemFlags::trusted(),+ flags: MemFlagsData::trusted(),},},"E31230008078",@@ -4035,7 +4035,7 @@ fn test_s390x_binemit() {base: gpr(3),index: gpr(2),disp: SImm20::maybe_from_i64(524287).unwrap(),- flags: MemFlags::trusted(),+ flags: MemFlagsData::trusted(),},},"E3123FFF7F78",@@ -4048,7 +4048,7 @@ fn test_s390x_binemit() {base: gpr(2),index: zero_reg(),disp: UImm12::zero(),- flags: MemFlags::trusted(),+ flags: MemFlagsData::trusted(),},},"E31020000004",@@ -4061,7 +4061,7 @@ fn test_s390x_binemit() {base: gpr(2),index: zero_reg(),disp: UImm12::maybe_from_u64(4095).unwrap(),- flags: MemFlags::trusted(),+ flags: MemFlagsData::trusted(),},},"E3102FFF0004",@@ -4074,7 +4074,7 @@ fn test_s390x_binemit() {base: gpr(2),index: zero_reg(),disp: SImm20::maybe_from_i64(-524288).unwrap(),- flags: MemFlags::trusted(),+ flags: MemFlagsData::trusted(),},},"E31020008004",@@ -4087,7 +4087,7 @@ fn test_s390x_binemit() {base: gpr(2),index: zero_reg(),disp: SImm20::maybe_from_i64(524287).unwrap(),- flags: MemFlags::trusted(),+ flags: MemFlagsData::trusted(),},},"E3102FFF7F04",@@ -4100,7 +4100,7 @@ fn test_s390x_binemit() {base: gpr(3),index: gpr(2),disp: UImm12::zero(),- flags: MemFlags::trusted(),+ flags: MemFlagsData::trusted(),},},"E31230000004",@@ -4113,7 +4113,7 @@ fn test_s390x_binemit() {base: gpr(3),index: gpr(2),disp: UImm12::maybe_from_u64(4095).unwrap(),- flags: MemFlags::trusted(),+ flags: MemFlagsData::trusted(),},},"E3123FFF0004",@@ -4126,7 +4126,7 @@ fn test_s390x_binemit() {base: gpr(3),index: gpr(2),disp: SImm20::maybe_from_i64(-524288).unwrap(),- flags: MemFlags::trusted(),+ flags: MemFlagsData::trusted(),},},"E31230008004",@@ -4139,7 +4139,7 @@ fn test_s390x_binemit() {base: gpr(3),index: gpr(2),disp: SImm20::maybe_from_i64(524287).unwrap(),- flags: MemFlags::trusted(),+ flags: MemFlagsData::trusted(),},},"E3123FFF7F04",@@ -4152,7 +4152,7 @@ fn test_s390x_binemit() {base: gpr(2),index: zero_reg(),disp: UImm12::zero(),- flags: MemFlags::trusted(),+ flags: MemFlagsData::trusted(),},},"E31020000090",@@ -4165,7 +4165,7 @@ fn test_s390x_binemit() {base: gpr(2),index: zero_reg(),disp: UImm12::maybe_from_u64(4095).unwrap(),- flags: MemFlags::trusted(),+ flags: MemFlagsData::trusted(),},},"E3102FFF0090",@@ -4178,7 +4178,7 @@ fn test_s390x_binemit() {base: gpr(2),index: zero_reg(),disp: SImm20::maybe_from_i64(-524288).unwrap(),- flags: MemFlags::trusted(),+ flags: MemFlagsData::trusted(),},},"E31020008090",@@ -4191,7 +4191,7 @@ fn test_s390x_binemit() {base: gpr(2),index: zero_reg(),disp: SImm20::maybe_from_i64(524287).unwrap(),- flags: MemFlags::trusted(),+ flags: MemFlagsData::trusted(),},},"E3102FFF7F90",@@ -4204,7 +4204,7 @@ fn test_s390x_binemit() {base: gpr(3),index: gpr(2),disp: UImm12::zero(),- flags: MemFlags::trusted(),+ flags: MemFlagsData::trusted(),},},"E31230000090",@@ -4217,7 +4217,7 @@ fn test_s390x_binemit() {base: gpr(3),index: gpr(2),disp: UImm12::maybe_from_u64(4095).unwrap(),- flags: MemFlags::trusted(),+ flags: MemFlagsData::trusted(),},},"E3123FFF0090",@@ -4230,7 +4230,7 @@ fn test_s390x_binemit() {base: gpr(3),index: gpr(2),disp: SImm20::maybe_from_i64(-524288).unwrap(),- flags: MemFlags::trusted(),+ flags: MemFlagsData::trusted(),},},"E31230008090",@@ -4243,7 +4243,7 @@ fn test_s390x_binemit() {base: gpr(3),index: gpr(2),disp: SImm20::maybe_from_i64(524287).unwrap(),- flags: MemFlags::trusted(),+ flags: MemFlagsData::trusted(),},},"E3123FFF7F90",@@ -4256,7 +4256,7 @@ fn test_s390x_binemit() {base: gpr(2),index: zero_reg(),disp: UImm12::zero(),- flags: MemFlags::trusted(),+ flags: MemFlagsData::trusted(),},},"E31020000077",@@ -4269,7 +4269,7 @@ fn test_s390x_binemit() {base: gpr(2),index: zero_reg(),disp: UImm12::maybe_from_u64(4095).unwrap(),- flags: MemFlags::trusted(),+ flags: MemFlagsData::trusted(),},},"E3102FFF0077",@@ -4282,7 +4282,7 @@ fn test_s390x_binemit() {base: gpr(2),index: zero_reg(),disp: SImm20::maybe_from_i64(-524288).unwrap(),- flags: MemFlags::trusted(),+ flags: MemFlagsData::trusted(),},},"E31020008077",@@ -4295,7 +4295,7 @@ fn test_s390x_binemit() {base: gpr(2),index: zero_reg(),disp: SImm20::maybe_from_i64(524287).unwrap(),- flags: MemFlags::trusted(),+ flags: MemFlagsData::trusted(),},},"E3102FFF7F77",@@ -4308,7 +4308,7 @@ fn test_s390x_binemit() {base: gpr(3),index: gpr(2),disp: UImm12::zero(),- flags: MemFlags::trusted(),+ flags: MemFlagsData::trusted(),},},"E31230000077",@@ -4321,7 +4321,7 @@ fn test_s390x_binemit() {base: gpr(3),index: gpr(2),disp: UImm12::maybe_from_u64(4095).unwrap(),- flags: MemFlags::trusted(),+ flags: MemFlagsData::trusted(),},},"E3123FFF0077",@@ -4334,7 +4334,7 @@ fn test_s390x_binemit() {base: gpr(3),index: gpr(2),disp: SImm20::maybe_from_i64(-524288).unwrap(),- flags: MemFlags::trusted(),+ flags: MemFlagsData::trusted(),},},"E31230008077",@@ -4347,7 +4347,7 @@ fn test_s390x_binemit() {base: gpr(3),index: gpr(2),disp: SImm20::maybe_from_i64(524287).unwrap(),- flags: MemFlags::trusted(),+ flags: MemFlagsData::trusted(),},},"E3123FFF7F77",@@ -4360,7 +4360,7 @@ fn test_s390x_binemit() {base: gpr(2),index: zero_reg(),disp: UImm12::zero(),- flags: MemFlags::trusted(),+ flags: MemFlagsData::trusted(),},},"E31020000091",@@ -4373,7 +4373,7 @@ fn test_s390x_binemit() {base: gpr(2),index: zero_reg(),disp: UImm12::maybe_from_u64(4095).unwrap(),- flags: MemFlags::trusted(),+ flags: MemFlagsData::trusted(),},},"E3102FFF0091",@@ -4386,7 +4386,7 @@ fn test_s390x_binemit() {base: gpr(2),index: zero_reg(),disp: SImm20::maybe_from_i64(-524288).unwrap(),- flags: MemFlags::trusted(),+ flags: MemFlagsData::trusted(),},},"E31020008091",@@ -4399,7 +4399,7 @@ fn test_s390x_binemit() {base: gpr(2),index: zero_reg(),disp: SImm20::maybe_from_i64(524287).unwrap(),- flags: MemFlags::trusted(),+ flags: MemFlagsData::trusted(),},},"E3102FFF7F91",@@ -4412,7 +4412,7 @@ fn test_s390x_binemit() {base: gpr(3),index: gpr(2),disp: UImm12::zero(),- flags: MemFlags::trusted(),+ flags: MemFlagsData::trusted(),},},"E31230000091",@@ -4425,7 +4425,7 @@ fn test_s390x_binemit() {base: gpr(3),index: gpr(2),disp: UImm12::maybe_from_u64(4095).unwrap(),- flags: MemFlags::trusted(),+ flags: MemFlagsData::trusted(),},},"E3123FFF0091",@@ -4438,7 +4438,7 @@ fn test_s390x_binemit() {base: gpr(3),index: gpr(2),disp: SImm20::maybe_from_i64(-524288).unwrap(),- flags: MemFlags::trusted(),+ flags: MemFlagsData::trusted(),},},"E31230008091",@@ -4451,7 +4451,7 @@ fn test_s390x_binemit() {base: gpr(3),index: gpr(2),disp: SImm20::maybe_from_i64(524287).unwrap(),- flags: MemFlags::trusted(),+ flags: MemFlagsData::trusted(),},},"E3123FFF7F91",@@ -4464,7 +4464,7 @@ fn test_s390x_binemit() {base: gpr(2),index: zero_reg(),disp: UImm12::zero(),- flags: MemFlags::trusted(),+ flags: MemFlagsData::trusted(),},},"E31020000015",@@ -4477,7 +4477,7 @@ fn test_s390x_binemit() {base: gpr(2),index: zero_reg(),disp: UImm12::maybe_from_u64(4095).unwrap(),- flags: MemFlags::trusted(),+ flags: MemFlagsData::trusted(),},},"E3102FFF0015",@@ -4490,7 +4490,7 @@ fn test_s390x_binemit() {base: gpr(2),index: zero_reg(),disp: SImm20::maybe_from_i64(-524288).unwrap(),- flags: MemFlags::trusted(),+ flags: MemFlagsData::trusted(),},},"E31020008015",@@ -4503,7 +4503,7 @@ fn test_s390x_binemit() {base: gpr(2),index: zero_reg(),disp: SImm20::maybe_from_i64(524287).unwrap(),- flags: MemFlags::trusted(),+ flags: MemFlagsData::trusted(),},},"E3102FFF7F15",@@ -4516,7 +4516,7 @@ fn test_s390x_binemit() {base: gpr(3),index: gpr(2),disp: UImm12::zero(),- flags: MemFlags::trusted(),+ flags: MemFlagsData::trusted(),},},"E31230000015",@@ -4529,7 +4529,7 @@ fn test_s390x_binemit() {base: gpr(3),index: gpr(2),disp: UImm12::maybe_from_u64(4095).unwrap(),- flags: MemFlags::trusted(),+ flags: MemFlagsData::trusted(),},},"E3123FFF0015",@@ -4542,7 +4542,7 @@ fn test_s390x_binemit() {base: gpr(3),index: gpr(2),disp: SImm20::maybe_from_i64(-524288).unwrap(),- flags: MemFlags::trusted(),+ flags: MemFlagsData::trusted(),},},"E31230008015",@@ -4555,7 +4555,7 @@ fn test_s390x_binemit() {base: gpr(3),index: gpr(2),disp: SImm20::maybe_from_i64(524287).unwrap(),- flags: MemFlags::trusted(),+ flags: MemFlagsData::trusted(),},},"E3123FFF7F15",@@ -4568,7 +4568,7 @@ fn test_s390x_binemit() {base: gpr(2),index: zero_reg(),disp: UImm12::zero(),- flags: MemFlags::trusted(),+ flags: MemFlagsData::trusted(),},},"E31020000016",@@ -4581,7 +4581,7 @@ fn test_s390x_binemit() {base: gpr(2),index: zero_reg(),disp: UImm12::maybe_from_u64(4095).unwrap(),- flags: MemFlags::trusted(),+ flags: MemFlagsData::trusted(),},},"E3102FFF0016",@@ -4594,7 +4594,7 @@ fn test_s390x_binemit() {base: gpr(2),index: zero_reg(),disp: SImm20::maybe_from_i64(-524288).unwrap(),- flags: MemFlags::trusted(),+ flags: MemFlagsData::trusted(),},},"E31020008016",@@ -4607,7 +4607,7 @@ fn test_s390x_binemit() {base: gpr(2),index: zero_reg(),disp: SImm20::maybe_from_i64(524287).unwrap(),- flags: MemFlags::trusted(),+ flags: MemFlagsData::trusted(),},},"E3102FFF7F16",@@ -4620,7 +4620,7 @@ fn test_s390x_binemit() {base: gpr(3),index: gpr(2),disp: UImm12::zero(),- flags: MemFlags::trusted(),+ flags: MemFlagsData::trusted(),},},"E31230000016",@@ -4633,7 +4633,7 @@ fn test_s390x_binemit() {base: gpr(3),index: gpr(2),disp: UImm12::maybe_from_u64(4095).unwrap(),- flags: MemFlags::trusted(),+ flags: MemFlagsData::trusted(),},},"E3123FFF0016",@@ -4646,7 +4646,7 @@ fn test_s390x_binemit() {base: gpr(3),index: gpr(2),disp: SImm20::maybe_from_i64(-524288).unwrap(),- flags: MemFlags::trusted(),+ flags: MemFlagsData::trusted(),},},"E31230008016",@@ -4659,7 +4659,7 @@ fn test_s390x_binemit() {base: gpr(3),index: gpr(2),disp: SImm20::maybe_from_i64(524287).unwrap(),- flags: MemFlags::trusted(),+ flags: MemFlagsData::trusted(),},},"E3123FFF7F16",@@ -4672,7 +4672,7 @@ fn test_s390x_binemit() {base: gpr(2),index: zero_reg(),disp: UImm12::zero(),- flags: MemFlags::trusted(),+ flags: MemFlagsData::trusted(),},},"E31020000014",@@ -4685,7 +4685,7 @@ fn test_s390x_binemit() {base: gpr(2),index: zero_reg(),disp: UImm12::maybe_from_u64(4095).unwrap(),- flags: MemFlags::trusted(),+ flags: MemFlagsData::trusted(),},},"E3102FFF0014",@@ -4698,7 +4698,7 @@ fn test_s390x_binemit() {base: gpr(2),index: zero_reg(),disp: SImm20::maybe_from_i64(-524288).unwrap(),- flags: MemFlags::trusted(),+ flags: MemFlagsData::trusted(),},},"E31020008014",@@ -4711,7 +4711,7 @@ fn test_s390x_binemit() {base: gpr(2),index: zero_reg(),disp: SImm20::maybe_from_i64(524287).unwrap(),- flags: MemFlags::trusted(),+ flags: MemFlagsData::trusted(),},},"E3102FFF7F14",@@ -4724,7 +4724,7 @@ fn test_s390x_binemit() {base: gpr(3),index: gpr(2),disp: UImm12::zero(),- flags: MemFlags::trusted(),+ flags: MemFlagsData::trusted(),},},"E31230000014",@@ -4737,7 +4737,7 @@ fn test_s390x_binemit() {base: gpr(3),index: gpr(2),disp: UImm12::maybe_from_u64(4095).unwrap(),- flags: MemFlags::trusted(),+ flags: MemFlagsData::trusted(),},},"E3123FFF0014",@@ -4750,7 +4750,7 @@ fn test_s390x_binemit() {base: gpr(3),index: gpr(2),disp: SImm20::maybe_from_i64(-524288).unwrap(),- flags: MemFlags::trusted(),+ flags: MemFlagsData::trusted(),},},"E31230008014",@@ -4763,7 +4763,7 @@ fn test_s390x_binemit() {base: gpr(3),index: gpr(2),disp: SImm20::maybe_from_i64(524287).unwrap(),- flags: MemFlags::trusted(),+ flags: MemFlagsData::trusted(),},},"E3123FFF7F14",@@ -4857,7 +4857,7 @@ fn test_s390x_binemit() {base: gpr(2),index: zero_reg(),disp: UImm12::zero(),- flags: MemFlags::trusted(),+ flags: MemFlagsData::trusted(),},},"E3102000001F",@@ -4870,7 +4870,7 @@ fn test_s390x_binemit() {base: gpr(2),index: zero_reg(),disp: UImm12::maybe_from_u64(4095).unwrap(),- flags: MemFlags::trusted(),+ flags: MemFlagsData::trusted(),},},"E3102FFF001F",@@ -4883,7 +4883,7 @@ fn test_s390x_binemit() {base: gpr(2),index: zero_reg(),disp: SImm20::maybe_from_i64(-524288).unwrap(),- flags: MemFlags::trusted(),+ flags: MemFlagsData::trusted(),},},"E3102000801F",@@ -4896,7 +4896,7 @@ fn test_s390x_binemit() {base: gpr(2),index: zero_reg(),disp: SImm20::maybe_from_i64(524287).unwrap(),- flags: MemFlags::trusted(),+ flags: MemFlagsData::trusted(),},},"E3102FFF7F1F",@@ -4909,7 +4909,7 @@ fn test_s390x_binemit() {base: gpr(3),index: gpr(2),disp: UImm12::zero(),- flags: MemFlags::trusted(),+ flags: MemFlagsData::trusted(),},},"E3123000001F",@@ -4922,7 +4922,7 @@ fn test_s390x_binemit() {base: gpr(3),index: gpr(2),disp: UImm12::maybe_from_u64(4095).unwrap(),- flags: MemFlags::trusted(),+ flags: MemFlagsData::trusted(),},},"E3123FFF001F",@@ -4935,7 +4935,7 @@ fn test_s390x_binemit() {base: gpr(3),index: gpr(2),disp: SImm20::maybe_from_i64(-524288).unwrap(),- flags: MemFlags::trusted(),+ flags: MemFlagsData::trusted(),},},"E3123000801F",@@ -4948,7 +4948,7 @@ fn test_s390x_binemit() {base: gpr(3),index: gpr(2),disp: SImm20::maybe_from_i64(524287).unwrap(),- flags: MemFlags::trusted(),+ flags: MemFlagsData::trusted(),},},"E3123FFF7F1F",@@ -4961,7 +4961,7 @@ fn test_s390x_binemit() {base: gpr(2),index: zero_reg(),disp: UImm12::zero(),- flags: MemFlags::trusted(),+ flags: MemFlagsData::trusted(),},},"E3102000001E",@@ -4974,7 +4974,7 @@ fn test_s390x_binemit() {base: gpr(2),index: zero_reg(),disp: UImm12::maybe_from_u64(4095).unwrap(),- flags: MemFlags::trusted(),+ flags: MemFlagsData::trusted(),},},"E3102FFF001E",@@ -4987,7 +4987,7 @@ fn test_s390x_binemit() {base: gpr(2),index: zero_reg(),disp: SImm20::maybe_from_i64(-524288).unwrap(),- flags: MemFlags::trusted(),+ flags: MemFlagsData::trusted(),},},"E3102000801E",@@ -5000,7 +5000,7 @@ fn test_s390x_binemit() {base: gpr(2),index: zero_reg(),disp: SImm20::maybe_from_i64(524287).unwrap(),- flags: MemFlags::trusted(),+ flags: MemFlagsData::trusted(),},},"E3102FFF7F1E",@@ -5013,7 +5013,7 @@ fn test_s390x_binemit() {base: gpr(3),index: gpr(2),disp: UImm12::zero(),- flags: MemFlags::trusted(),+ flags: MemFlagsData::trusted(),},},"E3123000001E",@@ -5026,7 +5026,7 @@ fn test_s390x_binemit() {base: gpr(3),index: gpr(2),disp: UImm12::maybe_from_u64(4095).unwrap(),- flags: MemFlags::trusted(),+ flags: MemFlagsData::trusted(),},},"E3123FFF001E",@@ -5039,7 +5039,7 @@ fn test_s390x_binemit() {base: gpr(3),index: gpr(2),disp: SImm20::maybe_from_i64(-524288).unwrap(),- flags: MemFlags::trusted(),+ flags: MemFlagsData::trusted(),},},"E3123000801E",@@ -5052,7 +5052,7 @@ fn test_s390x_binemit() {base: gpr(3),index: gpr(2),disp: SImm20::maybe_from_i64(524287).unwrap(),- flags: MemFlags::trusted(),+ flags: MemFlagsData::trusted(),},},"E3123FFF7F1E",@@ -5065,7 +5065,7 @@ fn test_s390x_binemit() {base: gpr(2),index: zero_reg(),disp: UImm12::zero(),- flags: MemFlags::trusted(),+ flags: MemFlagsData::trusted(),},},"E3102000000F",@@ -5078,7 +5078,7 @@ fn test_s390x_binemit() {base: gpr(2),index: zero_reg(),disp: UImm12::maybe_from_u64(4095).unwrap(),- flags: MemFlags::trusted(),+ flags: MemFlagsData::trusted(),},},"E3102FFF000F",@@ -5091,7 +5091,7 @@ fn test_s390x_binemit() {base: gpr(2),index: zero_reg(),disp: SImm20::maybe_from_i64(-524288).unwrap(),- flags: MemFlags::trusted(),+ flags: MemFlagsData::trusted(),},},"E3102000800F",@@ -5104,7 +5104,7 @@ fn test_s390x_binemit() {base: gpr(2),index: zero_reg(),disp: SImm20::maybe_from_i64(524287).unwrap(),- flags: MemFlags::trusted(),+ flags: MemFlagsData::trusted(),},},"E3102FFF7F0F",@@ -5117,7 +5117,7 @@ fn test_s390x_binemit() {base: gpr(3),index: gpr(2),disp: UImm12::zero(),- flags: MemFlags::trusted(),+ flags: MemFlagsData::trusted(),},},"E3123000000F",@@ -5130,7 +5130,7 @@ fn test_s390x_binemit() {base: gpr(3),index: gpr(2),disp: UImm12::maybe_from_u64(4095).unwrap(),- flags: MemFlags::trusted(),+ flags: MemFlagsData::trusted(),},},"E3123FFF000F",@@ -5143,7 +5143,7 @@ fn test_s390x_binemit() {base: gpr(3),index: gpr(2),disp: SImm20::maybe_from_i64(-524288).unwrap(),- flags: MemFlags::trusted(),+ flags: MemFlagsData::trusted(),},},"E3123000800F",@@ -5156,7 +5156,7 @@ fn test_s390x_binemit() {base: gpr(3),index: gpr(2),disp: SImm20::maybe_from_i64(524287).unwrap(),- flags: MemFlags::trusted(),+ flags: MemFlagsData::trusted(),},},"E3123FFF7F0F",@@ -5170,7 +5170,7 @@ fn test_s390x_binemit() {base: gpr(2),index: zero_reg(),disp: UImm12::zero(),- flags: MemFlags::trusted(),+ flags: MemFlagsData::trusted(),},},"42102000",@@ -5183,7 +5183,7 @@ fn test_s390x_binemit() {base: gpr(2),index: zero_reg(),disp: UImm12::maybe_from_u64(4095).unwrap(),- flags: MemFlags::trusted(),+ flags: MemFlagsData::trusted(),},},"42102FFF",@@ -5196,7 +5196,7 @@ fn test_s390x_binemit() {base: gpr(2),index: zero_reg(),disp: SImm20::maybe_from_i64(-524288).unwrap(),- flags: MemFlags::trusted(),+ flags: MemFlagsData::trusted(),},},"E31020008072",@@ -5209,7 +5209,7 @@ fn test_s390x_binemit() {base: gpr(2),index: zero_reg(),disp: SImm20::maybe_from_i64(524287).unwrap(),- flags: MemFlags::trusted(),+ flags: MemFlagsData::trusted(),},},"E3102FFF7F72",@@ -5222,7 +5222,7 @@ fn test_s390x_binemit() {base: gpr(3),index: gpr(2),disp: UImm12::zero(),- flags: MemFlags::trusted(),+ flags: MemFlagsData::trusted(),},},"42123000",@@ -5235,7 +5235,7 @@ fn test_s390x_binemit() {base: gpr(3),index: gpr(2),disp: UImm12::maybe_from_u64(4095).unwrap(),- flags: MemFlags::trusted(),+ flags: MemFlagsData::trusted(),},},"42123FFF",@@ -5248,7 +5248,7 @@ fn test_s390x_binemit() {base: gpr(3),index: gpr(2),disp: SImm20::maybe_from_i64(-524288).unwrap(),- flags: MemFlags::trusted(),+ flags: MemFlagsData::trusted(),},},"E31230008072",@@ -5261,7 +5261,7 @@ fn test_s390x_binemit() {base: gpr(3),index: gpr(2),disp: SImm20::maybe_from_i64(524287).unwrap(),- flags: MemFlags::trusted(),+ flags: MemFlagsData::trusted(),},},"E3123FFF7F72",@@ -5274,7 +5274,7 @@ fn test_s390x_binemit() {base: gpr(2),index: zero_reg(),disp: UImm12::zero(),- flags: MemFlags::trusted(),+ flags: MemFlagsData::trusted(),},},"40102000",@@ -5287,7 +5287,7 @@ fn test_s390x_binemit() {base: gpr(2),index: zero_reg(),disp: UImm12::maybe_from_u64(4095).unwrap(),- flags: MemFlags::trusted(),+ flags: MemFlagsData::trusted(),},},"40102FFF",@@ -5300,7 +5300,7 @@ fn test_s390x_binemit() {base: gpr(2),index: zero_reg(),disp: SImm20::maybe_from_i64(-524288).unwrap(),- flags: MemFlags::trusted(),+ flags: MemFlagsData::trusted(),},},"E31020008070",@@ -5313,7 +5313,7 @@ fn test_s390x_binemit() {base: gpr(2),index: zero_reg(),disp: SImm20::maybe_from_i64(524287).unwrap(),- flags: MemFlags::trusted(),+ flags: MemFlagsData::trusted(),},},"E3102FFF7F70",@@ -5326,7 +5326,7 @@ fn test_s390x_binemit() {base: gpr(3),index: gpr(2),disp: UImm12::zero(),- flags: MemFlags::trusted(),+ flags: MemFlagsData::trusted(),},},"40123000",@@ -5339,7 +5339,7 @@ fn test_s390x_binemit() {base: gpr(3),index: gpr(2),disp: UImm12::maybe_from_u64(4095).unwrap(),- flags: MemFlags::trusted(),+ flags: MemFlagsData::trusted(),},},"40123FFF",@@ -5352,7 +5352,7 @@ fn test_s390x_binemit() {base: gpr(3),index: gpr(2),disp: SImm20::maybe_from_i64(-524288).unwrap(),- flags: MemFlags::trusted(),+ flags: MemFlagsData::trusted(),},},"E31230008070",@@ -5365,7 +5365,7 @@ fn test_s390x_binemit() {base: gpr(3),index: gpr(2),disp: SImm20::maybe_from_i64(524287).unwrap(),- flags: MemFlags::trusted(),+ flags: MemFlagsData::trusted(),},},"E3123FFF7F70",@@ -5378,7 +5378,7 @@ fn test_s390x_binemit() {base: gpr(2),index: zero_reg(),disp: UImm12::zero(),- flags: MemFlags::trusted(),+ flags: MemFlagsData::trusted(),},},"50102000",@@ -5391,7 +5391,7 @@ fn test_s390x_binemit() {base: gpr(2),index: zero_reg(),disp: UImm12::maybe_from_u64(4095).unwrap(),- flags: MemFlags::trusted(),+ flags: MemFlagsData::trusted(),},},"50102FFF",@@ -5404,7 +5404,7 @@ fn test_s390x_binemit() {base: gpr(2),index: zero_reg(),disp: SImm20::maybe_from_i64(-524288).unwrap(),- flags: MemFlags::trusted(),+ flags: MemFlagsData::trusted(),},},"E31020008050",@@ -5417,7 +5417,7 @@ fn test_s390x_binemit() {base: gpr(2),index: zero_reg(),disp: SImm20::maybe_from_i64(524287).unwrap(),- flags: MemFlags::trusted(),+ flags: MemFlagsData::trusted(),},},"E3102FFF7F50",@@ -5430,7 +5430,7 @@ fn test_s390x_binemit() {base: gpr(3),index: gpr(2),disp: UImm12::zero(),- flags: MemFlags::trusted(),+ flags: MemFlagsData::trusted(),},},"50123000",@@ -5443,7 +5443,7 @@ fn test_s390x_binemit() {base: gpr(3),index: gpr(2),disp: UImm12::maybe_from_u64(4095).unwrap(),- flags: MemFlags::trusted(),+ flags: MemFlagsData::trusted(),},},"50123FFF",@@ -5456,7 +5456,7 @@ fn test_s390x_binemit() {base: gpr(3),index: gpr(2),disp: SImm20::maybe_from_i64(-524288).unwrap(),- flags: MemFlags::trusted(),+ flags: MemFlagsData::trusted(),},},"E31230008050",@@ -5469,7 +5469,7 @@ fn test_s390x_binemit() {base: gpr(3),index: gpr(2),disp: SImm20::maybe_from_i64(524287).unwrap(),- flags: MemFlags::trusted(),+ flags: MemFlagsData::trusted(),},},"E3123FFF7F50",@@ -5482,7 +5482,7 @@ fn test_s390x_binemit() {base: gpr(2),index: zero_reg(),disp: UImm12::zero(),- flags: MemFlags::trusted(),+ flags: MemFlagsData::trusted(),},},"E31020000024",@@ -5495,7 +5495,7 @@ fn test_s390x_binemit() {base: gpr(2),index: zero_reg(),disp: UImm12::maybe_from_u64(4095).unwrap(),- flags: MemFlags::trusted(),+ flags: MemFlagsData::trusted(),},},"E3102FFF0024",@@ -5508,7 +5508,7 @@ fn test_s390x_binemit() {base: gpr(2),index: zero_reg(),disp: SImm20::maybe_from_i64(-524288).unwrap(),- flags: MemFlags::trusted(),+ flags: MemFlagsData::trusted(),},},"E31020008024",@@ -5521,7 +5521,7 @@ fn test_s390x_binemit() {base: gpr(2),index: zero_reg(),disp: SImm20::maybe_from_i64(524287).unwrap(),- flags: MemFlags::trusted(),+ flags: MemFlagsData::trusted(),},},"E3102FFF7F24",@@ -5534,7 +5534,7 @@ fn test_s390x_binemit() {base: gpr(3),index: gpr(2),disp: UImm12::zero(),- flags: MemFlags::trusted(),+ flags: MemFlagsData::trusted(),},},"E31230000024",@@ -5547,7 +5547,7 @@ fn test_s390x_binemit() {base: gpr(3),index: gpr(2),disp: UImm12::maybe_from_u64(4095).unwrap(),- flags: MemFlags::trusted(),+ flags: MemFlagsData::trusted(),},},"E3123FFF0024",@@ -5560,7 +5560,7 @@ fn test_s390x_binemit() {base: gpr(3),index: gpr(2),disp: SImm20::maybe_from_i64(-524288).unwrap(),- flags: MemFlags::trusted(),+ flags: MemFlagsData::trusted(),},},"E31230008024",@@ -5573,7 +5573,7 @@ fn test_s390x_binemit() {base: gpr(3),index: gpr(2),disp: SImm20::maybe_from_i64(524287).unwrap(),- flags: MemFlags::trusted(),+ flags: MemFlagsData::trusted(),},},"E3123FFF7F24",@@ -5587,7 +5587,7 @@ fn test_s390x_binemit() {base: gpr(2),index: zero_reg(),disp: UImm12::zero(),- flags: MemFlags::trusted(),+ flags: MemFlagsData::trusted(),},},"92FF2000",@@ -5600,7 +5600,7 @@ fn test_s390x_binemit() {base: gpr(2),index: zero_reg(),disp: UImm12::maybe_from_u64(4095).unwrap(),- flags: MemFlags::trusted(),+ flags: MemFlagsData::trusted(),},},"92002FFF",@@ -5613,7 +5613,7 @@ fn test_s390x_binemit() {base: gpr(2),index: zero_reg(),disp: SImm20::maybe_from_i64(-524288).unwrap(),- flags: MemFlags::trusted(),+ flags: MemFlagsData::trusted(),},},"EBFF20008052",@@ -5626,7 +5626,7 @@ fn test_s390x_binemit() {base: gpr(2),index: zero_reg(),disp: SImm20::maybe_from_i64(524287).unwrap(),- flags: MemFlags::trusted(),+ flags: MemFlagsData::trusted(),},},"EB002FFF7F52",@@ -5639,7 +5639,7 @@ fn test_s390x_binemit() {base: gpr(2),index: zero_reg(),disp: UImm12::zero(),- flags: MemFlags::trusted(),+ flags: MemFlagsData::trusted(),},},"E54420008000",@@ -5652,7 +5652,7 @@ fn test_s390x_binemit() {base: gpr(2),index: zero_reg(),disp: UImm12::maybe_from_u64(4095).unwrap(),- flags: MemFlags::trusted(),+ flags: MemFlagsData::trusted(),},},"E5442FFF7FFF",@@ -5665,7 +5665,7 @@ fn test_s390x_binemit() {base: gpr(2),index: zero_reg(),disp: UImm12::zero(),- flags: MemFlags::trusted(),+ flags: MemFlagsData::trusted(),},},"E54C20008000",@@ -5678,7 +5678,7 @@ fn test_s390x_binemit() {base: gpr(2),index: zero_reg(),disp: UImm12::maybe_from_u64(4095).unwrap(),- flags: MemFlags::trusted(),+ flags: MemFlagsData::trusted(),},},"E54C2FFF7FFF",@@ -5691,7 +5691,7 @@ fn test_s390x_binemit() {base: gpr(2),index: zero_reg(),disp: UImm12::zero(),- flags: MemFlags::trusted(),+ flags: MemFlagsData::trusted(),},},"E54820008000",@@ -5704,7 +5704,7 @@ fn test_s390x_binemit() {base: gpr(2),index: zero_reg(),disp: UImm12::maybe_from_u64(4095).unwrap(),- flags: MemFlags::trusted(),+ flags: MemFlagsData::trusted(),},},"E5482FFF7FFF",@@ -5718,7 +5718,7 @@ fn test_s390x_binemit() {base: gpr(2),index: zero_reg(),disp: UImm12::zero(),- flags: MemFlags::trusted(),+ flags: MemFlagsData::trusted(),},},"E3102000003F",@@ -5731,7 +5731,7 @@ fn test_s390x_binemit() {base: gpr(2),index: zero_reg(),disp: UImm12::maybe_from_u64(4095).unwrap(),- flags: MemFlags::trusted(),+ flags: MemFlagsData::trusted(),},},"E3102FFF003F",@@ -5744,7 +5744,7 @@ fn test_s390x_binemit() {base: gpr(2),index: zero_reg(),disp: SImm20::maybe_from_i64(-524288).unwrap(),- flags: MemFlags::trusted(),+ flags: MemFlagsData::trusted(),},},"E3102000803F",@@ -5757,7 +5757,7 @@ fn test_s390x_binemit() {base: gpr(2),index: zero_reg(),disp: SImm20::maybe_from_i64(524287).unwrap(),- flags: MemFlags::trusted(),+ flags: MemFlagsData::trusted(),},},"E3102FFF7F3F",@@ -5770,7 +5770,7 @@ fn test_s390x_binemit() {base: gpr(3),index: gpr(2),disp: UImm12::zero(),- flags: MemFlags::trusted(),+ flags: MemFlagsData::trusted(),},},"E3123000003F",@@ -5783,7 +5783,7 @@ fn test_s390x_binemit() {base: gpr(3),index: gpr(2),disp: UImm12::maybe_from_u64(4095).unwrap(),- flags: MemFlags::trusted(),+ flags: MemFlagsData::trusted(),},},"E3123FFF003F",@@ -5796,7 +5796,7 @@ fn test_s390x_binemit() {base: gpr(3),index: gpr(2),disp: SImm20::maybe_from_i64(-524288).unwrap(),- flags: MemFlags::trusted(),+ flags: MemFlagsData::trusted(),},},"E3123000803F",@@ -5809,7 +5809,7 @@ fn test_s390x_binemit() {base: gpr(3),index: gpr(2),disp: SImm20::maybe_from_i64(524287).unwrap(),- flags: MemFlags::trusted(),+ flags: MemFlagsData::trusted(),},},"E3123FFF7F3F",@@ -5822,7 +5822,7 @@ fn test_s390x_binemit() {base: gpr(2),index: zero_reg(),disp: UImm12::zero(),- flags: MemFlags::trusted(),+ flags: MemFlagsData::trusted(),},},"E3102000003E",@@ -5835,7 +5835,7 @@ fn test_s390x_binemit() {base: gpr(2),index: zero_reg(),disp: UImm12::maybe_from_u64(4095).unwrap(),- flags: MemFlags::trusted(),+ flags: MemFlagsData::trusted(),},},"E3102FFF003E",@@ -5848,7 +5848,7 @@ fn test_s390x_binemit() {base: gpr(2),index: zero_reg(),disp: SImm20::maybe_from_i64(-524288).unwrap(),- flags: MemFlags::trusted(),+ flags: MemFlagsData::trusted(),},},"E3102000803E",@@ -5861,7 +5861,7 @@ fn test_s390x_binemit() {base: gpr(2),index: zero_reg(),disp: SImm20::maybe_from_i64(524287).unwrap(),- flags: MemFlags::trusted(),+ flags: MemFlagsData::trusted(),},},"E3102FFF7F3E",@@ -5874,7 +5874,7 @@ fn test_s390x_binemit() {base: gpr(3),index: gpr(2),disp: UImm12::zero(),- flags: MemFlags::trusted(),+ flags: MemFlagsData::trusted(),},},"E3123000003E",@@ -5887,7 +5887,7 @@ fn test_s390x_binemit() {base: gpr(3),index: gpr(2),disp: UImm12::maybe_from_u64(4095).unwrap(),- flags: MemFlags::trusted(),+ flags: MemFlagsData::trusted(),},},"E3123FFF003E",@@ -5900,7 +5900,7 @@ fn test_s390x_binemit() {base: gpr(3),index: gpr(2),disp: SImm20::maybe_from_i64(-524288).unwrap(),- flags: MemFlags::trusted(),+ flags: MemFlagsData::trusted(),},},"E3123000803E",@@ -5913,7 +5913,7 @@ fn test_s390x_binemit() {base: gpr(3),index: gpr(2),disp: SImm20::maybe_from_i64(524287).unwrap(),- flags: MemFlags::trusted(),+ flags: MemFlagsData::trusted(),},},"E3123FFF7F3E",@@ -5926,7 +5926,7 @@ fn test_s390x_binemit() {base: gpr(2),index: zero_reg(),disp: UImm12::zero(),- flags: MemFlags::trusted(),+ flags: MemFlagsData::trusted(),},},"E3102000002F",@@ -5939,7 +5939,7 @@ fn test_s390x_binemit() {base: gpr(2),index: zero_reg(),disp: UImm12::maybe_from_u64(4095).unwrap(),- flags: MemFlags::trusted(),+ flags: MemFlagsData::trusted(),},},"E3102FFF002F",@@ -5952,7 +5952,7 @@ fn test_s390x_binemit() {base: gpr(2),index: zero_reg(),disp: SImm20::maybe_from_i64(-524288).unwrap(),- flags: MemFlags::trusted(),+ flags: MemFlagsData::trusted(),},},"E3102000802F",@@ -5965,7 +5965,7 @@ fn test_s390x_binemit() {base: gpr(2),index: zero_reg(),disp: SImm20::maybe_from_i64(524287).unwrap(),- flags: MemFlags::trusted(),+ flags: MemFlagsData::trusted(),},},"E3102FFF7F2F",@@ -5978,7 +5978,7 @@ fn test_s390x_binemit() {base: gpr(3),index: gpr(2),disp: UImm12::zero(),- flags: MemFlags::trusted(),+ flags: MemFlagsData::trusted(),},},"E3123000002F",@@ -5991,7 +5991,7 @@ fn test_s390x_binemit() {base: gpr(3),index: gpr(2),disp: UImm12::maybe_from_u64(4095).unwrap(),- flags: MemFlags::trusted(),+ flags: MemFlagsData::trusted(),},},"E3123FFF002F",@@ -6004,7 +6004,7 @@ fn test_s390x_binemit() {base: gpr(3),index: gpr(2),disp: SImm20::maybe_from_i64(-524288).unwrap(),- flags: MemFlags::trusted(),+ flags: MemFlagsData::trusted(),},},"E3123000802F",@@ -6017,7 +6017,7 @@ fn test_s390x_binemit() {base: gpr(3),index: gpr(2),disp: SImm20::maybe_from_i64(524287).unwrap(),- flags: MemFlags::trusted(),+ flags: MemFlagsData::trusted(),},},"E3123FFF7F2F",@@ -6063,7 +6063,7 @@ fn test_s390x_binemit() {base: gpr(15),index: zero_reg(),disp: SImm20::maybe_from_i64(-524288).unwrap(),- flags: MemFlags::trusted(),+ flags: MemFlagsData::trusted(),},},"EB8CF0008004",@@ -6077,7 +6077,7 @@ fn test_s390x_binemit() {base: gpr(15),index: zero_reg(),disp: SImm20::maybe_from_i64(524287).unwrap(),- flags: MemFlags::trusted(),+ flags: MemFlagsData::trusted(),},},"EB8CFFFF7F04",@@ -6092,7 +6092,7 @@ fn test_s390x_binemit() {base: gpr(15),index: zero_reg(),disp: SImm20::maybe_from_i64(-524288).unwrap(),- flags: MemFlags::trusted(),+ flags: MemFlagsData::trusted(),},},"EB8CF0008024",@@ -6106,7 +6106,7 @@ fn test_s390x_binemit() {base: gpr(15),index: zero_reg(),disp: SImm20::maybe_from_i64(524287).unwrap(),- flags: MemFlags::trusted(),+ flags: MemFlagsData::trusted(),},},"EB8CFFFF7F24",@@ -6120,7 +6120,7 @@ fn test_s390x_binemit() {base: zero_reg(),index: zero_reg(),disp: UImm12::zero(),- flags: MemFlags::trusted(),+ flags: MemFlagsData::trusted(),},},"41100000",@@ -6133,7 +6133,7 @@ fn test_s390x_binemit() {base: zero_reg(),index: zero_reg(),disp: UImm12::maybe_from_u64(4095).unwrap(),- flags: MemFlags::trusted(),+ flags: MemFlagsData::trusted(),},},"41100FFF",@@ -6146,7 +6146,7 @@ fn test_s390x_binemit() {base: zero_reg(),index: zero_reg(),disp: SImm20::maybe_from_i64(-524288).unwrap(),- flags: MemFlags::trusted(),+ flags: MemFlagsData::trusted(),},},"E31000008071",@@ -6159,7 +6159,7 @@ fn test_s390x_binemit() {base: zero_reg(),index: zero_reg(),disp: SImm20::maybe_from_i64(524287).unwrap(),- flags: MemFlags::trusted(),+ flags: MemFlagsData::trusted(),},},"E3100FFF7F71",@@ -6172,7 +6172,7 @@ fn test_s390x_binemit() {base: gpr(2),index: zero_reg(),disp: UImm12::zero(),- flags: MemFlags::trusted(),+ flags: MemFlagsData::trusted(),},},"41102000",@@ -6185,7 +6185,7 @@ fn test_s390x_binemit() {base: gpr(2),index: zero_reg(),disp: UImm12::maybe_from_u64(4095).unwrap(),- flags: MemFlags::trusted(),+ flags: MemFlagsData::trusted(),},},"41102FFF",@@ -6198,7 +6198,7 @@ fn test_s390x_binemit() {base: gpr(2),index: zero_reg(),disp: SImm20::maybe_from_i64(-524288).unwrap(),- flags: MemFlags::trusted(),+ flags: MemFlagsData::trusted(),},},"E31020008071",@@ -6211,7 +6211,7 @@ fn test_s390x_binemit() {base: gpr(2),index: zero_reg(),disp: SImm20::maybe_from_i64(524287).unwrap(),- flags: MemFlags::trusted(),+ flags: MemFlagsData::trusted(),},},"E3102FFF7F71",@@ -6224,7 +6224,7 @@ fn test_s390x_binemit() {base: gpr(3),index: gpr(2),disp: UImm12::zero(),- flags: MemFlags::trusted(),+ flags: MemFlagsData::trusted(),},},"41123000",@@ -6237,7 +6237,7 @@ fn test_s390x_binemit() {base: gpr(3),index: gpr(2),disp: UImm12::maybe_from_u64(4095).unwrap(),- flags: MemFlags::trusted(),+ flags: MemFlagsData::trusted(),},},"41123FFF",@@ -6250,7 +6250,7 @@ fn test_s390x_binemit() {base: gpr(3),index: gpr(2),disp: SImm20::maybe_from_i64(-524288).unwrap(),- flags: MemFlags::trusted(),+ flags: MemFlagsData::trusted(),},},"E31230008071",@@ -6263,7 +6263,7 @@ fn test_s390x_binemit() {base: gpr(3),index: gpr(2),disp: SImm20::maybe_from_i64(524287).unwrap(),- flags: MemFlags::trusted(),+ flags: MemFlagsData::trusted(),},},"E3123FFF7F71",@@ -6285,7 +6285,7 @@ fn test_s390x_binemit() {mem: MemArg::Symbol {name: Box::new(ExternalName::testcase("test0")),offset: 64,- flags: MemFlags::trusted(),+ flags: MemFlagsData::trusted(),},},"C01000000000",@@ -6298,7 +6298,7 @@ fn test_s390x_binemit() {mem: MemArg::RegOffset {reg: gpr(2),off: 0,- flags: MemFlags::trusted(),+ flags: MemFlagsData::trusted(),},},"41102000",@@ -6310,7 +6310,7 @@ fn test_s390x_binemit() {mem: MemArg::RegOffset {reg: gpr(2),off: 4095,- flags: MemFlags::trusted(),+ flags: MemFlagsData::trusted(),},},"41102FFF",@@ -6322,7 +6322,7 @@ fn test_s390x_binemit() {mem: MemArg::RegOffset {reg: gpr(2),off: -524288,- flags: MemFlags::trusted(),+ flags: MemFlagsData::trusted(),},},"E31020008071",@@ -6334,7 +6334,7 @@ fn test_s390x_binemit() {mem: MemArg::RegOffset {reg: gpr(2),off: 524287,- flags: MemFlags::trusted(),+ flags: MemFlagsData::trusted(),},},"E3102FFF7F71",@@ -6346,7 +6346,7 @@ fn test_s390x_binemit() {mem: MemArg::RegOffset {reg: gpr(2),off: -2147483648,- flags: MemFlags::trusted(),+ flags: MemFlagsData::trusted(),},},"C0118000000041112000",@@ -6358,7 +6358,7 @@ fn test_s390x_binemit() {mem: MemArg::RegOffset {reg: gpr(2),off: 2147483647,- flags: MemFlags::trusted(),+ flags: MemFlagsData::trusted(),},},"C0117FFFFFFF41112000",@@ -6932,7 +6932,7 @@ fn test_s390x_binemit() {base: gpr(6),index: zero_reg(),disp: UImm12::maybe_from_u64(0).unwrap(),- flags: MemFlags::trusted(),+ flags: MemFlagsData::trusted(),},},],@@ -10750,7 +10750,7 @@ fn test_s390x_binemit() {base: gpr(2),index: zero_reg(),disp: UImm12::zero(),- flags: MemFlags::trusted(),+ flags: MemFlagsData::trusted(),},},"E71020000806",@@ -10763,7 +10763,7 @@ fn test_s390x_binemit() {base: gpr(2),index: zero_reg(),disp: UImm12::maybe_from_u64(4095).unwrap(),- flags: MemFlags::trusted(),+ flags: MemFlagsData::trusted(),},},"E7102FFF0806",@@ -10776,7 +10776,7 @@ fn test_s390x_binemit() {base: gpr(3),index: gpr(2),disp: UImm12::zero(),- flags: MemFlags::trusted(),+ flags: MemFlagsData::trusted(),},},"E71230000806",@@ -10789,7 +10789,7 @@ fn test_s390x_binemit() {base: gpr(2),index: zero_reg(),disp: UImm12::zero(),- flags: MemFlags::trusted(),+ flags: MemFlagsData::trusted(),},},"E61020004806",@@ -10802,7 +10802,7 @@ fn test_s390x_binemit() {base: gpr(2),index: zero_reg(),disp: UImm12::maybe_from_u64(4095).unwrap(),- flags: MemFlags::trusted(),+ flags: MemFlagsData::trusted(),},},"E6102FFF4806",@@ -10815,7 +10815,7 @@ fn test_s390x_binemit() {base: gpr(3),index: gpr(2),disp: UImm12::zero(),- flags: MemFlags::trusted(),+ flags: MemFlagsData::trusted(),},},"E61230004806",@@ -10828,7 +10828,7 @@ fn test_s390x_binemit() {base: gpr(2),index: zero_reg(),disp: UImm12::zero(),- flags: MemFlags::trusted(),+ flags: MemFlagsData::trusted(),},},"E61020001806",@@ -10841,7 +10841,7 @@ fn test_s390x_binemit() {base: gpr(2),index: zero_reg(),disp: UImm12::maybe_from_u64(4095).unwrap(),- flags: MemFlags::trusted(),+ flags: MemFlagsData::trusted(),},},"E6102FFF1806",@@ -10854,7 +10854,7 @@ fn test_s390x_binemit() {base: gpr(3),index: gpr(2),disp: UImm12::zero(),- flags: MemFlags::trusted(),+ flags: MemFlagsData::trusted(),},},"E61230001806",@@ -10867,7 +10867,7 @@ fn test_s390x_binemit() {base: gpr(2),index: zero_reg(),disp: UImm12::zero(),- flags: MemFlags::trusted(),+ flags: MemFlagsData::trusted(),},},"E61020002806",@@ -10880,7 +10880,7 @@ fn test_s390x_binemit() {base: gpr(2),index: zero_reg(),disp: UImm12::maybe_from_u64(4095).unwrap(),- flags: MemFlags::trusted(),+ flags: MemFlagsData::trusted(),},},"E6102FFF2806",@@ -10893,7 +10893,7 @@ fn test_s390x_binemit() {base: gpr(3),index: gpr(2),disp: UImm12::zero(),- flags: MemFlags::trusted(),+ flags: MemFlagsData::trusted(),},},"E61230002806",@@ -10906,7 +10906,7 @@ fn test_s390x_binemit() {base: gpr(2),index: zero_reg(),disp: UImm12::zero(),- flags: MemFlags::trusted(),+ flags: MemFlagsData::trusted(),},},"E61020003806",@@ -10919,7 +10919,7 @@ fn test_s390x_binemit() {base: gpr(2),index: zero_reg(),disp: UImm12::maybe_from_u64(4095).unwrap(),- flags: MemFlags::trusted(),+ flags: MemFlagsData::trusted(),},},"E6102FFF3806",@@ -10932,7 +10932,7 @@ fn test_s390x_binemit() {base: gpr(3),index: gpr(2),disp: UImm12::zero(),- flags: MemFlags::trusted(),+ flags: MemFlagsData::trusted(),},},"E61230003806",@@ -10945,7 +10945,7 @@ fn test_s390x_binemit() {base: gpr(2),index: zero_reg(),disp: UImm12::zero(),- flags: MemFlags::trusted(),+ flags: MemFlagsData::trusted(),},},"E61020001807",@@ -10958,7 +10958,7 @@ fn test_s390x_binemit() {base: gpr(2),index: zero_reg(),disp: UImm12::maybe_from_u64(4095).unwrap(),- flags: MemFlags::trusted(),+ flags: MemFlagsData::trusted(),},},"E6102FFF1807",@@ -10971,7 +10971,7 @@ fn test_s390x_binemit() {base: gpr(3),index: gpr(2),disp: UImm12::zero(),- flags: MemFlags::trusted(),+ flags: MemFlagsData::trusted(),},},"E61230001807",@@ -10984,7 +10984,7 @@ fn test_s390x_binemit() {base: gpr(2),index: zero_reg(),disp: UImm12::zero(),- flags: MemFlags::trusted(),+ flags: MemFlagsData::trusted(),},},"E61020002807",@@ -10997,7 +10997,7 @@ fn test_s390x_binemit() {base: gpr(2),index: zero_reg(),disp: UImm12::maybe_from_u64(4095).unwrap(),- flags: MemFlags::trusted(),+ flags: MemFlagsData::trusted(),},},"E6102FFF2807",@@ -11010,7 +11010,7 @@ fn test_s390x_binemit() {base: gpr(3),index: gpr(2),disp: UImm12::zero(),- flags: MemFlags::trusted(),+ flags: MemFlagsData::trusted(),},},"E61230002807",@@ -11023,7 +11023,7 @@ fn test_s390x_binemit() {base: gpr(2),index: zero_reg(),disp: UImm12::zero(),- flags: MemFlags::trusted(),+ flags: MemFlagsData::trusted(),},},"E61020003807",@@ -11036,7 +11036,7 @@ fn test_s390x_binemit() {base: gpr(2),index: zero_reg(),disp: UImm12::maybe_from_u64(4095).unwrap(),- flags: MemFlags::trusted(),+ flags: MemFlagsData::trusted(),},},"E6102FFF3807",@@ -11049,7 +11049,7 @@ fn test_s390x_binemit() {base: gpr(3),index: gpr(2),disp: UImm12::zero(),- flags: MemFlags::trusted(),+ flags: MemFlagsData::trusted(),},},"E61230003807",@@ -11062,7 +11062,7 @@ fn test_s390x_binemit() {base: gpr(2),index: zero_reg(),disp: UImm12::zero(),- flags: MemFlags::trusted(),+ flags: MemFlagsData::trusted(),},},"E7102000080E",@@ -11075,7 +11075,7 @@ fn test_s390x_binemit() {base: gpr(2),index: zero_reg(),disp: UImm12::maybe_from_u64(4095).unwrap(),- flags: MemFlags::trusted(),+ flags: MemFlagsData::trusted(),},},"E7102FFF080E",@@ -11088,7 +11088,7 @@ fn test_s390x_binemit() {base: gpr(3),index: gpr(2),disp: UImm12::zero(),- flags: MemFlags::trusted(),+ flags: MemFlagsData::trusted(),},},"E7123000080E",@@ -11101,7 +11101,7 @@ fn test_s390x_binemit() {base: gpr(2),index: zero_reg(),disp: UImm12::zero(),- flags: MemFlags::trusted(),+ flags: MemFlagsData::trusted(),},},"E6102000480E",@@ -11114,7 +11114,7 @@ fn test_s390x_binemit() {base: gpr(2),index: zero_reg(),disp: UImm12::maybe_from_u64(4095).unwrap(),- flags: MemFlags::trusted(),+ flags: MemFlagsData::trusted(),},},"E6102FFF480E",@@ -11127,7 +11127,7 @@ fn test_s390x_binemit() {base: gpr(3),index: gpr(2),disp: UImm12::zero(),- flags: MemFlags::trusted(),+ flags: MemFlagsData::trusted(),},},"E6123000480E",@@ -11140,7 +11140,7 @@ fn test_s390x_binemit() {base: gpr(2),index: zero_reg(),disp: UImm12::zero(),- flags: MemFlags::trusted(),+ flags: MemFlagsData::trusted(),},},"E6102000180E",@@ -11153,7 +11153,7 @@ fn test_s390x_binemit() {base: gpr(2),index: zero_reg(),disp: UImm12::maybe_from_u64(4095).unwrap(),- flags: MemFlags::trusted(),+ flags: MemFlagsData::trusted(),},},"E6102FFF180E",@@ -11166,7 +11166,7 @@ fn test_s390x_binemit() {base: gpr(3),index: gpr(2),disp: UImm12::zero(),- flags: MemFlags::trusted(),+ flags: MemFlagsData::trusted(),},},"E6123000180E",@@ -11179,7 +11179,7 @@ fn test_s390x_binemit() {base: gpr(2),index: zero_reg(),disp: UImm12::zero(),- flags: MemFlags::trusted(),+ flags: MemFlagsData::trusted(),},},"E6102000280E",@@ -11192,7 +11192,7 @@ fn test_s390x_binemit() {base: gpr(2),index: zero_reg(),disp: UImm12::maybe_from_u64(4095).unwrap(),- flags: MemFlags::trusted(),+ flags: MemFlagsData::trusted(),},},"E6102FFF280E",@@ -11205,7 +11205,7 @@ fn test_s390x_binemit() {base: gpr(3),index: gpr(2),disp: UImm12::zero(),- flags: MemFlags::trusted(),+ flags: MemFlagsData::trusted(),},},"E6123000280E",@@ -11218,7 +11218,7 @@ fn test_s390x_binemit() {base: gpr(2),index: zero_reg(),disp: UImm12::zero(),- flags: MemFlags::trusted(),+ flags: MemFlagsData::trusted(),},},"E6102000380E",@@ -11231,7 +11231,7 @@ fn test_s390x_binemit() {base: gpr(2),index: zero_reg(),disp: UImm12::maybe_from_u64(4095).unwrap(),- flags: MemFlags::trusted(),+ flags: MemFlagsData::trusted(),},},"E6102FFF380E",@@ -11244,7 +11244,7 @@ fn test_s390x_binemit() {base: gpr(3),index: gpr(2),disp: UImm12::zero(),- flags: MemFlags::trusted(),+ flags: MemFlagsData::trusted(),},},"E6123000380E",@@ -11257,7 +11257,7 @@ fn test_s390x_binemit() {base: gpr(2),index: zero_reg(),disp: UImm12::zero(),- flags: MemFlags::trusted(),+ flags: MemFlagsData::trusted(),},},"E6102000180F",@@ -11270,7 +11270,7 @@ fn test_s390x_binemit() {base: gpr(2),index: zero_reg(),disp: UImm12::maybe_from_u64(4095).unwrap(),- flags: MemFlags::trusted(),+ flags: MemFlagsData::trusted(),},},"E6102FFF180F",@@ -11283,7 +11283,7 @@ fn test_s390x_binemit() {base: gpr(3),index: gpr(2),disp: UImm12::zero(),- flags: MemFlags::trusted(),+ flags: MemFlagsData::trusted(),},},"E6123000180F",@@ -11296,7 +11296,7 @@ fn test_s390x_binemit() {base: gpr(2),index: zero_reg(),disp: UImm12::zero(),- flags: MemFlags::trusted(),+ flags: MemFlagsData::trusted(),},},"E6102000280F",@@ -11309,7 +11309,7 @@ fn test_s390x_binemit() {base: gpr(2),index: zero_reg(),disp: UImm12::maybe_from_u64(4095).unwrap(),- flags: MemFlags::trusted(),+ flags: MemFlagsData::trusted(),},},"E6102FFF280F",@@ -11322,7 +11322,7 @@ fn test_s390x_binemit() {base: gpr(3),index: gpr(2),disp: UImm12::zero(),- flags: MemFlags::trusted(),+ flags: MemFlagsData::trusted(),},},"E6123000280F",@@ -11335,7 +11335,7 @@ fn test_s390x_binemit() {base: gpr(2),index: zero_reg(),disp: UImm12::zero(),- flags: MemFlags::trusted(),+ flags: MemFlagsData::trusted(),},},"E6102000380F",@@ -11348,7 +11348,7 @@ fn test_s390x_binemit() {base: gpr(2),index: zero_reg(),disp: UImm12::maybe_from_u64(4095).unwrap(),- flags: MemFlags::trusted(),+ flags: MemFlagsData::trusted(),},},"E6102FFF380F",@@ -11361,7 +11361,7 @@ fn test_s390x_binemit() {base: gpr(3),index: gpr(2),disp: UImm12::zero(),- flags: MemFlags::trusted(),+ flags: MemFlagsData::trusted(),},},"E6123000380F",@@ -11375,7 +11375,7 @@ fn test_s390x_binemit() {base: gpr(2),index: zero_reg(),disp: UImm12::maybe_from_u64(128).unwrap(),- flags: MemFlags::trusted(),+ flags: MemFlagsData::trusted(),},},"E71020800805",@@ -11389,7 +11389,7 @@ fn test_s390x_binemit() {base: gpr(2),index: zero_reg(),disp: UImm12::maybe_from_u64(128).unwrap(),- flags: MemFlags::trusted(),+ flags: MemFlagsData::trusted(),},},"E71020801805",@@ -11403,7 +11403,7 @@ fn test_s390x_binemit() {base: gpr(2),index: zero_reg(),disp: UImm12::maybe_from_u64(128).unwrap(),- flags: MemFlags::trusted(),+ flags: MemFlagsData::trusted(),},},"E71020802805",@@ -11417,7 +11417,7 @@ fn test_s390x_binemit() {base: gpr(2),index: zero_reg(),disp: UImm12::maybe_from_u64(128).unwrap(),- flags: MemFlags::trusted(),+ flags: MemFlagsData::trusted(),},},"E71020803805",@@ -11431,7 +11431,7 @@ fn test_s390x_binemit() {base: gpr(2),index: zero_reg(),disp: UImm12::maybe_from_u64(128).unwrap(),- flags: MemFlags::trusted(),+ flags: MemFlagsData::trusted(),},},"E61020801805",@@ -11445,7 +11445,7 @@ fn test_s390x_binemit() {base: gpr(2),index: zero_reg(),disp: UImm12::maybe_from_u64(128).unwrap(),- flags: MemFlags::trusted(),+ flags: MemFlagsData::trusted(),},},"E61020802805",@@ -11459,7 +11459,7 @@ fn test_s390x_binemit() {base: gpr(2),index: zero_reg(),disp: UImm12::maybe_from_u64(128).unwrap(),- flags: MemFlags::trusted(),+ flags: MemFlagsData::trusted(),},},"E61020803805",@@ -11588,7 +11588,7 @@ fn test_s390x_binemit() {base: gpr(2),index: zero_reg(),disp: UImm12::zero(),- flags: MemFlags::trusted(),+ flags: MemFlagsData::trusted(),},lane_imm: 15,},@@ -11604,7 +11604,7 @@ fn test_s390x_binemit() {base: gpr(2),index: zero_reg(),disp: UImm12::maybe_from_u64(4095).unwrap(),- flags: MemFlags::trusted(),+ flags: MemFlagsData::trusted(),},lane_imm: 0,},@@ -11620,7 +11620,7 @@ fn test_s390x_binemit() {base: gpr(3),index: gpr(2),disp: UImm12::zero(),- flags: MemFlags::trusted(),+ flags: MemFlagsData::trusted(),},lane_imm: 15,},@@ -11636,7 +11636,7 @@ fn test_s390x_binemit() {base: gpr(3),index: gpr(2),disp: UImm12::maybe_from_u64(4095).unwrap(),- flags: MemFlags::trusted(),+ flags: MemFlagsData::trusted(),},lane_imm: 0,},@@ -11652,7 +11652,7 @@ fn test_s390x_binemit() {base: gpr(2),index: zero_reg(),disp: UImm12::zero(),- flags: MemFlags::trusted(),+ flags: MemFlagsData::trusted(),},lane_imm: 7,},@@ -11668,7 +11668,7 @@ fn test_s390x_binemit() {base: gpr(2),index: zero_reg(),disp: UImm12::maybe_from_u64(4095).unwrap(),- flags: MemFlags::trusted(),+ flags: MemFlagsData::trusted(),},lane_imm: 0,},@@ -11684,7 +11684,7 @@ fn test_s390x_binemit() {base: gpr(3),index: gpr(2),disp: UImm12::zero(),- flags: MemFlags::trusted(),+ flags: MemFlagsData::trusted(),},lane_imm: 7,},@@ -11700,7 +11700,7 @@ fn test_s390x_binemit() {base: gpr(3),index: gpr(2),disp: UImm12::maybe_from_u64(4095).unwrap(),- flags: MemFlags::trusted(),+ flags: MemFlagsData::trusted(),},lane_imm: 0,},@@ -11716,7 +11716,7 @@ fn test_s390x_binemit() {base: gpr(2),index: zero_reg(),disp: UImm12::zero(),- flags: MemFlags::trusted(),+ flags: MemFlagsData::trusted(),},lane_imm: 3,},@@ -11732,7 +11732,7 @@ fn test_s390x_binemit() {base: gpr(2),index: zero_reg(),disp: UImm12::maybe_from_u64(4095).unwrap(),- flags: MemFlags::trusted(),+ flags: MemFlagsData::trusted(),},lane_imm: 0,},@@ -11748,7 +11748,7 @@ fn test_s390x_binemit() {base: gpr(3),index: gpr(2),disp: UImm12::zero(),- flags: MemFlags::trusted(),+ flags: MemFlagsData::trusted(),},lane_imm: 3,},@@ -11764,7 +11764,7 @@ fn test_s390x_binemit() {base: gpr(3),index: gpr(2),disp: UImm12::maybe_from_u64(4095).unwrap(),- flags: MemFlags::trusted(),+ flags: MemFlagsData::trusted(),},lane_imm: 0,},@@ -11780,7 +11780,7 @@ fn test_s390x_binemit() {base: gpr(2),index: zero_reg(),disp: UImm12::zero(),- flags: MemFlags::trusted(),+ flags: MemFlagsData::trusted(),},lane_imm: 1,},@@ -11796,7 +11796,7 @@ fn test_s390x_binemit() {base: gpr(2),index: zero_reg(),disp: UImm12::maybe_from_u64(4095).unwrap(),- flags: MemFlags::trusted(),+ flags: MemFlagsData::trusted(),},lane_imm: 0,},@@ -11812,7 +11812,7 @@ fn test_s390x_binemit() {base: gpr(3),index: gpr(2),disp: UImm12::zero(),- flags: MemFlags::trusted(),+ flags: MemFlagsData::trusted(),},lane_imm: 1,},@@ -11828,7 +11828,7 @@ fn test_s390x_binemit() {base: gpr(3),index: gpr(2),disp: UImm12::maybe_from_u64(4095).unwrap(),- flags: MemFlags::trusted(),+ flags: MemFlagsData::trusted(),},lane_imm: 0,},@@ -11843,7 +11843,7 @@ fn test_s390x_binemit() {base: gpr(2),index: zero_reg(),disp: UImm12::zero(),- flags: MemFlags::trusted(),+ flags: MemFlagsData::trusted(),},lane_imm: 0,},@@ -11858,7 +11858,7 @@ fn test_s390x_binemit() {base: gpr(2),index: zero_reg(),disp: UImm12::maybe_from_u64(4095).unwrap(),- flags: MemFlags::trusted(),+ flags: MemFlagsData::trusted(),},lane_imm: 0,},@@ -11873,7 +11873,7 @@ fn test_s390x_binemit() {base: gpr(2),index: zero_reg(),disp: SImm20::maybe_from_i64(-524288).unwrap(),- flags: MemFlags::trusted(),+ flags: MemFlagsData::trusted(),},lane_imm: 0,},@@ -11888,7 +11888,7 @@ fn test_s390x_binemit() {base: gpr(2),index: zero_reg(),disp: SImm20::maybe_from_i64(524287).unwrap(),- flags: MemFlags::trusted(),+ flags: MemFlagsData::trusted(),},lane_imm: 0,},@@ -11903,7 +11903,7 @@ fn test_s390x_binemit() {base: gpr(2),index: zero_reg(),disp: UImm12::zero(),- flags: MemFlags::trusted(),+ flags: MemFlagsData::trusted(),},lane_imm: 0,},@@ -11918,7 +11918,7 @@ fn test_s390x_binemit() {base: gpr(2),index: zero_reg(),disp: UImm12::maybe_from_u64(4095).unwrap(),- flags: MemFlags::trusted(),+ flags: MemFlagsData::trusted(),},lane_imm: 0,},@@ -11933,7 +11933,7 @@ fn test_s390x_binemit() {base: gpr(3),index: gpr(2),disp: UImm12::zero(),- flags: MemFlags::trusted(),+ flags: MemFlagsData::trusted(),},lane_imm: 0,},@@ -11948,7 +11948,7 @@ fn test_s390x_binemit() {base: gpr(3),index: gpr(2),disp: UImm12::maybe_from_u64(4095).unwrap(),- flags: MemFlags::trusted(),+ flags: MemFlagsData::trusted(),},lane_imm: 0,},@@ -11963,7 +11963,7 @@ fn test_s390x_binemit() {base: gpr(3),index: gpr(2),disp: SImm20::maybe_from_i64(-524288).unwrap(),- flags: MemFlags::trusted(),+ flags: MemFlagsData::trusted(),},lane_imm: 0,},@@ -11978,7 +11978,7 @@ fn test_s390x_binemit() {base: gpr(3),index: gpr(2),disp: SImm20::maybe_from_i64(524287).unwrap(),- flags: MemFlags::trusted(),+ flags: MemFlagsData::trusted(),},lane_imm: 0,},@@ -11993,7 +11993,7 @@ fn test_s390x_binemit() {base: gpr(3),index: gpr(2),disp: UImm12::zero(),- flags: MemFlags::trusted(),+ flags: MemFlagsData::trusted(),},lane_imm: 0,},@@ -12008,7 +12008,7 @@ fn test_s390x_binemit() {base: gpr(3),index: gpr(2),disp: UImm12::maybe_from_u64(4095).unwrap(),- flags: MemFlags::trusted(),+ flags: MemFlagsData::trusted(),},lane_imm: 0,},@@ -12023,7 +12023,7 @@ fn test_s390x_binemit() {base: gpr(2),index: zero_reg(),disp: UImm12::zero(),- flags: MemFlags::trusted(),+ flags: MemFlagsData::trusted(),},lane_imm: 0,},@@ -12038,7 +12038,7 @@ fn test_s390x_binemit() {base: gpr(2),index: zero_reg(),disp: UImm12::maybe_from_u64(4095).unwrap(),- flags: MemFlags::trusted(),+ flags: MemFlagsData::trusted(),},lane_imm: 0,},@@ -12053,7 +12053,7 @@ fn test_s390x_binemit() {base: gpr(2),index: zero_reg(),disp: SImm20::maybe_from_i64(-524288).unwrap(),- flags: MemFlags::trusted(),+ flags: MemFlagsData::trusted(),},lane_imm: 0,},@@ -12068,7 +12068,7 @@ fn test_s390x_binemit() {base: gpr(2),index: zero_reg(),disp: SImm20::maybe_from_i64(524287).unwrap(),- flags: MemFlags::trusted(),+ flags: MemFlagsData::trusted(),},lane_imm: 0,},@@ -12083,7 +12083,7 @@ fn test_s390x_binemit() {base: gpr(2),index: zero_reg(),disp: UImm12::zero(),- flags: MemFlags::trusted(),+ flags: MemFlagsData::trusted(),},lane_imm: 0,},@@ -12098,7 +12098,7 @@ fn test_s390x_binemit() {base: gpr(2),index: zero_reg(),disp: UImm12::maybe_from_u64(4095).unwrap(),- flags: MemFlags::trusted(),+ flags: MemFlagsData::trusted(),},lane_imm: 0,},@@ -12113,7 +12113,7 @@ fn test_s390x_binemit() {base: gpr(3),index: gpr(2),disp: UImm12::zero(),- flags: MemFlags::trusted(),+ flags: MemFlagsData::trusted(),},lane_imm: 0,},@@ -12128,7 +12128,7 @@ fn test_s390x_binemit() {base: gpr(3),index: gpr(2),disp: UImm12::maybe_from_u64(4095).unwrap(),- flags: MemFlags::trusted(),+ flags: MemFlagsData::trusted(),},lane_imm: 0,},@@ -12143,7 +12143,7 @@ fn test_s390x_binemit() {base: gpr(3),index: gpr(2),disp: SImm20::maybe_from_i64(-524288).unwrap(),- flags: MemFlags::trusted(),+ flags: MemFlagsData::trusted(),},lane_imm: 0,},@@ -12158,7 +12158,7 @@ fn test_s390x_binemit() {base: gpr(3),index: gpr(2),disp: SImm20::maybe_from_i64(524287).unwrap(),- flags: MemFlags::trusted(),+ flags: MemFlagsData::trusted(),},lane_imm: 0,},@@ -12173,7 +12173,7 @@ fn test_s390x_binemit() {base: gpr(3),index: gpr(2),disp: UImm12::zero(),- flags: MemFlags::trusted(),+ flags: MemFlagsData::trusted(),},lane_imm: 0,},@@ -12188,7 +12188,7 @@ fn test_s390x_binemit() {base: gpr(3),index: gpr(2),disp: UImm12::maybe_from_u64(4095).unwrap(),- flags: MemFlags::trusted(),+ flags: MemFlagsData::trusted(),},lane_imm: 0,},@@ -12203,7 +12203,7 @@ fn test_s390x_binemit() {base: gpr(2),index: zero_reg(),disp: UImm12::zero(),- flags: MemFlags::trusted(),+ flags: MemFlagsData::trusted(),},lane_imm: 15,},@@ -12218,7 +12218,7 @@ fn test_s390x_binemit() {base: gpr(2),index: zero_reg(),disp: UImm12::maybe_from_u64(4095).unwrap(),- flags: MemFlags::trusted(),+ flags: MemFlagsData::trusted(),},lane_imm: 0,},@@ -12233,7 +12233,7 @@ fn test_s390x_binemit() {base: gpr(3),index: gpr(2),disp: UImm12::zero(),- flags: MemFlags::trusted(),+ flags: MemFlagsData::trusted(),},lane_imm: 15,},@@ -12248,7 +12248,7 @@ fn test_s390x_binemit() {base: gpr(3),index: gpr(2),disp: UImm12::maybe_from_u64(4095).unwrap(),- flags: MemFlags::trusted(),+ flags: MemFlagsData::trusted(),},lane_imm: 0,},@@ -12263,7 +12263,7 @@ fn test_s390x_binemit() {base: gpr(2),index: zero_reg(),disp: UImm12::zero(),- flags: MemFlags::trusted(),+ flags: MemFlagsData::trusted(),},lane_imm: 7,},@@ -12278,7 +12278,7 @@ fn test_s390x_binemit() {base: gpr(2),index: zero_reg(),disp: UImm12::maybe_from_u64(4095).unwrap(),- flags: MemFlags::trusted(),+ flags: MemFlagsData::trusted(),},lane_imm: 0,},@@ -12293,7 +12293,7 @@ fn test_s390x_binemit() {base: gpr(3),index: gpr(2),disp: UImm12::zero(),- flags: MemFlags::trusted(),+ flags: MemFlagsData::trusted(),},lane_imm: 7,},@@ -12308,7 +12308,7 @@ fn test_s390x_binemit() {base: gpr(3),index: gpr(2),disp: UImm12::maybe_from_u64(4095).unwrap(),- flags: MemFlags::trusted(),+ flags: MemFlagsData::trusted(),},lane_imm: 0,},@@ -12323,7 +12323,7 @@ fn test_s390x_binemit() {base: gpr(2),index: zero_reg(),disp: UImm12::zero(),- flags: MemFlags::trusted(),+ flags: MemFlagsData::trusted(),},lane_imm: 0,},@@ -12338,7 +12338,7 @@ fn test_s390x_binemit() {base: gpr(2),index: zero_reg(),disp: UImm12::maybe_from_u64(4095).unwrap(),- flags: MemFlags::trusted(),+ flags: MemFlagsData::trusted(),},lane_imm: 0,},@@ -12353,7 +12353,7 @@ fn test_s390x_binemit() {base: gpr(2),index: zero_reg(),disp: SImm20::maybe_from_i64(-524288).unwrap(),- flags: MemFlags::trusted(),+ flags: MemFlagsData::trusted(),},lane_imm: 0,},@@ -12368,7 +12368,7 @@ fn test_s390x_binemit() {base: gpr(2),index: zero_reg(),disp: SImm20::maybe_from_i64(524287).unwrap(),- flags: MemFlags::trusted(),+ flags: MemFlagsData::trusted(),},lane_imm: 0,},@@ -12383,7 +12383,7 @@ fn test_s390x_binemit() {base: gpr(2),index: zero_reg(),disp: UImm12::zero(),- flags: MemFlags::trusted(),+ flags: MemFlagsData::trusted(),},lane_imm: 0,},@@ -12398,7 +12398,7 @@ fn test_s390x_binemit() {base: gpr(2),index: zero_reg(),disp: UImm12::maybe_from_u64(4095).unwrap(),- flags: MemFlags::trusted(),+ flags: MemFlagsData::trusted(),},lane_imm: 0,},@@ -12413,7 +12413,7 @@ fn test_s390x_binemit() {base: gpr(3),index: gpr(2),disp: UImm12::zero(),- flags: MemFlags::trusted(),+ flags: MemFlagsData::trusted(),},lane_imm: 0,},@@ -12428,7 +12428,7 @@ fn test_s390x_binemit() {base: gpr(3),index: gpr(2),disp: UImm12::maybe_from_u64(4095).unwrap(),- flags: MemFlags::trusted(),+ flags: MemFlagsData::trusted(),},lane_imm: 0,},@@ -12443,7 +12443,7 @@ fn test_s390x_binemit() {base: gpr(3),index: gpr(2),disp: SImm20::maybe_from_i64(-524288).unwrap(),- flags: MemFlags::trusted(),+ flags: MemFlagsData::trusted(),},lane_imm: 0,},@@ -12458,7 +12458,7 @@ fn test_s390x_binemit() {base: gpr(3),index: gpr(2),disp: SImm20::maybe_from_i64(524287).unwrap(),- flags: MemFlags::trusted(),+ flags: MemFlagsData::trusted(),},lane_imm: 0,},@@ -12473,7 +12473,7 @@ fn test_s390x_binemit() {base: gpr(3),index: gpr(2),disp: UImm12::zero(),- flags: MemFlags::trusted(),+ flags: MemFlagsData::trusted(),},lane_imm: 0,},@@ -12488,7 +12488,7 @@ fn test_s390x_binemit() {base: gpr(3),index: gpr(2),disp: UImm12::maybe_from_u64(4095).unwrap(),- flags: MemFlags::trusted(),+ flags: MemFlagsData::trusted(),},lane_imm: 0,},@@ -12503,7 +12503,7 @@ fn test_s390x_binemit() {base: gpr(2),index: zero_reg(),disp: UImm12::zero(),- flags: MemFlags::trusted(),+ flags: MemFlagsData::trusted(),},lane_imm: 0,},@@ -12518,7 +12518,7 @@ fn test_s390x_binemit() {base: gpr(2),index: zero_reg(),disp: UImm12::maybe_from_u64(4095).unwrap(),- flags: MemFlags::trusted(),+ flags: MemFlagsData::trusted(),},lane_imm: 0,},@@ -12533,7 +12533,7 @@ fn test_s390x_binemit() {base: gpr(2),index: zero_reg(),disp: SImm20::maybe_from_i64(-524288).unwrap(),- flags: MemFlags::trusted(),+ flags: MemFlagsData::trusted(),},lane_imm: 0,},@@ -12548,7 +12548,7 @@ fn test_s390x_binemit() {base: gpr(2),index: zero_reg(),disp: SImm20::maybe_from_i64(524287).unwrap(),- flags: MemFlags::trusted(),+ flags: MemFlagsData::trusted(),},lane_imm: 0,},@@ -12563,7 +12563,7 @@ fn test_s390x_binemit() {base: gpr(2),index: zero_reg(),disp: UImm12::zero(),- flags: MemFlags::trusted(),+ flags: MemFlagsData::trusted(),},lane_imm: 0,},@@ -12578,7 +12578,7 @@ fn test_s390x_binemit() {base: gpr(2),index: zero_reg(),disp: UImm12::maybe_from_u64(4095).unwrap(),- flags: MemFlags::trusted(),+ flags: MemFlagsData::trusted(),},lane_imm: 0,},@@ -12593,7 +12593,7 @@ fn test_s390x_binemit() {base: gpr(3),index: gpr(2),disp: UImm12::zero(),- flags: MemFlags::trusted(),+ flags: MemFlagsData::trusted(),},lane_imm: 0,},@@ -12608,7 +12608,7 @@ fn test_s390x_binemit() {base: gpr(3),index: gpr(2),disp: UImm12::maybe_from_u64(4095).unwrap(),- flags: MemFlags::trusted(),+ flags: MemFlagsData::trusted(),},lane_imm: 0,},@@ -12623,7 +12623,7 @@ fn test_s390x_binemit() {base: gpr(3),index: gpr(2),disp: SImm20::maybe_from_i64(-524288).unwrap(),- flags: MemFlags::trusted(),+ flags: MemFlagsData::trusted(),},lane_imm: 0,},@@ -12638,7 +12638,7 @@ fn test_s390x_binemit() {base: gpr(3),index: gpr(2),disp: SImm20::maybe_from_i64(524287).unwrap(),- flags: MemFlags::trusted(),+ flags: MemFlagsData::trusted(),},lane_imm: 0,},@@ -12653,7 +12653,7 @@ fn test_s390x_binemit() {base: gpr(3),index: gpr(2),disp: UImm12::zero(),- flags: MemFlags::trusted(),+ flags: MemFlagsData::trusted(),},lane_imm: 0,},@@ -12668,7 +12668,7 @@ fn test_s390x_binemit() {base: gpr(3),index: gpr(2),disp: UImm12::maybe_from_u64(4095).unwrap(),- flags: MemFlags::trusted(),+ flags: MemFlagsData::trusted(),},lane_imm: 0,},@@ -12684,7 +12684,7 @@ fn test_s390x_binemit() {base: gpr(2),index: zero_reg(),disp: UImm12::zero(),- flags: MemFlags::trusted(),+ flags: MemFlagsData::trusted(),},lane_imm: 0,},@@ -12700,7 +12700,7 @@ fn test_s390x_binemit() {base: gpr(2),index: zero_reg(),disp: UImm12::maybe_from_u64(4095).unwrap(),- flags: MemFlags::trusted(),+ flags: MemFlagsData::trusted(),},lane_imm: 0,},@@ -12716,7 +12716,7 @@ fn test_s390x_binemit() {base: gpr(3),index: gpr(2),disp: UImm12::zero(),- flags: MemFlags::trusted(),+ flags: MemFlagsData::trusted(),},lane_imm: 0,},@@ -12732,7 +12732,7 @@ fn test_s390x_binemit() {base: gpr(3),index: gpr(2),disp: UImm12::maybe_from_u64(4095).unwrap(),- flags: MemFlags::trusted(),+ flags: MemFlagsData::trusted(),},lane_imm: 0,},@@ -12748,7 +12748,7 @@ fn test_s390x_binemit() {base: gpr(2),index: zero_reg(),disp: UImm12::zero(),- flags: MemFlags::trusted(),+ flags: MemFlagsData::trusted(),},lane_imm: 0,},@@ -12764,7 +12764,7 @@ fn test_s390x_binemit() {base: gpr(2),index: zero_reg(),disp: UImm12::maybe_from_u64(4095).unwrap(),- flags: MemFlags::trusted(),+ flags: MemFlagsData::trusted(),},lane_imm: 0,},@@ -12780,7 +12780,7 @@ fn test_s390x_binemit() {base: gpr(3),index: gpr(2),disp: UImm12::zero(),- flags: MemFlags::trusted(),+ flags: MemFlagsData::trusted(),},lane_imm: 0,},@@ -12796,7 +12796,7 @@ fn test_s390x_binemit() {base: gpr(3),index: gpr(2),disp: UImm12::maybe_from_u64(4095).unwrap(),- flags: MemFlags::trusted(),+ flags: MemFlagsData::trusted(),},lane_imm: 0,},@@ -12812,7 +12812,7 @@ fn test_s390x_binemit() {base: gpr(2),index: zero_reg(),disp: UImm12::zero(),- flags: MemFlags::trusted(),+ flags: MemFlagsData::trusted(),},lane_imm: 0,},@@ -12828,7 +12828,7 @@ fn test_s390x_binemit() {base: gpr(2),index: zero_reg(),disp: UImm12::maybe_from_u64(4095).unwrap(),- flags: MemFlags::trusted(),+ flags: MemFlagsData::trusted(),},lane_imm: 0,},@@ -12844,7 +12844,7 @@ fn test_s390x_binemit() {base: gpr(3),index: gpr(2),disp: UImm12::zero(),- flags: MemFlags::trusted(),+ flags: MemFlagsData::trusted(),},lane_imm: 0,},@@ -12860,7 +12860,7 @@ fn test_s390x_binemit() {base: gpr(3),index: gpr(2),disp: UImm12::maybe_from_u64(4095).unwrap(),- flags: MemFlags::trusted(),+ flags: MemFlagsData::trusted(),},lane_imm: 0,},@@ -12875,7 +12875,7 @@ fn test_s390x_binemit() {base: gpr(2),index: zero_reg(),disp: UImm12::zero(),- flags: MemFlags::trusted(),+ flags: MemFlagsData::trusted(),},lane_imm: 0,},@@ -12890,7 +12890,7 @@ fn test_s390x_binemit() {base: gpr(2),index: zero_reg(),disp: UImm12::maybe_from_u64(4095).unwrap(),- flags: MemFlags::trusted(),+ flags: MemFlagsData::trusted(),},lane_imm: 0,},@@ -12905,7 +12905,7 @@ fn test_s390x_binemit() {base: gpr(2),index: zero_reg(),disp: SImm20::maybe_from_i64(-524288).unwrap(),- flags: MemFlags::trusted(),+ flags: MemFlagsData::trusted(),},lane_imm: 0,},@@ -12920,7 +12920,7 @@ fn test_s390x_binemit() {base: gpr(2),index: zero_reg(),disp: SImm20::maybe_from_i64(524287).unwrap(),- flags: MemFlags::trusted(),+ flags: MemFlagsData::trusted(),},lane_imm: 0,},@@ -12935,7 +12935,7 @@ fn test_s390x_binemit() {base: gpr(3),index: gpr(2),disp: UImm12::zero(),- flags: MemFlags::trusted(),+ flags: MemFlagsData::trusted(),},lane_imm: 0,},@@ -12950,7 +12950,7 @@ fn test_s390x_binemit() {base: gpr(3),index: gpr(2),disp: UImm12::maybe_from_u64(4095).unwrap(),- flags: MemFlags::trusted(),+ flags: MemFlagsData::trusted(),},lane_imm: 0,},@@ -12965,7 +12965,7 @@ fn test_s390x_binemit() {base: gpr(3),index: gpr(2),disp: SImm20::maybe_from_i64(-524288).unwrap(),- flags: MemFlags::trusted(),+ flags: MemFlagsData::trusted(),},lane_imm: 0,},@@ -12980,7 +12980,7 @@ fn test_s390x_binemit() {base: gpr(3),index: gpr(2),disp: SImm20::maybe_from_i64(524287).unwrap(),- flags: MemFlags::trusted(),+ flags: MemFlagsData::trusted(),},lane_imm: 0,},@@ -12995,7 +12995,7 @@ fn test_s390x_binemit() {base: gpr(2),index: zero_reg(),disp: UImm12::zero(),- flags: MemFlags::trusted(),+ flags: MemFlagsData::trusted(),},lane_imm: 0,},@@ -13010,7 +13010,7 @@ fn test_s390x_binemit() {base: gpr(2),index: zero_reg(),disp: UImm12::maybe_from_u64(4095).unwrap(),- flags: MemFlags::trusted(),+ flags: MemFlagsData::trusted(),},lane_imm: 0,},@@ -13025,7 +13025,7 @@ fn test_s390x_binemit() {base: gpr(2),index: zero_reg(),disp: SImm20::maybe_from_i64(-524288).unwrap(),- flags: MemFlags::trusted(),+ flags: MemFlagsData::trusted(),},lane_imm: 0,},@@ -13040,7 +13040,7 @@ fn test_s390x_binemit() {base: gpr(2),index: zero_reg(),disp: SImm20::maybe_from_i64(524287).unwrap(),- flags: MemFlags::trusted(),+ flags: MemFlagsData::trusted(),},lane_imm: 0,},@@ -13055,7 +13055,7 @@ fn test_s390x_binemit() {base: gpr(3),index: gpr(2),disp: UImm12::zero(),- flags: MemFlags::trusted(),+ flags: MemFlagsData::trusted(),},lane_imm: 0,},@@ -13070,7 +13070,7 @@ fn test_s390x_binemit() {base: gpr(3),index: gpr(2),disp: UImm12::maybe_from_u64(4095).unwrap(),- flags: MemFlags::trusted(),+ flags: MemFlagsData::trusted(),},lane_imm: 0,},@@ -13085,7 +13085,7 @@ fn test_s390x_binemit() {base: gpr(3),index: gpr(2),disp: SImm20::maybe_from_i64(-524288).unwrap(),- flags: MemFlags::trusted(),+ flags: MemFlagsData::trusted(),},lane_imm: 0,},@@ -13100,7 +13100,7 @@ fn test_s390x_binemit() {base: gpr(3),index: gpr(2),disp: SImm20::maybe_from_i64(524287).unwrap(),- flags: MemFlags::trusted(),+ flags: MemFlagsData::trusted(),},lane_imm: 0,},@@ -13115,7 +13115,7 @@ fn test_s390x_binemit() {base: gpr(2),index: zero_reg(),disp: UImm12::zero(),- flags: MemFlags::trusted(),+ flags: MemFlagsData::trusted(),},lane_imm: 7,},@@ -13130,7 +13130,7 @@ fn test_s390x_binemit() {base: gpr(2),index: zero_reg(),disp: UImm12::maybe_from_u64(4095).unwrap(),- flags: MemFlags::trusted(),+ flags: MemFlagsData::trusted(),},lane_imm: 0,},@@ -13145,7 +13145,7 @@ fn test_s390x_binemit() {base: gpr(3),index: gpr(2),disp: UImm12::zero(),- flags: MemFlags::trusted(),+ flags: MemFlagsData::trusted(),},lane_imm: 7,},@@ -13160,7 +13160,7 @@ fn test_s390x_binemit() {base: gpr(3),index: gpr(2),disp: UImm12::maybe_from_u64(4095).unwrap(),- flags: MemFlags::trusted(),+ flags: MemFlagsData::trusted(),},lane_imm: 0,},@@ -13175,7 +13175,7 @@ fn test_s390x_binemit() {base: gpr(2),index: zero_reg(),disp: UImm12::zero(),- flags: MemFlags::trusted(),+ flags: MemFlagsData::trusted(),},lane_imm: 0,},@@ -13190,7 +13190,7 @@ fn test_s390x_binemit() {base: gpr(2),index: zero_reg(),disp: UImm12::maybe_from_u64(4095).unwrap(),- flags: MemFlags::trusted(),+ flags: MemFlagsData::trusted(),},lane_imm: 0,},@@ -13205,7 +13205,7 @@ fn test_s390x_binemit() {base: gpr(2),index: zero_reg(),disp: SImm20::maybe_from_i64(-524288).unwrap(),- flags: MemFlags::trusted(),+ flags: MemFlagsData::trusted(),},lane_imm: 0,},@@ -13220,7 +13220,7 @@ fn test_s390x_binemit() {base: gpr(2),index: zero_reg(),disp: SImm20::maybe_from_i64(524287).unwrap(),- flags: MemFlags::trusted(),+ flags: MemFlagsData::trusted(),},lane_imm: 0,},@@ -13235,7 +13235,7 @@ fn test_s390x_binemit() {base: gpr(3),index: gpr(2),disp: UImm12::zero(),- flags: MemFlags::trusted(),+ flags: MemFlagsData::trusted(),},lane_imm: 0,},@@ -13250,7 +13250,7 @@ fn test_s390x_binemit() {base: gpr(3),index: gpr(2),disp: UImm12::maybe_from_u64(4095).unwrap(),- flags: MemFlags::trusted(),+ flags: MemFlagsData::trusted(),},lane_imm: 0,},@@ -13265,7 +13265,7 @@ fn test_s390x_binemit() {base: gpr(3),index: gpr(2),disp: SImm20::maybe_from_i64(-524288).unwrap(),- flags: MemFlags::trusted(),+ flags: MemFlagsData::trusted(),},lane_imm: 0,},@@ -13280,7 +13280,7 @@ fn test_s390x_binemit() {base: gpr(3),index: gpr(2),disp: SImm20::maybe_from_i64(524287).unwrap(),- flags: MemFlags::trusted(),+ flags: MemFlagsData::trusted(),},lane_imm: 0,},@@ -13295,7 +13295,7 @@ fn test_s390x_binemit() {base: gpr(2),index: zero_reg(),disp: UImm12::zero(),- flags: MemFlags::trusted(),+ flags: MemFlagsData::trusted(),},lane_imm: 0,},@@ -13310,7 +13310,7 @@ fn test_s390x_binemit() {base: gpr(2),index: zero_reg(),disp: UImm12::maybe_from_u64(4095).unwrap(),- flags: MemFlags::trusted(),+ flags: MemFlagsData::trusted(),},lane_imm: 0,},@@ -13325,7 +13325,7 @@ fn test_s390x_binemit() {base: gpr(2),index: zero_reg(),disp: SImm20::maybe_from_i64(-524288).unwrap(),- flags: MemFlags::trusted(),+ flags: MemFlagsData::trusted(),},lane_imm: 0,},@@ -13340,7 +13340,7 @@ fn test_s390x_binemit() {base: gpr(2),index: zero_reg(),disp: SImm20::maybe_from_i64(524287).unwrap(),- flags: MemFlags::trusted(),+ flags: MemFlagsData::trusted(),},lane_imm: 0,},@@ -13355,7 +13355,7 @@ fn test_s390x_binemit() {base: gpr(3),index: gpr(2),disp: UImm12::zero(),- flags: MemFlags::trusted(),+ flags: MemFlagsData::trusted(),},lane_imm: 0,},@@ -13370,7 +13370,7 @@ fn test_s390x_binemit() {base: gpr(3),index: gpr(2),disp: UImm12::maybe_from_u64(4095).unwrap(),- flags: MemFlags::trusted(),+ flags: MemFlagsData::trusted(),},lane_imm: 0,},@@ -13385,7 +13385,7 @@ fn test_s390x_binemit() {base: gpr(3),index: gpr(2),disp: SImm20::maybe_from_i64(-524288).unwrap(),- flags: MemFlags::trusted(),+ flags: MemFlagsData::trusted(),},lane_imm: 0,},@@ -13400,7 +13400,7 @@ fn test_s390x_binemit() {base: gpr(3),index: gpr(2),disp: SImm20::maybe_from_i64(524287).unwrap(),- flags: MemFlags::trusted(),+ flags: MemFlagsData::trusted(),},lane_imm: 0,},diff --git a/cranelift/codegen/src/isa/s390x/inst/mod.rs b/cranelift/codegen/src/isa/s390x/inst/mod.rsindex 52ce2d2603..43cad9b9d1 100644--- a/cranelift/codegen/src/isa/s390x/inst/mod.rs+++ b/cranelift/codegen/src/isa/s390x/inst/mod.rs@@ -1,7 +1,7 @@//! This module defines s390x-specific machine instruction types.use crate::binemit::{Addend, CodeOffset, Reloc};-use crate::ir::{ExternalName, MemFlags, Type, types};+use crate::ir::{ExternalName, MemFlagsData, Type, types};use crate::isa::s390x::abi::S390xMachineDeps;use crate::isa::{CallConv, FunctionAlignment};use crate::machinst::*;@@ -3544,7 +3544,7 @@ impl Inst {4 => "lxaq",_ => unreachable!(),};- let flags = MemFlags::trusted();+ let flags = MemFlagsData::trusted();let mem = MemArg::BXD20 {base,index,@@ -3569,7 +3569,7 @@ impl Inst {4 => "llxaq",_ => unreachable!(),};- let flags = MemFlags::trusted();+ let flags = MemFlagsData::trusted();let mem = MemArg::BXD20 {base,index,diff --git a/cranelift/codegen/src/isa/s390x/lower.isle b/cranelift/codegen/src/isa/s390x/lower.isleindex 0ffd745edb..75b096fb05 100644--- a/cranelift/codegen/src/isa/s390x/lower.isle+++ b/cranelift/codegen/src/isa/s390x/lower.isle@@ -2297,7 +2297,7 @@x);; Bitcast between types residing in VRs with different lane counts is a-;; no-op if the operation's MemFlags indicate a byte order compatible with+;; no-op if the operation's MemFlagsData indicate a byte order compatible with;; the current lane order. Otherwise, lane elements need to be swapped,;; first in the input type, and then again in the output type. This could;; be optimized further, but we don't bother at the moment since due to our@@ -2921,7 +2921,7 @@;; Helper to perform a 128-bit full-vector byte-reversed load.-(decl vec_load_full_rev (Type MemFlags Value Offset32) Reg)+(decl vec_load_full_rev (Type MemFlagsData Value Offset32) Reg);; Full-vector byte-reversed load via single instruction on z15.(rule 1 (vec_load_full_rev (vr128_ty ty) flags addr offset)@@ -2939,7 +2939,7 @@;; Helper to perform an element-wise byte-reversed load.-(decl vec_load_byte_rev (Type MemFlags Value Offset32) Reg)+(decl vec_load_byte_rev (Type MemFlagsData Value Offset32) Reg);; Element-wise byte-reversed 1x128-bit load is a full byte-reversed load.(rule -1 (vec_load_byte_rev $I128 flags addr offset)@@ -2977,7 +2977,7 @@;; Helper to perform an element-reversed load.-(decl vec_load_elt_rev (Type MemFlags Value Offset32) Reg)+(decl vec_load_elt_rev (Type MemFlagsData Value Offset32) Reg);; Element-reversed 1x128-bit load is a direct load.;; For 1x128-bit types, this is a direct load.@@ -3131,7 +3131,7 @@;; Helper to load a 64-bit half-size vector from memory.-(decl load_v64 (Type MemFlags Value Offset32) Reg)+(decl load_v64 (Type MemFlagsData Value Offset32) Reg);; Any big-endian source value, BE lane order.(rule -1 (load_v64 _ flags @ (bigendian) addr offset)@@ -3261,7 +3261,7 @@;; Helper to perform a 128-bit full-vector byte-reversed store.-(decl vec_store_full_rev (Type Reg MemFlags Value Offset32) SideEffectNoResult)+(decl vec_store_full_rev (Type Reg MemFlagsData Value Offset32) SideEffectNoResult);; Full-vector byte-reversed store via single instruction on z15.(rule 1 (vec_store_full_rev _ val flags addr offset)@@ -3280,7 +3280,7 @@;; Helper to perform an element-wise byte-reversed store.-(decl vec_store_byte_rev (Type Reg MemFlags Value Offset32) SideEffectNoResult)+(decl vec_store_byte_rev (Type Reg MemFlagsData Value Offset32) SideEffectNoResult);; Element-wise byte-reversed 1x128-bit store is a full byte-reversed store.(rule -1 (vec_store_byte_rev $I128 val flags addr offset)@@ -3318,7 +3318,7 @@;; Helper to perform an element-reversed store.-(decl vec_store_elt_rev (Type Reg MemFlags Value Offset32) SideEffectNoResult)+(decl vec_store_elt_rev (Type Reg MemFlagsData Value Offset32) SideEffectNoResult);; Element-reversed 1x128-bit store is a direct store.(rule -1 (vec_store_elt_rev $I128 val flags addr offset)@@ -3362,7 +3362,7 @@(side_effect (istore8_impl flags val addr offset)));; Helper to store 8-bit integer types.-(decl istore8_impl (MemFlags Value Value Offset32) SideEffectNoResult)+(decl istore8_impl (MemFlagsData Value Value Offset32) SideEffectNoResult);; Store 8-bit integer types, register input.(rule (istore8_impl flags val addr offset)@@ -3380,7 +3380,7 @@(side_effect (istore16_impl flags val addr offset)));; Helper to store 16-bit integer types.-(decl istore16_impl (MemFlags Value Value Offset32) SideEffectNoResult)+(decl istore16_impl (MemFlagsData Value Value Offset32) SideEffectNoResult);; Store 16-bit big-endian integer types, register input.(rule 2 (istore16_impl flags @ (bigendian) val addr offset)@@ -3406,7 +3406,7 @@(side_effect (istore32_impl flags val addr offset)));; Helper to store 32-bit integer types.-(decl istore32_impl (MemFlags Value Value Offset32) SideEffectNoResult)+(decl istore32_impl (MemFlagsData Value Value Offset32) SideEffectNoResult);; Store 32-bit big-endian integer types, register input.(rule 1 (istore32_impl flags @ (bigendian) val addr offset)@@ -3424,7 +3424,7 @@;;;; Rules for 64-bit integer stores ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; Helper to store 64-bit integer types.-(decl istore64_impl (MemFlags Value Value Offset32) SideEffectNoResult)+(decl istore64_impl (MemFlagsData Value Value Offset32) SideEffectNoResult);; Store 64-bit big-endian integer types, register input.(rule 1 (istore64_impl flags @ (bigendian) val addr offset)@@ -3516,7 +3516,7 @@(casloop_subword ib ty flags aligned_addr bitshift val3)));; Loop bodies for atomic read-modify-write operations.-(decl atomic_rmw_body (VecMInstBuilder Type MemFlags AtomicRmwOp+(decl atomic_rmw_body (VecMInstBuilder Type MemFlagsData AtomicRmwOpWritableReg Reg Reg) Reg);; Loop bodies for 32-/64-bit atomic XCHG operations.@@ -3567,7 +3567,7 @@(atomic_rmw_body_rxsbg ib ty flags (RxSBGOp.And) tmp val src)));; RxSBG subword operation.-(decl atomic_rmw_body_rxsbg (VecMInstBuilder Type MemFlags RxSBGOp+(decl atomic_rmw_body_rxsbg (VecMInstBuilder Type MemFlagsData RxSBGOpWritableReg Reg Reg) Reg);; 8-bit case: use the low byte of "src" and the high byte of "val".(rule (atomic_rmw_body_rxsbg ib $I8 _ op tmp val src)@@ -3582,7 +3582,7 @@(push_rxsbg ib op tmp val (bswap_reg $I32 src) 48 63 -16));; Invert a subword.-(decl atomic_rmw_body_invert (VecMInstBuilder Type MemFlags WritableReg Reg) Reg)+(decl atomic_rmw_body_invert (VecMInstBuilder Type MemFlagsData WritableReg Reg) Reg);; 8-bit case: invert the high byte.(rule (atomic_rmw_body_invert ib $I8 _ tmp val)(push_xor_uimm32shifted ib $I32 tmp val (uimm32shifted 0xff000000 0)))@@ -3600,7 +3600,7 @@(atomic_rmw_body_addsub ib ty flags (aluop_sub (ty_ext32 ty)) tmp val src));; Addition or subtraction operation.-(decl atomic_rmw_body_addsub (VecMInstBuilder Type MemFlags ALUOp+(decl atomic_rmw_body_addsub (VecMInstBuilder Type MemFlagsData ALUOpWritableReg Reg Reg) Reg);; 32/64-bit big-endian case: just a regular add/sub operation.(rule 2 (atomic_rmw_body_addsub ib (ty_32_or_64 ty) (bigendian) op tmp val src)@@ -3646,7 +3646,7 @@(intcc_as_cond (IntCC.UnsignedGreaterThan)) tmp val src));; Minimum or maximum operation.-(decl atomic_rmw_body_minmax (VecMInstBuilder Type MemFlags CmpOp Cond+(decl atomic_rmw_body_minmax (VecMInstBuilder Type MemFlagsData CmpOp CondWritableReg Reg Reg) Reg);; 32/64-bit big-endian case: just a comparison followed by a conditional;; break out of the loop if the memory value does not need to change.@@ -3726,7 +3726,7 @@(casloop_subword ib ty flags aligned_addr bitshift val3)));; Emit loop body instructions to perform a subword compare-and-swap.-(decl atomic_cas_body (VecMInstBuilder Type MemFlags+(decl atomic_cas_body (VecMInstBuilder Type MemFlagsDataWritableReg Reg Reg Reg) Reg);; 8-bit case: "val" contains the value loaded from memory in the high byte.diff --git a/cranelift/codegen/src/isa/s390x/lower/isle.rs b/cranelift/codegen/src/isa/s390x/lower/isle.rsindex bededcef31..a19a0f1de6 100644--- a/cranelift/codegen/src/isa/s390x/lower/isle.rs+++ b/cranelift/codegen/src/isa/s390x/lower/isle.rs@@ -16,8 +16,8 @@ use crate::machinst::isle::*;use crate::machinst::{CallInfo, MachLabel, Reg, TryCallInfo, non_writable_value_regs};use crate::{ir::{- AtomicRmwOp, BlockCall, Endianness, Inst, InstructionData, KnownSymbol, MemFlags, Opcode,- TrapCode, Value, ValueList, condcodes::*, immediates::*, types::*,+ AtomicRmwOp, BlockCall, Endianness, Inst, InstructionData, KnownSymbol, MemFlagsData,+ Opcode, TrapCode, Value, ValueList, condcodes::*, immediates::*, types::*,},isa::CallConv,machinst::{@@ -87,8 +87,8 @@ impl generated_code::Context for IsleContext<'_, '_, MInst, S390xBackend> {if arg_space > 0 {if self.backend.flags.preserve_frame_pointers() {let tmp = self.lower_ctx.alloc_tmp(I64).only_reg().unwrap();- let src_mem = MemArg::reg(stack_reg(), MemFlags::trusted());- let dst_mem = MemArg::reg(stack_reg(), MemFlags::trusted());+ let src_mem = MemArg::reg(stack_reg(), MemFlagsData::trusted());+ let dst_mem = MemArg::reg(stack_reg(), MemFlagsData::trusted());self.emit(&MInst::Load64 {rd: tmp,mem: src_mem,@@ -647,7 +647,7 @@ impl generated_code::Context for IsleContext<'_, '_, MInst, S390xBackend> {}#[inline]- fn littleendian(&mut self, flags: MemFlags) -> Option<()> {+ fn littleendian(&mut self, flags: MemFlagsData) -> Option<()> {let endianness = flags.endianness(Endianness::Big);if endianness == Endianness::Little {Some(())@@ -657,7 +657,7 @@ impl generated_code::Context for IsleContext<'_, '_, MInst, S390xBackend> {}#[inline]- fn bigendian(&mut self, flags: MemFlags) -> Option<()> {+ fn bigendian(&mut self, flags: MemFlagsData) -> Option<()> {let endianness = flags.endianness(Endianness::Big);if endianness == Endianness::Big {Some(())@@ -667,8 +667,8 @@ impl generated_code::Context for IsleContext<'_, '_, MInst, S390xBackend> {}#[inline]- fn memflags_trusted(&mut self) -> MemFlags {- MemFlags::trusted()+ fn memflags_trusted(&mut self) -> MemFlagsData {+ MemFlagsData::trusted()}#[inline]@@ -683,7 +683,7 @@ impl generated_code::Context for IsleContext<'_, '_, MInst, S390xBackend> {}#[inline]- fn memarg_reg_plus_reg(&mut self, x: Reg, y: Reg, bias: u8, flags: MemFlags) -> MemArg {+ fn memarg_reg_plus_reg(&mut self, x: Reg, y: Reg, bias: u8, flags: MemFlagsData) -> MemArg {MemArg::BXD12 {base: x,index: y,@@ -698,7 +698,7 @@ impl generated_code::Context for IsleContext<'_, '_, MInst, S390xBackend> {x: Reg,y: Reg,offset: &SImm20,- flags: MemFlags,+ flags: MemFlagsData,) -> MemArg {if let Some(imm) = UImm12::maybe_from_simm20(*offset) {MemArg::BXD12 {@@ -718,12 +718,12 @@ impl generated_code::Context for IsleContext<'_, '_, MInst, S390xBackend> {}#[inline]- fn memarg_reg_plus_off(&mut self, reg: Reg, off: i64, bias: u8, flags: MemFlags) -> MemArg {+ fn memarg_reg_plus_off(&mut self, reg: Reg, off: i64, bias: u8, flags: MemFlagsData) -> MemArg {MemArg::reg_plus_off(reg, off + (bias as i64), flags)}#[inline]- fn memarg_symbol(&mut self, name: ExternalName, offset: i32, flags: MemFlags) -> MemArg {+ fn memarg_symbol(&mut self, name: ExternalName, offset: i32, flags: MemFlagsData) -> MemArg {MemArg::Symbol {name: Box::new(name),offset,@@ -736,7 +736,7 @@ impl generated_code::Context for IsleContext<'_, '_, MInst, S390xBackend> {MemArg::Symbol {name: Box::new(ExternalName::KnownSymbol(KnownSymbol::ElfGlobalOffsetTable)),offset: 0,- flags: MemFlags::trusted(),+ flags: MemFlagsData::trusted(),}}@@ -754,7 +754,7 @@ impl generated_code::Context for IsleContext<'_, '_, MInst, S390xBackend> {#[inline]fn memarg_frame_pointer_offset(&mut self) -> MemArg {// The frame pointer (back chain) is stored directly at SP.- MemArg::reg(stack_reg(), MemFlags::trusted())+ MemArg::reg(stack_reg(), MemFlagsData::trusted())}#[inline]diff --git a/cranelift/codegen/src/isa/x64/abi.rs b/cranelift/codegen/src/isa/x64/abi.rsindex a752614631..3dd4c90488 100644--- a/cranelift/codegen/src/isa/x64/abi.rs+++ b/cranelift/codegen/src/isa/x64/abi.rs@@ -1,7 +1,7 @@//! Implementation of the standard x64 ABI.use crate::CodegenResult;-use crate::ir::{self, LibCall, MemFlags, Signature, TrapCode, types};+use crate::ir::{self, LibCall, MemFlagsData, Signature, TrapCode, types};use crate::ir::{ExternalName, types::*};use crate::isa;use crate::isa::winch;@@ -1011,7 +1011,7 @@ impl From<StackAMode> for SyntheticAmode {SyntheticAmode::Real(Amode::ImmReg {simm32: off,base: regs::rsp(),- flags: MemFlags::trusted(),+ flags: MemFlagsData::trusted(),})}}diff --git a/cranelift/codegen/src/isa/x64/inst.isle b/cranelift/codegen/src/isa/x64/inst.isleindex ef8954dda8..c28842c106 100644--- a/cranelift/codegen/src/isa/x64/inst.isle+++ b/cranelift/codegen/src/isa/x64/inst.isle@@ -421,14 +421,14 @@;; Immediate sign-extended and a register(ImmReg (simm32 i32)(base Reg)- (flags MemFlags))+ (flags MemFlagsData));; Sign-extend-32-to-64(simm32) + base + (index << shift)(ImmRegRegShift (simm32 i32)(base Gpr)(index Gpr)(shift u8)- (flags MemFlags))+ (flags MemFlagsData));; Sign-extend-32-to-64(immediate) + RIP (instruction;; pointer). The appropriate relocation is emitted so@@ -506,7 +506,7 @@(provide (= result (concat flags (bvadd val (sign_ext 64 offset)))))(require(= (widthof val) 64)))-(decl to_amode (MemFlags Value Offset32) SyntheticAmode)+(decl to_amode (MemFlagsData Value Offset32) SyntheticAmode)(rule 0 (to_amode flags base offset)(amode_imm_reg flags base offset))(rule 1 (to_amode flags (iadd _ x y) offset)@@ -532,7 +532,7 @@(provide (= result (concat flags (bvadd (bvadd (sign_ext 64 x) (sign_ext 64 y)) (sign_ext 64 offset))))))(instantiate to_amode_add((args (bv 16) (bv 64) (bv 64) (bv 32)) (ret (bv 80)) (canon (bv 64))))-(decl to_amode_add (MemFlags Value Value Offset32) Amode)+(decl to_amode_add (MemFlagsData Value Value Offset32) Amode)(rule to_amode_add_base_case 0 (to_amode_add flags x y offset)(amode_imm_reg_reg_shift flags x y offset))@@ -562,7 +562,7 @@(provide (= result (concat flags (bvadd (sign_ext 64 x) (sign_ext 64 offset))))))(instantiate amode_imm_reg((args (bv 16) (bv 64) (bv 32)) (ret (bv 80)) (canon (bv 64))))-(decl amode_imm_reg (MemFlags Value Offset32) Amode)+(decl amode_imm_reg (MemFlagsData Value Offset32) Amode)(rule amode_imm_reg_base 0 (amode_imm_reg flags base offset)(Amode.ImmReg offset base flags))(rule amode_imm_reg_iadd 1 (amode_imm_reg flags (iadd _ x y) offset)@@ -576,7 +576,7 @@(= (widthof offset) 32)))(instantiate amode_imm_reg_reg_shift((args (bv 16) (bv 64) (bv 64) (bv 32)) (ret (bv 80)) (canon (bv 64))))-(decl amode_imm_reg_reg_shift (MemFlags Value Value Offset32) Amode)+(decl amode_imm_reg_reg_shift (MemFlagsData Value Value Offset32) Amode)(rule amode_imm_reg_reg_shift_no_shift 0 (amode_imm_reg_reg_shift flags x y offset)(Amode.ImmRegRegShift offset x y 0 flags)) ;; 0 == y<<0 == "no shift"(rule amode_imm_reg_reg_shift_shl_rhs 1 (amode_imm_reg_reg_shift flags x (ishl _ y (iconst _ (uimm8 shift))) offset)@@ -592,7 +592,7 @@;; Note that the input `Amode` might have a static offset that's too large to;; add the specified `i32` to so in the case of overflow a new `Amode` is;; generated entirely using `lea`-(decl amode_offset (SyntheticAmode MemFlags i32) SyntheticAmode)+(decl amode_offset (SyntheticAmode MemFlagsData i32) SyntheticAmode)(rule 1 (amode_offset base _flags offset)(if-let new (amode_try_offset base offset))new)@@ -4089,7 +4089,7 @@(_ Unit (emit (MInst.AtomicRmwSeq ty op mem input tmp dst))))dst))-(decl x64_atomic_128_rmw_seq (AtomicRmwOp SyntheticAmode MemFlags ValueRegs) ValueRegs)+(decl x64_atomic_128_rmw_seq (AtomicRmwOp SyntheticAmode MemFlagsData ValueRegs) ValueRegs)(rule (x64_atomic_128_rmw_seq op mem_low flags input)(let ((dst_low WritableGpr (temp_writable_gpr))(dst_high WritableGpr (temp_writable_gpr))@@ -4112,7 +4112,7 @@(_ Unit (emit (MInst.Atomic128XchgSeq args))))(value_regs dst_low dst_high)))-(decl x64_atomic_128_store_seq (SyntheticAmode MemFlags ValueRegs) SideEffectNoResult)+(decl x64_atomic_128_store_seq (SyntheticAmode MemFlagsData ValueRegs) SideEffectNoResult)(rule (x64_atomic_128_store_seq mem_low flags input)(let ((dst_low WritableGpr (temp_writable_gpr))(dst_high WritableGpr (temp_writable_gpr))diff --git a/cranelift/codegen/src/isa/x64/inst/args.rs b/cranelift/codegen/src/isa/x64/inst/args.rsindex 6ed0608de4..9888391d18 100644--- a/cranelift/codegen/src/isa/x64/inst/args.rs+++ b/cranelift/codegen/src/isa/x64/inst/args.rs@@ -1,7 +1,7 @@//! Instruction operand sub-components (aka "parts"): definitions and printing.use super::regs::{self};-use crate::ir::MemFlags;+use crate::ir::MemFlagsData;use crate::ir::condcodes::{FloatCC, IntCC};use crate::ir::types::*;use crate::isa::x64::inst::Inst;@@ -410,7 +410,7 @@ impl Amode {Self::ImmReg {simm32,base,- flags: MemFlags::trusted(),+ flags: MemFlagsData::trusted(),}}@@ -424,7 +424,7 @@ impl Amode {base,index,shift,- flags: MemFlags::trusted(),+ flags: MemFlagsData::trusted(),}}@@ -432,8 +432,8 @@ impl Amode {Self::RipRelative { target }}- /// Set the specified [MemFlags] to the [Amode].- pub fn with_flags(&self, flags: MemFlags) -> Self {+ /// Set the specified [MemFlagsData] to the [Amode].+ pub fn with_flags(&self, flags: MemFlagsData) -> Self {match self {&Self::ImmReg { simm32, base, .. } => Self::ImmReg {simm32,@@ -495,10 +495,10 @@ impl Amode {}}- pub(crate) fn get_flags(&self) -> MemFlags {+ pub(crate) fn get_flags(&self) -> MemFlagsData {match self {Amode::ImmReg { flags, .. } | Amode::ImmRegRegShift { flags, .. } => *flags,- Amode::RipRelative { .. } => MemFlags::trusted(),+ Amode::RipRelative { .. } => MemFlagsData::trusted(),}}diff --git a/cranelift/codegen/src/isa/x64/lower/isle.rs b/cranelift/codegen/src/isa/x64/lower/isle.rsindex 5a1ada113e..ab1fe1dce0 100644--- a/cranelift/codegen/src/isa/x64/lower/isle.rs+++ b/cranelift/codegen/src/isa/x64/lower/isle.rs@@ -12,7 +12,7 @@ use crate::ir::condcodes::{FloatCC, IntCC};use crate::ir::immediates::*;use crate::ir::types::*;use crate::ir::{- BlockCall, Inst, InstructionData, LibCall, MemFlags, Opcode, TrapCode, Value, ValueList,+ BlockCall, Inst, InstructionData, LibCall, MemFlagsData, Opcode, TrapCode, Value, ValueList,};use crate::isa::x64::X64Backend;use crate::isa::x64::inst::{ReturnCallInfo, args::*, regs};diff --git a/cranelift/codegen/src/isle_prelude.rs b/cranelift/codegen/src/isle_prelude.rsindex b38ad10dce..864102246f 100644--- a/cranelift/codegen/src/isle_prelude.rs+++ b/cranelift/codegen/src/isle_prelude.rs@@ -819,12 +819,12 @@ macro_rules! isle_common_prelude_methods {}#[inline]- fn mem_flags_trusted(&mut self) -> MemFlags {- MemFlags::trusted()+ fn mem_flags_trusted(&mut self) -> MemFlagsData {+ MemFlagsData::trusted()}#[inline]- fn little_or_native_endian(&mut self, flags: MemFlags) -> Option<MemFlags> {+ fn little_or_native_endian(&mut self, flags: MemFlagsData) -> Option<MemFlagsData> {match flags.explicit_endianness() {Some(crate::ir::Endianness::Little) | None => Some(flags),Some(crate::ir::Endianness::Big) => None,diff --git a/cranelift/codegen/src/legalizer/globalvalue.rs b/cranelift/codegen/src/legalizer/globalvalue.rsindex ce78016247..0f9578eab9 100644--- a/cranelift/codegen/src/legalizer/globalvalue.rs+++ b/cranelift/codegen/src/legalizer/globalvalue.rs@@ -115,7 +115,7 @@ fn load_addr(base: ir::GlobalValue,offset: ir::immediates::Offset32,global_type: ir::Type,- flags: ir::MemFlags,+ flags: ir::MemFlagsData,isa: &dyn TargetIsa,) -> WalkCommand {// We need to load a pointer from the `base` global value, so insert a new `global_value`diff --git a/cranelift/codegen/src/legalizer/mod.rs b/cranelift/codegen/src/legalizer/mod.rsindex 768afd3067..f22b6949da 100644--- a/cranelift/codegen/src/legalizer/mod.rs+++ b/cranelift/codegen/src/legalizer/mod.rs@@ -16,7 +16,7 @@use crate::cursor::{Cursor, FuncCursor};use crate::ir::immediates::Imm64;use crate::ir::types::{self, I64, I128};-use crate::ir::{self, InstBuilder, InstructionData, MemFlags, Value};+use crate::ir::{self, InstBuilder, InstructionData, MemFlagsData, Value};use crate::isa::TargetIsa;use crate::trace;use cranelift_entity::EntitySet;@@ -311,7 +311,7 @@ fn expand_dynamic_stack_store(let addr_ty = isa.pointer_type();let addr = pos.ins().dynamic_stack_addr(addr_ty, dynamic_stack_slot);- let mut mflags = MemFlags::new();+ let mut mflags = MemFlagsData::new();// Stack slots are required to be accessible and aligned.mflags.set_notrap();mflags.set_aligned();@@ -337,7 +337,7 @@ fn expand_dynamic_stack_load(let addr = pos.ins().dynamic_stack_addr(addr_ty, dynamic_stack_slot);// Stack slots are required to be accessible and aligned.- let mflags = MemFlags::trusted();+ let mflags = MemFlagsData::trusted();pos.func.dfg.replace(inst).load(ty, mflags, addr, 0);@@ -360,7 +360,7 @@ fn expand_stack_store(// Stack slots are required to be accessible.// We can't currently ensure that they are aligned.- let mut mflags = MemFlags::new();+ let mut mflags = MemFlagsData::new();mflags.set_notrap();pos.func.dfg.replace(inst).store(mflags, arg, addr, 0);@@ -385,7 +385,7 @@ fn expand_stack_load(// Stack slots are required to be accessible.// We can't currently ensure that they are aligned.- let mut mflags = MemFlags::new();+ let mut mflags = MemFlagsData::new();mflags.set_notrap();pos.func.dfg.replace(inst).load(ty, mflags, addr, 0);diff --git a/cranelift/codegen/src/machinst/lower.rs b/cranelift/codegen/src/machinst/lower.rsindex d62e4f8825..60af548113 100644--- a/cranelift/codegen/src/machinst/lower.rs+++ b/cranelift/codegen/src/machinst/lower.rs@@ -9,7 +9,7 @@ use crate::entity::SecondaryMap;use crate::inst_predicates::{has_lowering_side_effect, is_constant_64bit};use crate::ir::{ArgumentPurpose, Block, BlockArg, Constant, ConstantData, DataFlowGraph, ExternalName,- Function, GlobalValue, GlobalValueData, Immediate, Inst, InstructionData, MemFlags,+ Function, GlobalValue, GlobalValueData, Immediate, Inst, InstructionData, MemFlagsData,RelSourceLoc, SigRef, Signature, Type, Value, ValueDef, ValueLabelAssignments, ValueLabelStart,};use crate::machinst::valueregs::InvalidSentinel;@@ -1420,7 +1420,7 @@ impl<'func, I: VCodeInst> Lower<'func, I> {}/// Returns the memory flags of a given memory access.- pub fn memflags(&self, ir_inst: Inst) -> Option<MemFlags> {+ pub fn memflags(&self, ir_inst: Inst) -> Option<MemFlagsData> {match &self.f.dfg.insts[ir_inst] {&InstructionData::AtomicCas { flags, .. } => Some(flags),&InstructionData::AtomicRmw { flags, .. } => Some(flags),diff --git a/cranelift/codegen/src/nan_canonicalization.rs b/cranelift/codegen/src/nan_canonicalization.rsindex 761277f1fd..bb3162bcde 100644--- a/cranelift/codegen/src/nan_canonicalization.rs+++ b/cranelift/codegen/src/nan_canonicalization.rs@@ -7,7 +7,7 @@ use crate::ir::condcodes::FloatCC;use crate::ir::immediates::{Ieee16, Ieee32, Ieee64, Ieee128};use crate::ir::types::{self};use crate::ir::{Function, Inst, InstBuilder, InstructionData, Opcode, Value};-use crate::opts::MemFlags;+use crate::opts::MemFlagsData;use crate::timing;/// Perform the NaN canonicalization pass.@@ -70,7 +70,7 @@ fn add_nan_canon_seq(pos: &mut FuncCursor, inst: Inst, has_vector_support: bool)let canon_nan = pos.ins().scalar_to_vector(ty, canon_nan);let new_res = pos.ins().scalar_to_vector(ty, new_res);let is_nan = pos.ins().fcmp(comparison, new_res, new_res);- let is_nan = pos.ins().bitcast(ty, MemFlags::new(), is_nan);+ let is_nan = pos.ins().bitcast(ty, MemFlagsData::new(), is_nan);let simd_result = pos.ins().bitselect(is_nan, canon_nan, new_res);pos.ins().with_result(val).extractlane(simd_result, 0);};@@ -83,7 +83,7 @@ fn add_nan_canon_seq(pos: &mut FuncCursor, inst: Inst, has_vector_support: bool)let vector_select = |pos: &mut FuncCursor, canon_nan: Value| {let is_nan = pos.ins().fcmp(comparison, new_res, new_res);- let is_nan = pos.ins().bitcast(val_type, MemFlags::new(), is_nan);+ let is_nan = pos.ins().bitcast(val_type, MemFlagsData::new(), is_nan);pos.ins().with_result(val).bitselect(is_nan, canon_nan, new_res);diff --git a/cranelift/codegen/src/opts.rs b/cranelift/codegen/src/opts.rsindex 8e83f9aa7f..07d395a464 100644--- a/cranelift/codegen/src/opts.rs+++ b/cranelift/codegen/src/opts.rs@@ -10,7 +10,7 @@ use crate::ir::instructions::InstructionFormat;pub use crate::ir::types::*;pub use crate::ir::{AtomicRmwOp, BlockCall, Constant, DynamicStackSlot, FuncRef, GlobalValue, Immediate,- InstructionData, JumpTable, MemFlags, Opcode, StackSlot, TrapCode, Type, Value,+ InstructionData, JumpTable, MemFlagsData, Opcode, StackSlot, TrapCode, Type, Value,};use crate::isle_common_prelude_methods;use crate::machinst::isle::*;diff --git a/cranelift/codegen/src/prelude.isle b/cranelift/codegen/src/prelude.isleindex 923ed6df4e..3eb9787448 100644--- a/cranelift/codegen/src/prelude.isle+++ b/cranelift/codegen/src/prelude.isle@@ -359,19 +359,19 @@(decl pure ty_equal (Type Type) bool)(extern constructor ty_equal ty_equal)-;;;; `cranelift_codegen::ir::MemFlags ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;+;;;; `cranelift_codegen::ir::MemFlagsData ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;-;; Provide model for the MemFlags type (declared in generated clif_lower.isle).-(model MemFlags (type (bv 16)))+;; Provide model for the MemFlagsData type (declared in generated clif_lower.isle).+(model MemFlagsData (type (bv 16)))-;; `MemFlags::trusted`+;; `MemFlagsData::trusted`(spec (mem_flags_trusted)(provide (= result #x0003)))-(decl pure mem_flags_trusted () MemFlags)+(decl pure mem_flags_trusted () MemFlagsData)(extern constructor mem_flags_trusted mem_flags_trusted);; Determine if flags specify little- or native-endian.-(decl little_or_native_endian (MemFlags) MemFlags)+(decl little_or_native_endian (MemFlagsData) MemFlagsData)(extern extractor little_or_native_endian little_or_native_endian);;;; Helpers for Working with Flags ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;diff --git a/cranelift/codegen/src/verifier/mod.rs b/cranelift/codegen/src/verifier/mod.rsindex 5fca9a68d9..9645f7d900 100644--- a/cranelift/codegen/src/verifier/mod.rs+++ b/cranelift/codegen/src/verifier/mod.rs@@ -72,7 +72,7 @@ use crate::ir::instructions::{CallInfo, InstructionFormat, ResolvedConstraint};use crate::ir::{self, ArgumentExtension, BlockArg, ExceptionTable};use crate::ir::{ArgumentPurpose, Block, Constant, DynamicStackSlot, FuncRef, Function, GlobalValue, Inst,- JumpTable, MemFlags, Opcode, SigRef, StackSlot, Type, Value, ValueDef, ValueList, types,+ JumpTable, MemFlagsData, Opcode, SigRef, StackSlot, Type, Value, ValueDef, ValueList, types,};use crate::ir::{ExceptionTableItem, Signature};use crate::isa::{CallConv, TargetIsa};@@ -1091,7 +1091,7 @@ impl<'a> Verifier<'a> {fn verify_bitcast(&self,inst: Inst,- flags: MemFlags,+ flags: MemFlagsData,arg: Value,errors: &mut VerifierErrors,) -> VerifierStepResult {@@ -1108,15 +1108,15 @@ impl<'a> Verifier<'a> {typ.bits()),))- } else if flags != MemFlags::new()- && flags != MemFlags::new().with_endianness(ir::Endianness::Little)- && flags != MemFlags::new().with_endianness(ir::Endianness::Big)+ } else if flags != MemFlagsData::new()+ && flags != MemFlagsData::new().with_endianness(ir::Endianness::Little)+ && flags != MemFlagsData::new().with_endianness(ir::Endianness::Big){errors.fatal((inst,"The bitcast instruction only accepts the `big` or `little` memory flags",))- } else if flags == MemFlags::new() && typ.lane_count() != value_type.lane_count() {+ } else if flags == MemFlagsData::new() && typ.lane_count() != value_type.lane_count() {errors.fatal((inst,"Byte order specifier required for bitcast instruction changing lane count",diff --git a/cranelift/filetests/src/function_runner.rs b/cranelift/filetests/src/function_runner.rsindex 17d34e608c..8f04fe0ec0 100644--- a/cranelift/filetests/src/function_runner.rs+++ b/cranelift/filetests/src/function_runner.rs@@ -572,7 +572,7 @@ fn make_trampoline(name: UserFuncName, signature: &ir::Signature, isa: &dyn Targ.enumerate().map(|(i, param)| {// We always store vector types in little-endian byte order as DataValue.- let mut flags = ir::MemFlags::trusted();+ let mut flags = ir::MemFlagsData::trusted();if param.value_type.is_vector() {flags.set_endianness(ir::Endianness::Little);}@@ -597,7 +597,7 @@ fn make_trampoline(name: UserFuncName, signature: &ir::Signature, isa: &dyn Targlet results = builder.func.dfg.inst_results(call).to_vec();for ((i, value), param) in results.iter().enumerate().zip(&signature.returns) {// We always store vector types in little-endian byte order as DataValue.- let mut flags = ir::MemFlags::trusted();+ let mut flags = ir::MemFlagsData::trusted();if param.value_type.is_vector() {flags.set_endianness(ir::Endianness::Little);}diff --git a/cranelift/frontend/src/frontend.rs b/cranelift/frontend/src/frontend.rsindex d51dbbbbd2..690aec88af 100644--- a/cranelift/frontend/src/frontend.rs+++ b/cranelift/frontend/src/frontend.rs@@ -10,9 +10,9 @@ use cranelift_codegen::ir::condcodes::IntCC;use cranelift_codegen::ir::{AbiParam, Block, DataFlowGraph, DynamicStackSlot, DynamicStackSlotData, ExtFuncData,ExternalName, FuncRef, Function, GlobalValue, GlobalValueData, Inst, InstBuilder,- InstBuilderBase, InstructionData, JumpTable, JumpTableData, LibCall, MemFlags, RelSourceLoc,- SigRef, Signature, StackSlot, StackSlotData, Type, Value, ValueLabel, ValueLabelAssignments,- ValueLabelStart, types,+ InstBuilderBase, InstructionData, JumpTable, JumpTableData, LibCall, MemFlagsData,+ RelSourceLoc, SigRef, Signature, StackSlot, StackSlotData, Type, Value, ValueLabel,+ ValueLabelAssignments, ValueLabelStart, types,};use cranelift_codegen::isa::TargetFrontendConfig;use cranelift_codegen::packed_option::PackedOption;@@ -868,7 +868,7 @@ impl<'a> FunctionBuilder<'a> {dest_align: u8,src_align: u8,non_overlapping: bool,- mut flags: MemFlags,+ mut flags: MemFlagsData,) {// Currently the result of guess work, not actual profiling.const THRESHOLD: u64 = 4;@@ -964,7 +964,7 @@ impl<'a> FunctionBuilder<'a> {ch: u8,size: u64,buffer_align: u8,- mut flags: MemFlags,+ mut flags: MemFlagsData,) {// Currently the result of guess work, not actual profiling.const THRESHOLD: u64 = 4;@@ -1096,7 +1096,7 @@ impl<'a> FunctionBuilder<'a> {/// `left` and `right` pointers respectively. These are used to know whether/// to mark `load`s as aligned. It's always fine to pass `1` for these, but/// passing something higher than the true alignment may trap or otherwise- /// misbehave as described in [`MemFlags::aligned`].+ /// misbehave as described in [`MemFlagsData::aligned`].////// Note that `memcmp` is a *big-endian* and *unsigned* comparison./// As such, this panics when called with `IntCC::Signed*`.@@ -1109,7 +1109,7 @@ impl<'a> FunctionBuilder<'a> {size: u64,left_align: std::num::NonZeroU8,right_align: std::num::NonZeroU8,- flags: MemFlags,+ flags: MemFlagsData,) -> Value {use IntCC::*;let (zero_cc, empty_imm) = match int_cc {@@ -1209,7 +1209,7 @@ mod tests {use cranelift_codegen::ir::condcodes::IntCC;use cranelift_codegen::ir::{AbiParam, BlockCall, ExceptionTableData, ExtFuncData, ExternalName, Function, InstBuilder,- MemFlags, Signature, UserExternalName, UserFuncName, Value, types::*,+ MemFlagsData, Signature, UserExternalName, UserFuncName, Value, types::*,};use cranelift_codegen::isa::{CallConv, TargetFrontendConfig, TargetIsa};use cranelift_codegen::settings;@@ -1419,7 +1419,7 @@ block0:8,8,true,- MemFlags::new(),+ MemFlagsData::new(),);builder.ins().return_(&[dest]);@@ -1471,7 +1471,7 @@ block0:8,8,true,- MemFlags::new(),+ MemFlagsData::new(),);builder.ins().return_(&[dest]);@@ -1516,7 +1516,7 @@ block0:let dest = builder.use_var(y);let size = 8;- builder.emit_small_memset(frontend_config, dest, 1, size, 8, MemFlags::new());+ builder.emit_small_memset(frontend_config, dest, 1, size, 8, MemFlagsData::new());builder.ins().return_(&[dest]);builder.seal_all_blocks();@@ -1555,7 +1555,7 @@ block0:let dest = builder.use_var(y);let size = 8192;- builder.emit_small_memset(frontend_config, dest, 1, size, 8, MemFlags::new());+ builder.emit_small_memset(frontend_config, dest, 1, size, 8, MemFlagsData::new());builder.ins().return_(&[dest]);builder.seal_all_blocks();@@ -1664,7 +1664,7 @@ block0:0,align_eight,align_eight,- MemFlags::new(),+ MemFlagsData::new(),)},);@@ -1693,7 +1693,7 @@ block0:1,align_one,align_one,- MemFlags::new(),+ MemFlagsData::new(),)},);@@ -1722,7 +1722,7 @@ block0:4,align_four,align_four,- MemFlags::new(),+ MemFlagsData::new(),)},);@@ -1751,7 +1751,7 @@ block0:16,align_two,align_two,- MemFlags::new(),+ MemFlagsData::new(),)},);@@ -1783,7 +1783,7 @@ block0:3,one,one,- MemFlags::new(),+ MemFlagsData::new(),)},);diff --git a/cranelift/fuzzgen/src/function_generator.rs b/cranelift/fuzzgen/src/function_generator.rsindex 9291d85b15..312a898e25 100644--- a/cranelift/fuzzgen/src/function_generator.rs+++ b/cranelift/fuzzgen/src/function_generator.rs@@ -17,7 +17,8 @@ use cranelift::codegen::isa::CallConv;use cranelift::frontend::{FunctionBuilder, FunctionBuilderContext, Switch, Variable};use cranelift::prelude::isa::OwnedTargetIsa;use cranelift::prelude::{- ExtFuncData, FloatCC, InstBuilder, IntCC, JumpTableData, MemFlags, StackSlotData, StackSlotKind,+ ExtFuncData, FloatCC, InstBuilder, IntCC, JumpTableData, MemFlagsData, StackSlotData,+ StackSlotKind,};use std::collections::HashMap;use std::ops::RangeInclusive;@@ -133,7 +134,7 @@ fn insert_stack_load(let type_size = typevar.bytes();let (slot, slot_size, _align, category) = fgen.stack_slot_with_size(type_size)?;- // `stack_load` doesn't support setting MemFlags, and it does not set any+ // `stack_load` doesn't support setting MemFlagsData, and it does not set any// alias analysis bits, so we can only emit it for `Other` slots.if category != AACategory::Other {return Err(arbitrary::Error::IncorrectFormat.into());@@ -160,7 +161,7 @@ fn insert_stack_store(let (slot, slot_size, _align, category) = fgen.stack_slot_with_size(type_size)?;- // `stack_store` doesn't support setting MemFlags, and it does not set any+ // `stack_store` doesn't support setting MemFlagsData, and it does not set any// alias analysis bits, so we can only emit it for `Other` slots.if category != AACategory::Other {return Err(arbitrary::Error::IncorrectFormat.into());@@ -256,7 +257,7 @@ fn insert_bitcast(let to_var = fgen.get_variable_of_type(rets[0])?;// TODO: We can generate little/big endian flags here.- let mut memflags = MemFlags::new();+ let mut memflags = MemFlagsData::new();// When bitcasting between vectors of different lane counts, we need to// specify the endianness.@@ -1184,7 +1185,7 @@ impl AACategory {]}- pub fn update_memflags(&self, flags: &mut MemFlags) {+ pub fn update_memflags(&self, flags: &mut MemFlagsData) {flags.set_alias_region(match self {AACategory::Other => None,AACategory::Heap => Some(AliasRegion::Heap),@@ -1350,7 +1351,7 @@ wherebuilder: &mut FunctionBuilder,min_size: u32,is_atomic: bool,- ) -> Result<(Value, MemFlags, Offset32)> {+ ) -> Result<(Value, MemFlagsData, Offset32)> {// Should we generate an aligned address// Some backends have issues with unaligned atomics.// AArch64: https://github.com/bytecodealliance/wasmtime/issues/5483@@ -1371,7 +1372,7 @@ wherebool::arbitrary(self.u)?};- let mut flags = MemFlags::new();+ let mut flags = MemFlagsData::new();// Even if we picked an aligned address, we can always generate unaligned memflagsif aligned && bool::arbitrary(self.u)? {flags.set_aligned();@@ -1680,7 +1681,7 @@ where// Each stack slot has an associated category, that means we have to set the// correct memflags for it. So we can't use `stack_store` directly.- let mut flags = MemFlags::new();+ let mut flags = MemFlagsData::new();flags.set_notrap();category.update_memflags(&mut flags);diff --git a/cranelift/interpreter/src/interpreter.rs b/cranelift/interpreter/src/interpreter.rsindex 1891078b18..9e39864d0e 100644--- a/cranelift/interpreter/src/interpreter.rs+++ b/cranelift/interpreter/src/interpreter.rs@@ -12,7 +12,7 @@ use crate::value::{DataValueExt, ValueError};use cranelift_codegen::data_value::DataValue;use cranelift_codegen::ir::{ArgumentPurpose, Block, Endianness, ExternalName, FuncRef, Function, GlobalValue,- GlobalValueData, LibCall, MemFlags, StackSlot, Type,+ GlobalValueData, LibCall, MemFlagsData, StackSlot, Type,};use log::trace;use smallvec::SmallVec;@@ -322,7 +322,7 @@ impl<'a> State<'a> for InterpreterState<'a> {&self,addr: Address,ty: Type,- mem_flags: MemFlags,+ mem_flags: MemFlagsData,) -> Result<DataValue, MemoryError> {let load_size = ty.bytes() as usize;let addr_start = addr.offset as usize;@@ -358,7 +358,7 @@ impl<'a> State<'a> for InterpreterState<'a> {&mut self,addr: Address,v: DataValue,- mem_flags: MemFlags,+ mem_flags: MemFlagsData,) -> Result<(), MemoryError> {let store_size = v.ty().bytes() as usize;let addr_start = addr.offset as usize;@@ -537,7 +537,7 @@ impl<'a> State<'a> for InterpreterState<'a> {global_type,}) => {let mut addr = Address::try_from(current_val)?;- let mem_flags = MemFlags::trusted();+ let mem_flags = MemFlagsData::trusted();// We can forego bounds checking here since its performed in `checked_load`addr.offset += offset as u64;current_val = self.checked_load(addr, global_type, mem_flags)?;diff --git a/cranelift/interpreter/src/state.rs b/cranelift/interpreter/src/state.rsindex 2447a5fbcb..4ca9c0f06b 100644--- a/cranelift/interpreter/src/state.rs+++ b/cranelift/interpreter/src/state.rs@@ -5,8 +5,8 @@ use crate::frame::Frame;use crate::interpreter::LibCallHandler;use cranelift_codegen::data_value::DataValue;use cranelift_codegen::ir::{- ExternalName, FuncRef, Function, GlobalValue, LibCall, MemFlags, Signature, StackSlot, Type,- Value, types,+ ExternalName, FuncRef, Function, GlobalValue, LibCall, MemFlagsData, Signature, StackSlot,+ Type, Value, types,};use cranelift_codegen::isa::CallConv;use smallvec::SmallVec;@@ -55,7 +55,7 @@ pub trait State<'a> {&self,address: Address,ty: Type,- mem_flags: MemFlags,+ mem_flags: MemFlagsData,) -> Result<DataValue, MemoryError>;/// Store a value `V` into memory at the given `address`, checking if it belongs either to the/// stack or to one of the heaps; the number of bytes stored corresponds to the specified [Type].@@ -63,7 +63,7 @@ pub trait State<'a> {&mut self,address: Address,v: DataValue,- mem_flags: MemFlags,+ mem_flags: MemFlagsData,) -> Result<(), MemoryError>;/// Compute the address of a function given its name.@@ -128,13 +128,13 @@ pub enum MemoryError {OutOfBoundsLoad {addr: Address,load_size: usize,- mem_flags: MemFlags,+ mem_flags: MemFlagsData,},#[error("Store of {store_size} bytes is larger than available size at address {addr:?}")]OutOfBoundsStore {addr: Address,store_size: usize,- mem_flags: MemFlags,+ mem_flags: MemFlagsData,},#[error("Load of {load_size} bytes is misaligned at address {addr:?}")]MisalignedLoad { addr: Address, load_size: usize },diff --git a/cranelift/interpreter/src/step.rs b/cranelift/interpreter/src/step.rsindex 9ac203e0ff..8d1fdcd74d 100644--- a/cranelift/interpreter/src/step.rs+++ b/cranelift/interpreter/src/step.rs@@ -9,7 +9,7 @@ use cranelift_codegen::data_value::DataValue;use cranelift_codegen::ir::condcodes::{FloatCC, IntCC};use cranelift_codegen::ir::{AbiParam, AtomicRmwOp, Block, BlockArg, BlockCall, Endianness, ExternalName, FuncRef, Function,- InstructionData, MemFlags, Opcode, TrapCode, Type, Value as ValueRef, types,+ InstructionData, MemFlagsData, Opcode, TrapCode, Type, Value as ValueRef, types,};use log::trace;use smallvec::{SmallVec, smallvec};@@ -538,7 +538,7 @@ wherelet load_ty = inst_context.controlling_type().unwrap();let slot = inst.stack_slot().unwrap();let offset = sum_unsigned(imm(), args())? as u64;- let mem_flags = MemFlags::new();+ let mem_flags = MemFlagsData::new();assign_or_memtrap({state.stack_address(AddressSize::_64, slot, offset)@@ -549,7 +549,7 @@ wherelet arg = arg(0);let slot = inst.stack_slot().unwrap();let offset = sum_unsigned(imm(), args_range(1..)?)? as u64;- let mem_flags = MemFlags::new();+ let mem_flags = MemFlagsData::new();continue_or_memtrap({state.stack_address(AddressSize::_64, slot, offset)diff --git a/cranelift/isle/isle/isle_examples/pass/prio_trie_bug.isle b/cranelift/isle/isle/isle_examples/pass/prio_trie_bug.isleindex 0040f65b9b..c99cafc98e 100644--- a/cranelift/isle/isle/isle_examples/pass/prio_trie_bug.isle+++ b/cranelift/isle/isle/isle_examples/pass/prio_trie_bug.isle@@ -6,7 +6,7 @@(type Unit (primitive Unit))(type Reg (primitive Reg))-(type MemFlags (primitive MemFlags))+(type MemFlagsData (primitive MemFlagsData))(type MachLabel (primitive MachLabel))(type Value (primitive Value))@@ -45,14 +45,14 @@;; Immediate sign-extended and a register(ImmReg (simm32 u32)(base Reg)- (flags MemFlags))+ (flags MemFlagsData));; Sign-extend-32-to-64(simm32) + base + (index << shift)(ImmRegRegShift (simm32 u32)(base Reg)(index Reg)(shift u32)- (flags MemFlags))+ (flags MemFlagsData));; Sign-extend-32-to-64(immediate) + RIP (instruction;; pointer). The appropriate relocation is emitted sodiff --git a/cranelift/isle/veri/veri_engine/examples/store/broken_bvsub_store_with_load.isle b/cranelift/isle/veri/veri_engine/examples/store/broken_bvsub_store_with_load.isleindex 8523214222..a16efcf048 100644--- a/cranelift/isle/veri/veri_engine/examples/store/broken_bvsub_store_with_load.isle+++ b/cranelift/isle/veri/veri_engine/examples/store/broken_bvsub_store_with_load.isle@@ -12,14 +12,14 @@;; Immediate sign-extended and a register(ImmReg (simm32 i32)(base Reg)- (flags MemFlags))+ (flags MemFlagsData));; Sign-extend-32-to-64(simm32) + base + (index << shift)(ImmRegRegShift (simm32 i32)(base Gpr)(index Gpr)(shift u8)- (flags MemFlags))+ (flags MemFlagsData));; Sign-extend-32-to-64(immediate) + RIP (instruction;; pointer). The appropriate relocation is emitted so@@ -76,7 +76,7 @@(provide (= result (concat flags (bvadd val (sign_ext 64 offset)))))(require(= (widthof val) 64)))-(decl to_amode (MemFlags Value Offset32) Amode)+(decl to_amode (MemFlagsData Value Offset32) Amode)(extern constructor to_amode to_amode)(decl operand_size_of_type_32_64 (Type) OperandSize)diff --git a/cranelift/isle/veri/veri_engine/examples/store/broken_isub_store_with_load.isle b/cranelift/isle/veri/veri_engine/examples/store/broken_isub_store_with_load.isleindex a2a7ec5f2a..2dfed3114f 100644--- a/cranelift/isle/veri/veri_engine/examples/store/broken_isub_store_with_load.isle+++ b/cranelift/isle/veri/veri_engine/examples/store/broken_isub_store_with_load.isle@@ -12,14 +12,14 @@;; Immediate sign-extended and a register(ImmReg (simm32 i32)(base Reg)- (flags MemFlags))+ (flags MemFlagsData));; Sign-extend-32-to-64(simm32) + base + (index << shift)(ImmRegRegShift (simm32 i32)(base Gpr)(index Gpr)(shift u8)- (flags MemFlags))+ (flags MemFlagsData));; Sign-extend-32-to-64(immediate) + RIP (instruction;; pointer). The appropriate relocation is emitted so@@ -76,7 +76,7 @@(provide (= result (concat flags (bvadd val (sign_ext 64 offset)))))(require(= (widthof val) 64)))-(decl to_amode (MemFlags Value Offset32) Amode)+(decl to_amode (MemFlagsData Value Offset32) Amode)(extern constructor to_amode to_amode)(decl operand_size_of_type_32_64 (Type) OperandSize)diff --git a/cranelift/isle/veri/veri_engine/examples/x86/amode_add_shl.isle b/cranelift/isle/veri/veri_engine/examples/x86/amode_add_shl.isleindex 990c4d275a..9c85f60855 100644--- a/cranelift/isle/veri/veri_engine/examples/x86/amode_add_shl.isle+++ b/cranelift/isle/veri/veri_engine/examples/x86/amode_add_shl.isle@@ -3,7 +3,7 @@(type Type (primitive Type))(type Inst (primitive Inst))(type Unit (primitive Unit))-(type MemFlags (primitive MemFlags))+(type MemFlagsData (primitive MemFlagsData))(type Gpr (primitive Gpr))(type Imm64 (primitive Imm64))@@ -111,14 +111,14 @@;; Immediate sign-extended and a register(ImmReg (simm32 u32)(base Reg)- (flags MemFlags))+ (flags MemFlagsData));; Sign-extend-32-to-64(simm32) + base + (index << shift)(ImmRegRegShift (simm32 u32)(base Gpr)(index Gpr)(shift u8)- (flags MemFlags))+ (flags MemFlagsData))))diff --git a/cranelift/isle/veri/veri_engine/examples/x86/amode_add_uextend_shl.isle b/cranelift/isle/veri/veri_engine/examples/x86/amode_add_uextend_shl.isleindex 1b4c5f2538..a3e9ac7451 100644--- a/cranelift/isle/veri/veri_engine/examples/x86/amode_add_uextend_shl.isle+++ b/cranelift/isle/veri/veri_engine/examples/x86/amode_add_uextend_shl.isle@@ -5,7 +5,7 @@(type Type (primitive Type))(type Inst (primitive Inst))(type Unit (primitive Unit))-(type MemFlags (primitive MemFlags))+(type MemFlagsData (primitive MemFlagsData))(type Gpr (primitive Gpr))(type Imm64 (primitive Imm64))@@ -122,14 +122,14 @@;; Immediate sign-extended and a register(ImmReg (simm32 u32)(base Reg)- (flags MemFlags))+ (flags MemFlagsData));; Sign-extend-32-to-64(simm32) + base + (index << shift)(ImmRegRegShift (simm32 u32)(base Gpr)(index Gpr)(shift u8)- (flags MemFlags))+ (flags MemFlagsData))))diff --git a/cranelift/reader/src/parser.rs b/cranelift/reader/src/parser.rsindex bbd2d08828..235a1941bc 100644--- a/cranelift/reader/src/parser.rs+++ b/cranelift/reader/src/parser.rs@@ -20,7 +20,7 @@ use cranelift_codegen::ir::{DebugTag, types::*};use cranelift_codegen::ir::{AbiParam, ArgumentExtension, ArgumentPurpose, Block, BlockArg, Constant, ConstantData,DynamicStackSlot, DynamicStackSlotData, DynamicTypeData, ExtFuncData, ExternalName, FuncRef,- Function, GlobalValue, GlobalValueData, JumpTableData, MemFlags, Opcode, SigRef, Signature,+ Function, GlobalValue, GlobalValueData, JumpTableData, MemFlagsData, Opcode, SigRef, Signature,StackSlot, StackSlotData, StackSlotKind, UserFuncName, Value, types,};use cranelift_codegen::isa::{self, CallConv};@@ -884,8 +884,8 @@ impl<'a> Parser<'a> {}// Match and a consume a possibly empty sequence of memory operation flags.- fn optional_memflags(&mut self) -> ParseResult<MemFlags> {- let mut flags = MemFlags::new();+ fn optional_memflags(&mut self) -> ParseResult<MemFlagsData> {+ let mut flags = MemFlagsData::new();while let Some(Token::Identifier(text)) = self.token() {match flags.set_by_name(text) {Ok(true) => {diff --git a/cranelift/umbrella/src/lib.rs b/cranelift/umbrella/src/lib.rsindex cfda269c73..089a0406b7 100644--- a/cranelift/umbrella/src/lib.rs+++ b/cranelift/umbrella/src/lib.rs@@ -28,7 +28,7 @@ pub mod prelude {pub use crate::codegen::ir::types;pub use crate::codegen::ir::{AbiParam, Block, ExtFuncData, ExternalName, GlobalValueData, InstBuilder, JumpTableData,- MemFlags, Signature, StackSlotData, StackSlotKind, TrapCode, Type, Value,+ MemFlagsData, Signature, StackSlotData, StackSlotKind, TrapCode, Type, Value,};pub use crate::codegen::isa;pub use crate::codegen::settings::{self, Configurable};diff --git a/crates/cranelift/src/compiler.rs b/crates/cranelift/src/compiler.rsindex 546b6ad36b..5ab4ed2bf5 100644--- a/crates/cranelift/src/compiler.rs+++ b/crates/cranelift/src/compiler.rs@@ -7,7 +7,9 @@ use crate::{CompiledFunction, ModuleTextBuilder, array_call_signature};use cranelift_codegen::binemit::CodeOffset;use cranelift_codegen::inline::InlineCommand;use cranelift_codegen::ir::condcodes::IntCC;-use cranelift_codegen::ir::{self, InstBuilder, MemFlags, UserExternalName, UserFuncName, Value};+use cranelift_codegen::ir::{+ self, InstBuilder, MemFlagsData, UserExternalName, UserFuncName, Value,+};use cranelift_codegen::isa::CallConv;use cranelift_codegen::isa::{OwnedTargetIsa, TargetIsa,@@ -302,13 +304,13 @@ impl wasmtime_environ::Compiler for Compiler {base: vmctx,offset: i32::from(func_env.offsets.ptr.vmctx_store_context()).into(),global_type: isa.pointer_type(),- flags: MemFlags::trusted().with_readonly(),+ flags: MemFlagsData::trusted().with_readonly(),});let stack_limit = context.func.create_global_value(ir::GlobalValueData::Load {base: interrupts_ptr,offset: i32::from(func_env.offsets.ptr.vmstore_context_stack_limit()).into(),global_type: isa.pointer_type(),- flags: MemFlags::trusted(),+ flags: MemFlagsData::trusted(),});if self.tunables.signals_based_traps {context.func.stack_limit = Some(stack_limit);@@ -405,7 +407,7 @@ impl wasmtime_environ::Compiler for Compiler {let ptr = isa.pointer_bytes();let vm_store_context = builder.ins().load(pointer_type,- MemFlags::trusted(),+ MemFlagsData::trusted(),caller_vmctx,i32::from(ptr.vmcontext_store_context()),);@@ -421,7 +423,7 @@ impl wasmtime_environ::Compiler for Compiler {let ptr_size = isa.pointer_bytes();let callee = builder.ins().load(pointer_type,- MemFlags::trusted(),+ MemFlagsData::trusted(),callee_vmctx,ptr_size.vmarray_call_host_func_context_func_ref() + ptr_size.vm_func_ref_array_call(),);@@ -441,19 +443,19 @@ impl wasmtime_environ::Compiler for Compiler {if self.tunables.debug_guest {let vmstore_ctx_ptr = builder.ins().load(pointer_type,- MemFlags::trusted().with_readonly(),+ MemFlagsData::trusted().with_readonly(),caller_vmctx,i32::from(ptr_size.vmctx_store_context()),);let old_version = builder.ins().load(ir::types::I64,- MemFlags::trusted(),+ MemFlagsData::trusted(),vmstore_ctx_ptr,i32::from(ptr_size.vmstore_context_execution_version()),);let new_version = builder.ins().iadd_imm(old_version, 1);builder.ins().store(- MemFlags::trusted(),+ MemFlagsData::trusted(),new_version,vmstore_ctx_ptr,i32::from(ptr_size.vmstore_context_execution_version()),@@ -775,7 +777,7 @@ impl wasmtime_environ::Compiler for Compiler {self.debug_assert_vmctx_kind(&mut builder, vmctx, wasmtime_environ::VMCONTEXT_MAGIC);let vm_store_context = builder.ins().load(pointer_type,- MemFlags::trusted(),+ MemFlagsData::trusted(),vmctx,ptr_size.vmcontext_store_context(),);@@ -1115,7 +1117,7 @@ impl Compiler {// despite this load/store being unrelated to execution in Wasm itself.// For more details on this see the `ValRaw` type in// `wasmtime::runtime::vm`.- let flags = ir::MemFlags::new()+ let flags = ir::MemFlagsData::new().with_notrap().with_endianness(ir::Endianness::Little);@@ -1152,7 +1154,7 @@ impl Compiler {// Note that this is little-endian like `store_values_to_array` above,// see notes there for more information.- let flags = MemFlags::new()+ let flags = MemFlagsData::new().with_notrap().with_endianness(ir::Endianness::Little);@@ -1248,7 +1250,7 @@ impl Compiler {// Builtins are stored in an array in all `VMContext`s. First load the// base pointer of the array and then load the entry of the array that// corresponds to this builtin.- let mem_flags = ir::MemFlags::trusted().with_readonly();+ let mem_flags = ir::MemFlagsData::trusted().with_readonly();let array_addr = builder.ins().load(pointer_type,mem_flags,@@ -1300,7 +1302,7 @@ impl Compiler {}let magic = builder.ins().load(ir::types::I32,- MemFlags::trusted().with_endianness(self.isa.endianness()),+ MemFlagsData::trusted().with_endianness(self.isa.endianness()),vmctx,0,);@@ -1695,7 +1697,7 @@ fn save_last_wasm_entry_context(// First we need to get the `VMStoreContext`.let vm_store_context = builder.ins().load(pointer_type,- MemFlags::trusted(),+ MemFlagsData::trusted(),vmctx,i32::try_from(vm_store_context_offset).unwrap(),);@@ -1703,14 +1705,14 @@ fn save_last_wasm_entry_context(// Save the current fp/sp of the entry trampoline into the `VMStoreContext`.let fp = builder.ins().get_frame_pointer(pointer_type);builder.ins().store(- MemFlags::trusted(),+ MemFlagsData::trusted(),fp,vm_store_context,ptr_size.vmstore_context_last_wasm_entry_fp(),);let sp = builder.ins().get_stack_pointer(pointer_type);builder.ins().store(- MemFlags::trusted(),+ MemFlagsData::trusted(),sp,vm_store_context,ptr_size.vmstore_context_last_wasm_entry_sp(),@@ -1722,7 +1724,7 @@ fn save_last_wasm_entry_context(.ins().get_exception_handler_address(pointer_type, block, 0);builder.ins().store(- MemFlags::trusted(),+ MemFlagsData::trusted(),trap_handler,vm_store_context,ptr_size.vmstore_context_last_wasm_entry_trap_handler(),@@ -1740,7 +1742,7 @@ fn save_last_wasm_exit_fp_and_pc(// last Wasm frame.let trampoline_fp = builder.ins().get_frame_pointer(pointer_type);builder.ins().store(- MemFlags::trusted(),+ MemFlagsData::trusted(),trampoline_fp,limits,ptr.vmstore_context_last_wasm_exit_trampoline_fp(),@@ -1749,7 +1751,7 @@ fn save_last_wasm_exit_fp_and_pc(// Finally save the Wasm return address to the limits.let wasm_pc = builder.ins().get_return_address(pointer_type);builder.ins().store(- MemFlags::trusted(),+ MemFlagsData::trusted(),wasm_pc,limits,ptr.vmstore_context_last_wasm_exit_pc(),diff --git a/crates/cranelift/src/compiler/component.rs b/crates/cranelift/src/compiler/component.rsindex 70aabb93f9..2718ced60b 100644--- a/crates/cranelift/src/compiler/component.rs+++ b/crates/cranelift/src/compiler/component.rs@@ -5,7 +5,7 @@ use crate::trap::TranslateTrap;use crate::{TRAP_CANNOT_LEAVE_COMPONENT, TRAP_INTERNAL_ASSERT, compiler::Compiler};use cranelift_codegen::cursor::FuncCursor;use cranelift_codegen::ir::condcodes::IntCC;-use cranelift_codegen::ir::{self, InstBuilder, MemFlags, Value};+use cranelift_codegen::ir::{self, InstBuilder, MemFlagsData, Value};use cranelift_codegen::isa::{CallConv, TargetIsa};use cranelift_frontend::FunctionBuilder;use wasmtime_environ::error::{Result, bail};@@ -152,7 +152,7 @@ impl<'a> TrampolineCompiler<'a> {params.extend([me.builder.ins().load(pointer_type,- MemFlags::trusted(),+ MemFlagsData::trusted(),vmctx,i32::try_from(me.offsets.lowering_data(*index)).unwrap(),),@@ -968,7 +968,7 @@ impl<'a> TrampolineCompiler<'a> {// indirect function pointer with the list of arguments.let host_fn = self.builder.ins().load(pointer_type,- MemFlags::trusted(),+ MemFlagsData::trusted(),vmctx,i32::try_from(self.offsets.lowering_callee(index)).unwrap(),);@@ -1166,7 +1166,7 @@ impl<'a> TrampolineCompiler<'a> {&[],);- let trusted = ir::MemFlags::trusted().with_readonly();+ let trusted = ir::MemFlagsData::trusted().with_readonly();self.builder.switch_to_block(run_destructor_block);@@ -1190,7 +1190,7 @@ impl<'a> TrampolineCompiler<'a> {);let zero = self.builder.ins().iconst(ir::types::I32, i64::from(0));self.builder.ins().store(- ir::MemFlags::trusted(),+ ir::MemFlagsData::trusted(),zero,vmctx,i32::try_from(self.offsets.task_may_block()).unwrap(),@@ -1282,7 +1282,7 @@ impl<'a> TrampolineCompiler<'a> {// Restore the old value of `may_block`self.builder.ins().store(- ir::MemFlags::trusted(),+ ir::MemFlagsData::trusted(),old_may_block,vmctx,i32::try_from(self.offsets.task_may_block()).unwrap(),@@ -1311,7 +1311,7 @@ impl<'a> TrampolineCompiler<'a> {fn load_memory(&mut self, vmctx: ir::Value, memory: RuntimeMemoryIndex) -> ir::Value {self.builder.ins().load(self.isa.pointer_type(),- MemFlags::trusted(),+ MemFlagsData::trusted(),vmctx,i32::try_from(self.offsets.runtime_memory(memory)).unwrap(),)@@ -1326,7 +1326,7 @@ impl<'a> TrampolineCompiler<'a> {match callback {Some(idx) => self.builder.ins().load(pointer_type,- MemFlags::trusted(),+ MemFlagsData::trusted(),vmctx,i32::try_from(self.offsets.runtime_callback(idx)).unwrap(),),@@ -1343,7 +1343,7 @@ impl<'a> TrampolineCompiler<'a> {match post_return {Some(idx) => self.builder.ins().load(pointer_type,- MemFlags::trusted(),+ MemFlagsData::trusted(),vmctx,i32::try_from(self.offsets.runtime_post_return(idx)).unwrap(),),@@ -1365,14 +1365,14 @@ impl<'a> TrampolineCompiler<'a> {// per-process.let builtins_array = self.builder.ins().load(pointer_type,- MemFlags::trusted().with_readonly(),+ MemFlagsData::trusted().with_readonly(),vmctx,i32::try_from(self.offsets.builtins()).unwrap(),);// Next load the function pointer at `offset` and return that.self.builder.ins().load(pointer_type,- MemFlags::trusted().with_readonly(),+ MemFlagsData::trusted().with_readonly(),builtins_array,i32::try_from(index.index() * u32::from(self.offsets.ptr.size())).unwrap(),)@@ -1506,7 +1506,7 @@ impl<'a> TrampolineCompiler<'a> {let flags = self.builder.ins().load(ir::types::I32,- ir::MemFlags::trusted(),+ ir::MemFlagsData::trusted(),vmctx,i32::try_from(self.offsets.instance_flags(instance)).unwrap(),);@@ -1542,7 +1542,7 @@ impl<'a> TrampolineCompiler<'a> {let caller_vmctx = self.abi_load_params()[1];self.builder.ins().load(self.isa.pointer_type(),- ir::MemFlags::trusted()+ ir::MemFlagsData::trusted().with_readonly().with_alias_region(Some(ir::AliasRegion::Vmctx)).with_can_move(),@@ -1841,7 +1841,7 @@ impl TrampolineCompiler<'_> {if uses_retptr {results.push(self.builder.ins().load(pointer_type,- ir::MemFlags::trusted(),+ ir::MemFlagsData::trusted(),*args.last().unwrap(),0,));@@ -1928,7 +1928,7 @@ impl TrampolineCompiler<'_> {let from_vmmemory_definition = self.load_memory(vmctx, mem);self.builder.ins().load(pointer_type,- MemFlags::trusted(),+ MemFlagsData::trusted(),from_vmmemory_definition,i32::from(self.offsets.ptr.vmmemory_definition_base()),)@@ -1989,7 +1989,7 @@ impl<'a> UnsafeIntrinsicCompiler<'a> {// Load the `*mut T` out of the `VMStoreContext`.let data_address = self.cursor.ins().load(pointer_type,- ir::MemFlags::trusted()+ ir::MemFlagsData::trusted().with_readonly().with_alias_region(Some(ir::AliasRegion::Vmctx)).with_can_move(),@@ -2044,7 +2044,7 @@ impl<'a> UnsafeIntrinsicCompiler<'a> {let mut value = self.cursor.ins()- .load(clif_ty, ir::MemFlags::trusted(), pointer, 0);+ .load(clif_ty, ir::MemFlagsData::trusted(), pointer, 0);// Extend the value, if necessary. When implementing the// `u8-native-load` intrinsic, for example, we will load a Cranelift@@ -2097,7 +2097,7 @@ impl<'a> UnsafeIntrinsicCompiler<'a> {// Do the store!self.cursor.ins()- .store(ir::MemFlags::trusted(), value, pointer, 0);+ .store(ir::MemFlagsData::trusted(), value, pointer, 0);Ok(())}@@ -2128,7 +2128,7 @@ impl<'a> UnsafeIntrinsicCompiler<'a> {UnsafeIntrinsic::ContextGetI32_0 | UnsafeIntrinsic::ContextGetI32_1 => {let context = self.cursor.ins().load(ty,- MemFlags::trusted(),+ MemFlagsData::trusted(),vmstore_context,i32::from(offset),);@@ -2137,7 +2137,7 @@ impl<'a> UnsafeIntrinsicCompiler<'a> {UnsafeIntrinsic::ContextSetI32_0 | UnsafeIntrinsic::ContextSetI32_1 => {let new_context = params[2];self.cursor.ins().store(- MemFlags::trusted(),+ MemFlagsData::trusted(),new_context,vmstore_context,i32::from(offset),@@ -2161,7 +2161,7 @@ impl<'a> UnsafeIntrinsicCompiler<'a> {let caller_vmctx = params[1];self.cursor.ins().load(self.isa.pointer_type(),- ir::MemFlags::trusted()+ ir::MemFlagsData::trusted().with_readonly().with_alias_region(Some(ir::AliasRegion::Vmctx)).with_can_move(),diff --git a/crates/cranelift/src/func_environ.rs b/crates/cranelift/src/func_environ.rsindex 19499bac9b..70b344efc8 100644--- a/crates/cranelift/src/func_environ.rs+++ b/crates/cranelift/src/func_environ.rs@@ -14,7 +14,7 @@ use cranelift_codegen::ir::immediates::{Imm64, Offset32, V128Imm};use cranelift_codegen::ir::{self, BlockArg, Endianness, ExceptionTableData, ExceptionTableItem, types,};-use cranelift_codegen::ir::{ArgumentPurpose, ConstantData, Function, InstBuilder, MemFlags};+use cranelift_codegen::ir::{ArgumentPurpose, ConstantData, Function, InstBuilder, MemFlagsData};use cranelift_codegen::ir::{Block, types::*};use cranelift_codegen::isa::{CallConv, TargetFrontendConfig, TargetIsa};use cranelift_entity::packed_option::{PackedOption, ReservedValue};@@ -345,7 +345,7 @@ impl<'module_environment> FuncEnvironment<'module_environment> {base: vmctx,offset: Offset32::new(i32::try_from(from_offset).unwrap()),global_type: pointer_type,- flags: MemFlags::trusted().with_readonly().with_can_move(),+ flags: MemFlagsData::trusted().with_readonly().with_can_move(),});(global, 0)}@@ -364,7 +364,7 @@ impl<'module_environment> FuncEnvironment<'module_environment> {base,offset: Offset32::new(offset.into()),global_type: self.pointer_type(),- flags: ir::MemFlags::trusted().with_readonly().with_can_move(),+ flags: ir::MemFlagsData::trusted().with_readonly().with_can_move(),});self.vm_store_context = Some(ptr);ptr@@ -514,7 +514,7 @@ impl<'module_environment> FuncEnvironment<'module_environment> {let (addr, offset) = self.fuel_addr_offset(builder);let fuel = builder.ins()- .load(ir::types::I64, ir::MemFlags::trusted(), addr, offset);+ .load(ir::types::I64, ir::MemFlagsData::trusted(), addr, offset);builder.def_var(self.fuel_var, fuel);}@@ -525,7 +525,7 @@ impl<'module_environment> FuncEnvironment<'module_environment> {let fuel_consumed = builder.use_var(self.fuel_var);builder.ins()- .store(ir::MemFlags::trusted(), fuel_consumed, addr, offset);+ .store(ir::MemFlagsData::trusted(), fuel_consumed, addr, offset);}/// Returns the `(address, offset)` of the fuel consumption within@@ -663,7 +663,7 @@ impl<'module_environment> FuncEnvironment<'module_environment> {let offset = i32::from(self.offsets.ptr.vmctx_epoch_ptr());let epoch_ptr = builder.ins()- .load(pointer_type, ir::MemFlags::trusted(), base, offset);+ .load(pointer_type, ir::MemFlagsData::trusted(), base, offset);epoch_ptr}@@ -671,7 +671,7 @@ impl<'module_environment> FuncEnvironment<'module_environment> {let addr = builder.use_var(self.epoch_ptr_var);builder.ins().load(ir::types::I64,- ir::MemFlags::trusted(),+ ir::MemFlagsData::trusted(),addr,ir::immediates::Offset32::new(0),)@@ -726,7 +726,7 @@ impl<'module_environment> FuncEnvironment<'module_environment> {let vmstore_ctx = self.get_vmstore_context_ptr(builder);let deadline = builder.ins().load(ir::types::I64,- ir::MemFlags::trusted(),+ ir::MemFlagsData::trusted(),vmstore_ctx,ir::immediates::Offset32::new(self.offsets.ptr.vmstore_context_epoch_deadline() as i32),);@@ -935,7 +935,7 @@ impl<'module_environment> FuncEnvironment<'module_environment> {func: &mut ir::Function,ptr: ir::GlobalValue,offset: u32,- flags: ir::MemFlags,+ flags: ir::MemFlagsData,) -> ir::GlobalValue {func.create_global_value(ir::GlobalValueData::Load {base: ptr,@@ -951,7 +951,7 @@ impl<'module_environment> FuncEnvironment<'module_environment> {&mut self,func: &mut ir::Function,offset: u32,- flags: ir::MemFlags,+ flags: ir::MemFlagsData,) -> ir::GlobalValue {let vmctx = self.vmctx(func);self.global_load(func, vmctx, offset, flags)@@ -1041,7 +1041,7 @@ impl<'module_environment> FuncEnvironment<'module_environment> {) -> ir::Value {let vmctx = self.vmctx_val(pos);let pointer_type = self.pointer_type();- let mem_flags = ir::MemFlags::trusted().with_readonly().with_can_move();+ let mem_flags = ir::MemFlagsData::trusted().with_readonly().with_can_move();// Load the base pointer of the array of `VMSharedTypeIndex`es.let shared_indices = pos.ins().load(@@ -1067,7 +1067,7 @@ impl<'module_environment> FuncEnvironment<'module_environment> {pub(crate) fn load_funcref_type_index(&mut self,pos: &mut FuncCursor,- mem_flags: ir::MemFlags,+ mem_flags: ir::MemFlagsData,funcref: ir::Value,) -> ir::Value {let ty = self.vmshared_type_index_ty();@@ -1120,20 +1120,20 @@ impl<'module_environment> FuncEnvironment<'module_environment> {}}- fn memflags_for_debug_slot_value_wasm_ty(&self, ty: WasmValType) -> MemFlags {+ fn memflags_for_debug_slot_value_wasm_ty(&self, ty: WasmValType) -> MemFlagsData {// Store vectors in little-endian format: this is// universally supported, while native or// big-endian formats may not be in all cases// (e.g. Pulley on s390x).- let mut flags = MemFlags::trusted();+ let mut flags = MemFlagsData::trusted();if ty == WasmValType::V128 {flags.set_endianness(Endianness::Little);}flags}- fn memflags_for_debug_slot_value_clif_ty(&self, ty: ir::Type) -> MemFlags {- let mut flags = MemFlags::trusted();+ fn memflags_for_debug_slot_value_clif_ty(&self, ty: ir::Type) -> MemFlagsData {+ let mut flags = MemFlagsData::trusted();if ty.is_vector() {flags.set_endianness(Endianness::Little);}@@ -1523,7 +1523,7 @@ impl FuncEnvironment<'_> {let memory = self.global_load_from_vmctx(func,from_offset,- ir::MemFlags::trusted().with_readonly().with_can_move(),+ ir::MemFlagsData::trusted().with_readonly().with_can_move(),);let base_offset = i32::from(self.offsets.ptr.vmmemory_definition_base());let current_length_offset =@@ -1545,7 +1545,7 @@ impl FuncEnvironment<'_> {let memory = self.global_load_from_vmctx(func,from_offset,- ir::MemFlags::trusted().with_readonly().with_can_move(),+ ir::MemFlagsData::trusted().with_readonly().with_can_move(),);let base_offset = i32::from(self.offsets.ptr.vmmemory_definition_base());let current_length_offset =@@ -1558,7 +1558,7 @@ impl FuncEnvironment<'_> {base: base_ptr,offset: Offset32::new(current_length_offset),global_type: pointer_type,- flags: MemFlags::trusted(),+ flags: MemFlagsData::trusted(),});let base = self.make_heap_base(func, memory, base_ptr, base_offset);@@ -1581,7 +1581,7 @@ impl FuncEnvironment<'_> {let pointer_type = self.pointer_type();let memory_tunables = MemoryTunables::new(self.tunables, MemoryKind::LinearMemory);- let mut flags = ir::MemFlags::trusted().with_can_move();+ let mut flags = ir::MemFlagsData::trusted().with_can_move();if !memory.memory_may_move(&memory_tunables) {flags.set_readonly();}@@ -1615,7 +1615,7 @@ impl FuncEnvironment<'_> {base: vmctx,offset: Offset32::new(i32::try_from(from_offset).unwrap()),global_type: pointer_type,- flags: MemFlags::trusted().with_readonly().with_can_move(),+ flags: MemFlagsData::trusted().with_readonly().with_can_move(),});let base_offset = i32::from(self.offsets.vmtable_definition_base());let current_elements_offset =@@ -1639,9 +1639,9 @@ impl FuncEnvironment<'_> {flags: if Some(table.limits.min) == table.limits.max {// A fixed-size table can't be resized so its base address won't// change.- MemFlags::trusted().with_readonly().with_can_move()+ MemFlagsData::trusted().with_readonly().with_can_move()} else {- MemFlags::trusted()+ MemFlagsData::trusted()},});@@ -1658,7 +1658,7 @@ impl FuncEnvironment<'_> {u16::from(self.offsets.size_of_vmtable_definition_current_elements()) * 8,).unwrap(),- flags: MemFlags::trusted(),+ flags: MemFlagsData::trusted(),}),}};@@ -1712,13 +1712,13 @@ impl FuncEnvironment<'_> {let pointer_type = self.pointer_type();let from_vmctx = builder.ins().load(pointer_type,- MemFlags::trusted().with_readonly(),+ MemFlagsData::trusted().with_readonly(),vmctx,i32::try_from(vmctx_tag_vmctx_offset).unwrap(),);let index = builder.ins().load(I32,- MemFlags::trusted().with_readonly(),+ MemFlagsData::trusted().with_readonly(),vmctx,i32::try_from(vmctx_tag_index_offset).unwrap(),);@@ -1817,7 +1817,7 @@ impl<'a, 'func, 'module_env> Call<'a, 'func, 'module_env> {let vmctx = self.env.vmctx(self.builder.func);let base = self.builder.ins().global_value(pointer_type, vmctx);- let mem_flags = ir::MemFlags::trusted().with_readonly().with_can_move();+ let mem_flags = ir::MemFlagsData::trusted().with_readonly().with_can_move();// Load the callee address.let body_offset = i32::try_from(@@ -2034,7 +2034,7 @@ impl<'a, 'func, 'module_env> Call<'a, 'func, 'module_env> {if self.env.clif_memory_traps_enabled() {self.builder.ins().load(sig_id_type,- ir::MemFlags::trusted()+ ir::MemFlagsData::trusted().with_readonly().with_trap_code(Some(crate::TRAP_INDIRECT_CALL_TO_NULL)),funcref_ptr,@@ -2097,7 +2097,7 @@ impl<'a, 'func, 'module_env> Call<'a, 'func, 'module_env> {//// Note that the callee may be null in which case this load may// trap. If so use the `TRAP_INDIRECT_CALL_TO_NULL` trap code.- let mut mem_flags = ir::MemFlags::trusted().with_readonly();+ let mut mem_flags = ir::MemFlagsData::trusted().with_readonly();if self.env.clif_memory_traps_enabled() {mem_flags = mem_flags.with_trap_code(Some(crate::TRAP_INDIRECT_CALL_TO_NULL));} else {@@ -2178,7 +2178,7 @@ impl<'a, 'func, 'module_env> Call<'a, 'func, 'module_env> {// optional trap code provided by the caller of `unchecked_call` which// will handle the case where this is either already known to be// non-null or may trap.- let mem_flags = ir::MemFlags::trusted().with_readonly();+ let mem_flags = ir::MemFlagsData::trusted().with_readonly();let mut callee_flags = mem_flags;if self.env.clif_memory_traps_enabled() {callee_flags = callee_flags.with_trap_code(callee_load_trap_code);@@ -3042,7 +3042,7 @@ impl FuncEnvironment<'_> {},GlobalVariable::Memory { gv, offset, ty } => {let addr = builder.ins().global_value(self.pointer_type(), gv);- let mut flags = ir::MemFlags::trusted();+ let mut flags = ir::MemFlagsData::trusted();// Store vector globals in little-endian format to avoid// byte swaps on big-endian platforms since at-rest vectors// should already be in little-endian format anyway.@@ -3074,9 +3074,9 @@ impl FuncEnvironment<'_> {ref_ty,src,if global_ty.mutability {- ir::MemFlags::trusted()+ ir::MemFlagsData::trusted()} else {- ir::MemFlags::trusted().with_readonly().with_can_move()+ ir::MemFlagsData::trusted().with_readonly().with_can_move()},)}@@ -3095,7 +3095,7 @@ impl FuncEnvironment<'_> {}GlobalVariable::Memory { gv, offset, ty } => {let addr = builder.ins().global_value(self.pointer_type(), gv);- let mut flags = ir::MemFlags::trusted();+ let mut flags = ir::MemFlagsData::trusted();// Like `global.get`, store globals in little-endian format.if ty.is_vector() {flags.set_endianness(ir::Endianness::Little);@@ -3126,7 +3126,7 @@ impl FuncEnvironment<'_> {ty,src,val,- ir::MemFlags::trusted(),+ ir::MemFlagsData::trusted(),)?}}@@ -3244,14 +3244,14 @@ impl FuncEnvironment<'_> {let vmctx = pos.ins().load(self.isa.pointer_type(),- ir::MemFlags::trusted(),+ ir::MemFlagsData::trusted(),cur_vmctx,i32::try_from(vmimport + u32::from(self.offsets.vmmemory_import_vmctx())).unwrap(),);let index = pos.ins().load(ir::types::I32,- ir::MemFlags::trusted(),+ ir::MemFlagsData::trusted(),cur_vmctx,i32::try_from(vmimport + u32::from(self.offsets.vmmemory_import_index())).unwrap(),@@ -3280,14 +3280,14 @@ impl FuncEnvironment<'_> {let vmctx = pos.ins().load(self.isa.pointer_type(),- ir::MemFlags::trusted(),+ ir::MemFlagsData::trusted(),cur_vmctx,i32::try_from(vmimport + u32::from(self.offsets.vmtable_import_vmctx())).unwrap(),);let index = pos.ins().load(ir::types::I32,- ir::MemFlags::trusted(),+ ir::MemFlagsData::trusted(),cur_vmctx,i32::try_from(vmimport + u32::from(self.offsets.vmtable_import_index())).unwrap(),@@ -3344,7 +3344,7 @@ impl FuncEnvironment<'_> {i32::try_from(self.offsets.vmctx_vmmemory_pointer(def_index)).unwrap();let vmmemory_ptr =pos.ins()- .load(pointer_type, ir::MemFlags::trusted(), base, offset);+ .load(pointer_type, ir::MemFlagsData::trusted(), base, offset);let vmmemory_definition_offset =i64::from(self.offsets.ptr.vmmemory_definition_current_length());let vmmemory_definition_ptr =@@ -3357,7 +3357,7 @@ impl FuncEnvironment<'_> {// bounds-checked version of this is implemented.pos.ins().atomic_load(pointer_type,- ir::MemFlags::trusted(),+ ir::MemFlagsData::trusted(),vmmemory_definition_ptr,)} else {@@ -3368,14 +3368,14 @@ impl FuncEnvironment<'_> {).unwrap();pos.ins()- .load(pointer_type, ir::MemFlags::trusted(), base, offset)+ .load(pointer_type, ir::MemFlagsData::trusted(), base, offset)}}None => {let offset = i32::try_from(self.offsets.vmctx_vmmemory_import_from(index)).unwrap();let vmmemory_ptr =pos.ins()- .load(pointer_type, ir::MemFlags::trusted(), base, offset);+ .load(pointer_type, ir::MemFlagsData::trusted(), base, offset);if is_shared {let vmmemory_definition_offset =i64::from(self.offsets.ptr.vmmemory_definition_current_length());@@ -3383,13 +3383,13 @@ impl FuncEnvironment<'_> {pos.ins().iadd_imm(vmmemory_ptr, vmmemory_definition_offset);pos.ins().atomic_load(pointer_type,- ir::MemFlags::trusted(),+ ir::MemFlagsData::trusted(),vmmemory_definition_ptr,)} else {pos.ins().load(pointer_type,- ir::MemFlags::trusted(),+ ir::MemFlagsData::trusted(),vmmemory_ptr,i32::from(self.offsets.ptr.vmmemory_definition_current_length()),)diff --git a/crates/cranelift/src/func_environ/gc.rs b/crates/cranelift/src/func_environ/gc.rsindex 3ddc7a5156..72a8dce1be 100644--- a/crates/cranelift/src/func_environ/gc.rs+++ b/crates/cranelift/src/func_environ/gc.rs@@ -126,7 +126,7 @@ pub trait GcCompiler {builder: &mut FunctionBuilder,ty: WasmRefType,src: ir::Value,- flags: ir::MemFlags,+ flags: ir::MemFlagsData,) -> WasmResult<ir::Value>;/// Emit a write barrier for when we are writing a GC reference over another@@ -168,7 +168,7 @@ pub trait GcCompiler {ty: WasmRefType,dst: ir::Value,new_val: ir::Value,- flags: ir::MemFlags,+ flags: ir::MemFlagsData,) -> WasmResult<()>;}diff --git a/crates/cranelift/src/func_environ/gc/enabled.rs b/crates/cranelift/src/func_environ/gc/enabled.rsindex b5ac2cac73..6494a4d7db 100644--- a/crates/cranelift/src/func_environ/gc/enabled.rs+++ b/crates/cranelift/src/func_environ/gc/enabled.rs@@ -33,8 +33,8 @@ mod copying;/// retain internal assertion metadata to report if such a trap happens. This/// is here to ensure that in the face of heap corruption that there's no/// possible UB within Cranelift and/or the runtime.-const GC_MEMFLAGS: ir::MemFlags =- ir::MemFlags::new().with_trap_code(Some(crate::TRAP_GC_HEAP_CORRUPT));+const GC_MEMFLAGS: ir::MemFlagsData =+ ir::MemFlagsData::new().with_trap_code(Some(crate::TRAP_GC_HEAP_CORRUPT));/// Get the default GC compiler.pub fn gc_compiler(func_env: &mut FuncEnvironment<'_>) -> WasmResult<Box<dyn GcCompiler>> {@@ -88,7 +88,7 @@ fn unbarriered_load_gc_ref(builder: &mut FunctionBuilder,ty: WasmHeapType,ptr_to_gc_ref: ir::Value,- flags: ir::MemFlags,+ flags: ir::MemFlagsData,) -> WasmResult<ir::Value> {debug_assert!(ty.is_vmgcref_type());let gc_ref = builder.ins().load(ir::types::I32, flags, ptr_to_gc_ref, 0);@@ -107,7 +107,7 @@ fn unbarriered_store_gc_ref(ty: WasmHeapType,dst: ir::Value,gc_ref: ir::Value,- flags: ir::MemFlags,+ flags: ir::MemFlagsData,) -> WasmResult<()> {debug_assert!(ty.is_vmgcref_type());builder.ins().store(flags, gc_ref, dst, 0);@@ -280,7 +280,7 @@ fn write_func_ref_at_addr(func_env: &mut FuncEnvironment<'_>,builder: &mut FunctionBuilder<'_>,ref_type: WasmRefType,- flags: ir::MemFlags,+ flags: ir::MemFlagsData,field_addr: ir::Value,func_ref: ir::Value,) -> WasmResult<()> {@@ -1490,7 +1490,7 @@ impl FuncEnvironment<'_> {let store_context_ptr = self.get_vmstore_context_ptr_global(func);let offset = self.offsets.ptr.vmstore_context_gc_heap_base();- let mut flags = ir::MemFlags::trusted();+ let mut flags = ir::MemFlagsData::trusted();let memory_tunables =wasmtime_environ::MemoryTunables::new(self.tunables, MemoryKind::GcHeap);if !self@@ -1530,7 +1530,7 @@ impl FuncEnvironment<'_> {base: store_context_ptr,offset: Offset32::new(offset.into()),global_type: self.pointer_type(),- flags: ir::MemFlags::trusted(),+ flags: ir::MemFlagsData::trusted(),});self.gc_heap_bound = Some(bound);bounddiff --git a/crates/cranelift/src/func_environ/gc/enabled/copying.rs b/crates/cranelift/src/func_environ/gc/enabled/copying.rsindex 9d34d413c5..8b361be96e 100644--- a/crates/cranelift/src/func_environ/gc/enabled/copying.rs+++ b/crates/cranelift/src/func_environ/gc/enabled/copying.rs@@ -36,7 +36,7 @@ impl CopyingCompiler {let vmctx = func_env.vmctx_val(&mut builder.cursor());builder.ins().load(pointer_type,- ir::MemFlags::trusted().with_readonly().with_can_move(),+ ir::MemFlagsData::trusted().with_readonly().with_can_move(),vmctx,i32::from(func_env.offsets.ptr.vmctx_gc_heap_data()),)@@ -53,13 +53,13 @@ impl CopyingCompiler {) -> (ir::Value, ir::Value) {let bump_ptr = builder.ins().load(ir::types::I32,- ir::MemFlags::trusted().with_can_move(),+ ir::MemFlagsData::trusted().with_can_move(),ptr_to_heap_data,i32::from(func_env.offsets.ptr.vmcopying_heap_data_bump_ptr()),);let active_space_end = builder.ins().load(ir::types::I32,- ir::MemFlags::trusted().with_readonly().with_can_move(),+ ir::MemFlagsData::trusted().with_readonly().with_can_move(),ptr_to_heap_data,i32::from(func_env.offsets.ptr.vmcopying_heap_data_active_space_end()),);@@ -154,7 +154,7 @@ impl CopyingCompiler {// Update the bump pointer.let end_of_object = builder.ins().ireduce(ir::types::I32, end_64);builder.ins().store(- ir::MemFlags::trusted().with_alias_region(Some(ir::AliasRegion::Vmctx)),+ ir::MemFlagsData::trusted().with_alias_region(Some(ir::AliasRegion::Vmctx)),end_of_object,ptr_to_heap_data,i32::from(func_env.offsets.ptr.vmcopying_heap_data_bump_ptr()),@@ -170,7 +170,7 @@ impl CopyingCompiler {.ins().iconst(ir::types::I32, i64::from(kind.as_u32()));builder.ins().store(- ir::MemFlags::trusted(),+ ir::MemFlagsData::trusted(),kind_val,obj_ptr,i32::try_from(wasmtime_environ::VM_GC_HEADER_KIND_OFFSET).unwrap(),@@ -179,7 +179,7 @@ impl CopyingCompiler {// Write `VMGcHeader::type_index`.let shared_ty = func_env.module_interned_to_shared_ty(&mut builder.cursor(), ty);builder.ins().store(- ir::MemFlags::trusted(),+ ir::MemFlagsData::trusted(),shared_ty,obj_ptr,i32::try_from(wasmtime_environ::VM_GC_HEADER_TYPE_INDEX_OFFSET).unwrap(),@@ -187,7 +187,7 @@ impl CopyingCompiler {// Write `VMCopyingHeader::object_size`.builder.ins().istore32(- ir::MemFlags::trusted(),+ ir::MemFlagsData::trusted(),aligned_size_64,obj_ptr,i32::try_from(wasmtime_environ::VM_GC_HEADER_SIZE).unwrap(),@@ -412,7 +412,7 @@ impl GcCompiler for CopyingCompiler {builder: &mut FunctionBuilder,ty: WasmRefType,src: ir::Value,- flags: ir::MemFlags,+ flags: ir::MemFlagsData,) -> WasmResult<ir::Value> {assert!(ty.is_vmgcref_type());@@ -448,7 +448,7 @@ impl GcCompiler for CopyingCompiler {ty: WasmRefType,dst: ir::Value,new_val: ir::Value,- flags: ir::MemFlags,+ flags: ir::MemFlagsData,) -> WasmResult<()> {// No write barrier needed for the copying collector.unbarriered_store_gc_ref(builder, ty.heap_type, dst, new_val, flags)diff --git a/crates/cranelift/src/func_environ/gc/enabled/drc.rs b/crates/cranelift/src/func_environ/gc/enabled/drc.rsindex a13daac721..ece70b21fe 100644--- a/crates/cranelift/src/func_environ/gc/enabled/drc.rs+++ b/crates/cranelift/src/func_environ/gc/enabled/drc.rs@@ -129,7 +129,7 @@ impl DrcCompiler {let vmctx = builder.ins().global_value(ptr_ty, vmctx);builder.ins().load(ptr_ty,- ir::MemFlags::trusted().with_readonly(),+ ir::MemFlagsData::trusted().with_readonly(),vmctx,i32::from(func_env.offsets.ptr.vmctx_gc_heap_data()),)@@ -250,7 +250,7 @@ impl DrcCompiler {ty: WasmRefType,dst: ir::Value,new_val: ir::Value,- flags: ir::MemFlags,+ flags: ir::MemFlagsData,) -> WasmResult<()> {let (ref_ty, _) = func_env.reference_type(ty.heap_type);@@ -537,7 +537,7 @@ impl GcCompiler for DrcCompiler {builder: &mut FunctionBuilder,ty: WasmRefType,src: ir::Value,- flags: ir::MemFlags,+ flags: ir::MemFlagsData,) -> WasmResult<ir::Value> {log::trace!("translate_read_gc_reference({ty:?}, {src:?}, {flags:?})");@@ -688,7 +688,7 @@ impl GcCompiler for DrcCompiler {ty: WasmRefType,dst: ir::Value,new_val: ir::Value,- flags: ir::MemFlags,+ flags: ir::MemFlagsData,) -> WasmResult<()> {assert!(ty.is_vmgcref_type());diff --git a/crates/cranelift/src/func_environ/gc/enabled/null.rs b/crates/cranelift/src/func_environ/gc/enabled/null.rsindex dc7cba2e16..a52ad637bd 100644--- a/crates/cranelift/src/func_environ/gc/enabled/null.rs+++ b/crates/cranelift/src/func_environ/gc/enabled/null.rs@@ -73,7 +73,7 @@ impl NullCompiler {let vmctx = func_env.vmctx_val(&mut builder.cursor());let ptr_to_next = builder.ins().load(pointer_type,- ir::MemFlags::trusted().with_readonly(),+ ir::MemFlagsData::trusted().with_readonly(),vmctx,i32::from(func_env.offsets.ptr.vmctx_gc_heap_data()),);@@ -374,7 +374,7 @@ impl GcCompiler for NullCompiler {builder: &mut FunctionBuilder,_ty: WasmRefType,src: ir::Value,- flags: ir::MemFlags,+ flags: ir::MemFlagsData,) -> WasmResult<ir::Value> {// NB: Don't use `unbarriered_load_gc_ref` here because we don't need to// mark the value as requiring inclusion in stack maps.@@ -388,7 +388,7 @@ impl GcCompiler for NullCompiler {ty: WasmRefType,dst: ir::Value,new_val: ir::Value,- flags: ir::MemFlags,+ flags: ir::MemFlagsData,) -> WasmResult<()> {unbarriered_store_gc_ref(builder, ty.heap_type, dst, new_val, flags)}diff --git a/crates/cranelift/src/func_environ/stack_switching/instructions.rs b/crates/cranelift/src/func_environ/stack_switching/instructions.rsindex 9579dd3583..5da5c88623 100644--- a/crates/cranelift/src/func_environ/stack_switching/instructions.rs+++ b/crates/cranelift/src/func_environ/stack_switching/instructions.rs@@ -4,7 +4,7 @@ use itertools::{Either, Itertools};use crate::trap::TranslateTrap;use cranelift_codegen::ir::condcodes::*;use cranelift_codegen::ir::types::*;-use cranelift_codegen::ir::{self, MemFlags};+use cranelift_codegen::ir::{self, MemFlagsData};use cranelift_codegen::ir::{Block, BlockCall, InstBuilder, JumpTableData};use cranelift_frontend::FunctionBuilder;use wasmtime_environ::{PtrSize, TagIndex, TypeIndex, WasmResult, WasmValType, wasm_unsupported};@@ -159,7 +159,7 @@ pub(crate) mod stack_switching_helpers {last_ancestor: ir::Value,) {let offset: i32 = env.offsets.ptr.vmcontref_last_ancestor().into();- let mem_flags = ir::MemFlags::trusted();+ let mem_flags = ir::MemFlagsData::trusted();builder.ins().store(mem_flags, last_ancestor, self.address, offset);@@ -171,7 +171,7 @@ pub(crate) mod stack_switching_helpers {builder: &mut FunctionBuilder,) -> ir::Value {let offset: i32 = env.offsets.ptr.vmcontref_last_ancestor().into();- let mem_flags = ir::MemFlags::trusted();+ let mem_flags = ir::MemFlagsData::trusted();builder.ins().load(env.pointer_type(), mem_flags, self.address, offset)@@ -184,7 +184,7 @@ pub(crate) mod stack_switching_helpers {env: &mut crate::func_environ::FuncEnvironment<'a>,builder: &mut FunctionBuilder,) -> ir::Value {- let mem_flags = ir::MemFlags::trusted();+ let mem_flags = ir::MemFlagsData::trusted();let offset: i32 = env.offsets.ptr.vmcontref_revision().into();let revision = builder.ins().load(I64, mem_flags, self.address, offset);revision@@ -199,7 +199,7 @@ pub(crate) mod stack_switching_helpers {builder: &mut FunctionBuilder,revision: ir::Value,) -> ir::Value {- let mem_flags = ir::MemFlags::trusted();+ let mem_flags = ir::MemFlagsData::trusted();let offset: i32 = env.offsets.ptr.vmcontref_revision().into();let revision_plus1 = builder.ins().iadd_imm(revision, 1);builder@@ -229,7 +229,7 @@ pub(crate) mod stack_switching_helpers {}fn get(&self, builder: &mut FunctionBuilder, ty: ir::Type, offset: i32) -> ir::Value {- let mem_flags = ir::MemFlags::trusted();+ let mem_flags = ir::MemFlagsData::trusted();builder.ins().load(ty, mem_flags, self.address, offset)}@@ -239,7 +239,7 @@ pub(crate) mod stack_switching_helpers {Type::int_with_byte_size(u16::try_from(core::mem::size_of::<U>()).unwrap()).unwrap());- let mem_flags = ir::MemFlags::trusted();+ let mem_flags = ir::MemFlagsData::trusted();builder.ins().store(mem_flags, value, self.address, offset);}@@ -292,7 +292,7 @@ pub(crate) mod stack_switching_helpers {) {debug_assert_eq!(builder.func.dfg.value_type(data), env.pointer_type());let offset: i32 = env.offsets.ptr.vmhostarray_data().into();- let mem_flags = ir::MemFlags::trusted();+ let mem_flags = ir::MemFlagsData::trusted();builder.ins().store(mem_flags, data, self.address, offset);}@@ -371,7 +371,7 @@ pub(crate) mod stack_switching_helpers {builder: &mut FunctionBuilder,load_types: &[ir::Type],) -> Vec<ir::Value> {- let memflags = ir::MemFlags::trusted();+ let memflags = ir::MemFlagsData::trusted();let data_start_pointer = self.get_data(env, builder);let mut values = vec![];@@ -409,7 +409,7 @@ pub(crate) mod stack_switching_helpers {size <= entry_size}));- let memflags = ir::MemFlags::trusted();+ let memflags = ir::MemFlagsData::trusted();let data_start_pointer = self.get_data(env, builder);@@ -517,7 +517,7 @@ pub(crate) mod stack_switching_helpers {initial_offset: i32,pointer_type: ir::Type,) -> VMStackChain {- let memflags = ir::MemFlags::trusted();+ let memflags = ir::MemFlagsData::trusted();let mut offset = initial_offset;let mut data = vec![];for _ in 0..2 {@@ -536,7 +536,7 @@ pub(crate) mod stack_switching_helpers {target_pointer: ir::Value,initial_offset: i32,) {- let memflags = ir::MemFlags::trusted();+ let memflags = ir::MemFlagsData::trusted();let mut offset = initial_offset;let data = self.to_raw_parts();@@ -605,7 +605,7 @@ pub(crate) mod stack_switching_helpers {env: &mut crate::func_environ::FuncEnvironment<'a>,builder: &mut FunctionBuilder,) -> ir::Value {- let mem_flags = ir::MemFlags::trusted();+ let mem_flags = ir::MemFlagsData::trusted();let state_ptr = self.get_state_ptr(env, builder);builder.ins().load(I32, mem_flags, state_ptr, 0)@@ -618,7 +618,7 @@ pub(crate) mod stack_switching_helpers {discriminant: u32,) {let discriminant = builder.ins().iconst(I32, i64::from(discriminant));- let mem_flags = ir::MemFlags::trusted();+ let mem_flags = ir::MemFlagsData::trusted();let state_ptr = self.get_state_ptr(env, builder);builder.ins().store(mem_flags, discriminant, state_ptr, 0);@@ -690,7 +690,7 @@ pub(crate) mod stack_switching_helpers {builder: &mut FunctionBuilder,) -> ir::Value {// Field first_switch_handler_index has type u32- let memflags = ir::MemFlags::trusted();+ let memflags = ir::MemFlagsData::trusted();let offset: i32 = env.offsets.ptr@@ -706,7 +706,7 @@ pub(crate) mod stack_switching_helpers {value: ir::Value,) {// Field first_switch_handler_index has type u32- let memflags = ir::MemFlags::trusted();+ let memflags = ir::MemFlagsData::trusted();let offset: i32 = env.offsets.ptr@@ -726,7 +726,7 @@ pub(crate) mod stack_switching_helpers {) {let stack_limits_ptr = self.get_stack_limits_ptr(env, builder);- let memflags = ir::MemFlags::trusted();+ let memflags = ir::MemFlagsData::trusted();let mut copy_to_vm_runtime_limits = |our_offset, their_offset| {let our_value = builder.ins().load(@@ -770,7 +770,7 @@ pub(crate) mod stack_switching_helpers {) {let stack_limits_ptr = self.get_stack_limits_ptr(env, builder);- let memflags = ir::MemFlags::trusted();+ let memflags = ir::MemFlagsData::trusted();let pointer_size = u8::try_from(env.pointer_type().bytes()).unwrap();let mut copy = |runtime_limits_offset, stack_limits_offset| {@@ -817,7 +817,7 @@ pub(crate) mod stack_switching_helpers {env: &mut crate::func_environ::FuncEnvironment<'a>,builder: &mut FunctionBuilder,) -> ir::Value {- let mem_flags = ir::MemFlags::trusted();+ let mem_flags = ir::MemFlagsData::trusted();builder.ins().load(env.pointer_type(), mem_flags, self.tos_ptr, 0)@@ -897,7 +897,7 @@ pub(crate) fn vmcontref_store_payloads<'a>(let ptr = builder.block_params(store_data_block)[0];// Store the values.- let memflags = ir::MemFlags::trusted();+ let memflags = ir::MemFlagsData::trusted();let mut offset = 0;for value in values {builder.ins().store(memflags, *value, ptr, offset);@@ -922,7 +922,7 @@ pub(crate) fn tag_address<'a>(let offset = i32::try_from(env.offsets.vmctx_vmtag_import_from(tag_index)).unwrap();builder.ins().load(pointer_type,- ir::MemFlags::trusted().with_readonly(),+ ir::MemFlagsData::trusted().with_readonly(),vmctx,ir::immediates::Offset32::new(offset),)@@ -943,7 +943,7 @@ pub fn vmctx_load_stack_chain<'a>(let vm_store_context_offset = env.offsets.ptr.vmctx_store_context();let vm_store_context = builder.ins().load(env.pointer_type(),- MemFlags::trusted(),+ MemFlagsData::trusted(),vmctx,vm_store_context_offset,);@@ -971,7 +971,7 @@ pub fn vmctx_store_stack_chain<'a>(let vm_store_context_offset = env.offsets.ptr.vmctx_store_context();let vm_store_context = builder.ins().load(env.pointer_type(),- MemFlags::trusted(),+ MemFlagsData::trusted(),vmctx,vm_store_context_offset,);@@ -1001,7 +1001,7 @@ pub fn vmctx_load_vm_runtime_limits_ptr<'a>(// The *pointer* to the VMRuntimeLimits does not change within the// same function, allowing us to set the `read_only` flag.- let flags = ir::MemFlags::trusted().with_readonly();+ let flags = ir::MemFlagsData::trusted().with_readonly();builder.ins().load(pointer_type, flags, vmctx, offset)}@@ -1142,7 +1142,7 @@ fn search_handler<'a>(let offset = builder.ins().uextend(I64, offset);let entry_address = builder.ins().iadd(base, offset);- let memflags = ir::MemFlags::trusted();+ let memflags = ir::MemFlagsData::trusted();let handled_tag = builder.ins()@@ -1871,7 +1871,7 @@ pub(crate) fn translate_switch<'a>(let slot = builder.create_sized_stack_slot(slot_size);let tmp_control_context = builder.ins().stack_addr(env.pointer_type(), slot, 0);- let flags = MemFlags::trusted();+ let flags = MemFlagsData::trusted();let mut offset: i32 = 0;while offset < i32::from(cctx_size) {// switchee_last_ancestor_cc -> tmp control contextdiff --git a/crates/cranelift/src/lib.rs b/crates/cranelift/src/lib.rsindex aaa33ecda0..aa0797de67 100644--- a/crates/cranelift/src/lib.rs+++ b/crates/cranelift/src/lib.rs@@ -101,7 +101,7 @@ fn blank_sig(isa: &dyn TargetIsa, call_conv: CallConv) -> ir::Signature {/// convention.fn unbarriered_store_type_at_offset(pos: &mut FuncCursor,- flags: ir::MemFlags,+ flags: ir::MemFlagsData,base: ir::Value,offset: i32,value: ir::Value,@@ -122,7 +122,7 @@ fn unbarriered_load_type_at_offset(isa: &dyn TargetIsa,pos: &mut FuncCursor,ty: WasmValType,- flags: ir::MemFlags,+ flags: ir::MemFlagsData,base: ir::Value,offset: i32,) -> ir::Value {diff --git a/crates/cranelift/src/translate/code_translator.rs b/crates/cranelift/src/translate/code_translator.rsindex 3bf231f7b8..aa64e77bba 100644--- a/crates/cranelift/src/translate/code_translator.rs+++ b/crates/cranelift/src/translate/code_translator.rs@@ -84,7 +84,7 @@ use crate::trap::TranslateTrap;use cranelift_codegen::ir::condcodes::{FloatCC, IntCC};use cranelift_codegen::ir::immediates::Offset32;use cranelift_codegen::ir::{- self, AtomicRmwOp, ExceptionTag, InstBuilder, JumpTableData, MemFlags, Value, ValueLabel,+ self, AtomicRmwOp, ExceptionTag, InstBuilder, JumpTableData, MemFlagsData, Value, ValueLabel,};use cranelift_codegen::ir::{BlockArg, types::*};use cranelift_codegen::packed_option::ReservedValue;@@ -1161,25 +1161,25 @@ pub fn translate_operator(let val = environ.stacks.pop1();environ.stacks- .push1(builder.ins().bitcast(F32, MemFlags::new(), val));+ .push1(builder.ins().bitcast(F32, MemFlagsData::new(), val));}Operator::F64ReinterpretI64 => {let val = environ.stacks.pop1();environ.stacks- .push1(builder.ins().bitcast(F64, MemFlags::new(), val));+ .push1(builder.ins().bitcast(F64, MemFlagsData::new(), val));}Operator::I32ReinterpretF32 => {let val = environ.stacks.pop1();environ.stacks- .push1(builder.ins().bitcast(I32, MemFlags::new(), val));+ .push1(builder.ins().bitcast(I32, MemFlagsData::new(), val));}Operator::I64ReinterpretF64 => {let val = environ.stacks.pop1();environ.stacks- .push1(builder.ins().bitcast(I64, MemFlags::new(), val));+ .push1(builder.ins().bitcast(I64, MemFlagsData::new(), val));}Operator::I32Extend8S => {let val = environ.stacks.pop1();@@ -3483,7 +3483,7 @@ fn prepare_addr(access_size: u8,builder: &mut FunctionBuilder,environ: &mut FuncEnvironment<'_>,-) -> WasmResult<Reachability<(MemFlags, Value, Value)>> {+) -> WasmResult<Reachability<(MemFlagsData, Value, Value)>> {let index = environ.stacks.pop1();let memory_index = MemoryIndex::from_u32(memarg.memory);@@ -3633,7 +3633,7 @@ fn prepare_addr(// alignment immediate may says it's aligned, because WebAssembly's// immediate field is just a hint, while Cranelift's aligned flag needs a// guarantee. WebAssembly memory accesses are always little-endian.- let mut flags = MemFlags::new();+ let mut flags = MemFlagsData::new();flags.set_endianness(ir::Endianness::Little);// The access occurs to the `heap` disjoint category of abstract@@ -3685,7 +3685,7 @@ fn prepare_atomic_addr(loaded_bytes: u8,builder: &mut FunctionBuilder,environ: &mut FuncEnvironment<'_>,-) -> WasmResult<Reachability<(MemFlags, Value, Value)>> {+) -> WasmResult<Reachability<(MemFlagsData, Value, Value)>> {align_atomic_addr(memarg, loaded_bytes, builder, environ);prepare_addr(memarg, loaded_bytes, builder, environ)}@@ -4238,7 +4238,7 @@ fn optionally_bitcast_vector(builder: &mut FunctionBuilder,) -> Value {if builder.func.dfg.value_type(value) != needed_type {- let mut flags = MemFlags::new();+ let mut flags = MemFlagsData::new();flags.set_endianness(ir::Endianness::Little);builder.ins().bitcast(needed_type, flags, value)} else {@@ -4267,7 +4267,7 @@ fn canonicalise_v128_values<'a>(// Cast, and push the resulting `Value`s into `canonicalised`.for v in values {let value = if is_non_canonical_v128(builder.func.dfg.value_type(*v)) {- let mut flags = MemFlags::new();+ let mut flags = MemFlagsData::new();flags.set_endianness(ir::Endianness::Little);builder.ins().bitcast(I8X16, flags, *v)} else {@@ -4401,7 +4401,7 @@ pub fn bitcast_wasm_returns(arguments: &mut [Value], builder: &mut FunctionBuildbuilder.func.signature.returns[i].purpose == ir::ArgumentPurpose::Normal});for (t, arg) in changes {- let mut flags = MemFlags::new();+ let mut flags = MemFlagsData::new();flags.set_endianness(ir::Endianness::Little);*arg = builder.ins().bitcast(t, flags, *arg);}@@ -4419,7 +4419,7 @@ fn bitcast_wasm_params(environ.is_wasm_parameter(i)});for (t, arg) in changes {- let mut flags = MemFlags::new();+ let mut flags = MemFlagsData::new();flags.set_endianness(ir::Endianness::Little);*arg = builder.ins().bitcast(t, flags, *arg);}diff --git a/crates/cranelift/src/translate/table.rs b/crates/cranelift/src/translate/table.rsindex 968a27e047..37a407b884 100644--- a/crates/cranelift/src/translate/table.rs+++ b/crates/cranelift/src/translate/table.rs@@ -63,7 +63,7 @@ impl TableData {env: &mut FuncEnvironment<'_>,pos: &mut FunctionBuilder,mut index: ir::Value,- ) -> (ir::Value, ir::MemFlags) {+ ) -> (ir::Value, ir::MemFlagsData) {let index_ty = pos.func.dfg.value_type(index);let addr_ty = env.pointer_type();let spectre_mitigations_enabled =@@ -104,7 +104,7 @@ impl TableData {let element_addr = pos.ins().iadd(base, offset);- let base_flags = ir::MemFlags::new()+ let base_flags = ir::MemFlagsData::new().with_aligned().with_alias_region(Some(ir::AliasRegion::Table));if spectre_mitigations_enabled {diff --git a/winch/codegen/src/isa/aarch64/asm.rs b/winch/codegen/src/isa/aarch64/asm.rsindex 484d6ea420..61ccd6cd2a 100644--- a/winch/codegen/src/isa/aarch64/asm.rs+++ b/winch/codegen/src/isa/aarch64/asm.rs@@ -20,7 +20,7 @@ use cranelift_codegen::isa::aarch64::inst::{use cranelift_codegen::{Final, MachBuffer, MachBufferFinalized, MachInst, MachInstEmit, MachInstEmitState, MachLabel,Writable,- ir::{ExternalName, MemFlags, SourceLoc, TrapCode, UserExternalNameRef},+ ir::{ExternalName, MemFlagsData, SourceLoc, TrapCode, UserExternalNameRef},isa::aarch64::inst::{self, ALUOp, ALUOp3, AMode, BitOp, BranchTarget, Cond, CondBrKind, ExtendOp,FPULeftShiftImm, FPUOp1, FPUOp2,@@ -163,12 +163,12 @@ impl Assembler {rt: xt1.into(),rt2: xt2.into(),mem,- flags: MemFlags::trusted(),+ flags: MemFlagsData::trusted(),});}/// Store a register.- pub fn str(&mut self, reg: Reg, mem: AMode, size: OperandSize, flags: MemFlags) {+ pub fn str(&mut self, reg: Reg, mem: AMode, size: OperandSize, flags: MemFlagsData) {use OperandSize::*;let inst = match (reg.is_int(), size) {(_, S8) => Inst::Store8 {@@ -212,12 +212,12 @@ impl Assembler {}/// Load a signed register.- pub fn sload(&mut self, mem: AMode, rd: WritableReg, size: OperandSize, flags: MemFlags) {+ pub fn sload(&mut self, mem: AMode, rd: WritableReg, size: OperandSize, flags: MemFlagsData) {self.ldr(mem, rd, size, true, flags);}/// Load an unsigned register.- pub fn uload(&mut self, mem: AMode, rd: WritableReg, size: OperandSize, flags: MemFlags) {+ pub fn uload(&mut self, mem: AMode, rd: WritableReg, size: OperandSize, flags: MemFlagsData) {self.ldr(mem, rd, size, false, flags);}@@ -228,7 +228,7 @@ impl Assembler {rd: WritableReg,size: OperandSize,signed: bool,- flags: MemFlags,+ flags: MemFlagsData,) {use OperandSize::*;let writable_reg = rd.map(Into::into);@@ -298,7 +298,7 @@ impl Assembler {rt: writable_xt1,rt2: writable_xt2,mem,- flags: MemFlags::trusted(),+ flags: MemFlagsData::trusted(),});}diff --git a/winch/codegen/src/isa/aarch64/masm.rs b/winch/codegen/src/isa/aarch64/masm.rsindex 419a0ebaae..15458b147a 100644--- a/winch/codegen/src/isa/aarch64/masm.rs+++ b/winch/codegen/src/isa/aarch64/masm.rs@@ -30,7 +30,7 @@ use crate::{use cranelift_codegen::{Final, MachBufferFinalized, MachLabel,binemit::CodeOffset,- ir::{MemFlags, RelSourceLoc, SourceLoc, types},+ ir::{MemFlagsData, RelSourceLoc, SourceLoc, types},isa::aarch64,isa::aarch64::inst::{self, Cond, ExtendOp, Imm12, ImmLogic, ImmShift, SImm7Scaled, SImm9, VectorSize,@@ -1327,7 +1327,7 @@ impl Masm for MacroAssembler {_addr: Self::Address,_size: OperandSize,_op: RmwOp,- _flags: MemFlags,+ _flags: MemFlagsData,_extend: Option<Extend<Zero>>,) -> Result<()> {Err(format_err!(CodeGenError::unimplemented_masm_instruction()))@@ -1358,7 +1358,7 @@ impl Masm for MacroAssembler {_context: &mut CodeGenContext<Emission>,_addr: Self::Address,_size: OperandSize,- _flags: MemFlags,+ _flags: MemFlagsData,_extend: Option<Extend<Zero>>,) -> Result<()> {Err(format_err!(CodeGenError::unimplemented_masm_instruction()))diff --git a/winch/codegen/src/isa/x64/asm.rs b/winch/codegen/src/isa/x64/asm.rsindex fe9c14ae2d..5f31eaba2f 100644--- a/winch/codegen/src/isa/x64/asm.rs+++ b/winch/codegen/src/isa/x64/asm.rs@@ -12,7 +12,7 @@ use crate::{use cranelift_codegen::{CallInfo, Final, MachBuffer, MachBufferFinalized, MachInst, MachInstEmit, MachInstEmitState,MachLabel, PatchRegion, Writable,- ir::{ExternalName, MemFlags, SourceLoc, TrapCode, Type, UserExternalNameRef, types},+ ir::{ExternalName, MemFlagsData, SourceLoc, TrapCode, Type, UserExternalNameRef, types},isa::{unwind::UnwindInst,x64::{@@ -323,7 +323,7 @@ impl Assembler {/// Load a floating point constant, using the constant pool.pub fn load_fp_const(&mut self, dst: WritableReg, constant: &[u8], size: OperandSize) {let addr = self.add_constant(constant);- self.xmm_mov_mr(&addr, dst, size, MemFlags::trusted());+ self.xmm_mov_mr(&addr, dst, size, MemFlagsData::trusted());}/// Return the emitted code.@@ -338,7 +338,7 @@ impl Assembler {inst.emit(&mut self.buffer, &self.emit_info, &mut self.emit_state);}- fn to_synthetic_amode(addr: &Address, memflags: MemFlags) -> SyntheticAmode {+ fn to_synthetic_amode(addr: &Address, memflags: MemFlagsData) -> SyntheticAmode {match *addr {Address::Offset { base, offset } => {let amode = Amode::imm_reg(offset as i32, base.into()).with_flags(memflags);@@ -398,7 +398,7 @@ impl Assembler {}/// Register-to-memory move.- pub fn mov_rm(&mut self, src: Reg, addr: &Address, size: OperandSize, flags: MemFlags) {+ pub fn mov_rm(&mut self, src: Reg, addr: &Address, size: OperandSize, flags: MemFlagsData) {assert!(addr.is_offset());let dst = Self::to_synthetic_amode(addr, flags);let inst = match size {@@ -412,7 +412,7 @@ impl Assembler {}/// Immediate-to-memory move.- pub fn mov_im(&mut self, src: i32, addr: &Address, size: OperandSize, flags: MemFlags) {+ pub fn mov_im(&mut self, src: i32, addr: &Address, size: OperandSize, flags: MemFlagsData) {assert!(addr.is_offset());let dst = Self::to_synthetic_amode(addr, flags);let inst = match size {@@ -442,7 +442,7 @@ impl Assembler {addr: &Address,dst: WritableReg,ext: Option<Extend<Zero>>,- memflags: MemFlags,+ memflags: MemFlagsData,) {let src = Self::to_synthetic_amode(addr, memflags);@@ -478,7 +478,7 @@ impl Assembler {addr: &Address,dst: WritableReg,ext: Extend<Signed>,- memflags: MemFlags,+ memflags: MemFlagsData,) {let src = Self::to_synthetic_amode(addr, memflags);let dst = WritableGpr::from_reg(dst.to_reg().into());@@ -580,7 +580,7 @@ impl Assembler {src: &Address,dst: WritableReg,size: OperandSize,- flags: MemFlags,+ flags: MemFlagsData,) {use OperandSize::*;@@ -603,7 +603,7 @@ impl Assembler {src: &Address,dst: WritableReg,kind: VpmovKind,- flags: MemFlags,+ flags: MemFlagsData,) {assert!(dst.to_reg().is_float());let src = Self::to_synthetic_amode(src, flags);@@ -639,7 +639,7 @@ impl Assembler {src: &Address,dst: WritableReg,size: OperandSize,- flags: MemFlags,+ flags: MemFlagsData,) {assert!(dst.to_reg().is_float());let src = Self::to_synthetic_amode(src, flags);@@ -673,7 +673,7 @@ impl Assembler {dst: WritableReg,mask: u8,size: OperandSize,- flags: MemFlags,+ flags: MemFlagsData,) {let dst: WritableXmm = dst.map(|r| r.into());let src = Self::to_synthetic_amode(src, flags);@@ -698,7 +698,7 @@ impl Assembler {}/// Single and double precision floating point store.- pub fn xmm_mov_rm(&mut self, src: Reg, dst: &Address, size: OperandSize, flags: MemFlags) {+ pub fn xmm_mov_rm(&mut self, src: Reg, dst: &Address, size: OperandSize, flags: MemFlagsData) {use OperandSize::*;assert!(src.is_float());@@ -1219,7 +1219,7 @@ impl Assembler {addr: Address,dst: WritableReg,size: OperandSize,- flags: MemFlags,+ flags: MemFlagsData,) {assert!(addr.is_offset());let mem = Self::to_synthetic_amode(&addr, flags);@@ -1242,7 +1242,7 @@ impl Assembler {dst: WritableReg,temp: WritableReg,size: OperandSize,- flags: MemFlags,+ flags: MemFlagsData,op: AtomicRmwSeqOp,) {assert!(addr.is_offset());@@ -1257,7 +1257,13 @@ impl Assembler {});}- pub fn xchg(&mut self, addr: Address, dst: WritableReg, size: OperandSize, flags: MemFlags) {+ pub fn xchg(+ &mut self,+ addr: Address,+ dst: WritableReg,+ size: OperandSize,+ flags: MemFlagsData,+ ) {assert!(addr.is_offset());let mem = Self::to_synthetic_amode(&addr, flags);let dst = pair_gpr(dst);@@ -1277,7 +1283,7 @@ impl Assembler {replacement: Reg,dst: WritableReg,size: OperandSize,- flags: MemFlags,+ flags: MemFlagsData,) {assert!(addr.is_offset());let mem = Self::to_synthetic_amode(&addr, flags);@@ -1659,7 +1665,7 @@ impl Assembler {/// Load effective address.pub fn lea(&mut self, addr: &Address, dst: WritableReg, size: OperandSize) {- let addr = Self::to_synthetic_amode(addr, MemFlags::trusted());+ let addr = Self::to_synthetic_amode(addr, MemFlagsData::trusted());let dst: WritableGpr = dst.map(Into::into);let inst = match size {OperandSize::S16 => asm::inst::leaw_rm::new(dst, addr).into(),@@ -1733,7 +1739,7 @@ impl Assembler {/// result in `dst`.pub fn xmm_vpshufb_rrm(&mut self, dst: WritableReg, src: Reg, mask: &Address) {let dst: WritableXmm = dst.map(|r| r.into());- let mask = Self::to_synthetic_amode(mask, MemFlags::trusted());+ let mask = Self::to_synthetic_amode(mask, MemFlagsData::trusted());let inst = asm::inst::vpshufb_b::new(dst, src, mask).into();self.emit(Inst::External { inst });}@@ -1758,7 +1764,7 @@ impl Assembler {size: OperandSize,) {let dst: WritableXmm = dst.map(|r| r.into());- let src2 = Self::to_synthetic_amode(src2, MemFlags::trusted());+ let src2 = Self::to_synthetic_amode(src2, MemFlagsData::trusted());let inst = match size {OperandSize::S8 => asm::inst::vpaddusb_b::new(dst, src1, src2).into(),OperandSize::S32 => asm::inst::vpaddusw_b::new(dst, src1, src2).into(),@@ -1800,7 +1806,7 @@ impl Assembler {size: OperandSize,) {let dst: WritableXmm = dst.map(|r| r.into());- let address = Self::to_synthetic_amode(src2, MemFlags::trusted());+ let address = Self::to_synthetic_amode(src2, MemFlagsData::trusted());let inst = match size {OperandSize::S8 => asm::inst::vpaddb_b::new(dst, src1, address).into(),OperandSize::S16 => asm::inst::vpaddw_b::new(dst, src1, address).into(),@@ -1837,7 +1843,7 @@ impl Assembler {src: Reg,lane: u8,size: OperandSize,- flags: MemFlags,+ flags: MemFlagsData,) {assert!(addr.is_offset());let dst = Self::to_synthetic_amode(addr, flags);@@ -1874,7 +1880,7 @@ impl Assembler {count: u8,size: OperandSize,) {- let src2 = Self::to_synthetic_amode(src2, MemFlags::trusted());+ let src2 = Self::to_synthetic_amode(src2, MemFlagsData::trusted());let dst: WritableXmm = dst.map(|r| r.into());let inst = match size {@@ -1911,7 +1917,7 @@ impl Assembler {/// Copy a 32-bit float in `src2`, merge into `src1`, and put result in `dst`.pub fn xmm_vinsertps_rrm(&mut self, dst: WritableReg, src1: Reg, address: &Address, imm: u8) {let dst: WritableXmm = dst.map(|r| r.into());- let address = Self::to_synthetic_amode(address, MemFlags::trusted());+ let address = Self::to_synthetic_amode(address, MemFlagsData::trusted());let inst = asm::inst::vinsertps_b::new(dst, src1, address, imm).into();self.emit(Inst::External { inst });}@@ -1934,7 +1940,7 @@ impl Assembler {/// Moves 64-bit float from `src` into lower 64-bits of `dst`./// Zeroes out the upper 64 bits of `dst`.pub fn xmm_vmovsd_rm(&mut self, dst: WritableReg, src: &Address) {- let src = Self::to_synthetic_amode(src, MemFlags::trusted());+ let src = Self::to_synthetic_amode(src, MemFlagsData::trusted());let dst: WritableXmm = dst.map(|r| r.into());let inst = asm::inst::vmovsd_d::new(dst, src).into();self.emit(Inst::External { inst });@@ -1944,7 +1950,7 @@ impl Assembler {/// Copies two 32-bit floats from the lower 64-bits of `src1` to lower/// 64-bits of `dst`.pub fn xmm_vmovlhps_rrm(&mut self, dst: WritableReg, src1: Reg, src2: &Address) {- let src2 = Self::to_synthetic_amode(src2, MemFlags::trusted());+ let src2 = Self::to_synthetic_amode(src2, MemFlagsData::trusted());let dst: WritableXmm = dst.map(|r| r.into());let inst = asm::inst::vmovhps_b::new(dst, src1, src2).into();self.emit(Inst::External { inst });@@ -1960,7 +1966,7 @@ impl Assembler {}/// Move unaligned packed integer values from address `src` to `dst`.- pub fn xmm_vmovdqu_mr(&mut self, src: &Address, dst: WritableReg, flags: MemFlags) {+ pub fn xmm_vmovdqu_mr(&mut self, src: &Address, dst: WritableReg, flags: MemFlagsData) {let src = Self::to_synthetic_amode(src, flags);let dst: WritableXmm = dst.map(|r| r.into());let inst = asm::inst::vmovdqu_a::new(dst, src).into();@@ -2053,7 +2059,7 @@ impl Assembler {size: OperandSize,) {let dst: WritableXmm = dst.map(|r| r.into());- let address = Self::to_synthetic_amode(src2, MemFlags::trusted());+ let address = Self::to_synthetic_amode(src2, MemFlagsData::trusted());let inst = match size {OperandSize::S32 => asm::inst::vaddps_b::new(dst, src1, address).into(),OperandSize::S64 => asm::inst::vaddpd_b::new(dst, src1, address).into(),@@ -2084,7 +2090,7 @@ impl Assembler {size: OperandSize,) {let dst: WritableXmm = dst.map(|r| r.into());- let address = Self::to_synthetic_amode(address, MemFlags::trusted());+ let address = Self::to_synthetic_amode(address, MemFlagsData::trusted());let inst = match size {OperandSize::S8 => asm::inst::vpcmpeqb_b::new(dst, lhs, address).into(),OperandSize::S16 => asm::inst::vpcmpeqw_b::new(dst, lhs, address).into(),@@ -2205,7 +2211,7 @@ impl Assembler {/// `dst`.pub fn xmm_vsub_rrm(&mut self, src1: Reg, src2: &Address, dst: WritableReg, size: OperandSize) {let dst: WritableXmm = dst.map(|r| r.into());- let address = Self::to_synthetic_amode(src2, MemFlags::trusted());+ let address = Self::to_synthetic_amode(src2, MemFlagsData::trusted());let inst = match size {OperandSize::S64 => asm::inst::vsubpd_b::new(dst, src1, address).into(),_ => unimplemented!(),@@ -2267,7 +2273,7 @@ impl Assembler {size: OperandSize,) {let dst: WritableXmm = dst.map(|r| r.into());- let address = Self::to_synthetic_amode(src2, MemFlags::trusted());+ let address = Self::to_synthetic_amode(src2, MemFlagsData::trusted());let inst = match size {OperandSize::S32 => asm::inst::vunpcklps_b::new(dst, src1, address).into(),_ => unimplemented!(),@@ -2451,7 +2457,7 @@ impl Assembler {size: OperandSize,) {let dst: WritableXmm = dst.map(|r| r.into());- let address = Self::to_synthetic_amode(src2, MemFlags::trusted());+ let address = Self::to_synthetic_amode(src2, MemFlagsData::trusted());let inst = match size {OperandSize::S32 => asm::inst::vandps_b::new(dst, src1, address).into(),OperandSize::S64 => asm::inst::vandpd_b::new(dst, src1, address).into(),@@ -2476,7 +2482,7 @@ impl Assembler {/// and stores the results in `dst`.pub fn xmm_vpand_rrm(&mut self, src1: Reg, src2: &Address, dst: WritableReg) {let dst: WritableXmm = dst.map(|r| r.into());- let address = Self::to_synthetic_amode(&src2, MemFlags::trusted());+ let address = Self::to_synthetic_amode(&src2, MemFlagsData::trusted());let inst = asm::inst::vpand_b::new(dst, src1, address).into();self.emit(Inst::External { inst });}@@ -2544,7 +2550,7 @@ impl Assembler {/// results in `dst`.pub fn xmm_vpxor_rmr(&mut self, src: Reg, address: &Address, dst: WritableReg) {let dst: WritableXmm = dst.map(|r| r.into());- let address = Self::to_synthetic_amode(address, MemFlags::trusted());+ let address = Self::to_synthetic_amode(address, MemFlagsData::trusted());let inst = asm::inst::vpxor_b::new(dst, src, address).into();self.emit(Inst::External { inst });}@@ -2579,7 +2585,7 @@ impl Assembler {size: OperandSize,) {let dst: WritableXmm = dst.map(|r| r.into());- let address = Self::to_synthetic_amode(src2, MemFlags::trusted());+ let address = Self::to_synthetic_amode(src2, MemFlagsData::trusted());let inst = match size {OperandSize::S32 => asm::inst::vminps_b::new(dst, src1, address).into(),OperandSize::S64 => asm::inst::vminpd_b::new(dst, src1, address).into(),@@ -2728,7 +2734,7 @@ impl Assembler {/// Multiply and add packed signed and unsigned bytes.pub fn xmm_vpmaddubsw_rmr(&mut self, src: Reg, address: &Address, dst: WritableReg) {let dst: WritableXmm = dst.map(|r| r.into());- let address = Self::to_synthetic_amode(address, MemFlags::trusted());+ let address = Self::to_synthetic_amode(address, MemFlagsData::trusted());let inst = asm::inst::vpmaddubsw_b::new(dst, src, address).into();self.emit(Inst::External { inst });}@@ -2743,7 +2749,7 @@ impl Assembler {/// Multiple and add packed integers.pub fn xmm_vpmaddwd_rmr(&mut self, src: Reg, address: &Address, dst: WritableReg) {let dst: WritableXmm = dst.map(|r| r.into());- let address = Self::to_synthetic_amode(address, MemFlags::trusted());+ let address = Self::to_synthetic_amode(address, MemFlagsData::trusted());let inst = asm::inst::vpmaddwd_b::new(dst, src, address).into();self.emit(Inst::External { inst });}diff --git a/winch/codegen/src/isa/x64/masm.rs b/winch/codegen/src/isa/x64/masm.rsindex a6d123f3f0..1b66952871 100644--- a/winch/codegen/src/isa/x64/masm.rs+++ b/winch/codegen/src/isa/x64/masm.rs@@ -36,7 +36,7 @@ use crate::{use cranelift_codegen::{Final, MachBufferFinalized, MachLabel,binemit::CodeOffset,- ir::{MemFlags, RelSourceLoc, SourceLoc},+ ir::{MemFlagsData, RelSourceLoc, SourceLoc},isa::{unwind::UnwindInst,x64::{AtomicRmwSeqOp, args::CC, settings as x64_settings},@@ -1514,8 +1514,13 @@ impl Masm for MacroAssembler {RegImm::Reg(src) => self.asm.xmm_vpshuf_rr(src, dst, mask, OperandSize::S32),RegImm::Imm(imm) => {let src = self.asm.add_constant(&imm.to_bytes());- self.asm- .xmm_vpshuf_mr(&src, dst, mask, OperandSize::S32, MemFlags::trusted());+ self.asm.xmm_vpshuf_mr(+ &src,+ dst,+ mask,+ OperandSize::S32,+ MemFlagsData::trusted(),+ );}}} else {@@ -1525,8 +1530,12 @@ impl Masm for MacroAssembler {RegImm::Reg(src) => self.asm.xmm_vpbroadcast_rr(src, dst, size.lane_size()),RegImm::Imm(imm) => {let src = self.asm.add_constant(&imm.to_bytes());- self.asm- .xmm_vpbroadcast_mr(&src, dst, size.lane_size(), MemFlags::trusted());+ self.asm.xmm_vpbroadcast_mr(+ &src,+ dst,+ size.lane_size(),+ MemFlagsData::trusted(),+ );}}}@@ -1590,7 +1599,7 @@ impl Masm for MacroAssembler {addr: Self::Address,size: OperandSize,op: RmwOp,- flags: MemFlags,+ flags: MemFlagsData,extend: Option<Extend<Zero>>,) -> Result<()> {let res = match op {@@ -1776,7 +1785,7 @@ impl Masm for MacroAssembler {context: &mut CodeGenContext<Emission>,addr: Self::Address,size: OperandSize,- flags: MemFlags,+ flags: MemFlagsData,extend: Option<Extend<Zero>>,) -> Result<()> {// `cmpxchg` expects `expected` to be in the `*a*` register.@@ -2562,7 +2571,7 @@ impl Masm for MacroAssembler {shift: 0,},tmp_xmm.writable(),- MemFlags::trusted(),+ MemFlagsData::trusted(),);});@@ -2591,7 +2600,7 @@ impl Masm for MacroAssembler {let cst = this.asm.add_constant(&SIGN_MASK.to_le_bytes());this.asm- .xmm_vmovdqu_mr(&cst, writable!(tmp_xmm2), MemFlags::trusted());+ .xmm_vmovdqu_mr(&cst, writable!(tmp_xmm2), MemFlagsData::trusted());this.asm.xmm_vpsrl_rrr(tmp_xmm2,tmp_xmm.inner(),@@ -3084,7 +3093,7 @@ impl Masm for MacroAssembler {&mask,scratch.writable(),OperandSize::S128,- MemFlags::trusted(),+ MemFlagsData::trusted(),);masm.asm.xmm_vpmaddubsw_rrr(scratch.inner(), src, dst);});@@ -3192,7 +3201,7 @@ impl Masm for MacroAssembler {0x0, 0x1, 0x1, 0x2, 0x1, 0x2, 0x2, 0x3, 0x1, 0x2, 0x2, 0x3, 0x2, 0x3, 0x3, 0x4,]);masm.asm- .xmm_mov_mr(&address, reg2, OperandSize::S128, MemFlags::trusted());+ .xmm_mov_mr(&address, reg2, OperandSize::S128, MemFlagsData::trusted());// Use the upper 4 bits as an index into the lookup table.masm.asm.xmm_vpshufb_rrr(reg, reg2.to_reg(), reg.to_reg());// Use the lower 4 bits as an index into the lookup table.@@ -3358,7 +3367,7 @@ impl MacroAssembler {src: Address,dst: WritableReg,size: OperandSize,- flags: MemFlags,+ flags: MemFlagsData,) -> Result<()> {if dst.to_reg().is_int() {let ext = size.extend_to::<Zero>(OperandSize::S64);@@ -3376,7 +3385,7 @@ impl MacroAssembler {src: RegImm,dst: Address,size: OperandSize,- flags: MemFlags,+ flags: MemFlagsData,) -> Result<()> {let _ = match src {RegImm::Imm(imm) => match imm {@@ -3401,7 +3410,7 @@ impl MacroAssembler {&addr,float_scratch.writable(),size,- MemFlags::trusted(),+ MemFlagsData::trusted(),);masm.asm.xmm_mov_rm(float_scratch.inner(), &dst, size, flags);@@ -3417,7 +3426,7 @@ impl MacroAssembler {&addr,float_scratch.writable(),size,- MemFlags::trusted(),+ MemFlagsData::trusted(),);masm.asm.xmm_mov_rm(float_scratch.inner(), &dst, size, flags);@@ -3432,7 +3441,7 @@ impl MacroAssembler {&addr,vector_scratch.writable(),size,- MemFlags::trusted(),+ MemFlagsData::trusted(),);masm.asm.xmm_mov_rm(vector_scratch.inner(), &dst, size, flags);diff --git a/winch/codegen/src/masm.rs b/winch/codegen/src/masm.rsindex 84046acc12..566c1b0d58 100644--- a/winch/codegen/src/masm.rs+++ b/winch/codegen/src/masm.rs@@ -8,7 +8,7 @@ use crate::isa::{use cranelift_codegen::{Final, MachBufferFinalized, MachLabel,binemit::CodeOffset,- ir::{Endianness, MemFlags, RelSourceLoc, SourceLoc, UserExternalNameRef},+ ir::{Endianness, MemFlagsData, RelSourceLoc, SourceLoc, UserExternalNameRef},};use std::{fmt::Debug, ops::Range};use wasmtime_environ::{PtrSize, WasmHeapType, WasmRefType, WasmValType};@@ -1372,12 +1372,12 @@ pub enum RoundingMode {}/// Memory flags for trusted loads/stores.-pub const TRUSTED_FLAGS: MemFlags = MemFlags::trusted();+pub const TRUSTED_FLAGS: MemFlagsData = MemFlagsData::trusted();/// Flags used for WebAssembly loads / stores./// Untrusted by default so we don't set `no_trap`./// We also ensure that the endianness is the right one for WebAssembly.-pub const UNTRUSTED_FLAGS: MemFlags = MemFlags::new().with_endianness(Endianness::Little);+pub const UNTRUSTED_FLAGS: MemFlagsData = MemFlagsData::new().with_endianness(Endianness::Little);/// Generic MacroAssembler interface used by the code generation.///@@ -2094,7 +2094,7 @@ pub(crate) trait MacroAssembler {addr: Self::Address,size: OperandSize,op: RmwOp,- flags: MemFlags,+ flags: MemFlagsData,extend: Option<Extend<Zero>>,) -> Result<()>;@@ -2128,7 +2128,7 @@ pub(crate) trait MacroAssembler {context: &mut CodeGenContext<Emission>,addr: Self::Address,size: OperandSize,- flags: MemFlags,+ flags: MemFlagsData,extend: Option<Extend<Zero>>,) -> Result<()>;