Yehowshua/FastWaveBackend
Archived
1
0
Fork 0
Code Issues 9 Pull requests 1 Projects Releases Packages Wiki Activity Actions

Compute num_bytes ahead of time; Start removing undeeded signals from match arms

Browse source
This commit is contained in:
Yehowshua Immanuel 2022-08-22 09:48:56 -04:00
parent 8dab46a0cb
commit 91dc24a9ba
3 changed files with 36 additions and 37 deletions
Download patch file Download diff file Expand all files Collapse all files

35
src/vcd/parse/events.rs
View file

@ -121,6 +121,7 @@ pub(super) fn parse_events<'a>(
sig_type,
ref mut signal_error,
num_bits,
num_bytes,
self_idx,
nums_encoded_as_fixed_width_le_u8,
string_vals,
@ -190,7 +191,9 @@ pub(super) fn parse_events<'a>(
// so that we end up storing all values
// of a particular signal in a consistent
// amount of bytes
let bytes_required = Signal::bytes_required(num_bits, name)?;
let bytes_required = num_bytes.ok_or_else(|| {
format!("Error near {}:{}. num_bytes empty.", file!(), line!())
})?;
while curr_num_bytes < bytes_required {
nums_encoded_as_fixed_width_le_u8.push(0u8);
@ -230,14 +233,13 @@ pub(super) fn parse_events<'a>(
sig_type,
ref mut signal_error,
num_bits,
self_idx,
num_bytes: _,
self_idx: _,
nums_encoded_as_fixed_width_le_u8,
string_vals,
string_vals: _,
lsb_indxs_of_num_tmstmp_vals_on_tmln,
byte_len_of_num_tmstmp_vals_on_tmln,
lsb_indxs_of_string_tmstmp_vals_on_tmln,
byte_len_of_string_tmstmp_vals_on_tmln,
scope_parent,
..
} => {
// if this is a bad signal, go ahead and skip it
if signal_error.is_some() {
@ -309,14 +311,13 @@ pub(super) fn parse_events<'a>(
sig_type,
ref mut signal_error,
num_bits,
self_idx,
num_bytes: _,
self_idx: _,
nums_encoded_as_fixed_width_le_u8,
string_vals,
string_vals: _,
lsb_indxs_of_num_tmstmp_vals_on_tmln,
byte_len_of_num_tmstmp_vals_on_tmln,
lsb_indxs_of_string_tmstmp_vals_on_tmln,
byte_len_of_string_tmstmp_vals_on_tmln,
scope_parent,
..
} => {
// if this is a bad signal, go ahead and skip it
if signal_error.is_some() {
@ -390,14 +391,14 @@ pub(super) fn parse_events<'a>(
sig_type,
ref mut signal_error,
num_bits,
self_idx,
nums_encoded_as_fixed_width_le_u8,
num_bytes: _,
self_idx: _,
nums_encoded_as_fixed_width_le_u8: _,
string_vals,
lsb_indxs_of_num_tmstmp_vals_on_tmln,
byte_len_of_num_tmstmp_vals_on_tmln,
lsb_indxs_of_num_tmstmp_vals_on_tmln: _,
byte_len_of_num_tmstmp_vals_on_tmln: _,
lsb_indxs_of_string_tmstmp_vals_on_tmln,
byte_len_of_string_tmstmp_vals_on_tmln,
scope_parent,
..
} => {
// if this is a bad signal, go ahead and skip it
if signal_error.is_some() {

8
src/vcd/parse/scopes.rs
View file

@ -89,6 +89,13 @@ pub(super) fn parse_var<'a>(
}
let full_signal_name = full_signal_name.join(" ");
let num_bytes = if no_bits.is_some() {
let bytes_required = Signal::bytes_required(no_bits.unwrap(), &full_signal_name)?;
Some(bytes_required)
} else {
None
};
// Is the current variable an alias to a signal already encountered?
// if so, handle ref_signal_idx accordingly, if not, add signal to hash
// map
@ -109,6 +116,7 @@ pub(super) fn parse_var<'a>(
sig_type: var_type,
signal_error: None,
num_bits: no_bits,
num_bytes: num_bytes,
self_idx: signal_idx,
nums_encoded_as_fixed_width_le_u8: vec![],
string_vals: vec![],