Skip to content

Commit

Permalink
support decimal strings from signals.
Browse files Browse the repository at this point in the history
  • Loading branch information
steve committed Apr 4, 2001
1 parent 9b73418 commit 6322400
Show file tree
Hide file tree
Showing 3 changed files with 96 additions and 12 deletions.
15 changes: 14 additions & 1 deletion vvp/functor.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
*/
#if !defined(WINNT)
#ident "$Id: functor.h,v 1.9 2001/04/03 03:18:34 steve Exp $"
#ident "$Id: functor.h,v 1.10 2001/04/04 17:43:19 steve Exp $"
#endif

# include "pointers.h"
Expand Down Expand Up @@ -130,6 +130,16 @@ extern void functor_propagate(vvp_ipoint_t ptr);
*/
extern functor_t functor_index(vvp_ipoint_t point);

/*
* This is a convenience function that returns the current output
* value of the functor.
*/
inline unsigned functor_oval(vvp_ipoint_t fptr)
{
functor_t fp = functor_index(fptr);
return fp->oval & 3;
}

/*
* Dump a readable version of the functor address space to the file.
*/
Expand All @@ -145,6 +155,9 @@ extern const unsigned char ft_var[];

/*
* $Log: functor.h,v $
* Revision 1.10 2001/04/04 17:43:19 steve
* support decimal strings from signals.
*
* Revision 1.9 2001/04/03 03:18:34 steve
* support functor_set push for blocking assignment.
*
Expand Down
7 changes: 6 additions & 1 deletion vvp/vpi_priv.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
*/
#if !defined(WINNT)
#ident "$Id: vpi_priv.h,v 1.10 2001/04/04 04:33:09 steve Exp $"
#ident "$Id: vpi_priv.h,v 1.11 2001/04/04 17:43:19 steve Exp $"
#endif

# include "vpi_user.h"
Expand Down Expand Up @@ -101,6 +101,8 @@ struct __vpiSignal {
char*name;
/* The indices that define the width and access offset. */
int msb, lsb;
/* Flags */
unsigned signed_flag : 1;
/* The represented value is here. */
vvp_ipoint_t bits;
};
Expand Down Expand Up @@ -191,6 +193,9 @@ vpiHandle vpip_sim_time(void);

/*
* $Log: vpi_priv.h,v $
* Revision 1.11 2001/04/04 17:43:19 steve
* support decimal strings from signals.
*
* Revision 1.10 2001/04/04 04:33:09 steve
* Take vector form as parameters to vpi_call.
*
Expand Down
86 changes: 76 additions & 10 deletions vvp/vpi_signal.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
*/
#if !defined(WINNT)
#ident "$Id: vpi_signal.cc,v 1.5 2001/03/25 20:45:10 steve Exp $"
#ident "$Id: vpi_signal.cc,v 1.6 2001/04/04 17:43:19 steve Exp $"
#endif

