Fix compilation warnings.

This commit is contained in:
steve 2001-03-31 19:29:23 +00:00
parent 0f6eea7024
commit e29ecdc234
5 changed files with 22 additions and 19 deletions

View File

@ -16,7 +16,7 @@
# 59 Temple Place - Suite 330 # 59 Temple Place - Suite 330
# Boston, MA 02111-1307, USA # 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 SHELL = /bin/sh
@ -46,7 +46,7 @@ all: vvp.tgt
%.o: %.c %.o: %.c
@[ -d dep ] || mkdir dep @[ -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 mv $*.d dep
O = vvp.o eval_expr.o vvp_process.o vvp_scope.o O = vvp.o eval_expr.o vvp_process.o vvp_scope.o

View File

@ -17,7 +17,7 @@
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
*/ */
#if !defined(WINNT) #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 #endif
# include "vvp_priv.h" # include "vvp_priv.h"
@ -239,12 +239,15 @@ int draw_scope(ivl_scope_t net, ivl_scope_t parent)
draw_event_in_scope(event); draw_event_in_scope(event);
} }
ivl_scope_children(net, draw_scope, net); ivl_scope_children(net, (ivl_scope_f*) draw_scope, net);
return 0; return 0;
} }
/* /*
* $Log: vvp_scope.c,v $ * $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 * Revision 1.8 2001/03/29 03:47:13 steve
* events can take up to 4 inputs. * events can take up to 4 inputs.
* *

View File

@ -18,7 +18,7 @@
# 59 Temple Place - Suite 330 # 59 Temple Place - Suite 330
# Boston, MA 02111-1307, USA # 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 SHELL = /bin/sh
@ -50,7 +50,7 @@ all: system.vpi
%.o: %.c %.o: %.c
@[ -d dep ] || mkdir dep @[ -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 mv $*.d dep
O = sys_table.o sys_display.o sys_finish.o sys_random.o \ O = sys_table.o sys_display.o sys_finish.o sys_random.o \

View File

@ -17,7 +17,7 @@
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
*/ */
#if !defined(WINNT) #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 #endif
# include "functor.h" # include "functor.h"
@ -252,13 +252,10 @@ void functor_propagate(vvp_ipoint_t ptr)
functor_t fp = functor_index(ptr); functor_t fp = functor_index(ptr);
unsigned char oval = fp->oval; unsigned char oval = fp->oval;
//printf("functor %lx becomes %u\n", ptr, oval);
vvp_ipoint_t idx = fp->out; vvp_ipoint_t idx = fp->out;
while (idx) { while (idx) {
functor_t idxp = functor_index(idx); functor_t idxp = functor_index(idx);
vvp_ipoint_t next = idxp->port[ipoint_port(idx)]; vvp_ipoint_t next = idxp->port[ipoint_port(idx)];
//printf(" set %lx to %u\n", idx, oval);
functor_set(idx, oval); functor_set(idx, oval);
idx = next; idx = next;
} }
@ -268,9 +265,9 @@ void functor_dump(FILE*fd)
{ {
for (unsigned idx = 1 ; idx < functor_count ; idx += 1) { for (unsigned idx = 1 ; idx < functor_count ; idx += 1) {
functor_t cur = functor_index(idx*4); functor_t cur = functor_index(idx*4);
fprintf(fd, "%10p: out=%x port={%x %x %x %x}\n", idx*4, fprintf(fd, "%10p: out=%x port={%x %x %x %x}\n",
cur->out, cur->port[0], cur->port[1], (void*)(idx*4), cur->out, cur->port[0],
cur->port[2], cur->port[3]); cur->port[1], cur->port[2], cur->port[3]);
} }
} }
@ -300,6 +297,9 @@ const unsigned char ft_var[16] = {
/* /*
* $Log: functor.cc,v $ * $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 * Revision 1.8 2001/03/29 03:46:36 steve
* Support named events as mode 2 functors. * Support named events as mode 2 functors.
* *

View File

@ -17,7 +17,7 @@
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
*/ */
#if !defined(WINNT) && !defined(macintosh) #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 #endif
# include "vpi_priv.h" # include "vpi_priv.h"
@ -79,11 +79,6 @@ char *vpi_mcd_name(unsigned int mcd)
return NULL; 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) unsigned int vpi_mcd_open_x(char *name, char *mode)
{ {
int i; int i;
@ -101,6 +96,11 @@ got_entry:
return 1<<i; 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 vpi_mcd_printf(unsigned int mcd, const char*fmt, ...)
{ {
int i; int i;