From 0950fbb9a34b76342410f1aeac923f97b776b187 Mon Sep 17 00:00:00 2001
From: Stephen Williams <steve@icarus.com>
Date: Wed, 6 Oct 2010 15:02:45 -0700
Subject: [PATCH] Clean up some vvp signal casts.

---
 vvp/README.txt    |  7 ++++---
 vvp/vpi_signal.cc | 22 +++++++---------------
 2 files changed, 11 insertions(+), 18 deletions(-)

diff --git a/vvp/README.txt b/vvp/README.txt
index a28d699ef..8e43030b5 100644
--- a/vvp/README.txt
+++ b/vvp/README.txt
@@ -278,9 +278,10 @@ A variable is a bit vector that can be written by behavioral code (so
 has no structural input) and propagates its output to a functor. The
 general syntax of a variable is:
 
-	<label> .var   "name", <msb>, <lsb>;
-	<label> .var/s "name", <msb>, <lsb>;
-	<label> .var/real "name", <msb>, <lsb>;
+	<label> .var   "name", <msb>, <lsb>; Unsigned logic variable
+	<label> .var/s "name", <msb>, <lsb>; Signed logic variable
+	<label> .var/real "name", <msb>, <lsb>; real varibale
+	<label> .var/i "name", <msb>, <lsb>; vpiIntegerVar variable
 
 The "name" is the declared base name of the original variable, for the
 sake of VPI code that might access it. The variable is placed in the
diff --git a/vvp/vpi_signal.cc b/vvp/vpi_signal.cc
index c5cd60e8f..0ff68bf03 100644
--- a/vvp/vpi_signal.cc
+++ b/vvp/vpi_signal.cc
@@ -576,10 +576,8 @@ static int signal_get(int code, vpiHandle ref)
 
 static char* signal_get_str(int code, vpiHandle ref)
 {
-      assert((ref->vpi_type->type_code==vpiNet)
-	     || (ref->vpi_type->type_code==vpiReg));
-
-      struct __vpiSignal*rfp = (struct __vpiSignal*)ref;
+      struct __vpiSignal*rfp = vpip_signal_from_handle(ref);
+      assert(rfp);
 
       if (code == vpiFile) {  // Not implemented for now!
 	    return simple_set_rbuf_str(file_names[0]);
@@ -604,10 +602,8 @@ static char* signal_get_str(int code, vpiHandle ref)
 
 static vpiHandle signal_get_handle(int code, vpiHandle ref)
 {
-      assert((ref->vpi_type->type_code==vpiNet)
-	     || (ref->vpi_type->type_code==vpiReg));
-
       struct __vpiSignal*rfp = vpip_signal_from_handle(ref);
+      assert(rfp);
 
       switch (code) {
 
@@ -629,10 +625,8 @@ static vpiHandle signal_get_handle(int code, vpiHandle ref)
 
 static vpiHandle signal_iterate(int code, vpiHandle ref)
 {
-      assert((ref->vpi_type->type_code==vpiNet)
-	     || (ref->vpi_type->type_code==vpiReg));
-
-      struct __vpiSignal*rfp = (struct __vpiSignal*)ref;
+      struct __vpiSignal*rfp = vpip_signal_from_handle(ref);
+      assert(rfp);
 
       if (code == vpiIndex) {
 	    return rfp->is_netarray? array_index_iterate(code, rfp->id.index) : 0;
@@ -657,10 +651,8 @@ static unsigned signal_width(const struct __vpiSignal*rfp)
  */
 static void signal_get_value(vpiHandle ref, s_vpi_value*vp)
 {
-      assert((ref->vpi_type->type_code==vpiNet)
-	     || (ref->vpi_type->type_code==vpiReg));
-
-      struct __vpiSignal*rfp = (struct __vpiSignal*)ref;
+      struct __vpiSignal*rfp = vpip_signal_from_handle(ref);
+      assert(rfp);
 
       unsigned wid = signal_width(rfp);