Merge pull request #1333 from caryr/v13-branch

FST can dump packages
This commit is contained in:
Cary R. 2026-04-29 21:26:49 -07:00 committed by GitHub
commit 07dd50d37e
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
25 changed files with 38 additions and 24 deletions

View File

@ -166,6 +166,7 @@ clean:
$(foreach dir,$(SUBDIRS),$(MAKE) -C $(dir) $@ && ) true $(foreach dir,$(SUBDIRS),$(MAKE) -C $(dir) $@ && ) true
rm -f *.o parse.cc parse.h lexor.cc rm -f *.o parse.cc parse.h lexor.cc
rm -f ivl.exp iverilog-vpi.man iverilog-vpi.pdf iverilog-vpi.ps rm -f ivl.exp iverilog-vpi.man iverilog-vpi.pdf iverilog-vpi.ps
rm -f iverilog_man.ps iverilog_man.pdf iverilog_man_`./version.exe %M_%n`.pdf
rm -f parse.output syn-rules.output dosify$(BUILDEXT) ivl@EXEEXT@ check.vvp rm -f parse.output syn-rules.output dosify$(BUILDEXT) ivl@EXEEXT@ check.vvp
rm -f lexor_keyword.cc libivl.a libvpi.a iverilog-vpi syn-rules.cc rm -f lexor_keyword.cc libivl.a libvpi.a iverilog-vpi syn-rules.cc
rm -rf dep rm -rf dep
@ -252,7 +253,7 @@ endif
version.exe: $(srcdir)/version.c $(srcdir)/version_base.h version_tag.h version.exe: $(srcdir)/version.c $(srcdir)/version_base.h version_tag.h
$(BUILDCC) $(CPPFLAGS) $(CFLAGS) $(LDFLAGS) -o version.exe -I. -I$(srcdir) $(srcdir)/version.c $(BUILDCC) $(CPPFLAGS) $(CFLAGS) $(LDFLAGS) -o version.exe -I. -I$(srcdir) $(srcdir)/version.c
%.o: %.cc config.h %.o: %.cc config.h | dep
$(CXX) $(CPPFLAGS) $(CXXFLAGS) @DEPENDENCY_FLAG@ -c $< -o $*.o $(CXX) $(CPPFLAGS) $(CXXFLAGS) @DEPENDENCY_FLAG@ -c $< -o $*.o
mv $*.d dep/$*.d mv $*.d dep/$*.d

View File

@ -71,7 +71,7 @@ Makefile: $(srcdir)/Makefile.in ../config.status
dep: dep:
mkdir dep mkdir dep
%.o: %.c %.o: %.c | dep
$(CC) $(CPPFLAGS) $(CFLAGS) @DEPENDENCY_FLAG@ -c $< $(CC) $(CPPFLAGS) $(CFLAGS) @DEPENDENCY_FLAG@ -c $<
mv $*.d dep mv $*.d dep

View File

@ -92,11 +92,11 @@ cflexor.c: $(srcdir)/cflexor.lex
cfparse%c cfparse%h: $(srcdir)/cfparse%y cfparse%c cfparse%h: $(srcdir)/cfparse%y
$(YACC) --verbose -t -p cf -d -o cfparse.c $< $(YACC) --verbose -t -p cf -d -o cfparse.c $<
%.o: %.c %.o: %.c | dep
$(CC) $(CPPFLAGS) $(CFLAGS) @DEPENDENCY_FLAG@ -c $< -o $*.o $(CC) $(CPPFLAGS) $(CFLAGS) @DEPENDENCY_FLAG@ -c $< -o $*.o
mv $*.d dep mv $*.d dep
main.o: main.c globals.h $(srcdir)/../version_base.h ../version_tag.h Makefile main.o: main.c globals.h $(srcdir)/../version_base.h ../version_tag.h Makefile | dep
$(CC) $(CPPFLAGS) $(CFLAGS) @DEPENDENCY_FLAG@ -c -DIVL_ROOT='"@libdir@/ivl$(suffix)"' -DIVL_SUFFIX='"$(suffix)"' -DIVL_INC='"@includedir@"' -DIVL_LIB='"@libdir@"' -DDLLIB='"@DLLIB@"' -DIVL_INCLUDE_INSTALL_DIR="\"$(realpath $(DESTDIR)/$(includedir))\"" $(srcdir)/main.c $(CC) $(CPPFLAGS) $(CFLAGS) @DEPENDENCY_FLAG@ -c -DIVL_ROOT='"@libdir@/ivl$(suffix)"' -DIVL_SUFFIX='"$(suffix)"' -DIVL_INC='"@includedir@"' -DIVL_LIB='"@libdir@"' -DDLLIB='"@DLLIB@"' -DIVL_INCLUDE_INSTALL_DIR="\"$(realpath $(DESTDIR)/$(includedir))\"" $(srcdir)/main.c
mv $*.d dep mv $*.d dep

