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

[multiple changes]

Browse source 
2000-08-02  Bryce McKinlay  <bryce@albatross.co.nz>

        * interpret.cc (_Jv_InterpMethod::continue1): Type of `fun' changed
	to match C declaration in ffi.h.
	* Makefile.am: Add java/awt/Button.java.
	* Makefile.in: Rebuilt.

2000-07-29  Alexandre Petit-Bianco  <apbianco@cygnus.com>

        * java/lang/reflect/natMethod.cc (_Jv_CallAnyMethodA): Type of the
        cast of the second argument to `ffi_raw_call' changed to match
        prototype.

2000-07-26  Alexandre Petit-Bianco  <apbianco@cygnus.com>

        * jni.cc (_Jv_JNIMethod::call): Type of the cast of the second
        argument to `ffi_raw_call' changed to match prototype.

From-SVN: r35418
This commit is contained in:
Bryce McKinlay 2000-08-02 04:25:13 +01:00
parent cb7c7fc50e
commit 79c2c6da2c
6 changed files with 37 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

18
libjava/ChangeLog
View file

@ -1,3 +1,21 @@
2000-08-02 Bryce McKinlay <bryce@albatross.co.nz>
* interpret.cc (_Jv_InterpMethod::continue1): Type of `fun' changed
to match C declaration in ffi.h.
* Makefile.am: Add java/awt/Button.java.
* Makefile.in: Rebuilt.
2000-07-29 Alexandre Petit-Bianco <apbianco@cygnus.com>
* java/lang/reflect/natMethod.cc (_Jv_CallAnyMethodA): Type of the
cast of the second argument to `ffi_raw_call' changed to match
prototype.
2000-07-26 Alexandre Petit-Bianco <apbianco@cygnus.com>
* jni.cc (_Jv_JNIMethod::call): Type of the cast of the second
argument to `ffi_raw_call' changed to match prototype.
2000-07-31 Bryce McKinlay <bryce@albatross.co.nz>
* java/awt/Component.java (toString): Implemented.

1
libjava/Makefile.am
View file

@ -494,6 +494,7 @@ java/awt/AWTEventMulticaster.java \
java/awt/AWTException.java \
java/awt/ActiveEvent.java \
java/awt/Adjustable.java \
java/awt/Button.java \
java/awt/BorderLayout.java \
java/awt/CheckboxGroup.java \
java/awt/Color.java \

18
libjava/Makefile.in
View file

@ -270,6 +270,7 @@ java/awt/AWTEventMulticaster.java \
java/awt/AWTException.java \
java/awt/ActiveEvent.java \
java/awt/Adjustable.java \
java/awt/Button.java \
java/awt/BorderLayout.java \
java/awt/CheckboxGroup.java \
java/awt/Color.java \
@ -1048,14 +1049,15 @@ DEP_FILES = .deps/$(srcdir)/$(CONVERT_DIR)/gen-from-JIS.P \
.deps/java/awt/AWTError.P .deps/java/awt/AWTEvent.P \
.deps/java/awt/AWTEventMulticaster.P .deps/java/awt/AWTException.P \
.deps/java/awt/ActiveEvent.P .deps/java/awt/Adjustable.P \
.deps/java/awt/BorderLayout.P .deps/java/awt/CheckboxGroup.P \
.deps/java/awt/Color.P .deps/java/awt/Component.P \
.deps/java/awt/ComponentOrientation.P .deps/java/awt/Container.P \
.deps/java/awt/Cursor.P .deps/java/awt/Dimension.P \
.deps/java/awt/Event.P .deps/java/awt/EventDispatchThread.P \
.deps/java/awt/EventQueue.P .deps/java/awt/Font.P \
.deps/java/awt/FontMetrics.P .deps/java/awt/Frame.P \
.deps/java/awt/Graphics.P .deps/java/awt/GraphicsConfiguration.P \
.deps/java/awt/BorderLayout.P .deps/java/awt/Button.P \
.deps/java/awt/CheckboxGroup.P .deps/java/awt/Color.P \
.deps/java/awt/Component.P .deps/java/awt/ComponentOrientation.P \
.deps/java/awt/Container.P .deps/java/awt/Cursor.P \
.deps/java/awt/Dimension.P .deps/java/awt/Event.P \
.deps/java/awt/EventDispatchThread.P .deps/java/awt/EventQueue.P \
.deps/java/awt/Font.P .deps/java/awt/FontMetrics.P \
.deps/java/awt/Frame.P .deps/java/awt/Graphics.P \
.deps/java/awt/GraphicsConfiguration.P \
.deps/java/awt/IllegalComponentStateException.P .deps/java/awt/Image.P \
.deps/java/awt/Insets.P .deps/java/awt/ItemSelectable.P \
.deps/java/awt/Label.P .deps/java/awt/LayoutManager.P \

