Class.h (Class): Made _Jv_BytecodeVerifier a friend.

* java/lang/Class.h (Class): Made _Jv_BytecodeVerifier a friend.
	* Makefile.in: Rebuilt.
	* Makefile.am (libgcj_la_SOURCES): Added verify.cc.
	* verify.cc: New file.
	* include/java-interp.h (_Jv_count_arguments): Declare.
	(_Jv_VerifyMethod): Likewise.
	(class _Jv_InterpMethod): Made _Jv_BytecodeVerifier a friend.
	(class _Jv_InterpException): Likewise.
	* resolve.cc (_Jv_count_arguments): Renamed from count_arguments.
	No longer static.  Updated callers.
	* defineclass.cc (int_bits_to_float): Removed.
	(long_bits_to_double): Likewise.
	(prepare_pool_entry): Updated.
	(handleCodeAttribute): Verify method (commented out for now).

From-SVN: r46796
This commit is contained in:
Tom Tromey 2001-11-05 23:39:54 +00:00 committed by Tom Tromey
parent e6ec164c8d
commit a12fe13ddb
8 changed files with 2513 additions and 47 deletions

View file

@ -958,9 +958,9 @@ get_ffi_type_from_signature (unsigned char* ptr)
* function is non-static, then one is added to the number of elements
* found in the signature */
static int
count_arguments (_Jv_Utf8Const *signature,
jboolean staticp)
int
_Jv_count_arguments (_Jv_Utf8Const *signature,
jboolean staticp)
{
unsigned char *ptr = (unsigned char*) signature->data;
int arg_count = staticp ? 0 : 1;
@ -1048,7 +1048,7 @@ init_cif (_Jv_Utf8Const* signature,
#endif
/* we put this one here, and not in interpret.cc because it
* calls the utility routines count_arguments
* calls the utility routines _Jv_count_arguments
* which are static to this module. The following struct defines the
* layout we use for the stubs, it's only used in the ncode method. */
@ -1069,7 +1069,7 @@ _Jv_InterpMethod::ncode ()
return self->ncode;
jboolean staticp = (self->accflags & Modifier::STATIC) != 0;
int arg_count = count_arguments (self->signature, staticp);
int arg_count = _Jv_count_arguments (self->signature, staticp);
ncode_closure *closure =
(ncode_closure*)_Jv_AllocBytes (sizeof (ncode_closure)
@ -1119,7 +1119,7 @@ _Jv_JNIMethod::ncode ()
return self->ncode;
jboolean staticp = (self->accflags & Modifier::STATIC) != 0;
int arg_count = count_arguments (self->signature, staticp);
int arg_count = _Jv_count_arguments (self->signature, staticp);
ncode_closure *closure =
(ncode_closure*)_Jv_AllocBytes (sizeof (ncode_closure)
@ -1180,7 +1180,7 @@ _Jv_BuildResolvedMethod (_Jv_Method* method,
jboolean staticp,
jint vtable_index)
{
int arg_count = count_arguments (method->signature, staticp);
int arg_count = _Jv_count_arguments (method->signature, staticp);
_Jv_ResolvedMethod* result = (_Jv_ResolvedMethod*)
_Jv_AllocBytes (sizeof (_Jv_ResolvedMethod)