summaryrefslogtreecommitdiff
path: root/src/stages/intermediate.rs
diff options
context:
space:
mode:
Diffstat (limited to 'src/stages/intermediate.rs')
-rw-r--r--src/stages/intermediate.rs16
1 files changed, 10 insertions, 6 deletions
diff --git a/src/stages/intermediate.rs b/src/stages/intermediate.rs
index 3144b77..e48f31b 100644
--- a/src/stages/intermediate.rs
+++ b/src/stages/intermediate.rs
@@ -200,20 +200,24 @@ impl IntermediateParser {
let mut word_value = word_template.value;
for field in &word_template.fields {
let name = field.name.to_string();
- let field_source = &field.source;
+ let field_source = &field.ranges.first().unwrap().source;
let invocation = Invocation { name, arguments: Vec::new() };
if let Some(result) = self.parse_integer_invocation(&invocation, field_source) {
let field_value = **result;
// Inject field value into real value.
let value_width = width(field_value);
- if field.width < value_width {
- let error = IntermediateError::ValueTooWide(field.width, value_width);
+ if field.width() < value_width {
+ let error = IntermediateError::ValueTooWide(field.width(), value_width);
let new_source = field_source.wrap(result.source);
self.errors.push(Tracked::from(error, new_source));
} else {
- let mask = 2_usize.pow(field.width as u32) - 1;
- let clamped_value = (field_value as usize) & mask;
- word_value |= (clamped_value << field.shift) as usize;
+ let mut bits_mapped = 0;
+ for range in field.ranges.iter().rev() {
+ let range_mask = 2_usize.pow(range.width) - 1;
+ let range_bits = (field_value as usize >> bits_mapped) & range_mask;
+ word_value |= range_bits << range.shift;
+ bits_mapped += range.width;
+ }
}
}
}