Tweak definition of Mstore inst

fe-lang · Oct 13, 2024 · 63aa359 · 63aa359
1 parent e86f356
commit 63aa359
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 4 deletions.
diff --git a/crates/ir/src/inst/data.rs b/crates/ir/src/inst/data.rs
@@ -15,10 +15,10 @@ impl_inst_write!(Mload, (addr: ValueId, ty: Type));
 #[derive(Debug, Clone, Copy, PartialEq, Eq, Hash, Inst)]
 #[inst(side_effect(super::SideEffect::Write))]
 pub struct Mstore {
- #[inst(value)]
- value: ValueId,
  #[inst(value)]
  addr: ValueId,
+ #[inst(value)]
+ value: ValueId,
  ty: Type,
 }
 impl_inst_write!(Mstore, (value: ValueId, addr: ValueId, ty: Type));

diff --git a/crates/ir/src/interpret/data.rs b/crates/ir/src/interpret/data.rs
@@ -14,8 +14,8 @@ impl Interpret for Mstore {
  fn interpret(&self, state: &mut dyn State) -> EvalValue {
  state.set_action(Action::Continue);
 
- let value = state.lookup_val(*self.addr());
  let addr = state.lookup_val(*self.addr());
+ let value = state.lookup_val(*self.value());
  state.store(addr, value, *self.ty())
  }
 }

diff --git a/crates/parser/src/inst/data.rs b/crates/parser/src/inst/data.rs
@@ -4,7 +4,7 @@ use smallvec::SmallVec;
 use crate::{ast, error::ArityBound, BuildCtx, Error};
 
 super::impl_inst_build! {Mload, has_mload, (addr: ValueId, ty: Type)}
-super::impl_inst_build! {Mstore, has_mstore, (value: ValueId, addr: ValueId, ty: Type)}
+super::impl_inst_build! {Mstore, has_mstore, (addr: ValueId, value: ValueId, ty: Type)}
 super::impl_inst_build_common! {Gep, has_gep, ArityBound::AtLeast(2), build_gep}
 
 fn build_gep(