From 9c656c296827172589243d588f57f9ab2745efc6 Mon Sep 17 00:00:00 2001 From: Syndamia Date: Fri, 14 Feb 2025 08:50:49 +0200 Subject: feat(assembler): Implement beq and mov instructions --- assembler/src/parser/instruction.rs | 38 +++++++++++++++++++++++++++++++++++++ 1 file changed, 38 insertions(+) (limited to 'assembler/src/parser/instruction.rs') diff --git a/assembler/src/parser/instruction.rs b/assembler/src/parser/instruction.rs index 18d67b7..cc0523f 100644 --- a/assembler/src/parser/instruction.rs +++ b/assembler/src/parser/instruction.rs @@ -52,6 +52,20 @@ impl Instruction { "add" => { self.check_args_len(2)?; }, + "mov" => { + self.check_args_len(2)?; + + if ! self.args[1].is_location() { + return Err(ArgumentError::NotLocation); + } + }, + "beq" => { + self.check_args_len(2)?; + + if ! self.args[1].is_location() { + return Err(ArgumentError::NotLocation); + } + }, _ => return Err(ArgumentError::UnknownInstruction), } Ok(()) @@ -71,6 +85,30 @@ impl Instruction { Instruction::new_subleq(&Z, &self.args[1], &Address::Instruction(next + 2)), Instruction::new_subleq(&Z, &Z, &Address::Instruction(next + 3)), ], + "mov" => vec![ + Instruction::new_subleq(&self.args[1], &self.args[1], &Address::Instruction(next + 1)), + Instruction::new_subleq(&self.args[0], &Z, &Address::Instruction(next + 2)), + Instruction::new_subleq(&Z, &self.args[1], &Address::Instruction(next + 3)), + Instruction::new_subleq(&Z, &Z, &Address::Instruction(next + 4)), + ], + "beq" => vec![ + Instruction::new_subleq(&self.args[0], &Z, &Address::Instruction(next + 2)), + Instruction::new_subleq(&Z, &Z, &Address::Instruction(next + 4)), + Instruction::new_subleq(&Z, &Z, &Address::Instruction(next + 3)), + Instruction::new_subleq(&Z, &self.args[0], &self.args[1] ), + ], + _ => panic!("Unknown instruction {}!", self.name), + } + } + + pub(crate) fn collapse_len(&self) -> usize { + match &*self.name { + "subleq" | "jmp" + => 1, + "add" + => 3, + "mov" | "beq" + => 4, _ => panic!("Unknown instruction {}!", self.name), } } -- cgit v1.3.1-26-gb76a