From be44214598c29406cca0440e719159506f270a21 Mon Sep 17 00:00:00 2001 From: Cary R Date: Sat, 9 Oct 2010 21:30:18 -0700 Subject: [PATCH] Add cppcheck target to the Makefile This patch adds support for running cppcheck from the Makefile. It also standardizes the order of some of the targets. It renames vpip_format.c to vpip_format.cc and fixes the size of the array tables to make room for the trailing NULL. Found when using a C++ compiler. --- Makefile.in | 61 ++++++++++--------- cadpli/Makefile.in | 34 ++++++----- driver-vpi/Makefile.in | 15 ++++- driver/Makefile.in | 19 ++++-- ivlpp/Makefile.in | 15 ++++- libveriuser/Makefile.in | 53 +++++++++-------- tgt-fpga/Makefile.in | 41 +++++++------ tgt-null/Makefile.in | 34 ++++++----- tgt-pal/Makefile.in | 36 +++++++----- tgt-stub/Makefile.in | 34 ++++++----- tgt-verilog/Makefile.in | 39 ++++++++----- tgt-vhdl/Makefile.in | 41 ++++++++----- tgt-vlog95/Makefile.in | 34 ++++++----- tgt-vvp/Makefile.in | 45 ++++++++------ vpi/Makefile.in | 84 +++++++++++++++------------ vvp/Makefile.in | 60 ++++++++++--------- vvp/{vpip_format.c => vpip_format.cc} | 8 +-- 17 files changed, 393 insertions(+), 260 deletions(-) rename vvp/{vpip_format.c => vpip_format.cc} (95%) diff --git a/Makefile.in b/Makefile.in index fc291bf98..bb2a80393 100644 --- a/Makefile.in +++ b/Makefile.in @@ -76,18 +76,41 @@ MAN = @MAN@ PS2PDF = @PS2PDF@ GIT = @GIT@ -CPPFLAGS = @DEFS@ -I. -I$(srcdir) @CPPFLAGS@ +ifeq (@srcdir@,.) +INCLUDE_PATH = -I. +else +INCLUDE_PATH = -I. -I$(srcdir) +endif + +CPPFLAGS = @DEFS@ $(INCLUDE_PATH) @CPPFLAGS@ CXXFLAGS = @WARNING_FLAGS@ @CXXFLAGS@ PICFLAGS = @PICFLAG@ LDFLAGS = @rdynamic@ @LDFLAGS@ +TT = t-dll.o t-dll-api.o t-dll-expr.o t-dll-proc.o t-dll-analog.o +FF = cprop.o nodangle.o synth.o synth2.o syn-rules.o + +O = main.o async.o design_dump.o discipline.o dup_expr.o elaborate.o \ + elab_expr.o elaborate_analog.o elab_lval.o elab_net.o elab_pexpr.o \ + elab_scope.o elab_sig.o elab_sig_analog.o emit.o eval.o eval_attrib.o \ + eval_tree.o expr_synth.o functor.o lexor.o lexor_keyword.o link_const.o \ + load_module.o netlist.o netmisc.o net_analog.o net_assign.o net_design.o \ + net_event.o net_expr.o net_func.o net_link.o net_modulo.o net_nex_input.o \ + net_nex_output.o net_proc.o net_scope.o net_tran.o net_udp.o \ + pad_to_width.o parse.o parse_misc.o pform.o pform_analog.o \ + pform_disciplines.o pform_dump.o pform_types.o set_width.o \ + symbol_search.o sync.o sys_funcs.o verinum.o verireal.o target.o \ + Attrib.o HName.o LineInfo.o Module.o PDelays.o PEvent.o PExpr.o PGate.o \ + PGenerate.o PScope.o PSpec.o PTask.o PUdp.o PFunction.o PWire.o \ + Statement.o AStatement.o StringHeap.o $(FF) $(TT) + all: dep config.h _pli_types.h version_tag.h ivl@EXEEXT@ version.exe iverilog-vpi.man $(foreach dir,$(SUBDIRS),$(MAKE) -C $(dir) $@ && ) true # In the windows world, the installer will need a dosify program to # dosify text files. ifeq (@MINGW32@,yes) -all: dep dosify.exe +all: dosify.exe dosify.exe: $(srcdir)/dosify.c $(CC) -o dosify.exe $(srcdir)/dosify.c endif @@ -133,30 +156,20 @@ ifneq (@srcdir@,.) endif rm -rf autom4te.cache -TT = t-dll.o t-dll-api.o t-dll-expr.o t-dll-proc.o t-dll-analog.o -FF = cprop.o nodangle.o synth.o synth2.o syn-rules.o +cppcheck: $(O:.o=.cc) $(srcdir)/dosify.c $(srcdir)/version.c + cppcheck --enable=all -f $(INCLUDE_PATH) $^ -O = main.o async.o design_dump.o discipline.o dup_expr.o \ -elaborate.o elab_expr.o elaborate_analog.o \ -elab_lval.o elab_net.o elab_pexpr.o elab_scope.o \ -elab_sig.o elab_sig_analog.o emit.o eval.o eval_attrib.o \ -eval_tree.o expr_synth.o functor.o lexor.o lexor_keyword.o link_const.o \ -load_module.o netlist.o netmisc.o net_analog.o net_assign.o \ -net_design.o net_event.o net_expr.o net_func.o \ -net_link.o net_modulo.o net_nex_input.o net_nex_output.o \ -net_proc.o net_scope.o net_tran.o net_udp.o pad_to_width.o \ -parse.o parse_misc.o pform.o pform_analog.o pform_disciplines.o \ -pform_dump.o pform_types.o \ -set_width.o symbol_search.o sync.o sys_funcs.o \ -verinum.o verireal.o target.o \ -Attrib.o HName.o LineInfo.o Module.o PDelays.o PEvent.o \ -PExpr.o PGate.o PGenerate.o PScope.o PSpec.o \ -PTask.o PUdp.o PFunction.o PWire.o Statement.o AStatement.o StringHeap.o \ -$(FF) $(TT) +cppcheck-all: + $(foreach dir,$(SUBDIRS),$(MAKE) -C $(dir) cppcheck && ) true + $(foreach dir,$(NOTUSED),$(MAKE) -C $(dir) cppcheck && ) true + cppcheck Makefile: $(srcdir)/Makefile.in config.status ./config.status --file=$@ +dep: + mkdir dep + stamp-config-h: $(srcdir)/config.h.in config.status @rm -f $@ ./config.status config.h @@ -190,7 +203,7 @@ ivl@EXEEXT@: $O endif ifeq (@MINGW32@,no) -all: dep iverilog-vpi +all: iverilog-vpi iverilog-vpi: $(srcdir)/iverilog-vpi.sh Makefile sed -e 's;@SHARED@;@shared@;' -e 's;@PIC@;@PICFLAG@;' \ @@ -206,9 +219,6 @@ endif version.exe: $(srcdir)/version.c $(srcdir)/version_base.h version_tag.h $(HOSTCC) @WARNING_FLAGS@ -o version.exe -I. -I$(srcdir) $(srcdir)/version.c -dep: - mkdir dep - %.o: %.cc config.h $(CXX) $(CPPFLAGS) $(CXXFLAGS) @DEPENDENCY_FLAG@ -c $< -o $*.o mv $*.d dep/$*.d @@ -352,4 +362,3 @@ uninstall: -include $(patsubst %.o, dep/%.d, $O) --include $(patsubst %.o, dep/%.d, vpithunk.o) diff --git a/cadpli/Makefile.in b/cadpli/Makefile.in index 6e401ee6a..2aa370ea7 100644 --- a/cadpli/Makefile.in +++ b/cadpli/Makefile.in @@ -37,19 +37,36 @@ INSTALL = @INSTALL@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_DATA = @INSTALL_DATA@ -CPPFLAGS = -I$(srcdir) -I$(srcdir)/.. -I.. @CPPFLAGS@ @DEFS@ @PICFLAG@ +ifeq (@srcdir@,.) +INCLUDE_PATH = -I. -I.. +else +INCLUDE_PATH = -I. -I.. -I$(srcdir) -I$(srcdir)/.. +endif + +CPPFLAGS = $(INCLUDE_PATH) @CPPFLAGS@ @DEFS@ @PICFLAG@ CFLAGS = @WARNING_FLAGS@ @CFLAGS@ LDFLAGS = @LDFLAGS@ SHARED = @shared@ -all: +O = cadpli.o all: dep cadpli.vpl $(ALL32) -# No specific check operations. check: all +clean: + rm -rf *.o dep cadpli.vpl + +distclean: clean + rm -f Makefile config.log + +cppcheck: $(O:.o=.c) + cppcheck --enable=all -f $(INCLUDE_PATH) $^ + +Makefile: $(srcdir)/Makefile.in ../config.status + cd ..; ./config.status --file=cadpli/$@ + dep: mkdir dep @@ -57,11 +74,6 @@ dep: $(CC) $(CPPFLAGS) $(CFLAGS) @DEPENDENCY_FLAG@ -c $< mv $*.d dep -O = cadpli.o - -Makefile: $(srcdir)/Makefile.in ../config.status - cd ..; ./config.status --file=cadpli/$@ - SYSTEM_VPI_LDFLAGS = -L../vvp -lvpi ifeq (@MINGW32@,yes) SYSTEM_VPI_LDFLAGS += @EXTRALIBS@ @@ -70,12 +82,6 @@ endif cadpli.vpl: $O ../vvp/libvpi.a ../libveriuser/libveriuser.o $(CC) @shared@ -o $@ $O ../libveriuser/libveriuser.o $(SYSTEM_VPI_LDFLAGS) -clean: - rm -rf *.o dep cadpli.vpl - -distclean: clean - rm -f Makefile config.log - install: all installdirs $(vpidir)/cadpli.vpl $(vpidir)/cadpli.vpl: ./cadpli.vpl diff --git a/driver-vpi/Makefile.in b/driver-vpi/Makefile.in index f61ff7464..37a00b0fe 100644 --- a/driver-vpi/Makefile.in +++ b/driver-vpi/Makefile.in @@ -41,10 +41,18 @@ INSTALL = @INSTALL@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_DATA = @INSTALL_DATA@ -CPPFLAGS = -I. -I$(srcdir)/.. @CPPFLAGS@ @DEFS@ +ifeq (@srcdir@,.) +INCLUDE_PATH = -I. -I.. +else +INCLUDE_PATH = -I. -I.. -I$(srcdir) -I$(srcdir)/.. +endif + +CPPFLAGS = $(INCLUDE_PATH) @CPPFLAGS@ @DEFS@ CFLAGS = @WARNING_FLAGS@ @CFLAGS@ LDFLAGS = @LDFLAGS@ +O = main.o res.o + all: iverilog-vpi@EXEEXT@ check: all @@ -55,11 +63,12 @@ clean: distclean: clean rm -f Makefile config.log +cppcheck: main.c + cppcheck --enable=all -f $(INCLUDE_PATH) $^ + Makefile: $(srcdir)/Makefile.in ../config.status cd ..; ./config.status --file=driver-vpi/$@ -O = main.o res.o - iverilog-vpi@EXEEXT@: $O $(CC) $(LDFLAGS) $O -o iverilog-vpi@EXEEXT@ @EXTRALIBS@ diff --git a/driver/Makefile.in b/driver/Makefile.in index 26d6346b7..346ce4ab5 100644 --- a/driver/Makefile.in +++ b/driver/Makefile.in @@ -41,10 +41,18 @@ INSTALL_DATA = @INSTALL_DATA@ MAN = @MAN@ PS2PDF = @PS2PDF@ -CPPFLAGS = -I. -I.. -I$(srcdir)/.. -I$(srcdir) @CPPFLAGS@ @DEFS@ +ifeq (@srcdir@,.) +INCLUDE_PATH = -I. -I.. +else +INCLUDE_PATH = -I. -I.. -I$(srcdir) -I$(srcdir)/.. +endif + +CPPFLAGS = $(INCLUDE_PATH) @CPPFLAGS@ @DEFS@ CFLAGS = @WARNING_FLAGS@ @CFLAGS@ LDFLAGS = @LDFLAGS@ +O = main.o substit.o cflexor.o cfparse.o + all: dep iverilog@EXEEXT@ iverilog.man check: all @@ -57,10 +65,14 @@ clean: distclean: clean rm -f Makefile config.log +cppcheck: $(O:.o=.c) + cppcheck --enable=all -f $(INCLUDE_PATH) $^ + Makefile: $(srcdir)/Makefile.in ../config.status cd ..; ./config.status --file=driver/$@ -O = main.o substit.o cflexor.o cfparse.o +dep: + mkdir dep iverilog@EXEEXT@: $O $(CC) $(LDFLAGS) $O -o iverilog@EXEEXT@ @EXTRALIBS@ @@ -71,9 +83,6 @@ cflexor.c: cflexor.lex cfparse.h cfparse.c: cfparse.y bison --verbose -t -d -o cfparse.c --name-prefix=cf $(srcdir)/cfparse.y -dep: - mkdir dep - %.o: %.c $(CC) $(CPPFLAGS) $(CFLAGS) @DEPENDENCY_FLAG@ -c $< -o $*.o mv $*.d dep diff --git a/ivlpp/Makefile.in b/ivlpp/Makefile.in index de35381b2..f65f1114f 100644 --- a/ivlpp/Makefile.in +++ b/ivlpp/Makefile.in @@ -37,10 +37,18 @@ INSTALL = @INSTALL@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_DATA = @INSTALL_DATA@ -CPPFLAGS = -I. -I.. -I$(srcdir)/.. -I$(srcdir) @CPPFLAGS@ @DEFS@ +ifeq (@srcdir@,.) +INCLUDE_PATH = -I. -I.. +else +INCLUDE_PATH = -I. -I.. -I$(srcdir) -I$(srcdir)/.. +endif + +CPPFLAGS = $(INCLUDE_PATH) @CPPFLAGS@ @DEFS@ CFLAGS = @WARNING_FLAGS@ @CFLAGS@ LDFLAGS = @LDFLAGS@ +O = main.o lexor.o + all: ivlpp@EXEEXT@ check: all @@ -51,11 +59,12 @@ clean: distclean: clean rm -f Makefile config.log +cppcheck: $(O:.o=.c) + cppcheck --enable=all -f $(INCLUDE_PATH) $^ + Makefile: $(srcdir)/Makefile.in ../config.status cd ..; ./config.status --file=ivlpp/$@ -O = main.o lexor.o - ivlpp@EXEEXT@: $O $(CC) $(LDFLAGS) $O -o ivlpp@EXEEXT@ @EXTRALIBS@ diff --git a/libveriuser/Makefile.in b/libveriuser/Makefile.in index 31e16b8b4..4331ce4b5 100644 --- a/libveriuser/Makefile.in +++ b/libveriuser/Makefile.in @@ -35,33 +35,51 @@ INSTALL = @INSTALL@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_DATA = @INSTALL_DATA@ -CPPFLAGS = -I. -I.. -I$(srcdir) -I$(srcdir)/.. @CPPFLAGS@ @DEFS@ @PICFLAG@ +ifeq (@srcdir@,.) +INCLUDE_PATH = -I. -I.. +else +INCLUDE_PATH = -I. -I.. -I$(srcdir) -I$(srcdir)/.. +endif + +CPPFLAGS = $(INCLUDE_PATH) @CPPFLAGS@ @DEFS@ @PICFLAG@ CFLAGS = @WARNING_FLAGS@ @CFLAGS@ LDFLAGS = @LDFLAGS@ RANLIB = @RANLIB@ A = a_close.o a_compare_handles.o a_configure.o a_fetch_argc.o \ -a_fetch_argv.o a_fetch_dir.o a_fetch_fullname.o a_fetch_location.o \ -a_fetch_param.o a_fetch_range.o a_fetch_tfarg.o a_fetch_time.o \ -a_fetch_type.o a_fetch_type_str.o a_fetch_value.o a_handle_by_name.o \ -a_handle_hiconn.o a_handle_object.o a_handle_parent.o \ -a_handle_simulated_net.o a_handle_tfarg.o a_initialize.o \ -a_next.o a_next_bit.o a_next_port.o a_next_topmod.o \ -a_object_of_type.o a_product_version.o \ -a_set_value.o a_vcl.o a_version.o + a_fetch_argv.o a_fetch_dir.o a_fetch_fullname.o a_fetch_location.o \ + a_fetch_param.o a_fetch_range.o a_fetch_tfarg.o a_fetch_time.o \ + a_fetch_type.o a_fetch_type_str.o a_fetch_value.o a_handle_by_name.o \ + a_handle_hiconn.o a_handle_object.o a_handle_parent.o \ + a_handle_simulated_net.o a_handle_tfarg.o a_initialize.o a_next.o \ + a_next_bit.o a_next_port.o a_next_topmod.o a_object_of_type.o \ + a_product_version.o a_set_value.o a_vcl.o a_version.o O = asynch.o delay.o exprinfo.o finish.o getcstringp.o getinstance.o \ -getlongp.o getp.o getsimtime.o io_print.o math.o mc_scan_plusargs.o \ -nodeinfo.o nump.o putlongp.o putp.o spname.o typep.o workarea.o \ -veriusertfs.o priv.o $A + getlongp.o getp.o getsimtime.o io_print.o math.o mc_scan_plusargs.o \ + nodeinfo.o nump.o putlongp.o putp.o spname.o typep.o workarea.o \ + veriusertfs.o priv.o $A all: dep libveriuser.a $(ALL32) check: all +clean: + rm -rf *.o dep libveriuser.a libveriuser.o + +distclean: clean + rm -f Makefile config.log + rm -f config.h stamp-config-h + +cppcheck: $(O:.o=.c) + cppcheck --enable=all -f $(INCLUDE_PATH) $^ + Makefile: $(srcdir)/Makefile.in cd ..; ./config.status --file=libveriuser/$@ +dep: + mkdir dep + stamp-config-h: $(srcdir)/config.h.in ../config.status @rm -f $@ cd ..; ./config.status --header=libveriuser/config.h @@ -75,21 +93,10 @@ libveriuser.a: libveriuser.o ar cvq $@ libveriuser.o $(RANLIB) $@ -dep: - mkdir dep - %.o: %.c config.h $(CC) $(CPPFLAGS) $(CFLAGS) @DEPENDENCY_FLAG@ -c $< -o $*.o mv $*.d dep - -clean: - rm -rf *.o dep libveriuser.a libveriuser.o - -distclean: clean - rm -f Makefile config.log - rm -f config.h stamp-config-h - install:: all installdirs $(libdir)/libveriuser$(suffix).a $(INSTALL32) $(libdir)/libveriuser$(suffix).a: ./libveriuser.a diff --git a/tgt-fpga/Makefile.in b/tgt-fpga/Makefile.in index a3c5aa68e..db72580a6 100644 --- a/tgt-fpga/Makefile.in +++ b/tgt-fpga/Makefile.in @@ -38,12 +38,35 @@ INSTALL = @INSTALL@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_DATA = @INSTALL_DATA@ -CPPFLAGS = -I.. -I$(srcdir) -I$(srcdir)/.. @CPPFLAGS@ @DEFS@ @PICFLAG@ +ifeq (@srcdir@,.) +INCLUDE_PATH = -I. -I.. +else +INCLUDE_PATH = -I. -I.. -I$(srcdir) -I$(srcdir)/.. +endif + +CPPFLAGS = $(INCLUDE_PATH) @CPPFLAGS@ @DEFS@ @PICFLAG@ CFLAGS = @WARNING_FLAGS@ @CFLAGS@ LDFLAGS = @LDFLAGS@ +D = d-generic.o d-generic-edif.o d-lpm.o d-virtex.o d-virtex2.o +O = edif.o fpga.o gates.o mangle.o tables.o generic.o xilinx.o $D + all: dep fpga.tgt +check: all + +clean: + rm -rf *.o dep fpga.tgt + +distclean: clean + rm -f Makefile config.log + +cppcheck: $(O:.o=.c) + cppcheck --enable=all -f $(INCLUDE_PATH) $^ + +Makefile: $(srcdir)/Makefile.in ../config.status + cd ..; ./config.status --file=tgt-fpga$@ + dep: mkdir dep @@ -51,9 +74,6 @@ dep: $(CC) $(CPPFLAGS) $(CFLAGS) @DEPENDENCY_FLAG@ -c $< -o $*.o mv $*.d dep -D = d-generic.o d-generic-edif.o d-lpm.o d-virtex.o d-virtex2.o -O = edif.o fpga.o gates.o mangle.o tables.o generic.o xilinx.o $D - ifeq (@WIN32@,yes) TGTLDFLAGS=-L.. -livl TGTDEPLIBS=../libivl.a @@ -62,7 +82,6 @@ else TGTDEPLIBS= endif - fpga.tgt: $O $(TGTDEPLIBS) $(CC) @shared@ -o $@ $O $(TGTLDFLAGS) @@ -72,18 +91,6 @@ iverilog-fpga.ps: $(srcdir)/iverilog-fpga.man iverilog-fpga.pdf: iverilog-fpga.ps ps2pdf iverilog-fpga.ps iverilog-fpga.pdf - -Makefile: $(srcdir)/Makefile.in ../config.status - ../config.status --file=$@ - -clean: - rm -rf *.o dep fpga.tgt - -distclean: clean - rm -f Makefile config.log - -check: all - ifeq (@WIN32@,yes) INSTALL_DOC = $(prefix)/iverilog-fpga$(suffix).pdf $(mandir)/man1/iverilog-fpga$(suffix).1 INSTALL_DOCDIR = $(mandir)/man1 diff --git a/tgt-null/Makefile.in b/tgt-null/Makefile.in index 70881a764..c3b2d6f85 100644 --- a/tgt-null/Makefile.in +++ b/tgt-null/Makefile.in @@ -34,14 +34,34 @@ INSTALL = @INSTALL@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_DATA = @INSTALL_DATA@ -CPPFLAGS = -I.. -I$(srcdir)/.. -I$(srcdir) @CPPFLAGS@ @DEFS@ @PICFLAG@ +ifeq (@srcdir@,.) +INCLUDE_PATH = -I. -I.. +else +INCLUDE_PATH = -I. -I.. -I$(srcdir) -I$(srcdir)/.. +endif + +CPPFLAGS = $(INCLUDE_PATH) @CPPFLAGS@ @DEFS@ @PICFLAG@ CFLAGS = @WARNING_FLAGS@ @CFLAGS@ LDFLAGS = @LDFLAGS@ +O = null.o + all: dep null.tgt check: all +clean: + rm -rf *.o dep null.tgt + +distclean: clean + rm -f Makefile config.log + +cppcheck: $(O:.o=.c) + cppcheck --enable=all -f $(INCLUDE_PATH) $^ + +Makefile: $(srcdir)/Makefile.in ../config.status + cd ..; ./config.status --file=tgt-null/$@ + dep: mkdir dep @@ -49,8 +69,6 @@ dep: $(CC) $(CPPFLAGS) $(CFLAGS) @DEPENDENCY_FLAG@ -c $< -o $*.o mv $*.d dep -O = null.o - ifeq (@WIN32@,yes) TGTLDFLAGS=-L.. -livl TGTDEPLIBS=../libivl.a @@ -59,19 +77,9 @@ else TGTDEPLIBS= endif - null.tgt: $O $(TGTDEPLIBS) $(CC) @shared@ -o $@ $O $(TGTLDFLAGS) -clean: - rm -rf *.o dep null.tgt - -distclean: clean - rm -f Makefile config.log - -Makefile: $(srcdir)/Makefile.in ../config.status - cd ..; ./config.status --file=tgt-null/$@ - install: all installdirs $(libdir)/ivl$(suffix)/null.tgt $(INSTALL_DOC) $(libdir)/ivl$(suffix)/null.conf $(libdir)/ivl$(suffix)/null-s.conf $(libdir)/ivl$(suffix)/null.tgt: ./null.tgt diff --git a/tgt-pal/Makefile.in b/tgt-pal/Makefile.in index ea9964b8a..31f3ce7f3 100644 --- a/tgt-pal/Makefile.in +++ b/tgt-pal/Makefile.in @@ -33,12 +33,34 @@ INSTALL = @INSTALL@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_DATA = @INSTALL_DATA@ -CPPFLAGS = -I$(srcdir)/.. @CPPFLAGS@ @DEFS@ @PICFLAG@ +ifeq (@srcdir@,.) +INCLUDE_PATH = -I. -I.. +else +INCLUDE_PATH = -I. -I.. -I$(srcdir) -I$(srcdir)/.. +endif + +CPPFLAGS = $(INCLUDE_PATH) @CPPFLAGS@ @DEFS@ @PICFLAG@ CFLAGS = @WARNING_FLAGS@ @CFLAGS@ LDFLAGS = @LDFLAGS@ +O = imain.o dump_final.o emit_jed.o enables.o fit_log.o fit_reg.o pads.o + all: dep pal.tgt +check: all + +clean: + rm -rf *.o dep pal.tgt + +distclean: clean + rm -f Makefile config.log + +cppcheck: $(O:.o=.c) + cppcheck --enable=all -f $(INCLUDE_PATH) $^ + +Makefile: $(srcdir)/Makefile.in ../config.status + cd ..; ./config.status --file=tgt-pal/$@ + dep: mkdir dep @@ -46,8 +68,6 @@ dep: $(CC) $(CPPFLAGS) $(CFLAGS) @DEPENDENCY_FLAG@ -c $< -o $*.o mv $*.d dep -O = imain.o dump_final.o emit_jed.o enables.o fit_log.o fit_reg.o pads.o - ifeq (@CYGWIN@,yes) TGTLDFLAGS=-L.. -livl TGTDEPLIBS=../libivl.a @@ -56,19 +76,9 @@ else TGTDEPLIBS= endif - pal.tgt: $O $(TGTDEPLIBS) $(CC) @shared@ -o $@ $O $(TGTLDFLAGS) $(LDFLAGS) -lipal -clean: - rm -rf *.o dep pal.tgt - -distclean: clean - rm -f Makefile config.log - -Makefile: $(srcdir)/Makefile.in ../config.status - ../config.status --file=$@ - install: all installdirs $(libdir)/ivl/pal.tgt $(libdir)/ivl/pal.tgt: ./pal.tgt diff --git a/tgt-stub/Makefile.in b/tgt-stub/Makefile.in index 81cec6766..6b4a03fcd 100644 --- a/tgt-stub/Makefile.in +++ b/tgt-stub/Makefile.in @@ -35,14 +35,34 @@ INSTALL = @INSTALL@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_DATA = @INSTALL_DATA@ -CPPFLAGS = -I.. -I$(srcdir)/.. @CPPFLAGS@ @DEFS@ @PICFLAG@ +ifeq (@srcdir@,.) +INCLUDE_PATH = -I. -I.. +else +INCLUDE_PATH = -I. -I.. -I$(srcdir) -I$(srcdir)/.. +endif + +CPPFLAGS = $(INCLUDE_PATH) @CPPFLAGS@ @DEFS@ @PICFLAG@ CFLAGS = @WARNING_FLAGS@ @CFLAGS@ LDFLAGS = @LDFLAGS@ +O = stub.o expression.o statement.o switches.o + all: dep stub.tgt check: all +clean: + rm -rf *.o dep stub.tgt + +distclean: clean + rm -f Makefile config.log + +cppcheck: $(O:.o=.c) + cppcheck --enable=all -f $(INCLUDE_PATH) $^ + +Makefile: $(srcdir)/Makefile.in ../config.status + cd ..; ./config.status --file=tgt-stub/$@ + dep: mkdir dep @@ -50,8 +70,6 @@ dep: $(CC) $(CPPFLAGS) $(CFLAGS) @DEPENDENCY_FLAG@ -c $< -o $*.o mv $*.d dep -O = stub.o expression.o statement.o switches.o - ifeq (@WIN32@,yes) TGTLDFLAGS=-L.. -livl TGTDEPLIBS=../libivl.a @@ -60,19 +78,9 @@ else TGTDEPLIBS= endif - stub.tgt: $O $(TGTDEPLIBS) $(CC) @shared@ -o $@ $O $(TGTLDFLAGS) -clean: - rm -rf *.o dep stub.tgt - -distclean: clean - rm -f Makefile config.log - -Makefile: $(srcdir)/Makefile.in ../config.status - cd ..; ./config.status --file=tgt-stub/$@ - install: all installdirs $(libdir)/ivl$(suffix)/stub.tgt \ $(libdir)/ivl$(suffix)/stub.conf $(libdir)/ivl$(suffix)/stub-s.conf diff --git a/tgt-verilog/Makefile.in b/tgt-verilog/Makefile.in index 75d39bf23..60f692780 100644 --- a/tgt-verilog/Makefile.in +++ b/tgt-verilog/Makefile.in @@ -33,12 +33,34 @@ INSTALL = @INSTALL@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_DATA = @INSTALL_DATA@ -CPPFLAGS = @ident_support@ -I.. -I$(srcdir)/.. @CPPFLAGS@ @DEFS@ @PICFLAG@ -CFLAGS = -Wall @CFLAGS@ +ifeq (@srcdir@,.) +INCLUDE_PATH = -I. -I.. +else +INCLUDE_PATH = -I. -I.. -I$(srcdir) -I$(srcdir)/.. +endif + +CPPFLAGS = @ident_support@ $(INCLUDE_PATH) @CPPFLAGS@ @DEFS@ @PICFLAG@ +CFLAGS = @WARNING_FLAGS@ @CFLAGS@ LDFLAGS = @LDFLAGS@ +O = verilog.o + all: dep verilog.tgt +check: all + +clean: + rm -rf *.o dep verilog.tgt + +distclean: clean + rm -f Makefile config.log + +cppcheck: $(O:.o=.c) + cppcheck --enable=all -f $(INCLUDE_PATH) $^ + +Makefile: $(srcdir)/Makefile.in ../config.status + cd ..; ./config.status --file=tgt-verilog/$@ + dep: mkdir dep @@ -46,8 +68,6 @@ dep: $(CC) $(CPPFLAGS) $(CFLAGS) -MD -c $< -o $*.o mv $*.d dep -O = verilog.o - ifeq (@WIN32@,yes) TGTLDFLAGS= -L.. -livl TGTDEPLIBS=../libivl.a @@ -59,17 +79,6 @@ endif verilog.tgt: $O $(TGTDEPLIBS) $(CC) @shared@ -o $@ $O $(TGTLDFLAGS) -clean: - rm -rf *.o dep verilog.tgt - -distclean: clean - rm -f Makefile config.log - -Makefile: $(srcdir)/Makefile.in ../config.status - ../config.status --file=$@ - -check: all - install: all installdirs $(libdir)/ivl/verilog.tgt \ $(includedir)/vpi_user.h diff --git a/tgt-vhdl/Makefile.in b/tgt-vhdl/Makefile.in index 7638cd4e7..553edceab 100644 --- a/tgt-vhdl/Makefile.in +++ b/tgt-vhdl/Makefile.in @@ -36,12 +36,36 @@ INSTALL = @INSTALL@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_DATA = @INSTALL_DATA@ -CPPFLAGS = -I. -I.. -I$(srcdir)/.. @CPPFLAGS@ @DEFS@ @PICFLAG@ +ifeq (@srcdir@,.) +INCLUDE_PATH = -I. -I.. +else +INCLUDE_PATH = -I. -I.. -I$(srcdir) -I$(srcdir)/.. +endif + +CPPFLAGS = $(INCLUDE_PATH) @CPPFLAGS@ @DEFS@ @PICFLAG@ CXXFLAGS = @WARNING_FLAGS@ @CXXFLAGS@ LDFLAGS = @LDFLAGS@ +O = vhdl.o state.o vhdl_element.o vhdl_type.o vhdl_syntax.o scope.o process.o \ + stmt.o expr.o lpm.o support.o cast.o logic.o + all: dep vhdl.tgt vhdl.conf vhdl-s.conf +check: all + +clean: + rm -rf $(O) dep vhdl.tgt + +distclean: clean + rm -f Makefile config.log + rm -f stamp-vhdl_config-h vhdl_config.h + +cppcheck: $(O:.o=.cc) + cppcheck --enable=all -f $(INCLUDE_PATH) $^ + +Makefile: $(srcdir)/Makefile.in ../config.status + cd ..; ./config.status --file=tgt-vhdl/$@ + dep: mkdir dep @@ -49,9 +73,6 @@ dep: $(CXX) $(CPPFLAGS) $(CXXFLAGS) @DEPENDENCY_FLAG@ -c $< -o $*.o mv $*.d dep -O = vhdl.o state.o vhdl_element.o vhdl_type.o vhdl_syntax.o scope.o process.o \ - stmt.o expr.o lpm.o support.o cast.o logic.o - ifeq (@WIN32@,yes) TGTLDFLAGS=-L.. -livl TGTDEPLIBS=../libivl.a @@ -63,23 +84,11 @@ endif vhdl.tgt: $O $(TGTDEPLIBS) $(CXX) @shared@ -o $@ $O $(TGTLDFLAGS) -Makefile: $(srcdir)/Makefile.in ../config.status - cd ..; ./config.status --file=tgt-vhdl/$@ - stamp-vhdl_config-h: $(srcdir)/vhdl_config.h.in ../config.status @rm -f $@ cd ..; ./config.status --header=tgt-vhdl/vhdl_config.h vhdl_config.h: stamp-vhdl_config-h -clean: - rm -rf $(O) dep vhdl.tgt - -distclean: clean - rm -f Makefile config.log - rm -f stamp-vhdl_config-h vhdl_config.h - -check: all - install: all installdirs $(libdir)/ivl$(suffix)/vhdl.tgt $(libdir)/ivl$(suffix)/vhdl.conf \ $(libdir)/ivl$(suffix)/vhdl-s.conf diff --git a/tgt-vlog95/Makefile.in b/tgt-vlog95/Makefile.in index 36ba30adf..63fa02cfc 100644 --- a/tgt-vlog95/Makefile.in +++ b/tgt-vlog95/Makefile.in @@ -34,14 +34,34 @@ INSTALL = @INSTALL@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_DATA = @INSTALL_DATA@ -CPPFLAGS = -I. -I.. -I$(srcdir)/.. -I$(srcdir) @CPPFLAGS@ @DEFS@ @PICFLAG@ +ifeq (@srcdir@,.) +INCLUDE_PATH = -I. -I.. +else +INCLUDE_PATH = -I. -I.. -I$(srcdir) -I$(srcdir)/.. +endif + +CPPFLAGS = $(INCLUDE_PATH) @CPPFLAGS@ @DEFS@ @PICFLAG@ CFLAGS = @WARNING_FLAGS@ @CFLAGS@ LDFLAGS = @LDFLAGS@ +O = vlog95.o + all: dep vlog95.tgt check: all +clean: + rm -rf *.o dep vlog95.tgt + +distclean: clean + rm -f Makefile config.log + +cppcheck: $(O:.o=.c) + cppcheck --enable=all -f $(INCLUDE_PATH) $^ + +Makefile: $(srcdir)/Makefile.in ../config.status + cd ..; ./config.status --file=tgt-vlog95/$@ + dep: mkdir dep @@ -49,8 +69,6 @@ dep: $(CC) $(CPPFLAGS) $(CFLAGS) @DEPENDENCY_FLAG@ -c $< -o $*.o mv $*.d dep -O = vlog95.o - ifeq (@WIN32@,yes) TGTLDFLAGS=-L.. -livl TGTDEPLIBS=../libivl.a @@ -59,19 +77,9 @@ else TGTDEPLIBS= endif - vlog95.tgt: $O $(TGTDEPLIBS) $(CC) @shared@ -o $@ $O $(TGTLDFLAGS) -clean: - rm -rf *.o dep vlog95.tgt - -distclean: clean - rm -f Makefile config.log - -Makefile: $(srcdir)/Makefile.in ../config.status - cd ..; ./config.status --file=tgt-vlog95/$@ - install: all installdirs $(libdir)/ivl$(suffix)/vlog95.tgt $(INSTALL_DOC) $(libdir)/ivl$(suffix)/vlog95.conf $(libdir)/ivl$(suffix)/vlog95-s.conf $(libdir)/ivl$(suffix)/vlog95.tgt: ./vlog95.tgt diff --git a/tgt-vvp/Makefile.in b/tgt-vvp/Makefile.in index eb52a63c2..e8fed19a3 100644 --- a/tgt-vvp/Makefile.in +++ b/tgt-vvp/Makefile.in @@ -38,12 +38,37 @@ INSTALL = @INSTALL@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_DATA = @INSTALL_DATA@ -CPPFLAGS = -I. -I.. -I$(srcdir)/.. @CPPFLAGS@ @DEFS@ @PICFLAG@ +ifeq (@srcdir@,.) +INCLUDE_PATH = -I. -I.. +else +INCLUDE_PATH = -I. -I.. -I$(srcdir) -I$(srcdir)/.. +endif + +CPPFLAGS = $(INCLUDE_PATH) @CPPFLAGS@ @DEFS@ @PICFLAG@ CFLAGS = @WARNING_FLAGS@ @CFLAGS@ LDFLAGS = @LDFLAGS@ +O = vvp.o draw_mux.o draw_net_input.o draw_switch.o draw_ufunc.o draw_vpi.o \ + eval_bool.o eval_expr.o eval_real.o modpath.o vector.o vvp_process.o \ + vvp_scope.o + all: dep vvp.tgt vvp.conf vvp-s.conf +check: all + +clean: + rm -rf *.o dep vvp.tgt vvp.conf vvp-s.conf + +distclean: clean + rm -f Makefile config.log + rm -f stamp-vvp_config-h vvp_config.h + +cppcheck: $(O:.o=.c) + cppcheck --enable=all -f $(INCLUDE_PATH) $^ + +Makefile: $(srcdir)/Makefile.in ../config.status + cd ..; ./config.status --file=tgt-vvp/$@ + dep: mkdir dep @@ -51,11 +76,6 @@ dep: $(CC) $(CPPFLAGS) $(CFLAGS) @DEPENDENCY_FLAG@ -c $< -o $*.o mv $*.d dep -O = vvp.o draw_mux.o draw_net_input.o draw_switch.o draw_ufunc.o draw_vpi.o \ -eval_bool.o eval_expr.o \ -eval_real.o modpath.o vector.o \ -vvp_process.o vvp_scope.o - ifeq (@WIN32@,yes) TGTLDFLAGS=-L.. -livl TGTDEPLIBS=../libivl.a @@ -64,7 +84,6 @@ else TGTDEPLIBS= endif - vvp.tgt: $O $(TGTDEPLIBS) $(CC) @shared@ -o $@ $O $(TGTLDFLAGS) @@ -74,23 +93,11 @@ vvp.conf: $(srcdir)/vvp.conf.in Makefile vvp-s.conf: $(srcdir)/vvp-s.conf.in Makefile echo 'flag:VVP_EXECUTABLE=$(bindir)/vvp$(suffix)' | cat $(srcdir)/vvp-s.conf.in - > vvp-s.conf -Makefile: $(srcdir)/Makefile.in ../config.status - cd ..; ./config.status --file=tgt-vvp/$@ - stamp-vvp_config-h: $(srcdir)/vvp_config.h.in ../config.status @rm -f $@ cd ..; ./config.status --header=tgt-vvp/vvp_config.h vvp_config.h: stamp-vvp_config-h -clean: - rm -rf *.o dep vvp.tgt vvp.conf vvp-s.conf - -distclean: clean - rm -f Makefile config.log - rm -f stamp-vvp_config-h vvp_config.h - -check: all - install: all installdirs $(libdir)/ivl$(suffix)/vvp.tgt $(libdir)/ivl$(suffix)/vvp.conf $(libdir)/ivl$(suffix)/vvp-s.conf $(libdir)/ivl$(suffix)/vvp.tgt: ./vvp.tgt diff --git a/vpi/Makefile.in b/vpi/Makefile.in index 383e12d43..2e380b7ef 100644 --- a/vpi/Makefile.in +++ b/vpi/Makefile.in @@ -40,33 +40,24 @@ INSTALL_DATA = @INSTALL_DATA@ LEX = @LEX@ YACC = @YACC@ -CPPFLAGS = -I. -I$(srcdir)/.. -I$(srcdir) -I.. @file64_support@ @CPPFLAGS@ @DEFS@ @PICFLAG@ +ifeq (@srcdir@,.) +INCLUDE_PATH = -I. -I.. +else +INCLUDE_PATH = -I. -I.. -I$(srcdir) -I$(srcdir)/.. +endif + +CPPFLAGS = $(INCLUDE_PATH) @file64_support@ @CPPFLAGS@ @DEFS@ @PICFLAG@ CFLAGS = @WARNING_FLAGS@ @CFLAGS@ CXXFLAGS = @WARNING_FLAGS@ @CXXFLAGS@ LDFLAGS = @LDFLAGS@ -all: dep system.vpi va_math.vpi v2005_math.vpi $(ALL32) - -check: all - -dep: - mkdir dep - -%.o: %.c vpi_config.h - $(CC) $(CPPFLAGS) $(CFLAGS) @DEPENDENCY_FLAG@ -c $< -o $*.o - mv $*.d dep - -%.o: %.cc vpi_config.h - $(CXX) $(CPPFLAGS) $(CXXFLAGS) @DEPENDENCY_FLAG@ -c $< -o $*.o - mv $*.d dep - # Object files for system.vpi O = sys_table.o sys_convert.o sys_deposit.o sys_display.o sys_fileio.o \ -sys_finish.o sys_icarus.o sys_plusargs.o sys_random.o sys_random_mti.o \ -sys_readmem.o sys_readmem_lex.o sys_scanf.o sys_sdf.o \ -sys_time.o sys_vcd.o sys_vcdoff.o vcd_priv.o vcd_priv2.o \ -mt19937int.o sys_priv.o sdf_lexor.o sdf_parse.o stringheap.o \ -vams_simparam.o + sys_finish.o sys_icarus.o sys_plusargs.o sys_random.o sys_random_mti.o \ + sys_readmem.o sys_readmem_lex.o sys_scanf.o sys_sdf.o sys_time.o \ + sys_vcd.o sys_vcdoff.o vcd_priv.o mt19937int.o sys_priv.o sdf_lexor.o \ + sdf_parse.o stringheap.o vams_simparam.o +OPP = vcd_priv2.o ifeq (@HAVE_LIBZ@,yes) ifeq (@HAVE_LIBBZ2@,yes) @@ -82,6 +73,36 @@ M = sys_clog2.o v2005_math.o # Object files for va_math.vpi V = va_math.o +all: dep system.vpi va_math.vpi v2005_math.vpi $(ALL32) + +check: all + +clean: + rm -rf *.o sys_readmem_lex.c dep system.vpi + rm -f sdf_lexor.c sdf_parse.c sdf_parse.output sdf_parse.h + rm -f va_math.vpi v2005_math.vpi + +distclean: clean + rm -f Makefile config.log + rm -f vpi_config.h stamp-vpi_config-h + +cppcheck: $(O:.o=.c) $(OPP:.o=.cc) $(M:.o=.c) $(V:.o=.c) + cppcheck --enable=all -f $(INCLUDE_PATH) $^ + +Makefile: $(srcdir)/Makefile.in ../config.status + cd ..; ./config.status --file=vpi/$@ + +dep: + mkdir dep + +%.o: %.c vpi_config.h + $(CC) $(CPPFLAGS) $(CFLAGS) @DEPENDENCY_FLAG@ -c $< -o $*.o + mv $*.d dep + +%.o: %.cc vpi_config.h + $(CXX) $(CPPFLAGS) $(CXXFLAGS) @DEPENDENCY_FLAG@ -c $< -o $*.o + mv $*.d dep + LIBS = @LIBS@ SYSTEM_VPI_LDFLAGS = $(LIBS) VA_MATH_LDFLAGS = @@ -90,8 +111,8 @@ ifeq (@MINGW32@,yes) VA_MATH_LDFLAGS += @EXTRALIBS@ endif -system.vpi: $O ../vvp/libvpi.a - $(CXX) @shared@ -o $@ $O -L../vvp $(LDFLAGS) -lvpi $(SYSTEM_VPI_LDFLAGS) +system.vpi: $O $(OPP) ../vvp/libvpi.a + $(CXX) @shared@ -o $@ $O $(OPP) -L../vvp $(LDFLAGS) -lvpi $(SYSTEM_VPI_LDFLAGS) sys_readmem_lex.c: sys_readmem_lex.lex flex -t -Preadmem $(srcdir)/sys_readmem_lex.lex > sys_readmem_lex.c @@ -110,25 +131,11 @@ v2005_math.vpi: $M ../vvp/libvpi.a va_math.vpi: $V ../vvp/libvpi.a $(CC) @shared@ -o $@ $V -L../vvp $(LDFLAGS) -lvpi $(VA_MATH_VPI_LDFLAGS) -clean: - rm -rf *.o sys_readmem_lex.c dep system.vpi - rm -f sdf_lexor.c sdf_parse.c sdf_parse.output sdf_parse.h - rm -f va_math.vpi v2005_math.vpi - -distclean: clean - rm -f Makefile config.log - rm -f vpi_config.h stamp-vpi_config-h - -Makefile: $(srcdir)/Makefile.in ../config.status - cd ..; ./config.status --file=vpi/$@ - stamp-vpi_config-h: $(srcdir)/vpi_config.h.in ../config.status @rm -f $@ cd ..; ./config.status --header=vpi/vpi_config.h vpi_config.h: stamp-vpi_config-h -check: all - install: all installdirs \ $(vpidir)/system.vpi $(vpidir)/system.sft \ $(vpidir)/va_math.vpi $(vpidir)/va_math.sft \ @@ -164,3 +171,6 @@ uninstall: rm -f "$(DESTDIR)$(vpidir)/v2005_math.sft" -include $(patsubst %.o, dep/%.d, $O) +-include $(patsubst %.o, dep/%.d, $(OPP)) +-include $(patsubst %.o, dep/%.d, $M) +-include $(patsubst %.o, dep/%.d, $V) diff --git a/vvp/Makefile.in b/vvp/Makefile.in index b68832fdb..5d7284fae 100644 --- a/vvp/Makefile.in +++ b/vvp/Makefile.in @@ -45,7 +45,13 @@ YACC = @YACC@ MAN = @MAN@ PS2PDF = @PS2PDF@ -CPPFLAGS = -I. -I.. -I $(srcdir) -I$(srcdir)/.. @CPPFLAGS@ @DEFS@ +ifeq (@srcdir@,.) +INCLUDE_PATH = -I. -I.. +else +INCLUDE_PATH = -I. -I.. -I$(srcdir) -I$(srcdir)/.. +endif + +CPPFLAGS = $(INCLUDE_PATH) @CPPFLAGS@ @DEFS@ CFLAGS = @WARNING_FLAGS@ @CFLAGS@ CXXFLAGS = @WARNING_FLAGS@ @CXXFLAGS@ LDFLAGS = @rdynamic@ @LDFLAGS@ @@ -55,16 +61,19 @@ dllib=@DLLIB@ MDIR1 = -DMODULE_DIR1='"$(libdir)/ivl$(suffix)"' +V = vpi_modules.o vpi_callback.o vpi_const.o vpi_event.o vpi_iter.o vpi_mcd.o \ + vpi_priv.o vpi_scope.o vpi_real.o vpi_signal.o vpi_tasks.o vpi_time.o \ + vpi_vthr_vector.o vpip_bin.o vpip_hex.o vpip_oct.o \ + vpip_to_dec.o vpip_format.o vvp_vpi.o + +O = main.o parse.o parse_misc.o lexor.o arith.o array.o bufif.o compile.o \ + concat.o dff.o extend.o npmos.o part.o permaheap.o reduce.o resolv.o \ + sfunc.o stop.o symbols.o ufunc.o codes.o vthread.o schedule.o \ + statistics.o tables.o udp.o vvp_island.o vvp_net.o vvp_net_sig.o \ + event.o logic.o delay.o words.o island_tran.o $V + all: dep vvp@EXEEXT@ libvpi.a vvp.man -clean: - rm -f *.o *~ parse.cc parse.h lexor.cc tables.cc - rm -rf dep vvp@EXEEXT@ libvpi.a parse.output vvp.man vvp.ps vvp.pdf vvp.exp - -distclean: clean - rm -f Makefile config.log - rm -f stamp-config-h config.h - check: all ifeq (@WIN32@,yes) ifeq (@install_suffix@,) @@ -80,17 +89,22 @@ else ./vvp -M../vpi $(srcdir)/examples/hello.vvp | grep 'Hello, World.' endif -V = vpi_modules.o vpi_callback.o vpi_const.o vpi_event.o vpi_iter.o vpi_mcd.o \ -vpi_priv.o vpi_scope.o vpi_real.o vpi_signal.o vpi_tasks.o vpi_time.o \ -vpi_vthr_vector.o vpip_bin.o vpip_hex.o vpip_oct.o \ -vpip_to_dec.o vpip_format.o vvp_vpi.o +clean: + rm -f *.o *~ parse.cc parse.h lexor.cc tables.cc + rm -rf dep vvp@EXEEXT@ libvpi.a parse.output vvp.man vvp.ps vvp.pdf vvp.exp -O = main.o parse.o parse_misc.o lexor.o arith.o array.o bufif.o compile.o \ -concat.o \ -dff.o extend.o npmos.o part.o permaheap.o reduce.o resolv.o sfunc.o stop.o \ -symbols.o ufunc.o codes.o \ -vthread.o schedule.o statistics.o tables.o udp.o vvp_island.o vvp_net.o \ -vvp_net_sig.o event.o logic.o delay.o words.o island_tran.o $V +distclean: clean + rm -f Makefile config.log + rm -f stamp-config-h config.h + +cppcheck: $(O:.o=.cc) libvpi.c draw_tt.c + cppcheck --enable=all -f $(INCLUDE_PATH) $^ + +Makefile: $(srcdir)/Makefile.in + cd ..; ./config.status --file=vvp/$@ + +dep: + mkdir dep ifeq (@WIN32@,yes) # Under Windows (mingw) I need to make the vvp.exe in two steps. @@ -108,7 +122,7 @@ vvp@EXEEXT@ libvpi.a: $O $(srcdir)/vvp.def $(CXX) $(LDFLAGS) -o vvp@EXEEXT@ vvp.exp $(LDFLAGS) $O $(dllib) $(LIBS) else libvpi.a: libvpi.c - $(CC) -c $(srcdir)/libvpi.c + $(CC) $(CFLAGS) -c $< rm -f libvpi.a ar cqv libvpi.a libvpi.o $(RANLIB) libvpi.a @@ -117,9 +131,6 @@ vvp@EXEEXT@: $O $(CXX) $(LDFLAGS) -o vvp@EXEEXT@ $O $(LIBS) $(dllib) endif -dep: - mkdir dep - %.o: %.cc config.h $(CXX) $(CPPFLAGS) -DIVL_SUFFIX='"$(suffix)"' $(MDIR1) $(MDIR2) $(CXXFLAGS) @DEPENDENCY_FLAG@ -c $< -o $*.o mv $*.d dep/$*.d @@ -175,9 +186,6 @@ INSTALL_DOC = $(mandir)/man1/vvp$(suffix).1 INSTALL_DOCDIR = $(mandir)/man1 endif -Makefile: $(srcdir)/Makefile.in - cd ..; ./config.status --file=vvp/$@ - stamp-config-h: $(srcdir)/config.h.in ../config.status @rm -f $@ cd ..; ./config.status --header=vvp/config.h diff --git a/vvp/vpip_format.c b/vvp/vpip_format.cc similarity index 95% rename from vvp/vpip_format.c rename to vvp/vpip_format.cc index b750871d1..c5af282a7 100644 --- a/vvp/vpip_format.c +++ b/vvp/vpip_format.cc @@ -18,9 +18,9 @@ */ # include "vpi_user.h" -# include +# include -static const char str_char1_table[256] = { +static const char str_char1_table[257] = { ".HS1M222" "W3333333" /* 00 0F */ "L4444444" "44444444" /* 10 1F */ "P5555555" "55555555" /* 20 2F */ "55555555" "55555555" /* 30 3F */ "S6666666" "66666666" /* 40 4F */ "66666666" "66666666" /* 50 5F */ @@ -30,7 +30,7 @@ static const char str_char1_table[256] = { "77777777" "77777777" /* C0 CF */ "77777777" "77777777" /* D0 DF */ "77777777" "77777777" /* E0 EF */ "77777777" "77777777" /* F0 FF */ }; -static const char str_char2_table[256] = { +static const char str_char2_table[257] = { ".im0e010" "e0102010" /* 00 0F */ "a0102010" "30102010" /* 10 1F */ "u0102010" "30102010" /* 20 2F */ "40102010" "30102010" /* 30 3F */ "t0102010" "30102010" /* 40 4F */ "40102010" "30102010" /* 50 5F */ @@ -41,7 +41,7 @@ static const char str_char2_table[256] = { "50102010" "30102010" /* E0 EF */ "40102010" "30102010" /* F0 FF */ }; -void vpip_format_strength(char*str, s_vpi_value*value, unsigned bit) +extern "C" void vpip_format_strength(char*str, s_vpi_value*value, unsigned bit) { str[0] = '.'; str[1] = '.';