/*
Expand Down Expand Up @@ -58,7 +58,7 @@ static int signal_get(int code, vpiHandle ref)
switch (code) {

case vpiSigned:
return 0;
return rfp->signed_flag != 0;

case vpiSize:
if (rfp->msb >= rfp->lsb)
Expand Down Expand Up @@ -89,15 +89,75 @@ static char* signal_get_str(int code, vpiHandle ref)

static char buf[4096];

static void signal_vpiDecStrVal(struct __vpiSignal*rfp, s_vpi_value*vp)
{
unsigned wid = (rfp->msb >= rfp->lsb)
? (rfp->msb - rfp->lsb + 1)
: (rfp->lsb - rfp->msb + 1);

unsigned long val = 0;
unsigned count_x = 0, count_z = 0;

for (unsigned idx = 0 ; idx < wid ; idx += 1) {
vvp_ipoint_t fptr = ipoint_index(rfp->bits, idx);
val *= 2;
switch (functor_oval(fptr)) {
case 0:
break;
case 1:
val += 1;
break;
case 2:
count_x += 1;
break;
case 3:
count_z += 1;
break;
}
}

if (count_x == wid) {
buf[0] = 'x';
buf[1] = 0;
return;
}

if (count_x > 0) {
buf[0] = 'X';
buf[1] = 0;
return;
}

if (count_z == wid) {
buf[0] = 'z';
buf[1] = 0;
return;
}

if (count_z > 0) {
buf[0] = 'Z';
buf[1] = 0;
return;
}

if (rfp->signed_flag) {
long tmp = -1;
assert(sizeof(tmp) == sizeof(val));
tmp <<= wid;
tmp |= val;
sprintf(buf, "%ld", tmp);
} else {
sprintf(buf, "%lu", val);
}
}

/*
* The get_value method reads the values of the functors and returns
* the vector to the caller. This causes no side-effect, and reads the
* variables like a %load would.
*/
static void signal_get_value(vpiHandle ref, s_vpi_value*vp)
{
static const char bit_char[4] = { '0', '1', 'x', 'z' };

assert((ref->vpi_type->type_code==vpiNet)
|| (ref->vpi_type->type_code==vpiReg));

Expand All @@ -112,8 +172,7 @@ static void signal_get_value(vpiHandle ref, s_vpi_value*vp)
case vpiBinStrVal:
for (unsigned idx = 0 ; idx < wid ; idx += 1) {
vvp_ipoint_t fptr = ipoint_index(rfp->bits, idx);
functor_t fp = functor_index(fptr);
buf[wid-idx-1] = bit_char[fp->oval&3];
buf[wid-idx-1] = "01xz"[functor_oval(fptr)];
}
buf[wid] = 0;
vp->value.str = buf;
Expand All @@ -126,8 +185,7 @@ static void signal_get_value(vpiHandle ref, s_vpi_value*vp)
hval = 0;
for (unsigned idx = 0 ; idx < wid ; idx += 1) {
vvp_ipoint_t fptr = ipoint_index(rfp->bits, idx);
functor_t fp = functor_index(fptr);
hval = hval | ((fp->oval&3) << 2*(idx % 4));
hval = hval | (functor_oval(fptr) << 2*(idx % 4));

if (idx%4 == 3) {
hwid -= 1;
Expand All @@ -152,8 +210,7 @@ static void signal_get_value(vpiHandle ref, s_vpi_value*vp)
hval = 0;
for (unsigned idx = 0 ; idx < wid ; idx += 1) {
vvp_ipoint_t fptr = ipoint_index(rfp->bits, idx);
functor_t fp = functor_index(fptr);
hval = hval | ((fp->oval&3) << 2*(idx % 3));
hval = hval | (functor_oval(fptr) << 2*(idx % 3));

if (idx%3 == 2) {
hwid -= 1;
Expand All @@ -171,6 +228,10 @@ static void signal_get_value(vpiHandle ref, s_vpi_value*vp)
break;
}

case vpiDecStrVal:
signal_vpiDecStrVal(rfp, vp);
break;

default:
/* XXXX Not implemented yet. */
assert(0);
Expand Down Expand Up @@ -230,6 +291,7 @@ vpiHandle vpip_make_reg(char*name, int msb, int lsb, vvp_ipoint_t base)
obj->name = name;
obj->msb = msb;
obj->lsb = lsb;
obj->signed_flag = 0;
obj->bits = base;

obj->scope = vpip_peek_current_scope();
Expand All @@ -250,6 +312,7 @@ vpiHandle vpip_make_net(char*name, int msb, int lsb, vvp_ipoint_t base)
obj->name = name;
obj->msb = msb;
obj->lsb = lsb;
obj->signed_flag = 0;
obj->bits = base;

obj->scope = vpip_peek_current_scope();
Expand All @@ -260,6 +323,9 @@ vpiHandle vpip_make_net(char*name, int msb, int lsb, vvp_ipoint_t base)

/*
* $Log: vpi_signal.cc,v $
* Revision 1.6 2001/04/04 17:43:19 steve
* support decimal strings from signals.
*
* Revision 1.5 2001/03/25 20:45:10 steve
* Add vpiOctStrVal access to signals.
*
Expand Down

0 comments on commit 6322400

Please sign in to comment.