tonytins/corten
Archived
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Finished assembler paser

Browse source 
The assembler parser is finished and all tests do pass but the "load" command keeps pointing to "sub" for some reason.
This commit is contained in:
Anthony Foxclaw 2020-02-07 23:53:59 -05:00
parent fe69c0d0c8
commit afb68e46b3
5 changed files with 33 additions and 32 deletions
Download patch file Download diff file Expand all files Collapse all files

9
src/assembler/instruction_parser.rs
View file

@ -18,7 +18,7 @@ impl AssemblerInstruction {
pub fn to_bytes(&self) -> Vec<u8> {
let mut results = vec![];
match self.opcode.clone() {
match self.opcode.to_owned() {
Token::Opcode { code } => match code {
_ => {
results.push(code as u8);
@ -26,7 +26,7 @@ impl AssemblerInstruction {
},
_ => {
println!("Incorrect opcode!");
std::process::exit(0);
std::process::exit(1);
}
};
@ -49,6 +49,7 @@ impl AssemblerInstruction {
let conv = *value as u16;
let byte1 = conv;
let byte2 = conv >> 8;
results.push(byte2 as u8);
results.push(byte1 as u8);
},
@ -56,7 +57,7 @@ impl AssemblerInstruction {
println!("Opcode found in operand field");
std::process::exit(1);
}
}
};
}
}
@ -83,7 +84,7 @@ mod instruction_parser_test {
use crate::instruction::Opcode;
#[test]
fn test_parse_instruction() {
fn test_parse_instruction_form_one() {
let result = instruction_one(CompleteStr("load $0 #100\n"));
assert_eq!(
result,