T0b1/wasmtime
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

machinst x64: use assert_eq! when possible

Browse Source
This commit is contained in:
Andrew Brown
2020-08-03 16:17:17 -07:00
parent 999e04a2c4
commit c21fe0eb73
2 changed files with 19 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
cranelift/codegen/src/isa/x64/inst/emit.rs
View File

@@ -1949,9 +1949,9 @@ pub(crate) fn emit(
// //
// done: // done:
assert!(src != tmp_gpr1); assert_ne!(src, tmp_gpr1);
assert!(src != tmp_gpr2); assert_ne!(src, tmp_gpr2);
assert!(tmp_gpr1 != tmp_gpr2); assert_ne!(tmp_gpr1, tmp_gpr2);
let handle_negative = sink.get_label(); let handle_negative = sink.get_label();
let done = sink.get_label(); let done = sink.get_label();
@@ -2251,7 +2251,7 @@ pub(crate) fn emit(
// //
// done: // done:
assert!(tmp_xmm != src, "tmp_xmm clobbers src!"); assert_ne!(tmp_xmm, src, "tmp_xmm clobbers src!");
let (sub_op, cast_op, cmp_op, trunc_op) = if *src_size == OperandSize::Size64 { let (sub_op, cast_op, cmp_op, trunc_op) = if *src_size == OperandSize::Size64 {
( (

31
cranelift/codegen/src/isa/x64/lower.rs
View File

@@ -277,7 +277,7 @@ fn emit_vm_call<C: LowerCtx<I = Inst>>(
abi.emit_stack_pre_adjust(ctx); abi.emit_stack_pre_adjust(ctx);
let vm_context = if call_conv.extends_baldrdash() { 1 } else { 0 }; let vm_context = if call_conv.extends_baldrdash() { 1 } else { 0 };
assert!(inputs.len() + vm_context == abi.num_args()); assert_eq!(inputs.len() + vm_context, abi.num_args());
for (i, input) in inputs.iter().enumerate() { for (i, input) in inputs.iter().enumerate() {
let arg_reg = input_to_reg(ctx, *input); let arg_reg = input_to_reg(ctx, *input);
@@ -960,8 +960,8 @@ fn lower_insn_to_regs<C: LowerCtx<I = Inst>>(
Opcode::Call => { Opcode::Call => {
let (extname, dist) = ctx.call_target(insn).unwrap(); let (extname, dist) = ctx.call_target(insn).unwrap();
let sig = ctx.call_sig(insn).unwrap(); let sig = ctx.call_sig(insn).unwrap();
assert!(inputs.len() == sig.params.len()); assert_eq!(inputs.len(), sig.params.len());
assert!(outputs.len() == sig.returns.len()); assert_eq!(outputs.len(), sig.returns.len());
( (
X64ABICall::from_func(sig, &extname, dist, loc)?, X64ABICall::from_func(sig, &extname, dist, loc)?,
&inputs[..], &inputs[..],
@@ -971,8 +971,8 @@ fn lower_insn_to_regs<C: LowerCtx<I = Inst>>(
Opcode::CallIndirect => { Opcode::CallIndirect => {
let ptr = input_to_reg(ctx, inputs[0]); let ptr = input_to_reg(ctx, inputs[0]);
let sig = ctx.call_sig(insn).unwrap(); let sig = ctx.call_sig(insn).unwrap();
assert!(inputs.len() - 1 == sig.params.len()); assert_eq!(inputs.len() - 1, sig.params.len());
assert!(outputs.len() == sig.returns.len()); assert_eq!(outputs.len(), sig.returns.len());
(X64ABICall::from_ptr(sig, ptr, loc, op)?, &inputs[1..]) (X64ABICall::from_ptr(sig, ptr, loc, op)?, &inputs[1..])
} }
@@ -980,7 +980,7 @@ fn lower_insn_to_regs<C: LowerCtx<I = Inst>>(
}; };
abi.emit_stack_pre_adjust(ctx); abi.emit_stack_pre_adjust(ctx);
assert!(inputs.len() == abi.num_args()); assert_eq!(inputs.len(), abi.num_args());
for (i, input) in inputs.iter().enumerate() { for (i, input) in inputs.iter().enumerate() {
let arg_reg = input_to_reg(ctx, *input); let arg_reg = input_to_reg(ctx, *input);
abi.emit_copy_reg_to_arg(ctx, i, arg_reg); abi.emit_copy_reg_to_arg(ctx, i, arg_reg);
@@ -1531,7 +1531,7 @@ fn lower_insn_to_regs<C: LowerCtx<I = Inst>>(
| Opcode::Sload16 | Opcode::Sload16
| Opcode::Uload32 | Opcode::Uload32
| Opcode::Sload32 => { | Opcode::Sload32 => {
assert!(inputs.len() == 1, "only one input for load operands"); assert_eq!(inputs.len(), 1, "only one input for load operands");
let base = input_to_reg(ctx, inputs[0]); let base = input_to_reg(ctx, inputs[0]);
Amode::imm_reg(offset as u32, base) Amode::imm_reg(offset as u32, base)
} }
@@ -1543,8 +1543,9 @@ fn lower_insn_to_regs<C: LowerCtx<I = Inst>>(
| Opcode::Sload16Complex | Opcode::Sload16Complex
| Opcode::Uload32Complex | Opcode::Uload32Complex
| Opcode::Sload32Complex => { | Opcode::Sload32Complex => {
assert!( assert_eq!(
inputs.len() == 2, inputs.len(),
2,
"can't handle more than two inputs in complex load" "can't handle more than two inputs in complex load"
); );
let base = input_to_reg(ctx, inputs[0]); let base = input_to_reg(ctx, inputs[0]);
@@ -1618,10 +1619,7 @@ fn lower_insn_to_regs<C: LowerCtx<I = Inst>>(
let addr = match op { let addr = match op {
Opcode::Store | Opcode::Istore8 | Opcode::Istore16 | Opcode::Istore32 => { Opcode::Store | Opcode::Istore8 | Opcode::Istore16 | Opcode::Istore32 => {
assert!( assert_eq!(inputs.len(), 2, "only one input for store memory operands");
inputs.len() == 2,
"only one input for store memory operands"
);
let base = input_to_reg(ctx, inputs[1]); let base = input_to_reg(ctx, inputs[1]);
// TODO sign? // TODO sign?
Amode::imm_reg(offset as u32, base) Amode::imm_reg(offset as u32, base)
@@ -1631,8 +1629,9 @@ fn lower_insn_to_regs<C: LowerCtx<I = Inst>>(
| Opcode::Istore8Complex | Opcode::Istore8Complex
| Opcode::Istore16Complex | Opcode::Istore16Complex
| Opcode::Istore32Complex => { | Opcode::Istore32Complex => {
assert!( assert_eq!(
inputs.len() == 3, inputs.len(),
3,
"can't handle more than two inputs in complex store" "can't handle more than two inputs in complex store"
); );
let base = input_to_reg(ctx, inputs[1]); let base = input_to_reg(ctx, inputs[1]);
@@ -2023,7 +2022,7 @@ impl LowerBackend for X64Backend {
_ => unimplemented!("branch opcode"), _ => unimplemented!("branch opcode"),
} }
} else { } else {
assert!(branches.len() == 1); assert_eq!(branches.len(), 1);
// Must be an unconditional branch or trap. // Must be an unconditional branch or trap.
let op = ctx.data(branches[0]).opcode(); let op = ctx.data(branches[0]).opcode();