diff --git a/Cargo.lock b/Cargo.lock index bcc946a..0d861be 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -634,6 +634,7 @@ name = "moa_m68k" version = "0.1.0" dependencies = [ "moa_core", + "moa_parsing", ] [[package]] @@ -663,6 +664,13 @@ dependencies = [ "simple_logger", ] +[[package]] +name = "moa_parsing" +version = "0.1.0" +dependencies = [ + "moa_core", +] + [[package]] name = "moa_peripherals_generic" version = "0.1.0" diff --git a/emulator/core/src/lib.rs b/emulator/core/src/lib.rs index 6093dac..fe77056 100644 --- a/emulator/core/src/lib.rs +++ b/emulator/core/src/lib.rs @@ -10,7 +10,6 @@ mod signals; mod system; pub mod host; -pub mod parser; pub mod timers; pub use log::{trace, debug, info, warn, error}; diff --git a/emulator/cpus/m68k/Cargo.toml b/emulator/cpus/m68k/Cargo.toml index 86e7a68..9e2a6e5 100644 --- a/emulator/cpus/m68k/Cargo.toml +++ b/emulator/cpus/m68k/Cargo.toml @@ -5,3 +5,4 @@ edition = "2021" [dependencies] moa_core = { path = "../../core" } +moa_parsing = { path = "../../libraries/parsing" } diff --git a/emulator/cpus/m68k/src/assembler.rs b/emulator/cpus/m68k/src/assembler.rs index 09e3739..436807a 100644 --- a/emulator/cpus/m68k/src/assembler.rs +++ b/emulator/cpus/m68k/src/assembler.rs @@ -2,7 +2,7 @@ use std::collections::HashMap; use moa_core::Error; -use moa_core::parser::{self, AssemblyLine, AssemblyOperand, AssemblyParser}; +use moa_parsing::{self as parser, AssemblyLine, AssemblyOperand, AssemblyParser}; use super::state::M68kType; use super::instructions::Size; diff --git a/emulator/libraries/parsing/Cargo.toml b/emulator/libraries/parsing/Cargo.toml new file mode 100644 index 0000000..3ae3f72 --- /dev/null +++ b/emulator/libraries/parsing/Cargo.toml @@ -0,0 +1,7 @@ +[package] +name = "moa_parsing" +version = "0.1.0" +edition = "2021" + +[dependencies] +moa_core = { path = "../../core" } diff --git a/emulator/core/src/parser.rs b/emulator/libraries/parsing/src/lib.rs similarity index 99% rename from emulator/core/src/parser.rs rename to emulator/libraries/parsing/src/lib.rs index c6ff98d..045c998 100644 --- a/emulator/core/src/parser.rs +++ b/emulator/libraries/parsing/src/lib.rs @@ -2,7 +2,7 @@ use std::str::Chars; use std::iter::Peekable; -use crate::error::Error; +use moa_core::Error; #[derive(Debug)]