github/verilator
1
0
Fork 1
mirror of https://github.com/verilator/verilator.git synced 2025-01-01 12:17:35 +00:00
Code Issues Packages Projects Releases Wiki Activity

gtkwave: Merge from upstream.

Browse Source
This commit is contained in:
Wilson Snyder 2019-05-09 20:38:48 -04:00
parent eac3458647
commit 5df3032b11
2 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
include/gtkwave/fstapi.c
View File

@ -663,6 +663,7 @@ return(rc);
}
#ifndef FST_DYNAMIC_ALIAS2_DISABLE
static int fstWriterSVarint(FILE *handle, int64_t v)
{
unsigned char buf[15]; /* ceil(64/7) = 10 + sign byte padded way up */
@ -688,6 +689,7 @@ len = pnt-buf;
fstFwrite(buf, len, 1, handle);
return(len);
}
#endif
/***********************/
@ -4810,6 +4812,7 @@ uint32_t cur_blackout = 0;
int packtype;
unsigned char *mc_mem = NULL;
uint32_t mc_mem_len; /* corresponds to largest value encountered in chain_table_lengths[i] */
int dumpvars_state = 0;
if(!xc) return(0);
@ -4819,7 +4822,6 @@ length_remaining = (uint32_t *)calloc(xc->maxhandle, sizeof(uint32_t));
if(fv)
{
fprintf(fv, "$dumpvars\n");
#ifndef FST_WRITEX_DISABLE
fflush(fv);
setvbuf(fv, (char *) NULL, _IONBF, 0); /* even buffered IO is slow so disable it and use our own routines that don't need seeking */
@ -4966,8 +4968,10 @@ for(;;)
if(beg_tim)
{
if(dumpvars_state == 1) { wx_len = sprintf(wx_buf, "$end\n"); fstWritex(xc, wx_buf, wx_len); dumpvars_state = 2; }
wx_len = sprintf(wx_buf, "#%" PRIu64 "\n", beg_tim);
fstWritex(xc, wx_buf, wx_len);
if(!dumpvars_state) { wx_len = sprintf(wx_buf, "$dumpvars\n"); fstWritex(xc, wx_buf, wx_len); dumpvars_state = 1; }
}
if((xc->num_blackouts)&&(cur_blackout != xc->num_blackouts))
{
@ -5400,8 +5404,10 @@ for(;;)
}
}
if(dumpvars_state == 1) { wx_len = sprintf(wx_buf, "$end\n"); fstWritex(xc, wx_buf, wx_len); dumpvars_state = 2; }
wx_len = sprintf(wx_buf, "#%" PRIu64 "\n", time_table[i]);
fstWritex(xc, wx_buf, wx_len);
if(!dumpvars_state) { wx_len = sprintf(wx_buf, "$dumpvars\n"); fstWritex(xc, wx_buf, wx_len); dumpvars_state = 1; }
if((xc->num_blackouts)&&(cur_blackout != xc->num_blackouts))
{

3
test_regress/t/t_dist_tabs.pl
View File

@ -28,7 +28,8 @@ if (!-r "$root/.git") {
foreach my $line ((split /\n/, $diff), "+++ b/_the_end") {
if ($line =~ m!^\+\+\+ b/(.*)!) {
if ($file && !$atab && $btab
&& $file !~ /\.out$/) {
&& $file !~ m!\.out$!
&& $file !~ m!/gtkwave!) {
$summary = "File modifications adds new tabs (please untabify the patch):";
$warns{$file} = "File modification adds new tabs (please untabify the patch): $file";
}