xenia/fox32asm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Deduplicate operand to immediate conversion

Browse Source
This commit is contained in:
jn 2023-02-02 01:49:36 +01:00
parent 7371aed79f
commit fc1008cc10
1 changed files with 30 additions and 70 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

100
src/main.rs
View File

@ -1219,91 +1219,51 @@ fn generate_backpatch_immediate(name: &String, size: &Size, instruction: &Assemb
targets.push(BackpatchTarget::new(instruction, index, *size, is_relative)); targets.push(BackpatchTarget::new(instruction, index, *size, is_relative));
} }
fn operand_to_immediate_value(instruction: &AssembledInstruction, node: &AstNode){
let mut vec = instruction.borrow_mut();
match *node {
AstNode::Register (register) => vec.push(register),
AstNode::RegisterPointer(register) => vec.push(register),
AstNode::Immediate8 (immediate) => vec.push(immediate),
AstNode::Immediate16 (immediate) => vec.extend_from_slice(&immediate.to_le_bytes()),
AstNode::Immediate32 (immediate) => vec.extend_from_slice(&immediate.to_le_bytes()),
AstNode::ImmediatePointer(immediate) => vec.extend_from_slice(&immediate.to_le_bytes()),
AstNode::LabelOperand {ref name, ref size, is_relative} => {
std::mem::drop(vec);
generate_backpatch_immediate(name, size, instruction, is_relative);
}
AstNode::LabelOperandPointer {ref name, is_relative} => {
std::mem::drop(vec);
generate_backpatch_immediate(name, &Size::Word, instruction, is_relative);
}
_ => panic!("Attempting to parse a non-instruction AST node as an instruction: {:#?}", node),
}
}
fn node_to_immediate_values(node: &AstNode, instruction: &AssembledInstruction) { fn node_to_immediate_values(node: &AstNode, instruction: &AssembledInstruction) {
{ {
let mut vec = instruction.borrow_mut();
match node { match node {
AstNode::OperationZero {..} => {} AstNode::OperationZero {..} => {}
AstNode::OperationOne {operand, ..} => { AstNode::OperationOne {operand, ..} =>
match *operand.as_ref() { operand_to_immediate_value(instruction, operand.as_ref()),
AstNode::Register (register) => vec.push(register),
AstNode::RegisterPointer(register) => vec.push(register),
AstNode::Immediate8 (immediate) => vec.push(immediate), AstNode::OperationTwo {rhs, ..} =>
AstNode::Immediate16 (immediate) => vec.extend_from_slice(&immediate.to_le_bytes()), operand_to_immediate_value(instruction, rhs.as_ref()),
AstNode::Immediate32 (immediate) => vec.extend_from_slice(&immediate.to_le_bytes()),
AstNode::ImmediatePointer(immediate) => vec.extend_from_slice(&immediate.to_le_bytes()),
AstNode::LabelOperand {ref name, ref size, is_relative} => {
std::mem::drop(vec);
generate_backpatch_immediate(name, size, instruction, is_relative);
}
AstNode::LabelOperandPointer {ref name, is_relative} => {
std::mem::drop(vec);
generate_backpatch_immediate(name, &Size::Word, instruction, is_relative);
}
_ => panic!("Attempting to parse a non-instruction AST node as an instruction: {:#?}", node),
}
}
AstNode::OperationTwo {rhs, ..} => {
match *rhs.as_ref() {
AstNode::Register (register) => vec.push(register),
AstNode::RegisterPointer(register) => vec.push(register),
AstNode::Immediate8 (immediate) => vec.push(immediate),
AstNode::Immediate16 (immediate) => vec.extend_from_slice(&immediate.to_le_bytes()),
AstNode::Immediate32 (immediate) => vec.extend_from_slice(&immediate.to_le_bytes()),
AstNode::ImmediatePointer(immediate) => vec.extend_from_slice(&immediate.to_le_bytes()),
AstNode::LabelOperand {ref name, ref size, is_relative} => {
std::mem::drop(vec);
generate_backpatch_immediate(name, size, instruction, is_relative);
}
AstNode::LabelOperandPointer {ref name, is_relative} => {
std::mem::drop(vec);
generate_backpatch_immediate(name, &Size::Word, instruction, is_relative);
}
_ => panic!("Attempting to parse a non-instruction AST node as an instruction: {:#?}", node),
}
}
_ => panic!("Attempting to parse a non-instruction AST node as an instruction: {:#?}", node), _ => panic!("Attempting to parse a non-instruction AST node as an instruction: {:#?}", node),
} }
} }
let mut vec = instruction.borrow_mut();
match node { match node {
AstNode::OperationZero {..} => {} AstNode::OperationZero {..} => {}
AstNode::OperationOne {..} => {} AstNode::OperationOne {..} => {}
AstNode::OperationTwo {lhs, ..} => { AstNode::OperationTwo {lhs, ..} =>
match *lhs.as_ref() { operand_to_immediate_value(instruction, lhs.as_ref()),
AstNode::Register (register) => vec.push(register),
AstNode::RegisterPointer(register) => vec.push(register),
AstNode::Immediate8 (immediate) => vec.push(immediate),
AstNode::Immediate16 (immediate) => vec.extend_from_slice(&immediate.to_le_bytes()),
AstNode::Immediate32 (immediate) => vec.extend_from_slice(&immediate.to_le_bytes()),
AstNode::ImmediatePointer(immediate) => vec.extend_from_slice(&immediate.to_le_bytes()),
AstNode::LabelOperand {ref name, ref size, is_relative} => {
std::mem::drop(vec);
generate_backpatch_immediate(name, size, instruction, is_relative);
}
AstNode::LabelOperandPointer {ref name, is_relative} => {
std::mem::drop(vec);
generate_backpatch_immediate(name, &Size::Word, instruction, is_relative);
}
_ => panic!("Attempting to parse a non-instruction AST node as an instruction: {:#?}", node),
}
}
_ => panic!("Attempting to parse a non-instruction AST node as an instruction: {:#?}", node), _ => panic!("Attempting to parse a non-instruction AST node as an instruction: {:#?}", node),
}; };