12
libjava/interpret.cc
View file

@ -406,7 +406,7 @@ void _Jv_InterpMethod::continue1 (_Jv_InterpMethodInvocation *inv)
_Jv_word *pool_data = defining_class->constants.data;
/* these two are used in the invokeXXX instructions */
void (*fun)(...);
void (*fun)();
_Jv_ResolvedMethod* rmeth;
#define INSN_LABEL(op) &&insn_##op
@ -684,13 +684,13 @@ void _Jv_InterpMethod::continue1 (_Jv_InterpMethodInvocation *inv)
{
// final methods do not appear in the vtable,
// if it does not appear in the superclass.
fun = (void (*) (...)) rmeth->method->ncode;
fun = (void (*)()) rmeth->method->ncode;
}
else
{
jobject rcv = sp[0].o;
_Jv_VTable *table = *(_Jv_VTable**)rcv;
fun = (void (*) (...))table->method[rmeth->vtable_index];
fun = (void (*)()) table->method[rmeth->vtable_index];
}
}
goto perform_invoke;
@ -2149,7 +2149,7 @@ void _Jv_InterpMethod::continue1 (_Jv_InterpMethodInvocation *inv)
NULLCHECK(sp[0]);
fun = (void (*) (...))rmeth->method->ncode;
fun = (void (*)()) rmeth->method->ncode;
}
goto perform_invoke;
@ -2163,7 +2163,7 @@ void _Jv_InterpMethod::continue1 (_Jv_InterpMethodInvocation *inv)
sp -= rmeth->stack_item_count;
_Jv_InitClass (rmeth->klass);
fun = (void (*) (...))rmeth->method->ncode;
fun = (void (*)()) rmeth->method->ncode;
}
goto perform_invoke;
@ -2182,7 +2182,7 @@ void _Jv_InterpMethod::continue1 (_Jv_InterpMethodInvocation *inv)
jobject rcv = sp[0].o;
fun = (void (*) (...))
fun = (void (*)())
_Jv_LookupInterfaceMethod (rcv->getClass (),
rmeth->method->name,
rmeth->method->signature);

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

@ -414,7 +414,7 @@ _Jv_CallAnyMethodA (jobject obj,
try
{
ffi_call (&cif, (void (*) (...)) meth->ncode, result, values);
ffi_call (&cif, (void (*)()) meth->ncode, result, values);
}
catch (Throwable *ex2)
{

2
libjava/jni.cc
View file

@ -1784,7 +1784,7 @@ _Jv_JNIMethod::call (ffi_cif *, void *ret, ffi_raw *args, void *__this)
memcpy (&real_args[offset], args, _this->args_raw_size);
// The actual call to the JNI function.
ffi_raw_call (&_this->jni_cif, (void (*) (...)) _this->function,
ffi_raw_call (&_this->jni_cif, (void (*)()) _this->function,
ret, real_args);
_Jv_JNI_PopSystemFrame (env);