From ac91dc38b82afe5b82644124af5a44f1826064a6 Mon Sep 17 00:00:00 2001 From: steve Date: Sun, 25 Mar 2001 05:59:46 +0000 Subject: [PATCH] Recursive make check target. --- Makefile.in | 3 ++- tgt-vvp/Makefile.in | 7 ++++++- tgt-vvp/vvp_scope.c | 14 +++++++++++++- vpip/Makefile.in | 7 ++++++- vvp/Makefile.in | 8 +++++++- 5 files changed, 34 insertions(+), 5 deletions(-) diff --git a/Makefile.in b/Makefile.in index 762d143e7..a6deac1a4 100644 --- a/Makefile.in +++ b/Makefile.in @@ -16,7 +16,7 @@ # 59 Temple Place - Suite 330 # Boston, MA 02111-1307, USA # -#ident "$Id: Makefile.in,v 1.94 2001/03/25 04:47:47 steve Exp $" +#ident "$Id: Makefile.in,v 1.95 2001/03/25 05:59:46 steve Exp $" # # SHELL = /bin/sh @@ -72,6 +72,7 @@ all: ivl@EXEEXT@ # This rule rules the compiler in the trivial hello.vl program to make # sure the basics were compiled properly. check: all + for dir in $(SUBDIRS); do (cd $$dir ; $(MAKE) check); done driver/iverilog -Ccheck.conf -ocheck -tvvm-check -B./ivlpp examples/hello.vl $(CXX) -o check $(rdynamic) -fno-exceptions -I$(srcdir) -I$(srcdir)/vvm -I$(srcdir)/vpip -Lvvm -Lvpip check.cc -lvvm -lvpip $(dllib) ./check | grep 'Hello, World' diff --git a/tgt-vvp/Makefile.in b/tgt-vvp/Makefile.in index 1aca6026c..eaa634400 100644 --- a/tgt-vvp/Makefile.in +++ b/tgt-vvp/Makefile.in @@ -16,7 +16,7 @@ # 59 Temple Place - Suite 330 # Boston, MA 02111-1307, USA # -#ident "$Id: Makefile.in,v 1.3 2001/03/22 05:06:21 steve Exp $" +#ident "$Id: Makefile.in,v 1.4 2001/03/25 05:59:47 steve Exp $" # # SHELL = /bin/sh @@ -63,9 +63,14 @@ endif vvp.tgt: $O $(TGTDEPLIBS) $(CC) @shared@ -o $@ $O $(TGTLDFLAGS) +Makefile: Makefile.in config.status + ./config.status + clean: rm -f *.o dep/*.d +check: all + install: all installdirs $(libdir)/ivl/vvp.tgt $(libdir)/ivl/vvp.tgt: ./vvp.tgt diff --git a/tgt-vvp/vvp_scope.c b/tgt-vvp/vvp_scope.c index 68a7fe920..6de1be744 100644 --- a/tgt-vvp/vvp_scope.c +++ b/tgt-vvp/vvp_scope.c @@ -17,7 +17,7 @@ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA */ #if !defined(WINNT) -#ident "$Id: vvp_scope.c,v 1.3 2001/03/25 03:53:40 steve Exp $" +#ident "$Id: vvp_scope.c,v 1.4 2001/03/25 05:59:47 steve Exp $" #endif # include "vvp_priv.h" @@ -33,6 +33,8 @@ /* * This function takes a nexus and looks for an input functor. It then * draws to the output a string that represents that functor. + * + * XXXX This function does not yet support multiple drivers. */ static void draw_nexus_input(ivl_nexus_t nex) { @@ -114,6 +116,10 @@ int draw_scope(ivl_scope_t net, ivl_scope_t parent) ivl_scope_name(net), ivl_scope_name(net)); + /* Scan the scope for logic devices. For each device, draw out + a functor that connects pin 0 to the output, and the + remaining pins to inputs. */ + for (idx = 0 ; idx < ivl_scope_logs(net) ; idx += 1) { unsigned pdx; ivl_net_logic_t lptr = ivl_scope_log(net, idx); @@ -145,6 +151,9 @@ int draw_scope(ivl_scope_t net, ivl_scope_t parent) } + /* Scan the signals (reg and net) and draw the appropriate + statements to make the signal function. */ + for (idx = 0 ; idx < ivl_scope_sigs(net) ; idx += 1) { ivl_signal_t sig = ivl_scope_sig(net, idx); @@ -164,6 +173,9 @@ int draw_scope(ivl_scope_t net, ivl_scope_t parent) /* * $Log: vvp_scope.c,v $ + * Revision 1.4 2001/03/25 05:59:47 steve + * Recursive make check target. + * * Revision 1.3 2001/03/25 03:53:40 steve * Include signal bit index in functor input. * diff --git a/vpip/Makefile.in b/vpip/Makefile.in index 65cdfd8fc..5df8ad81c 100644 --- a/vpip/Makefile.in +++ b/vpip/Makefile.in @@ -18,7 +18,7 @@ # 59 Temple Place - Suite 330 # Boston, MA 02111-1307, USA # -#ident "$Id: Makefile.in,v 1.2 2001/03/20 00:29:10 steve Exp $" +#ident "$Id: Makefile.in,v 1.3 2001/03/25 05:59:47 steve Exp $" # # SHELL = /bin/sh @@ -64,6 +64,11 @@ else all: libvpip.a +check: all + +Makefile: Makefile.in config.status + ./config.status + libvpip.a: $P ld -r -o vpip.o $P rm -f $@ diff --git a/vvp/Makefile.in b/vvp/Makefile.in index bafb46daf..b7a7c50f7 100644 --- a/vvp/Makefile.in +++ b/vvp/Makefile.in @@ -16,7 +16,7 @@ # 59 Temple Place - Suite 330 # Boston, MA 02111-1307, USA # -#ident "$Id: Makefile.in,v 1.10 2001/03/22 22:37:36 steve Exp $" +#ident "$Id: Makefile.in,v 1.11 2001/03/25 05:59:47 steve Exp $" # # SHELL = /bin/sh @@ -54,6 +54,9 @@ clean: distclean: clean rm -f config.h Makefile config.cache config.log config.status +check: all + ./vvp -M../vpi $(srcdir)/examples/hello.vvp | grep 'Hello, World.' + V = vpi_modules.o vpi_const.o vpi_iter.o vpi_mcd.o vpi_priv.o \ vpi_scope.o vpi_signal.o vpi_tasks.o @@ -85,6 +88,9 @@ parse.h parse.cc: $(srcdir)/parse.y lexor.cc: $(srcdir)/lexor.lex flex -s -olexor.cc $(srcdir)/lexor.lex +Makefile: Makefile.in config.status + ./config.status + install: all installdirs $(bindir)/vvp