core: use new Subcore/Supercore mechanics

AluVM · Mar 4, 2025 · 81907ba · 81907ba
1 parent 54e5f8b
commit 81907ba
Show file tree

Hide file tree

Showing 3 changed files with 22 additions and 18 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/src/isa/core.rs b/src/isa/core.rs
@@ -23,7 +23,7 @@
 
 use core::fmt::{self, Debug, Formatter};
 
-use aluvm::alu::{CoreExt, NoExt, Register};
+use aluvm::alu::{CoreExt, NoExt, Register, Supercore};
 use aluvm::{GfaCore, RegE};
 use amplify::num::u256;
 
@@ -111,10 +111,14 @@ impl CoreExt for UsonicCore {
     }
 }
 
-impl From<UsonicCore> for GfaCore {
-    fn from(core: UsonicCore) -> Self { core.gfa }
+impl Supercore<GfaCore> for UsonicCore {
+    fn subcore(&self) -> GfaCore { self.gfa }
+
+    fn merge_subcore(&mut self, subcore: GfaCore) { self.gfa = subcore; }
 }
 
-impl From<UsonicCore> for NoExt {
-    fn from(_: UsonicCore) -> Self { NoExt }
+impl Supercore<NoExt> for UsonicCore {
+    fn subcore(&self) -> NoExt { NoExt }
+
+    fn merge_subcore(&mut self, _subcore: NoExt) {}
 }
diff --git a/src/isa/exec.rs b/src/isa/exec.rs
@@ -24,7 +24,7 @@
 use std::collections::BTreeSet;
 
 use aluvm::alu::regs::Status;
-use aluvm::alu::{Core, CoreExt, ExecStep, Site, SiteId};
+use aluvm::alu::{Core, CoreExt, ExecStep, Site, SiteId, Supercore};
 use aluvm::isa::Instruction;
 use aluvm::RegE;
 
@@ -152,22 +152,22 @@ impl<Id: SiteId> Instruction<Id> for Instr<Id> {
     ) -> ExecStep<Site<Id>> {
         match self {
             Instr::Ctrl(instr) => {
-                let mut subcore = Core::from(core.clone());
+                let mut subcore = core.subcore();
                 let step = instr.exec(site, &mut subcore, &mut ());
-                *core = subcore.extend(core.cx.clone());
+                core.merge_subcore(subcore);
                 step
             }
             Instr::Gfa(instr) => {
-                let mut subcore = Core::from(core.clone());
+                let mut subcore = core.subcore();
                 let step = instr.exec(site, &mut subcore, &mut ());
-                *core = subcore.extend(core.cx.clone());
+                core.merge_subcore(subcore);
                 step
             }
             Instr::Usonic(instr) => Instruction::<Id>::exec(instr, site, core, context),
             Instr::Reserved(instr) => {
-                let mut subcore = Core::from(core.clone());
+                let mut subcore = core.subcore();
                 let step = instr.exec(site, &mut subcore, &mut ());
-                *core = subcore.extend(core.cx.clone());
+                core.merge_subcore(subcore);
                 step
             }
         }