Tools/SCViewer
10
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

updates time scale handling

Browse Source
This commit is contained in:
Eyck Jentzsch
2023-03-04 12:33:22 +01:00
parent bf38ccd6db
commit b391d19303
6 changed files with 53 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
plugins/com.minres.scviewer.database.vcd/src/com/minres/scviewer/database/vcd/VCDFileParser.java
View File

@@ -16,12 +16,13 @@ import java.util.*;
import com.minres.scviewer.database.BitValue;
import com.minres.scviewer.database.BitVector;
import com.minres.scviewer.database.IWaveformDb;
class VCDFileParser {
private StreamTokenizer tokenizer;
private IVCDDatabaseBuilder traceBuilder;
private HashMap<String, Integer> nameToNetMap = new HashMap<>();
private long picoSecondsPerIncrement;
private long timeScaleFactor;
private boolean stripNetWidth;
private boolean replaceColon;
long currentTime;
@@ -121,29 +122,37 @@ class VCDFileParser {
nextToken();
}
String s = sb.toString();
int fac =1;
switch (s.charAt(s.length() - 2)){
case 'f': // Nano-seconds
fac = -15;
s = s.substring(0, s.length() - 2).trim();
break;
case 'p': // Nano-seconds
picoSecondsPerIncrement = 1;
fac = -12;
s = s.substring(0, s.length() - 2).trim();
break;
case 'n': // Nano-seconds
picoSecondsPerIncrement = 1000;
fac = -9;
s = s.substring(0, s.length() - 2).trim();
break;
case 'u': // Microseconds
picoSecondsPerIncrement = 1000000;
fac = -6;
s = s.substring(0, s.length() - 2).trim();
break;
case 'm': // Microseconds
picoSecondsPerIncrement = 1000000000;
fac = -3;
s = s.substring(0, s.length() - 2).trim();
break;
default: // Seconds
picoSecondsPerIncrement = 1000000000000L;
fac = 1;
s = s.substring(0, s.length() - 1);
break;
}
picoSecondsPerIncrement *= Long.parseLong(s);
timeScaleFactor = 1;
for(int i = 1; i<= fac-IWaveformDb.databaseTimeScale; i++)
timeScaleFactor *= 10;
timeScaleFactor = Long.parseLong(s);
}
private boolean parseDefinition() throws IOException, ParseException {
@@ -171,7 +180,7 @@ class VCDFileParser {
private boolean parseTransition() throws IOException {
if (!nextToken()) return false;
if (tokenizer.sval.charAt(0) == '#') { // If the line begins with a #, this is a timestamp.
currentTime = Long.parseLong(tokenizer.sval.substring(1)) * picoSecondsPerIncrement;
currentTime = Long.parseLong(tokenizer.sval.substring(1)) * timeScaleFactor;
} else {
if(tokenizer.sval.equals("$comment")){
do {