From bc9e31a444f969ef7b8b7a7aa96ddfdcc69b9a47 Mon Sep 17 00:00:00 2001
From: Stephen Williams <steve@icarus.com>
Date: Sat, 5 Jan 2013 11:39:17 -0800
Subject: [PATCH] Cleanup of v2009.vpoi module.

---
 vpi/Makefile.in                      | 4 ++--
 vpi/sys_table.c                      | 2 --
 vpi/v2009.sft                        | 1 -
 vpi/{sys_string.c => v2009_string.c} | 2 +-
 vpi/v2009_table.c                    | 2 ++
 5 files changed, 5 insertions(+), 6 deletions(-)
 rename vpi/{sys_string.c => v2009_string.c} (98%)

diff --git a/vpi/Makefile.in b/vpi/Makefile.in
index 80378e43e..16599f431 100644
--- a/vpi/Makefile.in
+++ b/vpi/Makefile.in
@@ -54,7 +54,7 @@ LDFLAGS = @LDFLAGS@
 O = sys_table.o sys_convert.o sys_countdrivers.o sys_darray.o sys_deposit.o sys_display.o \
     sys_fileio.o sys_finish.o sys_icarus.o sys_plusargs.o sys_queue.o \
     sys_random.o sys_random_mti.o sys_readmem.o sys_readmem_lex.o sys_scanf.o \
-    sys_sdf.o sys_string.o sys_time.o sys_vcd.o sys_vcdoff.o vcd_priv.o mt19937int.o \
+    sys_sdf.o sys_time.o sys_vcd.o sys_vcdoff.o vcd_priv.o mt19937int.o \
     sys_priv.o sdf_lexor.o sdf_parse.o stringheap.o vams_simparam.o \
     table_mod.o table_mod_lexor.o table_mod_parse.o
 OPP = vcd_priv2.o
@@ -73,7 +73,7 @@ M = sys_clog2.o v2005_math.o
 # Object files for va_math.vpi
 V = va_math.o
 
-V2009 = v2009_table.o v2009_enum.o
+V2009 = v2009_table.o v2009_enum.o v2009_string.o
 
 VHDL_SYS = vhdl_table.o
 
diff --git a/vpi/sys_table.c b/vpi/sys_table.c
index 0eef9ddf2..6e9a4326c 100644
--- a/vpi/sys_table.c
+++ b/vpi/sys_table.c
@@ -35,7 +35,6 @@ extern void sys_queue_register();
 extern void sys_random_register();
 extern void sys_random_mti_register();
 extern void sys_readmem_register();
-extern void sys_string_register();
 extern void sys_scanf_register();
 extern void sys_sdf_register();
 extern void sys_time_register();
@@ -210,7 +209,6 @@ void (*vlog_startup_routines[])() = {
       sys_random_mti_register,
       sys_readmem_register,
       sys_scanf_register,
-      sys_string_register,
       sys_time_register,
       sys_lxt_or_vcd_register,
       sys_sdf_register,
diff --git a/vpi/v2009.sft b/vpi/v2009.sft
index a606d187d..429342bf9 100644
--- a/vpi/v2009.sft
+++ b/vpi/v2009.sft
@@ -2,4 +2,3 @@
 # This is the system function descriptor table for the
 # builtin (system) functions.
 #
-
diff --git a/vpi/sys_string.c b/vpi/v2009_string.c
similarity index 98%
rename from vpi/sys_string.c
rename to vpi/v2009_string.c
index 88d2379ca..035d6b316 100644
--- a/vpi/sys_string.c
+++ b/vpi/v2009_string.c
@@ -73,7 +73,7 @@ static PLI_INT32 len_calltf(ICARUS_VPI_CONST PLI_BYTE8*name)
       return 0;
 }
 
-void sys_string_register(void)
+void v2009_string_register(void)
 {
       s_vpi_systf_data tf_data;
       vpiHandle res;
diff --git a/vpi/v2009_table.c b/vpi/v2009_table.c
index 551834e83..d19bc03b0 100644
--- a/vpi/v2009_table.c
+++ b/vpi/v2009_table.c
@@ -24,8 +24,10 @@
 # include <string.h>
 
 extern void v2009_enum_register(void);
+extern void v2009_string_register(void);
 
 void (*vlog_startup_routines[])() = {
       v2009_enum_register,
+      v2009_string_register,
       0
 };