FreeChainXenon/gcc
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

[multiple changes]

Browse source 
2002-02-14  Mark Wielaard  <mark@klomp.org>

    * java/math/BigInteger.java: import gnu.java.math.MPN not the whole
    package as a workaround for gcj 3.0.x

2002-02-14  Mark Wielaard <mark@klomp.org>

    * java/security/BasicPermission.java: extends with fully qualified
    classname as workaround for gcj 3.0.4.

2002-02-14  Eric Blake  <ebb9@email.byu.edu>

    * java/net/DatagramSocketImpl.java (setOption, getOption): Work
    around gcj bug of wrong emitted qualifier for inherited method.
    * java/net/SocketImpl.java (setOption, getOption): Ditto.
    * java/util/WeakHashMap.java (WeakEntrySet): Add non-private
    constructor to reduce amount of emitted bytecode. While this
    happens to work around a jikes 1.15 bug, it is still a useful
    patch even for correct compilers.
    * java/rmi/server/RMIClassLoader.java (MyClassLoader): Ditto.
    * gnu/java/rmi/server/UnicastRemoteCall.java
    (DummyObjectOutputStream, DummyObjectInputStream): Ditto.

2002-02-14  Eric Blake  <ebb9@email.byu.edu>

    * java/net/DatagramSocketImpl.java: Reformat (no code changes).
    * java/net/SocketImpl.java: Ditto.
    * java/rmi/server/RMIClassLoader.java: Ditto.
    * gnu/java/rmi/server/UnicastRemoteCall.java: Ditto.

2002-02-14  Mark Wielaard <mark@klomp.org>

    Thanks to Takashi Okamoto
    * java/util/Arrays.java (ArrayList.indexOf()): this.equals().
    * java/util/Arrays.java (ArrayList.lastIndexOf()): Likewise.
    * java/util/WeakHashMap.java (WeakEntry.getEntry()): this.get().

From-SVN: r49778
This commit is contained in:
Mark Wielaard 2002-02-14 23:16:11 +00:00
parent 9a360704f9
commit 894286989e
9 changed files with 536 additions and 344 deletions
Download patch file Download diff file Expand all files Collapse all files

37
libjava/ChangeLog
View file

@ -1,3 +1,40 @@
2002-02-14 Mark Wielaard <mark@klomp.org>
* java/math/BigInteger.java: import gnu.java.math.MPN not the whole
package as a workaround for gcj 3.0.x
2002-02-14 Mark Wielaard <mark@klomp.org>
* java/security/BasicPermission.java: extends with fully qualified
classname as workaround for gcj 3.0.4.
2002-02-14 Eric Blake <ebb9@email.byu.edu>
* java/net/DatagramSocketImpl.java (setOption, getOption): Work
around gcj bug of wrong emitted qualifier for inherited method.
* java/net/SocketImpl.java (setOption, getOption): Ditto.
* java/util/WeakHashMap.java (WeakEntrySet): Add non-private
constructor to reduce amount of emitted bytecode. While this
happens to work around a jikes 1.15 bug, it is still a useful
patch even for correct compilers.
* java/rmi/server/RMIClassLoader.java (MyClassLoader): Ditto.
* gnu/java/rmi/server/UnicastRemoteCall.java
(DummyObjectOutputStream, DummyObjectInputStream): Ditto.
2002-02-14 Eric Blake <ebb9@email.byu.edu>
* java/net/DatagramSocketImpl.java: Reformat (no code changes).
* java/net/SocketImpl.java: Ditto.
* java/rmi/server/RMIClassLoader.java: Ditto.
* gnu/java/rmi/server/UnicastRemoteCall.java: Ditto.
2002-02-14 Mark Wielaard <mark@klomp.org>
Thanks to Takashi Okamoto
* java/util/Arrays.java (ArrayList.indexOf()): this.equals().
* java/util/Arrays.java (ArrayList.lastIndexOf()): Likewise.
* java/util/WeakHashMap.java (WeakEntry.getEntry()): this.get().
2002-02-13 Todd Stock <toddastock@yahoo.com>
Fix for PR libgcj/5670:

236
libjava/gnu/java/rmi/server/UnicastRemoteCall.java
View file

