diff options
| author | green <green@138bc75d-0d04-0410-961f-82ee72b054a4> | 1999-08-10 05:32:23 +0000 |
|---|---|---|
| committer | green <green@138bc75d-0d04-0410-961f-82ee72b054a4> | 1999-08-10 05:32:23 +0000 |
| commit | dc9f8d59effacbdd8d1193cf000393dd8561206b (patch) | |
| tree | 9c08b881a7b585b2167568feb299be46b2919659 /libjava/include/java-interp.h | |
| parent | 7ce928ee23a784a5aeea6324e26f990e5da02a0c (diff) | |
| download | gcc-dc9f8d59effacbdd8d1193cf000393dd8561206b.tar.gz | |
Mon Aug 9 18:33:38 1999 Rainer Orth <ro@TechFak.Uni-Bielefeld.DE>
* Makefile: Rebuilt.
* Makefile.am (toolexeclibdir): Add $(MULTISUBDIR) even for native
builds.
* java/net/natPlainSocketImpl.cc: Include <sys/select.h> only if
present.
* configure: Rebuilt.
* configure.in: Properly align --help output, fix capitalization
and punctuation.
* acinclude.m4: Likewise.
1999-08-09 Kresten Krab Thorup <krab@gnu.org>
* include/javaprims.h (_Jv_word, _Jv_word2): New types.
* include/java-interp.h (_Jv_InterpMethodInvocation): Use _Jv_word.
(_Jv_callInterpretedMethod): Unused. Remove.
(_Jv_InterpMethod::run,run_normal,run_synch_object,run_synch_class):
Use ffi_raw.
* include/java-cpool.h (_Jv_get, _Jv_put): Remove.
(_Jv_{store,load}{Indexes,Int,Float,Long,Double}): Use _Jv_word.
* boehm.cc (_Jv_MarkObj): Use _Jv_word.
* interpret.cc: use _Jv_word.
* defineclass.cc: use_Jv_word.
* resolve.cc: Use _Jv_word.
(_Jv_ResolvePoolEntry): Return _Jv_word.
* java/lang/Class.h (_Jv_Constants): Use _Jv_word for cpool.
* java/lang/natClassLoader.cc (_Jv_InternClassStrings): Use _Jv_word.
* interpret.cc (gnu::gcj::runtime::MethodInvocation::continue1):
Change comment.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@28641 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'libjava/include/java-interp.h')
| -rw-r--r-- | libjava/include/java-interp.h | 21 |
1 files changed, 8 insertions, 13 deletions
diff --git a/libjava/include/java-interp.h b/libjava/include/java-interp.h index 70feec19beb..ffd53a868ab 100644 --- a/libjava/include/java-interp.h +++ b/libjava/include/java-interp.h @@ -105,11 +105,11 @@ class _Jv_InterpMethod { void *ncode (); void continue1 (_Jv_InterpMethodInvocation *inv); - static void run_normal (ffi_cif*, void*, void**, void*); - static void run_synch_object (ffi_cif*, void*, void**, void*); - static void run_synch_class (ffi_cif*, void*, void**, void*); + static void run_normal (ffi_cif*, void*, ffi_raw*, void*); + static void run_synch_object (ffi_cif*, void*, ffi_raw*, void*); + static void run_synch_class (ffi_cif*, void*, ffi_raw*, void*); - inline jobject run (ffi_cif*, void*, void**, + inline jobject run (ffi_cif*, void*, ffi_raw*, _Jv_InterpMethodInvocation*); bool find_exception (jobject ex, @@ -123,21 +123,16 @@ class _Jv_InterpMethod { friend class gnu::gcj::runtime::MethodInvocation; friend void _Jv_PrepareClass(jclass); - - friend void _Jv_callInterpretedMethod (ffi_cif*, - void*, - void **, - void*); }; class _Jv_InterpMethodInvocation { _Jv_InterpMethod *running; - void **sp; + _Jv_word *sp; unsigned char *pc; - void* state[0]; + _Jv_word state[0]; - void** stack_base () { return &state[0]; } - void** local_base () { return &state[running->max_stack]; } + _Jv_word* stack_base () { return &state[0]; } + _Jv_word* local_base () { return &state[running->max_stack]; } friend class _Jv_InterpMethod; }; |