From d6aaff86e7125c59aefaca3b599f19be7d9d3ef2 Mon Sep 17 00:00:00 2001 From: James Cherry Date: Thu, 27 Apr 2023 15:25:18 -0700 Subject: [PATCH] ccs liberty Signed-off-by: James Cherry --- liberty/LibertyReader.cc | 2 +- liberty/TableModel.cc | 16 ++++++++-------- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/liberty/LibertyReader.cc b/liberty/LibertyReader.cc index 5e811226..741ab864 100644 --- a/liberty/LibertyReader.cc +++ b/liberty/LibertyReader.cc @@ -2522,7 +2522,7 @@ LibertyReader::endOutputCurrentRiseFall(LibertyGroup *group) slew_axis->findAxisIndex(waveform->slew(), slew_index, slew_exists); cap_axis->findAxisIndex(waveform->cap(), cap_index, cap_exists); if (slew_exists && cap_exists) { - size_t index = slew_index * cap_axis->size() + cap_index; + size_t index = slew_index * slew_axis->size() + cap_index; current_waveforms[index] = waveform->stealCurrents(); (*ref_times)[slew_index] = waveform->referenceTime(); } diff --git a/liberty/TableModel.cc b/liberty/TableModel.cc index 8d6dd3fe..397ae233 100644 --- a/liberty/TableModel.cc +++ b/liberty/TableModel.cc @@ -1621,10 +1621,10 @@ OutputWaveforms::voltageWaveform(float slew, { size_t slew_index = slew_axis_->findAxisIndex(slew); size_t cap_index = cap_axis_->findAxisIndex(cap); - size_t wave_index00 = slew_index * cap_axis_->size() + cap_index; - size_t wave_index01 = slew_index * cap_axis_->size() + (cap_index + 1); - size_t wave_index10 = (slew_index + 1) * cap_axis_->size() + cap_index; - size_t wave_index11 = (slew_index + 1) * cap_axis_->size() + (cap_index + 1); + size_t wave_index00 = slew_index * slew_axis_->size() + cap_index; + size_t wave_index01 = slew_index * slew_axis_->size() + (cap_index + 1); + size_t wave_index10 = (slew_index + 1) * slew_axis_->size() + cap_index; + size_t wave_index11 = (slew_index + 1) * slew_axis_->size() + (cap_index + 1); float cap0 = cap_axis_->axisValue(cap_index); float cap1 = cap_axis_->axisValue(cap_index + 1); const Table1 *values00 = voltageWaveform(wave_index00, cap0); @@ -1730,10 +1730,10 @@ OutputWaveforms::currentWaveform(float slew, { size_t slew_index = slew_axis_->findAxisIndex(slew); size_t cap_index = cap_axis_->findAxisIndex(cap); - size_t wave_index00 = slew_index * cap_axis_->size() + cap_index; - size_t wave_index01 = slew_index * cap_axis_->size() + (cap_index + 1); - size_t wave_index10 = (slew_index + 1) * cap_axis_->size() + cap_index; - size_t wave_index11 = (slew_index + 1) * cap_axis_->size() + (cap_index + 1); + size_t wave_index00 = slew_index * slew_axis_->size() + cap_index; + size_t wave_index01 = slew_index * slew_axis_->size() + (cap_index + 1); + size_t wave_index10 = (slew_index + 1) * slew_axis_->size() + cap_index; + size_t wave_index11 = (slew_index + 1) * slew_axis_->size() + (cap_index + 1); const Table1 *values00 = current_waveforms_[wave_index00]; const Table1 *values01 = current_waveforms_[wave_index01]; const Table1 *values10 = current_waveforms_[wave_index10];