ext/swig_wrap.cin in ruby-vpi-13.0.0 vs ext/swig_wrap.cin in ruby-vpi-14.0.0
- old
+ new
@@ -1489,13 +1489,14 @@
#define SWIGTYPE_p_t_vpi_vecval swig_types[15]
#define SWIGTYPE_p_t_vpi_vlog_info swig_types[16]
#define SWIGTYPE_p_unsigned_char swig_types[17]
#define SWIGTYPE_p_unsigned_int swig_types[18]
#define SWIGTYPE_p_unsigned_short swig_types[19]
-#define SWIGTYPE_p_void swig_types[20]
-static swig_type_info *swig_types[22];
-static swig_module_info swig_module = {swig_types, 21, 0, 0, 0, 0};
+#define SWIGTYPE_p_va_list swig_types[20]
+#define SWIGTYPE_p_void swig_types[21]
+static swig_type_info *swig_types[23];
+static swig_module_info swig_module = {swig_types, 22, 0, 0, 0, 0};
#define SWIG_TypeQuery(name) SWIG_TypeQueryModule(&swig_module, &swig_module, name)
#define SWIG_MangledTypeQuery(name) SWIG_MangledTypeQueryModule(&swig_module, &swig_module, name)
/* -------- TYPES TABLE (END) -------- */
@@ -1509,11 +1510,11 @@
#define SWIG_as_voidptr(a) (void *)((const void *)(a))
#define SWIG_as_voidptrptr(a) ((void)SWIG_as_voidptr(*a),(void**)(a))
-#include "swig_vpi.h"
+#include "vpi_user.h"
#include <limits.h>
#ifndef LLONG_MIN
# define LLONG_MIN LONG_LONG_MIN
@@ -5941,32 +5942,38 @@
SWIGINTERN VALUE
_wrap_vpi_vprintf(int argc, VALUE *argv, VALUE self) {
PLI_BYTE8 *arg1 = (PLI_BYTE8 *) 0 ;
- int arg2 ;
+ va_list arg2 ;
PLI_INT32 result;
int res1 ;
char *buf1 = 0 ;
int alloc1 = 0 ;
- int val2 ;
- int ecode2 = 0 ;
+ void *argp2 ;
+ int res2 = 0 ;
VALUE vresult = Qnil;
if ((argc < 2) || (argc > 2)) {
rb_raise(rb_eArgError, "wrong # of arguments(%d for 2)",argc); SWIG_fail;
}
res1 = SWIG_AsCharPtrAndSize(argv[0], &buf1, NULL, &alloc1);
if (!SWIG_IsOK(res1)) {
SWIG_exception_fail(SWIG_ArgError(res1), "in method '" "vpi_vprintf" "', argument " "1"" of type '" "PLI_BYTE8 *""'");
}
arg1 = buf1;
- ecode2 = SWIG_AsVal_int(argv[1], &val2);
- if (!SWIG_IsOK(ecode2)) {
- SWIG_exception_fail(SWIG_ArgError(ecode2), "in method '" "vpi_vprintf" "', argument " "2"" of type '" "int""'");
- }
- arg2 = (int)(val2);
+ {
+ res2 = SWIG_ConvertPtr(argv[1], &argp2, SWIGTYPE_p_va_list, 0 );
+ if (!SWIG_IsOK(res2)) {
+ SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "vpi_vprintf" "', argument " "2"" of type '" "va_list""'");
+ }
+ if (!argp2) {
+ SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "vpi_vprintf" "', argument " "2"" of type '" "va_list""'");
+ } else {
+ arg2 = *((va_list *)(argp2));
+ }
+ }
result = (PLI_INT32)vpi_vprintf(arg1,arg2);
vresult = SWIG_From_int((int)(result));
if (alloc1 == SWIG_NEWOBJ) free((char*)buf1);
return vresult;
@@ -5978,19 +5985,19 @@
SWIGINTERN VALUE
_wrap_vpi_mcd_vprintf(int argc, VALUE *argv, VALUE self) {
PLI_UINT32 arg1 ;
PLI_BYTE8 *arg2 = (PLI_BYTE8 *) 0 ;
- int arg3 ;
+ va_list arg3 ;
PLI_INT32 result;
unsigned int val1 ;
int ecode1 = 0 ;
int res2 ;
char *buf2 = 0 ;
int alloc2 = 0 ;
- int val3 ;
- int ecode3 = 0 ;
+ void *argp3 ;
+ int res3 = 0 ;
VALUE vresult = Qnil;
if ((argc < 3) || (argc > 3)) {
rb_raise(rb_eArgError, "wrong # of arguments(%d for 3)",argc); SWIG_fail;
}
@@ -6002,15 +6009,21 @@
res2 = SWIG_AsCharPtrAndSize(argv[1], &buf2, NULL, &alloc2);
if (!SWIG_IsOK(res2)) {
SWIG_exception_fail(SWIG_ArgError(res2), "in method '" "vpi_mcd_vprintf" "', argument " "2"" of type '" "PLI_BYTE8 *""'");
}
arg2 = buf2;
- ecode3 = SWIG_AsVal_int(argv[2], &val3);
- if (!SWIG_IsOK(ecode3)) {
- SWIG_exception_fail(SWIG_ArgError(ecode3), "in method '" "vpi_mcd_vprintf" "', argument " "3"" of type '" "int""'");
- }
- arg3 = (int)(val3);
+ {
+ res3 = SWIG_ConvertPtr(argv[2], &argp3, SWIGTYPE_p_va_list, 0 );
+ if (!SWIG_IsOK(res3)) {
+ SWIG_exception_fail(SWIG_ArgError(res3), "in method '" "vpi_mcd_vprintf" "', argument " "3"" of type '" "va_list""'");
+ }
+ if (!argp3) {
+ SWIG_exception_fail(SWIG_ValueError, "invalid null reference " "in method '" "vpi_mcd_vprintf" "', argument " "3"" of type '" "va_list""'");
+ } else {
+ arg3 = *((va_list *)(argp3));
+ }
+ }
result = (PLI_INT32)vpi_mcd_vprintf(arg1,arg2,arg3);
vresult = SWIG_From_int((int)(result));
if (alloc2 == SWIG_NEWOBJ) free((char*)buf2);
return vresult;
@@ -6168,10 +6181,11 @@
static swig_type_info _swigt__p_t_vpi_vecval = {"_p_t_vpi_vecval", "struct t_vpi_vecval *", 0, 0, (void*)0, 0};
static swig_type_info _swigt__p_t_vpi_vlog_info = {"_p_t_vpi_vlog_info", "struct t_vpi_vlog_info *|p_vpi_vlog_info", 0, 0, (void*)0, 0};
static swig_type_info _swigt__p_unsigned_char = {"_p_unsigned_char", "unsigned char *|PLI_UBYTE8 *", 0, 0, (void*)0, 0};
static swig_type_info _swigt__p_unsigned_int = {"_p_unsigned_int", "unsigned int *|vpiHandle", 0, 0, (void*)0, 0};
static swig_type_info _swigt__p_unsigned_short = {"_p_unsigned_short", "unsigned short *|PLI_UINT16 *", 0, 0, (void*)0, 0};
+static swig_type_info _swigt__p_va_list = {"_p_va_list", "va_list *", 0, 0, (void*)0, 0};
static swig_type_info _swigt__p_void = {"_p_void", "void *", 0, 0, (void*)0, 0};
static swig_type_info *swig_type_initial[] = {
&_swigt__p_char,
&_swigt__p_f_p_char__int,
@@ -6191,10 +6205,11 @@
&_swigt__p_t_vpi_vecval,
&_swigt__p_t_vpi_vlog_info,
&_swigt__p_unsigned_char,
&_swigt__p_unsigned_int,
&_swigt__p_unsigned_short,
+ &_swigt__p_va_list,
&_swigt__p_void,
};
static swig_cast_info _swigc__p_char[] = { {&_swigt__p_char, 0, 0, 0},{0, 0, 0, 0}};
static swig_cast_info _swigc__p_f_p_char__int[] = { {&_swigt__p_f_p_char__int, 0, 0, 0},{0, 0, 0, 0}};
@@ -6214,10 +6229,11 @@
static swig_cast_info _swigc__p_t_vpi_vecval[] = { {&_swigt__p_t_vpi_vecval, 0, 0, 0},{0, 0, 0, 0}};
static swig_cast_info _swigc__p_t_vpi_vlog_info[] = { {&_swigt__p_t_vpi_vlog_info, 0, 0, 0},{0, 0, 0, 0}};
static swig_cast_info _swigc__p_unsigned_char[] = { {&_swigt__p_unsigned_char, 0, 0, 0},{0, 0, 0, 0}};
static swig_cast_info _swigc__p_unsigned_int[] = { {&_swigt__p_unsigned_int, 0, 0, 0},{0, 0, 0, 0}};
static swig_cast_info _swigc__p_unsigned_short[] = { {&_swigt__p_unsigned_short, 0, 0, 0},{0, 0, 0, 0}};
+static swig_cast_info _swigc__p_va_list[] = { {&_swigt__p_va_list, 0, 0, 0},{0, 0, 0, 0}};
static swig_cast_info _swigc__p_void[] = { {&_swigt__p_void, 0, 0, 0},{0, 0, 0, 0}};
static swig_cast_info *swig_cast_initial[] = {
_swigc__p_char,
_swigc__p_f_p_char__int,
@@ -6237,9 +6253,10 @@
_swigc__p_t_vpi_vecval,
_swigc__p_t_vpi_vlog_info,
_swigc__p_unsigned_char,
_swigc__p_unsigned_int,
_swigc__p_unsigned_short,
+ _swigc__p_va_list,
_swigc__p_void,
};
/* -------- TYPE CONVERSION AND EQUIVALENCE RULES (END) -------- */