devraza/tinypc
1
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

hotfix: better support for three-code lines

Browse source
This commit is contained in:
Muhammad Nauman Raza 2025-01-26 09:33:41 +00:00
parent 8f0da8a7f7
commit a40eba6f8d
Signed by: devraza
GPG key ID: 91EAD6081011574B
1 changed files with 25 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

31
src/main.rs
View file

@ -2,6 +2,17 @@ use std::collections::HashMap;
use std::fs::File; use std::fs::File;
use std::io::{self, BufRead, BufReader}; use std::io::{self, BufRead, BufReader};
fn retrieve(
memory: &mut HashMap<String, i64>,
ops: Vec<String>
) -> i64 {
if ops.len() >= 3 {
return *memory.get(&ops[2]).unwrap_or(&0);
} else {
return *memory.get(&ops[1]).unwrap_or(&0);
}
}
fn process( fn process(
line: String, line: String,
accumulator: &mut i64, accumulator: &mut i64,
@ -12,7 +23,7 @@ fn process(
let ops: Vec<String> = line.trim().split_whitespace().map(String::from).collect(); let ops: Vec<String> = line.trim().split_whitespace().map(String::from).collect();
let options: Vec<&str>; let options: Vec<&str>;
if ops.len() > 1 { if ops.len() >= 3 {
options = vec![ops[0].as_str(), ops[1].as_str()]; options = vec![ops[0].as_str(), ops[1].as_str()];
} else { } else {
options = vec![ops[0].as_str()]; options = vec![ops[0].as_str()];
@ -27,32 +38,36 @@ fn process(
} }
"OUT" => println!("{}", accumulator), "OUT" => println!("{}", accumulator),
"STA" => { "STA" => {
if ops.len() >= 3 {
memory.insert(ops[2].clone(), *accumulator);
} else {
memory.insert(ops[1].clone(), *accumulator); memory.insert(ops[1].clone(), *accumulator);
} }
"LDA" => {
if ops.len() > 1 {
*accumulator = *memory.get(&ops[2]).unwrap_or(&0);
} else {
*accumulator = *memory.get(&ops[1]).unwrap_or(&0);
} }
"LDA" => {
*accumulator = retrieve(memory, ops.clone());
} }
"ADD" => { "ADD" => {
if let Ok(value) = ops[1].parse::<i64>() { if let Ok(value) = ops[1].parse::<i64>() {
*accumulator += value; *accumulator += value;
} else { } else {
*accumulator += *memory.get(&ops[1]).unwrap_or(&0); *accumulator += retrieve(memory, ops.clone());
} }
} }
"SUB" => { "SUB" => {
if let Ok(value) = ops[1].parse::<i64>() { if let Ok(value) = ops[1].parse::<i64>() {
*accumulator -= value; *accumulator -= value;
} else { } else {
*accumulator -= *memory.get(&ops[1]).unwrap_or(&0); *accumulator -= retrieve(memory, ops.clone());
} }
} }
"BRA" => { "BRA" => {
if ops.len() >= 3 {
*pc = *labels.get(&ops[2]).unwrap();
} else {
*pc = *labels.get(&ops[1]).unwrap(); *pc = *labels.get(&ops[1]).unwrap();
} }
}
"HLT" => std::process::exit(0), "HLT" => std::process::exit(0),
_ => { _ => {
if ops.len() > 1 && ops[1] == "DAT" { if ops.len() > 1 && ops[1] == "DAT" {