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

defineclass.cc: Include alloca.h only if HAVE_ALLOCA_H.

Browse source 
* defineclass.cc: Include alloca.h only if HAVE_ALLOCA_H.
* java/lang/natDouble.cc: Likewise.
* java/lang/reflect/natMethod.cc: Likewise.
* interpret.cc: Likewise.  Fix NULLCHECKs that tested a _Jv_word.

From-SVN: r36404
This commit is contained in:
Alexandre Oliva 2000-09-14 07:51:56 +00:00 • committed by Alexandre Oliva
parent 597c1b349f
commit e7e18a21d2
5 changed files with 20 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

7
libjava/ChangeLog
View file

@ -1,3 +1,10 @@
2000-09-14 Alexandre Oliva <aoliva@redhat.com>
* defineclass.cc: Include alloca.h only if HAVE_ALLOCA_H.
* java/lang/natDouble.cc: Likewise.
* java/lang/reflect/natMethod.cc: Likewise.
* interpret.cc: Likewise. Fix NULLCHECKs that tested a _Jv_word.
2000-09-13 Alexandre Oliva <aoliva@redhat.com> 2000-09-13 Alexandre Oliva <aoliva@redhat.com>
* configure.in (LIBDATASTARTSPEC): Use `%s' to search for * configure.in (LIBDATASTARTSPEC): Use `%s' to search for

2
libjava/defineclass.cc
View file

@ -24,7 +24,9 @@ details. */
#ifdef INTERPRETER #ifdef INTERPRETER
#if HAVE_ALLOCA_H
#include <alloca.h> #include <alloca.h>
#endif
#include <java-cpool.h> #include <java-cpool.h>
#include <gcj/cni.h> #include <gcj/cni.h>

11
libjava/interpret.cc
View file

@ -35,7 +35,9 @@ details. */
#ifdef INTERPRETER #ifdef INTERPRETER
#if HAVE_ALLOCA_H
#include <alloca.h> #include <alloca.h>
#endif
#define ClassError _CL_Q34java4lang5Error #define ClassError _CL_Q34java4lang5Error
extern java::lang::Class ClassError; extern java::lang::Class ClassError;
@ -51,7 +53,7 @@ static void throw_null_pointer_exception ()
__attribute__ ((__noreturn__)); __attribute__ ((__noreturn__));
#endif #endif
extern "C" double __ieee754_fmod __P((double,double)); extern "C" double __ieee754_fmod (double,double);
static inline void dupx (_Jv_word *sp, int n, int x) static inline void dupx (_Jv_word *sp, int n, int x)
{ {
@ -678,7 +680,7 @@ void _Jv_InterpMethod::continue1 (_Jv_InterpMethodInvocation *inv)
rmeth = (_Jv_ResolvePoolEntry (defining_class, index)).rmethod; rmeth = (_Jv_ResolvePoolEntry (defining_class, index)).rmethod;
sp -= rmeth->stack_item_count; sp -= rmeth->stack_item_count;
NULLCHECK(sp[0]); NULLCHECK (sp[0].o);
if (rmeth->vtable_index == -1) if (rmeth->vtable_index == -1)
{ {
@ -2147,7 +2149,7 @@ void _Jv_InterpMethod::continue1 (_Jv_InterpMethodInvocation *inv)
sp -= rmeth->stack_item_count; sp -= rmeth->stack_item_count;
NULLCHECK(sp[0]); NULLCHECK (sp[0].o);
fun = (void (*)()) rmeth->method->ncode; fun = (void (*)()) rmeth->method->ncode;
} }
@ -2178,10 +2180,11 @@ void _Jv_InterpMethod::continue1 (_Jv_InterpMethodInvocation *inv)
rmeth = (_Jv_ResolvePoolEntry (defining_class, index)).rmethod; rmeth = (_Jv_ResolvePoolEntry (defining_class, index)).rmethod;
sp -= rmeth->stack_item_count; sp -= rmeth->stack_item_count;
NULLCHECK(sp[0]);
jobject rcv = sp[0].o; jobject rcv = sp[0].o;
NULLCHECK (rcv);
fun = (void (*)()) fun = (void (*)())
_Jv_LookupInterfaceMethod (rcv->getClass (), _Jv_LookupInterfaceMethod (rcv->getClass (),
rmeth->method->name, rmeth->method->name,

2
libjava/java/lang/natDouble.cc
View file

@ -10,7 +10,9 @@ details. */
#include <config.h> #include <config.h>
#if HAVE_ALLOCA_H
#include <alloca.h> #include <alloca.h>
#endif
#include <stdlib.h> #include <stdlib.h>

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

@ -10,7 +10,9 @@ details. */
#include <config.h> #include <config.h>
#if HAVE_ALLOCA_H
#include <alloca.h> #include <alloca.h>
#endif
#include <gcj/cni.h> #include <gcj/cni.h>
#include <jvm.h> #include <jvm.h>