FreeChainXenon/gcc
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

natMethod.cc (get_ffi_type): Test size of jboolean and select correct ffi type on that basis.

Browse source 
* java/lang/reflect/natMethod.cc (get_ffi_type): Test size of
	jboolean and select correct ffi type on that basis.
	(_Jv_CallNonvirtualMethodA): Handle `void' return type.
	Constructor call always has `void' return type.

From-SVN: r31242
This commit is contained in:
Tom Tromey 2000-01-05 17:23:34 +00:00 • committed by Tom Tromey
parent 95c6cc0ab5
commit 5dab1948f6
2 changed files with 24 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
libjava/ChangeLog
View file

@ -1,3 +1,10 @@
2000-01-05 Tom Tromey <tromey@cygnus.com>
* java/lang/reflect/natMethod.cc (get_ffi_type): Test size of
jboolean and select correct ffi type on that basis.
(_Jv_CallNonvirtualMethodA): Handle `void' return type.
Constructor call always has `void' return type.
2000-01-04 Tom Tromey <tromey@cygnus.com>
* java/lang/Class.h (getSignature): Updated.

21
libjava/java/lang/reflect/natMethod.cc
View file

@ -131,8 +131,14 @@ get_ffi_type (jclass klass)
r = &ffi_type_double;
else if (klass == JvPrimClass (boolean))
{
// FIXME.
r = &ffi_type_sint8;
// On some platforms a bool is a byte, on others an int.
if (sizeof (jboolean) == sizeof (jbyte))
r = &ffi_type_sint8;
else
{
JvAssert (sizeof (jboolean) == sizeof (jint));
r = &ffi_type_sint32;
}
}
else if (klass == JvPrimClass (char))
r = &ffi_type_uint16;
@ -333,7 +339,12 @@ _Jv_CallNonvirtualMethodA (jobject obj,
if (needs_this)
++param_count;
ffi_type *rtype = get_ffi_type (return_type);
ffi_type *rtype;
// A constructor itself always returns void.
if (is_constructor || return_type == JvPrimClass (void))
rtype = &ffi_type_void;
else
rtype = get_ffi_type (return_type);
ffi_type **argtypes = (ffi_type **) alloca (param_count
* sizeof (ffi_type *));
@ -451,7 +462,9 @@ _Jv_CallNonvirtualMethodA (jobject obj,
jobject r;
#define VAL(Wrapper, Type) (new Wrapper (* (Type *) &ret_value))
if (return_type == JvPrimClass (byte))
if (is_constructor)
r = obj;
else if (return_type == JvPrimClass (byte))
r = VAL (java::lang::Byte, jbyte);
else if (return_type == JvPrimClass (short))
r = VAL (java::lang::Short, jshort);