tied it together
This commit is contained in:
parent
96c17117cd
commit
a9a2761eb4
7 changed files with 342 additions and 29 deletions
228
Cargo.lock
generated
228
Cargo.lock
generated
|
|
@ -11,12 +11,137 @@ dependencies = [
|
|||
"memchr",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "anstream"
|
||||
version = "0.6.18"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "8acc5369981196006228e28809f761875c0327210a891e941f4c683b3a99529b"
|
||||
dependencies = [
|
||||
"anstyle",
|
||||
"anstyle-parse",
|
||||
"anstyle-query",
|
||||
"anstyle-wincon",
|
||||
"colorchoice",
|
||||
"is_terminal_polyfill",
|
||||
"utf8parse",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "anstyle"
|
||||
version = "1.0.10"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "55cc3b69f167a1ef2e161439aa98aed94e6028e5f9a59be9a6ffb47aef1651f9"
|
||||
|
||||
[[package]]
|
||||
name = "anstyle-parse"
|
||||
version = "0.2.6"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "3b2d16507662817a6a20a9ea92df6652ee4f94f914589377d69f3b21bc5798a9"
|
||||
dependencies = [
|
||||
"utf8parse",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "anstyle-query"
|
||||
version = "1.1.2"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "79947af37f4177cfead1110013d678905c37501914fba0efea834c3fe9a8d60c"
|
||||
dependencies = [
|
||||
"windows-sys",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "anstyle-wincon"
|
||||
version = "3.0.6"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "2109dbce0e72be3ec00bed26e6a7479ca384ad226efdd66db8fa2e3a38c83125"
|
||||
dependencies = [
|
||||
"anstyle",
|
||||
"windows-sys",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "clap"
|
||||
version = "4.5.21"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "fb3b4b9e5a7c7514dfa52869339ee98b3156b0bfb4e8a77c4ff4babb64b1604f"
|
||||
dependencies = [
|
||||
"clap_builder",
|
||||
"clap_derive",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "clap_builder"
|
||||
version = "4.5.21"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "b17a95aa67cc7b5ebd32aa5370189aa0d79069ef1c64ce893bd30fb24bff20ec"
|
||||
dependencies = [
|
||||
"anstream",
|
||||
"anstyle",
|
||||
"clap_lex",
|
||||
"strsim",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "clap_derive"
|
||||
version = "4.5.18"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "4ac6a0c7b1a9e9a5186361f67dfa1b88213572f427fb9ab038efb2bd8c582dab"
|
||||
dependencies = [
|
||||
"heck",
|
||||
"proc-macro2",
|
||||
"quote",
|
||||
"syn",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "clap_lex"
|
||||
version = "0.7.3"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "afb84c814227b90d6895e01398aee0d8033c00e7466aca416fb6a8e0eb19d8a7"
|
||||
|
||||
[[package]]
|
||||
name = "colorchoice"
|
||||
version = "1.0.3"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "5b63caa9aa9397e2d9480a9b13673856c78d8ac123288526c37d7839f2a86990"
|
||||
|
||||
[[package]]
|
||||
name = "heck"
|
||||
version = "0.5.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "2304e00983f87ffb38b55b444b5e3b60a884b5d30c0fca7d82fe33449bbe55ea"
|
||||
|
||||
[[package]]
|
||||
name = "is_terminal_polyfill"
|
||||
version = "1.70.1"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "7943c866cc5cd64cbc25b2e01621d07fa8eb2a1a23160ee81ce38704e97b8ecf"
|
||||
|
||||
[[package]]
|
||||
name = "memchr"
|
||||
version = "2.7.4"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "78ca9ab1a0babb1e7d5695e3530886289c18cf2f87ec19a575a0abdce112e3a3"
|
||||
|
||||
[[package]]
|
||||
name = "proc-macro2"
|
||||
version = "1.0.92"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "37d3544b3f2748c54e147655edb5025752e2303145b5aefb3c3ea2c78b973bb0"
|
||||
dependencies = [
|
||||
"unicode-ident",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "quote"
|
||||
version = "1.0.37"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "b5b9d34b8991d19d98081b46eacdd8eb58c6f2b201139f7c5f643cc155a633af"
|
||||
dependencies = [
|
||||
"proc-macro2",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "regex"
|
||||
version = "1.11.1"
|
||||
|
|
@ -46,9 +171,112 @@ version = "0.8.5"
|
|||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "2b15c43186be67a4fd63bee50d0303afffcef381492ebe2c5d87f324e1b8815c"
|
||||
|
||||
[[package]]
|
||||
name = "strsim"
|
||||
version = "0.11.1"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "7da8b5736845d9f2fcb837ea5d9e2628564b3b043a70948a3f0b778838c5fb4f"
|
||||
|
||||
[[package]]
|
||||
name = "syn"
|
||||
version = "2.0.89"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "44d46482f1c1c87acd84dea20c1bf5ebff4c757009ed6bf19cfd36fb10e92c4e"
|
||||
dependencies = [
|
||||
"proc-macro2",
|
||||
"quote",
|
||||
"unicode-ident",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "sysforge"
|
||||
version = "0.1.0"
|
||||
dependencies = [
|
||||
"clap",
|
||||
"regex",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "unicode-ident"
|
||||
version = "1.0.14"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "adb9e6ca4f869e1180728b7950e35922a7fc6397f7b641499e8f3ef06e50dc83"
|
||||
|
||||
[[package]]
|
||||
name = "utf8parse"
|
||||
version = "0.2.2"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "06abde3611657adf66d383f00b093d7faecc7fa57071cce2578660c9f1010821"
|
||||
|
||||
[[package]]
|
||||
name = "windows-sys"
|
||||
version = "0.59.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "1e38bc4d79ed67fd075bcc251a1c39b32a1776bbe92e5bef1f0bf1f8c531853b"
|
||||
dependencies = [
|
||||
"windows-targets",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "windows-targets"
|
||||
version = "0.52.6"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "9b724f72796e036ab90c1021d4780d4d3d648aca59e491e6b98e725b84e99973"
|
||||
dependencies = [
|
||||
"windows_aarch64_gnullvm",
|
||||
"windows_aarch64_msvc",
|
||||
"windows_i686_gnu",
|
||||
"windows_i686_gnullvm",
|
||||
"windows_i686_msvc",
|
||||
"windows_x86_64_gnu",
|
||||
"windows_x86_64_gnullvm",
|
||||
"windows_x86_64_msvc",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "windows_aarch64_gnullvm"
|
||||
version = "0.52.6"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "32a4622180e7a0ec044bb555404c800bc9fd9ec262ec147edd5989ccd0c02cd3"
|
||||
|
||||
[[package]]
|
||||
name = "windows_aarch64_msvc"
|
||||
version = "0.52.6"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "09ec2a7bb152e2252b53fa7803150007879548bc709c039df7627cabbd05d469"
|
||||
|
||||
[[package]]
|
||||
name = "windows_i686_gnu"
|
||||
version = "0.52.6"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "8e9b5ad5ab802e97eb8e295ac6720e509ee4c243f69d781394014ebfe8bbfa0b"
|
||||
|
||||
[[package]]
|
||||
name = "windows_i686_gnullvm"
|
||||
version = "0.52.6"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "0eee52d38c090b3caa76c563b86c3a4bd71ef1a819287c19d586d7334ae8ed66"
|
||||
|
||||
[[package]]
|
||||
name = "windows_i686_msvc"
|
||||
version = "0.52.6"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "240948bc05c5e7c6dabba28bf89d89ffce3e303022809e73deaefe4f6ec56c66"
|
||||
|
||||
[[package]]
|
||||
name = "windows_x86_64_gnu"
|
||||
version = "0.52.6"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "147a5c80aabfbf0c7d901cb5895d1de30ef2907eb21fbbab29ca94c5b08b1a78"
|
||||
|
||||
[[package]]
|
||||
name = "windows_x86_64_gnullvm"
|
||||
version = "0.52.6"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "24d5b23dc417412679681396f2b49f3de8c1473deb516bd34410872eff51ed0d"
|
||||
|
||||
[[package]]
|
||||
name = "windows_x86_64_msvc"
|
||||
version = "0.52.6"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "589f6da84c646204747d1270a2a5661ea66ed1cced2631d546fdfb155959f9ec"
|
||||
|
|
|
|||
|
|
@ -4,4 +4,5 @@ version = "0.1.0"
|
|||
edition = "2021"
|
||||
|
||||
[dependencies]
|
||||
clap = { version = "4.5.21", features = ["derive"] }
|
||||
regex = "1.11.1"
|
||||
|
|
|
|||
|
|
@ -11,10 +11,10 @@ pub struct Opcode<T: Clone + ToString + FromStr> {
|
|||
|
||||
impl<T: Clone + ToString + FromStr> Opcode<T> {
|
||||
pub fn create(key: &str, value: T) -> Opcode<T> {
|
||||
return Opcode {
|
||||
Opcode {
|
||||
key: key.to_string(),
|
||||
value: value,
|
||||
};
|
||||
value,
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -24,7 +24,7 @@ pub struct Assembler<T: Clone + ToString + FromStr> {
|
|||
|
||||
impl<T: Clone + ToString + FromStr> Assembler<T> {
|
||||
pub fn create(opcodes: Vec<Opcode<T>>) -> Assembler<T> {
|
||||
return Assembler { opcodes: opcodes };
|
||||
Assembler { opcodes: opcodes }
|
||||
}
|
||||
|
||||
pub fn assemble(&mut self, source: &mut String) -> Vec<T> {
|
||||
|
|
@ -34,7 +34,7 @@ impl<T: Clone + ToString + FromStr> Assembler<T> {
|
|||
map.insert(opcode.key.clone(), opcode.value.clone());
|
||||
}
|
||||
|
||||
return Regex::new(r"[\s]+") // create regex
|
||||
Regex::new(r"[\s]+") // create regex
|
||||
.unwrap()
|
||||
.split(source) // split by regex
|
||||
.filter(|s: &&str| !s.is_empty()) // remove empty entries
|
||||
|
|
@ -56,6 +56,6 @@ impl<T: Clone + ToString + FromStr> Assembler<T> {
|
|||
s.parse::<T>().ok()
|
||||
}
|
||||
})
|
||||
.collect();
|
||||
.collect()
|
||||
}
|
||||
}
|
||||
|
|
|
|||
56
src/cpu.rs
56
src/cpu.rs
|
|
@ -1,33 +1,71 @@
|
|||
// SPDX-License-Identifier: LGPL-3.0-or-later
|
||||
// Copyright (c) 2024 Patrick_Pluto
|
||||
|
||||
use crate::assembler;
|
||||
|
||||
pub trait CPU<T> {
|
||||
fn create(debug: bool, initial_state: Vec<T>) -> Self;
|
||||
fn assemble(source: String) -> Vec<T>;
|
||||
fn start(&mut self);
|
||||
}
|
||||
|
||||
// This is an example implementation of a CPU emulator. You can copy this for your own custom ISA, or do something else.
|
||||
pub struct ExampleCPU {
|
||||
debug: bool,
|
||||
execution_pointer: u8,
|
||||
operands: [u8; 3],
|
||||
ram: [u8; 256],
|
||||
registers: [u8; 8],
|
||||
registers: [u8; 4],
|
||||
}
|
||||
|
||||
impl ExampleCPU {
|
||||
impl CPU<u8> for ExampleCPU {
|
||||
// Here is where you can create your own CPU Instance.
|
||||
pub fn create(debug: bool, initial_state: [u8; 256]) -> ExampleCPU {
|
||||
return ExampleCPU {
|
||||
debug: debug,
|
||||
fn create(debug: bool, initial_state: Vec<u8>) -> ExampleCPU {
|
||||
let mut instance: ExampleCPU = ExampleCPU {
|
||||
debug,
|
||||
execution_pointer: 0,
|
||||
operands: [0; 3],
|
||||
ram: initial_state,
|
||||
registers: [0; 8],
|
||||
ram: [0; 256],
|
||||
registers: [0; 4],
|
||||
};
|
||||
|
||||
let len = initial_state.len();
|
||||
let ram_len = instance.ram.len();
|
||||
|
||||
if len >= ram_len {
|
||||
instance.ram.copy_from_slice(&initial_state[..ram_len]);
|
||||
} else {
|
||||
instance.ram[..len].copy_from_slice(&initial_state);
|
||||
}
|
||||
|
||||
instance
|
||||
}
|
||||
|
||||
pub fn start(&mut self) {
|
||||
// Here is where you define the steps for assembling your custom Assembly language.
|
||||
fn assemble(mut source: String) -> Vec<u8> {
|
||||
let mut assembler: assembler::Assembler<u8> = assembler::Assembler::create(vec![
|
||||
assembler::Opcode::create("nop", 0),
|
||||
assembler::Opcode::create("load", 1),
|
||||
assembler::Opcode::create("store", 2),
|
||||
assembler::Opcode::create("add", 3),
|
||||
assembler::Opcode::create("sub", 4),
|
||||
assembler::Opcode::create("jump", 5),
|
||||
assembler::Opcode::create("jpiz", 6),
|
||||
]);
|
||||
|
||||
assembler.assemble(&mut source)
|
||||
}
|
||||
|
||||
// This starts the CPU emulator.
|
||||
fn start(&mut self) {
|
||||
loop {
|
||||
self.fetch_and_decode()
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
// These are the implementations specific to ExampleCPU
|
||||
impl ExampleCPU {
|
||||
// This fetches the operands, based on the position of the execution_pointer, then runs the selected instruction.
|
||||
fn fetch_and_decode(&mut self) {
|
||||
self.operands[0] = self.ram[self.execution_pointer as usize];
|
||||
|
|
@ -81,7 +119,7 @@ impl ExampleCPU {
|
|||
}
|
||||
|
||||
fn jpiz(&mut self) {
|
||||
if self.operands[2] == 0 {
|
||||
if self.registers[self.operands[2] as usize] == 0 {
|
||||
self.execution_pointer = self.operands[1];
|
||||
} else {
|
||||
self.execution_pointer += 3;
|
||||
|
|
|
|||
21
src/file.rs
Normal file
21
src/file.rs
Normal file
|
|
@ -0,0 +1,21 @@
|
|||
use std::fs::File;
|
||||
use std::io::{Read, Write};
|
||||
|
||||
pub fn load_file(file_path: &str) -> String {
|
||||
let mut file: File = File::open(file_path).unwrap();
|
||||
let mut contents: String = String::new();
|
||||
let _ = file.read_to_string(&mut contents);
|
||||
contents
|
||||
}
|
||||
|
||||
pub fn save_binary_u8(file_path: &str, content: Vec<u8>) {
|
||||
let mut file: File = File::create(file_path).unwrap();
|
||||
file.write_all(&content).unwrap();
|
||||
}
|
||||
|
||||
pub fn load_binary_u8(file_path: &str) -> Vec<u8> {
|
||||
let mut file = File::open(file_path).unwrap();
|
||||
let mut buffer = Vec::new();
|
||||
file.read_to_end(&mut buffer).unwrap();
|
||||
buffer
|
||||
}
|
||||
0
src/gui.rs
Normal file
0
src/gui.rs
Normal file
53
src/main.rs
53
src/main.rs
|
|
@ -1,22 +1,47 @@
|
|||
// SPDX-License-Identifier: LGPL-3.0-or-later
|
||||
// Copyright (c) 2024 Patrick_Pluto
|
||||
|
||||
use clap::Parser;
|
||||
use cpu::CPU;
|
||||
use file::{load_binary_u8, load_file, save_binary_u8};
|
||||
mod assembler;
|
||||
mod cpu;
|
||||
mod file;
|
||||
|
||||
/// SysForge: Systems programming made easy.
|
||||
#[derive(Parser, Debug)]
|
||||
#[command(version, about, long_about = None)]
|
||||
struct Args {
|
||||
/// Assemble a file
|
||||
#[arg(short, long, default_value_t = false)]
|
||||
assemble: bool,
|
||||
|
||||
/// Run the emulator
|
||||
#[arg(short, long, default_value_t = false)]
|
||||
emulate: bool,
|
||||
|
||||
/// Selects the file
|
||||
#[arg(short, long, default_value = "main.asm")]
|
||||
file: String,
|
||||
|
||||
/// Selects the output file
|
||||
#[arg(short, long, default_value = "main.out")]
|
||||
output: String,
|
||||
|
||||
/// Selects which CPU to use
|
||||
#[arg(long, default_value = "ExampleCPU")]
|
||||
cpu: String,
|
||||
}
|
||||
|
||||
fn main() {
|
||||
let mut assembler: assembler::Assembler<u8> = assembler::Assembler::create(vec![
|
||||
assembler::Opcode::create("nop", 0),
|
||||
assembler::Opcode::create("load", 1),
|
||||
assembler::Opcode::create("store", 2),
|
||||
assembler::Opcode::create("add", 3),
|
||||
assembler::Opcode::create("sub", 4),
|
||||
assembler::Opcode::create("jump", 5),
|
||||
assembler::Opcode::create("jpiz", 6),
|
||||
]);
|
||||
|
||||
let final_result: Vec<u8> = assembler.assemble(&mut "nop 0x00 0x22".to_string());
|
||||
dbg!(final_result);
|
||||
let mut instance: cpu::ExampleCPU = cpu::ExampleCPU::create(false, [0; 256]);
|
||||
instance.start();
|
||||
let args: Args = Args::parse();
|
||||
if args.assemble {
|
||||
save_binary_u8(
|
||||
&args.output,
|
||||
cpu::ExampleCPU::assemble(load_file(&args.file)),
|
||||
);
|
||||
} else if args.emulate {
|
||||
cpu::ExampleCPU::create(true, load_binary_u8(&args.file)).start();
|
||||
} else {
|
||||
}
|
||||
}
|
||||
|
|
|
|||
Reference in a new issue