From a258c4fb2833dbb092e508453d620b6815153fe1 Mon Sep 17 00:00:00 2001 From: mkoch Date: Sun, 4 Jul 2004 15:27:05 +0000 Subject: 2004-07-04 Michael Koch * gnu/gcj/runtime/FirstThread.java, gnu/gcj/runtime/natFirstThread.cc: Removed. * gnu/java/lang/MainThread.java, gnu/java/lang/natMainThread.cc: New files. * prims.cc (_Jv_RunMain): Use MainThread instead of FirstThread. * Makefile.am: Added new files and removed deleted ones. * Makefile.in: Regenerated. git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@84085 138bc75d-0d04-0410-961f-82ee72b054a4 --- libjava/gnu/gcj/runtime/FirstThread.java | 98 ----------------------- libjava/gnu/gcj/runtime/natFirstThread.cc | 48 ----------- libjava/gnu/java/lang/MainThread.java | 128 ++++++++++++++++++++++++++++++ libjava/gnu/java/lang/natMainThread.cc | 48 +++++++++++ 4 files changed, 176 insertions(+), 146 deletions(-) delete mode 100644 libjava/gnu/gcj/runtime/FirstThread.java delete mode 100644 libjava/gnu/gcj/runtime/natFirstThread.cc create mode 100644 libjava/gnu/java/lang/MainThread.java create mode 100644 libjava/gnu/java/lang/natMainThread.cc (limited to 'libjava/gnu') diff --git a/libjava/gnu/gcj/runtime/FirstThread.java b/libjava/gnu/gcj/runtime/FirstThread.java deleted file mode 100644 index 9d4b435bba2..00000000000 --- a/libjava/gnu/gcj/runtime/FirstThread.java +++ /dev/null @@ -1,98 +0,0 @@ -// FirstThread.java - Implementation of very first thread. - -/* Copyright (C) 1998, 1999, 2000, 2001, 2003 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. */ - -package gnu.gcj.runtime; - -import java.util.jar.*; - -/** - * @author Tom Tromey - * @date August 24, 1998 - */ - -final class FirstThread extends Thread -{ - public FirstThread (Class k, String[] args) - { - super (null, null, "main"); - klass = k; - this.args = args; - } - - public FirstThread (String class_name, String[] args, boolean is_jar) - { - super (null, null, "main"); - klass_name = class_name; - this.args = args; - this.is_jar = is_jar; - } - - public void run() - { - if (is_jar) - klass_name = getMain(klass_name); - - if (klass == null) - { - try - { - klass = Class.forName(klass_name); - } - catch (ClassNotFoundException x) - { - throw new NoClassDefFoundError(klass_name); - } - } - - call_main(); - } - - private String getMain (String name) - { - String mainName = null; - try - { - JarFile j = new JarFile(name); - Attributes a = j.getManifest().getMainAttributes(); - mainName = a.getValue(Attributes.Name.MAIN_CLASS); - } - catch (Exception e) - { - // Ignore. - } - - if (mainName == null) - { - System.err.println("Failed to load Main-Class manifest attribute from " - + name); - System.exit(1); - } - return mainName; - } - - private native void call_main (); - - // Private data. - private Class klass; - private String klass_name; - private Object args; - private boolean is_jar; - - // If the user links statically then we need to ensure that these - // classes are linked in. Otherwise bootstrapping fails. These - // classes are only referred to via Class.forName(), so we add an - // explicit mention of them here. - static final Class Kcert = java.security.cert.Certificate.class; - static final Class Kfile = gnu.java.net.protocol.file.Handler.class; - static final Class Khttp = gnu.java.net.protocol.http.Handler.class; - static final Class Kjar = gnu.java.net.protocol.jar.Handler.class; - static final Class Klocale = gnu.java.locale.LocaleInformation.class; - static final Class Kcalendar = gnu.java.locale.Calendar.class; -} diff --git a/libjava/gnu/gcj/runtime/natFirstThread.cc b/libjava/gnu/gcj/runtime/natFirstThread.cc deleted file mode 100644 index e3100c53fc0..00000000000 --- a/libjava/gnu/gcj/runtime/natFirstThread.cc +++ /dev/null @@ -1,48 +0,0 @@ -// natFirstThread.cc - Implementation of FirstThread native methods. - -/* Copyright (C) 1998, 1999, 2000, 2001, 2003 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. */ - -#include - -#include -#include - -#include -#include - -#include - -typedef void main_func (jobject); - -void -gnu::gcj::runtime::FirstThread::call_main (void) -{ - Utf8Const* main_signature = _Jv_makeUtf8Const ("([Ljava.lang.String;)V", 22); - Utf8Const* main_name = _Jv_makeUtf8Const ("main", 4); - - _Jv_Method *meth = _Jv_LookupDeclaredMethod (klass, main_name, - main_signature); - - // Some checks from Java Spec section 12.1.4. - const char *msg = NULL; - if (meth == NULL) - msg = "no suitable method `main' in class"; - else if (! java::lang::reflect::Modifier::isStatic(meth->accflags)) - msg = "`main' must be static"; - else if (! java::lang::reflect::Modifier::isPublic(meth->accflags)) - msg = "`main' must be public"; - if (msg != NULL) - { - fprintf (stderr, "%s\n", msg); - ::exit(1); - } - - main_func *real_main = (main_func *) meth->ncode; - (*real_main) (args); -} diff --git a/libjava/gnu/java/lang/MainThread.java b/libjava/gnu/java/lang/MainThread.java new file mode 100644 index 00000000000..61751b24069 --- /dev/null +++ b/libjava/gnu/java/lang/MainThread.java @@ -0,0 +1,128 @@ +/* gnu.java.lang.MainThread + Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003, 2004 + Free Software Foundation, Inc. + +This file is part of GNU Classpath. + +GNU Classpath is free software; you can redistribute it and/or modify +it under the terms of the GNU General Public License as published by +the Free Software Foundation; either version 2, or (at your option) +any later version. + +GNU Classpath is distributed in the hope that it will be useful, but +WITHOUT ANY WARRANTY; without even the implied warranty of +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +General Public License for more details. + +You should have received a copy of the GNU General Public License +along with GNU Classpath; see the file COPYING. If not, write to the +Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA +02111-1307 USA. + +Linking this library statically or dynamically with other modules is +making a combined work based on this library. Thus, the terms and +conditions of the GNU General Public License cover the whole +combination. + +As a special exception, the copyright holders of this library give you +permission to link this library with independent modules to produce an +executable, regardless of the license terms of these independent +modules, and to copy and distribute the resulting executable under +terms of your choice, provided that you also meet, for each linked +independent module, the terms and conditions of the license of that +module. An independent module is a module which is not derived from +or based on this library. If you modify this library, you may extend +this exception to your version of the library, but you are not +obligated to do so. If you do not wish to do so, delete this +exception statement from your version. */ + + +package gnu.java.lang; + +import java.util.jar.*; + +/** + * MainThread is a Thread which uses the main() method of some class. + * + * @author John Keiser + * @author Tom Tromey (tromey@redhat.com) + */ +final class MainThread extends Thread +{ + // If the user links statically then we need to ensure that these + // classes are linked in. Otherwise bootstrapping fails. These + // classes are only referred to via Class.forName(), so we add an + // explicit mention of them here. + static final Class Kcert = java.security.cert.Certificate.class; + static final Class Kfile = gnu.java.net.protocol.file.Handler.class; + static final Class Khttp = gnu.java.net.protocol.http.Handler.class; + static final Class Kjar = gnu.java.net.protocol.jar.Handler.class; + static final Class Klocale = gnu.java.locale.LocaleInformation.class; + static final Class Kcalendar = gnu.java.locale.Calendar.class; + + // Private data. + private Class klass; + private String klass_name; + private Object args; + private boolean is_jar; + + public MainThread(Class k, String[] args) + { + super(null, null, "main"); + klass = k; + this.args = args; + } + + public MainThread(String classname, String[] args, boolean is_jar) + { + super (null, null, "main"); + klass_name = classname; + this.args = args; + this.is_jar = is_jar; + } + + public void run() + { + if (is_jar) + klass_name = getMain(klass_name); + + if (klass == null) + { + try + { + klass = Class.forName(klass_name); + } + catch (ClassNotFoundException x) + { + throw new NoClassDefFoundError(klass_name); + } + } + + call_main(); + } + + private String getMain(String name) + { + String mainName = null; + try + { + JarFile j = new JarFile(name); + Attributes a = j.getManifest().getMainAttributes(); + mainName = a.getValue(Attributes.Name.MAIN_CLASS); + } + catch (Exception e) + { + // Ignore. + } + + if (mainName == null) + { + System.err.println("Failed to load Main-Class manifest attribute from " + + name); + System.exit(1); + } + return mainName; + } + + private native void call_main(); +} diff --git a/libjava/gnu/java/lang/natMainThread.cc b/libjava/gnu/java/lang/natMainThread.cc new file mode 100644 index 00000000000..7e8e4223dfe --- /dev/null +++ b/libjava/gnu/java/lang/natMainThread.cc @@ -0,0 +1,48 @@ +// natMainThread.cc - Implementation of MainThread native methods. + +/* Copyright (C) 1998, 1999, 2000, 2001, 2003 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. */ + +#include + +#include +#include + +#include +#include + +#include + +typedef void main_func (jobject); + +void +gnu::java::lang::MainThread::call_main (void) +{ + Utf8Const* main_signature = _Jv_makeUtf8Const ("([Ljava.lang.String;)V", 22); + Utf8Const* main_name = _Jv_makeUtf8Const ("main", 4); + + _Jv_Method *meth = _Jv_LookupDeclaredMethod (klass, main_name, + main_signature); + + // Some checks from Java Spec section 12.1.4. + const char *msg = NULL; + if (meth == NULL) + msg = "no suitable method `main' in class"; + else if (! ::java::lang::reflect::Modifier::isStatic(meth->accflags)) + msg = "`main' must be static"; + else if (! ::java::lang::reflect::Modifier::isPublic(meth->accflags)) + msg = "`main' must be public"; + if (msg != NULL) + { + fprintf (stderr, "%s\n", msg); + ::exit(1); + } + + main_func *real_main = (main_func *) meth->ncode; + (*real_main) (args); +} -- cgit v1.2.3