Permalink
Browse files

Fix compilation warnings.

  • Loading branch information...
1 parent 0f6eea7 commit e29ecdc2346a4adae827ccb810014ff798020cc4 steve committed Mar 31, 2001
Showing with 22 additions and 19 deletions.
  1. +2 −2 tgt-vvp/Makefile.in
  2. +5 −2 tgt-vvp/vvp_scope.c
  3. +2 −2 vpi/Makefile.in
  4. +7 −7 vvp/functor.cc
  5. +6 −6 vvp/vpi_mcd.cc
View
@@ -16,7 +16,7 @@
# 59 Temple Place - Suite 330
# Boston, MA 02111-1307, USA
#
-#ident "$Id: Makefile.in,v 1.4 2001/03/25 05:59:47 steve Exp $"
+#ident "$Id: Makefile.in,v 1.5 2001/03/31 19:29:23 steve Exp $"
#
#
SHELL = /bin/sh
@@ -46,7 +46,7 @@ all: vvp.tgt
%.o: %.c
@[ -d dep ] || mkdir dep
- $(CC) -Wall $(CPPFLAGS) -I$(srcdir)/.. -MD -c $< -o $*.o
+ $(CC) -Wall -I$(srcdir)/.. $(CPPFLAGS) -MD -c $< -o $*.o
mv $*.d dep
O = vvp.o eval_expr.o vvp_process.o vvp_scope.o
View
@@ -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.8 2001/03/29 03:47:13 steve Exp $"
+#ident "$Id: vvp_scope.c,v 1.9 2001/03/31 19:29:23 steve Exp $"
#endif
# include "vvp_priv.h"
@@ -239,12 +239,15 @@ int draw_scope(ivl_scope_t net, ivl_scope_t parent)
draw_event_in_scope(event);
}
- ivl_scope_children(net, draw_scope, net);
+ ivl_scope_children(net, (ivl_scope_f*) draw_scope, net);
return 0;
}
/*
* $Log: vvp_scope.c,v $
+ * Revision 1.9 2001/03/31 19:29:23 steve
+ * Fix compilation warnings.
+ *
* Revision 1.8 2001/03/29 03:47:13 steve
* events can take up to 4 inputs.
*
View
@@ -18,7 +18,7 @@
# 59 Temple Place - Suite 330
# Boston, MA 02111-1307, USA
#
-#ident "$Id: Makefile.in,v 1.23 2001/03/20 01:43:16 steve Exp $"
+#ident "$Id: Makefile.in,v 1.24 2001/03/31 19:29:23 steve Exp $"
#
#
SHELL = /bin/sh
@@ -50,7 +50,7 @@ all: system.vpi
%.o: %.c
@[ -d dep ] || mkdir dep
- $(CC) -Wall $(CPPFLAGS) $(CFLAGS) -I$(srcdir) -I$(srcdir)/.. -MD -c $< -o $*.o
+ $(CC) -Wall -I$(srcdir) -I$(srcdir)/.. $(CPPFLAGS) $(CFLAGS) -MD -c $< -o $*.o
mv $*.d dep
O = sys_table.o sys_display.o sys_finish.o sys_random.o \
View
@@ -17,7 +17,7 @@
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
*/
#if !defined(WINNT)
-#ident "$Id: functor.cc,v 1.8 2001/03/29 03:46:36 steve Exp $"
+#ident "$Id: functor.cc,v 1.9 2001/03/31 19:29:23 steve Exp $"
#endif
# include "functor.h"
@@ -252,13 +252,10 @@ void functor_propagate(vvp_ipoint_t ptr)
functor_t fp = functor_index(ptr);
unsigned char oval = fp->oval;
- //printf("functor %lx becomes %u\n", ptr, oval);
-
vvp_ipoint_t idx = fp->out;
while (idx) {
functor_t idxp = functor_index(idx);
vvp_ipoint_t next = idxp->port[ipoint_port(idx)];
- //printf(" set %lx to %u\n", idx, oval);
functor_set(idx, oval);
idx = next;
}
@@ -268,9 +265,9 @@ void functor_dump(FILE*fd)
{
for (unsigned idx = 1 ; idx < functor_count ; idx += 1) {
functor_t cur = functor_index(idx*4);
- fprintf(fd, "%10p: out=%x port={%x %x %x %x}\n", idx*4,
- cur->out, cur->port[0], cur->port[1],
- cur->port[2], cur->port[3]);
+ fprintf(fd, "%10p: out=%x port={%x %x %x %x}\n",
+ (void*)(idx*4), cur->out, cur->port[0],
+ cur->port[1], cur->port[2], cur->port[3]);
}
}
@@ -300,6 +297,9 @@ const unsigned char ft_var[16] = {
/*
* $Log: functor.cc,v $
+ * Revision 1.9 2001/03/31 19:29:23 steve
+ * Fix compilation warnings.
+ *
* Revision 1.8 2001/03/29 03:46:36 steve
* Support named events as mode 2 functors.
*
View
@@ -17,7 +17,7 @@
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
*/
#if !defined(WINNT) && !defined(macintosh)
-#ident "$Id: vpi_mcd.cc,v 1.2 2001/03/22 02:24:05 steve Exp $"
+#ident "$Id: vpi_mcd.cc,v 1.3 2001/03/31 19:29:23 steve Exp $"
#endif
# include "vpi_priv.h"
@@ -79,11 +79,6 @@ char *vpi_mcd_name(unsigned int mcd)
return NULL;
}
-unsigned int vpi_mcd_open(char *name)
-{
- return vpi_mcd_open_x(name,"w");
-}
-
unsigned int vpi_mcd_open_x(char *name, char *mode)
{
int i;
@@ -101,6 +96,11 @@ unsigned int vpi_mcd_open_x(char *name, char *mode)
return 1<<i;
}
+unsigned int vpi_mcd_open(char *name)
+{
+ return vpi_mcd_open_x(name,"w");
+}
+
int vpi_mcd_printf(unsigned int mcd, const char*fmt, ...)
{
int i;

0 comments on commit e29ecdc

Please sign in to comment.