fragmented channel may not be fully utilized; more user input validation

Author: rmanohar

channel.cc

@@ -40,6 +40,7 @@ static void _hse_record_ids (act_channel_state *ch,
  if (!b) {
  int off;
  int type;
+ bool found;
 
  b = ihash_add (ch->fH, (long)ac);
 
@@ -73,18 +74,29 @@ static void _hse_record_ids (act_channel_state *ch,
  ntmp = newtmp;
  }
 
- off = sc->getLocalOffset (ntmp, mysi, &type);
- Assert (type == 0, "HSE in channel has non-boolean ops?");
- if (myc != c && (off < 0 && ((-off) & 1))) {
+ if (sc->hasLocalOffset (ntmp, mysi)) {
+ off = sc->getLocalOffset (ntmp, mysi, &type);
+ found = true;
+ }
+ else {
+ found = false;
+ }
+ Assert (!found || type == 0, "HSE in channel has non-boolean ops?");
+ if (found && (myc != c && (off < 0 && ((-off) & 1)))) {
  stateinfo_t *saved = sc->cursi();
  sc->setsi (mysi);
  off = myc->getGlobalOffset (off, 0);
  b->i = off;
  sc->setsi (saved);
  }
  else {
- off = myc->getGlobalOffset (off, 0);
- b->i = off;
+ if (found) {
+off = myc->getGlobalOffset (off, 0);
+b->i = off;
+ }
+ else {
+b->i = -1;
+ }
  }
 
  if (ntmp != ch_name) {
@@ -448,36 +460,38 @@ int ChanMethods::runMethod (ActSimCore *sim,
 fatal_error ("%s: Internal error running method %d", ch->ct->getName(),
  idx);
  }
- v = ch->_dummy->getBool (b->i);
- if (_ops[idx].op[from].type == CHAN_OP_BOOL_T) {
-if (v != 1) {
+ if (b->i != -1) {
+v = ch->_dummy->getBool (b->i);
+if (_ops[idx].op[from].type == CHAN_OP_BOOL_T) {
+ if (v != 1) {
 #ifdef DUMP_ALL
- printf ("nm:g#%d := 1\n", b->i);
-#endif 
- ch->_dummy->setBool (b->i, 1);
- v = -1;
+ printf ("nm:g#%d := 1\n", b->i);
+#endif
+ ch->_dummy->setBool (b->i, 1);
+ v = -1;
+ }
 }
- }
- else {
-if (v != 0) {
- ch->_dummy->setBool (b->i, 0);
+else {
+ if (v != 0) {
+ ch->_dummy->setBool (b->i, 0);
 #ifdef DUMP_ALL
- printf ("nm:g#%d := 0\n", b->i);
+  printf ("nm:g#%d := 0\n", b->i);
 #endif 
- v = -1;
+ v = -1;
+ }
 }
- }
- if (v == -1) {
-const ActSim::watchpt_bucket *nm;
-if ((nm = sim->chkWatchPt (0, b->i))) {
- BigInt tmpv;
- ch->_dummy->msgPrefix ();
- printf (" %s := %c\n", nm->s, _ops[idx].op[from].type == CHAN_OP_BOOL_T ?
- '1' : '0');
- tmpv = (_ops[idx].op[from].type == CHAN_OP_BOOL_T ? 1 : 0);
- sim->recordTrace (nm, 0, ACT_CHAN_IDLE, tmpv);
+if (v == -1) {
+ const ActSim::watchpt_bucket *nm;
+ if ((nm = sim->chkWatchPt (0, b->i))) {
+ BigInt tmpv;
+ ch->_dummy->msgPrefix ();
+ printf (" %s := %c\n", nm->s, _ops[idx].op[from].type == CHAN_OP_BOOL_T ?
+ '1' : '0');
+ tmpv = (_ops[idx].op[from].type == CHAN_OP_BOOL_T ? 1 : 0);
+ sim->recordTrace (nm, 0, ACT_CHAN_IDLE, tmpv);
+ }
+ ch->_dummy->boolProp (b->i);
 }
-ch->_dummy->boolProp (b->i);
  }
  from++;
  break;

chpsim.cc

@@ -2960,16 +2960,26 @@ BigInt ChpSim::exprEval (Expr *e)
  c = xid->Canonical (_frag_ch->ct->CurScope());
  b = ihash_lookup (_frag_ch->fH, (long)c);
  Assert (b, "Error during channel registration");
- l.setWidth (1);
- l.setVal (0, _sc->getBool (b->i));
- if (_sc->getBool (b->i) == 2) {
- ActId *tid;
- msgPrefix ();
+ if (b->i < 0) {
+ msgPrefix();
  printf ("CHP model: Boolean variable `");
- tid = c->toid();
- tid->Print (stdout);
- delete tid;
- printf ("' is X\n");
+ xid->Print (stdout);
+ printf ("' was optimized out; treating as 0.\n");
+ l.setWidth (1);
+ l.setVal (0, 0);
+ }
+ else {
+ l.setWidth (1);
+ l.setVal (0, _sc->getBool (b->i));
+ if (_sc->getBool (b->i) == 2) {
+ ActId *tid;
+ msgPrefix ();
+ printf ("CHP model: Boolean variable `");
+ tid = c->toid();
+ tid->Print (stdout);
+ delete tid;
+ printf ("' is X\n");
+ }
  }
 }
  }

core.cc

@@ -1825,7 +1825,8 @@ int ActSimCore::getLocalOffset (act_connection *c, stateinfo_t *si, int *type,
 
 int ActSimCore::hasLocalOffset (ActId *id, stateinfo_t *si)
 {
- act_connection *c = id->Canonical (si->bnl->cur);
+ act_connection *c = id->Canonical (si->bnl->cur, true);
+ if (!c) return 0;
  return hasLocalOffset (c, si);
 }
 
@@ -1882,7 +1883,14 @@ int ActSimCore::getLocalOffset (ActId *id, stateinfo_t *si, int *type, int *widt
  act_connection *c;
  Scope *sc = si->bnl->cur;
 
- c = id->Canonical (sc);
+ c = id->Canonical (sc, true);
+ if (!c) {
+ act_error_ctxt (stderr);
+ fprintf (stderr, "Identifier `");
+ id->Print (stderr);
+ fprintf (stderr, "' used, but not used in the design hierarchy selected.\n");
+ fatal_error ("Error in initializer block?");
+ }
  return getLocalOffset (c, si, type, width);
 }
 

main.cc

@@ -625,7 +625,14 @@ static int id_obj_to_siminfo (ActSimObj *obj,
  return 0;
  }
 
- c = id->Canonical (si->bnl->cur);
+ // validate the ID first, then call canonical pointer
+ c = id->Canonical (si->bnl->cur, true);
+ if (!c) {
+ fprintf (stderr, "Identifier `");
+ id->Print (stderr);
+ fprintf (stderr, "' not found in the design.\n");
+ return 0;
+ }
  Assert (c, "What?");
 
  int type, offset;
@@ -814,7 +821,6 @@ int process_set (int argc, char **argv)
  fprintf (stderr, "Integers are unsigned.\n");
  return LISP_RET_ERROR;
  }
-
  BigInt before = rd;
  rd.setWidth (otmp->getWidth());
  if (before != rd) {