b7a29fa9f2
* java/lang/natVMClassLoader.cc (defineClass): Reference 'systemClassLoader' field directly. * java/lang/natRuntime.cc (_load): Reference 'systemClassLoader' field directly. * java/lang/natClassLoader.cc (_Jv_RegisterInitiatingLoader): Reference 'systemClassLoader' field directly. (_Jv_UnregisterInitiatingLoader): Likewise. (_Jv_FindClass): Likewise. From-SVN: r96208
145 lines
3.5 KiB
C++
145 lines
3.5 KiB
C++
// natVMClassLoader.cc - VMClassLoader native methods
|
|
|
|
/* Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005 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. */
|
|
|
|
/* Author: Kresten Krab Thorup <krab@gnu.org> */
|
|
|
|
#include <config.h>
|
|
|
|
#include <stdlib.h>
|
|
#include <string.h>
|
|
|
|
#include <gcj/cni.h>
|
|
#include <jvm.h>
|
|
|
|
#include <java-threads.h>
|
|
#include <java-interp.h>
|
|
|
|
#include <java/lang/VMClassLoader.h>
|
|
#include <java/lang/VMCompiler.h>
|
|
#include <gnu/gcj/runtime/VMClassLoader.h>
|
|
#include <gnu/gcj/runtime/SystemClassLoader.h>
|
|
#include <java/lang/ClassLoader.h>
|
|
#include <java/lang/Class.h>
|
|
#include <java/lang/Throwable.h>
|
|
#include <java/security/ProtectionDomain.h>
|
|
#include <java/lang/ClassFormatError.h>
|
|
|
|
void
|
|
java::lang::VMClassLoader::resolveClass (jclass klass)
|
|
{
|
|
JvSynchronize sync (klass);
|
|
try
|
|
{
|
|
_Jv_Linker::wait_for_state (klass, JV_STATE_LINKED);
|
|
}
|
|
catch (java::lang::Throwable *x)
|
|
{
|
|
klass->set_state(JV_STATE_ERROR);
|
|
transformException(klass, x);
|
|
}
|
|
}
|
|
|
|
java::lang::Class *
|
|
java::lang::VMClassLoader::defineClass (java::lang::ClassLoader *loader,
|
|
jstring name,
|
|
jbyteArray data,
|
|
jint offset,
|
|
jint length,
|
|
java::security::ProtectionDomain *pd)
|
|
{
|
|
jclass klass = VMCompiler::compileClass(loader, name, data,
|
|
offset, length, pd);
|
|
|
|
#ifdef INTERPRETER
|
|
if (klass == NULL)
|
|
{
|
|
klass = new java::lang::Class ();
|
|
|
|
// Synchronize on the class, so that it is not attempted initialized
|
|
// until we're done loading.
|
|
JvSynchronize sync (klass);
|
|
|
|
// Record the defining loader. For the system class loader, we
|
|
// record NULL.
|
|
if (loader != java::lang::ClassLoader::systemClassLoader)
|
|
klass->loader = loader;
|
|
|
|
if (name != 0)
|
|
{
|
|
_Jv_Utf8Const *name2 = _Jv_makeUtf8Const (name);
|
|
|
|
if (! _Jv_VerifyClassName (name2))
|
|
throw new java::lang::ClassFormatError
|
|
(JvNewStringLatin1 ("erroneous class name"));
|
|
|
|
klass->name = name2;
|
|
}
|
|
|
|
try
|
|
{
|
|
_Jv_DefineClass (klass, data, offset, length, pd);
|
|
}
|
|
catch (java::lang::Throwable *ex)
|
|
{
|
|
klass->state = JV_STATE_ERROR;
|
|
klass->notifyAll ();
|
|
|
|
_Jv_UnregisterInitiatingLoader (klass, klass->loader);
|
|
|
|
// If EX is not a ClassNotFoundException, that's ok, because we
|
|
// account for the possibility in defineClass().
|
|
throw ex;
|
|
}
|
|
|
|
// if everything proceeded sucessfully, we're loaded.
|
|
JvAssert (klass->state == JV_STATE_LOADED);
|
|
}
|
|
#endif // INTERPRETER
|
|
|
|
return klass;
|
|
}
|
|
|
|
java::lang::ClassLoader *
|
|
java::lang::VMClassLoader::getSystemClassLoaderInternal()
|
|
{
|
|
_Jv_InitClass (&gnu::gcj::runtime::VMClassLoader::class$);
|
|
return gnu::gcj::runtime::VMClassLoader::system_instance;
|
|
}
|
|
|
|
jclass
|
|
java::lang::VMClassLoader::getPrimitiveClass (jchar type)
|
|
{
|
|
char sig[2];
|
|
sig[0] = (char) type;
|
|
sig[1] = '\0';
|
|
return _Jv_FindClassFromSignature (sig, NULL);
|
|
}
|
|
|
|
jclass
|
|
java::lang::VMClassLoader::loadClass(jstring name, jboolean resolve)
|
|
{
|
|
_Jv_Utf8Const *utf = _Jv_makeUtf8Const (name);
|
|
jclass klass = _Jv_FindClassInCache (utf);
|
|
if (klass)
|
|
{
|
|
// We never want to return a class without its supers linked.
|
|
// It isn't clear from the spec, but this is what other
|
|
// implementations do in practice.
|
|
if (resolve)
|
|
_Jv_InitClass (klass);
|
|
else
|
|
_Jv_Linker::wait_for_state (klass, JV_STATE_LOADING);
|
|
|
|
definePackageForNative(name);
|
|
}
|
|
|
|
return klass;
|
|
}
|