bc71e4a22b
2005-02-23 Thomas Fitzsimmons <fitzsim@redhat.com> PR libgcj/16923 * gcj.texi (Invocation): Add descriptions of JvVMInitArgs and JvVMOption. 2005-02-23 Thomas Fitzsimmons <fitzsim@redhat.com> PR libgcj/16923 * jni.cc (JNI_CreateJavaVM): Check JNI version. Cast args to JvVMInitArgs. Pass args to _Jv_CreateJavaVM and check return value. Move argument parsing code to prims.cc. * prims.cc (no_properties): Remove. (_Jv_Compiler_Properties): Initialize to NULL. (_Jv_Properties_Count): Initialize to 0. (parse_verbose_args): New function. (parse_init_args): New function. (_Jv_CreateJavaVM): Call parse_init_args. (_Jv_RunMain): Check return value of _Jv_CreateJavaVM. * gcj/cni.h (JvVMOption): New struct. (JvVMInitArgs): Likewise. (JvCreateJavaVM): Declare vm_args as JvVMInitArgs* rather than void*. * libjava/gcj/javaprims.h (_Jv_VMOption): New struct. (_Jv_VMInitArgs): Likewise. * include/java-props.h (_Jv_Properties_Count): Declare. * java/lang/natRuntime.cc (insertSystemProperties): Use _Jv_Properties_Count in for loop exit condition. * testsuite/libjava.jni/jni.exp (gcj_invocation_compile_c_to_binary): New procedure. (gcj_invocation_test_one): Likewise. (gcj_jni_run): Run JNI invocation API tests. * testsuite/libjava.jni/invocation/PR16923.c, testsuite/libjava.jni/invocation/PR16923.java, testsuite/libjava.jni/invocation/PR16923.out: New test. From-SVN: r95459
143 lines
2.8 KiB
C++
143 lines
2.8 KiB
C++
// gcj/cni.h -*- c++ -*-
|
|
// This file describes the Compiled Native Interface, CNI.
|
|
// It provides a nicer interface to many of the things in gcj/javaprims.h.
|
|
|
|
/* Copyright (C) 1998, 1999, 2002 Free Software Foundation
|
|
|
|
This file is part of libgcj.
|
|
|
|
This software is copyrighted work licensed under the terms of the
|
|
Libgcj License. Please consult the file "LIBGCJ_LICENSE" for
|
|
details. */
|
|
|
|
#ifndef __GCJ_CNI_H__
|
|
#define __GCJ_CNI_H__
|
|
|
|
#include <java/lang/Object.h>
|
|
#include <java/lang/Class.h>
|
|
|
|
#include <gcj/array.h>
|
|
#include <gcj/javaprims.h>
|
|
|
|
#include <string.h>
|
|
|
|
extern "C" void _Jv_InitClass (jclass);
|
|
extern "C" void *_Jv_AllocBytes (jsize size) __attribute__((__malloc__));
|
|
|
|
extern inline void
|
|
JvInitClass (jclass cls)
|
|
{
|
|
return _Jv_InitClass (cls);
|
|
}
|
|
|
|
extern inline void *
|
|
JvAllocBytes (jsize sz)
|
|
{
|
|
return _Jv_AllocBytes (sz);
|
|
}
|
|
|
|
extern inline jstring
|
|
JvAllocString (jsize sz)
|
|
{
|
|
return _Jv_AllocString (sz);
|
|
}
|
|
|
|
extern inline jstring
|
|
JvNewString (const jchar *chars, jsize len)
|
|
{
|
|
return _Jv_NewString (chars, len);
|
|
}
|
|
|
|
extern inline jstring
|
|
JvNewStringLatin1 (const char *bytes, jsize len)
|
|
{
|
|
return _Jv_NewStringLatin1 (bytes, len);
|
|
}
|
|
|
|
extern inline jstring
|
|
JvNewStringLatin1 (const char *bytes)
|
|
{
|
|
return _Jv_NewStringLatin1 (bytes, strlen (bytes));
|
|
}
|
|
|
|
extern inline jchar *
|
|
_Jv_GetStringChars (jstring str)
|
|
{
|
|
return (jchar*)((char*) str->data + str->boffset);
|
|
}
|
|
|
|
extern inline jchar*
|
|
JvGetStringChars (jstring str)
|
|
{
|
|
return _Jv_GetStringChars (str);
|
|
}
|
|
|
|
extern inline jsize
|
|
JvGetStringUTFLength (jstring string)
|
|
{
|
|
return _Jv_GetStringUTFLength (string);
|
|
}
|
|
|
|
extern inline jsize
|
|
JvGetStringUTFRegion (jstring str, jsize start, jsize len, char *buf)
|
|
{
|
|
return _Jv_GetStringUTFRegion (str, start, len, buf);
|
|
}
|
|
|
|
extern inline jstring
|
|
JvNewStringUTF (const char *bytes)
|
|
{
|
|
return _Jv_NewStringUTF (bytes);
|
|
}
|
|
|
|
class JvSynchronize
|
|
{
|
|
private:
|
|
jobject obj;
|
|
public:
|
|
JvSynchronize (const jobject &o) : obj (o)
|
|
{ _Jv_MonitorEnter (obj); }
|
|
~JvSynchronize ()
|
|
{ _Jv_MonitorExit (obj); }
|
|
};
|
|
|
|
/* Call malloc, but throw exception if insufficient memory. */
|
|
extern inline void *
|
|
JvMalloc (jsize size)
|
|
{
|
|
return _Jv_Malloc (size);
|
|
}
|
|
|
|
extern inline void
|
|
JvFree (void *ptr)
|
|
{
|
|
return _Jv_Free (ptr);
|
|
}
|
|
|
|
typedef struct _Jv_VMOption JvVMOption;
|
|
typedef struct _Jv_VMInitArgs JvVMInitArgs;
|
|
|
|
extern inline jint
|
|
JvCreateJavaVM (JvVMInitArgs* vm_args)
|
|
{
|
|
return _Jv_CreateJavaVM (vm_args);
|
|
}
|
|
|
|
extern inline java::lang::Thread*
|
|
JvAttachCurrentThread (jstring name, java::lang::ThreadGroup* group)
|
|
{
|
|
return _Jv_AttachCurrentThread (name, group);
|
|
}
|
|
|
|
extern inline java::lang::Thread*
|
|
JvAttachCurrentThreadAsDaemon (jstring name, java::lang::ThreadGroup* group)
|
|
{
|
|
return _Jv_AttachCurrentThreadAsDaemon (name, group);
|
|
}
|
|
|
|
extern inline jint
|
|
JvDetachCurrentThread (void)
|
|
{
|
|
return _Jv_DetachCurrentThread ();
|
|
}
|
|
#endif /* __GCJ_CNI_H__ */
|