From 9c5113194d6a6032f98f33e13d59247e44a350ea Mon Sep 17 00:00:00 2001
From: Cary R <cygcary@yahoo.com>
Date: Thu, 17 Jul 2014 16:15:08 -0700
Subject: [PATCH 1/2] Update LXT2 and FST files to latest from GTKWave

---
 vpi/fstapi.c     | 4 ++--
 vpi/lxt2_write.c | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/vpi/fstapi.c b/vpi/fstapi.c
index 2491e968e..b0d7dfc40 100644
--- a/vpi/fstapi.c
+++ b/vpi/fstapi.c
@@ -1072,9 +1072,9 @@ if(!sysctl(mib, 2, &v, &length, NULL, 0))
         {
         v /= 8;
 
-        if(v > FST_BREAK_SIZE)
+        if(v > (int64_t)FST_BREAK_SIZE)
                 {
-                if(v > FST_BREAK_SIZE_MAX)
+                if(v > (int64_t)FST_BREAK_SIZE_MAX)
                         {
                         v = FST_BREAK_SIZE_MAX;
                         }
diff --git a/vpi/lxt2_write.c b/vpi/lxt2_write.c
index c1fed8a43..b50aa2359 100644
--- a/vpi/lxt2_write.c
+++ b/vpi/lxt2_write.c
@@ -1057,7 +1057,7 @@ if(!clone)
 for(cnt = 0; cnt < lt->break_header_size; cnt += sizeof(buf))
 	{
 	seg = lt->break_header_size - cnt;
-	if(seg > sizeof(buf))
+	if(seg > (off_t)sizeof(buf))
 		{
 		seg = sizeof(buf);
 		}

From f5e01081d1963b56ed08a08ebef97485a04a012a Mon Sep 17 00:00:00 2001
From: Cary R <cygcary@yahoo.com>
Date: Thu, 17 Jul 2014 17:33:57 -0700
Subject: [PATCH 2/2] vlog95: Report that substitute LPMS are not translated

---
 tgt-vlog95/logic_lpm.c | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/tgt-vlog95/logic_lpm.c b/tgt-vlog95/logic_lpm.c
index 5e1bec833..898ef9edc 100644
--- a/tgt-vlog95/logic_lpm.c
+++ b/tgt-vlog95/logic_lpm.c
@@ -360,6 +360,7 @@ static ivl_nexus_t get_lpm_output(ivl_scope_t scope, ivl_lpm_t lpm)
 	case IVL_LPM_SHIFTR:
 	case IVL_LPM_SIGN_EXT:
 	case IVL_LPM_SUB:
+	case IVL_LPM_SUBSTITUTE:
 	case IVL_LPM_UFUNC:
 	      /* If the output of this LPM is a local signal then something
 	       * else will request that this be emitted. */
@@ -1186,6 +1187,13 @@ static void emit_lpm_as_ca(ivl_scope_t scope, ivl_lpm_t lpm,
 	    emit_nexus_as_ca(scope, ivl_lpm_data(lpm, 1), 0, 0);
 	    fprintf(vlog_out, ")");
 	    break;
+	case IVL_LPM_SUBSTITUTE:
+	    fprintf(vlog_out, "<unknown>");
+	    fprintf(stderr, "%s:%u: vlog95 sorry: Substitute LPMs are "
+	                    "not currently translated.\n",
+	                    ivl_lpm_file(lpm), ivl_lpm_lineno(lpm));
+	    vlog_errors += 1;
+	    break;
 	case IVL_LPM_UFUNC:
 	    emit_scope_path(scope, ivl_lpm_define(lpm));
 	    emit_lpm_func(scope, lpm);