V0.9: Fix shadow warnings add -Wshadow and update Makefile.in for SunPro
This patch combines a couple of things from the development patch. It adds the -Wshadow flag and updates all the Makefile.in files to support the gcc or SunPro compiler. It also fixes all the shadow warnings. For the most part this is a copy of few patches from development.
This commit is contained in:
Cary R
Stephen Williams
parent
d165f32113
commit
597c3da220
|
|
@ -77,7 +77,7 @@ PS2PDF = @PS2PDF@
|
|||
GIT = @GIT@
|
||||
|
||||
CPPFLAGS = @DEFS@ -I. -I$(srcdir) @CPPFLAGS@
|
||||
CXXFLAGS = @WARNING_CXXFLAGS@ @CXXFLAGS@
|
||||
CXXFLAGS = @WARNING_FLAGS@ @CXXFLAGS@
|
||||
PICFLAGS = @PICFLAG@
|
||||
LDFLAGS = @rdynamic@ @LDFLAGS@
|
||||
|
||||
|
|
@ -204,13 +204,13 @@ iverilog-vpi: $(srcdir)/iverilog-vpi.sh Makefile
|
|||
endif
|
||||
|
||||
version.exe: $(srcdir)/version.c $(srcdir)/version_base.h version_tag.h
|
||||
$(HOSTCC) -Wall -o version.exe -I. -I$(srcdir) $(srcdir)/version.c
|
||||
$(HOSTCC) @WARNING_FLAGS@ -o version.exe -I. -I$(srcdir) $(srcdir)/version.c
|
||||
|
||||
dep:
|
||||
mkdir dep
|
||||
|
||||
%.o: %.cc config.h
|
||||
$(CXX) $(CPPFLAGS) $(CXXFLAGS) @DEPENDENCY_CPPFLAGS@ -c $< -o $*.o
|
||||
$(CXX) $(CPPFLAGS) $(CXXFLAGS) @DEPENDENCY_FLAG@ -c $< -o $*.o
|
||||
mv $*.d dep/$*.d
|
||||
|
||||
# Here are some explicit dependencies needed to get things going.
|
||||
|
|
|
|||
|
|
@ -38,7 +38,7 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@
|
|||
INSTALL_DATA = @INSTALL_DATA@
|
||||
|
||||
CPPFLAGS = -I$(srcdir) -I$(srcdir)/.. -I.. @CPPFLAGS@ @DEFS@ @PICFLAG@
|
||||
CFLAGS = -Wall @CFLAGS@
|
||||
CFLAGS = @WARNING_FLAGS@ @CFLAGS@
|
||||
LDFLAGS = @LDFLAGS@
|
||||
|
||||
SHARED = @shared@
|
||||
|
|
@ -54,7 +54,7 @@ dep:
|
|||
mkdir dep
|
||||
|
||||
%.o: %.c
|
||||
$(CC) $(CPPFLAGS) $(CFLAGS) -MD -c $<
|
||||
$(CC) $(CPPFLAGS) $(CFLAGS) @DEPENDENCY_FLAG@ -c $<
|
||||
mv $*.d dep
|
||||
|
||||
O = cadpli.o
|
||||
|
|
|
|||
35
configure.in
35
configure.in
|
|
@ -58,12 +58,41 @@ AC_SUBST(EXEEXT)
|
|||
# Combined check for Microsoft-related bogosities; sets WIN32 if found
|
||||
AX_WIN32
|
||||
|
||||
AC_CHECK_DECL(__SUNPRO_C,AC_SUBST(WARNING_CFLAGS,),AC_SUBST(WARNING_CFLAGS,-Wall))
|
||||
# Check to see if we are using the Sun compiler. If so then configure
|
||||
# some of the flags to match the Sun compiler syntax. This is also used
|
||||
# in the aclocal.m4 file to configure the flags used to build and link
|
||||
# dynamic libraries
|
||||
AC_CHECK_DECL(__SUNPRO_C, using_sunpro_c=1, using_sunpro_c=0)
|
||||
if test ${using_sunpro_c} = 1
|
||||
then
|
||||
AC_SUBST(DEPENDENCY_FLAG, [-xMMD])
|
||||
AC_SUBST(WARNING_FLAGS, [""])
|
||||
else
|
||||
AC_SUBST(DEPENDENCY_FLAG, [-MD])
|
||||
AC_SUBST(WARNING_FLAGS, ["-Wall -Wshadow"])
|
||||
fi
|
||||
|
||||
AC_LANG(C++)
|
||||
|
||||
AC_CHECK_DECL(__SUNPRO_CC,AC_SUBST(WARNING_CXXFLAGS,),AC_SUBST(WARNING_CXXFLAGS,-Wall))
|
||||
AC_CHECK_DECL(__SUNPRO_CC,AC_SUBST(DEPENDENCY_CPPFLAGS,-xMD),AC_SUBST(DEPENDENCY_CPPFLAGS,-MD))
|
||||
# Check that we are using either the GNU compilers or the Sun compilers
|
||||
# but not a mixture of the two (not currently supported).
|
||||
AC_CHECK_DECL(__SUNPRO_CC, using_sunpro_cc=1, using_sunpro_cc=0)
|
||||
if test ${using_sunpro_c} = 1
|
||||
then
|
||||
if test ${using_sunpro_cc} = 0
|
||||
then
|
||||
echo "*** Error: No support for mixing GNU and Sun compilers. ***"
|
||||
echo " Using Sun C compiler and GNU C++ compiler.."
|
||||
exit 1
|
||||
fi
|
||||
else
|
||||
if test ${using_sunpro_cc} = 1
|
||||
then
|
||||
echo "*** Error: No support for mixing GNU and Sun compilers. ***"
|
||||
echo " Using GNU C compiler and Sun C++ compiler.."
|
||||
exit 1
|
||||
fi
|
||||
fi
|
||||
|
||||
AC_CHECK_HEADERS(getopt.h inttypes.h libiberty.h iosfwd sys/wait.h)
|
||||
|
||||
|
|
|
|||
|
|
@ -42,7 +42,7 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@
|
|||
INSTALL_DATA = @INSTALL_DATA@
|
||||
|
||||
CPPFLAGS = -I. -I$(srcdir)/.. @CPPFLAGS@ @DEFS@
|
||||
CFLAGS = -Wall @CFLAGS@
|
||||
CFLAGS = @WARNING_FLAGS@ @CFLAGS@
|
||||
LDFLAGS = @LDFLAGS@
|
||||
|
||||
all: iverilog-vpi@EXEEXT@
|
||||
|
|
|
|||
|
|
@ -42,7 +42,7 @@ MAN = @MAN@
|
|||
PS2PDF = @PS2PDF@
|
||||
|
||||
CPPFLAGS = -I. -I.. -I$(srcdir)/.. -I$(srcdir) @CPPFLAGS@ @DEFS@
|
||||
CFLAGS = @WARNING_CFLAGS@ @CFLAGS@
|
||||
CFLAGS = @WARNING_FLAGS@ @CFLAGS@
|
||||
LDFLAGS = @LDFLAGS@
|
||||
|
||||
all: dep iverilog@EXEEXT@ iverilog.man
|
||||
|
|
@ -75,11 +75,11 @@ dep:
|
|||
mkdir dep
|
||||
|
||||
%.o: %.c
|
||||
$(CC) $(CPPFLAGS) $(CFLAGS) -MD -c $< -o $*.o
|
||||
$(CC) $(CPPFLAGS) $(CFLAGS) @DEPENDENCY_FLAG@ -c $< -o $*.o
|
||||
mv $*.d dep
|
||||
|
||||
main.o: main.c globals.h $(srcdir)/../version_base.h ../version_tag.h Makefile
|
||||
$(CC) $(CPPFLAGS) $(CFLAGS) -MD -c -DIVL_ROOT='"@libdir@/ivl$(suffix)"' -DIVL_SUFFIX='"$(suffix)"' -DIVL_INC='"@includedir@"' -DIVL_LIB='"@libdir@"' -DDLLIB='"@DLLIB@"' $(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@"' $(srcdir)/main.c
|
||||
mv $*.d dep
|
||||
|
||||
cflexor.o: cflexor.c cfparse.h
|
||||
|
|
|
|||
12
elab_expr.cc
12
elab_expr.cc
|
|
@ -3534,7 +3534,7 @@ NetExpr*PETernary::elaborate_expr(Design*des, NetScope*scope,
|
|||
verinum cval = tmp->value();
|
||||
ivl_assert(*this, cval.len()==1);
|
||||
|
||||
// Condition is constant TRUE, so we only need the true claue.
|
||||
// Condition is constant TRUE, so we only need the true clause.
|
||||
if (cval.get(0) == verinum::V1) {
|
||||
if (debug_elaborate)
|
||||
cerr << get_fileline() << ": debug: Short-circuit "
|
||||
|
|
@ -3547,8 +3547,9 @@ NetExpr*PETernary::elaborate_expr(Design*des, NetScope*scope,
|
|||
<< " of expression: " << *this << endl;
|
||||
}
|
||||
ivl_assert(*this, use_wid > 0);
|
||||
NetExpr*tmp = elab_and_eval_alternative_(des, scope, tru_, use_wid);
|
||||
return pad_to_width(tmp, use_wid, *this);
|
||||
NetExpr*texpr = elab_and_eval_alternative_(des, scope, tru_,
|
||||
use_wid);
|
||||
return pad_to_width(texpr, use_wid, *this);
|
||||
}
|
||||
|
||||
// Condition is constant FALSE, so we only need the
|
||||
|
|
@ -3565,8 +3566,9 @@ NetExpr*PETernary::elaborate_expr(Design*des, NetScope*scope,
|
|||
<< " of expression: " << *this << endl;
|
||||
}
|
||||
ivl_assert(*this, use_wid > 0);
|
||||
NetExpr*tmp = elab_and_eval_alternative_(des, scope, fal_, use_wid);
|
||||
return pad_to_width(tmp, use_wid, *this);
|
||||
NetExpr*texpr = elab_and_eval_alternative_(des, scope, fal_,
|
||||
use_wid);
|
||||
return pad_to_width(texpr, use_wid, *this);
|
||||
}
|
||||
|
||||
// X and Z conditions need to blend both results, so we
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
/*
|
||||
* Copyright (c) 2000-2009 Stephen Williams (steve@icarus.com)
|
||||
* Copyright (c) 2000-2010 Stephen Williams (steve@icarus.com)
|
||||
*
|
||||
* This source code is free software; you can redistribute it
|
||||
* and/or modify it in source code form under the terms of the GNU
|
||||
|
|
@ -563,10 +563,10 @@ bool PGenerate::generate_scope_loop_(Design*des, NetScope*container)
|
|||
{
|
||||
// Check that the loop_index variable was declared in a
|
||||
// genvar statement.
|
||||
NetScope*scope = container;
|
||||
while (scope && !scope->find_genvar(loop_index))
|
||||
scope = scope->parent();
|
||||
if (!scope) {
|
||||
NetScope*cscope = container;
|
||||
while (cscope && !cscope->find_genvar(loop_index))
|
||||
cscope = cscope->parent();
|
||||
if (!cscope) {
|
||||
cerr << get_fileline() << ": error: genvar is missing for "
|
||||
"generate \"loop\" variable '" << loop_index << "'."
|
||||
<< endl;
|
||||
|
|
|
|||
14
elaborate.cc
14
elaborate.cc
|
|
@ -1,5 +1,5 @@
|
|||
/*
|
||||
* Copyright (c) 1998-2009 Stephen Williams (steve@icarus.com)
|
||||
* Copyright (c) 1998-2010 Stephen Williams (steve@icarus.com)
|
||||
*
|
||||
* This source code is free software; you can redistribute it
|
||||
* and/or modify it in source code form under the terms of the GNU
|
||||
|
|
@ -1398,12 +1398,12 @@ void PGModule::elaborate_mod_(Design*des, Module*rmod, NetScope*scope) const
|
|||
continue;
|
||||
}
|
||||
prts_vector_width = sig->vector_width();
|
||||
for (unsigned idx = 0; idx < prts.size(); idx += 1) {
|
||||
prts[idx]->port_type(NetNet::NOT_A_PORT);
|
||||
prts[idx] = cast_to_int(des, scope, prts[idx],
|
||||
prts_vector_width /
|
||||
instance.size());
|
||||
prts[idx]->port_type(NetNet::POUTPUT);
|
||||
for (unsigned pidx = 0; pidx < prts.size(); pidx += 1) {
|
||||
prts[pidx]->port_type(NetNet::NOT_A_PORT);
|
||||
prts[pidx] = cast_to_int(des, scope, prts[idx],
|
||||
prts_vector_width /
|
||||
instance.size());
|
||||
prts[pidx]->port_type(NetNet::POUTPUT);
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
/*
|
||||
* Copyright (c) 1999-2009 Stephen Williams (steve@icarus.com)
|
||||
* Copyright (c) 1999-2010 Stephen Williams (steve@icarus.com)
|
||||
*
|
||||
* This source code is free software; you can redistribute it
|
||||
* and/or modify it in source code form under the terms of the GNU
|
||||
|
|
@ -723,7 +723,7 @@ NetNet* NetEBShift::synthesize(Design*des, NetScope*scope, NetExpr*root)
|
|||
NetNet* NetEConcat::synthesize(Design*des, NetScope*scope, NetExpr*root)
|
||||
{
|
||||
/* First, synthesize the operands. */
|
||||
unsigned nparms = parms_.count();
|
||||
unsigned num_parms = parms_.count();
|
||||
NetNet**tmp = new NetNet*[parms_.count()];
|
||||
bool flag = true;
|
||||
ivl_variable_type_t data_type = IVL_VT_NO_TYPE;
|
||||
|
|
@ -732,7 +732,7 @@ NetNet* NetEConcat::synthesize(Design*des, NetScope*scope, NetExpr*root)
|
|||
/* We need to synthesize a replication of zero. */
|
||||
tmp[idx] = parms_[idx]->synthesize(des, scope, root);
|
||||
assert(tmp[idx] == 0);
|
||||
nparms -= 1;
|
||||
num_parms -= 1;
|
||||
} else {
|
||||
tmp[idx] = parms_[idx]->synthesize(des, scope, root);
|
||||
if (tmp[idx] == 0) flag = false;
|
||||
|
|
@ -758,7 +758,7 @@ NetNet* NetEConcat::synthesize(Design*des, NetScope*scope, NetExpr*root)
|
|||
|
||||
NetConcat*concat = new NetConcat(scope, scope->local_symbol(),
|
||||
osig->vector_width(),
|
||||
nparms * repeat());
|
||||
num_parms * repeat());
|
||||
concat->set_line(*this);
|
||||
des->add_node(concat);
|
||||
connect(concat->pin(0), osig->pin(0));
|
||||
|
|
|
|||
|
|
@ -38,7 +38,7 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@
|
|||
INSTALL_DATA = @INSTALL_DATA@
|
||||
|
||||
CPPFLAGS = -I. -I.. -I$(srcdir)/.. -I$(srcdir) @CPPFLAGS@ @DEFS@
|
||||
CFLAGS = -Wall @CFLAGS@
|
||||
CFLAGS = @WARNING_FLAGS@ @CFLAGS@
|
||||
LDFLAGS = @LDFLAGS@
|
||||
|
||||
all: ivlpp@EXEEXT@
|
||||
|
|
|
|||
|
|
@ -36,7 +36,7 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@
|
|||
INSTALL_DATA = @INSTALL_DATA@
|
||||
|
||||
CPPFLAGS = -I. -I.. -I$(srcdir) -I$(srcdir)/.. @CPPFLAGS@ @DEFS@ @PICFLAG@
|
||||
CFLAGS = -Wall @CFLAGS@
|
||||
CFLAGS = @WARNING_FLAGS@ @CFLAGS@
|
||||
LDFLAGS = @LDFLAGS@
|
||||
RANLIB = @RANLIB@
|
||||
|
||||
|
|
@ -79,7 +79,7 @@ dep:
|
|||
mkdir dep
|
||||
|
||||
%.o: %.c config.h
|
||||
$(CC) $(CPPFLAGS) $(CFLAGS) -MD -c $< -o $*.o
|
||||
$(CC) $(CPPFLAGS) $(CFLAGS) @DEPENDENCY_FLAG@ -c $< -o $*.o
|
||||
mv $*.d dep
|
||||
|
||||
|
||||
|
|
|
|||
11
net_func.cc
11
net_func.cc
|
|
@ -1,5 +1,5 @@
|
|||
/*
|
||||
* Copyright (c) 2002-2004 Stephen Williams (steve@icarus.com)
|
||||
* Copyright (c) 2002-2010 Stephen Williams (steve@icarus.com)
|
||||
*
|
||||
* This source code is free software; you can redistribute it
|
||||
* and/or modify it in source code form under the terms of the GNU
|
||||
|
|
@ -29,9 +29,10 @@
|
|||
* which accounts for all the inputs, plus one for the phantom output
|
||||
* that is the result.
|
||||
*/
|
||||
NetUserFunc::NetUserFunc(NetScope*s, perm_string n, NetScope*d, NetEvWait*trigger)
|
||||
NetUserFunc::NetUserFunc(NetScope*s, perm_string n, NetScope*d,
|
||||
NetEvWait*trigger__)
|
||||
: NetNode(s, n, d->func_def()->port_count()+1),
|
||||
def_(d), trigger_(trigger)
|
||||
def_(d), trigger_(trigger__)
|
||||
{
|
||||
pin(0).set_dir(Link::OUTPUT);
|
||||
|
||||
|
|
@ -128,8 +129,8 @@ bool PECallFunction::check_call_matches_definition_(Design*des, NetScope*dscope)
|
|||
|
||||
NetSysFunc::NetSysFunc(NetScope*s, perm_string n,
|
||||
const struct sfunc_return_type*def,
|
||||
unsigned ports, NetEvWait*trigger)
|
||||
: NetNode(s, n, ports), def_(def), trigger_(trigger)
|
||||
unsigned ports, NetEvWait*trigger__)
|
||||
: NetNode(s, n, ports), def_(def), trigger_(trigger__)
|
||||
{
|
||||
pin(0).set_dir(Link::OUTPUT); // Q
|
||||
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
/*
|
||||
* Copyright (c) 1998-2009 Stephen Williams (steve@icarus.com)
|
||||
* Copyright (c) 1998-2010 Stephen Williams (steve@icarus.com)
|
||||
*
|
||||
* This source code is free software; you can redistribute it
|
||||
* and/or modify it in source code form under the terms of the GNU
|
||||
|
|
@ -904,9 +904,9 @@ NetPartSelect::NetPartSelect(NetNet*sig, unsigned off, unsigned wid,
|
|||
}
|
||||
|
||||
NetPartSelect::NetPartSelect(NetNet*sig, NetNet*sel,
|
||||
unsigned wid, bool signed_flag)
|
||||
unsigned wid, bool signed_flag__)
|
||||
: NetNode(sig->scope(), sig->scope()->local_symbol(), 3),
|
||||
off_(0), wid_(wid), dir_(VP), signed_flag_(signed_flag)
|
||||
off_(0), wid_(wid), dir_(VP), signed_flag_(signed_flag__)
|
||||
{
|
||||
switch (dir_) {
|
||||
case NetPartSelect::VP:
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
#ifndef __netlist_H
|
||||
#define __netlist_H
|
||||
/*
|
||||
* Copyright (c) 1998-2009 Stephen Williams (steve@icarus.com)
|
||||
* Copyright (c) 1998-2010 Stephen Williams (steve@icarus.com)
|
||||
*
|
||||
* This source code is free software; you can redistribute it
|
||||
* and/or modify it in source code form under the terms of the GNU
|
||||
|
|
@ -1474,7 +1474,7 @@ class NetReplicate : public NetNode {
|
|||
class NetUserFunc : public NetNode {
|
||||
|
||||
public:
|
||||
NetUserFunc(NetScope*s, perm_string n, NetScope*def, NetEvWait*trigger);
|
||||
NetUserFunc(NetScope*s, perm_string n, NetScope*def, NetEvWait*trigger__);
|
||||
~NetUserFunc();
|
||||
|
||||
ivl_variable_type_t data_type(unsigned port) const;
|
||||
|
|
@ -1501,7 +1501,7 @@ class NetSysFunc : public NetNode {
|
|||
public:
|
||||
NetSysFunc(NetScope*s, perm_string n,
|
||||
const struct sfunc_return_type*def,
|
||||
unsigned ports, NetEvWait*trigger);
|
||||
unsigned ports, NetEvWait*trigger__);
|
||||
~NetSysFunc();
|
||||
|
||||
ivl_variable_type_t data_type() const;
|
||||
|
|
@ -1800,7 +1800,7 @@ class NetPartSelect : public NetNode {
|
|||
explicit NetPartSelect(NetNet*sig,
|
||||
unsigned off, unsigned wid, dir_t dir);
|
||||
explicit NetPartSelect(NetNet*sig, NetNet*sel,
|
||||
unsigned wid, bool signed_flag = false);
|
||||
unsigned wid, bool signed_flag__ = false);
|
||||
~NetPartSelect();
|
||||
|
||||
unsigned base() const;
|
||||
|
|
|
|||
9
pform.cc
9
pform.cc
|
|
@ -324,7 +324,6 @@ void pform_set_timescale(int unit, int prec,
|
|||
<< "confusing timing results. Affected modules are:"
|
||||
<< endl;
|
||||
|
||||
map<perm_string,Module*>::iterator mod;
|
||||
for (mod = pform_modules.begin()
|
||||
; mod != pform_modules.end() ; mod++) {
|
||||
Module*mp = (*mod).second;
|
||||
|
|
@ -467,14 +466,14 @@ void pform_module_set_ports(vector<Module::port_t*>*ports)
|
|||
}
|
||||
}
|
||||
|
||||
void pform_endmodule(const char*name, bool in_celldefine,
|
||||
Module::UCDriveType uc_drive)
|
||||
void pform_endmodule(const char*name, bool inside_celldefine,
|
||||
Module::UCDriveType uc_drive_def)
|
||||
{
|
||||
assert(pform_cur_module);
|
||||
perm_string mod_name = pform_cur_module->mod_name();
|
||||
assert(strcmp(name, mod_name) == 0);
|
||||
pform_cur_module->is_cell = in_celldefine;
|
||||
pform_cur_module->uc_drive = uc_drive;
|
||||
pform_cur_module->is_cell = inside_celldefine;
|
||||
pform_cur_module->uc_drive = uc_drive_def;
|
||||
|
||||
map<perm_string,Module*>::const_iterator test =
|
||||
pform_modules.find(mod_name);
|
||||
|
|
|
|||
4
pform.h
4
pform.h
|
|
@ -159,8 +159,8 @@ extern void pform_module_define_port(const struct vlltype&li,
|
|||
extern Module::port_t* pform_module_port_reference(perm_string name,
|
||||
const char*file,
|
||||
unsigned lineno);
|
||||
extern void pform_endmodule(const char*, bool in_celldefine,
|
||||
Module::UCDriveType uc_drive);
|
||||
extern void pform_endmodule(const char*, bool inside_celldefine,
|
||||
Module::UCDriveType uc_drive_def);
|
||||
|
||||
extern void pform_make_udp(perm_string name, list<perm_string>*parms,
|
||||
svector<PWire*>*decl, list<string>*table,
|
||||
|
|
|
|||
|
|
@ -39,7 +39,7 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@
|
|||
INSTALL_DATA = @INSTALL_DATA@
|
||||
|
||||
CPPFLAGS = -I.. -I$(srcdir) -I$(srcdir)/.. @CPPFLAGS@ @DEFS@ @PICFLAG@
|
||||
CFLAGS = -Wall @CFLAGS@
|
||||
CFLAGS = @WARNING_FLAGS@ @CFLAGS@
|
||||
LDFLAGS = @LDFLAGS@
|
||||
|
||||
all: dep fpga.tgt
|
||||
|
|
@ -48,7 +48,7 @@ dep:
|
|||
mkdir dep
|
||||
|
||||
%.o: %.c
|
||||
$(CC) $(CPPFLAGS) $(CFLAGS) -MD -c $< -o $*.o
|
||||
$(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
|
||||
|
|
|
|||
|
|
@ -35,7 +35,7 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@
|
|||
INSTALL_DATA = @INSTALL_DATA@
|
||||
|
||||
CPPFLAGS = -I.. -I$(srcdir)/.. -I$(srcdir) @CPPFLAGS@ @DEFS@ @PICFLAG@
|
||||
CFLAGS = -Wall @CFLAGS@
|
||||
CFLAGS = @WARNING_FLAGS@ @CFLAGS@
|
||||
LDFLAGS = @LDFLAGS@
|
||||
|
||||
all: dep null.tgt
|
||||
|
|
@ -46,7 +46,7 @@ dep:
|
|||
mkdir dep
|
||||
|
||||
%.o: %.c
|
||||
$(CC) $(CPPFLAGS) $(CFLAGS) -MD -c $< -o $*.o
|
||||
$(CC) $(CPPFLAGS) $(CFLAGS) @DEPENDENCY_FLAG@ -c $< -o $*.o
|
||||
mv $*.d dep
|
||||
|
||||
O = null.o
|
||||
|
|
|
|||
|
|
@ -34,7 +34,7 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@
|
|||
INSTALL_DATA = @INSTALL_DATA@
|
||||
|
||||
CPPFLAGS = -I$(srcdir)/.. @CPPFLAGS@ @DEFS@ @PICFLAG@
|
||||
CFLAGS = -Wall @CFLAGS@
|
||||
CFLAGS = @WARNING_FLAGS@ @CFLAGS@
|
||||
LDFLAGS = @LDFLAGS@
|
||||
|
||||
all: dep pal.tgt
|
||||
|
|
@ -43,7 +43,7 @@ dep:
|
|||
mkdir dep
|
||||
|
||||
%.o: %.c
|
||||
$(CC) $(CPPFLAGS) $(CFLAGS) -MD -c $< -o $*.o
|
||||
$(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
|
||||
|
|
|
|||
|
|
@ -36,7 +36,7 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@
|
|||
INSTALL_DATA = @INSTALL_DATA@
|
||||
|
||||
CPPFLAGS = -I.. -I$(srcdir)/.. @CPPFLAGS@ @DEFS@ @PICFLAG@
|
||||
CFLAGS = -Wall @CFLAGS@
|
||||
CFLAGS = @WARNING_FLAGS@ @CFLAGS@
|
||||
LDFLAGS = @LDFLAGS@
|
||||
|
||||
all: dep stub.tgt
|
||||
|
|
@ -47,7 +47,7 @@ dep:
|
|||
mkdir dep
|
||||
|
||||
%.o: %.c
|
||||
$(CC) $(CPPFLAGS) $(CFLAGS) -MD -c $< -o $*.o
|
||||
$(CC) $(CPPFLAGS) $(CFLAGS) @DEPENDENCY_FLAG@ -c $< -o $*.o
|
||||
mv $*.d dep
|
||||
|
||||
O = stub.o expression.o statement.o switches.o
|
||||
|
|
|
|||
|
|
@ -37,7 +37,7 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@
|
|||
INSTALL_DATA = @INSTALL_DATA@
|
||||
|
||||
CPPFLAGS = -I. -I.. -I$(srcdir)/.. @CPPFLAGS@ @DEFS@ @PICFLAG@
|
||||
CXXFLAGS = -Wall @CXXFLAGS@
|
||||
CXXFLAGS = @WARNING_FLAGS@ @CXXFLAGS@
|
||||
LDFLAGS = @LDFLAGS@
|
||||
|
||||
all: dep vhdl.tgt vhdl.conf vhdl-s.conf
|
||||
|
|
@ -46,7 +46,7 @@ dep:
|
|||
mkdir dep
|
||||
|
||||
%.o: %.cc vhdl_config.h
|
||||
$(CXX) $(CPPFLAGS) $(CXXFLAGS) -MD -c $< -o $*.o
|
||||
$(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 \
|
||||
|
|
|
|||
|
|
@ -39,7 +39,7 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@
|
|||
INSTALL_DATA = @INSTALL_DATA@
|
||||
|
||||
CPPFLAGS = -I. -I.. -I$(srcdir)/.. @CPPFLAGS@ @DEFS@ @PICFLAG@
|
||||
CFLAGS = -Wall @CFLAGS@
|
||||
CFLAGS = @WARNING_FLAGS@ @CFLAGS@
|
||||
LDFLAGS = @LDFLAGS@
|
||||
|
||||
all: dep vvp.tgt vvp.conf vvp-s.conf
|
||||
|
|
@ -48,7 +48,7 @@ dep:
|
|||
mkdir dep
|
||||
|
||||
%.o: %.c vvp_config.h
|
||||
$(CC) $(CPPFLAGS) $(CFLAGS) -MD -c $< -o $*.o
|
||||
$(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 \
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
/*
|
||||
* Copyright (c) 2003-2009 Stephen Williams (steve@icarus.com)
|
||||
* Copyright (c) 2003-2010 Stephen Williams (steve@icarus.com)
|
||||
*
|
||||
* This source code is free software; you can redistribute it
|
||||
* and/or modify it in source code form under the terms of the GNU
|
||||
|
|
@ -538,7 +538,6 @@ int draw_eval_real(ivl_expr_t expr)
|
|||
* division to work correctly. */
|
||||
if (ivl_expr_value(expr) != IVL_VT_REAL) {
|
||||
struct vector_info vi;
|
||||
int res;
|
||||
const char*sign_flag;
|
||||
|
||||
vi = draw_eval_expr(expr, STUFF_OK_XZ);
|
||||
|
|
|
|||
|
|
@ -40,7 +40,7 @@ LEX = @LEX@
|
|||
YACC = @YACC@
|
||||
|
||||
CPPFLAGS = -I. -I$(srcdir)/.. -I$(srcdir) -I.. @file64_support@ @CPPFLAGS@ @DEFS@ @PICFLAG@
|
||||
CFLAGS = -Wall @CFLAGS@
|
||||
CFLAGS = @WARNING_FLAGS@ @CFLAGS@
|
||||
LDFLAGS = @LDFLAGS@
|
||||
|
||||
all: dep system.vpi va_math.vpi v2005_math.vpi $(ALL32)
|
||||
|
|
@ -51,7 +51,7 @@ dep:
|
|||
mkdir dep
|
||||
|
||||
%.o: %.c vpi_config.h
|
||||
$(CC) $(CPPFLAGS) $(CFLAGS) -MD -c $< -o $*.o
|
||||
$(CC) $(CPPFLAGS) $(CFLAGS) @DEPENDENCY_FLAG@ -c $< -o $*.o
|
||||
mv $*.d dep
|
||||
|
||||
# Object files for system.vpi
|
||||
|
|
|
|||
|
|
@ -553,8 +553,8 @@ static void scan_item(unsigned depth, vpiHandle item, int skip)
|
|||
/* Turn a non-constant array word select into a
|
||||
* constant word select. */
|
||||
vpiHandle array = vpi_handle(vpiParent, item);
|
||||
PLI_INT32 index = vpi_get(vpiIndex, item);
|
||||
item = vpi_handle_by_index(array, index);
|
||||
PLI_INT32 idx = vpi_get(vpiIndex, item);
|
||||
item = vpi_handle_by_index(array, idx);
|
||||
}
|
||||
case vpiIntegerVar:
|
||||
case vpiTimeVar:
|
||||
|
|
|
|||
|
|
@ -564,8 +564,8 @@ static void scan_item(unsigned depth, vpiHandle item, int skip)
|
|||
/* Turn a non-constant array word select into a
|
||||
* constant word select. */
|
||||
vpiHandle array = vpi_handle(vpiParent, item);
|
||||
PLI_INT32 index = vpi_get(vpiIndex, item);
|
||||
item = vpi_handle_by_index(array, index);
|
||||
PLI_INT32 idx = vpi_get(vpiIndex, item);
|
||||
item = vpi_handle_by_index(array, idx);
|
||||
}
|
||||
case vpiIntegerVar:
|
||||
case vpiTimeVar:
|
||||
|
|
|
|||
|
|
@ -572,8 +572,8 @@ static void scan_item(unsigned depth, vpiHandle item, int skip)
|
|||
* word select. */
|
||||
if (vpi_get(vpiConstantSelect, item) == 0) {
|
||||
vpiHandle array = vpi_handle(vpiParent, item);
|
||||
PLI_INT32 index = vpi_get(vpiIndex, item);
|
||||
item = vpi_handle_by_index(array, index);
|
||||
PLI_INT32 idx = vpi_get(vpiIndex, item);
|
||||
item = vpi_handle_by_index(array, idx);
|
||||
}
|
||||
|
||||
/* An array word is implicitly escaped so look for an
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
#ifndef __vpi_user_H
|
||||
#define __vpi_user_H
|
||||
/*
|
||||
* Copyright (c) 1999-2009 Stephen Williams (steve@icarus.com)
|
||||
* Copyright (c) 1999-2010 Stephen Williams (steve@icarus.com)
|
||||
*
|
||||
* This source code is free software; you can redistribute it
|
||||
* and/or modify it in source code form under the terms of the GNU
|
||||
|
|
@ -483,7 +483,7 @@ extern void vpi_sim_control(PLI_INT32 operation, ...);
|
|||
extern vpiHandle vpi_handle(PLI_INT32 type, vpiHandle ref);
|
||||
extern vpiHandle vpi_iterate(PLI_INT32 type, vpiHandle ref);
|
||||
extern vpiHandle vpi_scan(vpiHandle iter);
|
||||
extern vpiHandle vpi_handle_by_index(vpiHandle ref, PLI_INT32 index);
|
||||
extern vpiHandle vpi_handle_by_index(vpiHandle ref, PLI_INT32 idx);
|
||||
extern vpiHandle vpi_handle_by_name(const char*name, vpiHandle scope);
|
||||
|
||||
extern void vpi_get_time(vpiHandle obj, s_vpi_time*t);
|
||||
|
|
|
|||
|
|
@ -46,8 +46,8 @@ MAN = @MAN@
|
|||
PS2PDF = @PS2PDF@
|
||||
|
||||
CPPFLAGS = -I. -I.. -I $(srcdir) -I$(srcdir)/.. @CPPFLAGS@ @DEFS@
|
||||
CFLAGS = -Wall @CFLAGS@
|
||||
CXXFLAGS = -Wall @CXXFLAGS@
|
||||
CFLAGS = @WARNING_FLAGS@ @CFLAGS@
|
||||
CXXFLAGS = @WARNING_FLAGS@ @CXXFLAGS@
|
||||
LDFLAGS = @rdynamic@ @LDFLAGS@
|
||||
LIBS = @LIBS@ @EXTRALIBS@
|
||||
|
||||
|
|
@ -121,15 +121,15 @@ dep:
|
|||
mkdir dep
|
||||
|
||||
%.o: %.cc config.h
|
||||
$(CXX) $(CPPFLAGS) -DIVL_SUFFIX='"$(suffix)"' $(MDIR1) $(MDIR2) $(CXXFLAGS) -MD -c $< -o $*.o
|
||||
$(CXX) $(CPPFLAGS) -DIVL_SUFFIX='"$(suffix)"' $(MDIR1) $(MDIR2) $(CXXFLAGS) @DEPENDENCY_FLAG@ -c $< -o $*.o
|
||||
mv $*.d dep/$*.d
|
||||
|
||||
%.o: %.c config.h
|
||||
$(CC) $(CPPFLAGS) $(MDIR1) $(MDIR2) $(CFLAGS) -MD -c $< -o $*.o
|
||||
$(CC) $(CPPFLAGS) $(MDIR1) $(MDIR2) $(CFLAGS) @DEPENDENCY_FLAG@ -c $< -o $*.o
|
||||
mv $*.d dep/$*.d
|
||||
|
||||
tables.cc: $(srcdir)/draw_tt.c
|
||||
$(HOSTCC) -Wall -o draw_tt $(srcdir)/draw_tt.c
|
||||
$(HOSTCC) @WARNING_FLAGS@ -o draw_tt $(srcdir)/draw_tt.c
|
||||
./draw_tt > tables.cc
|
||||
rm draw_tt@EXEEXT@
|
||||
|
||||
|
|
|
|||
|
|
@ -1655,9 +1655,9 @@ void memory_delete(vpiHandle item)
|
|||
} else {
|
||||
assert(arr->nets[idx]->vpi_type->type_code ==
|
||||
vpiRealVar);
|
||||
struct __vpiRealVar *sig = (struct __vpiRealVar *)
|
||||
arr->nets[idx];
|
||||
constant_delete(sig->id.index);
|
||||
struct __vpiRealVar *sigr = (struct __vpiRealVar *)
|
||||
arr->nets[idx];
|
||||
constant_delete(sigr->id.index);
|
||||
// Why are only the real words still here?
|
||||
free(arr->nets[idx]);
|
||||
}
|
||||
|
|
|
|||
Loading…
Reference in New Issue