luke
/
iverilog
mirror of https://github.com/steveicarus/iverilog.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #719 from steveicarus/steveicarus/issue717-vcd-real-parameters 

Fix vcd dump of real value parameters
This commit is contained in:
Stephen Williams 2022-05-21 11:35:17 -07:00 committed by GitHub
parent 6176f8eec3 6564f55219
commit e8bc3bf8dd
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 34 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
ivtest/gold/br_gh156.vcd.gold
View File

@ -1,5 +1,5 @@
$date
Sun May 15 09:20:23 2022
Sat May 21 10:00:47 2022
$end
$version
Icarus Verilog
@ -9,17 +9,21 @@ $timescale
$end
$scope module main $end
$var wire 4 ! bat [3:0] $end
$var parameter 4 " bar $end
$var parameter 4 # foo $end
$var real 1 " PI $end
$var parameter 4 # bar $end
$var parameter 4 $ foo $end
$var real 1 % tau $end
$upscope $end
$enddefinitions $end
$comment Show the parameter values. $end
$dumpall
b101 #
b111 "
b101 $
b111 #
r3.14 "
$end
#0
$dumpvars
r6.28 %
b1100 !
$end
#1

2
ivtest/ivltests/br_gh156.v
View File

@ -5,7 +5,9 @@
module main;
parameter [3:0] foo = 4'd5;
localparam [3:0] bar = 7;
parameter real PI = 3.14;
wire [3:0] bat = foo + bar;
wire real tau = 2.0 * PI;
initial begin
$dumpfile("work/br_gh156.vcd");

12
vpi/sys_fst.c
View File

@ -74,6 +74,10 @@ static void show_this_item(struct vcd_info*info)
value.format = vpiRealVal;
vpi_get_value(info->item, &value);
fstWriterEmitValueChange(dump_file, info->ident, &value.value.real);
} else if (type == vpiParameter && vpi_get(vpiConstType, info->item) == vpiRealConst) {
value.format = vpiRealVal;
vpi_get_value(info->item, &value);
fstWriterEmitValueChange(dump_file, info->ident, &value.value.real);
} else {
value.format = vpiBinStrVal;
vpi_get_value(info->item, &value);
@ -483,7 +487,13 @@ static void scan_item(unsigned depth, vpiHandle item, int skip)
case vpiNamedEvent: type = FST_VT_VCD_EVENT; break;
case vpiIntVar:
case vpiIntegerVar: type = FST_VT_VCD_INTEGER; break;
case vpiParameter: type = FST_VT_VCD_PARAMETER; break;
/* FST (gtkwave) assumes PARAMETER are bit, so handle other cases */
case vpiParameter:
switch (vpi_get(vpiConstType, item)) {
case vpiRealConst: type = FST_VT_VCD_REAL; break;
default: type = FST_VT_VCD_PARAMETER; break;
}
break;
/* Icarus converts realtime to real. */
case vpiRealVar: type = FST_VT_VCD_REAL; break;
case vpiMemoryWord:

13
vpi/sys_vcd.c
View File

@ -115,6 +115,11 @@ static void show_this_item(struct vcd_info*info)
fprintf(dump_file, "r%.16g %s\n", value.value.real, info->ident);
} else if (type == vpiNamedEvent) {
fprintf(dump_file, "1%s\n", info->ident);
} else if (type == vpiParameter && vpi_get(vpiConstType, info->item) == vpiRealConst) {
value.format = vpiRealVal;
vpi_get_value(info->item, &value);
fprintf(dump_file, "r%.16g %s\n", value.value.real, info->ident);
} else if (vpi_get(vpiSize, info->item) == 1) {
value.format = vpiBinStrVal;
vpi_get_value(info->item, &value);
@ -533,7 +538,13 @@ static void scan_item(unsigned depth, vpiHandle item, int skip)
case vpiNamedEvent: type = "event"; break;
case vpiIntVar:
case vpiIntegerVar: type = "integer"; break;
case vpiParameter: type = "parameter"; break;
/* VCD doesn't support real parameters, so lie. */
case vpiParameter:
switch (vpi_get(vpiConstType, item)) {
case vpiRealConst: type = "real"; break;
default: type = "parameter"; break;
}
break;
/* Icarus converts realtime to real. */
case vpiRealVar: type = "real"; break;
case vpiMemoryWord: