From bbd61823b92bdaaca8a3949e24eda8f05e17a555 Mon Sep 17 00:00:00 2001 From: Cary R Date: Tue, 27 Nov 2007 17:33:12 -0800 Subject: [PATCH] Update vpi/etc. files to correctly use PLI_INT32 This patch fixes the various PLI code that was incorrectly using int for PLI_INT32 for functions that are used with the vpi_systf_data and cd_data data structures. --- libveriuser/a_next.c | 2 +- libveriuser/veriusertfs.c | 14 +++++++------- vpi/sys_convert.c | 14 +++++++------- vpi/sys_deposit.c | 2 +- vpi/sys_display.c | 26 +++++++++++++------------- vpi/sys_fileio.c | 24 ++++++++++++------------ vpi/sys_finish.c | 2 +- vpi/sys_lxt.c | 18 +++++++++--------- vpi/sys_lxt2.c | 18 +++++++++--------- vpi/sys_plusargs.c | 10 +++++----- vpi/sys_priv.h | 2 +- vpi/sys_random.c | 12 ++++++------ vpi/sys_random_mti.c | 8 ++++---- vpi/sys_readmem.c | 4 ++-- vpi/sys_time.c | 8 ++++---- vpi/sys_vcd.c | 22 +++++++++++----------- vpi/sys_vcdoff.c | 10 +++++----- 17 files changed, 98 insertions(+), 98 deletions(-) diff --git a/libveriuser/a_next.c b/libveriuser/a_next.c index 17eb20397..bfbaff89c 100644 --- a/libveriuser/a_next.c +++ b/libveriuser/a_next.c @@ -34,7 +34,7 @@ handle acc_next(PLI_INT32 *type, handle scope, handle prev) /* trace */ if (pli_trace) { - int *ip; + PLI_INT32 *ip; fprintf(pli_trace, "acc_next(%p <", type); for (ip = type; *ip; ip++) { fprintf(pli_trace, "%s%d", ip != type ? "," : "", *ip); diff --git a/libveriuser/veriusertfs.c b/libveriuser/veriusertfs.c index b63f88a3d..56a3a2ec2 100644 --- a/libveriuser/veriusertfs.c +++ b/libveriuser/veriusertfs.c @@ -44,9 +44,9 @@ typedef struct t_pli_data { int paramvc; /* parameter number for misctf */ } s_pli_data, *p_pli_data; -static int compiletf(char *); -static int calltf(char *); -static int callback(p_cb_data); +static PLI_INT32 compiletf(char *); +static PLI_INT32 calltf(char *); +static PLI_INT32 callback(p_cb_data); /* * Register veriusertfs routines/wrappers. Iterate over the tfcell @@ -109,7 +109,7 @@ void veriusertfs_register_table(p_tfcell vtable) tf_data.tfname = tf->tfname; tf_data.compiletf = compiletf; tf_data.calltf = calltf; - tf_data.sizetf = tf->sizetf; + tf_data.sizetf = (PLI_INT32 (*)(char *))tf->sizetf; tf_data.user_data = (char *)data; if (pli_trace) { @@ -139,7 +139,7 @@ void veriusertfs_register_table(p_tfcell vtable) * This function calls the veriusertfs checktf and sets up all the * callbacks misctf requires. */ -static int compiletf(char *data) +static PLI_INT32 compiletf(char *data) { p_pli_data pli; p_tfcell tf; @@ -221,7 +221,7 @@ static int compiletf(char *data) /* * This function is the wrapper for the veriusertfs calltf routine. */ -static int calltf(char *data) +static PLI_INT32 calltf(char *data) { int rc = 0; p_pli_data pli; @@ -249,7 +249,7 @@ static int calltf(char *data) */ extern int async_misctf_enable; -static int callback(p_cb_data data) +static PLI_INT32 callback(p_cb_data data) { p_pli_data pli; p_tfcell tf; diff --git a/vpi/sys_convert.c b/vpi/sys_convert.c index 57f154aa4..e1977a4e4 100644 --- a/vpi/sys_convert.c +++ b/vpi/sys_convert.c @@ -86,10 +86,10 @@ static void double2bits(double real, PLI_UINT32 bits[2]) #endif } -static int sizetf_32 (char*x) { return 32; } -static int sizetf_64 (char*x) { return 64; } +static PLI_INT32 sizetf_32 (char*x) { return 32; } +static PLI_INT32 sizetf_64 (char*x) { return 64; } -static int sys_convert_compiletf(char *name) +static PLI_INT32 sys_convert_compiletf(char *name) { vpiHandle call_hand, argv, arg; int rtn = 0; @@ -116,7 +116,7 @@ static int sys_convert_compiletf(char *name) return rtn; } -static int sys_bitstoreal_calltf(char *user) +static PLI_INT32 sys_bitstoreal_calltf(char *user) { vpiHandle sys, argv, arg; s_vpi_value value; @@ -147,7 +147,7 @@ static int sys_bitstoreal_calltf(char *user) return 0; } -static int sys_itor_calltf(char *user) +static PLI_INT32 sys_itor_calltf(char *user) { vpiHandle sys, argv, arg; s_vpi_value value; @@ -174,7 +174,7 @@ static int sys_itor_calltf(char *user) return 0; } -static int sys_realtobits_calltf(char *user) +static PLI_INT32 sys_realtobits_calltf(char *user) { vpiHandle sys, argv, arg; s_vpi_value value; @@ -211,7 +211,7 @@ static int sys_realtobits_calltf(char *user) return 0; } -static int sys_rtoi_calltf(char *user) +static PLI_INT32 sys_rtoi_calltf(char *user) { vpiHandle sys, argv, arg; s_vpi_value value; diff --git a/vpi/sys_deposit.c b/vpi/sys_deposit.c index 81840af2a..3179860d8 100644 --- a/vpi/sys_deposit.c +++ b/vpi/sys_deposit.c @@ -26,7 +26,7 @@ # include "vpi_user.h" # include -static int sys_deposit_calltf(char *name) +static PLI_INT32 sys_deposit_calltf(char *name) { vpiHandle sys, argv, target, value; s_vpi_value val; diff --git a/vpi/sys_display.c b/vpi/sys_display.c index eed1e6440..9a1caf00f 100644 --- a/vpi/sys_display.c +++ b/vpi/sys_display.c @@ -931,7 +931,7 @@ static int get_default_format(char *name) return default_format; } -static int sys_display_calltf(char *name) +static PLI_INT32 sys_display_calltf(char *name) { struct strobe_cb_info*info; vpiHandle sys = vpi_handle(vpiSysTfCall, 0); @@ -966,7 +966,7 @@ static int sys_display_calltf(char *name) * where it is use to perform the actual formatting and printing. */ -static int strobe_cb(p_cb_data cb) +static PLI_INT32 strobe_cb(p_cb_data cb) { struct strobe_cb_info*info = (struct strobe_cb_info*)cb->user_data; @@ -980,7 +980,7 @@ static int strobe_cb(p_cb_data cb) return 0; } -static int sys_strobe_calltf(char*name) +static PLI_INT32 sys_strobe_calltf(char*name) { struct t_cb_data cb; struct t_vpi_time time; @@ -1070,7 +1070,7 @@ static vpiHandle *monitor_callbacks = 0; static int monitor_scheduled = 0; static int monitor_enabled = 1; -static int monitor_cb_2(p_cb_data cb) +static PLI_INT32 monitor_cb_2(p_cb_data cb) { do_display(1, &monitor_info); vpi_printf("\n"); @@ -1084,7 +1084,7 @@ static int monitor_cb_2(p_cb_data cb) * display to occur in a ReadOnlySync callback. The monitor_scheduled * flag is used to allow only one monitor strobe to be scheduled. */ -static int monitor_cb_1(p_cb_data cause) +static PLI_INT32 monitor_cb_1(p_cb_data cause) { struct t_cb_data cb; struct t_vpi_time time; @@ -1110,7 +1110,7 @@ static int monitor_cb_1(p_cb_data cause) return 0; } -static int sys_monitor_calltf(char*name) +static PLI_INT32 sys_monitor_calltf(char*name) { unsigned idx; struct t_cb_data cb; @@ -1177,14 +1177,14 @@ static int sys_monitor_calltf(char*name) return 0; } -static int sys_monitoron_calltf(char*name) +static PLI_INT32 sys_monitoron_calltf(char*name) { monitor_enabled = 1; monitor_cb_1(0); return 0; } -static int sys_monitoroff_calltf(char*name) +static PLI_INT32 sys_monitoroff_calltf(char*name) { monitor_enabled = 0; return 0; @@ -1193,7 +1193,7 @@ static int sys_monitoroff_calltf(char*name) /* Implement $fdisplay and $fwrite. * Perhaps this could be merged into sys_display_calltf. */ -static int sys_fdisplay_calltf(char *name) +static PLI_INT32 sys_fdisplay_calltf(char *name) { struct strobe_cb_info info; unsigned int mcd; @@ -1257,7 +1257,7 @@ static int sys_fdisplay_calltf(char *name) return 0; } -static int sys_timeformat_compiletf(char *xx) +static PLI_INT32 sys_timeformat_compiletf(char *xx) { vpiHandle sys = vpi_handle(vpiSysTfCall, 0); vpiHandle argv = vpi_iterate(vpiArgument, sys); @@ -1279,7 +1279,7 @@ static int sys_timeformat_compiletf(char *xx) return 0; } -static int sys_timeformat_calltf(char *xx) +static PLI_INT32 sys_timeformat_calltf(char *xx) { s_vpi_value value; vpiHandle sys = vpi_handle(vpiSysTfCall, 0); @@ -1335,7 +1335,7 @@ static char *pts_convert(int value) return string; } -static int sys_printtimescale_calltf(char *xx) +static PLI_INT32 sys_printtimescale_calltf(char *xx) { vpiHandle sys = vpi_handle(vpiSysTfCall, 0); vpiHandle argv = vpi_iterate(vpiArgument, sys); @@ -1358,7 +1358,7 @@ static int sys_printtimescale_calltf(char *xx) return 0; } -static int sys_end_of_compile(p_cb_data cb_data) +static PLI_INT32 sys_end_of_compile(p_cb_data cb_data) { /* The default timeformat prints times in unit of simulation precision. */ diff --git a/vpi/sys_fileio.c b/vpi/sys_fileio.c index 78702bdec..c6ae4cbae 100644 --- a/vpi/sys_fileio.c +++ b/vpi/sys_fileio.c @@ -33,7 +33,7 @@ /* * Implement the $fopen system function. */ -static int sys_fopen_calltf(char *name) +static PLI_INT32 sys_fopen_calltf(char *name) { s_vpi_value value; unsigned char *mode_string = 0; @@ -95,7 +95,7 @@ static int sys_fopen_calltf(char *name) return 0; } -static int sys_fopen_sizetf(char*x) +static PLI_INT32 sys_fopen_sizetf(char*x) { return 32; } @@ -103,7 +103,7 @@ static int sys_fopen_sizetf(char*x) /* * Implement $fclose system function */ -static int sys_fclose_calltf(char *name) +static PLI_INT32 sys_fclose_calltf(char *name) { unsigned int mcd; int type; @@ -139,14 +139,14 @@ static int sys_fclose_calltf(char *name) return 0; } -static int sys_fflush_calltf(char *name) +static PLI_INT32 sys_fflush_calltf(char *name) { fflush(0); return 0; } -static int sys_fputc_calltf(char *name) +static PLI_INT32 sys_fputc_calltf(char *name) { unsigned int mcd; int type; @@ -193,7 +193,7 @@ static int sys_fputc_calltf(char *name) return fputc(x, fp); } -static int sys_fgetc_calltf(char *name) +static PLI_INT32 sys_fgetc_calltf(char *name) { unsigned int mcd; int type; @@ -238,12 +238,12 @@ static int sys_fgetc_calltf(char *name) return 0; } -static int sys_fgetc_sizetf(char*x) +static PLI_INT32 sys_fgetc_sizetf(char*x) { return 32; } -static int sys_fgets_compiletf(char*name) +static PLI_INT32 sys_fgets_compiletf(char*name) { vpiHandle sys = vpi_handle(vpiSysTfCall, 0); vpiHandle argv = vpi_iterate(vpiArgument, sys); @@ -276,7 +276,7 @@ static int sys_fgets_compiletf(char*name) return 0; } -static int sys_fgets_calltf(char *name) +static PLI_INT32 sys_fgets_calltf(char *name) { unsigned int mcd; FILE*fd; @@ -326,7 +326,7 @@ static int sys_fgets_calltf(char *name) return 0; } -static int sys_ungetc_compiletf(char*name) +static PLI_INT32 sys_ungetc_compiletf(char*name) { int type; vpiHandle sys = vpi_handle(vpiSysTfCall, 0); @@ -354,7 +354,7 @@ static int sys_ungetc_compiletf(char*name) return 0; } -static int sys_ungetc_calltf(char *name) +static PLI_INT32 sys_ungetc_calltf(char *name) { unsigned int mcd; unsigned char x; @@ -398,7 +398,7 @@ static int sys_ungetc_calltf(char *name) return 0; } -static int sys_ungetc_sizetf(char*x) +static PLI_INT32 sys_ungetc_sizetf(char*x) { return 32; } diff --git a/vpi/sys_finish.c b/vpi/sys_finish.c index 5aa7d3b2c..4f28417d0 100644 --- a/vpi/sys_finish.c +++ b/vpi/sys_finish.c @@ -25,7 +25,7 @@ # include "vpi_user.h" # include -static int sys_finish_calltf(char *name) +static PLI_INT32 sys_finish_calltf(char *name) { if (strcmp(name,"$stop") == 0) { vpi_sim_control(vpiStop, 0); diff --git a/vpi/sys_lxt.c b/vpi/sys_lxt.c index 67ed0c459..8ccce9f2d 100644 --- a/vpi/sys_lxt.c +++ b/vpi/sys_lxt.c @@ -220,7 +220,7 @@ static void vcd_checkpoint_x() show_this_item_x(cur); } -static int variable_cb_2(p_cb_data cause) +static PLI_INT32 variable_cb_2(p_cb_data cause) { struct vcd_info* info = vcd_dmp_list; PLI_UINT64 now = timerec_to_time64(cause->time); @@ -240,7 +240,7 @@ static int variable_cb_2(p_cb_data cause) return 0; } -static int variable_cb_1(p_cb_data cause) +static PLI_INT32 variable_cb_1(p_cb_data cause) { struct t_cb_data cb; struct vcd_info*info = (struct vcd_info*)cause->user_data; @@ -263,7 +263,7 @@ static int variable_cb_1(p_cb_data cause) return 0; } -static int dumpvars_cb(p_cb_data cause) +static PLI_INT32 dumpvars_cb(p_cb_data cause) { if (dumpvars_status != 1) return 0; @@ -310,7 +310,7 @@ inline static int install_dumpvars_callback(void) return 0; } -static int sys_dumpoff_calltf(char*name) +static PLI_INT32 sys_dumpoff_calltf(char*name) { s_vpi_time now; PLI_UINT64 now64; @@ -340,7 +340,7 @@ static int sys_dumpoff_calltf(char*name) return 0; } -static int sys_dumpon_calltf(char*name) +static PLI_INT32 sys_dumpon_calltf(char*name) { s_vpi_time now; PLI_UINT64 now64; @@ -370,7 +370,7 @@ static int sys_dumpon_calltf(char*name) return 0; } -static int sys_dumpall_calltf(char*name) +static PLI_INT32 sys_dumpall_calltf(char*name) { s_vpi_time now; PLI_UINT64 now64; @@ -426,7 +426,7 @@ static void open_dumpfile(const char*path) } } -static int sys_dumpfile_calltf(char*name) +static PLI_INT32 sys_dumpfile_calltf(char*name) { char*path; @@ -470,7 +470,7 @@ static int sys_dumpfile_calltf(char*name) /* * The LXT1 format has no concept of file flushing. */ -static int sys_dumpflush_calltf(char*name) +static PLI_INT32 sys_dumpflush_calltf(char*name) { return 0; } @@ -674,7 +674,7 @@ static int draw_scope(vpiHandle item) return depth; } -static int sys_dumpvars_calltf(char*name) +static PLI_INT32 sys_dumpvars_calltf(char*name) { unsigned depth; s_vpi_value value; diff --git a/vpi/sys_lxt2.c b/vpi/sys_lxt2.c index a7fb6a1cc..30f8626c8 100644 --- a/vpi/sys_lxt2.c +++ b/vpi/sys_lxt2.c @@ -222,7 +222,7 @@ static void vcd_checkpoint_x() show_this_item_x(cur); } -static int variable_cb_2(p_cb_data cause) +static PLI_INT32 variable_cb_2(p_cb_data cause) { struct vcd_info* info = vcd_dmp_list; PLI_UINT64 now = timerec_to_time64(cause->time); @@ -242,7 +242,7 @@ static int variable_cb_2(p_cb_data cause) return 0; } -static int variable_cb_1(p_cb_data cause) +static PLI_INT32 variable_cb_1(p_cb_data cause) { struct t_cb_data cb; struct vcd_info*info = (struct vcd_info*)cause->user_data; @@ -265,7 +265,7 @@ static int variable_cb_1(p_cb_data cause) return 0; } -static int dumpvars_cb(p_cb_data cause) +static PLI_INT32 dumpvars_cb(p_cb_data cause) { if (dumpvars_status != 1) return 0; @@ -312,7 +312,7 @@ inline static int install_dumpvars_callback(void) return 0; } -static int sys_dumpoff_calltf(char*name) +static PLI_INT32 sys_dumpoff_calltf(char*name) { s_vpi_time now; PLI_UINT64 now64; @@ -341,7 +341,7 @@ static int sys_dumpoff_calltf(char*name) return 0; } -static int sys_dumpon_calltf(char*name) +static PLI_INT32 sys_dumpon_calltf(char*name) { s_vpi_time now; PLI_UINT64 now64; @@ -371,7 +371,7 @@ static int sys_dumpon_calltf(char*name) return 0; } -static int sys_dumpall_calltf(char*name) +static PLI_INT32 sys_dumpall_calltf(char*name) { s_vpi_time now; PLI_UINT64 now64; @@ -431,7 +431,7 @@ static void open_dumpfile(const char*path) } } -static int sys_dumpfile_calltf(char*name) +static PLI_INT32 sys_dumpfile_calltf(char*name) { char*path; @@ -479,7 +479,7 @@ static int sys_dumpfile_calltf(char*name) * writes checkpoints out, but this makes it happen at a specific * time. */ -static int sys_dumpflush_calltf(char*name) +static PLI_INT32 sys_dumpflush_calltf(char*name) { if (dump_file) lxt2_wr_flush(dump_file); return 0; @@ -692,7 +692,7 @@ static int draw_scope(vpiHandle item) return depth; } -static int sys_dumpvars_calltf(char*name) +static PLI_INT32 sys_dumpvars_calltf(char*name) { unsigned depth; s_vpi_value value; diff --git a/vpi/sys_plusargs.c b/vpi/sys_plusargs.c index fef41c419..f34474370 100644 --- a/vpi/sys_plusargs.c +++ b/vpi/sys_plusargs.c @@ -25,7 +25,7 @@ # include # include -static int sys_plusargs_sizetf(char*x) +static PLI_INT32 sys_plusargs_sizetf(char*x) { return 32; } @@ -34,7 +34,7 @@ static int sys_plusargs_sizetf(char*x) * The compiletf for $test$plusargs checks that there is one argument * to the function call, and that argument is a constant string. */ -static int sys_test_plusargs_compiletf(char*xx) +static PLI_INT32 sys_test_plusargs_compiletf(char*xx) { vpiHandle sys = vpi_handle(vpiSysTfCall, 0); vpiHandle argv = vpi_iterate(vpiArgument, sys); @@ -81,7 +81,7 @@ static int sys_test_plusargs_compiletf(char*xx) * passed to the $test$plusargs. If there is a simulator argument that * is like this argument, then return true. Otherwise return false. */ -static int sys_test_plusargs_calltf(char*xx) +static PLI_INT32 sys_test_plusargs_calltf(char*xx) { int idx; int flag = 0; @@ -125,7 +125,7 @@ static int sys_test_plusargs_calltf(char*xx) return 0; } -static int sys_value_plusargs_compiletf(char*xx) +static PLI_INT32 sys_value_plusargs_compiletf(char*xx) { s_vpi_value value; vpiHandle sys = vpi_handle(vpiSysTfCall, 0); @@ -229,7 +229,7 @@ static int sys_value_plusargs_compiletf(char*xx) return 0; } -static int sys_value_plusargs_calltf(char*xx) +static PLI_INT32 sys_value_plusargs_calltf(char*xx) { char*cp; int idx; diff --git a/vpi/sys_priv.h b/vpi/sys_priv.h index 943bbec02..986630913 100644 --- a/vpi/sys_priv.h +++ b/vpi/sys_priv.h @@ -29,7 +29,7 @@ * This function is used by sys_vcd and sys_lxt as the dumpvars * compiletf function. */ -extern int sys_vcd_dumpvars_compiletf(char*name); +extern PLI_INT32 sys_vcd_dumpvars_compiletf(char*name); /* * Context structure for PRNG in mt19937int.c diff --git a/vpi/sys_random.c b/vpi/sys_random.c index 519622bfc..c859bef62 100644 --- a/vpi/sys_random.c +++ b/vpi/sys_random.c @@ -190,7 +190,7 @@ static long poisson(long*seed, long mean) return n; } -static int sys_dist_poisson_calltf(char*name) +static PLI_INT32 sys_dist_poisson_calltf(char*name) { s_vpi_value val; vpiHandle call_handle; @@ -230,12 +230,12 @@ static int sys_dist_poisson_calltf(char*name) return 0; } -static int sys_dist_poisson_sizetf(char*x) +static PLI_INT32 sys_dist_poisson_sizetf(char*x) { return 32; } -static int sys_dist_uniform_calltf(char*name) +static PLI_INT32 sys_dist_uniform_calltf(char*name) { s_vpi_value val; vpiHandle call_handle; @@ -284,12 +284,12 @@ static int sys_dist_uniform_calltf(char*name) return 0; } -static int sys_dist_uniform_sizetf(char*x) +static PLI_INT32 sys_dist_uniform_sizetf(char*x) { return 32; } -static int sys_random_calltf(char*name) +static PLI_INT32 sys_random_calltf(char*name) { s_vpi_value val; vpiHandle call_handle; @@ -327,7 +327,7 @@ static int sys_random_calltf(char*name) return 0; } -static int sys_random_sizetf(char*x) +static PLI_INT32 sys_random_sizetf(char*x) { return 32; } diff --git a/vpi/sys_random_mti.c b/vpi/sys_random_mti.c index d5e6927da..4847e2c31 100644 --- a/vpi/sys_random_mti.c +++ b/vpi/sys_random_mti.c @@ -61,7 +61,7 @@ static long mti_dist_uniform(long*seed, long start, long end) } -static int sys_mti_dist_uniform_calltf(char*name) +static PLI_INT32 sys_mti_dist_uniform_calltf(char*name) { s_vpi_value val; vpiHandle call_handle; @@ -110,12 +110,12 @@ static int sys_mti_dist_uniform_calltf(char*name) return 0; } -static int sys_mti_dist_uniform_sizetf(char*x) +static PLI_INT32 sys_mti_dist_uniform_sizetf(char*x) { return 32; } -static int sys_mti_random_calltf(char*name) +static PLI_INT32 sys_mti_random_calltf(char*name) { s_vpi_value val; vpiHandle call_handle; @@ -174,7 +174,7 @@ static int sys_mti_random_calltf(char*name) return 0; } -static int sys_mti_random_sizetf(char*x) +static PLI_INT32 sys_mti_random_sizetf(char*x) { return 32; } diff --git a/vpi/sys_readmem.c b/vpi/sys_readmem.c index 86fa58a6d..c7b15cf4a 100644 --- a/vpi/sys_readmem.c +++ b/vpi/sys_readmem.c @@ -100,7 +100,7 @@ static int check_file_name(const char*name, vpiHandle item) } -static int sys_readmem_calltf(char*name) +static PLI_INT32 sys_readmem_calltf(char*name) { int code; int wwid; @@ -355,7 +355,7 @@ static int sys_readmem_calltf(char*name) return 0; } -static int sys_writemem_calltf(char*name) +static PLI_INT32 sys_writemem_calltf(char*name) { int wwid; char*path; diff --git a/vpi/sys_time.c b/vpi/sys_time.c index f2d8690bb..07d0091ad 100644 --- a/vpi/sys_time.c +++ b/vpi/sys_time.c @@ -37,17 +37,17 @@ static vpiHandle module_of_function(vpiHandle obj) return obj; } -static int sys_time_sizetf(char*x) +static PLI_INT32 sys_time_sizetf(char*x) { return 64; } -static int sys_stime_sizetf(char*x) +static PLI_INT32 sys_stime_sizetf(char*x) { return 32; } -static int sys_time_calltf(char*name) +static PLI_INT32 sys_time_calltf(char*name) { s_vpi_value val; s_vpi_time now; @@ -102,7 +102,7 @@ static int sys_time_calltf(char*name) return 0; } -static int sys_realtime_calltf(char*name) +static PLI_INT32 sys_realtime_calltf(char*name) { s_vpi_value val; s_vpi_time now; diff --git a/vpi/sys_vcd.c b/vpi/sys_vcd.c index 10a925685..2fc4f7b51 100644 --- a/vpi/sys_vcd.c +++ b/vpi/sys_vcd.c @@ -174,7 +174,7 @@ static void vcd_checkpoint_x() show_this_item_x(cur); } -static int variable_cb_2(p_cb_data cause) +static PLI_INT32 variable_cb_2(p_cb_data cause) { struct vcd_info* info = vcd_dmp_list; PLI_UINT64 now = timerec_to_time64(cause->time); @@ -194,7 +194,7 @@ static int variable_cb_2(p_cb_data cause) return 0; } -static int variable_cb_1(p_cb_data cause) +static PLI_INT32 variable_cb_1(p_cb_data cause) { struct t_cb_data cb; struct vcd_info*info = (struct vcd_info*)cause->user_data; @@ -217,7 +217,7 @@ static int variable_cb_1(p_cb_data cause) return 0; } -static int dumpvars_cb(p_cb_data cause) +static PLI_INT32 dumpvars_cb(p_cb_data cause) { if (dumpvars_status != 1) return 0; @@ -268,7 +268,7 @@ inline static int install_dumpvars_callback(void) return 0; } -static int sys_dumpoff_calltf(char*name) +static PLI_INT32 sys_dumpoff_calltf(char*name) { s_vpi_time now; PLI_UINT64 now64; @@ -299,7 +299,7 @@ static int sys_dumpoff_calltf(char*name) return 0; } -static int sys_dumpon_calltf(char*name) +static PLI_INT32 sys_dumpon_calltf(char*name) { s_vpi_time now; PLI_UINT64 now64; @@ -330,7 +330,7 @@ static int sys_dumpon_calltf(char*name) return 0; } -static int sys_dumpall_calltf(char*name) +static PLI_INT32 sys_dumpall_calltf(char*name) { s_vpi_time now; PLI_UINT64 now64; @@ -403,7 +403,7 @@ static void open_dumpfile(void) } } -static int sys_dumpfile_compiletf(char*name) +static PLI_INT32 sys_dumpfile_compiletf(char*name) { vpiHandle sys = vpi_handle(vpiSysTfCall, 0); vpiHandle argv = vpi_iterate(vpiArgument, sys); @@ -445,12 +445,12 @@ static int sys_dumpfile_compiletf(char*name) return 0; } -static int sys_dumpfile_calltf(char*name) +static PLI_INT32 sys_dumpfile_calltf(char*name) { return 0; } -static int sys_dumpflush_calltf(char*name) +static PLI_INT32 sys_dumpflush_calltf(char*name) { if (dump_file) fflush(dump_file); @@ -673,7 +673,7 @@ static int draw_scope(vpiHandle item) * This function is also used in sys_lxt to check the arguments of the * lxt variant of $dumpvars. */ -int sys_vcd_dumpvars_compiletf(char*name) +PLI_INT32 sys_vcd_dumpvars_compiletf(char*name) { vpiHandle sys = vpi_handle(vpiSysTfCall, 0); vpiHandle argv = vpi_iterate(vpiArgument, sys); @@ -711,7 +711,7 @@ int sys_vcd_dumpvars_compiletf(char*name) return 0; } -static int sys_dumpvars_calltf(char*name) +static PLI_INT32 sys_dumpvars_calltf(char*name) { unsigned depth; s_vpi_value value; diff --git a/vpi/sys_vcdoff.c b/vpi/sys_vcdoff.c index 2866f2d23..53a513013 100644 --- a/vpi/sys_vcdoff.c +++ b/vpi/sys_vcdoff.c @@ -41,17 +41,17 @@ static FILE*dump_file = 0; -static int sys_dumpoff_calltf(char*name) +static PLI_INT32 sys_dumpoff_calltf(char*name) { return 0; } -static int sys_dumpon_calltf(char*name) +static PLI_INT32 sys_dumpon_calltf(char*name) { return 0; } -static int sys_dumpall_calltf(char*name) +static PLI_INT32 sys_dumpall_calltf(char*name) { return 0; } @@ -70,7 +70,7 @@ static void open_dumpfile(const char*path) } } -static int sys_dumpfile_calltf(char*name) +static PLI_INT32 sys_dumpfile_calltf(char*name) { char*path; @@ -113,7 +113,7 @@ static int sys_dumpfile_calltf(char*name) return 0; } -static int sys_dumpvars_calltf(char*name) +static PLI_INT32 sys_dumpvars_calltf(char*name) { if (dump_file == 0) { open_dumpfile("dumpfile.vcd");