View File

@ -69,6 +69,9 @@ const char HELP[] =
# include <libiberty.h> # include <libiberty.h>
#endif #endif
#endif #endif
#ifdef __APPLE__
# include <mach-o/dyld.h>
#endif
#include <fcntl.h> #include <fcntl.h>
#ifdef HAVE_GETOPT_H #ifdef HAVE_GETOPT_H

1
ivtest/.gitignore vendored
View File

@ -34,4 +34,5 @@ tmp_blif.vvp
dump.vcd dump.vcd
dump.lxt dump.lxt
dump.lx2 dump.lx2
dump.fst
foo.vcd foo.vcd

View File

@ -0,0 +1 @@
FST info: dumpfile dump.fst opened for output.

View File

@ -31,6 +31,7 @@ br_gh703 vvp_tests/br_gh703.json
br_gh710a vvp_tests/br_gh710a.json br_gh710a vvp_tests/br_gh710a.json
br_gh710b vvp_tests/br_gh710b.json br_gh710b vvp_tests/br_gh710b.json
br_gh710c vvp_tests/br_gh710c.json br_gh710c vvp_tests/br_gh710c.json
br_gh710d vvp_tests/br_gh710d.json
br_gh939 vvp_tests/br_gh939.json br_gh939 vvp_tests/br_gh939.json
br_gh1001 vvp_tests/br_gh1001.json br_gh1001 vvp_tests/br_gh1001.json
br_gh1018 vvp_tests/br_gh1018.json br_gh1018 vvp_tests/br_gh1018.json

View File

@ -0,0 +1,7 @@
{
"type" : "normal",
"source" : "br_gh710.v",
"gold" : "br_gh710d",
"iverilog-args" : [ "-g2009" ],
"vvp-args-extended" : [ "-fst" ]
}

View File

@ -101,7 +101,7 @@ libveriuser.a: libveriuser.o
$(AR) cvq $@ libveriuser.o $(AR) cvq $@ libveriuser.o
$(RANLIB) $@ $(RANLIB) $@
%.o: %.c config.h %.o: %.c config.h | dep
$(CC) $(CPPFLAGS) $(CFLAGS) @DEPENDENCY_FLAG@ -c $< -o $*.o $(CC) $(CPPFLAGS) $(CFLAGS) @DEPENDENCY_FLAG@ -c $< -o $*.o
mv $*.d dep mv $*.d dep

View File

@ -70,7 +70,7 @@ Makefile: $(srcdir)/Makefile.in ../config.status
dep: dep:
mkdir dep mkdir dep
%.o: %.cc %.o: %.cc | dep
$(CXX) $(CPPFLAGS) $(CXXFLAGS) @DEPENDENCY_FLAG@ -c $< -o $*.o $(CXX) $(CPPFLAGS) $(CXXFLAGS) @DEPENDENCY_FLAG@ -c $< -o $*.o
mv $*.d dep mv $*.d dep

View File

@ -73,7 +73,7 @@ Makefile: $(srcdir)/Makefile.in ../config.status
dep: dep:
mkdir dep mkdir dep
%.o: %.c %.o: %.c | dep
$(CC) $(CPPFLAGS) $(CFLAGS) @DEPENDENCY_FLAG@ -c $< -o $*.o $(CC) $(CPPFLAGS) $(CFLAGS) @DEPENDENCY_FLAG@ -c $< -o $*.o
mv $*.d dep mv $*.d dep

View File

@ -68,7 +68,7 @@ Makefile: $(srcdir)/Makefile.in ../config.status
dep: dep:
mkdir dep mkdir dep
%.o: %.c %.o: %.c | dep
$(CC) $(CPPFLAGS) $(CFLAGS) @DEPENDENCY_FLAG@ -c $< -o $*.o $(CC) $(CPPFLAGS) $(CFLAGS) @DEPENDENCY_FLAG@ -c $< -o $*.o
mv $*.d dep mv $*.d dep

