yetanotherco · MauroToscano · Dec 11, 2025 · Dec 11, 2025 · Dec 11, 2025 · Dec 11, 2025
diff --git a/.github/workflows/pr_main.yaml b/.github/workflows/pr_main.yaml
@@ -52,4 +52,4 @@ jobs:
 
       - name: Run tests
         run: |
-          make test-no-compile
+          cd vm && make test-no-compile
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -1,9 +1,5 @@
-[package]
-name = "null-vm"
-version = "0.1.0"
-edition = "2024"
-
-[dependencies]
-elf = "0.7.4"
-hashbrown = { version = "0.14.5", features = ["serde", "inline-more"] }
-thiserror = "1.0.68"
+[workspace]
+members = [
+  "vm",
+  "prover",
+]
diff --git a/prover/Cargo.toml b/prover/Cargo.toml
@@ -0,0 +1,6 @@
+[package]
+name = "prover"
+version = "0.1.0"
+edition = "2024"
+
+[dependencies]
diff --git a/prover/src/main.rs b/prover/src/main.rs
@@ -0,0 +1,3 @@
+fn main() {
+    println!("Hello, world!");
+}
diff --git a/vm/.gitignore b/vm/.gitignore
@@ -0,0 +1 @@
+/target
diff --git a/vm/Cargo.lock b/vm/Cargo.lock
diff --git a/vm/Cargo.toml b/vm/Cargo.toml
@@ -0,0 +1,9 @@
+[package]
+name = "vm"
+version = "0.1.0"
+edition = "2024"
+
+[dependencies]
+elf = "0.7.4"
+hashbrown = { version = "0.14.5", features = ["serde", "inline-more"] }
+thiserror = "1.0.68"
diff --git a/Makefile → vm/Makefile b/Makefile → vm/Makefile
diff --git a/program_artifacts/asm/basic_program.elf → vm/program_artifacts/asm/basic_program.elf b/program_artifacts/asm/basic_program.elf → vm/program_artifacts/asm/basic_program.elf
diff --git a/program_artifacts/rust/basic_rust.elf → vm/program_artifacts/rust/basic_rust.elf b/program_artifacts/rust/basic_rust.elf → vm/program_artifacts/rust/basic_rust.elf
diff --git a/programs/asm/basic_program.s → vm/programs/asm/basic_program.s b/programs/asm/basic_program.s → vm/programs/asm/basic_program.s
diff --git a/programs/rust/basic_rust/Cargo.lock → vm/programs/rust/basic_rust/Cargo.lock b/programs/rust/basic_rust/Cargo.lock → vm/programs/rust/basic_rust/Cargo.lock
diff --git a/programs/rust/basic_rust/Cargo.toml → vm/programs/rust/basic_rust/Cargo.toml b/programs/rust/basic_rust/Cargo.toml → vm/programs/rust/basic_rust/Cargo.toml
@@ -1,3 +1,5 @@
+[workspace]
+
 [package]
 name = "basic_rust"
 version = "0.1.0"

diff --git a/programs/rust/basic_rust/src/main.rs → vm/programs/rust/basic_rust/src/main.rs b/programs/rust/basic_rust/src/main.rs → vm/programs/rust/basic_rust/src/main.rs
diff --git a/src/elf.rs → vm/src/elf.rs b/src/elf.rs → vm/src/elf.rs
diff --git a/src/lib.rs → vm/src/lib.rs b/src/lib.rs → vm/src/lib.rs
diff --git a/src/main.rs → vm/src/main.rs b/src/main.rs → vm/src/main.rs
@@ -1,4 +1,4 @@
-use null_vm::{elf::Elf, vm::execution::run_program};
+use vm::{elf::Elf, vm::execution::run_program};
 
 fn main() {
     println!("Reading elf");

diff --git a/src/vm/execution.rs → vm/src/vm/execution.rs b/src/vm/execution.rs → vm/src/vm/execution.rs
diff --git a/src/vm/instructions.rs → vm/src/vm/instructions.rs b/src/vm/instructions.rs → vm/src/vm/instructions.rs
diff --git a/src/vm/mod.rs → vm/src/vm/mod.rs b/src/vm/mod.rs → vm/src/vm/mod.rs
diff --git a/tests/asm.rs → vm/tests/asm.rs b/tests/asm.rs → vm/tests/asm.rs
@@ -1,4 +1,4 @@
-use null_vm::{elf::Elf, vm::execution::run_program};
+use vm::{elf::Elf, vm::execution::run_program};
 
 #[test]
 fn test_basic_program() {

diff --git a/tests/rust.rs → vm/tests/rust.rs b/tests/rust.rs → vm/tests/rust.rs
@@ -1,4 +1,4 @@
-use null_vm::{elf::Elf, vm::execution::run_program};
+use vm::{elf::Elf, vm::execution::run_program};
 
 #[test]
 fn test_basic_rust() {