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

remove some dead code in comments and add querying values on timeline back to vcd example

Browse source
This commit is contained in:
Yehowshua Immanuel 2022-10-26 02:19:59 -04:00
parent 9f18b166a5
commit b4cbbf29cc
4 changed files with 51 additions and 80 deletions
Download patch file Download diff file Expand all files Collapse all files

6
src/vcd/signal.rs
View file

@ -39,20 +39,18 @@ impl<'a> Signal<'a> {
pub fn query_string_val_on_tmln(
&self,
desired_time: &BigUint,
tmstmps_encoded_as_u8s: &Vec<u8>,
vcd: &types::VCD,
) -> Result<String, SignalErrors> {
let Signal(signal_enum) = &self;
signal_enum.query_string_val_on_tmln(desired_time, tmstmps_encoded_as_u8s, &vcd.all_signals)
signal_enum.query_string_val_on_tmln(desired_time, &vcd.tmstmps_encoded_as_u8s, &vcd.all_signals)
}
pub fn query_num_val_on_tmln(
&self,
desired_time: &BigUint,
tmstmps_encoded_as_u8s: &Vec<u8>,
vcd: &types::VCD,
) -> Result<BigUint, SignalErrors> {
let Signal(signal_enum) = &self;
signal_enum.query_num_val_on_tmln(desired_time, tmstmps_encoded_as_u8s, &vcd.all_signals)
signal_enum.query_num_val_on_tmln(desired_time, &vcd.tmstmps_encoded_as_u8s, &vcd.all_signals)
}
}

45
src/vcd/types.rs
View file

@ -33,7 +33,7 @@ pub struct Metadata {
pub struct ScopeIdx(pub usize);
#[derive(Debug, Copy, Clone, PartialEq)]
pub struct SignalIdx(pub(super) usize);
pub struct SignalIdx(pub usize);
#[derive(Debug)]
pub(super) struct Scope {
@ -84,6 +84,11 @@ impl VCD {
let scope = &self.all_scopes[idx];
&scope.name
}
pub fn signal_from_signal_idx<'a>(&'a self, idx: SignalIdx) -> Signal<'a> {
let SignalIdx(idx) = idx;
let signal_enum = &self.all_signals[idx];
return Signal(signal_enum);
}
/// We take in a Signal and attempt to de-alias that signal if it is of
/// variant ``Signal::Alias``. If it is of variant ``Signal::Alias`` and points to
/// another alias, that's an error. Otherwise, we return the ``Signal::Data``
@ -116,42 +121,4 @@ impl VCD {
)),
}
}
pub fn get_signal<'a>(&'a self, idx: SignalIdx) -> Signal<'a> {
let SignalIdx(idx) = idx;
let signal_enum = &self.all_signals[idx];
return Signal(signal_enum);
}
// Takes a signal_idx as input and returns the corresponding signal if the
// corresponding signal is of the Signal::Data variant, else the function the
// SignalIdx in the signal_alias field of Signal::Alias variant to index
// into the signal arena in the all_signals field of the vcd, and returns
// the resulting signal if that signal is a Signal::Data variant, else,
// this function returns an Err.
// pub fn try_signal_idx_to_signal<'a>(
// &'a self,
// idx: SignalIdx,
// ) -> Result<&'a Signal, String> {
// // get the signal pointed to be SignalIdx from the arena
// let SignalIdx(idx) = idx;
// let signal = &self.all_signals[idx];
// // dereference signal if Signal::Alias, or keep idx if Signal::Data
// let signal_idx = match signal {
// Signal::Data { self_idx, .. } => *self_idx,
// Signal::Alias { name, signal_alias } => *signal_alias,
// };
// // Should now point to Signal::Data variant, or else there's an error
// let SignalIdx(idx) = signal_idx;
// let signal = self.all_signals.get(idx).unwrap();
// match signal {
// Signal::Data { .. } => Ok(signal),
// Signal::Alias { .. } => Err(format!(
// "Error near {}:{}. A signal alias shouldn't \
// point to a signal alias.",
// file!(),
// line!()
// )),
// }
// }
}