View File

@ -67,7 +67,7 @@ Makefile: $(srcdir)/Makefile.in ../config.status
dep: dep:
mkdir dep mkdir dep
%.o: %.c %.o: %.c | dep
$(CC) $(CPPFLAGS) $(CFLAGS) @DEPENDENCY_FLAG@ -c $< -o $*.o $(CC) $(CPPFLAGS) $(CFLAGS) @DEPENDENCY_FLAG@ -c $< -o $*.o
mv $*.d dep mv $*.d dep

View File

@ -82,7 +82,7 @@ stamp-pcb_config-h: $(srcdir)/pcb_config.h.in ../config.status
cd ..; ./config.status --header=tgt-pcb/pcb_config.h cd ..; ./config.status --header=tgt-pcb/pcb_config.h
pcb_config.h: stamp-pcb_config-h pcb_config.h: stamp-pcb_config-h
%.o: %.cc %.o: %.cc | dep
$(CXX) $(CPPFLAGS) $(CXXFLAGS) @DEPENDENCY_FLAG@ -c $< -o $*.o $(CXX) $(CPPFLAGS) $(CXXFLAGS) @DEPENDENCY_FLAG@ -c $< -o $*.o
mv $*.d dep mv $*.d dep

View File

@ -68,7 +68,7 @@ Makefile: $(srcdir)/Makefile.in ../config.status
dep: dep:
mkdir dep mkdir dep
%.o: %.cc %.o: %.cc | dep
$(CXX) $(CPPFLAGS) $(CXXFLAGS) @DEPENDENCY_FLAG@ -c $< -o $*.o $(CXX) $(CPPFLAGS) $(CXXFLAGS) @DEPENDENCY_FLAG@ -c $< -o $*.o
mv $*.d dep mv $*.d dep

View File

@ -69,7 +69,7 @@ Makefile: $(srcdir)/Makefile.in ../config.status
dep: dep:
mkdir dep mkdir dep
%.o: %.c %.o: %.c | dep
$(CC) $(CPPFLAGS) $(CFLAGS) @DEPENDENCY_FLAG@ -c $< -o $*.o $(CC) $(CPPFLAGS) $(CFLAGS) @DEPENDENCY_FLAG@ -c $< -o $*.o
mv $*.d dep mv $*.d dep

View File

@ -67,7 +67,7 @@ Makefile: $(srcdir)/Makefile.in ../config.status
dep: dep:
mkdir dep mkdir dep
%.o: %.c %.o: %.c | dep
$(CC) $(CPPFLAGS) $(CFLAGS) -MD -c $< -o $*.o $(CC) $(CPPFLAGS) $(CFLAGS) -MD -c $< -o $*.o
mv $*.d dep mv $*.d dep

View File

@ -72,7 +72,7 @@ Makefile: $(srcdir)/Makefile.in ../config.status
dep: dep:
mkdir dep mkdir dep
%.o: %.cc vhdl_config.h %.o: %.cc vhdl_config.h | dep
$(CXX) $(CPPFLAGS) $(CXXFLAGS) @DEPENDENCY_FLAG@ -c $< -o $*.o $(CXX) $(CPPFLAGS) $(CXXFLAGS) @DEPENDENCY_FLAG@ -c $< -o $*.o
mv $*.d dep mv $*.d dep

View File

@ -68,7 +68,7 @@ Makefile: $(srcdir)/Makefile.in ../config.status
dep: dep:
mkdir dep mkdir dep
%.o: %.c %.o: %.c | dep
$(CC) $(CPPFLAGS) $(CFLAGS) @DEPENDENCY_FLAG@ -c $< -o $*.o $(CC) $(CPPFLAGS) $(CFLAGS) @DEPENDENCY_FLAG@ -c $< -o $*.o
mv $*.d dep mv $*.d dep

View File

@ -76,7 +76,7 @@ Makefile: $(srcdir)/Makefile.in ../config.status
dep: dep:
mkdir dep mkdir dep
%.o: %.c vvp_config.h %.o: %.c vvp_config.h | dep
$(CC) $(CPPFLAGS) $(CFLAGS) @DEPENDENCY_FLAG@ -c $< -o $*.o $(CC) $(CPPFLAGS) $(CFLAGS) @DEPENDENCY_FLAG@ -c $< -o $*.o
mv $*.d dep mv $*.d dep