@ -1,5 +1,5 @@
/*
Copyright (c) 1996, 1997, 1998, 1999 Free Software Foundation, Inc.
/* UnicastRemoteCall.java
Copyright (c) 1996, 1997, 1998, 1999, 2002 Free Software Foundation, Inc.
This file is part of GNU Classpath.
@ -45,8 +45,8 @@ import java.io.StreamCorruptedException;
import java.rmi.server.RemoteCall;
import java.util.Vector;
public class UnicastRemoteCall
implements RemoteCall {
public class UnicastRemoteCall implements RemoteCall
{
private UnicastConnection conn;
private Object result;
@ -59,76 +59,89 @@ private int ptr;
/**
* Incoming call.
*/
UnicastRemoteCall(UnicastConnection conn) {
UnicastRemoteCall(UnicastConnection conn)
{
this.conn = conn;
}
/**
* Outgoing call.
*/
UnicastRemoteCall(Object obj, int opnum, long hash) {
UnicastRemoteCall(Object obj, int opnum, long hash)
{
this.object = obj;
this.opnum = opnum;
this.hash = hash;
}
public ObjectOutput getOutputStream() throws IOException {
public ObjectOutput getOutputStream() throws IOException
{
vec = new Vector();
return (new DummyObjectOutputStream());
return new DummyObjectOutputStream();
}
public void releaseOutputStream() throws IOException {
public void releaseOutputStream() throws IOException
{
// Does nothing.
}
public ObjectInput getInputStream() throws IOException {
if (conn != null) {
return (conn.getObjectInputStream());
}
else {
public ObjectInput getInputStream() throws IOException
{
if (conn != null)
return conn.getObjectInputStream();
ptr = 0;
return (new DummyObjectInputStream());
}
return new DummyObjectInputStream();
}
public void releaseInputStream() throws IOException {
public void releaseInputStream() throws IOException
{
// Does nothing.
}
public ObjectOutput getResultStream(boolean success) throws IOException, StreamCorruptedException {
public ObjectOutput getResultStream(boolean success)
throws IOException, StreamCorruptedException
{
vec = new Vector();
return (new DummyObjectOutputStream());
return new DummyObjectOutputStream();
}
public void executeCall() throws Exception {
public void executeCall() throws Exception
{
throw new Error("Not implemented");
}
public void done() throws IOException {
public void done() throws IOException
{
/* Does nothing */
}
Object returnValue() {
return (vec.elementAt(0));
Object returnValue()
{
return vec.elementAt(0);
}
Object[] getArguments() {
return (vec.toArray());
Object[] getArguments()
{
return vec.toArray();
}
Object getObject() {
return (object);
Object getObject()
{
return object;
}
int getOpnum() {
return (opnum);
int getOpnum()
{
return opnum;
}
long getHash() {
return (hash);
long getHash()
{
return hash;
}
void setReturnValue(Object obj) {
void setReturnValue(Object obj)
{
vec.removeAllElements();
vec.addElement(obj);
}
@ -136,176 +149,227 @@ void setReturnValue(Object obj) {
/**
* Dummy object output class.
*/
private class DummyObjectOutputStream implements ObjectOutput {
private class DummyObjectOutputStream implements ObjectOutput
{
/**
* Non-private constructor to reduce bytecode emitted.
*/
DummyObjectOutputStream()
{
}
public void writeBoolean(boolean v) throws IOException {
public void writeBoolean(boolean v) throws IOException
{
vec.addElement(new Boolean(v));
}
public void writeByte(int v) throws IOException {
public void writeByte(int v) throws IOException
{
vec.addElement(new Byte((byte) v));
}
public void writeChar(int v) throws IOException {
public void writeChar(int v) throws IOException
{
vec.addElement(new Character((char) v));
}
public void writeDouble(double v) throws IOException {
public void writeDouble(double v) throws IOException
{
vec.addElement(new Double(v));
}
public void writeFloat(float v) throws IOException {
public void writeFloat(float v) throws IOException
{
vec.addElement(new Float(v));
}
public void writeInt(int v) throws IOException {
public void writeInt(int v) throws IOException
{
vec.addElement(new Integer(v));
}
public void writeLong(long v) throws IOException {
public void writeLong(long v) throws IOException
{
vec.addElement(new Long(v));
}
public void writeShort(int v) throws IOException {
public void writeShort(int v) throws IOException
{
vec.addElement(new Short((short) v));
}
public void writeObject(Object obj) throws IOException {
public void writeObject(Object obj) throws IOException
{
vec.addElement(obj);
}
public void write(byte b[]) throws IOException {
public void write(byte b[]) throws IOException
{
throw new IOException("not required");
}
public void write(byte b[], int off, int len) throws IOException {
public void write(byte b[], int off, int len) throws IOException
{
throw new IOException("not required");
}
public void write(int b) throws IOException {
public void write(int b) throws IOException
{
throw new IOException("not required");
}
public void writeBytes(String s) throws IOException {
public void writeBytes(String s) throws IOException
{
throw new IOException("not required");
}
public void writeChars(String s) throws IOException {
public void writeChars(String s) throws IOException
{
throw new IOException("not required");
}
public void writeUTF(String str) throws IOException {
public void writeUTF(String str) throws IOException
{
throw new IOException("not required");
}
public void flush() throws IOException {
}
public void close() throws IOException {
public void flush() throws IOException
{
}
public void close() throws IOException
{
}
} // class DummyObjectOutputStream
/**
* Dummy object input class.
*/
private class DummyObjectInputStream implements ObjectInput {
private class DummyObjectInputStream implements ObjectInput
{
/**
* Non-private constructor to reduce bytecode emitted.
*/
DummyObjectInputStream()
{
}
public boolean readBoolean() throws IOException {
public boolean readBoolean() throws IOException
{
Object obj = vec.elementAt(ptr++);
return (((Boolean)obj).booleanValue());
return ((Boolean) obj).booleanValue();
}
public byte readByte() throws IOException {
public byte readByte() throws IOException
{
Object obj = vec.elementAt(ptr++);
return (((Byte)obj).byteValue());
return ((Byte) obj).byteValue();
}
public char readChar() throws IOException {
public char readChar() throws IOException
{
Object obj = vec.elementAt(ptr++);
return (((Character)obj).charValue());
return ((Character) obj).charValue();
}
public double readDouble() throws IOException {
public double readDouble() throws IOException
{
Object obj = vec.elementAt(ptr++);
return (((Double)obj).doubleValue());
return ((Double) obj).doubleValue();
}
public float readFloat() throws IOException {
public float readFloat() throws IOException
{
Object obj = vec.elementAt(ptr++);
return (((Float)obj).floatValue());
return ((Float) obj).floatValue();
}
public int readInt() throws IOException {
public int readInt() throws IOException
{
Object obj = vec.elementAt(ptr++);
return (((Integer)obj).intValue());
return ((Integer) obj).intValue();
}
public long readLong() throws IOException {
public long readLong() throws IOException
{
Object obj = vec.elementAt(ptr++);
return (((Long)obj).longValue());
return ((Long) obj).longValue();
}
public short readShort() throws IOException {
public short readShort() throws IOException
{
Object obj = vec.elementAt(ptr++);
return (((Short)obj).shortValue());
return ((Short) obj).shortValue();
}
public Object readObject() throws IOException {
return (vec.elementAt(ptr++));
public Object readObject() throws IOException
{
return vec.elementAt(ptr++);
}
public int read(byte b[]) throws IOException {
public int read(byte b[]) throws IOException
{
throw new IOException("not required");
}
public int read(byte b[], int off, int len) throws IOException {
public int read(byte b[], int off, int len) throws IOException
{
throw new IOException("not required");
}
public int read() throws IOException {
public int read() throws IOException
{
throw new IOException("not required");
}
public long skip(long n) throws IOException {
public long skip(long n) throws IOException
{
throw new IOException("not required");
}
public int available() throws IOException {
public int available() throws IOException
{
throw new IOException("not required");
}
public void readFully(byte b[]) throws IOException {
public void readFully(byte b[]) throws IOException
{
throw new IOException("not required");
}
public void readFully(byte b[], int off, int len) throws IOException {
public void readFully(byte b[], int off, int len) throws IOException
{
throw new IOException("not required");
}
public String readLine() throws IOException {
public String readLine() throws IOException
{
throw new IOException("not required");
}
public String readUTF() throws IOException {
public String readUTF() throws IOException
{
throw new IOException("not required");
}
public int readUnsignedByte() throws IOException {
public int readUnsignedByte() throws IOException
{
throw new IOException("not required");
}
public int readUnsignedShort() throws IOException {
public int readUnsignedShort() throws IOException
{
throw new IOException("not required");
}
public int skipBytes(int n) throws IOException {
public int skipBytes(int n) throws IOException
{
throw new IOException("not required");
}
public void close() throws IOException {
}
public void close() throws IOException
{
}
} // class DummyObjectInputStream
}

2
libjava/java/math/BigInteger.java
View file

@ -37,7 +37,7 @@ exception statement from your version. */
package java.math;
import gnu.java.math.*;
import gnu.java.math.MPN;
import java.util.Random;
import java.io.ObjectInputStream;
import java.io.ObjectOutputStream;

40
libjava/java/net/DatagramSocketImpl.java
View file

@ -1,5 +1,5 @@
/* DatagramSocketImpl.java -- Abstract class for UDP socket implementations
Copyright (C) 1998, 1999 2000, 2001 Free Software Foundation, Inc.
Copyright (C) 1998, 1999 2000, 2001, 2002 Free Software Foundation, Inc.
This file is part of GNU Classpath.
@ -45,10 +45,8 @@ import java.io.FileDescriptor;
* Written using on-line Java Platform 1.2 API Specification, as well
* as "The Java Class Libraries", 2nd edition (Addison-Wesley, 1998).
* Status: Believed complete and correct.
*/
/**
* This abstract class models a datagram socket implementation. An
*
* <p>This abstract class models a datagram socket implementation. An
* actual implementation class would implement these methods, probably
* via redirecting them to native code.
*
@ -203,4 +201,36 @@ public abstract class DatagramSocketImpl implements SocketOptions
{
return localPort;
}
/**
* Sets the specified option on a socket to the passed in object. For
* options that take an integer argument, the passed in object is an
* <code>Integer</code>. For options that are set to on or off, the
* value passed will be a <code>Boolean</code>. The <code>option_id</code>
* parameter is one of the defined constants in the superinterface.
*
* @param option_id The identifier of the option
* @param val The value to set the option to
*
* @exception SocketException If an error occurs
* @XXX This redeclaration from SocketOptions is a workaround to a gcj bug.
*/
public abstract void setOption(int option_id, Object val)
throws SocketException;
/**
* Returns the current setting of the specified option. The
* <code>Object</code> returned will be an <code>Integer</code> for options
* that have integer values. For options that are set to on or off, a
* <code>Boolean</code> will be returned. The <code>option_id</code>
* is one of the defined constants in the superinterface.
*
* @param option_id The option identifier
*
* @return The current value of the option
*
* @exception SocketException If an error occurs
* @XXX This redeclaration from SocketOptions is a workaround to a gcj bug.
*/
public abstract Object getOption(int option_id) throws SocketException;
}

44
libjava/java/net/SocketImpl.java
View file

@ -1,5 +1,5 @@
/* SocketImpl.java -- Abstract socket implementation class
Copyright (C) 1998, 1999, 2000, 2001 Free Software Foundation, Inc.
Copyright (C) 1998, 1999, 2000, 2001, 2002 Free Software Foundation, Inc.
This file is part of GNU Classpath.
@ -61,8 +61,6 @@ import java.io.*;
*/
public abstract class SocketImpl implements SocketOptions
{
/**
* The address of the remote end of the socket connection
*/
@ -224,14 +222,46 @@ public abstract class SocketImpl implements SocketOptions
protected int getLocalPort() { return localport; }
/**
* Returns a <code>String</code> representing the remote host and port of this
* socket.
* Returns a <code>String</code> representing the remote host and port of
* this socket.
*
* @return A <code>String</code> for this socket.
*/
public String toString()
{
return "[addr=" + address.toString() + ",port=" + Integer.toString(port) +
",localport=" + Integer.toString(localport) + "]";
return "[addr=" + address.toString() + ",port=" + Integer.toString(port)
+ ",localport=" + Integer.toString(localport) + "]";
}
/**
* Sets the specified option on a socket to the passed in object. For
* options that take an integer argument, the passed in object is an
* <code>Integer</code>. For options that are set to on or off, the
* value passed will be a <code>Boolean</code>. The <code>option_id</code>
* parameter is one of the defined constants in the superinterface.
*
* @param option_id The identifier of the option
* @param val The value to set the option to
*
* @exception SocketException If an error occurs
* @XXX This redeclaration from SocketOptions is a workaround to a gcj bug.
*/
public abstract void setOption(int option_id, Object val)
throws SocketException;
/**
* Returns the current setting of the specified option. The
* <code>Object</code> returned will be an <code>Integer</code> for options
* that have integer values. For options that are set to on or off, a
* <code>Boolean</code> will be returned. The <code>option_id</code>
* is one of the defined constants in the superinterface.
*
* @param option_id The option identifier
*
* @return The current value of the option
*
* @exception SocketException If an error occurs
* @XXX This redeclaration from SocketOptions is a workaround to a gcj bug.
*/
public abstract Object getOption(int option_id) throws SocketException;
}

63
libjava/java/rmi/server/RMIClassLoader.java
View file

@ -1,5 +1,5 @@
/*
Copyright (c) 1996, 1997, 1998, 1999 Free Software Foundation, Inc.
/* RMIClassLoader.java
Copyright (c) 1996, 1997, 1998, 1999, 2002 Free Software Foundation, Inc.
This file is part of GNU Classpath.
@ -44,58 +44,81 @@ import java.io.DataInputStream;
import java.net.MalformedURLException;
import java.util.StringTokenizer;
public class RMIClassLoader {
public class RMIClassLoader
{
static private class MyClassLoader extends ClassLoader {
static private class MyClassLoader extends ClassLoader
{
/**
* Non-private constructor to reduce bytecode emitted.
*/
MyClassLoader()
{
}
Class defineClass(String name, byte[] data) {
return (defineClass(name, data, 0, data.length));
Class defineClass(String name, byte[] data)
{
return defineClass(name, data, 0, data.length);
}
}
static private MyClassLoader loader = new MyClassLoader();
/**
* @deprecated
*/
public static Class loadClass(String name) throws MalformedURLException, ClassNotFoundException {
return (loadClass(System.getProperty("java.rmi.server.codebase"), name));
public static Class loadClass(String name)
throws MalformedURLException, ClassNotFoundException
{
return loadClass(System.getProperty("java.rmi.server.codebase"), name);
}
public static Class loadClass(URL codebase, String name) throws MalformedURLException, ClassNotFoundException {
public static Class loadClass(URL codebase, String name)
throws MalformedURLException, ClassNotFoundException
{
URL u = new URL(codebase, name + ".class");
try {
try
{
URLConnection conn = u.openConnection();
DataInputStream strm = new DataInputStream(conn.getInputStream());
byte data[] = new byte[conn.getContentLength()];
strm.readFully(data);
return (loader.defineClass(name, data));
return loader.defineClass(name, data);
}
catch (IOException _) {
catch (IOException _)
{
throw new ClassNotFoundException(name);
}
}
public static Class loadClass(String codebase, String name) throws MalformedURLException, ClassNotFoundException {
public static Class loadClass(String codebase, String name)
throws MalformedURLException, ClassNotFoundException
{
StringTokenizer tok = new StringTokenizer(codebase, ":");
while (tok.hasMoreTokens()) {
try {
return (loadClass(new URL(tok.nextToken()), name));
while (tok.hasMoreTokens())
{
try
{
return loadClass(new URL(tok.nextToken()), name);
}
catch (ClassNotFoundException _) {
catch (ClassNotFoundException _)
{
// Ignore - try the next one.
}
}
throw new ClassNotFoundException(name);
}
public static String getClassAnnotation(Class cl) {
return (null); // We don't yet do this.
public static String getClassAnnotation(Class cl)
{
return null; // We don't yet do this.
}
/**
* @deprecated
*/
public static Object getSecurityContext(ClassLoader loader) {
public static Object getSecurityContext(ClassLoader loader)
{
throw new Error("Not implemented");
}

5
libjava/java/security/BasicPermission.java
View file

@ -61,8 +61,9 @@ import java.util.Enumeration;
*
* @author Aaron M. Renn (arenn@urbanophile.com)
*/
public abstract class BasicPermission extends Permission implements
Serializable
public abstract class BasicPermission extends java.security.Permission
implements Serializable
// FIXME extends with fully qualified classname as workaround for gcj 3.0.4
{
/**
* This method initializes a new instance of <code>BasicPermission</code>

6
libjava/java/util/Arrays.java
View file

@ -1,5 +1,5 @@
/* Arrays.java -- Utility class with methods to operate on arrays
Copyright (C) 1998, 1999, 2000, 2001 Free Software Foundation, Inc.
Copyright (C) 1998, 1999, 2000, 2001, 2002 Free Software Foundation, Inc.
This file is part of GNU Classpath.
@ -2430,7 +2430,7 @@ public class Arrays
{
int size = a.length;
for (int i = 0; i < size; i++)
if (equals(o, a[i]))
if (this.equals(o, a[i]))
return i;
return -1;
}
@ -2439,7 +2439,7 @@ public class Arrays
{
int i = a.length;
while (--i >= 0)
if (equals(o, a[i]))
if (this.equals(o, a[i]))
return i;
return -1;
}

11
libjava/java/util/WeakHashMap.java
View file

@ -1,6 +1,6 @@
/* java.util.WeakHashMap -- a hashtable that keeps only weak references
to its keys, allowing the virtual machine to reclaim them
Copyright (C) 1999, 2000, 2001 Free Software Foundation, Inc.
Copyright (C) 1999, 2000, 2001, 2002 Free Software Foundation, Inc.
This file is part of GNU Classpath.
@ -169,6 +169,13 @@ public class WeakHashMap extends AbstractMap implements Map
*/
private final class WeakEntrySet extends AbstractSet
{
/**
* Non-private constructor to reduce bytecode emitted.
*/
WeakEntrySet()
{
}
/**
* Returns the size of this set.
*
@ -483,7 +490,7 @@ public class WeakHashMap extends AbstractMap implements Map
*/
WeakEntry getEntry()
{
final Object key = get();
final Object key = this.get();
if (key == null)
return null;
return new WeakEntry(key);