mirror of
git://gcc.gnu.org/git/gcc.git
synced 2025-03-24 08:50:26 +08:00
jvm.h: Declare _Jv_RegisterResource.
* include/jvm.h: Declare _Jv_RegisterResource.
* gnu/gcj/Core.java, gnu/gcj/natCore.cc,
gnu/gcj/protocol/core/Connection.java,
gnu/gcj/protocol/core/Handler.java,
gnu/gcj/protocol/core/CoreInputStream.java,
gnu/gcj/protocol/core/natCoreInputStream.cc: New files.
* java/net/URL.java (setURLStreamHandler): Use
gnu.gcj.protocol.core.Handler for the core protocol.
* gnu/gcj/runtime/VMClassLoader.java (init): Add "core:/" to the
end of java.class.path.
* Makefile.am (ordinary_java_source_files): Add new java files.
(nat_source_files): Add new native code files.
* Makefile.in: Rebuilt.
From-SVN: r45450
This commit is contained in:
Anthony Green
Anthony Green
parent
f2767a670e
commit
a11e2c2279
@ -1,3 +1,19 @@
|
||||
2001-09-06 Anthony Green <green@redhat.com>
|
||||
|
||||
* include/jvm.h: Declare _Jv_RegisterResource.
|
||||
* gnu/gcj/Core.java, gnu/gcj/natCore.cc,
|
||||
gnu/gcj/protocol/core/Connection.java,
|
||||
gnu/gcj/protocol/core/Handler.java,
|
||||
gnu/gcj/protocol/core/CoreInputStream.java,
|
||||
gnu/gcj/protocol/core/natCoreInputStream.cc: New files.
|
||||
* java/net/URL.java (setURLStreamHandler): Use
|
||||
gnu.gcj.protocol.core.Handler for the core protocol.
|
||||
* gnu/gcj/runtime/VMClassLoader.java (init): Add "core:/" to the
|
||||
end of java.class.path.
|
||||
* Makefile.am (ordinary_java_source_files): Add new java files.
|
||||
(nat_source_files): Add new native code files.
|
||||
* Makefile.in: Rebuilt.
|
||||
|
||||
2001-09-05 Tom Tromey <tromey@redhat.com>
|
||||
|
||||
* java/util/Properties.java: Re-merged from Classpath.
|
||||
|
||||
@ -1109,11 +1109,15 @@ java/util/WeakHashMap.java
|
||||
## awt_java_source_files. If the .java file has a hand-maintained
|
||||
## header, please list it in special_java_source_files.
|
||||
ordinary_java_source_files = $(core_java_source_files) \
|
||||
gnu/gcj/Core.java \
|
||||
gnu/gcj/RawData.java \
|
||||
gnu/gcj/io/DefaultMimeTypes.java \
|
||||
gnu/gcj/io/MimeTypes.java \
|
||||
gnu/gcj/io/SimpleSHSStream.java \
|
||||
gnu/gcj/math/MPN.java \
|
||||
gnu/gcj/protocol/core/Connection.java \
|
||||
gnu/gcj/protocol/core/Handler.java \
|
||||
gnu/gcj/protocol/core/CoreInputStream.java \
|
||||
gnu/gcj/protocol/file/Connection.java \
|
||||
gnu/gcj/protocol/file/Handler.java \
|
||||
gnu/gcj/protocol/http/Connection.java \
|
||||
@ -1464,6 +1468,7 @@ c_source_files = \
|
||||
|
||||
## This lists all the C++ source files in subdirectories.
|
||||
nat_source_files = \
|
||||
gnu/gcj/natCore.cc \
|
||||
gnu/gcj/convert/JIS0208_to_Unicode.cc \
|
||||
gnu/gcj/convert/JIS0212_to_Unicode.cc \
|
||||
gnu/gcj/convert/Unicode_to_JIS.cc \
|
||||
@ -1474,6 +1479,7 @@ gnu/gcj/convert/natOutput_EUCJIS.cc \
|
||||
gnu/gcj/convert/natOutput_SJIS.cc \
|
||||
gnu/gcj/io/natSimpleSHSStream.cc \
|
||||
gnu/gcj/io/shs.cc \
|
||||
gnu/gcj/protocol/core/natCoreInputStream.cc \
|
||||
gnu/gcj/runtime/natFirstThread.cc \
|
||||
java/io/natFile.cc \
|
||||
java/io/natFileDescriptor.cc \
|
||||
|
||||
@ -123,38 +123,26 @@ libgcj_basedir = @libgcj_basedir@
|
||||
mkinstalldirs = @mkinstalldirs@
|
||||
|
||||
AUTOMAKE_OPTIONS = foreign
|
||||
@TESTSUBDIR_TRUE@SUBDIRS = \
|
||||
@TESTSUBDIR_TRUE@$(DIRLTDL) testsuite gcj include
|
||||
@TESTSUBDIR_FALSE@SUBDIRS = \
|
||||
@TESTSUBDIR_FALSE@$(DIRLTDL) gcj include
|
||||
@USE_LIBDIR_TRUE@toolexeclibdir = \
|
||||
@USE_LIBDIR_TRUE@$(libdir)$(MULTISUBDIR)
|
||||
@USE_LIBDIR_FALSE@toolexeclibdir = \
|
||||
@USE_LIBDIR_FALSE@$(toolexecdir)/lib$(MULTISUBDIR)
|
||||
@USE_LIBDIR_FALSE@toolexecdir = \
|
||||
@USE_LIBDIR_FALSE@$(exec_prefix)/$(target_alias)
|
||||
@XLIB_AWT_TRUE@cond_x_ltlibrary = \
|
||||
@XLIB_AWT_TRUE@libgcjx.la
|
||||
@XLIB_AWT_FALSE@cond_x_ltlibrary = \
|
||||
@TESTSUBDIR_TRUE@SUBDIRS = @TESTSUBDIR_TRUE@$(DIRLTDL) testsuite gcj include
|
||||
@TESTSUBDIR_FALSE@SUBDIRS = @TESTSUBDIR_FALSE@$(DIRLTDL) gcj include
|
||||
@USE_LIBDIR_TRUE@toolexeclibdir = @USE_LIBDIR_TRUE@$(libdir)$(MULTISUBDIR)
|
||||
@USE_LIBDIR_FALSE@toolexeclibdir = @USE_LIBDIR_FALSE@$(toolexecdir)/lib$(MULTISUBDIR)
|
||||
@USE_LIBDIR_FALSE@toolexecdir = @USE_LIBDIR_FALSE@$(exec_prefix)/$(target_alias)
|
||||
@XLIB_AWT_TRUE@cond_x_ltlibrary = @XLIB_AWT_TRUE@libgcjx.la
|
||||
@XLIB_AWT_FALSE@cond_x_ltlibrary =
|
||||
|
||||
toolexeclib_LTLIBRARIES = libgcj.la $(cond_x_ltlibrary)
|
||||
toolexeclib_DATA = libgcj.spec
|
||||
data_DATA = libgcj.jar
|
||||
|
||||
@NATIVE_TRUE@bin_PROGRAMS = \
|
||||
@NATIVE_TRUE@jv-convert gij rmic rmiregistry
|
||||
@NATIVE_TRUE@bin_PROGRAMS = @NATIVE_TRUE@jv-convert gij rmic rmiregistry
|
||||
|
||||
bin_SCRIPTS = addr2name.awk
|
||||
@CANADIAN_TRUE@@NULL_TARGET_TRUE@ZIP = \
|
||||
@CANADIAN_TRUE@@NULL_TARGET_TRUE@$(MULTIBUILDTOP)../$(COMPPATH)/fastjar/jar$(EXEEXT)
|
||||
@CANADIAN_TRUE@@NULL_TARGET_FALSE@ZIP = \
|
||||
@CANADIAN_TRUE@@NULL_TARGET_FALSE@jar
|
||||
@CANADIAN_FALSE@ZIP = \
|
||||
@CANADIAN_FALSE@$(MULTIBUILDTOP)../$(COMPPATH)/fastjar/jar$(EXEEXT)
|
||||
@CANADIAN_TRUE@GCJH = \
|
||||
@CANADIAN_TRUE@gcjh
|
||||
@CANADIAN_FALSE@GCJH = \
|
||||
@CANADIAN_FALSE@$(MULTIBUILDTOP)../$(COMPPATH)/gcc/gcjh$(EXEEXT)
|
||||
@CANADIAN_TRUE@@NULL_TARGET_TRUE@ZIP = @CANADIAN_TRUE@@NULL_TARGET_TRUE@$(MULTIBUILDTOP)../$(COMPPATH)/fastjar/jar$(EXEEXT)
|
||||
@CANADIAN_TRUE@@NULL_TARGET_FALSE@ZIP = @CANADIAN_TRUE@@NULL_TARGET_FALSE@jar
|
||||
@CANADIAN_FALSE@ZIP = @CANADIAN_FALSE@$(MULTIBUILDTOP)../$(COMPPATH)/fastjar/jar$(EXEEXT)
|
||||
@CANADIAN_TRUE@GCJH = @CANADIAN_TRUE@gcjh
|
||||
@CANADIAN_FALSE@GCJH = @CANADIAN_FALSE@$(MULTIBUILDTOP)../$(COMPPATH)/gcc/gcjh$(EXEEXT)
|
||||
|
||||
GCJ_WITH_FLAGS = $(GCJ) --encoding=UTF-8
|
||||
|
||||
@ -174,10 +162,8 @@ AM_CXXFLAGS = -fno-rtti -fnon-call-exceptions \
|
||||
@LIBGCJ_CXXFLAGS@ @X_CFLAGS@ $(WARNINGS) -D_GNU_SOURCE \
|
||||
-DPREFIX="\"$(prefix)\""
|
||||
|
||||
@USING_GCC_TRUE@AM_CFLAGS = \
|
||||
@USING_GCC_TRUE@@LIBGCJ_CFLAGS@ $(WARNINGS)
|
||||
@USING_GCC_FALSE@AM_CFLAGS = \
|
||||
@USING_GCC_FALSE@@LIBGCJ_CFLAGS@
|
||||
@USING_GCC_TRUE@AM_CFLAGS = @USING_GCC_TRUE@@LIBGCJ_CFLAGS@ $(WARNINGS)
|
||||
@USING_GCC_FALSE@AM_CFLAGS = @USING_GCC_FALSE@@LIBGCJ_CFLAGS@
|
||||
|
||||
JCFLAGS = -g
|
||||
JC1FLAGS = @LIBGCJ_JAVAFLAGS@ $(GCJFLAGS)
|
||||
@ -245,8 +231,7 @@ extra_headers = java/lang/Object.h java/lang/Class.h
|
||||
|
||||
NM = nm
|
||||
|
||||
@NATIVE_TRUE@@MAINTAINER_MODE_TRUE@noinst_PROGRAMS = \
|
||||
@NATIVE_TRUE@@MAINTAINER_MODE_TRUE@gen-from-JIS
|
||||
@NATIVE_TRUE@@MAINTAINER_MODE_TRUE@noinst_PROGRAMS = @NATIVE_TRUE@@MAINTAINER_MODE_TRUE@gen-from-JIS
|
||||
|
||||
CONVERT_DIR = gnu/gcj/convert
|
||||
|
||||
@ -859,11 +844,15 @@ java/util/WeakHashMap.java
|
||||
|
||||
|
||||
ordinary_java_source_files = $(core_java_source_files) \
|
||||
gnu/gcj/Core.java \
|
||||
gnu/gcj/RawData.java \
|
||||
gnu/gcj/io/DefaultMimeTypes.java \
|
||||
gnu/gcj/io/MimeTypes.java \
|
||||
gnu/gcj/io/SimpleSHSStream.java \
|
||||
gnu/gcj/math/MPN.java \
|
||||
gnu/gcj/protocol/core/Connection.java \
|
||||
gnu/gcj/protocol/core/Handler.java \
|
||||
gnu/gcj/protocol/core/CoreInputStream.java \
|
||||
gnu/gcj/protocol/file/Connection.java \
|
||||
gnu/gcj/protocol/file/Handler.java \
|
||||
gnu/gcj/protocol/http/Connection.java \
|
||||
@ -1213,6 +1202,7 @@ c_source_files = \
|
||||
#java/awt/natToolkit.cc
|
||||
|
||||
nat_source_files = \
|
||||
gnu/gcj/natCore.cc \
|
||||
gnu/gcj/convert/JIS0208_to_Unicode.cc \
|
||||
gnu/gcj/convert/JIS0212_to_Unicode.cc \
|
||||
gnu/gcj/convert/Unicode_to_JIS.cc \
|
||||
@ -1223,6 +1213,7 @@ gnu/gcj/convert/natOutput_EUCJIS.cc \
|
||||
gnu/gcj/convert/natOutput_SJIS.cc \
|
||||
gnu/gcj/io/natSimpleSHSStream.cc \
|
||||
gnu/gcj/io/shs.cc \
|
||||
gnu/gcj/protocol/core/natCoreInputStream.cc \
|
||||
gnu/gcj/runtime/natFirstThread.cc \
|
||||
java/io/natFile.cc \
|
||||
java/io/natFileDescriptor.cc \
|
||||
@ -1379,13 +1370,14 @@ X_LIBS = @X_LIBS@
|
||||
X_EXTRA_LIBS = @X_EXTRA_LIBS@
|
||||
X_PRE_LIBS = @X_PRE_LIBS@
|
||||
libgcj_la_OBJECTS = prims.lo posix.lo jni.lo exception.lo resolve.lo \
|
||||
defineclass.lo interpret.lo name-finder.lo \
|
||||
defineclass.lo interpret.lo name-finder.lo gnu/gcj/natCore.lo \
|
||||
gnu/gcj/convert/JIS0208_to_Unicode.lo \
|
||||
gnu/gcj/convert/JIS0212_to_Unicode.lo gnu/gcj/convert/Unicode_to_JIS.lo \
|
||||
gnu/gcj/convert/natIconv.lo gnu/gcj/convert/natInput_EUCJIS.lo \
|
||||
gnu/gcj/convert/natInput_SJIS.lo gnu/gcj/convert/natOutput_EUCJIS.lo \
|
||||
gnu/gcj/convert/natOutput_SJIS.lo gnu/gcj/io/natSimpleSHSStream.lo \
|
||||
gnu/gcj/io/shs.lo gnu/gcj/runtime/natFirstThread.lo java/io/natFile.lo \
|
||||
gnu/gcj/io/shs.lo gnu/gcj/protocol/core/natCoreInputStream.lo \
|
||||
gnu/gcj/runtime/natFirstThread.lo java/io/natFile.lo \
|
||||
java/io/natFileDescriptor.lo java/io/natObjectInputStream.lo \
|
||||
java/io/natObjectOutputStream.lo java/lang/natCharacter.lo \
|
||||
java/lang/natClass.lo java/lang/natClassLoader.lo \
|
||||
@ -1443,7 +1435,7 @@ libgcj-test.spec.in libgcj.spec.in
|
||||
|
||||
DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST)
|
||||
|
||||
TAR = tar
|
||||
TAR = gtar
|
||||
GZIP_ENV = --best
|
||||
DIST_SUBDIRS = @DIRLTDL@ testsuite gcj include @DIRLTDL@ gcj include
|
||||
DEP_FILES = .deps/$(srcdir)/$(CONVERT_DIR)/gen-from-JIS.P \
|
||||
@ -1460,9 +1452,9 @@ DEP_FILES = .deps/$(srcdir)/$(CONVERT_DIR)/gen-from-JIS.P \
|
||||
.deps/gnu/awt/xlib/XGraphics.P \
|
||||
.deps/gnu/awt/xlib/XGraphicsConfiguration.P \
|
||||
.deps/gnu/awt/xlib/XPanelPeer.P .deps/gnu/awt/xlib/XToolkit.P \
|
||||
.deps/gnu/classpath/Configuration.P .deps/gnu/gcj/RawData.P \
|
||||
.deps/gnu/gcj/awt/BitMaskExtent.P .deps/gnu/gcj/awt/Buffers.P \
|
||||
.deps/gnu/gcj/awt/ComponentDataBlitOp.P \
|
||||
.deps/gnu/classpath/Configuration.P .deps/gnu/gcj/Core.P \
|
||||
.deps/gnu/gcj/RawData.P .deps/gnu/gcj/awt/BitMaskExtent.P \
|
||||
.deps/gnu/gcj/awt/Buffers.P .deps/gnu/gcj/awt/ComponentDataBlitOp.P \
|
||||
.deps/gnu/gcj/awt/GLightweightPeer.P \
|
||||
.deps/gnu/gcj/convert/BytesToUnicode.P .deps/gnu/gcj/convert/Convert.P \
|
||||
.deps/gnu/gcj/convert/IOConverter.P \
|
||||
@ -1489,7 +1481,12 @@ DEP_FILES = .deps/$(srcdir)/$(CONVERT_DIR)/gen-from-JIS.P \
|
||||
.deps/gnu/gcj/io/DefaultMimeTypes.P .deps/gnu/gcj/io/MimeTypes.P \
|
||||
.deps/gnu/gcj/io/SimpleSHSStream.P \
|
||||
.deps/gnu/gcj/io/natSimpleSHSStream.P .deps/gnu/gcj/io/shs.P \
|
||||
.deps/gnu/gcj/math/MPN.P .deps/gnu/gcj/protocol/file/Connection.P \
|
||||
.deps/gnu/gcj/math/MPN.P .deps/gnu/gcj/natCore.P \
|
||||
.deps/gnu/gcj/protocol/core/Connection.P \
|
||||
.deps/gnu/gcj/protocol/core/CoreInputStream.P \
|
||||
.deps/gnu/gcj/protocol/core/Handler.P \
|
||||
.deps/gnu/gcj/protocol/core/natCoreInputStream.P \
|
||||
.deps/gnu/gcj/protocol/file/Connection.P \
|
||||
.deps/gnu/gcj/protocol/file/Handler.P \
|
||||
.deps/gnu/gcj/protocol/http/Connection.P \
|
||||
.deps/gnu/gcj/protocol/http/Handler.P \
|
||||
@ -2474,7 +2471,7 @@ distdir: $(DISTFILES)
|
||||
@for file in $(DISTFILES); do \
|
||||
d=$(srcdir); \
|
||||
if test -d $$d/$$file; then \
|
||||
cp -pr $$/$$file $(distdir)/$$file; \
|
||||
cp -pr $$d/$$file $(distdir)/$$file; \
|
||||
else \
|
||||
test -f $(distdir)/$$file \
|
||||
|| ln $$d/$$file $(distdir)/$$file 2> /dev/null \
|
||||
|
||||
18
libjava/gnu/gcj/Core.java
Normal file
18
libjava/gnu/gcj/Core.java
Normal file
@ -0,0 +1,18 @@
|
||||
/* Copyright (C) 2001 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;
|
||||
|
||||
public class Core
|
||||
{
|
||||
public native static Core create (String name) throws java.io.IOException;
|
||||
|
||||
public RawData ptr;
|
||||
public int length;
|
||||
}
|
||||
|
||||
82
libjava/gnu/gcj/natCore.cc
Normal file
82
libjava/gnu/gcj/natCore.cc
Normal file
@ -0,0 +1,82 @@
|
||||
// natCore -- C++ side of Core
|
||||
|
||||
/* Copyright (C) 2001 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: Anthony Green <green@redhat.com>. */
|
||||
|
||||
#include <config.h>
|
||||
|
||||
#include <gcj/cni.h>
|
||||
#include <jvm.h>
|
||||
#include <string.h>
|
||||
#include <stdlib.h>
|
||||
|
||||
#include <java/lang/NullPointerException.h>
|
||||
#include <java/io/IOException.h>
|
||||
#include <gnu/gcj/Core.h>
|
||||
|
||||
typedef struct core_chain_struct
|
||||
{
|
||||
int name_length;
|
||||
const char *name;
|
||||
int data_length;
|
||||
const void *data;
|
||||
|
||||
struct core_chain_struct *next;
|
||||
} core_chain;
|
||||
|
||||
static core_chain *root;
|
||||
|
||||
void _Jv_RegisterResource (void *vptr)
|
||||
{
|
||||
char *rptr = (char *)vptr;
|
||||
|
||||
// These are permanent data structures for now. This routine is
|
||||
// called from a static constructor, so we shouldn't depend on too
|
||||
// much existing infrastructure.
|
||||
core_chain *cc = (core_chain *) malloc (sizeof (core_chain));
|
||||
|
||||
cc->name_length = ((int *)rptr)[0];
|
||||
cc->data_length = ((int *)rptr)[1];
|
||||
cc->name = rptr + 2*sizeof(int);
|
||||
cc->data = cc->name + cc->name_length;
|
||||
|
||||
// Add this new item to the chain...
|
||||
core_chain *old_root = root;
|
||||
cc->next = old_root;
|
||||
root = cc;
|
||||
}
|
||||
|
||||
gnu::gcj::Core *
|
||||
gnu::gcj::Core::create (jstring name)
|
||||
{
|
||||
char buf[name->length() + 1];
|
||||
jsize total = JvGetStringUTFRegion (name, 0, name->length(), buf);
|
||||
buf[total] = '\0';
|
||||
|
||||
core_chain *node = root;
|
||||
|
||||
while (node)
|
||||
{
|
||||
if (total == node->name_length
|
||||
&& strncmp (buf, node->name, total) == 0)
|
||||
{
|
||||
gnu::gcj::Core *core =
|
||||
(gnu::gcj::Core *) _Jv_AllocObject(&gnu::gcj::Core::class$,
|
||||
sizeof (gnu::gcj::Core));
|
||||
core->ptr = (gnu::gcj::RawData *) node->data;
|
||||
core->length = node->data_length;
|
||||
return core;
|
||||
}
|
||||
else
|
||||
node = node->next;
|
||||
}
|
||||
|
||||
throw new java::io::IOException (JvNewStringLatin1 ("can't open core"));
|
||||
}
|
||||
154
libjava/gnu/gcj/protocol/core/Connection.java
Normal file
154
libjava/gnu/gcj/protocol/core/Connection.java
Normal file
@ -0,0 +1,154 @@
|
||||
// Connection.java - Implementation of URLConnection for core protocol.
|
||||
|
||||
/* Copyright (C) 2001 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.protocol.core;
|
||||
|
||||
import gnu.gcj.Core;
|
||||
import java.net.*;
|
||||
import java.io.*;
|
||||
import java.util.Vector;
|
||||
import java.util.Hashtable;
|
||||
import java.util.Enumeration;
|
||||
|
||||
/**
|
||||
* @author Anthony Green <green@redhat.com>
|
||||
* @date August 13, 2001
|
||||
*/
|
||||
|
||||
class Connection extends URLConnection
|
||||
{
|
||||
private Hashtable hdrHash = new Hashtable();
|
||||
private Vector hdrVec = new Vector();
|
||||
private boolean gotHeaders = false;
|
||||
|
||||
private Core core;
|
||||
|
||||
public Connection(URL url)
|
||||
{
|
||||
super(url);
|
||||
}
|
||||
|
||||
// Implementation of abstract method.
|
||||
public void connect() throws IOException
|
||||
{
|
||||
// Call is ignored if already connected.
|
||||
if (connected)
|
||||
return;
|
||||
|
||||
// If not connected, then file needs to be opened.
|
||||
core = Core.create (url.getFile());
|
||||
connected = true;
|
||||
}
|
||||
|
||||
public InputStream getInputStream() throws IOException
|
||||
{
|
||||
if (!connected)
|
||||
connect();
|
||||
|
||||
if (! doInput)
|
||||
throw new ProtocolException("Can't open InputStream if doInput is false");
|
||||
return new BufferedInputStream(new CoreInputStream (core));
|
||||
}
|
||||
|
||||
// Override default method in URLConnection.
|
||||
public String getHeaderField(String name)
|
||||
{
|
||||
try
|
||||
{
|
||||
getHeaders();
|
||||
}
|
||||
catch (IOException x)
|
||||
{
|
||||
return null;
|
||||
}
|
||||
return (String) hdrHash.get(name.toLowerCase());
|
||||
}
|
||||
|
||||
// Override default method in URLConnection.
|
||||
public String getHeaderField(int n)
|
||||
{
|
||||
try
|
||||
{
|
||||
getHeaders();
|
||||
}
|
||||
catch (IOException x)
|
||||
{
|
||||
return null;
|
||||
}
|
||||
if (n < hdrVec.size())
|
||||
return getField((String) hdrVec.elementAt(n));
|
||||
|
||||
return null;
|
||||
}
|
||||
|
||||
// Override default method in URLConnection.
|
||||
public String getHeaderFieldKey(int n)
|
||||
{
|
||||
try
|
||||
{
|
||||
getHeaders();
|
||||
}
|
||||
catch (IOException x)
|
||||
{
|
||||
return null;
|
||||
}
|
||||
if (n < hdrVec.size())
|
||||
return getKey((String) hdrVec.elementAt(n));
|
||||
|
||||
return null;
|
||||
}
|
||||
|
||||
private String getKey(String str)
|
||||
{
|
||||
if (str == null)
|
||||
return null;
|
||||
int index = str.indexOf(':');
|
||||
if (index >= 0)
|
||||
return str.substring(0, index);
|
||||
else
|
||||
return null;
|
||||
}
|
||||
|
||||
private String getField(String str)
|
||||
{
|
||||
if (str == null)
|
||||
return null;
|
||||
int index = str.indexOf(':');
|
||||
if (index >= 0)
|
||||
return str.substring(index + 1).trim();
|
||||
else
|
||||
return str;
|
||||
}
|
||||
|
||||
private void getHeaders() throws IOException
|
||||
{
|
||||
if (gotHeaders)
|
||||
return;
|
||||
gotHeaders = true;
|
||||
|
||||
connect();
|
||||
|
||||
// Yes, it is overkill to use the hash table and vector here since
|
||||
// we're only putting one header in the file, but in case we need
|
||||
// to add others later and for consistency, we'll implement it this way.
|
||||
|
||||
// Add the only header we know about right now: Content-length.
|
||||
long len = core.length;
|
||||
String line = "Content-length: " + len;
|
||||
hdrVec.addElement(line);
|
||||
|
||||
// The key will never be null in this scenario since we build up the
|
||||
// headers ourselves. If we ever rely on getting a header from somewhere
|
||||
// else, then we may have to check if the result of getKey() is null.
|
||||
String key = getKey(line);
|
||||
hdrHash.put(key.toLowerCase(), Long.toString(len));
|
||||
}
|
||||
}
|
||||
|
||||
89
libjava/gnu/gcj/protocol/core/CoreInputStream.java
Normal file
89
libjava/gnu/gcj/protocol/core/CoreInputStream.java
Normal file
@ -0,0 +1,89 @@
|
||||
// Handler.java - URLStreamHandler for core protocol.
|
||||
|
||||
/* Copyright (C) 2001 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.protocol.core;
|
||||
|
||||
import java.io.*;
|
||||
import gnu.gcj.Core;
|
||||
import gnu.gcj.RawData;
|
||||
|
||||
public class CoreInputStream extends InputStream
|
||||
{
|
||||
/* A pointer to the object in memory. */
|
||||
protected RawData ptr;
|
||||
|
||||
/* Position of the next byte in core to be read. */
|
||||
protected int pos;
|
||||
|
||||
/* The currently marked position in the stream. */
|
||||
protected int mark;
|
||||
|
||||
/* The index in core one greater than the last valid character. */
|
||||
protected int count;
|
||||
|
||||
private native int unsafeGetByte (long offset);
|
||||
private native int copyIntoByteArray (byte[] dest, int offset, int numBytes);
|
||||
|
||||
public CoreInputStream (Core core)
|
||||
{
|
||||
ptr = core.ptr;
|
||||
count = core.length;
|
||||
}
|
||||
|
||||
public synchronized int available()
|
||||
{
|
||||
return count - pos;
|
||||
}
|
||||
|
||||
public synchronized void mark(int readAheadLimit)
|
||||
{
|
||||
// readAheadLimit is ignored per Java Class Lib. book, p.220.
|
||||
mark = pos;
|
||||
}
|
||||
|
||||
public boolean markSupported()
|
||||
{
|
||||
return true;
|
||||
}
|
||||
|
||||
public synchronized int read()
|
||||
{
|
||||
if (pos < count)
|
||||
return ((int) unsafeGetByte(pos++)) & 0xFF;
|
||||
return -1;
|
||||
}
|
||||
|
||||
public synchronized int read(byte[] b, int off, int len)
|
||||
{
|
||||
if (pos >= count)
|
||||
return -1;
|
||||
|
||||
int numBytes = Math.min(count - pos, len);
|
||||
copyIntoByteArray (b, off, numBytes);
|
||||
pos += numBytes;
|
||||
return numBytes;
|
||||
}
|
||||
|
||||
public synchronized void reset()
|
||||
{
|
||||
pos = mark;
|
||||
}
|
||||
|
||||
public synchronized long skip(long n)
|
||||
{
|
||||
// Even though the var numBytes is a long, in reality it can never
|
||||
// be larger than an int since the result of subtracting 2 positive
|
||||
// ints will always fit in an int. Since we have to return a long
|
||||
// anyway, numBytes might as well just be a long.
|
||||
long numBytes = Math.min((long) (count - pos), n < 0 ? 0L : n);
|
||||
pos += numBytes;
|
||||
return numBytes;
|
||||
}
|
||||
}
|
||||
29
libjava/gnu/gcj/protocol/core/Handler.java
Normal file
29
libjava/gnu/gcj/protocol/core/Handler.java
Normal file
@ -0,0 +1,29 @@
|
||||
// Handler.java - URLStreamHandler for core protocol.
|
||||
|
||||
/* Copyright (C) 2001 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.protocol.core;
|
||||
|
||||
import java.net.URL;
|
||||
import java.net.URLConnection;
|
||||
import java.net.URLStreamHandler;
|
||||
import java.io.IOException;
|
||||
|
||||
/**
|
||||
* @author Anthony Green <green@redhat.com>
|
||||
* @date August 13, 2001.
|
||||
*/
|
||||
|
||||
public class Handler extends URLStreamHandler
|
||||
{
|
||||
protected URLConnection openConnection(URL url) throws IOException
|
||||
{
|
||||
return new Connection(url);
|
||||
}
|
||||
}
|
||||
49
libjava/gnu/gcj/protocol/core/natCoreInputStream.cc
Normal file
49
libjava/gnu/gcj/protocol/core/natCoreInputStream.cc
Normal file
@ -0,0 +1,49 @@
|
||||
// natCoreInputStream.cc -- C++ side of CoreInputStream
|
||||
|
||||
/* Copyright (C) 2001 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: Anthony Green <green@redhat.com>. */
|
||||
|
||||
#include <config.h>
|
||||
|
||||
#include <gcj/cni.h>
|
||||
#include <jvm.h>
|
||||
#include <string.h>
|
||||
|
||||
#include <java/lang/NullPointerException.h>
|
||||
#include <java/lang/ArrayIndexOutOfBoundsException.h>
|
||||
#include <gnu/gcj/protocol/core/CoreInputStream.h>
|
||||
|
||||
jint
|
||||
gnu::gcj::protocol::core::CoreInputStream::unsafeGetByte (jlong offset)
|
||||
{
|
||||
return ((char *)ptr)[offset];
|
||||
}
|
||||
|
||||
jint
|
||||
gnu::gcj::protocol::core::CoreInputStream::copyIntoByteArray (jbyteArray dest,
|
||||
jint offset,
|
||||
jint numBytes)
|
||||
{
|
||||
if (! dest)
|
||||
throw new java::lang::NullPointerException;
|
||||
jsize destSize = JvGetArrayLength (dest);
|
||||
if (offset < 0 || numBytes < 0 || offset + numBytes < 0
|
||||
|| offset + numBytes > destSize
|
||||
|| pos + numBytes > count)
|
||||
throw new java::lang::ArrayIndexOutOfBoundsException;
|
||||
|
||||
void *pcore = (void *) &((char*)ptr)[pos];
|
||||
void *pdest = (void *) (elements (dest) + offset);
|
||||
|
||||
memcpy (pdest, pcore, numBytes);
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
@ -56,6 +56,16 @@ public final class VMClassLoader extends java.net.URLClassLoader
|
||||
/* Ignore this path element */
|
||||
}
|
||||
}
|
||||
// Add core:/ to the end of the java.class.path so any resources
|
||||
// compiled into this executable may be found.
|
||||
try
|
||||
{
|
||||
p.addElement (new URL("core", "", -1, "/"));
|
||||
}
|
||||
catch (java.net.MalformedURLException x)
|
||||
{
|
||||
// This should never happen.
|
||||
}
|
||||
|
||||
URL[] urls = new URL[p.size()];
|
||||
p.copyInto (urls);
|
||||
|
||||
@ -224,6 +224,7 @@ extern "C" void *_Jv_LookupInterfaceMethodIdx (jclass klass, jclass iface,
|
||||
extern "C" void _Jv_CheckArrayStore (jobject array, jobject obj);
|
||||
extern "C" void _Jv_RegisterClass (jclass klass);
|
||||
extern "C" void _Jv_RegisterClasses (jclass *classes);
|
||||
extern "C" void _Jv_RegisterResource (void *vptr);
|
||||
extern void _Jv_UnregisterClass (_Jv_Utf8Const*, java::lang::ClassLoader*);
|
||||
extern void _Jv_ResolveField (_Jv_Field *, java::lang::ClassLoader*);
|
||||
|
||||
|
||||
@ -339,6 +339,10 @@ public final class URL implements Serializable
|
||||
// If a non-default factory has been set, use it to find the protocol.
|
||||
if (factory != null)
|
||||
handler = factory.createURLStreamHandler(protocol);
|
||||
else if (protocol.equals ("core"))
|
||||
{
|
||||
handler = new gnu.gcj.protocol.core.Handler ();
|
||||
}
|
||||
else if (protocol.equals ("file"))
|
||||
{
|
||||
// This is an interesting case. It's tempting to think that we
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user