Skip to content

Add support for string #13

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
oscargus wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Add support for string #13

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions ci/test.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@ fi
! ./vcddiff tests/counter.vcd tests/counter.var_reorder.no_diff.vcd | grep -q .
! ./vcddiff tests/counter.vcd tests/counter.identifier.no_diff.vcd | grep -q .
Copy link
Author

@oscargus oscargus Jan 4, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Note that the file name here (and some more) was different than the actual, so the test passed as the "file not found" error was on stderr... I have renamed the files to correspond to the script.

! ./vcddiff tests/counter.vcd tests/counter.scope_move.no_diff.vcd | grep -q .
! ./vcddiff tests/counter_with_strings.vcd tests/counter_with_strings.identifier.no_diff.vcd | grep -q .
if [ "$FIFO_SUPPORTED" = "1" ]; then
! ./vcddiff <(cat tests/counter.vcd) <(cat tests/counter.vcd) | grep -q .
fi
Expand All @@ -30,6 +31,8 @@ fi
grep "not defined in both files"
./vcddiff tests/counter.vcd tests/counter.new_sig.diff.vcd |
grep "Ignoring signal t.the_sub.new_sig .* - not defined in both files"
! ./vcddiff tests/counter_with_strings.vcd tests/counter_with_strings.value_change.diff.vcd |
grep "t.cyc_string (') differs at time 10"
if [ "$FIFO_SUPPORTED" = "1" ]; then
./vcddiff <(cat tests/counter.vcd) <(cat tests/counter.end_time.diff.vcd) |
grep "Files have different end times"
Expand Down
0 tests/counter.change_reorder.vcd → tests/counter.change_reorder.no_diff.vcd
View file
Open in desktop
File renamed without changes.
0 tests/counter.identifier.vcd → tests/counter.identifier.no_diff.vcd
View file
Open in desktop
File renamed without changes.
0 tests/counter.var_reorder.vcd → tests/counter.var_reorder.no_diff.vcd
View file
Open in desktop
File renamed without changes.
50 changes: 50 additions & 0 deletions tests/counter_with_strings.identifier.no_diff.vcd
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,50 @@
$date
Fri Nov 21 13:40:50 2025
$end
$version
Some Simulator
$end
$timescale
1ns
$end

$scope module t $end
$var reg 1 ! clk $end
$var integer 32 " cyc $end
$var string 0 a cyc_string $end

$scope module the_sub $end
$var integer 32 # cyc $end
$var integer 32 $ cyc_plus_one $end
$upscope $end
$upscope $end

$scope begin std $end
$upscope $end
$enddefinitions $end
#0
$dumpvars
0!
b0 "
b0 #
b1 $
szero a
$end
#10
1!
b1 "
b1 #
b10 $
sone a
#20
0!
#30
1!
b10 "
b10 #
b11 $
stwo a
#40
0!
#50
1!
50 changes: 50 additions & 0 deletions tests/counter_with_strings.value_change.diff.vcd
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,50 @@
$date
Fri Nov 21 13:40:50 2025
$end
$version
Some Simulator
$end
$timescale
1ns
$end

$scope module t $end
$var reg 1 ! clk $end
$var integer 32 " cyc $end
$var string 0 ' cyc_string $end

$scope module the_sub $end
$var integer 32 # cyc $end
$var integer 32 $ cyc_plus_one $end
$upscope $end
$upscope $end

$scope begin std $end
$upscope $end
$enddefinitions $end
#0
$dumpvars
0!
b0 "
b0 #
b1 $
szero '
$end
#10
1!
b1 "
b1 #
b10 $
sones '
#20
0!
#30
1!
b10 "
b10 #
b11 $
stwo '
#40
0!
#50
1!
50 changes: 50 additions & 0 deletions tests/counter_with_strings.vcd
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,50 @@
$date
Fri Nov 21 13:40:50 2025
$end
$version
Some Simulator
$end
$timescale
1ns
$end

$scope module t $end
$var reg 1 ! clk $end
$var integer 32 " cyc $end
$var string 0 ' cyc_string $end

$scope module the_sub $end
$var integer 32 # cyc $end
$var integer 32 $ cyc_plus_one $end
$upscope $end
$upscope $end

$scope begin std $end
$upscope $end
$enddefinitions $end
#0
$dumpvars
0!
b0 "
b0 #
b1 $
szero '
$end
#10
1!
b1 "
b1 #
b10 $
sone '
#20
0!
#30
1!
b10 "
b10 #
b11 $
stwo '
#40
0!
#50
1!
4 changes: 3 additions & 1 deletion vcddiff.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -279,6 +279,7 @@ static struct variable_types_t var_types[]
{"realtime", REALTIME}, // GTKWave's fst2vcd
{"reg", REG},
{"shortint", SHORTINT}, // GTKWave's fst2vcd
{"string", STRING}, // GTKWave's fst2vcd
{"supply0", SUPPLY0},
{"supply1", SUPPLY1},
{"time", TIME},
Expand Down Expand Up @@ -892,9 +893,10 @@ static int get_nxt_chg(FILE* fp, char* fname, int* sigcode, int* bit, char* valu
}
return (SCALAR);
break;
/* vector or real cases */
/* vector, real, or string cases */
case 'b':
case 'r':
case 's':
strncpy(value, line, MAXTOKSIZE);
get_token(fp, token);
*sigcode = VERILOG_ID_TO_POS(token);
Expand Down
27 changes: 14 additions & 13 deletions vcddiff.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,20 +45,21 @@
#define REALTIME 11
#define REG 12
#define SHORTINT 13
#define SUPPLY0 14
#define SUPPLY1 15
#define TIME 16
#define TRI 17
#define TRI0 18
#define TRI1 19
#define TRIAND 20
#define TRIOR 21
#define TRIREG 22
#define WAND 23
#define WIRE 24
#define WOR 25
#define STRING 14
#define SUPPLY0 15
#define SUPPLY1 16
#define TIME 17
#define TRI 18
#define TRI0 19
#define TRI1 20
#define TRIAND 21
#define TRIOR 22
#define TRIREG 23
#define WAND 24
#define WIRE 25
#define WOR 26

#define UNDEFINED 26
#define UNDEFINED 27

/*dumpfile key words*/
#define V_ATTRBEGIN 1
Expand Down