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

Assemble data.8 CONST_LABEL correctly as one byte

Browse Source 
Fixes #5
This commit is contained in:
jn 2023-02-01 21:19:11 +01:00
parent e59e0ef83d
commit fc925e577d
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/main.rs
View File

@ -609,21 +609,24 @@ fn parse_data(pair: pest::iterators::Pair<Rule>) -> AstNode {
Rule::data_byte => { Rule::data_byte => {
match parse_operand(pair.into_inner().next().unwrap(), false) { match parse_operand(pair.into_inner().next().unwrap(), false) {
AstNode::Immediate32(half) => AstNode::DataByte(half as u8), AstNode::Immediate32(half) => AstNode::DataByte(half as u8),
AstNode::LabelOperand {name, size, is_relative} => AstNode::LabelOperand {name, size, is_relative}, AstNode::LabelOperand {name, size: _, is_relative} =>
AstNode::LabelOperand {name, size: Size::Byte, is_relative},
_ => unreachable!(), _ => unreachable!(),
} }
}, },
Rule::data_half => { Rule::data_half => {
match parse_operand(pair.into_inner().next().unwrap(), false) { match parse_operand(pair.into_inner().next().unwrap(), false) {
AstNode::Immediate32(half) => AstNode::DataHalf(half as u16), AstNode::Immediate32(half) => AstNode::DataHalf(half as u16),
AstNode::LabelOperand {name, size, is_relative} => AstNode::LabelOperand {name, size, is_relative}, AstNode::LabelOperand {name, size: _, is_relative} =>
AstNode::LabelOperand {name, size: Size::Half, is_relative},
_ => unreachable!(), _ => unreachable!(),
} }
}, },
Rule::data_word => { Rule::data_word => {
match parse_operand(pair.into_inner().next().unwrap(), false) { match parse_operand(pair.into_inner().next().unwrap(), false) {
AstNode::Immediate32(word) => AstNode::DataWord(word), AstNode::Immediate32(word) => AstNode::DataWord(word),
AstNode::LabelOperand {name, size, is_relative} => AstNode::LabelOperand {name, size, is_relative}, AstNode::LabelOperand {name, size: _, is_relative} =>
AstNode::LabelOperand {name, size: Size::Word, is_relative},
_ => unreachable!(), _ => unreachable!(),
} }
}, },