Compilation warnings.
This commit is contained in:
parent
dde69cebb6
commit
7413c533f6
|
|
@ -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
|
||||||
*/
|
*/
|
||||||
#ifdef HAVE_CVS_IDENT
|
#ifdef HAVE_CVS_IDENT
|
||||||
#ident "$Id: net_nex_output.cc,v 1.11.2.6 2006/06/01 03:01:48 steve Exp $"
|
#ident "$Id: net_nex_output.cc,v 1.11.2.7 2006/06/02 23:42:48 steve Exp $"
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
# include "config.h"
|
# include "config.h"
|
||||||
|
|
@ -76,8 +76,8 @@ void NetAssignBase::nex_output(NexusSet&out)
|
||||||
/* The address is constant, so simply
|
/* The address is constant, so simply
|
||||||
connect to the right pins and we are
|
connect to the right pins and we are
|
||||||
done. */
|
done. */
|
||||||
long adr= ae->value().as_long();
|
long adr_s = ae->value().as_long();
|
||||||
adr = lmem->index_to_address(adr) * lmem->width();
|
unsigned adr = lmem->index_to_address(adr_s) * lmem->width();
|
||||||
|
|
||||||
if (adr >= lmem->count()*lmem->width()) {
|
if (adr >= lmem->count()*lmem->width()) {
|
||||||
/* Skip assignments with constant
|
/* Skip assignments with constant
|
||||||
|
|
@ -168,6 +168,9 @@ void NetWhile::nex_output(NexusSet&out)
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* $Log: net_nex_output.cc,v $
|
* $Log: net_nex_output.cc,v $
|
||||||
|
* Revision 1.11.2.7 2006/06/02 23:42:48 steve
|
||||||
|
* Compilation warnings.
|
||||||
|
*
|
||||||
* Revision 1.11.2.6 2006/06/01 03:01:48 steve
|
* Revision 1.11.2.6 2006/06/01 03:01:48 steve
|
||||||
* Handle condit clauses with unassigned outputs.
|
* Handle condit clauses with unassigned outputs.
|
||||||
*
|
*
|
||||||
|
|
|
||||||
13
synth2.cc
13
synth2.cc
|
|
@ -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
|
||||||
*/
|
*/
|
||||||
#ifdef HAVE_CVS_IDENT
|
#ifdef HAVE_CVS_IDENT
|
||||||
#ident "$Id: synth2.cc,v 1.39.2.33 2006/06/01 03:01:48 steve Exp $"
|
#ident "$Id: synth2.cc,v 1.39.2.34 2006/06/02 23:42:48 steve Exp $"
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
# include "config.h"
|
# include "config.h"
|
||||||
|
|
@ -256,17 +256,17 @@ bool NetAssignBase::synth_async_mem_sync_(Design*des, NetScope*scope,
|
||||||
/* Handle the special case that the mux expression is
|
/* Handle the special case that the mux expression is
|
||||||
constant. In this case, just hook up the pertinent bits. */
|
constant. In this case, just hook up the pertinent bits. */
|
||||||
if (NetEConst*ae = dynamic_cast<NetEConst*>(cur->bmux())) {
|
if (NetEConst*ae = dynamic_cast<NetEConst*>(cur->bmux())) {
|
||||||
long adr= ae->value().as_long();
|
long adr_s = ae->value().as_long();
|
||||||
if (adr >= lmem->count()) {
|
if (adr_s >= (long)lmem->count()) {
|
||||||
cerr << get_line() << ": error: "
|
cerr << get_line() << ": error: "
|
||||||
<< "Address " << adr
|
<< "Address " << adr_s
|
||||||
<< " is outside range of memory."
|
<< " is outside range of memory."
|
||||||
<< " Skipping assignment." << endl;
|
<< " Skipping assignment." << endl;
|
||||||
des->errors += 1;
|
des->errors += 1;
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
|
||||||
adr = lmem->index_to_address(adr) * lmem->width();
|
unsigned adr = lmem->index_to_address(adr_s) * lmem->width();
|
||||||
for (unsigned idx = 0 ; idx < cur->lwidth() ; idx += 1) {
|
for (unsigned idx = 0 ; idx < cur->lwidth() ; idx += 1) {
|
||||||
unsigned off = adr+idx;
|
unsigned off = adr+idx;
|
||||||
unsigned ptr = find_nexus_in_set(nex_map, msig->pin(off).nexus());
|
unsigned ptr = find_nexus_in_set(nex_map, msig->pin(off).nexus());
|
||||||
|
|
@ -1926,6 +1926,9 @@ void synth2(Design*des)
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* $Log: synth2.cc,v $
|
* $Log: synth2.cc,v $
|
||||||
|
* Revision 1.39.2.34 2006/06/02 23:42:48 steve
|
||||||
|
* Compilation warnings.
|
||||||
|
*
|
||||||
* Revision 1.39.2.33 2006/06/01 03:01:48 steve
|
* Revision 1.39.2.33 2006/06/01 03:01:48 steve
|
||||||
* Handle condit clauses with unassigned outputs.
|
* Handle condit clauses with unassigned outputs.
|
||||||
*
|
*
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue