Renamed vasm to vasm_core

.idea/vulcan-emu.iml

@@ -5,9 +5,9 @@
       <sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" />
       <sourceFolder url="file://$MODULE_DIR$/vcore/src" isTestSource="false" />
       <sourceFolder url="file://$MODULE_DIR$/vemu/src" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/vasm/src" isTestSource="false" />
       <sourceFolder url="file://$MODULE_DIR$/vtest/src" isTestSource="false" />
       <sourceFolder url="file://$MODULE_DIR$/vlua/src" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/vasm_core/src" isTestSource="false" />
       <excludeFolder url="file://$MODULE_DIR$/target" />
     </content>
     <orderEntry type="inheritedJdk" />

Cargo.toml

@@ -3,7 +3,7 @@ resolver = "2"
 members = [
     "vcore",
     "vemu",
-    "vasm",
+    "vasm_core",
     "vtest",
     "vlua"
 ]

vemu/Cargo.toml

@@ -7,7 +7,7 @@ edition = "2021"
 
 [dependencies]
 vcore = { path = "../vcore" }
-vasm = { path = "../vasm" }
+vasm = { path = "../vasm_core" }
 rand = "0.8.0"
 winit = "0.26.1"
 pixels = "0.9.0"

vemu/src/main.rs

@@ -45,11 +45,12 @@ fn main() {
     let memory = Memory::from(rng);
     let mut cpu = CPU::new(memory);
     display::reset(&mut cpu);
-    // let code = assemble_snippet(include_str!("typewriter.asm").lines().map(String::from)).expect("Assemble error");
+    let code = assemble_snippet(include_str!("typewriter.asm").lines().map(String::from))
+        .expect("Assemble error");
     // let code = assemble_file("init.asm").expect("Assemble error");
-    let mut file = File::open("4th.rom").expect("ROM not found");
-    let mut code = Vec::new();
-    file.read_to_end(&mut code).expect("Couldn't read ROM");
+    // let mut file = File::open("4th.rom").expect("ROM not found");
+    // let mut code = Vec::new();
+    // file.read_to_end(&mut code).expect("Couldn't read ROM");
     println!("ROM size: {} bytes", code.len());
     cpu.poke_slice(0x400.into(), code.as_slice());
     cpu.start();

vtest/Cargo.toml

@@ -7,4 +7,4 @@ edition = "2021"
 
 [dependencies]
 vcore = { path = "../vcore" }
-vasm = { path = "../vasm" }
+vasm = { path = "../vasm_core" }