Website Summary Files Commits Branches @commit @diff @stats
diff options
context:
space:
mode:
Commit74f1e4f03ae496bef87d25a5a26948204a7e7800 (patch)
Author
 Syndamia <kamen@syndamia.com>
2025-02-14 13:12:49 +0200
Committer
 Syndamia <kamen@syndamia.com>
2025-02-14 13:12:49 +0200
Files5b8aeae53067e9194d8dd5468ea279d7ad8c6977
tonkobali-74f1e4f03ae496bef87d25a5a26948204a7e7800.tar
tonkobali-74f1e4f03ae496bef87d25a5a26948204a7e7800.tar.gz
tonkobali-74f1e4f03ae496bef87d25a5a26948204a7e7800.zip
Parent9c656c296827172589243d588f57f9ab2745efc6 (diff)
feat: Replace root crate with workspace
8 files changed, 13 insertions, 21 deletions
-rw-r--r--Cargo.lock (renamed from assembler/Cargo.lock)6
-rw-r--r--Cargo.toml10
-rw-r--r--assembler/Cargo.toml2
-rw-r--r--example.s (renamed from assembler/example.s)2
-rw-r--r--src/main.rs3
-rw-r--r--vm/Cargo.lock7
-rw-r--r--vm/Cargo.toml2
-rw-r--r--vm/src/main.rs2
diff --git a/assembler/Cargo.lock b/Cargo.lock
index a1558f6..d9959a3 100644
--- a/assembler/Cargo.lock
+++ b/Cargo.lock
@@ -3,5 +3,9 @@
version = 3
[[package]]
-name = "tonkobali_assembler"
+name = "assembler"
+version = "0.1.0"
+
+[[package]]
+name = "vm"
version = "0.1.0"
diff --git a/Cargo.toml b/Cargo.toml
index 26c9380..3dd89f3 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -1,6 +1,4 @@
-[package]
-name = "tonkobali"
-version = "0.1.0"
-edition = "2021"
-
-[dependencies]
+[workspace]
+members = [
+ "vm", "assembler"
+]
diff --git a/assembler/Cargo.toml b/assembler/Cargo.toml
index 323b365..2f45134 100644
--- a/assembler/Cargo.toml
+++ b/assembler/Cargo.toml
@@ -1,5 +1,5 @@
[package]
-name = "tonkobali_assembler"
+name = "assembler"
version = "0.1.0"
edition = "2021"
diff --git a/assembler/example.s b/example.s
index b7c45ee..41b0771 100644
--- a/assembler/example.s
+++ b/example.s
@@ -11,7 +11,7 @@ if_false:
endif:
jmp %0
-condition = 0
+condition = 1
; 0 beq Memory(0), Instruction(2),
; 0: subleq Memory(0), Memory(0), Instruction(2),
diff --git a/src/main.rs b/src/main.rs
deleted file mode 100644
index e7a11a9..0000000
--- a/src/main.rs
+++ /dev/null
@@ -1,3 +0,0 @@
-fn main() {
- println!("Hello, world!");
-}
diff --git a/vm/Cargo.lock b/vm/Cargo.lock
deleted file mode 100644
index 097a59f..0000000
--- a/vm/Cargo.lock
+++ /dev/null
@@ -1,7 +0,0 @@
-# This file is automatically @generated by Cargo.
-# It is not intended for manual editing.
-version = 3
-
-[[package]]
-name = "tonkobali-vm"
-version = "0.1.0"
diff --git a/vm/Cargo.toml b/vm/Cargo.toml
index 8b28653..bd9b36a 100644
--- a/vm/Cargo.toml
+++ b/vm/Cargo.toml
@@ -1,5 +1,5 @@
[package]
-name = "tonkobali-vm"
+name = "vm"
version = "0.1.0"
edition = "2021"
diff --git a/vm/src/main.rs b/vm/src/main.rs
index 211cdc7..0076ba1 100644
--- a/vm/src/main.rs
+++ b/vm/src/main.rs
@@ -23,7 +23,7 @@ fn main() {
* > subleq 0, 0, next
* > subleq 0, 0, 0
*/
- let vm = VirtualMachine::create_from_file("../assembler/program.bin");
+ let vm = VirtualMachine::create_from_file("./program.bin");
let _vm_handle = {
let vm = Arc::clone(&vm);