View File

@ -104,11 +104,11 @@ dep:
vhdlpp@EXEEXT@: $O vhdlpp@EXEEXT@: $O
$(CXX) -o vhdlpp@EXEEXT@ $(LDFLAGS) $O $(LIBS) $(CXX) -o vhdlpp@EXEEXT@ $(LDFLAGS) $O $(LIBS)
%.o: $(srcdir)/../libmisc/%.cc %.o: $(srcdir)/../libmisc/%.cc | dep
$(CXX) $(CPPFLAGS) $(CXXFLAGS) @DEPENDENCY_FLAG@ -c $< -o $*.o $(CXX) $(CPPFLAGS) $(CXXFLAGS) @DEPENDENCY_FLAG@ -c $< -o $*.o
mv $*.d dep/$*.d mv $*.d dep/$*.d
%.o: %.cc vhdlpp_config.h %.o: %.cc vhdlpp_config.h | dep
$(CXX) $(CPPFLAGS) $(CXXFLAGS) @DEPENDENCY_FLAG@ -c $< -o $*.o $(CXX) $(CPPFLAGS) $(CXXFLAGS) @DEPENDENCY_FLAG@ -c $< -o $*.o
mv $*.d dep/$*.d mv $*.d dep/$*.d

View File

@ -123,11 +123,11 @@ Makefile: $(srcdir)/Makefile.in ../config.status
dep: dep:
mkdir dep mkdir dep
%.o: %.c vpi_config.h %.o: %.c vpi_config.h | dep
$(CC) $(CPPFLAGS) $(CFLAGS) @DEPENDENCY_FLAG@ -c $< -o $*.o $(CC) $(CPPFLAGS) $(CFLAGS) @DEPENDENCY_FLAG@ -c $< -o $*.o
mv $*.d dep mv $*.d dep
%.o: %.cc vpi_config.h %.o: %.cc vpi_config.h | dep
$(CXX) $(CPPFLAGS) $(CXXFLAGS) @DEPENDENCY_FLAG@ -c $< -o $*.o $(CXX) $(CPPFLAGS) $(CXXFLAGS) @DEPENDENCY_FLAG@ -c $< -o $*.o
mv $*.d dep mv $*.d dep

View File

@ -3204,7 +3204,7 @@ static const char *modtypes[] = {"module",
"vhdl_if_generate", "vhdl_if_generate",
"vhdl_generate", "vhdl_generate",
"vhdl_package", "vhdl_package",
"unpacked"}; "sv_array"};
static const char *attrtypes[] = {"misc", "array", "enum", "class"}; static const char *attrtypes[] = {"misc", "array", "enum", "class"};

View File

@ -108,7 +108,7 @@ enum fstScopeType
FST_ST_VHDL_GENERATE = 20, FST_ST_VHDL_GENERATE = 20,
FST_ST_VHDL_PACKAGE = 21, FST_ST_VHDL_PACKAGE = 21,
FST_ST_UNPACKED_DIM = 22, FST_ST_SV_ARRAY = 22,
FST_ST_MAX = 22, FST_ST_MAX = 22,
FST_ST_GEN_ATTRBEGIN = 252, FST_ST_GEN_ATTRBEGIN = 252,

View File

@ -159,11 +159,11 @@ vvp@EXEEXT@: $O main.o
endif endif
endif endif
%.o: %.cc config.h %.o: %.cc config.h | dep
$(CXX) $(CPPFLAGS) -DIVL_SUFFIX='"$(suffix)"' $(MDIR1) $(MDIR2) $(CXXFLAGS) @DEPENDENCY_FLAG@ -c $< -o $*.o $(CXX) $(CPPFLAGS) -DIVL_SUFFIX='"$(suffix)"' $(MDIR1) $(MDIR2) $(CXXFLAGS) @DEPENDENCY_FLAG@ -c $< -o $*.o
mv $*.d dep/$*.d mv $*.d dep/$*.d
%.o: %.c config.h %.o: %.c config.h | dep
$(CC) $(CPPFLAGS) $(MDIR1) $(MDIR2) $(CFLAGS) @DEPENDENCY_FLAG@ -c $< -o $*.o $(CC) $(CPPFLAGS) $(MDIR1) $(MDIR2) $(CFLAGS) @DEPENDENCY_FLAG@ -c $< -o $*.o
mv $*.d dep/$*.d mv $*.d dep/$*.d