Adjust for change in the size of the Go type int. Until some time in
the future, require a -intgosize option when invoking SWIG. Otherwise there is no reliable way for us to know the size of int, and we need to know. git-svn-id: https://swig.svn.sourceforge.net/svnroot/swig/trunk@13864 626c5289-ae23-0410-ae9c-e8d60b6d4f22
This commit is contained in:
Ian Lance Taylor
parent
fad2bd5e1e
commit
a42882dcee
5 changed files with 124 additions and 27 deletions
|
|
@ -93,6 +93,18 @@ swig -go -help
|
|||
<th>Go specific options</th>
|
||||
</tr>
|
||||
|
||||
<tr>
|
||||
<td>-intgo-type-size %lt;s%gt;</td>
|
||||
<td>Set the size for the Go type <tt>int</tt>. This controls the size
|
||||
that the C/C++ code expects to see. The %lt;s%gt; argument should
|
||||
be 32 or 64. This option is currently required during the
|
||||
transition from Go 1.0 to Go 1.1, as the size of <tt>int</tt> on
|
||||
64-bit x86 systems changes between those releases (from 32 bits to
|
||||
64 bits). In the future the option may become optional, and SWIG
|
||||
will assume that the size of <tt>int</tt> is the size of a C
|
||||
pointer.</td>
|
||||
</tr>
|
||||
|
||||
<tr>
|
||||
<td>-gccgo</td>
|
||||
<td>Generate code for gccgo. The default is to generate code for
|
||||
|
|
|
|||
|
|
@ -1169,6 +1169,7 @@ GO = @GO@
|
|||
GOGCC = @GOGCC@
|
||||
GO1 = @GO1@
|
||||
GOC = @GOC@
|
||||
GOOPT = @GOOPT@
|
||||
|
||||
GOSWIGARG = `if $(GOGCC) ; then echo -gccgo; fi`
|
||||
GOCOMPILEARG = `if $(GOGCC) ; then echo -c -g; elif $(GO1) ; then echo tool $(GOC:c=g) ; fi`
|
||||
|
|
@ -1191,7 +1192,7 @@ GOGCCOBJS = $(GOSRCS:.go=.@OBJEXT@)
|
|||
# ----------------------------------------------------------------
|
||||
|
||||
go: $(SRCS)
|
||||
$(SWIG) -go $(GOSWIGARG) $(SWIGOPT) $(INTERFACEPATH)
|
||||
$(SWIG) -go $(GOOPT) $(GOSWIGARG) $(SWIGOPT) $(INTERFACEPATH)
|
||||
$(CC) -g -c $(CCSHARED) $(CFLAGS) $(SRCS) $(ISRCS) $(INCLUDES)
|
||||
$(LDSHARED) $(CFLAGS) $(OBJS) $(IOBJS) $(LIBS) -o $(LIBPREFIX)$(TARGET)$(SO)
|
||||
$(COMPILETOOL) $(GO) $(GOCOMPILEARG) -I . $(GOSRCS)
|
||||
|
|
@ -1205,7 +1206,7 @@ go: $(SRCS)
|
|||
# ----------------------------------------------------------------
|
||||
|
||||
go_cpp: $(SRCS)
|
||||
$(SWIG) -go -c++ $(GOSWIGARG) $(SWIGOPT) $(INTERFACEPATH)
|
||||
$(SWIG) -go -c++ $(GOOPT) $(GOSWIGARG) $(SWIGOPT) $(INTERFACEPATH)
|
||||
$(CXX) -g -c $(CCSHARED) $(CFLAGS) $(SRCS) $(CXXSRCS) $(ICXXSRCS) $(INCLUDES)
|
||||
$(CXXSHARED) $(CFLAGS) $(OBJS) $(IOBJS) $(LIBS) $(CPP_DLLIBS) -o $(LIBPREFIX)$(TARGET)$(SO)
|
||||
$(COMPILETOOL) $(GO) $(GOCOMPILEARG) -I . $(GOSRCS)
|
||||
|
|
|
|||
|
|
@ -5,12 +5,32 @@
|
|||
* ------------------------------------------------------------ */
|
||||
|
||||
%insert(runtime) %{
|
||||
#include <stddef.h>
|
||||
#include <stdio.h>
|
||||
#include <stdlib.h>
|
||||
#include <string.h>
|
||||
#include <sys/types.h>
|
||||
|
||||
typedef struct { char *p; int n; } _gostring_;
|
||||
typedef struct { void* array; unsigned int len; unsigned int cap; } _goslice_;
|
||||
%}
|
||||
|
||||
#if SWIGGO_INTGO_SIZE == 32
|
||||
%insert(runtime) %{
|
||||
typedef int intgo;
|
||||
%}
|
||||
#elif SWIGGO_INTGO_SIZE == 64
|
||||
%insert(runtime) %{
|
||||
typedef long long intgo;
|
||||
%}
|
||||
#else
|
||||
%insert(runtime) %{
|
||||
typedef ptrdiff_t intgo;
|
||||
%}
|
||||
#endif
|
||||
|
||||
%insert(runtime) %{
|
||||
|
||||
typedef struct { char *p; intgo n; } _gostring_;
|
||||
typedef struct { void* array; intgo len; intgo cap; } _goslice_;
|
||||
|
||||
%}
|
||||
|
||||
|
|
|
|||
|
|
@ -28,6 +28,8 @@ class GO:public Language {
|
|||
String *soname;
|
||||
// Size in bits of the C type "long".
|
||||
int long_type_size;
|
||||
// Size in bits of the Go type "int". 0 if not specified.
|
||||
int intgo_type_size;
|
||||
|
||||
/* Output files */
|
||||
File *f_c_begin;
|
||||
|
|
@ -88,6 +90,7 @@ public:
|
|||
go_prefix(NULL),
|
||||
soname(NULL),
|
||||
long_type_size(32),
|
||||
intgo_type_size(0),
|
||||
f_c_begin(NULL),
|
||||
f_go_begin(NULL),
|
||||
f_gc_begin(NULL),
|
||||
|
|
@ -173,6 +176,19 @@ private:
|
|||
} else {
|
||||
Swig_arg_error();
|
||||
}
|
||||
} else if (strcmp(argv[i], "-intgosize") == 0) {
|
||||
if (argv[i + 1]) {
|
||||
intgo_type_size = atoi(argv[i + 1]);
|
||||
if (intgo_type_size != 32 && intgo_type_size != 64) {
|
||||
Printf(stderr, "-intgosize not 32 or 64\n");
|
||||
Swig_arg_error();
|
||||
}
|
||||
Swig_mark_arg(i);
|
||||
Swig_mark_arg(i + 1);
|
||||
++i;
|
||||
} else {
|
||||
Swig_arg_error();
|
||||
}
|
||||
} else if (strcmp(argv[i], "-help") == 0) {
|
||||
Printf(stdout, "%s\n", usage);
|
||||
}
|
||||
|
|
@ -196,6 +212,22 @@ private:
|
|||
Preprocessor_define("SWIGGO_LONG_TYPE_SIZE 64", 0);
|
||||
}
|
||||
|
||||
// This test may be removed in the future, when we can assume that
|
||||
// everybody has upgraded to Go 1.1. The code below is prepared
|
||||
// for this test to simply be taken out.
|
||||
if (intgo_type_size == 0) {
|
||||
Printf(stderr, "SWIG -go: -intgosize option required but not specified\n");
|
||||
SWIG_exit(EXIT_FAILURE);
|
||||
}
|
||||
|
||||
if (intgo_type_size == 32) {
|
||||
Preprocessor_define("SWIGGO_INTGO_SIZE 32", 0);
|
||||
} else if (intgo_type_size == 64) {
|
||||
Preprocessor_define("SWIGGO_INTGO_SIZE 64", 0);
|
||||
} else {
|
||||
Preprocessor_define("SWIGGO_INTGO_SIZE 0", 0);
|
||||
}
|
||||
|
||||
// Add typemap definitions.
|
||||
SWIG_typemap_lang("go");
|
||||
SWIG_config_file("go.swg");
|
||||
|
|
@ -1130,9 +1162,8 @@ private:
|
|||
// A string has a pointer and a length.
|
||||
Append(orig, "(2 * SWIG_PARM_SIZE)");
|
||||
} else if (Strncmp(go, "[]", 2) == 0) {
|
||||
// A slice has a pointer, a length, and a capacity. The
|
||||
// length and capacity are always 4 bytes.
|
||||
Append(orig, "(SWIG_PARM_SIZE + 8)");
|
||||
// A slice has a pointer, a length, and a capacity.
|
||||
Append(orig, "(3 * SWIG_PARM_SIZE)");
|
||||
} else if (Strcmp(go, "float64") == 0) {
|
||||
Append(orig, "8");
|
||||
} else if (Strcmp(go, "complex64") == 0) {
|
||||
|
|
@ -1186,7 +1217,7 @@ private:
|
|||
Printv(f->code, "\tstruct swigargs {\n", NULL);
|
||||
|
||||
if (parm_count > required_count) {
|
||||
Printv(f->code, "\t\tint _swig_optargc;\n", NULL);
|
||||
Printv(f->code, "\t\tintgo _swig_optargc;\n", NULL);
|
||||
}
|
||||
|
||||
Parm *p = parms;
|
||||
|
|
@ -1298,7 +1329,7 @@ private:
|
|||
Printv(fnname, go_prefix, "_", wname, "(", NULL);
|
||||
|
||||
if (parm_count > required_count) {
|
||||
Printv(fnname, "int _swig_optargc", NULL);
|
||||
Printv(fnname, "intgo _swig_optargc", NULL);
|
||||
}
|
||||
|
||||
Parm *p = parms;
|
||||
|
|
@ -4614,19 +4645,20 @@ private:
|
|||
bool is_member = Strcmp(gt, "_swig_memberptr") == 0;
|
||||
bool is_complex64 = Strcmp(gt, "complex64") == 0;
|
||||
bool is_complex128 = Strcmp(gt, "complex128") == 0;
|
||||
bool is_char = false;
|
||||
bool is_short = false;
|
||||
bool is_int = false;
|
||||
bool is_long = false;
|
||||
bool is_float = false;
|
||||
bool is_double = false;
|
||||
bool is_int8 = false;
|
||||
bool is_int16 = false;
|
||||
bool is_int = Strcmp(gt, "int") == 0 || Strcmp(gt, "uint") == 0;
|
||||
bool is_int32 = false;
|
||||
bool is_int64 = false;
|
||||
bool is_float32 = false;
|
||||
bool is_float64 = false;
|
||||
if ((n != NULL && Getattr(n, "tmap:gotype") != NULL) || hasGoTypemap(n, type)) {
|
||||
is_char = Strcmp(gt, "int8") == 0 || Strcmp(gt, "uint8") == 0 || Strcmp(gt, "byte") == 0;
|
||||
is_short = Strcmp(gt, "int16") == 0 || Strcmp(gt, "uint16") == 0;
|
||||
is_int = Strcmp(gt, "int") == 0 || Strcmp(gt, "int32") == 0 || Strcmp(gt, "uint32") == 0;
|
||||
is_long = Strcmp(gt, "int64") == 0 || Strcmp(gt, "uint64") == 0;
|
||||
is_float = Strcmp(gt, "float32") == 0;
|
||||
is_double = Strcmp(gt, "float64") == 0;
|
||||
is_int8 = Strcmp(gt, "int8") == 0 || Strcmp(gt, "uint8") == 0 || Strcmp(gt, "byte") == 0;
|
||||
is_int16 = Strcmp(gt, "int16") == 0 || Strcmp(gt, "uint16") == 0;
|
||||
is_int32 = Strcmp(gt, "int32") == 0 || Strcmp(gt, "uint32") == 0;
|
||||
is_int64 = Strcmp(gt, "int64") == 0 || Strcmp(gt, "uint64") == 0;
|
||||
is_float32 = Strcmp(gt, "float32") == 0;
|
||||
is_float64 = Strcmp(gt, "float64") == 0;
|
||||
}
|
||||
Delete(gt);
|
||||
|
||||
|
|
@ -4677,7 +4709,12 @@ private:
|
|||
if (Strcmp(q, "const") == 0) {
|
||||
SwigType_del_qualifier(t);
|
||||
if (hasGoTypemap(n, t) || SwigType_ispointer(t)) {
|
||||
ret = SwigType_lstr(t, name);
|
||||
if (is_int) {
|
||||
ret = NewString("intgo ");
|
||||
Append(ret, name);
|
||||
} else {
|
||||
ret = SwigType_lstr(t, name);
|
||||
}
|
||||
Delete(q);
|
||||
Delete(t);
|
||||
return ret;
|
||||
|
|
@ -4687,17 +4724,19 @@ private:
|
|||
}
|
||||
}
|
||||
Delete(t);
|
||||
if (is_char) {
|
||||
if (is_int8) {
|
||||
ret = NewString("char ");
|
||||
} else if (is_short) {
|
||||
} else if (is_int16) {
|
||||
ret = NewString("short ");
|
||||
} else if (is_int) {
|
||||
ret = NewString("intgo ");
|
||||
} else if (is_int32) {
|
||||
ret = NewString("int ");
|
||||
} else if (is_long) {
|
||||
} else if (is_int64) {
|
||||
ret = NewString("long long ");
|
||||
} else if (is_float) {
|
||||
} else if (is_float32) {
|
||||
ret = NewString("float ");
|
||||
} else if (is_double) {
|
||||
} else if (is_float64) {
|
||||
ret = NewString("double ");
|
||||
} else {
|
||||
return SwigType_lstr(type, name);
|
||||
|
|
@ -4871,6 +4910,7 @@ Go Options (available with -go)\n\
|
|||
-gccgo - Generate code for gccgo rather than 6g/8g\n\
|
||||
-go-prefix <p> - Like gccgo -fgo-prefix option\n\
|
||||
-longsize <s> - Set size of C/C++ long type--32 or 64 bits\n\
|
||||
-intgosize <s> - Set size of Go int type--32 or 64 bits\n\
|
||||
-package <name> - Set name of the Go package to <name>\n\
|
||||
-soname <name> - Set shared library holding C/C++ code to <name>\n\
|
||||
\n";
|
||||
|
|
|
|||
24
configure.in
24
configure.in
|
|
@ -2055,6 +2055,7 @@ if test x"${GOBIN}" = xno -o x"${with_alllang}" = xno ; then
|
|||
GOC=
|
||||
GO1=false
|
||||
GOGCC=false
|
||||
GOOPT=
|
||||
else
|
||||
|
||||
if test "x$GOBIN" = xyes; then
|
||||
|
|
@ -2065,6 +2066,7 @@ else
|
|||
|
||||
GOGCC=false
|
||||
GO1=false
|
||||
GOOPT=
|
||||
if test -n "$GO" ; then
|
||||
if $GO --help 2>/dev/null | grep gccgo >/dev/null 2>&1 ; then
|
||||
GOGCC=true
|
||||
|
|
@ -2074,10 +2076,30 @@ else
|
|||
AC_MSG_RESULT([yes - minimum version is 4.7.0])
|
||||
else
|
||||
AC_MSG_RESULT([no])
|
||||
if test "$go_version" -lt 480; then
|
||||
GOOPT="-intgosize 32"
|
||||
else
|
||||
AC_CHECK_SIZEOF([void *], [4])
|
||||
if test "$ac_cv_sizeof_void_p" = "8"; then
|
||||
GOOPT="-intgosize 64"
|
||||
else
|
||||
GOOPT="-intgosize 32"
|
||||
fi
|
||||
fi
|
||||
fi
|
||||
elif test "`echo $GO | sed -e 's|.*/||'`" = "go"; then
|
||||
GO1=true
|
||||
GOC=$(sh -c "$(go env) && echo \$GOCHAR")c
|
||||
go_version=$($GO version | sed -e 's/go version //')
|
||||
case $go_version in
|
||||
go1.0*) GOOPT="-intgosize 32" ;;
|
||||
*) if test "$GOC" = "6c"; then
|
||||
GOOPT="-intgosize 64"
|
||||
else
|
||||
GOOPT="-intgosize 32"
|
||||
fi
|
||||
;;
|
||||
esac
|
||||
else
|
||||
GOC=`echo $GO | sed -e 's/g/c/'`
|
||||
AC_MSG_CHECKING([whether Go ($GO) version is too old])
|
||||
|
|
@ -2089,6 +2111,7 @@ else
|
|||
else
|
||||
AC_MSG_RESULT([no])
|
||||
fi
|
||||
GOOPT="-intgosize 32"
|
||||
fi
|
||||
fi
|
||||
fi
|
||||
|
|
@ -2097,6 +2120,7 @@ AC_SUBST(GOGCC)
|
|||
AC_SUBST(GO)
|
||||
AC_SUBST(GOC)
|
||||
AC_SUBST(GO1)
|
||||
AC_SUBST(GOOPT)
|
||||
|
||||
#----------------------------------------------------------------
|
||||
# Look for D
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue