dergrimm/hence
1
1
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Did stuff again

Browse source
This commit is contained in:
Dominic Grimm 2022-08-26 15:02:48 +02:00
parent 8d15e300b7
commit 6f28879402
14 changed files with 74 additions and 151 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

40
Cargo.lock generated
View file

@ -33,9 +33,9 @@ checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd"
[[package]]
name = "clap"
version = "3.2.16"
version = "3.2.17"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "a3dbbb6653e7c55cc8595ad3e1f7be8f32aba4eb7ff7f0fd1163d4f3d137c0a9"
checksum = "29e724a68d9319343bb3328c9cc2dfde263f4b3142ee1059a9980580171c954b"
dependencies = [
"atty",
"bitflags",
@ -50,9 +50,9 @@ dependencies = [
[[package]]
name = "clap_derive"
version = "3.2.15"
version = "3.2.17"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "9ba52acd3b0a5c33aeada5cdaa3267cdc7c594a98731d4268cdc1532f4264cb4"
checksum = "13547f7012c01ab4a0e8f8967730ada8f9fdf419e8b6c792788f39cf4e46eefa"
dependencies = [
"heck",
"proc-macro-error",
@ -86,9 +86,9 @@ dependencies = [
[[package]]
name = "either"
version = "1.7.0"
version = "1.8.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "3f107b87b6afc2a64fd13cac55fe06d6c8859f12d4b14cbcdd2c67d0976781be"
checksum = "90e5c1c8368803113bf0c9584fc495a58b86dc8a29edbf8fe877d21d9507e797"
[[package]]
name = "encode_unicode"
@ -162,9 +162,9 @@ dependencies = [
[[package]]
name = "libc"
version = "0.2.126"
version = "0.2.132"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "349d5a591cd28b49e1d1037471617a32ddcda5731b99419008085f72d5a53836"
checksum = "8371e4e5341c3a96db127eb2465ac681ced4c433e01dd0e938adbef26ba93ba5"
[[package]]
name = "num"
@ -253,15 +253,15 @@ dependencies = [
[[package]]
name = "once_cell"
version = "1.13.0"
version = "1.13.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "18a6dbe30758c9f83eb00cbea4ac95966305f5a7772f3f42ebfc7fc7eddbd8e1"
checksum = "074864da206b4973b84eb91683020dbefd6a8c3f0f38e054d93954e891935e4e"
[[package]]
name = "os_str_bytes"
version = "6.2.0"
version = "6.3.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "648001efe5d5c0102d8cea768e348da85d90af8ba91f0bea908f157951493cd4"
checksum = "9ff7415e9ae3fff1225851df9e0d9e4e5479f947619774677a63572e55e80eff"
[[package]]
name = "ppv-lite86"
@ -295,18 +295,18 @@ dependencies = [
[[package]]
name = "proc-macro2"
version = "1.0.40"
version = "1.0.43"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "dd96a1e8ed2596c337f8eae5f24924ec83f5ad5ab21ea8e455d3566c69fbcaf7"
checksum = "0a2ca2c61bc9f3d74d2886294ab7b9853abd9c1ad903a3ac7815c58989bb7bab"
dependencies = [
"unicode-ident",
]
[[package]]
name = "quote"
version = "1.0.20"
version = "1.0.21"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "3bcdf212e9776fbcb2d23ab029360416bb1706b1aea2d1a5ba002727cbcab804"
checksum = "bbe448f377a7d6961e30f5955f9b8d106c3f5e449d493ee1b125c1d43c2b5179"
dependencies = [
"proc-macro2",
]
@ -361,9 +361,9 @@ checksum = "73473c0e59e6d5812c5dfe2a064a6444949f089e20eec9a2e5506596494e4623"
[[package]]
name = "syn"
version = "1.0.98"
version = "1.0.99"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "c50aef8a904de4c23c788f104b7dddc7d6f79c647c7c8ce4cc8f73eb0ca773dd"
checksum = "58dbef6ec655055e20b86b15a8cc6d439cca19b667537ac6a1369572d151ab13"
dependencies = [
"proc-macro2",
"quote",
@ -397,9 +397,9 @@ checksum = "b1141d4d61095b28419e22cb0bbf02755f5e54e0526f97f1e3d1d160e60885fb"
[[package]]
name = "unicode-ident"
version = "1.0.2"
version = "1.0.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "15c61ba63f9235225a22310255a29b806b907c9b8c964bcbd0a2c70f3f2deea7"
checksum = "c4f5b37a154999a8f3f98cc23a628d850e154479cd94decf3414696e12e31aaf"
[[package]]
name = "unicode-width"

25
Cargo.toml
View file

@ -1,2 +1,23 @@
[workspace]
members = ["hence"]
[package]
name = "hence"
version = "0.1.0"
edition = "2021"
[lib]
name = "hence"
path = "src/lib/lib.rs"
[[bin]]
name = "hence"
path = "src/bin/main.rs"
# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
[dependencies]
itertools = "0.10.2"
num-parse = "0.1.2"
clap = { version = "3.2.16", features = ["derive"] }
rhexdump = "0.1.1"
radix_fmt = "1"
rand = "0.8.5"
console = "0.15.1"

60
examples/forth.asm
View file

@ -61,65 +61,8 @@ forth:
ts jump_main
tlr CORE_REG_PC
end_input:
dbg
main:
; loop body
loop:
; read key from stdin
ts CORE_MEM_KEY
get
; check if key is newline (0x0a)
tlr CORE_REG_D ; store in register D because register A is used later on
tlr CORE_REG_A ; store in register A as input for ALU
ts "\n" ; store newline in TMP
tlr CORE_REG_B ; store newline in register B as input for ALU
ts CORE_ALU_EQ ; ALU equal operation
alu ; run ALU
; go back to loop start if pressed key is newline
tlr CORE_REG_A ; store result of ALU operation in TMP
; ts loop ; load memory address of loop start into TMP
ts 0
tls
ts jump_switch
tls
ts end_input
tlrc CORE_REG_PC ; set register PC to loop start address if result is true
pop
tlr CORE_REG_A
ts 0
tlrc CORE_REG_C
; print out char
tsr CORE_REG_D ; get char
tlr CORE_REG_A ; load char into register A
ts CORE_MEM_CHR ; set TMP to char print memory address
set ; print char
; increment counter by one
tsr CORE_REG_C
tlr CORE_REG_A
ts 1
tlr CORE_REG_B
ts CORE_ALU_ADD
alu
tlr CORE_REG_C
tlr CORE_REG_A
ts FORTH_MEM_INPUT_SIZE
tlr CORE_REG_B
ts CORE_ALU_LT
alu
tlr CORE_REG_A
ts loop
tlrc CORE_REG_PC
ts "\n"
tlr CORE_REG_A
dbg
; set PC to maximum for u16 and therefore stops program execution
ts 0xffff ; load 0xffff into TMP
@ -128,3 +71,4 @@ tlr CORE_REG_PC ; store value of TMP into register PC
.org jump_main
ts main
tlr CORE_REG_PC

BIN
examples/forth.bin
View file

Binary file not shown.

1
hence/.gitignore vendored
View file

@ -1 +0,0 @@
/target

23
hence/Cargo.toml
View file

@ -1,23 +0,0 @@
[package]
name = "hence"
version = "0.1.0"
edition = "2021"
[lib]
name = "hence"
path = "src/lib/lib.rs"
[[bin]]
name = "hence"
path = "src/bin/main.rs"
# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
[dependencies]
itertools = "0.10.2"
num-parse = "0.1.2"
clap = { version = "3.2.16", features = ["derive"] }
rhexdump = "0.1.1"
radix_fmt = "1"
rand = "0.8.5"
console = "0.15.1"

5
hence/src/bin/main.rs → src/bin/main.rs
View file

@ -69,12 +69,9 @@ fn main() {
);
assembler::assemble(&mut data).unwrap();
match bin {
Some(x) => {
if let Some(x) = bin {
File::create(x).unwrap().write_all(&data.program).unwrap();
}
_ => {}
}
if dump {
println!("{}", rhexdump::hexdump(&data.program));
}

14
hence/src/lib/arg.rs → src/lib/arg.rs
View file

@ -52,10 +52,7 @@ impl assembler::ByteResolvable<assembler::Data> for Arg {
let mut arg: Option<arg::Arg>;
loop {
arg = match data.contants.get(&name) {
Some(a) => Some(a.clone()),
_ => None,
};
arg = data.contants.get(&name).cloned();
match arg {
Some(a) => {
@ -95,12 +92,7 @@ impl assembler::ByteResolvable<assembler::Data> for Arg {
let mut arg: Option<arg::Arg>;
loop {
dbg!(&name);
arg = match data.contants.get(&name) {
Some(a) => Some(a.clone()),
_ => None,
};
dbg!(&arg);
arg = data.contants.get(&name).cloned();
match arg {
Some(a) => {
@ -174,7 +166,7 @@ pub fn parse_binary_expression_arg(tokens: &mut Vec<&&lexer::Token>) -> Result<A
op: parse_binary_operation(args[1]).unwrap(),
};
while tokens.len() != 0 {
while !tokens.is_empty() {
args = tokens.drain(..2).collect();
bin_expr = Arg::BinaryExpression {
left: Box::new(bin_expr),

33
hence/src/lib/assembler.rs → src/lib/assembler.rs
View file

@ -136,20 +136,6 @@ pub fn assemble(data: &mut Data) -> Result<(), String> {
}
println!("==========");
}
// "define" => {
// let name = match &args[0] {
// arg::Arg::Variable(x) | arg::Arg::String(x) => x,
// _ => return Err(
// "First argument of define macro needs to be a literal-like"
// .to_string(),
// ),
// };
// if data.contants.contains_key(name) {
// return Err(format!("Constant already exists: '{name}'"));
// }
// data.contants.insert(name.to_string(), (&args[1]).clone());
// }
"define" => {
let name = match &args[0] {
arg::Arg::Variable(x) | arg::Arg::String(x) => x,
@ -170,13 +156,18 @@ pub fn assemble(data: &mut Data) -> Result<(), String> {
),
};
let args = match (&args[1..])
.into_iter()
.map(|a| match a {
arg::Arg::Variable(x) => Ok(x.clone()),
__ => {
return Err(
"Macro arguments need to be variables".to_string()
)
.iter()
// .map(|a| match a {
// arg::Arg::Variable(x) => Ok(x.clone()),
// __ => {
// Err("Macro arguments need to be variables".to_string())
// }
// })
.map(|a| {
if let arg::Arg::Variable(x) = a {
Ok(x.clone())
} else {
Err("Macro arguments need to be variables".to_string())
}
})
.collect::<Result<Vec<_>, _>>()

13
hence/src/lib/emulator.rs → src/lib/emulator.rs
View file

@ -27,7 +27,7 @@ pub struct Data {
impl Data {
pub fn new(program: [u8; 32 * 1024]) -> Self {
return Self {
Self {
program,
tmp: 0,
@ -46,14 +46,14 @@ impl Data {
memory: [0; 16 * 1024],
term: console::Term::stdout(),
};
}
}
pub fn get_memory(&self, address: u16) -> u16 {
if address < (32 * 1024) {
match self.program.get(address as usize) {
Some(val) => val.clone() as u16,
_ => 0,
Some(val) => *val as u16,
None => 0,
}
} else if address < (40 * 1024) {
self.stack[(address - (32 * 1024)) as usize]
@ -67,7 +67,8 @@ impl Data {
}
pub fn set_memory(&mut self, address: u16, value: u16) {
if address >= (32 * 1024) && address < (40 * 1024) {
// if address >= (32 * 1024) && address < (40 * 1024) {
if ((32 * 1024)..(40 * 1024)).contains(&address) {
self.stack[(address - (32 * 1024)) as usize] = value;
} else if address < (40 * 1024) {
self.memory[(address - (40 * 1024)) as usize] = value;
@ -252,7 +253,7 @@ pub fn emulate(data: &mut Data) -> Result<(), String> {
data.reg_arg = data.get_memory(data.reg_pc) << 8;
data.reg_pc = data.reg_pc.wrapping_add(1);
data.reg_arg = data.reg_arg | data.get_memory(data.reg_pc);
data.reg_arg |= data.get_memory(data.reg_pc);
data.reg_pc = data.reg_pc.wrapping_add(1);
}

0
hence/src/lib/lexer.rs → src/lib/lexer.rs
View file

0
hence/src/lib/lib.rs → src/lib/lib.rs
View file

9
hence/src/lib/parser.rs → src/lib/parser.rs
View file

@ -55,10 +55,11 @@ pub fn parse(tokens: Vec<lexer::Token>) -> Result<ast::AST, String> {
body.push(ast::Node::Call {
name: x.clone(),
arg: match args.first() {
Some(x) => Some(x.clone()),
_ => None,
},
// arg: match args.first() {
// Some(x) => Some(x.clone()),
// _ => None,
// },
arg: args.first().cloned(),
});
}
}

0
hence/src/lib/parser/ast.rs → src/lib/parser/ast.rs
View file