From java-patches-return-344-listarch-java-patches=sourceware.cygnus.com@sourceware.cygnus.com Mon Jan 03 13:52:22 2000
Return-Path: <java-patches-return-344-listarch-java-patches=sourceware.cygnus.com@sourceware.cygnus.com>
Delivered-To: listarch-java-patches@sourceware.cygnus.com
Received: (qmail 26556 invoked by alias); 3 Jan 2000 13:52:22 -0000
Mailing-List: contact java-patches-help@sourceware.cygnus.com; run by ezmlm
Precedence: bulk
List-Subscribe: <mailto:java-patches-subscribe@sourceware.cygnus.com>
List-Archive: <http://sourceware.cygnus.com/ml/java-patches/>
List-Post: <mailto:java-patches@sourceware.cygnus.com>
List-Help: <mailto:java-patches-help@sourceware.cygnus.com>, <http://sourceware.cygnus.com/ml/#faqs>
Sender: java-patches-owner@sourceware.cygnus.com
Delivered-To: mailing list java-patches@sourceware.cygnus.com
Received: (qmail 26537 invoked from network); 3 Jan 2000 13:52:19 -0000
Message-ID: <3870A964.4420@fernuni-hagen.de>
Date: Mon, 03 Jan 2000 14:51:32 +0100
From: Joerg Brunsmann <joerg.brunsmann@FernUni-Hagen.de>
Organization: Fernuniversitaet Hagen - Software Engineering 
              (Praktische Informatik III)
X-Mailer: Mozilla 3.04 (X11; I; SunOS 5.7 sun4u)
MIME-Version: 1.0
To: java-patches@sourceware.cygnus.com
Subject: Re: FAQ -- building snapshots?
Content-Type: text/plain; charset=us-ascii
Content-Transfer-Encoding: 7bit

This patch removes some inconsistencies in faq.html and
it adds a new FAQ entry. Please also find attached the 
referenced file "build-snapshot.html". BTW: the file
FAQ.html and the directory "new" in "htdocs/" can be 
deleted, I think.


*** faq.html.orig	Mon Jan  3 12:06:21 2000
--- faq.html	Mon Jan  3 14:27:36 2000
***************
*** 61,100 ****
                the support? </a></li>
              <li><a href="#2_2">Does GCJ support using straight C native methods 
                ala JNI? CNI looks kind of hard to use.</a></li>
!             <li><a href="#3_3">Why does GCJ use CNI? </a></li>
!             <li><a href="#2_3">What is the state of AWT support?</a></li>
!             <li><a href="#2_4">How about support for Swing ?</a></li>
!             <li><a href="#2_5">What support is there for RMI ?</a></li>
!             <li><a href="#2_6">Can I use any code from other OpenSource projects 
                to supplement libgcj's current features ?</a></li>
!             <li><a href="#2_7">What features of the Java language are/arn't supported</a></li>
            </ol>
!         <li><a href="#2_0">Build Issues</a> 
            <ol>
              <li><a href="#3_2">Linker bug on Solaris</a> 
            </ol>
          <li><a href="#4_0">Gcj Compile/Link Questions</a> 
            <ol>
              <li><a href="#4_1">Why do I get <tt>undefined reference to `main'</tt> 
                errors?</a> 
!             <li><a href="#4_2">4.2 Can GCJ only handle source code? </a> 
              <li><a href="#4_3">&quot;gcj -C" Doesnt seem to work like javac/jikes. 
                Whats going on? </a> 
              <li><a href="#4_4">Where does GCJ look for files? </a> 
!             <li><a href="#4_4">How does gcj resolve wether to compile .class or 
                .java files? </a> 
-             <li><a href="#4_5">How do I increase the runtime's initial and maximum 
-               heap sizes? </a> 
            </ol>
          <li><a href="#5_0">Runtime Questions</a> 
            <ol>
              <li><a href="#5_1">My program is dumping core! What's going on?</a> 
              <li><a href="#5_2">When I run the debugger I get a SEGV in the GC! 
                What's going on?</a> 
!             <li><a href="#5_3">Can I profile Garbage Collection? </a> 
!             <li><a href="#5_4">How do I increase the runtime's initial and maximum 
                heap sizes?</a> 
!             <li><a href="#5_5">How can I profile my application?</a> 
            </ol>
          <li><a href="#6_0">Programing Issues</a> 
            <ol>
--- 61,103 ----
                the support? </a></li>
              <li><a href="#2_2">Does GCJ support using straight C native methods 
                ala JNI? CNI looks kind of hard to use.</a></li>
!             <li><a href="#2_3">Why does GCJ use CNI? </a></li>
!             <li><a href="#2_4">What is the state of AWT support?</a></li>
!             <li><a href="#2_5">How about support for Swing ?</a></li>
!             <li><a href="#2_6">What support is there for RMI ?</a></li>
!             <li><a href="#2_7">Can I use any code from other OpenSource projects 
                to supplement libgcj's current features ?</a></li>
!             <li><a href="#2_8">What features of the Java language are/arn't supported</a></li>
            </ol>
!         <li><a href="#3_0">Build Issues</a> 
            <ol>
+             <li><a href="#3_1">I need something more recent than the last release; how
+                   should I build it?</a>
              <li><a href="#3_2">Linker bug on Solaris</a> 
            </ol>
          <li><a href="#4_0">Gcj Compile/Link Questions</a> 
            <ol>
              <li><a href="#4_1">Why do I get <tt>undefined reference to `main'</tt> 
                errors?</a> 
!             <li><a href="#4_2">Can GCJ only handle source code? </a> 
              <li><a href="#4_3">&quot;gcj -C" Doesnt seem to work like javac/jikes. 
                Whats going on? </a> 
              <li><a href="#4_4">Where does GCJ look for files? </a> 
!             <li><a href="#4_5">How does gcj resolve wether to compile .class or 
                .java files? </a> 
            </ol>
          <li><a href="#5_0">Runtime Questions</a> 
            <ol>
              <li><a href="#5_1">My program is dumping core! What's going on?</a> 
              <li><a href="#5_2">When I run the debugger I get a SEGV in the GC! 
                What's going on?</a> 
!             <li><a href="#5_3">I have just compiled and benchmarked my Java application 
!             and it seems to be running slower than than XXX JIT JVM. Is there 
!             anything I can do to make it go faster?</a><
!             <li><a href="#5_4">Can I profile Garbage Collection? </a> 
!             <li><a href="#5_5">How do I increase the runtime's initial and maximum 
                heap sizes?</a> 
!             <li><a href="#5_6">How can I profile my application?</a> 
            </ol>
          <li><a href="#6_0">Programing Issues</a> 
            <ol>
***************
*** 169,175 ****
        <table border="0" cellpadding="4" width="95%">
          <tr bgcolor="#B0D0FF"> 
            <th align="left"> 
-             <h2>&nbsp;</h2>
              <h2><a name="2_0">Java Feature Support</a></h2>
            </th>
          </tr>
--- 172,177 ----
***************
*** 201,226 ****
              all of those native methods yourself, and make sure they behave exactly 
              as Sun's do. Note that they're undocumented! </dd>
          </dl>
-         <dl> 
-           <dt>&nbsp;</dt>
-           <dd>&nbsp;</dd>
-         </dl>
          <dt>&nbsp;</dt>
          <dd>To date Reflection is not supported, although all the required metadata 
            is included in Class.h.</dd>
-         <dl> 
-           <dd> 
-             <dl> 
-               <dt>&nbsp; </dt>
-             </dl>
-           </dd>
-         </dl>
-         <dl> 
-           <dt> 
-             <dl> 
-               <dd></dd>
-             </dl>
-           </dt>
          </dl>
          <hr>
          <h3><a name="2_2">2.2 </a>Does GCJ support using straight C native methods 
--- 203,212 ----
              all of those native methods yourself, and make sure they behave exactly 
              as Sun's do. Note that they're undocumented! </dd>
          </dl>
          <dt>&nbsp;</dt>
+        </dl>
          <dd>To date Reflection is not supported, although all the required metadata 
            is included in Class.h.</dd>
          </dl>
          <hr>
          <h3><a name="2_2">2.2 </a>Does GCJ support using straight C native methods 
***************
*** 256,262 ****
            </dt>
          </dl>
          <hr>
!         <h3><a name="2_2">2.3 </a>Why does GCJ use CNI? </h3>
          <blockquote> 
            <p><a href="mailto:per@bothner.com">Per Bothner</a> explains </p>
            <blockquote> 
--- 242,248 ----
            </dt>
          </dl>
          <hr>
!         <h3><a name="2_3">2.3 </a>Why does GCJ use CNI? </h3>
          <blockquote> 
            <p><a href="mailto:per@bothner.com">Per Bothner</a> explains </p>
            <blockquote> 
***************
*** 275,281 ****
          </blockquote>
          <hr>
        </dl>
!       <h3><a name="4_4">2.4 What is the state of AWT support</a>?</h3>
        <dl> 
          <dd> No support is currently in place for AWT. Prior Art which could be 
            used for this all require JNI. Possible starting points follow: 
--- 261,267 ----
          </blockquote>
          <hr>
        </dl>
!       <h3><a name="2_4">2.4 What is the state of AWT support</a>?</h3>
        <dl> 
          <dd> No support is currently in place for AWT. Prior Art which could be 
            used for this all require JNI. Possible starting points follow: 
***************
*** 399,405 ****
        </dl>
        <dl> 
          <dt> 
!           <h3><a name="2_7">2.7 Can I contribute code from other Free Software 
              projects to supplement libgcj's current features?</a></h3>
          </dt>
          <dd> <font color="#FF6600">Can someone point me to some difinitive words 
--- 385,391 ----
        </dl>
        <dl> 
          <dt> 
!           <h3><a name="2_7">2.7 Can I use any code from other OpenSource
              projects to supplement libgcj's current features?</a></h3>
          </dt>
          <dd> <font color="#FF6600">Can someone point me to some difinitive words 
***************
*** 413,419 ****
        </dl>
        <dl> 
          <dt> 
!           <h3><a name="2_8">2.8 What features of the Java language are/arn't supported.</a></h3>
          </dt>
          <dd>At the moment GCJ supports all Java language constructs as per the 
            <a href="http://java.sun.com/docs/books/jls/">Java language Specification 
--- 399,405 ----
        </dl>
        <dl> 
          <dt> 
!           <h3><a name="2_8">2.8 What features of the Java language are/aren't supported.</a></h3>
          </dt>
          <dd>At the moment GCJ supports all Java language constructs as per the 
            <a href="http://java.sun.com/docs/books/jls/">Java language Specification 
***************
*** 431,439 ****
            </th>
          </tr>
        </table>
        <dl> 
          <dt> 
!           <h3><a name="3_1">3.1 Linker bug on Solaris</a></h3>
          </dt>
          <p> 
          <dd>There is a known problem with the <a href="http://egcs.cygnus.com/ml/gcc-bugs/1999-10/msg00159.html"> 
--- 417,436 ----
            </th>
          </tr>
        </table>
+ 
+       <dl> 
+         <dt> 
+           <h3><a name="3_1">3.1 I need something more recent than the last release; how should I build it?</a></h3>
+         </dt>
+         <p> 
+         <dd>Please read <a href="build-snapshot.html">here</a>.
+         </dd>
+         <p></p>
+       </dl>
+ 
        <dl> 
          <dt> 
!           <h3><a name="3_2">3.2 Linker bug on Solaris</a></h3>
          </dt>
          <p> 
          <dd>There is a known problem with the <a href="http://egcs.cygnus.com/ml/gcc-bugs/1999-10/msg00159.html"> 
*************** collect2: ld returned 1 exit status
*** 519,525 ****
          <dt>&nbsp;</dt>
          <dt><font color="#FF3300"></font></dt>
          <dt> 
!           <h3><a name="4_4">4.3 &quot;gcj -C"</a> Doesnt seem to work like javac/jikes. 
              Whats going on?</h3>
          </dt>
          <blockquote> 
--- 516,522 ----
          <dt>&nbsp;</dt>
          <dt><font color="#FF3300"></font></dt>
          <dt> 
!           <h3><a name="4_3">4.3 &quot;gcj -C"</a> Doesnt seem to work like javac/jikes. 
              Whats going on?</h3>
          </dt>
          <blockquote> 
*************** collect2: ld returned 1 exit status
*** 642,648 ****
          <hr>
          <dt>&nbsp;</dt>
          <dt> 
!           <h3><a name="5_3">5.3 Can I profile Garbage Collection?</a></h3>
          </dt>
          <dd>It is possible to turn on verbose GC output by supressing the -DSILENT 
            flag during build. One way to do this is to comment out the line with 
--- 639,645 ----
          <hr>
          <dt>&nbsp;</dt>
          <dt> 
!           <h3><a name="5_4">5.4 Can I profile Garbage Collection?</a></h3>
          </dt>
          <dd>It is possible to turn on verbose GC output by supressing the -DSILENT 
            flag during build. One way to do this is to comment out the line with 
*************** collect2: ld returned 1 exit status
*** 655,661 ****
          <hr>
          <dt>&nbsp;</dt>
          <dt> 
!           <h3><a name="5_3">5.4 How do I increase the runtime's initial and maximum 
              heap sizes?</a></h3>
          </dt>
          <dd>Some programs that allocate many small, short-lived objects can cause 
--- 652,658 ----
          <hr>
          <dt>&nbsp;</dt>
          <dt> 
!           <h3><a name="5_5">5.5 How do I increase the runtime's initial and maximum 
              heap sizes?</a></h3>
          </dt>
          <dd>Some programs that allocate many small, short-lived objects can cause 
*************** collect2: ld returned 1 exit status
*** 667,673 ****
        <hr>
        <dl> 
          <dt> 
!           <h3><a name="5_3">5.5 How can I profile my application?</a></h3>
          </dt>
          <dd>Support for this is currently lagging. Only single threaded Java code 
            may be used by the profiler (gprof). POSIX threads seem to be incompatible 
--- 664,670 ----
        <hr>
        <dl> 
          <dt> 
!           <h3><a name="5_6">5.6 How can I profile my application?</a></h3>
          </dt>
          <dd>Support for this is currently lagging. Only single threaded Java code 
            may be used by the profiler (gprof). POSIX threads seem to be incompatible 
*************** collect2: ld returned 1 exit status
*** 685,691 ****
        <h3><a name="6_1"></a>6.1 Are there any examples of how to use CNI?</h3>
        <blockquote> 
          <p><a href="mailto:tromey@cygnus.com">Tom Tromey</a> has created a couple 
!           of simple ezamples <a href="cni-1.txt">here</a> and <a href="cni-2.txt">here</a>. 
          </p>
          <p>Another CNI example may be found here (thanks to Glenn Chambers!): 
            <a href="http://sourceware.cygnus.com/ml/java-discuss/1999-q3/msg00534.html">http://sourceware.cygnus.com/ml/java-discuss/1999-q3/msg00534.html</a> 
--- 682,688 ----
        <h3><a name="6_1"></a>6.1 Are there any examples of how to use CNI?</h3>
        <blockquote> 
          <p><a href="mailto:tromey@cygnus.com">Tom Tromey</a> has created a couple 
!           of simple examples <a href="cni-1.txt">here</a> and <a href="cni-2.txt">here</a>. 
          </p>
          <p>Another CNI example may be found here (thanks to Glenn Chambers!): 
            <a href="http://sourceware.cygnus.com/ml/java-discuss/1999-q3/msg00534.html">http://sourceware.cygnus.com/ml/java-discuss/1999-q3/msg00534.html</a> 




-----------------build-snapshot.html-------------------


<html>
<head>
<title>How to build GCJ/LIBGCJ snapshots</title>
</head>
<body bgcolor="white" text="black" link="#0000EE" VLINK="#551A8B" ALINK="red">

<body bgcolor="#FFFFFF">

<table border="0" cellpadding="4" width="95%">
        <tr bgcolor="#b0d0ff"> 
          <th align="center"> 
            <h2>Howto build and run libgcj/gcj snapshots</a>
          </th>
        </tr>


<tr bgcolor="cccccc">
<td>
<pre>
1. Get a GCC snapshots from 

<a href="ftp://gcc.cygnus.com/pub/egcs/snapshots/index.html">ftp://gcc.cygnus.com/pub/egcs/snapshots/index.html</a>

They are made about once a week. 
</pre>
</td>
</tr>

<tr bgcolor="dddddd">
<td>
<pre>
2. Get a Libgcj snapshots from

<a href="ftp://sourceware.cygnus.com/pub/java/snapshot">ftp://sourceware.cygnus.com/pub/java/snapshot</a>

They are made nightly.
</pre>
</td>
</tr>

<tr bgcolor="cccccc">
<td>
<pre>
3. Make a compile directory

  $ mkdir compile
</pre>
</td>
</tr>

<tr bgcolor="dddddd">
<td>
<pre>
4. Move the snapshots into the compile dir, e.g.

  $ cd compile
  $ mv ../egcs-19991110.tar.gz .
  $ mv ../libgcj-snapshot-1999-11-12.tar.gz .
  $ gunzip *.gz
  $ tar xfv *.tar
  $ ln -s egcs-19991102 egcs
  $ ln -s libgcj-snapshot-1999-11-12 libgcj
</pre>
</td>
</tr>

<tr bgcolor="cccccc">
<td>
<pre>
5. Compile and install egcs/gcj

  $ cd egcs
  $ mkdir objdir
  $ cd objdir
  $ ../configure --enable-threads=posix --prefix=/home/joerg/gcc \ 
     --enable-java-gc=boehm --with-as=/opt/gnu/bin/as \
     --with-ld=/opt/gnu/bin/ld
  $ make bootstrap
  $ make install

If you compile under Linux you could omit the last two options. Under
Solaris you'll need them. If you omit '--prefix' the compiled source will 
be installed under /usr/local. For more information about installing 
egcs and/or configuration options see:

<a href="http://egcs.cygnus.com/install/index.html">
http://egcs.cygnus.com/install/index.html</a>
</pre>
</td>
</tr>

<tr bgcolor="dddddd">
<td>
<pre>
6. Set the Path to the newly installed gcc

  $ setenv PATH /home/joerg/gcc/bin:$PATH

Be sure to use the path with you gave the configure script
with '--prefix'.

Test the existence with

  $ gcj -v
</pre>
</td>
</tr>

<tr bgcolor="cccccc">
<td>
<pre>
7. Compile and install libgcj

 $ cd ../libgcj
 $ mkdir objdir
 $ cd objdir
 $ ../configure --enable-threads=posix --prefix=/home/joerg/libgcj \
   --enable-java-gc=boehm --with-as=/opt/gnu/bin/as --with-ld=/opt/gnu/bin/ld

Again, the last two options are needed for Solaris.

 $ make
 $ make install

Make sure you configured both gcj and libgjc with the same garbarge collector 
and with the same thread package. If you use the default for gcj/egcs (no 
configure option) you have to use --enable-java-gc=no for libgcj.
</pre>
</td>
</tr>

<tr bgcolor="dddddd">
<td>
<pre>
8. Adjust your environment

Edit a file env.csh:

setenv PATH /home/joerg/gcc/bin:$PATH
setenv LD_LIBRARY_PATH /home/joerg/libgcj/lib
setenv CLASSPATH /home/joerg/libgcj/share/libgcj.zip

  $ source env.csh
</pre>
</td>
</tr>

<tr bgcolor="cccccc">
<td>
<pre>
9. If gcj complains about a missing libgcj.spec file copy it into your current directory
  
  $ cp /home/joerg/libgcj/lib/libgcj.spec .
</pre>
</td>
</tr>

<tr bgcolor="dddddd">
<td>
<pre>
10. Edit a file HelloWorld.java

  public class HelloWorld {
    public static void main(String [] args) {
      System.out.println("Hello");
    }
  }
</pre>
</td>
</tr>

<tr bgcolor="cccccc">
<td>
<pre>
11. Compile and run HelloWorld

 $ gcj --main=HelloWorld -o HelloWorld HelloWorld.java
 $ ./HelloWorld
</pre>
</td>
</tr>

</table>


</body>
</html>

From java-patches-return-345-listarch-java-patches=sourceware.cygnus.com@sourceware.cygnus.com Mon Jan 03 20:18:20 2000
Return-Path: <java-patches-return-345-listarch-java-patches=sourceware.cygnus.com@sourceware.cygnus.com>
Delivered-To: listarch-java-patches@sourceware.cygnus.com
Received: (qmail 19209 invoked by alias); 3 Jan 2000 20:18:19 -0000
Mailing-List: contact java-patches-help@sourceware.cygnus.com; run by ezmlm
Precedence: bulk
List-Subscribe: <mailto:java-patches-subscribe@sourceware.cygnus.com>
List-Archive: <http://sourceware.cygnus.com/ml/java-patches/>
List-Post: <mailto:java-patches@sourceware.cygnus.com>
List-Help: <mailto:java-patches-help@sourceware.cygnus.com>, <http://sourceware.cygnus.com/ml/#faqs>
Sender: java-patches-owner@sourceware.cygnus.com
Delivered-To: mailing list java-patches@sourceware.cygnus.com
Received: (qmail 19176 invoked from network); 3 Jan 2000 20:18:06 -0000
To: Java Patch List <java-patches@sourceware.cygnus.com> 
Subject: Patch: better control of Mauve tests
X-Zippy:  What a COINCIDENCE!  I'm an authorized ``SNOOTS OF THE STARS'' dealer!!
X-Attribution:  Tom
Bcc:
Reply-To:  tromey@cygnus.com
From:  Tom Tromey <tromey@cygnus.com>
Date: 03 Jan 2000 13:20:23 -0700
Message-ID: <87k8lqoqk8.fsf@cygnus.com>
Lines: 39

I'm committing the appended patch.  It changes the test suite to give
better control over Mauve tests; now you can select which tests to run
from the `dejagnu' command line.

1999-12-31  Tom Tromey  <tromey@cygnus.com>

	* libjava.mauve/mauve.exp (mauve_compute_uses): Let user select
	specific tests to run.

Tom

Index: libjava.mauve/mauve.exp
===================================================================
RCS file: /cvs/java/libgcj/libjava/testsuite/libjava.mauve/mauve.exp,v
retrieving revision 1.6
diff -u -r1.6 mauve.exp
--- mauve.exp	1999/07/31 23:52:52	1.6
+++ mauve.exp	2000/01/03 20:10:51
@@ -10,7 +10,7 @@
 # maps source file names onto list of objects required for link.
 proc mauve_compute_uses {aName} {
   upvar $aName uses
-  global env
+  global env runtests
 
   set fd [open classes r]
   set line [read $fd]
@@ -21,6 +21,11 @@
       continue
     }
     set item [join [split $item .] /].java
+
+    # User might have specified "mauve.exp=something.java".
+    if {! [runtest_file_p $runtests $item]} {
+      continue
+    }
 
     # Look for Uses line in source file.
     set fd [open $env(MAUVEDIR)/$item r]

From java-patches-return-346-listarch-java-patches=sourceware.cygnus.com@sourceware.cygnus.com Tue Jan 04 08:47:46 2000
Return-Path: <java-patches-return-346-listarch-java-patches=sourceware.cygnus.com@sourceware.cygnus.com>
Delivered-To: listarch-java-patches@sourceware.cygnus.com
Received: (qmail 16469 invoked by alias); 4 Jan 2000 08:47:45 -0000
Mailing-List: contact java-patches-help@sourceware.cygnus.com; run by ezmlm
Precedence: bulk
List-Subscribe: <mailto:java-patches-subscribe@sourceware.cygnus.com>
List-Archive: <http://sourceware.cygnus.com/ml/java-patches/>
List-Post: <mailto:java-patches@sourceware.cygnus.com>
List-Help: <mailto:java-patches-help@sourceware.cygnus.com>, <http://sourceware.cygnus.com/ml/#faqs>
Sender: java-patches-owner@sourceware.cygnus.com
Delivered-To: mailing list java-patches@sourceware.cygnus.com
Received: (qmail 16367 invoked from network); 4 Jan 2000 08:46:32 -0000
To: Java Patch List <java-patches@sourceware.cygnus.com> 
Subject: Patch: reflection support
X-Zippy:  It's today's SPECIAL!
X-Attribution:  Tom
Bcc:
Reply-To:  tromey@cygnus.com
From:  Tom Tromey <tromey@cygnus.com>
Date: 04 Jan 2000 01:46:20 -0700
Message-ID: <87hfguns0z.fsf@cygnus.com>
Lines: 1456
X-Mailer: Gnus v5.5/Emacs 20.3

I'm checking in this jumbo patch.  It:

* Implements most of java.lang.reflect (perhaps all of it)
* Implements nearly all of the reflection methods in java.lang.Class
* Fixes a couple bugs in the existing reflection code
* Fixes a couple minor portability bugs (define _GNU_SOURCE always,
  remove the `#pragma's from array.h -- this last one allows "-g"
  builds to work again for me)

This code compiles, and at least partly works, but it is largely
untested.  It currently fails on the one Mauve Method.invoke test, but
I've been having major problems debugging (compiler and debugger
failures on alternate days), so I'm just committing it.  As far as I
know it won't break anything that already works.

In case this seeming instability worries you, my plan for the next few
days is to write Mauve tests for the new functionality, and get the
debugging done too.

2000-01-04  Tom Tromey  <tromey@cygnus.com>

	* java/lang/reflect/natConstructor.cc (newInstance): Pass
	declaring class as return_type argument to
	_Jv_CallNonvirtualMethodA.
	* java/lang/reflect/natMethod.cc (_Jv_CallNonvirtualMethodA): In
	constructor case, create object and use it as `this' argument.
	* java/lang/Class.h (_getConstructors): Declare.
	(_getFields): Declare.
	* java/lang/Class.java (getConstructors): Wrote.
	(_getConstructors): New native method.
	(getDeclaredConstructors): Wrote.
	(_getFields): Declare new native method.
	* java/lang/natClass.cc (_Jv_LookupInterfaceMethod): Removed
	incorrect comment.
	(getMethod): Work correctly when class is primitive.
	(getDeclaredMethods): Likewise.  Compute offset using `method',
	not `mptr'.
	(getDeclaredMethod): Likewise.
	(getConstructor): Wrote.
	(ConstructorClass): New define.
	(getDeclaredConstructor): Wrote.
	(_getConstructors): New method.
	(_getFields): New method.
	(getFields): Wrote.

	* Makefile.in: Rebuilt.
	* Makefile.am (AM_CXXFLAGS): Added -D_GNU_SOURCE.

	* prims.cc: Remove `#pragma implementation'.
	* gcj/array.h: Remove `#pragma interface'.

	* prims.cc (_Jv_equaln): New function.
	* java/lang/Class.java (getSignature): Declare.
	* resolve.cc (_Jv_LookupDeclaredMethod): Moved to natClass.cc.
	* java/lang/natClass.cc (_Jv_LookupDeclaredMethod): Moved from
	resolve.cc.
	(getSignature): New method.
	(getDeclaredMethod): Wrote.
	(getMethod): Wrote.
	Include StringBuffer.h.
	* java/lang/Class.h (Class): Added _Jv_FromReflectedConstructor
	as a friend.  Unconditionally declare _Jv_LookupDeclaredMethod as
	a friend.
	(getSignature): Declare.
	* include/jvm.h (_Jv_GetTypesFromSignature): Declare.
	(_Jv_equaln): Declare.
	(_Jv_CallNonvirtualMethodA): Declare.
	* Makefile.in: Rebuilt.
	* Makefile.am (nat_source_files): Added natConstructor.cc.
	(java/lang/reflect/Constructor.h): New target.
	* java/lang/reflect/natConstructor.cc: New file.
	* java/lang/reflect/Constructor.java (newInstance): Now native.
	(declaringClass): Renamed from decl_class.
	(offset): Renamed from index.
	(getType): New native method.
	(getModifiers): Now native.
	(getParameterTypes): Call getType if required.
	(hashCode): Include hash code from declaring class.
	(modifiers): Removed.
	(toString): Call getType if required.
	* gcj/method.h (_Jv_FromReflectedConstructor): New function.
	* java/lang/reflect/natMethod.cc (hack_call): New method.
	Removed `#if 0' around FFI code.
	Include <gnu/gcj/RawData.h>.
	(invoke): Use _Jv_CallNonvirtualMethodA.  Throw
	IllegalArgumentException when argument object and class disagree.
	(_Jv_GetTypesFromSignature): New function.
	(getType): Use it.
	(ObjectClass): New define.
	(_Jv_CallNonvirtualMethodA): New function.
	* java/lang/reflect/Method.java (hack_trampoline): New method.
	(hack_call): New native method.

1999-12-21  Per Bothner  <per@bothner.com>

	* java/lang/natClass.cc (getDeclaredMethods): Correctly compute
	offset in new Method.

Tom

Index: Makefile.am
===================================================================
RCS file: /cvs/java/libgcj/libjava/Makefile.am,v
retrieving revision 1.39
diff -u -r1.39 Makefile.am
--- Makefile.am	1999/12/20 02:18:11	1.39
+++ Makefile.am	2000/01/04 08:39:01
@@ -74,8 +74,10 @@
 EH_COMMON_INCLUDE = @EH_COMMON_INCLUDE@
 
 WARNINGS = -W -Wall
+## We need _GNU_SOURCE defined for some Linux builds.  It doesn't hurt
+## to always define it.
 AM_CXXFLAGS = -fno-rtti -fvtable-thunks @LIBGCJ_CXXFLAGS@ @EXCEPTIONSPEC@ \
-	$(WARNINGS)
+	$(WARNINGS) -D_GNU_SOURCE
 if USING_GCC
 AM_CFLAGS = @LIBGCJ_CFLAGS@ $(WARNINGS)
 else
@@ -229,6 +231,12 @@
 	    -friend 'jstring _Jv_AllocString (jsize);' \
 	    $(basename $<)
 
+java/lang/reflect/Constructor.h: java/lang/reflect/Constructor.class libgcj.zip
+	$(GCJH) -classpath $(top_builddir) \
+	    -friend 'jmethodID _Jv_FromReflectedConstructor (java::lang::reflect::Constructor *);' \
+	    -friend 'java::lang::Class;' \
+	    $(basename $<)
+
 java/lang/reflect/Field.h: java/lang/reflect/Field.class libgcj.zip
 	$(GCJH) -classpath $(top_builddir) \
 	    -friend 'jfieldID _Jv_FromReflectedField (java::lang::reflect::Field *);' \
@@ -797,6 +805,7 @@
 java/lang/natSystem.cc \
 java/lang/natThread.cc \
 java/lang/reflect/natArray.cc \
+java/lang/reflect/natConstructor.cc \
 java/lang/reflect/natField.cc \
 java/lang/reflect/natMethod.cc \
 java/net/natInetAddress.cc \
Index: prims.cc
===================================================================
RCS file: /cvs/java/libgcj/libjava/prims.cc,v
retrieving revision 1.14
diff -u -r1.14 prims.cc
--- prims.cc	1999/11/25 00:36:51	1.14
+++ prims.cc	2000/01/04 08:39:14
@@ -16,8 +16,6 @@
 #include <string.h>
 #include <signal.h>
 
-#pragma implementation "gcj/array.h"
-
 #include <gcj/cni.h>
 #include <jvm.h>
 #include <java-signal.h>
@@ -133,6 +131,26 @@
   register unsigned char* ptr = (unsigned char*) a->data;
   register unsigned char* limit = ptr + a->length;
   for (;; i++, sptr++)
+    {
+      int ch = UTF8_GET (ptr, limit);
+      if (i == len)
+	return ch < 0;
+      if (ch != *sptr)
+	return false;
+    }
+  return true;
+}
+
+/* Like _Jv_equal, but stop after N characters.  */
+jboolean
+_Jv_equaln (Utf8Const *a, jstring str, jint n)
+{
+  jint len = str->length();
+  jint i = 0;
+  jchar *sptr = _Jv_GetStringChars (str);
+  register unsigned char* ptr = (unsigned char*) a->data;
+  register unsigned char* limit = ptr + a->length;
+  for (; n-- > 0; i++, sptr++)
     {
       int ch = UTF8_GET (ptr, limit);
       if (i == len)
Index: resolve.cc
===================================================================
RCS file: /cvs/java/libgcj/libjava/resolve.cc,v
retrieving revision 1.6
diff -u -r1.6 resolve.cc
--- resolve.cc	1999/09/10 22:03:05	1.6
+++ resolve.cc	2000/01/04 08:39:24
@@ -321,21 +321,6 @@
     }
 }
 
-_Jv_Method*
-_Jv_LookupDeclaredMethod (jclass klass, _Jv_Utf8Const *name,
-			_Jv_Utf8Const *signature)
-{
-  for (; klass; klass = klass->getSuperclass())
-    {
-      _Jv_Method *meth = _Jv_GetMethodLocal (klass, name, signature);
-
-      if (meth)
-	return meth;
-    }
-
-  return NULL;
-}
-
 /** FIXME: this is a terribly inefficient algorithm!  It would improve
     things if compiled classes to know vtable offset, and _Jv_Method had
     a field for this.
Index: gcj/array.h
===================================================================
RCS file: /cvs/java/libgcj/libjava/gcj/array.h,v
retrieving revision 1.2
diff -u -r1.2 array.h
--- array.h	1999/10/22 19:43:40	1.2
+++ array.h	2000/01/04 08:39:28
@@ -11,8 +11,6 @@
 #ifndef __GCJ_ARRAY_H__
 #define __GCJ_ARRAY_H__
 
-#pragma interface
-
 #include <java/lang/Object.h>
 
 extern "Java" {
Index: gcj/method.h
===================================================================
RCS file: /cvs/java/libgcj/libjava/gcj/method.h,v
retrieving revision 1.1
diff -u -r1.1 method.h
--- method.h	1999/09/10 22:03:06	1.1
+++ method.h	2000/01/04 08:39:28
@@ -18,4 +18,11 @@
     ((char *) method->declaringClass->methods + method->offset);
 }
 
+extern inline jmethodID
+_Jv_FromReflectedConstructor (java::lang::reflect::Constructor *constructor)
+{
+  return (jmethodID)
+    ((char *) constructor->declaringClass->methods + constructor->offset);
+}
+
 #endif /* __GCJ_METHOD_H__ */
Index: include/jvm.h
===================================================================
RCS file: /cvs/java/libgcj/libjava/include/jvm.h,v
retrieving revision 1.8
diff -u -r1.8 jvm.h
--- jvm.h	1999/12/06 06:33:56	1.8
+++ jvm.h	2000/01/04 08:39:32
@@ -53,6 +53,7 @@
 _Jv_Utf8Const *_Jv_makeUtf8Const (jstring string);
 extern jboolean _Jv_equalUtf8Consts (_Jv_Utf8Const *, _Jv_Utf8Const *);
 extern jboolean _Jv_equal (_Jv_Utf8Const *, jstring, jint);
+extern jboolean _Jv_equaln (_Jv_Utf8Const *, jstring, jint);
 
 #define StringClass _CL_Q34java4lang6String
 extern java::lang::Class StringClass;
@@ -161,6 +162,13 @@
 			     java::lang::ClassLoader *loader);
 extern jclass _Jv_FindClassFromSignature (char *,
 					  java::lang::ClassLoader *loader);
+extern void _Jv_GetTypesFromSignature (jmethodID method,
+				       jclass declaringClass,
+				       JArray<jclass> **arg_types_out,
+				       jclass *return_type_out);
+extern jobject _Jv_CallNonvirtualMethodA (jobject, jclass,
+					  jmethodID, jboolean,
+					  JArray<jclass> *, jobjectArray);
 
 extern jobject _Jv_NewMultiArray (jclass, jint ndims, jint* dims)
   __attribute__((__malloc__));
Index: java/lang/Class.h
===================================================================
RCS file: /cvs/java/libgcj/libjava/java/lang/Class.h,v
retrieving revision 1.7
diff -u -r1.7 Class.h
--- Class.h	1999/09/10 22:03:08	1.7
+++ Class.h	2000/01/04 08:39:37
@@ -1,6 +1,6 @@
 // Class.h - Header file for java.lang.Class.  -*- c++ -*-
 
-/* Copyright (C) 1998, 1999  Cygnus Solutions
+/* Copyright (C) 1998, 1999, 2000  Cygnus Solutions
 
    This file is part of libgcj.
 
@@ -94,12 +94,16 @@
 
   java::lang::reflect::Field *getField (jstring);
 private:
+  jint _getFields (JArray<java::lang::reflect::Field *> *result, jint offset);
+  JArray<java::lang::reflect::Constructor *> *_getConstructors (jboolean);
   java::lang::reflect::Field *getField (jstring, jint);
 public:
   JArray<java::lang::reflect::Field *> *getFields (void);
 
   JArray<jclass> *getInterfaces (void);
 
+  void getSignature (java::lang::StringBuffer *buffer);
+  static jstring getSignature (JArray<jclass> *);
   java::lang::reflect::Method *getMethod (jstring, JArray<jclass> *);
   JArray<java::lang::reflect::Method *> *getMethods (void);
 
@@ -156,6 +160,8 @@
   // Friend functions implemented in natClass.cc.
   friend _Jv_Method *_Jv_GetMethodLocal (jclass klass, _Jv_Utf8Const *name,
 					 _Jv_Utf8Const *signature);
+  friend _Jv_Method* _Jv_LookupDeclaredMethod (jclass, _Jv_Utf8Const *, 
+					       _Jv_Utf8Const*);
   friend void _Jv_InitClass (jclass klass);
 
   friend jfieldID JvGetFirstInstanceField (jclass);
@@ -166,6 +172,7 @@
   friend jobject _Jv_JNI_ToReflectedField (_Jv_JNIEnv *, jclass, jfieldID);
   friend jfieldID _Jv_FromReflectedField (java::lang::reflect::Field *);
   friend jmethodID _Jv_FromReflectedMethod (java::lang::reflect::Method *);
+  friend jmethodID _Jv_FromReflectedConstructor (java::lang::reflect::Constructor *);
 
   friend class _Jv_PrimClass;
 
@@ -190,8 +197,6 @@
 #ifdef INTERPRETER
   friend jboolean _Jv_IsInterpretedClass (jclass);
   friend void _Jv_InitField (jobject, jclass, _Jv_Field*);
-  friend _Jv_Method* _Jv_LookupDeclaredMethod (jclass, _Jv_Utf8Const *, 
-					       _Jv_Utf8Const*);
   friend int _Jv_DetermineVTableIndex (jclass, _Jv_Utf8Const *, 
 				       _Jv_Utf8Const*);
   friend void _Jv_InitField (jobject, jclass, int);
Index: java/lang/Class.java
===================================================================
RCS file: /cvs/java/libgcj/libjava/java/lang/Class.java,v
retrieving revision 1.3
diff -u -r1.3 Class.java
--- Class.java	1999/08/18 14:16:41	1.3
+++ Class.java	2000/01/04 08:39:37
@@ -1,6 +1,6 @@
 // Class.java - Representation of a Java class.
 
-/* Copyright (C) 1998, 1999  Cygnus Solutions
+/* Copyright (C) 1998, 1999, 2000  Cygnus Solutions
 
    This file is part of libgcj.
 
@@ -36,14 +36,27 @@
 
   public native Constructor getConstructor (Class[] parameterTypes)
     throws NoSuchMethodException, SecurityException;
-  public native Constructor[] getConstructors () throws SecurityException;
 
-  public native Class[] getDeclaredClasses () throws SecurityException;
+  // This is used to implement getConstructors and
+  // getDeclaredConstructors.
+  private native Constructor[] _getConstructors (boolean declared)
+    throws SecurityException;
 
+  public Constructor[] getConstructors () throws SecurityException
+  {
+    return _getConstructors (false);
+  }
+
   public native Constructor getDeclaredConstructor (Class[] parameterTypes)
     throws NoSuchMethodException, SecurityException;
-  public native Constructor[] getDeclaredConstructors ()
-    throws SecurityException;
+
+  public native Class[] getDeclaredClasses () throws SecurityException;
+
+  public Constructor[] getDeclaredConstructors () throws SecurityException
+  {
+    return _getConstructors (true);
+  }
+
   public native Field getDeclaredField (String fieldName)
     throws NoSuchFieldException, SecurityException;
   public native Field[] getDeclaredFields () throws SecurityException;
@@ -69,9 +82,14 @@
       throw new NoSuchFieldException(fieldName);
     return fld;
   }
+
+  private native Field[] _getFields (Field[] result, int offset);
   public native Field[] getFields () throws SecurityException;
 
   public native Class[] getInterfaces ();
+
+  private final native void getSignature (StringBuffer buffer);
+  private static final native String getSignature (Class[] parameterTypes);
 
   public native Method getMethod (String methodName, Class[] parameterTypes)
     throws NoSuchMethodException, SecurityException;
Index: java/lang/natClass.cc
===================================================================
RCS file: /cvs/java/libgcj/libjava/java/lang/natClass.cc,v
retrieving revision 1.8
diff -u -r1.8 natClass.cc
--- natClass.cc	1999/11/18 07:19:00	1.8
+++ natClass.cc	2000/01/04 08:39:41
@@ -1,6 +1,6 @@
 // natClass.cc - Implementation of java.lang.Class native methods.
 
-/* Copyright (C) 1998, 1999  Cygnus Solutions
+/* Copyright (C) 1998, 1999, 2000  Cygnus Solutions
 
    This file is part of libgcj.
 
@@ -38,6 +38,7 @@
 #include <java/lang/NullPointerException.h>
 #include <java/lang/System.h>
 #include <java/lang/SecurityManager.h>
+#include <java/lang/StringBuffer.h>
 
 #include <java-cpool.h>
 
@@ -55,6 +56,8 @@
 extern java::lang::Class MethodClass;
 #define FieldClass _CL_Q44java4lang7reflect5Field
 extern java::lang::Class FieldClass;
+#define ConstructorClass _CL_Q44java4lang7reflect11Constructor
+extern java::lang::Class ConstructorClass;
 
 // Some constants we use to look up the class initializer.
 static _Jv_Utf8Const *void_signature = _Jv_makeUtf8Const ("()V", 3);
@@ -96,27 +99,95 @@
 }
 
 java::lang::reflect::Constructor *
-java::lang::Class::getConstructor (JArray<jclass> *)
+java::lang::Class::getConstructor (JArray<jclass> *param_types)
 {
-  JvFail ("java::lang::Class::getConstructor not implemented");
+  jstring partial_sig = getSignature (param_types);
+  jint hash = partial_sig->hashCode ();
+
+  int i = isPrimitive () ? 0 : method_count;
+  while (--i >= 0)
+    {
+      // FIXME: access checks.
+      if (_Jv_equalUtf8Consts (methods[i].name, init_name)
+	  && _Jv_equal (methods[i].signature, partial_sig, hash))
+	{
+	  // Found it.  For getConstructor, the constructor must be
+	  // public.
+	  using namespace java::lang::reflect;
+	  if (Modifier::isPublic(methods[i].accflags))
+	    break;
+	  Constructor *cons = new Constructor ();
+	  cons->offset = (char *) (&methods[i]) - (char *) methods;
+	  cons->declaringClass = this;
+	  return cons;
+	}
+    }
+  JvThrow (new java::lang::NoSuchMethodException);
 }
 
 JArray<java::lang::reflect::Constructor *> *
-java::lang::Class::getConstructors (void)
+java::lang::Class::_getConstructors (jboolean declared)
 {
-  JvFail ("java::lang::Class::getConstructors not implemented");
+  // FIXME: this method needs access checks.
+
+  int numConstructors = 0;
+  int max = isPrimitive () ? 0 : method_count;
+  int i;
+  for (i = max; --i >= 0; )
+    {
+      _Jv_Method *method = &methods[i];
+      if (method->name == NULL
+	  && ! _Jv_equalUtf8Consts (method->name, init_name))
+	continue;
+      if (declared
+	  && ! java::lang::reflect::Modifier::isPublic(method->accflags))
+	continue;
+      numConstructors++;
+    }
+  JArray<java::lang::reflect::Constructor *> *result
+    = (JArray<java::lang::reflect::Constructor *> *)
+    JvNewObjectArray (numConstructors, &ConstructorClass, NULL);
+  java::lang::reflect::Constructor** cptr = elements (result);
+  for (i = 0;  i < max;  i++)
+    {
+      _Jv_Method *method = &methods[i];
+      if (method->name == NULL
+	  && ! _Jv_equalUtf8Consts (method->name, init_name))
+	continue;
+      if (declared
+	  && ! java::lang::reflect::Modifier::isPublic(method->accflags))
+	continue;
+      java::lang::reflect::Constructor *cons
+	= new java::lang::reflect::Constructor ();
+      cons->offset = (char *) method - (char *) methods;
+      cons->declaringClass = this;
+      *cptr++ = cons;
+    }
+  return result;
 }
 
 java::lang::reflect::Constructor *
-java::lang::Class::getDeclaredConstructor (JArray<jclass> *)
+java::lang::Class::getDeclaredConstructor (JArray<jclass> *param_types)
 {
-  JvFail ("java::lang::Class::getDeclaredConstructor not implemented");
-}
+  jstring partial_sig = getSignature (param_types);
+  jint hash = partial_sig->hashCode ();
 
-JArray<java::lang::reflect::Constructor *> *
-java::lang::Class::getDeclaredConstructors (void)
-{
-  JvFail ("java::lang::Class::getDeclaredConstructors not implemented");
+  int i = isPrimitive () ? 0 : method_count;
+  while (--i >= 0)
+    {
+      // FIXME: access checks.
+      if (_Jv_equalUtf8Consts (methods[i].name, init_name)
+	  && _Jv_equal (methods[i].signature, partial_sig, hash))
+	{
+	  // Found it.
+	  using namespace java::lang::reflect;
+	  Constructor *cons = new Constructor ();
+	  cons->offset = (char *) (&methods[i]) - (char *) methods;
+	  cons->declaringClass = this;
+	  return cons;
+	}
+    }
+  JvThrow (new java::lang::NoSuchMethodException);
 }
 
 java::lang::reflect::Field *
@@ -187,18 +258,67 @@
   return result;
 }
 
+void
+java::lang::Class::getSignature (java::lang::StringBuffer *buffer)
+{
+  if (isPrimitive())
+    buffer->append((jchar) method_count);
+  else
+    {
+      jstring name = getName();
+      if (name->charAt(0) != '[')
+	buffer->append((jchar) 'L');
+      buffer->append(name);
+      if (name->charAt(0) != '[')
+	buffer->append((jchar) ';');
+    }
+}
+
+// This doesn't have to be native.  It is an implementation detail
+// only called from the C++ code, though, so maybe this is clearer.
+jstring
+java::lang::Class::getSignature (JArray<jclass> *param_types)
+{
+  java::lang::StringBuffer *buf = new java::lang::StringBuffer ();
+  buf->append((jchar) '(');
+  jclass *v = elements (param_types);
+  for (int i = 0; i < param_types->length; ++i)
+    v[i]->getSignature(buf);
+  buf->append((jchar) ')');
+  return buf->toString();
+}
+
 java::lang::reflect::Method *
-java::lang::Class::getDeclaredMethod (jstring, JArray<jclass> *)
+java::lang::Class::getDeclaredMethod (jstring name,
+				      JArray<jclass> *param_types)
 {
-  JvFail ("java::lang::Class::getDeclaredMethod not implemented");
+  jstring partial_sig = getSignature (param_types);
+  jint p_len = partial_sig->length();
+  _Jv_Utf8Const *utf_name = _Jv_makeUtf8Const (name);
+  int i = isPrimitive () ? 0 : method_count;
+  while (--i >= 0)
+    {
+      // FIXME: access checks.
+      if (_Jv_equalUtf8Consts (methods[i].name, utf_name)
+	  && _Jv_equaln (methods[i].signature, partial_sig, p_len))
+	{
+	  // Found it.
+	  using namespace java::lang::reflect;
+	  Method *rmethod = new Method ();
+	  rmethod->offset = (char*) (&methods[i]) - (char*) methods;
+	  rmethod->declaringClass = this;
+	}
+    }
+  JvThrow (new java::lang::NoSuchMethodException);
 }
 
 JArray<java::lang::reflect::Method *> *
 java::lang::Class::getDeclaredMethods (void)
 {
   int numMethods = 0;
+  int max = isPrimitive () ? 0 : method_count;
   int i;
-  for (i = method_count;  --i >= 0; )
+  for (i = max; --i >= 0; )
     {
       _Jv_Method *method = &methods[i];
       if (method->name == NULL
@@ -211,15 +331,16 @@
     = (JArray<java::lang::reflect::Method *> *)
     JvNewObjectArray (numMethods, &MethodClass, NULL);
   java::lang::reflect::Method** mptr = elements (result);
-  for (i = 0;  i < method_count;  i++)
+  for (i = 0;  i < max;  i++)
     {
       _Jv_Method *method = &methods[i];
       if (method->name == NULL
 	  || _Jv_equalUtf8Consts (method->name, clinit_name)
 	  || _Jv_equalUtf8Consts (method->name, init_name))
 	continue;
-      java::lang::reflect::Method* rmethod = new java::lang::reflect::Method ();
-      rmethod->offset = (char*) mptr - (char*) elements (result);
+      java::lang::reflect::Method* rmethod
+	= new java::lang::reflect::Method ();
+      rmethod->offset = (char*) method - (char*) methods;
       rmethod->declaringClass = this;
       *mptr++ = rmethod;
     }
@@ -258,10 +379,58 @@
   return NULL;			// Placate compiler.
 }
 
+jint
+java::lang::Class::_getFields (JArray<java::lang::reflect::Field *> *result,
+			       jint offset)
+{
+  int count = 0;
+  for (int i = 0;  i < field_count;  i++)
+    {
+      _Jv_Field *field = &fields[i];
+      if (! (field->getModifiers() & java::lang::reflect::Modifier::PUBLIC))
+	continue;
+      ++count;
+
+      if (result != NULL)
+	{
+	  java::lang::reflect::Field *rfield
+	    = new java::lang::reflect::Field ();
+	  rfield->offset = (char *) field - (char *) fields;
+	  rfield->declaringClass = this;
+	  rfield->name = _Jv_NewStringUtf8Const (field->name);
+	  (elements (result))[offset + i] = rfield;
+	}
+    }
+  jclass superclass = getSuperclass();
+  if (superclass != NULL)
+    {
+      int s_count = superclass->_getFields (result, offset);
+      count += s_count;
+      offset += s_count;
+    }
+  for (int i = 0; i < interface_count; ++i)
+    {
+      int f_count = interfaces[i]->_getFields (result, offset);
+      count += f_count;
+      offset += f_count;
+    }
+  return count;
+}
+
 JArray<java::lang::reflect::Field *> *
 java::lang::Class::getFields (void)
 {
-  JvFail ("java::lang::Class::getFields not implemented");
+  using namespace java::lang::reflect;
+
+  int count = _getFields (NULL, 0);
+
+  JArray<java::lang::reflect::Field *> *result
+    = ((JArray<java::lang::reflect::Field *> *)
+       JvNewObjectArray (count, &FieldClass, NULL));
+
+  _getFields (result, 0);
+
+  return result;
 }
 
 JArray<jclass> *
@@ -275,9 +444,30 @@
 }
 
 java::lang::reflect::Method *
-java::lang::Class::getMethod (jstring, JArray<jclass> *)
+java::lang::Class::getMethod (jstring name, JArray<jclass> *param_types)
 {
-  JvFail ("java::lang::Class::getMethod not implemented");
+  jstring partial_sig = getSignature (param_types);
+  jint p_len = partial_sig->length();
+  _Jv_Utf8Const *utf_name = _Jv_makeUtf8Const (name);
+  for (Class *klass = this; klass; klass = klass->getSuperclass())
+    {
+      int i = klass->isPrimitive () ? 0 : klass->method_count;
+      while (--i >= 0)
+	{
+	  // FIXME: access checks.
+	  if (_Jv_equalUtf8Consts (klass->methods[i].name, utf_name)
+	      && _Jv_equaln (klass->methods[i].signature, partial_sig, p_len))
+	    {
+	      // Found it.
+	      using namespace java::lang::reflect;
+	      Method *rmethod = new Method ();
+	      rmethod->offset = (char*) (&klass->methods[i]) - (char*) methods;
+	      rmethod->declaringClass = klass;
+	      return rmethod;
+	    }
+	}
+    }
+  JvThrow (new java::lang::NoSuchMethodException);
 }
 
 JArray<java::lang::reflect::Method *> *
@@ -494,6 +684,8 @@
 // Some class-related convenience functions.
 //
 
+// Find a method declared in the class.  If it is not declared locally
+// (or if it is inherited), return NULL.
 _Jv_Method *
 _Jv_GetMethodLocal (jclass klass, _Jv_Utf8Const *name,
 		    _Jv_Utf8Const *signature)
@@ -507,6 +699,21 @@
   return NULL;
 }
 
+_Jv_Method *
+_Jv_LookupDeclaredMethod (jclass klass, _Jv_Utf8Const *name,
+			_Jv_Utf8Const *signature)
+{
+  for (; klass; klass = klass->getSuperclass())
+    {
+      _Jv_Method *meth = _Jv_GetMethodLocal (klass, name, signature);
+
+      if (meth)
+	return meth;
+    }
+
+  return NULL;
+}
+
 // NOTE: MCACHE_SIZE should be a power of 2 minus one.
 #define MCACHE_SIZE 1023
 
@@ -553,16 +760,6 @@
 _Jv_LookupInterfaceMethod (jclass klass, _Jv_Utf8Const *name,
 			   _Jv_Utf8Const *signature)
 {
-  // FIXME: can't do this until we have a working class loader.
-  // This probably isn't the right thing to do anyway, since we can't
-  // call a method of a class until the class is linked.  But this
-  // captures the general idea.
-  // klass->getClassLoader()->resolveClass(klass);
-  // 
-  // KKT: This is unnessecary, exactly for the reason you present: 
-  // _Jv_LookupInterfaceMethod is only called on object instances, and
-  // such have already been initialized (which includes resolving).
-
   void *ncode = _Jv_FindMethodInCache (klass, name, signature);
   if (ncode != 0)
     return ncode;
Index: java/lang/reflect/Constructor.java
===================================================================
RCS file: /cvs/java/libgcj/libjava/java/lang/reflect/Constructor.java,v
retrieving revision 1.1.1.1
diff -u -r1.1.1.1 Constructor.java
--- Constructor.java	1999/04/07 14:52:39	1.1.1.1
+++ Constructor.java	2000/01/04 08:39:41
@@ -28,12 +28,12 @@
       if (! (obj instanceof Constructor))
 	return false;
       Constructor c = (Constructor) obj;
-      return decl_class == c.decl_class && index == c.index;
+      return declaringClass == c.declaringClass && offset == c.offset;
     }
 
   public Class getDeclaringClass ()
     {
-      return decl_class;
+      return declaringClass;
     }
 
   public Class[] getExceptionTypes ()
@@ -41,40 +41,39 @@
       return (Class[]) exception_types.clone();
     }
 
-  public int getModifiers ()
-    {
-      return modifiers;
-    }
+  public native int getModifiers ();
 
   public String getName ()
-    {
-      return decl_class.getName();
-    }
+  {
+    return declaringClass.getName();
+  }
 
   public Class[] getParameterTypes ()
     {
+      if (parameter_types == null)
+	getType ();
       return (Class[]) parameter_types.clone();
     }
 
   public int hashCode ()
     {
       // FIXME.
-      return getName().hashCode();
+      return getName().hashCode() + declaringClass.getName().hashCode();
     }
+
+  // Update cached values from method descriptor in class.
+  private native void getType ();
 
-  // FIXME: this must be native.  Should share implementation with
-  // Method.invoke.
-  public Object newInstance (Object[] args)
+  public native Object newInstance (Object[] args)
     throws InstantiationException, IllegalAccessException,
-           IllegalArgumentException, InvocationTargetException
-    {
-      return null;
-    }
+           IllegalArgumentException, InvocationTargetException;
 
   public String toString ()
     {
+      if (parameter_types == null)
+	getType ();
       StringBuffer b = new StringBuffer ();
-      b.append(Modifier.toString(modifiers));
+      b.append(Modifier.toString(getModifiers()));
       b.append(" ");
       b.append(getName());
       b.append("(");
@@ -88,19 +87,19 @@
       return b.toString();
     }
 
-  // Can't create these.  FIXME.
+  // Can't create these.
   private Constructor ()
     {
     }
 
   // Declaring class.
-  private Class decl_class;
+  private Class declaringClass;
+
   // Exception types.
   private Class[] exception_types;
-  // Modifiers.
-  private int modifiers;
   // Parameter types.
   private Class[] parameter_types;
-  // Index of this method in declaring class' method table.
-  private int index;
+
+  // Offset in bytes from the start of declaringClass's methods array.
+  private int offset;
 }
Index: java/lang/reflect/Method.java
===================================================================
RCS file: /cvs/java/libgcj/libjava/java/lang/reflect/Method.java,v
retrieving revision 1.3
diff -u -r1.3 Method.java
--- Method.java	1999/12/20 23:05:21	1.3
+++ Method.java	2000/01/04 08:39:46
@@ -10,6 +10,8 @@
  
 package java.lang.reflect;
 
+import gnu.gcj.RawData;
+
 /**
  * @author Tom Tromey <tromey@cygnus.com>
  * @date December 12, 1998
@@ -17,7 +19,7 @@
 /* Written using "Java Class Libraries", 2nd edition, ISBN 0-201-31002-3
  * "The Java Language Specification", ISBN 0-201-63451-1
  * plus online API docs for JDK 1.2 beta from http://www.javasoft.com.
- * Status:  Incomplete: invoke() needs to be finished.
+ * Status:  Complete, but not correct: access checks aren't done.
  */
 
 public final class Method extends AccessibleObject implements Member
@@ -65,6 +67,30 @@
       // FIXME.
       return name.hashCode() + declaringClass.getName().hashCode();
     }
+
+  // This is used to perform an actual method call via ffi.
+  private static final native void hack_call (RawData cif,
+					      RawData method,
+					      RawData ret_value,
+					      RawData values);
+
+  // Perform an ffi call while capturing exceptions.  We have to do
+  // this because we can't catch Java exceptions from C++.
+  static final Throwable hack_trampoline (RawData cif,
+					  RawData method,
+					  RawData ret_value,
+					  RawData values)
+  {
+    try
+      {
+	hack_call (cif, method, ret_value, values);
+      }
+    catch (Throwable x)
+      {
+	return x;
+      }
+    return null;
+  }
 
   public native Object invoke (Object obj, Object[] args)
     throws IllegalAccessException, IllegalArgumentException,
Index: java/lang/reflect/natConstructor.cc
===================================================================
RCS file: natConstructor.cc
diff -N natConstructor.cc
--- /dev/null	Tue May  5 13:32:27 1998
+++ natConstructor.cc	Tue Jan  4 00:39:46 2000
@@ -0,0 +1,53 @@
+// natConstructor.cc - Native code for Constructor class.
+
+/* Copyright (C) 1999, 2000  Cygnus Solutions
+
+   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 <config.h>
+
+#include <gcj/cni.h>
+#include <jvm.h>
+
+#include <java/lang/reflect/Constructor.h>
+#include <java/lang/reflect/Method.h>
+#include <java/lang/reflect/InvocationTargetException.h>
+#include <java/lang/reflect/Modifier.h>
+#include <java/lang/InstantiationException.h>
+#include <gcj/method.h>
+
+jint
+java::lang::reflect::Constructor::getModifiers ()
+{
+  return _Jv_FromReflectedConstructor (this)->accflags;
+}
+
+void
+java::lang::reflect::Constructor::getType ()
+{
+  _Jv_GetTypesFromSignature (_Jv_FromReflectedConstructor (this),
+			     declaringClass,
+			     &parameter_types,
+			     NULL);
+}
+
+jobject
+java::lang::reflect::Constructor::newInstance (jobjectArray args)
+{
+  if (parameter_types == NULL)
+    getType ();
+
+  using namespace java::lang::reflect;
+  if (Modifier::isAbstract (declaringClass->getModifiers()))
+    JvThrow (new InstantiationException);
+
+  jmethodID meth = _Jv_FromReflectedConstructor (this);
+  // In the constructor case the return type is the type of the
+  // constructor.
+  return _Jv_CallNonvirtualMethodA (NULL, declaringClass, meth, true,
+				    parameter_types, args);
+}
Index: java/lang/reflect/natMethod.cc
===================================================================
RCS file: /cvs/java/libgcj/libjava/java/lang/reflect/natMethod.cc,v
retrieving revision 1.3
diff -u -r1.3 natMethod.cc
--- natMethod.cc	1999/09/10 22:03:08	1.3
+++ natMethod.cc	2000/01/04 08:39:46
@@ -1,6 +1,6 @@
 // natMethod.cc - Native code for Method class.
 
-/* Copyright (C) 1998, 1999  Cygnus Solutions
+/* Copyright (C) 1998, 1999, 2000  Cygnus Solutions
 
    This file is part of libgcj.
 
@@ -8,14 +8,13 @@
 Libgcj License.  Please consult the file "LIBGCJ_LICENSE" for
 details.  */
 
-// This is about 90% done.  Search for FIXME to see what remains.
-
 #include <config.h>
 
 #include <gcj/cni.h>
 #include <jvm.h>
 
 #include <java/lang/reflect/Method.h>
+#include <java/lang/reflect/Constructor.h>
 #include <java/lang/reflect/InvocationTargetException.h>
 #include <java/lang/reflect/Modifier.h>
 
@@ -32,14 +31,15 @@
 #include <java/lang/NullPointerException.h>
 #include <java/lang/Class.h>
 #include <gcj/method.h>
+#include <gnu/gcj/RawData.h>
 
+#define ObjectClass _CL_Q34java4lang6Object
+extern java::lang::Class ObjectClass;
 #define ClassClass _CL_Q34java4lang5Class
 extern java::lang::Class ClassClass;
 
 #include <stdlib.h>
 
-#if 0
-
 #include <ffi.h>
 
 #define VoidClass _CL_Q34java4lang4Void
@@ -144,38 +144,226 @@
 
   return r;
 }
+
+// Actually perform an FFI call.
+void
+java::lang::reflect::Method::hack_call (gnu::gcj::RawData *rcif,
+					gnu::gcj::RawData *rmethod,
+					gnu::gcj::RawData *rret_value,
+					gnu::gcj::RawData *rvalues)
+{
+  ffi_cif *cif = (ffi_cif *) rcif;
+  void (*method) (...) = (void (*) (...)) rmethod;
+  void *ret_value = (void *) rret_value;
+  void **values = (void **) rvalues;
+
+  ffi_call (cif, method, ret_value, values);
+}
 
-// FIXME: the body of this method should be a separate function so
-// that Constructor can use it too.
 jobject
-java::lang::reflect::Method::invoke (jobject obj,
-				     jobjectArray args)
+java::lang::reflect::Method::invoke (jobject obj, jobjectArray args)
 {
-  // FIXME: we need to be a friend of Class here.
-  _Jv_Method *meth = decl_class->methods[index];
-  if (! java::lang::reflect::Modifier::isStatic(modifiers))
+  if (parameter_types == NULL)
+    getType ();
+
+  jmethodID meth = _Jv_FromReflectedMethod (this);
+  if (! java::lang::reflect::Modifier::isStatic(meth->accflags))
     {
       jclass k = obj ? obj->getClass() : NULL;
-      if (! obj || ! decl_class->isAssignableFrom(k))
+      if (! obj)
 	JvThrow (new java::lang::NullPointerException);
+      if (! declaringClass->isAssignableFrom(k))
+	JvThrow (new java::lang::IllegalArgumentException);
       // FIXME: access checks.
-      meth = _Jv_LookupMethod (k, meth->name, meth->signature);
+
+      // Find the possibly overloaded method based on the runtime type
+      // of the object.
+      meth = _Jv_LookupDeclaredMethod (k, meth->name, meth->signature);
+    }
+
+  return _Jv_CallNonvirtualMethodA (obj, return_type, meth, false,
+				    parameter_types, args);
+}
+
+jint
+java::lang::reflect::Method::getModifiers ()
+{
+  return _Jv_FromReflectedMethod (this)->accflags;
+}
+
+jstring
+java::lang::reflect::Method::getName ()
+{
+  if (name == NULL)
+    name = _Jv_NewStringUtf8Const (_Jv_FromReflectedMethod (this)->name);
+  return name;
+}
+
+/* Internal method to set return_type and parameter_types fields. */
+
+void
+java::lang::reflect::Method::getType ()
+{
+  _Jv_GetTypesFromSignature (_Jv_FromReflectedMethod (this),
+			     declaringClass,
+			     &parameter_types,
+			     &return_type);
+}
+
+void
+_Jv_GetTypesFromSignature (jmethodID method,
+			   jclass declaringClass,
+			   JArray<jclass> **arg_types_out,
+			   jclass *return_type_out)
+{
+
+  _Jv_Utf8Const* sig = method->signature;
+  java::lang::ClassLoader *loader = declaringClass->getClassLoader();
+  char *ptr = sig->data;
+  int numArgs = 0;
+  /* First just count the number of parameters. */
+  for (; ; ptr++)
+    {
+      switch (*ptr)
+	{
+	case 0:
+	case ')':
+	case 'V':
+	  break;
+	case '[':
+	case '(':
+	  continue;
+	case 'B':
+	case 'C':
+	case 'D':
+	case 'F':
+	case 'S':
+	case 'I':
+	case 'J':
+	case 'Z':
+	  numArgs++;
+	  continue;
+	case 'L':
+	  numArgs++;
+	  do 
+	    ptr++;
+	  while (*ptr != ';' && ptr[1] != '\0');
+	  continue;
+	}
+      break;
     }
 
+  JArray<jclass> *args = (JArray<jclass> *)
+    JvNewObjectArray (numArgs, &ClassClass, NULL);
+  jclass* argPtr = elements (args);
+  for (ptr = sig->data; *ptr != '\0'; ptr++)
+    {
+      int num_arrays = 0;
+      jclass type;
+      for (; *ptr == '[';  ptr++)
+	num_arrays++;
+      switch (*ptr)
+	{
+	default:
+	  return;
+	case ')':
+	  argPtr = return_type_out;
+	  continue;
+	case '(':
+	  continue;
+	case 'V':
+	case 'B':
+	case 'C':
+	case 'D':
+	case 'F':
+	case 'S':
+	case 'I':
+	case 'J':
+	case 'Z':
+	  type = _Jv_FindClassFromSignature(ptr, loader);
+	  break;
+	case 'L':
+	  type = _Jv_FindClassFromSignature(ptr, loader);
+	  do 
+	    ptr++;
+	  while (*ptr != ';' && ptr[1] != '\0');
+	  break;
+	}
+
+      // FIXME: 2'nd argument should be "current loader"
+      while (--num_arrays >= 0)
+	type = _Jv_FindArrayClass (type, 0);
+      // ARGPTR can be NULL if we are processing the return value of a
+      // call from Constructor.
+      if (argPtr)
+	*argPtr++ = type;
+    }
+  *arg_types_out = args;
+}
+
+// This is a very rough analog of the JNI CallNonvirtual<type>MethodA
+// functions.  It handles both Methods and Constructors, and it can
+// handle any return type.  In the Constructor case, the `obj'
+// argument is unused and should be NULL; also, the `return_type' is
+// the class that the constructor will construct.
+jobject
+_Jv_CallNonvirtualMethodA (jobject obj,
+			   jclass return_type,
+			   jmethodID meth,
+			   jboolean is_constructor,
+			   JArray<jclass> *parameter_types,
+			   jobjectArray args)
+{
+  JvAssert (! is_constructor || ! obj);
+  JvAssert (! is_constructor || ! return_type);
+
   // FIXME: access checks.
 
   if (parameter_types->length != args->length)
     JvThrow (new java::lang::IllegalArgumentException);
 
+  // See whether call needs an object as the first argument.  A
+  // constructor does need a `this' argument, but it is one we create.
+  jboolean needs_this = false;
+  if (is_constructor
+      || ! java::lang::reflect::Modifier::isStatic(meth->accflags))
+    needs_this = true;
+
+  int param_count = parameter_types->length;
+  if (needs_this)
+    ++param_count;
+
   ffi_type *rtype = get_ffi_type (return_type);
-  ffi_type **argtypes = (ffi_type **) alloca (parameter_types->length
+  ffi_type **argtypes = (ffi_type **) alloca (param_count
 					      * sizeof (ffi_type *));
 
-  jobject *paramelts = elements (parameter_types);
+  jclass *paramelts = elements (parameter_types);
   jobject *argelts = elements (args);
 
+  // FIXME: at some point the compiler is going to add extra arguments
+  // to some functions.  In particular we are going to do this for
+  // handling access checks in reflection.  We must add these hidden
+  // arguments here.
+
+  // Special case for the `this' argument of a constructor.  Note that
+  // the JDK 1.2 docs specify that the new object must be allocated
+  // before argument conversions are done.
+  if (is_constructor)
+    {
+      // FIXME: must special-case String, arrays, maybe others here.
+      obj = JvAllocObject (return_type);
+    }
+
+  int i = 0;
   int size = 0;
-  for (int i = 0; i < parameter_types->length; ++i)
+  if (needs_this)
+    {
+      // The `NULL' type is `Object'.
+      argtypes[i++] = get_ffi_type (NULL);
+      size += sizeof (jobject);
+    }
+
+  for (; i < param_count; ++i)
     {
       jclass k = argelts[i] ? argelts[i]->getClass() : NULL;
       argtypes[i] = get_ffi_type (k);
@@ -196,7 +384,7 @@
     }
 
   ffi_cif cif;
-  if (ffi_prep_cif (&cif, FFI_DEFAULT_ABI, parameter_types->length,
+  if (ffi_prep_cif (&cif, FFI_DEFAULT_ABI, param_count,
 		    rtype, argtypes) != FFI_OK)
     {
       // FIXME: throw some kind of VirtualMachineError here.
@@ -212,8 +400,15 @@
     Where += sizeof (Type); \
   } while (0)
 
-  for (int i = 0; i < parameter_types->length; ++i)
+  i = 0;
+  if (needs_this)
     {
+      COPY (p, obj, jobject);
+      ++i;
+    }
+
+  for (; i < param_count; ++i)
+    {
       java::lang::Number *num = (java::lang::Number *) paramelts[i];
       if (paramelts[i] == JvPrimClass (byte))
 	COPY (p, num->byteValue(), jbyte);
@@ -228,7 +423,8 @@
       else if (paramelts[i] == JvPrimClass (double))
 	COPY (p, num->doubleValue(), jdouble);
       else if (paramelts[i] == JvPrimClass (boolean))
-	COPY (p, ((java::lang::Boolean *) argelts[i])->booleanValue(), jboolean);
+	COPY (p, ((java::lang::Boolean *) argelts[i])->booleanValue(),
+	      jboolean);
       else if (paramelts[i] == JvPrimClass (char))
 	COPY (p, ((java::lang::Character *) argelts[i])->charValue(), jchar);
       else
@@ -237,12 +433,18 @@
 	  COPY (p, argelts[i], jobject);
 	}
     }
+
+  // FIXME: initialize class here.
 
-  // FIXME: exception handling.
+  // Largest possible value.  Hopefully it is aligned!
+  jdouble ret_value;
   java::lang::Throwable *ex;
-  jdouble ret_value;		// Largest possible value.  Hopefully
-				// it is aligned!
-  ex = TRAMP_CALL (ffi_call (&cif, meth->ncode, &ret_value, (void *) values));
+  using namespace java::lang;
+  using namespace java::lang::reflect;
+  ex = Method::hack_trampoline ((gnu::gcj::RawData *) &cif,
+				(gnu::gcj::RawData *) meth->ncode,
+				(gnu::gcj::RawData *) &ret_value,
+				(gnu::gcj::RawData *) values);
 
   if (ex)
     JvThrow (new InvocationTargetException (ex));
@@ -269,119 +471,9 @@
     r = NULL;
   else
     {
-      JvAssert (! return_type->isPrimitive());
-      r = VAL (java::lang::Object, jobject);
+      JvAssert (return_type == NULL || ! return_type->isPrimitive());
+      r = * (Object **) &ret_value;
     }
 
   return r;
-}
-
-#else /* 0 */
-
-jobject
-java::lang::reflect::Method::invoke (jobject, jobjectArray)
-{
-  JvFail ("not enabled yet");
-}
-
-#endif /* 0 */
-
-jint
-java::lang::reflect::Method::getModifiers ()
-{
-  return _Jv_FromReflectedMethod (this)->accflags;
-}
-
-jstring
-java::lang::reflect::Method::getName ()
-{
-  if (name == NULL)
-    name = _Jv_NewStringUtf8Const (_Jv_FromReflectedMethod (this)->name);
-  return name;
-}
-
-/* Internal method to set return_type and parameter_types fields. */
-
-void
-java::lang::reflect::Method::getType ()
-{
-  _Jv_Utf8Const* sig = _Jv_FromReflectedMethod (this)->signature;
-  java::lang::ClassLoader *loader = declaringClass->getClassLoader();
-  char *ptr = sig->data;
-  int numArgs = 0;
-  /* First just count the number of parameters. */
-  for (; ; ptr++)
-    {
-      switch (*ptr)
-	{
-	case 0:
-	case ')':
-	case 'V':
-	  break;
-	case '[':
-	case '(':
-	  continue;
-	case 'B':
-	case 'C':
-	case 'D':
-	case 'F':
-	case 'S':
-	case 'I':
-	case 'J':
-	case 'Z':
-	  numArgs++;
-	  continue;
-	case 'L':
-	  numArgs++;
-	  do 
-	    ptr++;
-	  while (*ptr != ';' && ptr[1] != '\0');
-	  continue;
-	}
-      break;
-    }
-
-  JArray<jclass> *args = (JArray<jclass> *)
-    JvNewObjectArray (numArgs, &ClassClass, NULL);
-  jclass* argPtr = elements (args);
-  for (ptr = sig->data; *ptr != '\0'; ptr++)
-    {
-      int num_arrays = 0;
-      jclass type;
-      for (; *ptr == '[';  ptr++)
-	num_arrays++;
-      switch (*ptr)
-	{
-	default:
-	  return;
-	case ')':
-	  argPtr = &return_type;
-	  continue;
-	case '(':
-	  continue;
-	case 'V':
-	case 'B':
-	case 'C':
-	case 'D':
-	case 'F':
-	case 'S':
-	case 'I':
-	case 'J':
-	case 'Z':
-	  type = _Jv_FindClassFromSignature(ptr, loader);
-	  break;
-	case 'L':
-	  type = _Jv_FindClassFromSignature(ptr, loader);
-	  do 
-	    ptr++;
-	  while (*ptr != ';' && ptr[1] != '\0');
-	  break;
-	}
-
-      // FIXME: 2'nd argument should be "current loader"
-      while (--num_arrays >= 0)
-	type = _Jv_FindArrayClass (type, 0);
-      *argPtr++ = type;
-    }
-  parameter_types = args;
 }

From java-patches-return-347-listarch-java-patches=sourceware.cygnus.com@sourceware.cygnus.com Tue Jan 04 22:37:34 2000
Return-Path: <java-patches-return-347-listarch-java-patches=sourceware.cygnus.com@sourceware.cygnus.com>
Delivered-To: listarch-java-patches@sourceware.cygnus.com
Received: (qmail 30088 invoked by alias); 4 Jan 2000 22:37:34 -0000
Mailing-List: contact java-patches-help@sourceware.cygnus.com; run by ezmlm
Precedence: bulk
List-Subscribe: <mailto:java-patches-subscribe@sourceware.cygnus.com>
List-Archive: <http://sourceware.cygnus.com/ml/java-patches/>
List-Post: <mailto:java-patches@sourceware.cygnus.com>
List-Help: <mailto:java-patches-help@sourceware.cygnus.com>, <http://sourceware.cygnus.com/ml/#faqs>
Sender: java-patches-owner@sourceware.cygnus.com
Delivered-To: mailing list java-patches@sourceware.cygnus.com
Received: (qmail 30062 invoked from network); 4 Jan 2000 22:37:32 -0000
Date: Tue, 4 Jan 2000 14:37:31 -0800 (PST)
From: Warren Levy <warrenl@cygnus.com>
To: java-patches@sourceware.cygnus.com
Subject: Patch: java.net.DatagramSocketImpl
Message-ID: <Pine.SOL.3.91.1000104142218.825A-100000@fencer.cygnus.com>
MIME-Version: 1.0
Content-Type: TEXT/PLAIN; charset=US-ASCII

Folks,
I'm committing the following minor change to java.net.  Naturally, if 
anyone sees a problem (or areas of further concern, please followup).

Thanks go to Anthony Green for finding this one.
--warrenl


2000-01-04  Warren Levy  <warrenl@cygnus.com>

        * java/net/natPlainDatagramSocketImpl.cc (peek): Removed unnecesary
        comment.
        (receive): Set the sender's address in the DatagramPacket.


Index: java/net/natPlainDatagramSocketImpl.cc
===================================================================
RCS file: /cvs/java/libgcj/libjava/java/net/natPlainDatagramSocketImpl.cc,v
retrieving revision 1.15
diff -u -p -r1.15 natPlainDatagramSocketImpl.cc
--- natPlainDatagramSocketImpl.cc       1999/12/17 05:11:28     1.15
+++ natPlainDatagramSocketImpl.cc       2000/01/04 22:34:49
@@ -1,4 +1,4 @@
-/* Copyright (C) 1999  Cygnus Solutions
+/* Copyright (C) 1999, 2000  Cygnus Solutions
 
    This file is part of libgcj.
 
@@ -242,7 +242,6 @@ java::net::PlainDatagramSocketImpl::peek
 #endif
   else
     goto error;
-  // FIXME: Multicast:  s->address = new InetAddress (raddr, NULL);
   i->address = raddr;
   return rport;
  error:
@@ -335,7 +334,7 @@ java::net::PlainDatagramSocketImpl::rece
 #endif
   else
     goto error;
-  // FIXME: Multicast:  s->address = new InetAddress (raddr, NULL);
+  p->setAddress (new InetAddress (raddr, NULL));
   p->setPort (rport);
   p->setLength ((jint) retlen);
   return;




From java-patches-return-348-listarch-java-patches=sourceware.cygnus.com@sourceware.cygnus.com Tue Jan 04 23:06:28 2000
Return-Path: <java-patches-return-348-listarch-java-patches=sourceware.cygnus.com@sourceware.cygnus.com>
Delivered-To: listarch-java-patches@sourceware.cygnus.com
Received: (qmail 5533 invoked by alias); 4 Jan 2000 23:06:27 -0000
Mailing-List: contact java-patches-help@sourceware.cygnus.com; run by ezmlm
Precedence: bulk
List-Subscribe: <mailto:java-patches-subscribe@sourceware.cygnus.com>
List-Archive: <http://sourceware.cygnus.com/ml/java-patches/>
List-Post: <mailto:java-patches@sourceware.cygnus.com>
List-Help: <mailto:java-patches-help@sourceware.cygnus.com>, <http://sourceware.cygnus.com/ml/#faqs>
Sender: java-patches-owner@sourceware.cygnus.com
Delivered-To: mailing list java-patches@sourceware.cygnus.com
Received: (qmail 5473 invoked from network); 4 Jan 2000 23:06:08 -0000
To: Java Patch List <java-patches@sourceware.cygnus.com> 
Subject: Patch: libffi Makefile
X-Zippy:  I don't know WHY I said that..  I think it came from the FILLINGS
 in my rear molars..
X-Attribution:  Tom
Bcc:
Reply-To:  tromey@cygnus.com
From:  Tom Tromey <tromey@cygnus.com>
Date: 04 Jan 2000 16:08:46 -0700
Message-ID: <87d7rho2o1.fsf@cygnus.com>
Lines: 13
X-Mailer: Gnus v5.5/Emacs 20.3

I'm checking in a patch which simply rebuilds the libffi Makefile.in
with a newer automake.  This is currently a bad situation, since
libffi requires an unreleased automake, but unfortunately a fix is not
easy -- it requires an automake release, which is done strictly on
volunteer time...

2000-01-04  Tom Tromey  <tromey@cygnus.com>

	* Makefile.in: Rebuilt with newer automake.

I'm not appending the patch since it isn't useful to read.

Tom

From java-patches-return-349-listarch-java-patches=sourceware.cygnus.com@sourceware.cygnus.com Wed Jan 05 16:28:26 2000
Return-Path: <java-patches-return-349-listarch-java-patches=sourceware.cygnus.com@sourceware.cygnus.com>
Delivered-To: listarch-java-patches@sourceware.cygnus.com
Received: (qmail 28228 invoked by alias); 5 Jan 2000 16:28:26 -0000
Mailing-List: contact java-patches-help@sourceware.cygnus.com; run by ezmlm
Precedence: bulk
List-Subscribe: <mailto:java-patches-subscribe@sourceware.cygnus.com>
List-Archive: <http://sourceware.cygnus.com/ml/java-patches/>
List-Post: <mailto:java-patches@sourceware.cygnus.com>
List-Help: <mailto:java-patches-help@sourceware.cygnus.com>, <http://sourceware.cygnus.com/ml/#faqs>
Sender: java-patches-owner@sourceware.cygnus.com
Delivered-To: mailing list java-patches@sourceware.cygnus.com
Received: (qmail 28131 invoked from network); 5 Jan 2000 16:28:00 -0000
To: Java Patch List <java-patches@sourceware.cygnus.com> 
Subject: Patch: reflection bug fix
X-Zippy:  LOOK!!!  I'm WALKING in my SLEEP again!!
X-Attribution:  Tom
Bcc:
Reply-To:  tromey@cygnus.com
From:  Tom Tromey <tromey@cygnus.com>
Date: 05 Jan 2000 09:30:16 -0700
Message-ID: <879024o50n.fsf@cygnus.com>
Lines: 137
X-Mailer: Gnus v5.5/Emacs 20.3

I'm checking in this patch.  It fixes a couple bugs in the reflection
code discovered by the Mauve tests I wrote yesterday.

2000-01-04  Tom Tromey  <tromey@cygnus.com>

	* java/lang/Class.h (getSignature): Updated.
	* java/lang/Class.java (getSignature): Updated.
	* java/lang/natClass.cc (getSignature): Added `is_constructor'
	argument.
	(getConstructor): Ensure constructor is public.
	(_getConstructors): Check for public-ness of constructor when
	`declared' is false, not when it is true.

Tom

Index: java/lang/Class.h
===================================================================
RCS file: /cvs/java/libgcj/libjava/java/lang/Class.h,v
retrieving revision 1.8
diff -u -r1.8 Class.h
--- Class.h	2000/01/04 08:46:52	1.8
+++ Class.h	2000/01/05 05:24:48
@@ -103,7 +103,7 @@
   JArray<jclass> *getInterfaces (void);
 
   void getSignature (java::lang::StringBuffer *buffer);
-  static jstring getSignature (JArray<jclass> *);
+  static jstring getSignature (JArray<jclass> *, jboolean is_constructor);
   java::lang::reflect::Method *getMethod (jstring, JArray<jclass> *);
   JArray<java::lang::reflect::Method *> *getMethods (void);
 
Index: java/lang/Class.java
===================================================================
RCS file: /cvs/java/libgcj/libjava/java/lang/Class.java,v
retrieving revision 1.4
diff -u -r1.4 Class.java
--- Class.java	2000/01/04 08:46:52	1.4
+++ Class.java	2000/01/05 05:24:48
@@ -89,7 +89,8 @@
   public native Class[] getInterfaces ();
 
   private final native void getSignature (StringBuffer buffer);
-  private static final native String getSignature (Class[] parameterTypes);
+  private static final native String getSignature (Class[] parameterTypes,
+						   boolean is_construtor);
 
   public native Method getMethod (String methodName, Class[] parameterTypes)
     throws NoSuchMethodException, SecurityException;
Index: java/lang/natClass.cc
===================================================================
RCS file: /cvs/java/libgcj/libjava/java/lang/natClass.cc,v
retrieving revision 1.9
diff -u -r1.9 natClass.cc
--- natClass.cc	2000/01/04 08:46:52	1.9
+++ natClass.cc	2000/01/05 05:24:53
@@ -101,7 +101,7 @@
 java::lang::reflect::Constructor *
 java::lang::Class::getConstructor (JArray<jclass> *param_types)
 {
-  jstring partial_sig = getSignature (param_types);
+  jstring partial_sig = getSignature (param_types, true);
   jint hash = partial_sig->hashCode ();
 
   int i = isPrimitive () ? 0 : method_count;
@@ -114,7 +114,7 @@
 	  // Found it.  For getConstructor, the constructor must be
 	  // public.
 	  using namespace java::lang::reflect;
-	  if (Modifier::isPublic(methods[i].accflags))
+	  if (! Modifier::isPublic(methods[i].accflags))
 	    break;
 	  Constructor *cons = new Constructor ();
 	  cons->offset = (char *) (&methods[i]) - (char *) methods;
@@ -139,7 +139,7 @@
       if (method->name == NULL
 	  && ! _Jv_equalUtf8Consts (method->name, init_name))
 	continue;
-      if (declared
+      if (! declared
 	  && ! java::lang::reflect::Modifier::isPublic(method->accflags))
 	continue;
       numConstructors++;
@@ -154,7 +154,7 @@
       if (method->name == NULL
 	  && ! _Jv_equalUtf8Consts (method->name, init_name))
 	continue;
-      if (declared
+      if (! declared
 	  && ! java::lang::reflect::Modifier::isPublic(method->accflags))
 	continue;
       java::lang::reflect::Constructor *cons
@@ -169,7 +169,7 @@
 java::lang::reflect::Constructor *
 java::lang::Class::getDeclaredConstructor (JArray<jclass> *param_types)
 {
-  jstring partial_sig = getSignature (param_types);
+  jstring partial_sig = getSignature (param_types, true);
   jint hash = partial_sig->hashCode ();
 
   int i = isPrimitive () ? 0 : method_count;
@@ -277,7 +277,8 @@
 // This doesn't have to be native.  It is an implementation detail
 // only called from the C++ code, though, so maybe this is clearer.
 jstring
-java::lang::Class::getSignature (JArray<jclass> *param_types)
+java::lang::Class::getSignature (JArray<jclass> *param_types,
+				 jboolean is_constructor)
 {
   java::lang::StringBuffer *buf = new java::lang::StringBuffer ();
   buf->append((jchar) '(');
@@ -285,6 +286,8 @@
   for (int i = 0; i < param_types->length; ++i)
     v[i]->getSignature(buf);
   buf->append((jchar) ')');
+  if (is_constructor)
+    buf->append((jchar) 'V');
   return buf->toString();
 }
 
@@ -292,7 +295,7 @@
 java::lang::Class::getDeclaredMethod (jstring name,
 				      JArray<jclass> *param_types)
 {
-  jstring partial_sig = getSignature (param_types);
+  jstring partial_sig = getSignature (param_types, false);
   jint p_len = partial_sig->length();
   _Jv_Utf8Const *utf_name = _Jv_makeUtf8Const (name);
   int i = isPrimitive () ? 0 : method_count;
@@ -446,7 +449,7 @@
 java::lang::reflect::Method *
 java::lang::Class::getMethod (jstring name, JArray<jclass> *param_types)
 {
-  jstring partial_sig = getSignature (param_types);
+  jstring partial_sig = getSignature (param_types, false);
   jint p_len = partial_sig->length();
   _Jv_Utf8Const *utf_name = _Jv_makeUtf8Const (name);
   for (Class *klass = this; klass; klass = klass->getSuperclass())

From java-patches-return-350-listarch-java-patches=sourceware.cygnus.com@sourceware.cygnus.com Wed Jan 05 17:22:04 2000
Return-Path: <java-patches-return-350-listarch-java-patches=sourceware.cygnus.com@sourceware.cygnus.com>
Delivered-To: listarch-java-patches@sourceware.cygnus.com
Received: (qmail 3398 invoked by alias); 5 Jan 2000 17:22:04 -0000
Mailing-List: contact java-patches-help@sourceware.cygnus.com; run by ezmlm
Precedence: bulk
List-Subscribe: <mailto:java-patches-subscribe@sourceware.cygnus.com>
List-Archive: <http://sourceware.cygnus.com/ml/java-patches/>
List-Post: <mailto:java-patches@sourceware.cygnus.com>
List-Help: <mailto:java-patches-help@sourceware.cygnus.com>, <http://sourceware.cygnus.com/ml/#faqs>
Sender: java-patches-owner@sourceware.cygnus.com
Delivered-To: mailing list java-patches@sourceware.cygnus.com
Received: (qmail 3372 invoked from network); 5 Jan 2000 17:21:55 -0000
To: Java Patch List <java-patches@sourceware.cygnus.com> 
Subject: Patch: Constructor invocation
X-Zippy:  I'm GLAD I remembered to XEROX all my UNDERSHIRTS!!
X-Attribution:  Tom
Bcc:
Reply-To:  tromey@cygnus.com
From:  Tom Tromey <tromey@cygnus.com>
Date: 05 Jan 2000 10:24:46 -0700
Message-ID: <877lhoo2ht.fsf@cygnus.com>
Lines: 63
X-Mailer: Gnus v5.5/Emacs 20.3

I'm committing this patch.  It fixes a potential bug in method
invocation regarding the size of booleans, and it changes the
invocation code to understand that the constructor method itself
"returns" void.

2000-01-05  Tom Tromey  <tromey@cygnus.com>

	* java/lang/reflect/natMethod.cc (get_ffi_type): Test size of
	jboolean and select correct ffi type on that basis.
	(_Jv_CallNonvirtualMethodA): Handle `void' return type.
	Constructor call always has `void' return type.

Tom

Index: java/lang/reflect/natMethod.cc
===================================================================
RCS file: /cvs/java/libgcj/libjava/java/lang/reflect/natMethod.cc,v
retrieving revision 1.4
diff -u -r1.4 natMethod.cc
--- natMethod.cc	2000/01/04 08:46:52	1.4
+++ natMethod.cc	2000/01/05 17:20:53
@@ -131,8 +131,14 @@
     r = &ffi_type_double;
   else if (klass == JvPrimClass (boolean))
     {
-      // FIXME.
-      r = &ffi_type_sint8;
+      // On some platforms a bool is a byte, on others an int.
+      if (sizeof (jboolean) == sizeof (jbyte))
+	r = &ffi_type_sint8;
+      else
+	{
+	  JvAssert (sizeof (jboolean) == sizeof (jint));
+	  r = &ffi_type_sint32;
+	}
     }
   else if (klass == JvPrimClass (char))
     r = &ffi_type_uint16;
@@ -333,7 +339,12 @@
   if (needs_this)
     ++param_count;
 
-  ffi_type *rtype = get_ffi_type (return_type);
+  ffi_type *rtype;
+  // A constructor itself always returns void.
+  if (is_constructor || return_type == JvPrimClass (void))
+    rtype = &ffi_type_void;
+  else
+    rtype = get_ffi_type (return_type);
   ffi_type **argtypes = (ffi_type **) alloca (param_count
 					      * sizeof (ffi_type *));
 
@@ -451,7 +462,9 @@
 
   jobject r;
 #define VAL(Wrapper, Type)  (new Wrapper (* (Type *) &ret_value))
-  if (return_type == JvPrimClass (byte))
+  if (is_constructor)
+    r = obj;
+  else if (return_type == JvPrimClass (byte))
     r = VAL (java::lang::Byte, jbyte);
   else if (return_type == JvPrimClass (short))
     r = VAL (java::lang::Short, jshort);

From java-patches-return-351-listarch-java-patches=sourceware.cygnus.com@sourceware.cygnus.com Wed Jan 05 22:22:51 2000
Return-Path: <java-patches-return-351-listarch-java-patches=sourceware.cygnus.com@sourceware.cygnus.com>
Delivered-To: listarch-java-patches@sourceware.cygnus.com
Received: (qmail 22688 invoked by alias); 5 Jan 2000 22:22:49 -0000
Mailing-List: contact java-patches-help@sourceware.cygnus.com; run by ezmlm
Precedence: bulk
List-Subscribe: <mailto:java-patches-subscribe@sourceware.cygnus.com>
List-Archive: <http://sourceware.cygnus.com/ml/java-patches/>
List-Post: <mailto:java-patches@sourceware.cygnus.com>
List-Help: <mailto:java-patches-help@sourceware.cygnus.com>, <http://sourceware.cygnus.com/ml/#faqs>
Sender: java-patches-owner@sourceware.cygnus.com
Delivered-To: mailing list java-patches@sourceware.cygnus.com
Received: (qmail 22436 invoked from network); 5 Jan 2000 22:22:29 -0000
To: Java Patch List <java-patches@sourceware.cygnus.com> 
Subject: Patch: reflection bug fixes
X-Zippy:  ..I must be a VETERINARIAN..
X-Attribution:  Tom
Bcc:
Reply-To:  tromey@cygnus.com
From:  Tom Tromey <tromey@cygnus.com>
Date: 05 Jan 2000 15:24:09 -0700
Message-ID: <8766x8nomu.fsf@cygnus.com>
Lines: 252
X-Mailer: Gnus v5.5/Emacs 20.3

I'm committing this patch.  It fixes a number of bugs in the new
reflection code (most of which were pointed out by the Mauve hacking I
did today).  It also implements a few more reflection methods; I think
only Class.getClasses() is missing now.

2000-01-05  Tom Tromey  <tromey@cygnus.com>

	* java/lang/Class.h (_getMethods): Declare.
	* java/lang/Class.java (_getMethods): Declare.
	* java/lang/natClass.cc (getDeclaringClass): Always return NULL.
	(getDeclaredClasses): Always return empty array.
	(_getMethods): New method.
	(getMethods): Wrote.
	(getDeclaredMethod): Return `rmethod'.
	(finit_name): New global.
	(getDeclaredMethods): Check for finit_name.
	(_getMethods): Likewise.
	(getMethod): Only return public methods.

Tom

Index: java/lang/Class.h
===================================================================
RCS file: /cvs/java/libgcj/libjava/java/lang/Class.h,v
retrieving revision 1.9
diff -u -r1.9 Class.h
--- Class.h	2000/01/05 16:35:20	1.9
+++ Class.h	2000/01/05 22:13:42
@@ -105,6 +105,8 @@
   void getSignature (java::lang::StringBuffer *buffer);
   static jstring getSignature (JArray<jclass> *, jboolean is_constructor);
   java::lang::reflect::Method *getMethod (jstring, JArray<jclass> *);
+  jint _getMethods (JArray<java::lang::reflect::Method *> *result,
+		    jint offset);
   JArray<java::lang::reflect::Method *> *getMethods (void);
 
   jint getModifiers (void)
Index: java/lang/Class.java
===================================================================
RCS file: /cvs/java/libgcj/libjava/java/lang/Class.java,v
retrieving revision 1.5
diff -u -r1.5 Class.java
--- Class.java	2000/01/05 16:35:20	1.5
+++ Class.java	2000/01/05 22:13:42
@@ -94,6 +94,7 @@
 
   public native Method getMethod (String methodName, Class[] parameterTypes)
     throws NoSuchMethodException, SecurityException;
+  private native int _getMethods (Method[] result, int offset);
   public native Method[] getMethods () throws SecurityException;
 
   public native int getModifiers ();
Index: java/lang/natClass.cc
===================================================================
RCS file: /cvs/java/libgcj/libjava/java/lang/natClass.cc,v
retrieving revision 1.10
diff -u -r1.10 natClass.cc
--- natClass.cc	2000/01/05 16:35:20	1.10
+++ natClass.cc	2000/01/05 22:13:51
@@ -63,6 +63,7 @@
 static _Jv_Utf8Const *void_signature = _Jv_makeUtf8Const ("()V", 3);
 static _Jv_Utf8Const *clinit_name = _Jv_makeUtf8Const ("<clinit>", 8);
 static _Jv_Utf8Const *init_name = _Jv_makeUtf8Const ("<init>", 6);
+static _Jv_Utf8Const *finit_name = _Jv_makeUtf8Const ("$finit$", 7);
 
 
 
@@ -310,6 +311,7 @@
 	  Method *rmethod = new Method ();
 	  rmethod->offset = (char*) (&methods[i]) - (char*) methods;
 	  rmethod->declaringClass = this;
+	  return rmethod;
 	}
     }
   JvThrow (new java::lang::NoSuchMethodException);
@@ -326,7 +328,8 @@
       _Jv_Method *method = &methods[i];
       if (method->name == NULL
 	  || _Jv_equalUtf8Consts (method->name, clinit_name)
-	  || _Jv_equalUtf8Consts (method->name, init_name))
+	  || _Jv_equalUtf8Consts (method->name, init_name)
+	  || _Jv_equalUtf8Consts (method->name, finit_name))
 	continue;
       numMethods++;
     }
@@ -339,7 +342,8 @@
       _Jv_Method *method = &methods[i];
       if (method->name == NULL
 	  || _Jv_equalUtf8Consts (method->name, clinit_name)
-	  || _Jv_equalUtf8Consts (method->name, init_name))
+	  || _Jv_equalUtf8Consts (method->name, init_name)
+	  || _Jv_equalUtf8Consts (method->name, finit_name))
 	continue;
       java::lang::reflect::Method* rmethod
 	= new java::lang::reflect::Method ();
@@ -370,16 +374,19 @@
 java::lang::Class::getDeclaredClasses (void)
 {
   checkMemberAccess (java::lang::reflect::Member::DECLARED);
-  JvFail ("java::lang::Class::getDeclaredClasses not implemented");
-  return NULL;			// Placate compiler.
+  // Until we have inner classes, it always makes sense to return an
+  // empty array.
+  JArray<jclass> *result
+    = (JArray<jclass> *) JvNewObjectArray (0, &ClassClass, NULL);
+  return result;
 }
 
-// This is marked as unimplemented in the JCL book.
 jclass
 java::lang::Class::getDeclaringClass (void)
 {
-  JvFail ("java::lang::Class::getDeclaringClass unimplemented");
-  return NULL;			// Placate compiler.
+  // Until we have inner classes, it makes sense to always return
+  // NULL.
+  return NULL;
 }
 
 jint
@@ -463,6 +470,11 @@
 	    {
 	      // Found it.
 	      using namespace java::lang::reflect;
+
+	      // Method must be public.
+	      if (! Modifier::isPublic (methods[i].accflags))
+		break;
+
 	      Method *rmethod = new Method ();
 	      rmethod->offset = (char*) (&klass->methods[i]) - (char*) methods;
 	      rmethod->declaringClass = klass;
@@ -473,10 +485,118 @@
   JvThrow (new java::lang::NoSuchMethodException);
 }
 
+// This is a very slow implementation, since it re-scans all the
+// methods we've already listed to make sure we haven't duplicated a
+// method.  It also over-estimates the required size, so we have to
+// shrink the result array later.
+jint
+java::lang::Class::_getMethods (JArray<java::lang::reflect::Method *> *result,
+				jint offset)
+{
+  jint count = 0;
+
+  // First examine all local methods
+  for (int i = isPrimitive () ? 0 : method_count; --i >= 0; )
+    {
+      _Jv_Method *method = &methods[i];
+      if (method->name == NULL
+	  || _Jv_equalUtf8Consts (method->name, clinit_name)
+	  || _Jv_equalUtf8Consts (method->name, init_name)
+	  || _Jv_equalUtf8Consts (method->name, finit_name))
+	continue;
+      // Only want public methods.
+      if (! java::lang::reflect::Modifier::isPublic (method->accflags))
+	continue;
+
+      // This is where we over-count the slots required if we aren't
+      // filling the result for real.
+      if (result != NULL)
+	{
+	  jboolean add = true;
+	  java::lang::reflect::Method **mp = elements (result);
+	  // If we already have a method with this name and signature,
+	  // then ignore this one.  This can happen with virtual
+	  // methods.
+	  for (int j = 0; j < offset; ++j)
+	    {
+	      _Jv_Method *meth_2 = _Jv_FromReflectedMethod (mp[j]);
+	      if (_Jv_equalUtf8Consts (method->name, meth_2->name)
+		  && _Jv_equalUtf8Consts (method->signature,
+					  meth_2->signature))
+		{
+		  add = false;
+		  break;
+		}
+	    }
+	  if (! add)
+	    continue;
+	}
+
+      if (result != NULL)
+	{
+	  using namespace java::lang::reflect;
+	  Method *rmethod = new Method ();
+	  rmethod->offset = (char *) method - (char *) methods;
+	  rmethod->declaringClass = this;
+	  Method **mp = elements (result);
+	  mp[offset + count] = rmethod;
+	}
+      ++count;
+    }
+  offset += count;
+
+  // Now examine superclasses.
+  if (getSuperclass () != NULL)
+    {
+      jint s_count = getSuperclass()->_getMethods (result, offset);
+      offset += s_count;
+      count += s_count;
+    }
+
+  // Finally, examine interfaces.
+  for (int i = 0; i < interface_count; ++i)
+    {
+      int f_count = interfaces[i]->_getMethods (result, offset);
+      count += f_count;
+      offset += f_count;
+    }
+
+  return count;
+}
+
 JArray<java::lang::reflect::Method *> *
 java::lang::Class::getMethods (void)
 {
-  JvFail ("java::lang::Class::getMethods not implemented");
+  using namespace java::lang::reflect;
+
+  // FIXME: security checks.
+
+  // This will overestimate the size we need.
+  jint count = _getMethods (NULL, 0);
+
+  JArray<Method *> *result
+    = ((JArray<Method *> *) JvNewObjectArray (count, &MethodClass, NULL));
+
+  // When filling the array for real, we get the actual count.  Then
+  // we resize the array.
+  jint real_count = _getMethods (result, 0);
+
+  if (real_count != count)
+    {
+      JArray<Method *> *r2
+	= ((JArray<Method *> *) JvNewObjectArray (real_count, &MethodClass,
+						  NULL));
+      
+      Method **destp = elements (r2);
+      Method **srcp = elements (result);
+
+      for (int i = 0; i < real_count; ++i)
+	*destp++ = *srcp++;
+
+      result = r2;
+    }
+
+  return result;
 }
 
 jboolean

From java-patches-return-352-listarch-java-patches=sourceware.cygnus.com@sourceware.cygnus.com Wed Jan 05 22:29:09 2000
Return-Path: <java-patches-return-352-listarch-java-patches=sourceware.cygnus.com@sourceware.cygnus.com>
Delivered-To: listarch-java-patches@sourceware.cygnus.com
Received: (qmail 27631 invoked by alias); 5 Jan 2000 22:29:08 -0000
Mailing-List: contact java-patches-help@sourceware.cygnus.com; run by ezmlm
Precedence: bulk
List-Subscribe: <mailto:java-patches-subscribe@sourceware.cygnus.com>
List-Archive: <http://sourceware.cygnus.com/ml/java-patches/>
List-Post: <mailto:java-patches@sourceware.cygnus.com>
List-Help: <mailto:java-patches-help@sourceware.cygnus.com>, <http://sourceware.cygnus.com/ml/#faqs>
Sender: java-patches-owner@sourceware.cygnus.com
Delivered-To: mailing list java-patches@sourceware.cygnus.com
Received: (qmail 27496 invoked from network); 5 Jan 2000 22:28:56 -0000
To: Java Patch List <java-patches@sourceware.cygnus.com> 
Subject: Patch: decl fix in Class.h
X-Zippy:  UH-OH!!  I think KEN is OVER-DUE on his R.V. PAYMENTS and HE'S
 having a NERVOUS BREAKDOWN too!!  Ha ha.
X-Attribution:  Tom
Bcc:
Reply-To:  tromey@cygnus.com
From:  Tom Tromey <tromey@cygnus.com>
Date: 05 Jan 2000 15:31:00 -0700
Message-ID: <874scsnobf.fsf@cygnus.com>
Lines: 35
X-Mailer: Gnus v5.5/Emacs 20.3

I'm committing this patch.  It fixes a silly thinko, where I put a
decl in a public section instead of a private section.

2000-01-05  Tom Tromey  <tromey@cygnus.com>

	* java/lang/Class.h (_getMethods): Correctly declare as private,
	not public.

Tom

Index: java/lang/Class.h
===================================================================
RCS file: /cvs/java/libgcj/libjava/java/lang/Class.h,v
retrieving revision 1.10
diff -u -r1.10 Class.h
--- Class.h	2000/01/05 22:22:10	1.10
+++ Class.h	2000/01/05 22:24:37
@@ -97,6 +97,8 @@
   jint _getFields (JArray<java::lang::reflect::Field *> *result, jint offset);
   JArray<java::lang::reflect::Constructor *> *_getConstructors (jboolean);
   java::lang::reflect::Field *getField (jstring, jint);
+  jint _getMethods (JArray<java::lang::reflect::Method *> *result,
+		    jint offset);
 public:
   JArray<java::lang::reflect::Field *> *getFields (void);
 
@@ -105,8 +107,6 @@
   void getSignature (java::lang::StringBuffer *buffer);
   static jstring getSignature (JArray<jclass> *, jboolean is_constructor);
   java::lang::reflect::Method *getMethod (jstring, JArray<jclass> *);
-  jint _getMethods (JArray<java::lang::reflect::Method *> *result,
-		    jint offset);
   JArray<java::lang::reflect::Method *> *getMethods (void);
 
   jint getModifiers (void)

From java-patches-return-353-listarch-java-patches=sourceware.cygnus.com@sourceware.cygnus.com Wed Jan 05 22:51:44 2000
Return-Path: <java-patches-return-353-listarch-java-patches=sourceware.cygnus.com@sourceware.cygnus.com>
Delivered-To: listarch-java-patches@sourceware.cygnus.com
Received: (qmail 11834 invoked by alias); 5 Jan 2000 22:51:44 -0000
Mailing-List: contact java-patches-help@sourceware.cygnus.com; run by ezmlm
Precedence: bulk
List-Subscribe: <mailto:java-patches-subscribe@sourceware.cygnus.com>
List-Archive: <http://sourceware.cygnus.com/ml/java-patches/>
List-Post: <mailto:java-patches@sourceware.cygnus.com>
List-Help: <mailto:java-patches-help@sourceware.cygnus.com>, <http://sourceware.cygnus.com/ml/#faqs>
Sender: java-patches-owner@sourceware.cygnus.com
Delivered-To: mailing list java-patches@sourceware.cygnus.com
Received: (qmail 11414 invoked from network); 5 Jan 2000 22:51:24 -0000
To: Java Patch List <java-patches@sourceware.cygnus.com> 
Subject: Patch: include missing header
X-Zippy:  It's the RINSE CYCLE!!  They've ALL IGNORED the RINSE CYCLE!!
X-Attribution:  Tom
Bcc:
Reply-To:  tromey@cygnus.com
From:  Tom Tromey <tromey@cygnus.com>
Date: 05 Jan 2000 15:54:19 -0700
Message-ID: <87zoukm8o4.fsf@cygnus.com>
Lines: 24
X-Mailer: Gnus v5.5/Emacs 20.3

I'm committing this patch.  It changes natClass.cc to include a header
it needs.  I don't know why this wasn't caught earlier.

2000-01-05  Tom Tromey  <tromey@cygnus.com>

	* java/lang/natClass.cc: Include <gcj/method.h>.

Tom

Index: java/lang/natClass.cc
===================================================================
RCS file: /cvs/java/libgcj/libjava/java/lang/natClass.cc,v
retrieving revision 1.11
diff -u -r1.11 natClass.cc
--- natClass.cc	2000/01/05 22:22:10	1.11
+++ natClass.cc	2000/01/05 22:50:44
@@ -39,6 +39,7 @@
 #include <java/lang/System.h>
 #include <java/lang/SecurityManager.h>
 #include <java/lang/StringBuffer.h>
+#include <gcj/method.h>
 
 #include <java-cpool.h>
 

From java-patches-return-354-listarch-java-patches=sourceware.cygnus.com@sourceware.cygnus.com Thu Jan 06 00:55:06 2000
Return-Path: <java-patches-return-354-listarch-java-patches=sourceware.cygnus.com@sourceware.cygnus.com>
Delivered-To: listarch-java-patches@sourceware.cygnus.com
Received: (qmail 28917 invoked by alias); 6 Jan 2000 00:55:06 -0000
Mailing-List: contact java-patches-help@sourceware.cygnus.com; run by ezmlm
Precedence: bulk
List-Subscribe: <mailto:java-patches-subscribe@sourceware.cygnus.com>
List-Archive: <http://sourceware.cygnus.com/ml/java-patches/>
List-Post: <mailto:java-patches@sourceware.cygnus.com>
List-Help: <mailto:java-patches-help@sourceware.cygnus.com>, <http://sourceware.cygnus.com/ml/#faqs>
Sender: java-patches-owner@sourceware.cygnus.com
Delivered-To: mailing list java-patches@sourceware.cygnus.com
Received: (qmail 28786 invoked from network); 6 Jan 2000 00:54:51 -0000
To: Java Patch List <java-patches@sourceware.cygnus.com> 
Subject: Patch: even more reflection fixes
X-Zippy:  Somewhere in DOWNTOWN BURBANK a prostitute is OVERCOOKING a LAMB CHOP!!
X-Attribution:  Tom
Bcc:
Reply-To:  tromey@cygnus.com
From:  Tom Tromey <tromey@cygnus.com>
Date: 05 Jan 2000 17:57:42 -0700
Message-ID: <87wvpom2yh.fsf@cygnus.com>
Lines: 136
X-Mailer: Gnus v5.5/Emacs 20.3

I'm committing this patch.  It fixes a Class.getMethod() bug that
escaped me earlier, and it makes Method.invoke actually work (one of
the Mauve invoke tests still fails, but that will have to wait for
tomorrow).

2000-01-05  Tom Tromey  <tromey@cygnus.com>

	* java/lang/natClass.cc (getMethod): Compute offset relative to
	`klass's methods table, not `this's table.

	* java/lang/reflect/natMethod.cc (_Jv_CallNonvirtualMethodA):
	In unwrapping/widening case, check whether `k' is null, not
	whether it is primitive.  Initialize `num' from `argelts', not
	`paramelts'.  Correct create and pass arguments to ffi_call.
	Don't let presence of `this' argument affect index used to look in
	argument arrays.
	(COPY): Set appropriate element in `values' vector.

Tom

Index: java/lang/natClass.cc
===================================================================
RCS file: /cvs/java/libgcj/libjava/java/lang/natClass.cc,v
retrieving revision 1.12
diff -u -r1.12 natClass.cc
--- natClass.cc	2000/01/05 22:52:54	1.12
+++ natClass.cc	2000/01/06 00:49:57
@@ -477,7 +477,8 @@
 		break;
 
 	      Method *rmethod = new Method ();
-	      rmethod->offset = (char*) (&klass->methods[i]) - (char*) methods;
+	      rmethod->offset = ((char *) (&klass->methods[i])
+				 - (char *) klass->methods);
 	      rmethod->declaringClass = klass;
 	      return rmethod;
 	    }
Index: java/lang/reflect/natMethod.cc
===================================================================
RCS file: /cvs/java/libgcj/libjava/java/lang/reflect/natMethod.cc,v
retrieving revision 1.5
diff -u -r1.5 natMethod.cc
--- natMethod.cc	2000/01/05 17:23:34	1.5
+++ natMethod.cc	2000/01/06 00:50:00
@@ -374,21 +374,21 @@
       size += sizeof (jobject);
     }
 
-  for (; i < param_count; ++i)
+  for (int arg = 0; i < param_count; ++i, ++arg)
     {
-      jclass k = argelts[i] ? argelts[i]->getClass() : NULL;
+      jclass k = argelts[arg] ? argelts[arg]->getClass() : NULL;
       argtypes[i] = get_ffi_type (k);
-      if (paramelts[i]->isPrimitive())
+      if (paramelts[arg]->isPrimitive())
 	{
-	  if (! argelts[i]
-	      || ! k->isPrimitive ()
-	      || ! can_widen (k, paramelts[i]))
+	  if (! argelts[arg]
+	      || ! k
+	      || ! can_widen (k, paramelts[arg]))
 	    JvThrow (new java::lang::IllegalArgumentException);
-	  size += paramelts[i]->size();
+	  size += paramelts[arg]->size();
 	}
       else
 	{
-	  if (argelts[i] && ! paramelts[i]->isAssignableFrom (k))
+	  if (argelts[arg] && ! paramelts[arg]->isAssignableFrom (k))
 	    JvThrow (new java::lang::IllegalArgumentException);
 	  size += sizeof (jobject);
 	}
@@ -401,13 +401,14 @@
       // FIXME: throw some kind of VirtualMachineError here.
     }
 
-  char *values = (char *) alloca (size);
-  char *p = values;
+  char *p = (char *) alloca (size);
+  void **values = (void **) alloca (param_count * sizeof (void *));
 
 #define COPY(Where, What, Type) \
   do { \
     Type val = (What); \
     memcpy ((Where), &val, sizeof (Type)); \
+    values[i] = (Where); \
     Where += sizeof (Type); \
   } while (0)
 
@@ -418,30 +419,30 @@
       ++i;
     }
 
-  for (; i < param_count; ++i)
+  for (int arg = 0; i < param_count; ++i, ++arg)
     {
-      java::lang::Number *num = (java::lang::Number *) paramelts[i];
-      if (paramelts[i] == JvPrimClass (byte))
+      java::lang::Number *num = (java::lang::Number *) argelts[arg];
+      if (paramelts[arg] == JvPrimClass (byte))
 	COPY (p, num->byteValue(), jbyte);
-      else if (paramelts[i] == JvPrimClass (short))
+      else if (paramelts[arg] == JvPrimClass (short))
 	COPY (p, num->shortValue(), jshort);
-      else if (paramelts[i] == JvPrimClass (int))
+      else if (paramelts[arg] == JvPrimClass (int))
 	COPY (p, num->intValue(), jint);
-      else if (paramelts[i] == JvPrimClass (long))
+      else if (paramelts[arg] == JvPrimClass (long))
 	COPY (p, num->longValue(), jlong);
-      else if (paramelts[i] == JvPrimClass (float))
+      else if (paramelts[arg] == JvPrimClass (float))
 	COPY (p, num->floatValue(), jfloat);
-      else if (paramelts[i] == JvPrimClass (double))
+      else if (paramelts[arg] == JvPrimClass (double))
 	COPY (p, num->doubleValue(), jdouble);
-      else if (paramelts[i] == JvPrimClass (boolean))
-	COPY (p, ((java::lang::Boolean *) argelts[i])->booleanValue(),
+      else if (paramelts[arg] == JvPrimClass (boolean))
+	COPY (p, ((java::lang::Boolean *) argelts[arg])->booleanValue(),
 	      jboolean);
-      else if (paramelts[i] == JvPrimClass (char))
-	COPY (p, ((java::lang::Character *) argelts[i])->charValue(), jchar);
+      else if (paramelts[arg] == JvPrimClass (char))
+	COPY (p, ((java::lang::Character *) argelts[arg])->charValue(), jchar);
       else
 	{
-	  JvAssert (! paramelts[i]->isPrimitive());
-	  COPY (p, argelts[i], jobject);
+	  JvAssert (! paramelts[arg]->isPrimitive());
+	  COPY (p, argelts[arg], jobject);
 	}
     }
 

From java-patches-return-355-listarch-java-patches=sourceware.cygnus.com@sourceware.cygnus.com Thu Jan 06 03:29:17 2000
Return-Path: <java-patches-return-355-listarch-java-patches=sourceware.cygnus.com@sourceware.cygnus.com>
Delivered-To: listarch-java-patches@sourceware.cygnus.com
Received: (qmail 11981 invoked by alias); 6 Jan 2000 03:29:16 -0000
Mailing-List: contact java-patches-help@sourceware.cygnus.com; run by ezmlm
Precedence: bulk
List-Subscribe: <mailto:java-patches-subscribe@sourceware.cygnus.com>
List-Archive: <http://sourceware.cygnus.com/ml/java-patches/>
List-Post: <mailto:java-patches@sourceware.cygnus.com>
List-Help: <mailto:java-patches-help@sourceware.cygnus.com>, <http://sourceware.cygnus.com/ml/#faqs>
Sender: java-patches-owner@sourceware.cygnus.com
Delivered-To: mailing list java-patches@sourceware.cygnus.com
Received: (qmail 11956 invoked from network); 6 Jan 2000 03:29:16 -0000
Date: Wed, 5 Jan 2000 19:29:14 -0800
Message-Id: <200001060329.TAA28928@hoser.cygnus.com>
From: Anthony Green <green@cygnus.com>
To: GChambers@provsol.com
CC: java-patches@sourceware.cygnus.com
In-reply-to: <FDD8932D6ED1D211B3500008C7F4D3271A1D7A@EXCHANGE> (message from
	Glenn Chambers on Wed, 29 Dec 1999 14:08:59 -0500)
Subject: Re: Update CNI examples in FAQ
X-Organization: Cygnus Solutions, Sunnyvale, California
X-URL: http://www.cygnus.com/~green
References:  <FDD8932D6ED1D211B3500008C7F4D3271A1D7A@EXCHANGE>


> Wed Dec 22 13:12:06 1999  Glenn Chambers  (gchambers@provsol.com)
> 
> 	* faq.html: Renumber section 5; fix minor typos; correct 
>       attribution	of CNI examples; add JNI example reference.
>       * cni-2.txt: Fix typo: this example is for version 2.96.

Thanks - I've comitted this.  Sorry it took so long - it is _very_ much
appreciated.

AG

-- 
Anthony Green                                               Cygnus Solutions
                                                       Sunnyvale, California

From java-patches-return-356-listarch-java-patches=sourceware.cygnus.com@sourceware.cygnus.com Thu Jan 06 03:33:12 2000
Return-Path: <java-patches-return-356-listarch-java-patches=sourceware.cygnus.com@sourceware.cygnus.com>
Delivered-To: listarch-java-patches@sourceware.cygnus.com
Received: (qmail 12302 invoked by alias); 6 Jan 2000 03:33:11 -0000
Mailing-List: contact java-patches-help@sourceware.cygnus.com; run by ezmlm
Precedence: bulk
List-Subscribe: <mailto:java-patches-subscribe@sourceware.cygnus.com>
List-Archive: <http://sourceware.cygnus.com/ml/java-patches/>
List-Post: <mailto:java-patches@sourceware.cygnus.com>
List-Help: <mailto:java-patches-help@sourceware.cygnus.com>, <http://sourceware.cygnus.com/ml/#faqs>
Sender: java-patches-owner@sourceware.cygnus.com
Delivered-To: mailing list java-patches@sourceware.cygnus.com
Received: (qmail 12269 invoked from network); 6 Jan 2000 03:33:10 -0000
Date: Wed, 5 Jan 2000 19:33:08 -0800
Message-Id: <200001060333.TAA28940@hoser.cygnus.com>
From: Anthony Green <green@cygnus.com>
To: joerg.brunsmann@FernUni-Hagen.de
CC: java-patches@sourceware.cygnus.com
In-reply-to: <3870A964.4420@fernuni-hagen.de> (message from Joerg Brunsmann on
	Mon, 03 Jan 2000 14:51:32 +0100)
Subject: Re: FAQ -- building snapshots?
X-Organization: Cygnus Solutions, Sunnyvale, California
X-URL: http://www.cygnus.com/~green
References:  <3870A964.4420@fernuni-hagen.de>


Joerg wrote:
> This patch removes some inconsistencies in faq.html and
> it adds a new FAQ entry.

Thanks!  This is great.  I've added a ChangeLog entry and committed
it.

AG

-- 
Anthony Green                                               Cygnus Solutions
                                                       Sunnyvale, California

From java-patches-return-357-listarch-java-patches=sourceware.cygnus.com@sourceware.cygnus.com Thu Jan 06 03:37:14 2000
Return-Path: <java-patches-return-357-listarch-java-patches=sourceware.cygnus.com@sourceware.cygnus.com>
Delivered-To: listarch-java-patches@sourceware.cygnus.com
Received: (qmail 12787 invoked by alias); 6 Jan 2000 03:37:14 -0000
Mailing-List: contact java-patches-help@sourceware.cygnus.com; run by ezmlm
Precedence: bulk
List-Subscribe: <mailto:java-patches-subscribe@sourceware.cygnus.com>
List-Archive: <http://sourceware.cygnus.com/ml/java-patches/>
List-Post: <mailto:java-patches@sourceware.cygnus.com>
List-Help: <mailto:java-patches-help@sourceware.cygnus.com>, <http://sourceware.cygnus.com/ml/#faqs>
Sender: java-patches-owner@sourceware.cygnus.com
Delivered-To: mailing list java-patches@sourceware.cygnus.com
Received: (qmail 12762 invoked from network); 6 Jan 2000 03:37:13 -0000
Date: Wed, 5 Jan 2000 19:37:11 -0800
Message-Id: <200001060337.TAA28945@hoser.cygnus.com>
From: Anthony Green <green@cygnus.com>
To: joerg.brunsmann@FernUni-Hagen.de
CC: java-patches@sourceware.cygnus.com
In-reply-to: <3870A964.4420@fernuni-hagen.de> (message from Joerg Brunsmann on
	Mon, 03 Jan 2000 14:51:32 +0100)
Subject: Re: FAQ -- building snapshots?
X-Organization: Cygnus Solutions, Sunnyvale, California
X-URL: http://www.cygnus.com/~green
References:  <3870A964.4420@fernuni-hagen.de>


Joerg wrote:
> Please also find attached the referenced file "build-snapshot.html".

Actually - I do have one question about step 9.  You should never have
to do this.  Does this happen often?

You also shouldn't have to set CLASSPATH.  gcj will know where to look.

AG

-- 
Anthony Green                                               Cygnus Solutions
                                                       Sunnyvale, California

From java-patches-return-358-listarch-java-patches=sourceware.cygnus.com@sourceware.cygnus.com Thu Jan 06 10:32:11 2000
Return-Path: <java-patches-return-358-listarch-java-patches=sourceware.cygnus.com@sourceware.cygnus.com>
Delivered-To: listarch-java-patches@sourceware.cygnus.com
Received: (qmail 26681 invoked by alias); 6 Jan 2000 10:32:11 -0000
Mailing-List: contact java-patches-help@sourceware.cygnus.com; run by ezmlm
Precedence: bulk
List-Subscribe: <mailto:java-patches-subscribe@sourceware.cygnus.com>
List-Archive: <http://sourceware.cygnus.com/ml/java-patches/>
List-Post: <mailto:java-patches@sourceware.cygnus.com>
List-Help: <mailto:java-patches-help@sourceware.cygnus.com>, <http://sourceware.cygnus.com/ml/#faqs>
Sender: java-patches-owner@sourceware.cygnus.com
Delivered-To: mailing list java-patches@sourceware.cygnus.com
Received: (qmail 26660 invoked from network); 6 Jan 2000 10:32:10 -0000
Message-ID: <38746F00.755D@fernuni-hagen.de>
Date: Thu, 06 Jan 2000 11:31:28 +0100
From: Joerg Brunsmann <joerg.brunsmann@FernUni-Hagen.de>
Organization: Fernuniversitaet Hagen - Software Engineering 
              (Praktische Informatik III)
X-Mailer: Mozilla 3.04 (X11; I; SunOS 5.7 sun4u)
MIME-Version: 1.0
To: Anthony Green <green@cygnus.com>
CC: java-patches@sourceware.cygnus.com
Subject: Re: FAQ -- building snapshots?
References: <3870A964.4420@fernuni-hagen.de> <200001060337.TAA28945@hoser.cygnus.com>
Content-Type: text/plain; charset=iso-8859-1
Content-Transfer-Encoding: quoted-printable
X-Encoded: Changed encoding from 8bit for 7bit transmission

Anthony Green wrote:

> Actually - I do have one question about step 9.  You should never have
> to do this.  Does this happen often?

For me always, both on Solaris and Linux. Is it due to the fact that
I don't install into /usr/local?

> You also shouldn't have to set CLASSPATH.  gcj will know where to look.

$ gcj -c -o Worker.o Worker.java

gcj: libgcj.spec: Datei oder Verzeichnis nicht gefunden

[which means file or directory not found]

$ gcj --main=3DWebServer -L/home/joerg/libgcj/lib -o WebServer Worker.o Log=
.o WebServer.java

WebServer.java:0: Can't find default package `java.lang'. Check the CLASSPA=
TH environment variable and the access to the archives.

J=F6rg

From java-patches-return-359-listarch-java-patches=sourceware.cygnus.com@sourceware.cygnus.com Thu Jan 06 13:47:35 2000
Return-Path: <java-patches-return-359-listarch-java-patches=sourceware.cygnus.com@sourceware.cygnus.com>
Delivered-To: listarch-java-patches@sourceware.cygnus.com
Received: (qmail 26162 invoked by alias); 6 Jan 2000 13:47:35 -0000
Mailing-List: contact java-patches-help@sourceware.cygnus.com; run by ezmlm
Precedence: bulk
List-Subscribe: <mailto:java-patches-subscribe@sourceware.cygnus.com>
List-Archive: <http://sourceware.cygnus.com/ml/java-patches/>
List-Post: <mailto:java-patches@sourceware.cygnus.com>
List-Help: <mailto:java-patches-help@sourceware.cygnus.com>, <http://sourceware.cygnus.com/ml/#faqs>
Sender: java-patches-owner@sourceware.cygnus.com
Delivered-To: mailing list java-patches@sourceware.cygnus.com
Received: (qmail 26137 invoked from network); 6 Jan 2000 13:47:34 -0000
Date: Thu, 6 Jan 2000 05:47:31 -0800
Message-Id: <200001061347.FAA29670@hoser.cygnus.com>
From: Anthony Green <green@cygnus.com>
To: joerg.brunsmann@FernUni-Hagen.de
CC: java-patches@sourceware.cygnus.com
In-reply-to: <38746F00.755D@fernuni-hagen.de> (message from Joerg Brunsmann on
	Thu, 06 Jan 2000 11:31:28 +0100)
Subject: Re: FAQ -- building snapshots?
X-Organization: Cygnus Solutions, Sunnyvale, California
X-URL: http://www.cygnus.com/~green
References: <3870A964.4420@fernuni-hagen.de> <200001060337.TAA28945@hoser.cygnus.com> <38746F00.755D@fernuni-hagen.de>


Joerg wrote:
> For me always, both on Solaris and Linux. Is it due to the fact that
> I don't install into /usr/local?

All of these problems show up because you're not installing gcc and
libgcc in the same place.  I'll fix build-snapshot.html.

AG

-- 
Anthony Green                                               Cygnus Solutions
                                                       Sunnyvale, California

From java-patches-return-360-listarch-java-patches=sourceware.cygnus.com@sourceware.cygnus.com Thu Jan 06 13:57:54 2000
Return-Path: <java-patches-return-360-listarch-java-patches=sourceware.cygnus.com@sourceware.cygnus.com>
Delivered-To: listarch-java-patches@sourceware.cygnus.com
Received: (qmail 28019 invoked by alias); 6 Jan 2000 13:57:54 -0000
Mailing-List: contact java-patches-help@sourceware.cygnus.com; run by ezmlm
Precedence: bulk
List-Subscribe: <mailto:java-patches-subscribe@sourceware.cygnus.com>
List-Archive: <http://sourceware.cygnus.com/ml/java-patches/>
List-Post: <mailto:java-patches@sourceware.cygnus.com>
List-Help: <mailto:java-patches-help@sourceware.cygnus.com>, <http://sourceware.cygnus.com/ml/#faqs>
Sender: java-patches-owner@sourceware.cygnus.com
Delivered-To: mailing list java-patches@sourceware.cygnus.com
Received: (qmail 27994 invoked from network); 6 Jan 2000 13:57:49 -0000
Date: Thu, 6 Jan 2000 05:57:47 -0800
Message-Id: <200001061357.FAA29673@hoser.cygnus.com>
From: Anthony Green <green@cygnus.com>
To: joerg.brunsmann@FernUni-Hagen.de
CC: java-patches@sourceware.cygnus.com
In-reply-to: <38746F00.755D@fernuni-hagen.de> (message from Joerg Brunsmann on
	Thu, 06 Jan 2000 11:31:28 +0100)
Subject: Re: FAQ -- building snapshots?
X-Organization: Cygnus Solutions, Sunnyvale, California
X-URL: http://www.cygnus.com/~green
References: <3870A964.4420@fernuni-hagen.de> <200001060337.TAA28945@hoser.cygnus.com> <38746F00.755D@fernuni-hagen.de>


Joerg wrote:
> For me always, both on Solaris and Linux. Is it due to the fact that
> I don't install into /usr/local?

I'm about to commit this...

2000-01-06  Anthony Green  <green@cygnus.com>
	    
	    * build-snapshot.html: Install gcc and gcj in the same place.
	    Don't need to specify gc when building compiler.

Index: build-snapshot.html
===================================================================
RCS file: /cvs/java/htdocs/build-snapshot.html,v
retrieving revision 1.1
diff -u -r1.1 build-snapshot.html
--- build-snapshot.html	2000/01/06 13:45:14	1.1
+++ build-snapshot.html	2000/01/06 13:55:52
@@ -73,8 +73,7 @@
   $ mkdir objdir
   $ cd objdir
   $ ../configure --enable-threads=posix --prefix=/home/joerg/gcc \ 
-     --enable-java-gc=boehm --with-as=/opt/gnu/bin/as \
-     --with-ld=/opt/gnu/bin/ld
+     --with-as=/opt/gnu/bin/as --with-ld=/opt/gnu/bin/ld
   $ make bootstrap
   $ make install
 
@@ -114,17 +113,20 @@
  $ cd ../libgcj
  $ mkdir objdir
  $ cd objdir
- $ ../configure --enable-threads=posix --prefix=/home/joerg/libgcj \
+ $ ../configure --enable-threads=posix --prefix=/home/joerg/gcc \
    --enable-java-gc=boehm --with-as=/opt/gnu/bin/as --with-ld=/opt/gnu/bin/ld
 
 Again, the last two options are needed for Solaris.
 
+Be sure to use the same prefix option as you did for gcc, otherwise
+gcj won't be able to find the special files it needs from libgcj.
+
  $ make
  $ make install
+
+Make sure you configured both gcj and libgjc with the same thread
+package.
 
-Make sure you configured both gcj and libgjc with the same garbarge collector 
-and with the same thread package. If you use the default for gcj/egcs (no 
-configure option) you have to use --enable-java-gc=no for libgcj.
 </pre>
 </td>
 </tr>
@@ -137,28 +139,17 @@
 Edit a file env.csh:
 
 setenv PATH /home/joerg/gcc/bin:$PATH
-setenv LD_LIBRARY_PATH /home/joerg/libgcj/lib
-setenv CLASSPATH /home/joerg/libgcj/share/libgcj.zip
+setenv LD_LIBRARY_PATH /home/joerg/gcc/lib
 
   $ source env.csh
 </pre>
 </td>
 </tr>
 
-<tr bgcolor="cccccc">
-<td>
-<pre>
-9. If gcj complains about a missing libgcj.spec file copy it into your current directory
-  
-  $ cp /home/joerg/libgcj/lib/libgcj.spec .
-</pre>
-</td>
-</tr>
-
 <tr bgcolor="dddddd">
 <td>
 <pre>
-10. Edit a file HelloWorld.java
+9. Edit a file HelloWorld.java
 
   public class HelloWorld {
     public static void main(String [] args) {
@@ -172,7 +163,7 @@
 <tr bgcolor="cccccc">
 <td>
 <pre>
-11. Compile and run HelloWorld
+10. Compile and run HelloWorld
 
  $ gcj --main=HelloWorld -o HelloWorld HelloWorld.java
  $ ./HelloWorld

From java-patches-return-361-listarch-java-patches=sourceware.cygnus.com@sourceware.cygnus.com Thu Jan 06 18:17:00 2000
Return-Path: <java-patches-return-361-listarch-java-patches=sourceware.cygnus.com@sourceware.cygnus.com>
Delivered-To: listarch-java-patches@sourceware.cygnus.com
Received: (qmail 4306 invoked by alias); 6 Jan 2000 18:16:59 -0000
Mailing-List: contact java-patches-help@sourceware.cygnus.com; run by ezmlm
Precedence: bulk
List-Subscribe: <mailto:java-patches-subscribe@sourceware.cygnus.com>
List-Archive: <http://sourceware.cygnus.com/ml/java-patches/>
List-Post: <mailto:java-patches@sourceware.cygnus.com>
List-Help: <mailto:java-patches-help@sourceware.cygnus.com>, <http://sourceware.cygnus.com/ml/#faqs>
Sender: java-patches-owner@sourceware.cygnus.com
Delivered-To: mailing list java-patches@sourceware.cygnus.com
Received: (qmail 4281 invoked from network); 6 Jan 2000 18:16:49 -0000
To: Java Patch List <java-patches@sourceware.cygnus.com> 
Subject: Patch: this morning's reflection fixes
X-Zippy:  Now I'm being INVOLUNTARILY shuffled closer to the CLAM DIP
 with the BROKEN PLASTIC FORKS in it!!
X-Attribution:  Tom
Bcc:
Reply-To:  tromey@cygnus.com
From:  Tom Tromey <tromey@cygnus.com>
Date: 06 Jan 2000 11:19:54 -0700
Message-ID: <87vh57m59x.fsf@cygnus.com>
Lines: 46
X-Mailer: Gnus v5.5/Emacs 20.3

I'm committing the appended patch.  This fixes the remaining Mauve
reflection failures; now the java.lang.Class.reflection and
java.lang.reflect.Method.invoke tests pass completely.

2000-01-06  Tom Tromey  <tromey@cygnus.com>

	* java/lang/natClass.cc (_getConstructors): Correctly check
	whether method name is the init name.
	(getMethod): Look at accflags on method in `klass', not `this'.

Tom

Index: java/lang/natClass.cc
===================================================================
RCS file: /cvs/java/libgcj/libjava/java/lang/natClass.cc,v
retrieving revision 1.13
diff -u -r1.13 natClass.cc
--- natClass.cc	2000/01/06 00:56:21	1.13
+++ natClass.cc	2000/01/06 18:15:45
@@ -139,7 +139,7 @@
     {
       _Jv_Method *method = &methods[i];
       if (method->name == NULL
-	  && ! _Jv_equalUtf8Consts (method->name, init_name))
+	  || ! _Jv_equalUtf8Consts (method->name, init_name))
 	continue;
       if (! declared
 	  && ! java::lang::reflect::Modifier::isPublic(method->accflags))
@@ -154,7 +154,7 @@
     {
       _Jv_Method *method = &methods[i];
       if (method->name == NULL
-	  && ! _Jv_equalUtf8Consts (method->name, init_name))
+	  || ! _Jv_equalUtf8Consts (method->name, init_name))
 	continue;
       if (! declared
 	  && ! java::lang::reflect::Modifier::isPublic(method->accflags))
@@ -473,7 +473,7 @@
 	      using namespace java::lang::reflect;
 
 	      // Method must be public.
-	      if (! Modifier::isPublic (methods[i].accflags))
+	      if (! Modifier::isPublic (klass->methods[i].accflags))
 		break;
 
 	      Method *rmethod = new Method ();

From java-patches-return-362-listarch-java-patches=sourceware.cygnus.com@sourceware.cygnus.com Fri Jan 07 20:21:51 2000
Return-Path: <java-patches-return-362-listarch-java-patches=sourceware.cygnus.com@sourceware.cygnus.com>
Delivered-To: listarch-java-patches@sourceware.cygnus.com
Received: (qmail 31213 invoked by alias); 7 Jan 2000 20:21:51 -0000
Mailing-List: contact java-patches-help@sourceware.cygnus.com; run by ezmlm
Precedence: bulk
List-Subscribe: <mailto:java-patches-subscribe@sourceware.cygnus.com>
List-Archive: <http://sourceware.cygnus.com/ml/java-patches/>
List-Post: <mailto:java-patches@sourceware.cygnus.com>
List-Help: <mailto:java-patches-help@sourceware.cygnus.com>, <http://sourceware.cygnus.com/ml/#faqs>
Sender: java-patches-owner@sourceware.cygnus.com
Delivered-To: mailing list java-patches@sourceware.cygnus.com
Received: (qmail 31177 invoked from network); 7 Jan 2000 20:21:35 -0000
To: Java Patch List <java-patches@sourceware.cygnus.com> 
Subject: Patch: Class.getClasses()
X-Zippy:  CHUBBY CHECKER owns my BUILDING!
X-Attribution:  Tom
Bcc:
Reply-To:  tromey@cygnus.com
From:  Tom Tromey <tromey@cygnus.com>
Date: 07 Jan 2000 13:23:56 -0700
Message-ID: <87iu15my03.fsf@cygnus.com>
Lines: 31
X-Mailer: Gnus v5.5/Emacs 20.3

I'm committing this patch.  It implements Class.getClasses (to the
extent that we currently can).  I now believe all the reflection code
exists and works correctly.  On to other things.

2000-01-07  Tom Tromey  <tromey@cygnus.com>

	* java/lang/natClass.cc (getClasses): Wrote.

Tom

Index: java/lang/natClass.cc
===================================================================
RCS file: /cvs/java/libgcj/libjava/java/lang/natClass.cc,v
retrieving revision 1.14
diff -u -r1.14 natClass.cc
--- natClass.cc	2000/01/06 18:18:15	1.14
+++ natClass.cc	2000/01/07 20:17:49
@@ -367,8 +367,11 @@
 JArray<jclass> *
 java::lang::Class::getClasses (void)
 {
-  // FIXME: implement.
-  return NULL;
+  // Until we have inner classes, it always makes sense to return an
+  // empty array.
+  JArray<jclass> *result
+    = (JArray<jclass> *) JvNewObjectArray (0, &ClassClass, NULL);
+  return result;
 }
 
 JArray<jclass> *

From java-patches-return-363-listarch-java-patches=sourceware.cygnus.com@sourceware.cygnus.com Fri Jan 07 20:39:49 2000
Return-Path: <java-patches-return-363-listarch-java-patches=sourceware.cygnus.com@sourceware.cygnus.com>
Delivered-To: listarch-java-patches@sourceware.cygnus.com
Received: (qmail 32626 invoked by alias); 7 Jan 2000 20:39:49 -0000
Mailing-List: contact java-patches-help@sourceware.cygnus.com; run by ezmlm
Precedence: bulk
List-Subscribe: <mailto:java-patches-subscribe@sourceware.cygnus.com>
List-Archive: <http://sourceware.cygnus.com/ml/java-patches/>
List-Post: <mailto:java-patches@sourceware.cygnus.com>
List-Help: <mailto:java-patches-help@sourceware.cygnus.com>, <http://sourceware.cygnus.com/ml/#faqs>
Sender: java-patches-owner@sourceware.cygnus.com
Delivered-To: mailing list java-patches@sourceware.cygnus.com
Received: (qmail 32607 invoked from network); 7 Jan 2000 20:39:44 -0000
To: Java Patch List <java-patches@sourceware.cygnus.com> 
Subject: Patch: mauve ClassTest
X-Zippy:  CONGRATULATIONS!  Now should I make thinly veiled comments about
 DIGNITY, self-esteem and finding TRUE FUN in your RIGHT VENTRICLE??
X-Attribution:  Tom
Bcc:
Reply-To:  tromey@cygnus.com
From:  Tom Tromey <tromey@cygnus.com>
Date: 07 Jan 2000 13:43:11 -0700
Message-ID: <87hfgpmx40.fsf@cygnus.com>
Lines: 31
X-Mailer: Gnus v5.5/Emacs 20.3

I'm committing this patch.
It reenables the ClassTest test; we now at least stub out the method
which previously caused this not to compile.

2000-01-07  Tom Tromey  <tromey@cygnus.com>

	* mauve-libgcj: Don't disable ClassTest.

Tom

Index: mauve-libgcj
===================================================================
RCS file: /cvs/java/libgcj/libjava/mauve-libgcj,v
retrieving revision 1.11
diff -u -r1.11 mauve-libgcj
--- mauve-libgcj	1999/12/21 23:50:01	1.11
+++ mauve-libgcj	2000/01/07 20:38:42
@@ -11,8 +11,6 @@
 java.lang.String.hash
 # We support 1.2 for this test.
 java.lang.reflect.Modifier.toString12
-# We don't have the URL function in Class yet.
-!java.lang.Class.ClassTest
 !java.math
 !java.rmi
 !java.security
@@ -25,3 +23,4 @@
 !java.text.AttributedCharacterIterator
 !java.text.resources
 !java.text.DateFormat
+!java.net

From java-patches-return-364-listarch-java-patches=sourceware.cygnus.com@sourceware.cygnus.com Fri Jan 07 20:41:58 2000
Return-Path: <java-patches-return-364-listarch-java-patches=sourceware.cygnus.com@sourceware.cygnus.com>
Delivered-To: listarch-java-patches@sourceware.cygnus.com
Received: (qmail 451 invoked by alias); 7 Jan 2000 20:41:58 -0000
Mailing-List: contact java-patches-help@sourceware.cygnus.com; run by ezmlm
Precedence: bulk
List-Subscribe: <mailto:java-patches-subscribe@sourceware.cygnus.com>
List-Archive: <http://sourceware.cygnus.com/ml/java-patches/>
List-Post: <mailto:java-patches@sourceware.cygnus.com>
List-Help: <mailto:java-patches-help@sourceware.cygnus.com>, <http://sourceware.cygnus.com/ml/#faqs>
Sender: java-patches-owner@sourceware.cygnus.com
Delivered-To: mailing list java-patches@sourceware.cygnus.com
Received: (qmail 426 invoked from network); 7 Jan 2000 20:41:58 -0000
Date: Fri, 7 Jan 2000 12:41:57 -0800 (PST)
Message-Id: <200001072041.MAA00291@ferrule.cygnus.com>
From: Tom Tromey <tromey@cygnus.com>
To: tromey@cygnus.com
Cc: Java Patch List <java-patches@sourceware.cygnus.com>
Subject: Re: Patch: mauve ClassTest
In-Reply-To: <87hfgpmx40.fsf@cygnus.com>
References: <87hfgpmx40.fsf@cygnus.com>
X-Zippy:  When you get your PH.D. will you get able to work at BURGER KING?
X-Attribution:  Tom

>>>>> "Tom" == Tom Tromey <tromey@cygnus.com> writes:

Tom> I'm committing this patch.
Tom> It reenables the ClassTest test; we now at least stub out the method
Tom> which previously caused this not to compile.

I'm not actually committing the second hunk of this patch.
That was a temporary hack I made...

Tom

From java-patches-return-365-listarch-java-patches=sourceware.cygnus.com@sourceware.cygnus.com Sun Jan 09 22:19:07 2000
Return-Path: <java-patches-return-365-listarch-java-patches=sourceware.cygnus.com@sourceware.cygnus.com>
Delivered-To: listarch-java-patches@sourceware.cygnus.com
Received: (qmail 18457 invoked by alias); 9 Jan 2000 22:19:06 -0000
Mailing-List: contact java-patches-help@sourceware.cygnus.com; run by ezmlm
Precedence: bulk
List-Subscribe: <mailto:java-patches-subscribe@sourceware.cygnus.com>
List-Archive: <http://sourceware.cygnus.com/ml/java-patches/>
List-Post: <mailto:java-patches@sourceware.cygnus.com>
List-Help: <mailto:java-patches-help@sourceware.cygnus.com>, <http://sourceware.cygnus.com/ml/#faqs>
Sender: java-patches-owner@sourceware.cygnus.com
Delivered-To: mailing list java-patches@sourceware.cygnus.com
Received: (qmail 18432 invoked from network); 9 Jan 2000 22:19:05 -0000
Date: Sun, 9 Jan 2000 14:19:04 -0800
Message-Id: <200001092219.OAA18242@hoser.cygnus.com>
From: Anthony Green <green@cygnus.com>
To: java-patches@sourceware.cygnus.com
Subject: Patches for java.lang.String
X-Organization: Cygnus Solutions, Sunnyvale, California
X-URL: http://www.cygnus.com/~green


I'm committing the following changes to natString.cc based on mauve
test results:

2000-01-09  Anthony Green  <green@cygnus.com>

	    * java/lang/natString.cc (init): Test for overflow condition
	    during out of bounds check.
	    (getChars): Throw StringIndexOutOfBoundsException, not
	    ArrayIndexOutOfBoundsException.
	    (getBytes): Ditto.
	    (regionMatches): Obey case option during string comparison.


Index: libjava/java/lang/natString.cc
===================================================================
RCS file: /cvs/java/libgcj/libjava/java/lang/natString.cc,v
retrieving revision 1.8
diff -u -r1.8 natString.cc
--- natString.cc	1999/12/02 19:59:30	1.8
+++ natString.cc	2000/01/09 22:13:18
@@ -328,7 +328,8 @@
   if (! chars)
     JvThrow (new NullPointerException);
   jsize data_size = JvGetArrayLength (chars);
-  if (offset < 0 || count < 0 || offset + count > data_size)
+  if (offset < 0 || count < 0 || offset + count < 0
+      || offset + count > data_size)
     JvThrow (new StringIndexOutOfBoundsException());
   jcharArray array;
   jchar *pdst;
@@ -451,7 +452,7 @@
   jint dst_length = JvGetArrayLength (dst);
   if (srcBegin < 0 || srcBegin > srcEnd || srcEnd > count
       || dstBegin < 0 || dstBegin + (srcEnd-srcBegin) > dst_length)
-    JvThrow (new java::lang::ArrayIndexOutOfBoundsException());
+    JvThrow (new java::lang::StringIndexOutOfBoundsException());
   register jchar *dPtr = elements (dst) + dstBegin;
   register jchar *sPtr = JvGetStringChars (this) + srcBegin;
   register jint i = srcEnd-srcBegin;
@@ -501,7 +502,7 @@
   jint dst_length = JvGetArrayLength (dst);
   if (srcBegin < 0 || srcBegin > srcEnd || srcEnd > count
       || dstBegin < 0 || dstBegin + (srcEnd-srcBegin) > dst_length)
-    JvThrow (new java::lang::ArrayIndexOutOfBoundsException());
+    JvThrow (new java::lang::StringIndexOutOfBoundsException());
   register jbyte *dPtr = elements (dst) + dstBegin;
   register jchar *sPtr = JvGetStringChars (this) + srcBegin;
   register jint i = srcEnd-srcBegin;
@@ -591,19 +592,25 @@
   register jchar *tptr = JvGetStringChars (this) + toffset;
   register jchar *optr = JvGetStringChars (other) + ooffset;
   register jint i = len;
-  while (--i >= 0)
-    {
-      jchar tch = *tptr++;
-      jchar och = *optr++;
-      if (tch != och)
-	return false;
-      if (ignoreCase
-	  && (java::lang::Character::toLowerCase (tch)
-	      != java::lang::Character::toLowerCase (och))
-	  && (java::lang::Character::toUpperCase (tch)
-	      != java::lang::Character::toUpperCase (och)))
-	return false;
-    }
+  if (ignoreCase)
+    while (--i >= 0)
+      {
+	jchar tch = *tptr++;
+	jchar och = *optr++;
+	if ((java::lang::Character::toLowerCase (tch)
+	     != java::lang::Character::toLowerCase (och))
+	    && (java::lang::Character::toUpperCase (tch)
+		!= java::lang::Character::toUpperCase (och)))
+	  return false;
+      }
+  else
+    while (--i >= 0)
+      {
+	jchar tch = *tptr++;
+	jchar och = *optr++;
+	if (tch != och)
+	  return false;
+      }
   return true;
 }

-- 
Anthony Green                                               Cygnus Solutions
                                                       Sunnyvale, California

From java-patches-return-366-listarch-java-patches=sourceware.cygnus.com@sourceware.cygnus.com Sun Jan 09 22:24:25 2000
Return-Path: <java-patches-return-366-listarch-java-patches=sourceware.cygnus.com@sourceware.cygnus.com>
Delivered-To: listarch-java-patches@sourceware.cygnus.com
Received: (qmail 19727 invoked by alias); 9 Jan 2000 22:24:24 -0000
Mailing-List: contact java-patches-help@sourceware.cygnus.com; run by ezmlm
Precedence: bulk
List-Subscribe: <mailto:java-patches-subscribe@sourceware.cygnus.com>
List-Archive: <http://sourceware.cygnus.com/ml/java-patches/>
List-Post: <mailto:java-patches@sourceware.cygnus.com>
List-Help: <mailto:java-patches-help@sourceware.cygnus.com>, <http://sourceware.cygnus.com/ml/#faqs>
Sender: java-patches-owner@sourceware.cygnus.com
Delivered-To: mailing list java-patches@sourceware.cygnus.com
Received: (qmail 19702 invoked from network); 9 Jan 2000 22:24:23 -0000
Date: Sun, 9 Jan 2000 14:24:21 -0800
Message-Id: <200001092224.OAA18258@hoser.cygnus.com>
From: Anthony Green <green@cygnus.com>
To: java-patches@sourceware.cygnus.com
Subject: Enable interpreter by default for IA-32
X-Organization: Cygnus Solutions, Sunnyvale, California
X-URL: http://www.cygnus.com/~green


I'm about to commit the following change, which enables the
interpreter by default for IA-32.  I've been using it like this for
some time now.

2000-01-09  Anthony Green  <green@cygnus.com>

	    * configure.host (ligcj_interpreter): New variable.  Enable
	    interpreter by default on IA-32.
	    * configure.in:  Examine libgcj_interpreter.
	    * configure: Rebuilt.

Index: libjava/configure.host
===================================================================
RCS file: /cvs/java/libgcj/libjava/configure.host,v
retrieving revision 1.6
diff -u -r1.6 configure.host
--- configure.host	1999/11/19 19:13:42	1.6
+++ configure.host	2000/01/09 22:20:20
@@ -24,6 +24,7 @@
 libgcj_cxxflags=
 libgcj_javaflags=
 libgcj_sjlj=
+libgcj_interpreter=
 
 case "${target_optspace}:${host}" in
   yes:*)
@@ -58,6 +59,7 @@
 	;;
   i686-*|i586-*)
 	libgcj_flags="${libgcj_flags} -ffloat-store"
+	libgcj_interpreter=yes
 	DIVIDESPEC=-fno-use-divide-subroutine
 	;;
   sparc-*)
Index: libjava/configure.in
===================================================================
RCS file: /cvs/java/libgcj/libjava/configure.in,v
retrieving revision 1.44
diff -u -r1.44 configure.in
--- configure.in	1999/12/20 05:55:34	1.44
+++ configure.in	2000/01/09 22:20:22
@@ -61,8 +61,13 @@
 AC_ARG_ENABLE(interpreter,
 [  --enable-interpreter    enable interpreter],
   if test "$enable_interpreter" = yes; then
-     AC_DEFINE(INTERPRETER)
+    # This can also be set in configure.host.
+    libgcj_interpreter=yes
   fi)
+
+if test "$libgcj_interpreter" = yes; then
+   AC_DEFINE(INTERPRETER)
+fi
 
 EXCEPTIONSPEC=
 dnl See if we should use setjmp/longjmp exceptions
Index: libjava/configure
===================================================================
RCS file: /cvs/java/libgcj/libjava/configure,v
retrieving revision 1.46
diff -u -r1.46 configure
--- configure	1999/12/20 05:55:34	1.46
+++ configure	2000/01/09 22:20:34
@@ -2422,14 +2422,19 @@
 if test "${enable_interpreter+set}" = set; then
   enableval="$enable_interpreter"
   if test "$enable_interpreter" = yes; then
-     cat >> confdefs.h <<\EOF
+    # This can also be set in configure.host.
+    libgcj_interpreter=yes
+  fi
+fi
+
+
+if test "$libgcj_interpreter" = yes; then
+   cat >> confdefs.h <<\EOF
 #define INTERPRETER 1
 EOF
 
-  fi
 fi
 
-
 EXCEPTIONSPEC=
 # Check whether --enable-sjlj-exceptions or --disable-sjlj-exceptions was given.
 if test "${enable_sjlj_exceptions+set}" = set; then
@@ -2455,18 +2460,18 @@
 fi   
 
 echo $ac_n "checking for data_start""... $ac_c" 1>&6
-echo "configure:2459: checking for data_start" >&5
+echo "configure:2464: checking for data_start" >&5
 LIBDATASTARTSPEC=
 NEEDS_DATA_START=
 cat > conftest.$ac_ext <<EOF
-#line 2463 "configure"
+#line 2468 "configure"
 #include "confdefs.h"
 extern int data_start;
 int main() {
 return ((int) &data_start);
 ; return 0; }
 EOF
-if { (eval echo configure:2470: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:2475: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   echo "$ac_t""found it" 1>&6
 else
@@ -2522,7 +2527,7 @@
 esac
 
 echo $ac_n "checking how to run the C preprocessor""... $ac_c" 1>&6
-echo "configure:2526: checking how to run the C preprocessor" >&5
+echo "configure:2531: checking how to run the C preprocessor" >&5
 # On Suns, sometimes $CPP names a directory.
 if test -n "$CPP" && test -d "$CPP"; then
   CPP=
@@ -2537,13 +2542,13 @@
   # On the NeXT, cc -E runs the code through the compiler's parser,
   # not just through cpp.
   cat > conftest.$ac_ext <<EOF
-#line 2541 "configure"
+#line 2546 "configure"
 #include "confdefs.h"
 #include <assert.h>
 Syntax Error
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:2547: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:2552: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
   :
@@ -2554,13 +2559,13 @@
   rm -rf conftest*
   CPP="${CC-cc} -E -traditional-cpp"
   cat > conftest.$ac_ext <<EOF
-#line 2558 "configure"
+#line 2563 "configure"
 #include "confdefs.h"
 #include <assert.h>
 Syntax Error
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:2564: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:2569: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
   :
@@ -2571,13 +2576,13 @@
   rm -rf conftest*
   CPP="${CC-cc} -nologo -E"
   cat > conftest.$ac_ext <<EOF
-#line 2575 "configure"
+#line 2580 "configure"
 #include "confdefs.h"
 #include <assert.h>
 Syntax Error
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:2581: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:2586: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
   :
@@ -2602,7 +2607,7 @@
 echo "$ac_t""$CPP" 1>&6
 
 cat > conftest.$ac_ext <<EOF
-#line 2606 "configure"
+#line 2611 "configure"
 #include "confdefs.h"
 #include <stdint.h>
 EOF
@@ -2617,7 +2622,7 @@
 rm -f conftest*
 
 cat > conftest.$ac_ext <<EOF
-#line 2621 "configure"
+#line 2626 "configure"
 #include "confdefs.h"
 #include <inttypes.h>
 EOF
@@ -2632,7 +2637,7 @@
 rm -f conftest*
 
 cat > conftest.$ac_ext <<EOF
-#line 2636 "configure"
+#line 2641 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 EOF
@@ -2647,7 +2652,7 @@
 rm -f conftest*
 
 cat > conftest.$ac_ext <<EOF
-#line 2651 "configure"
+#line 2656 "configure"
 #include "confdefs.h"
 #include <sys/config.h>
 EOF
@@ -2664,7 +2669,7 @@
 
 
 cat > conftest.$ac_ext <<EOF
-#line 2668 "configure"
+#line 2673 "configure"
 #include "confdefs.h"
 #include <time.h>
 EOF
@@ -2679,7 +2684,7 @@
 rm -f conftest*
 
 cat > conftest.$ac_ext <<EOF
-#line 2683 "configure"
+#line 2688 "configure"
 #include "confdefs.h"
 #include <time.h>
 EOF
@@ -2717,7 +2722,7 @@
 libsubdir=.libs
 
 echo $ac_n "checking for garbage collector to use""... $ac_c" 1>&6
-echo "configure:2721: checking for garbage collector to use" >&5
+echo "configure:2726: checking for garbage collector to use" >&5
 # Check whether --enable-java-gc or --disable-java-gc was given.
 if test "${enable_java_gc+set}" = set; then
   enableval="$enable_java_gc"
@@ -2767,7 +2772,7 @@
 
 
 echo $ac_n "checking for threads package to use""... $ac_c" 1>&6
-echo "configure:2771: checking for threads package to use" >&5
+echo "configure:2776: checking for threads package to use" >&5
 # Check whether --enable-threads or --disable-threads was given.
 if test "${enable_threads+set}" = set; then
   enableval="$enable_threads"
@@ -2947,12 +2952,12 @@
    for ac_func in strerror ioctl select fstat open fsync sleep
 do
 echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:2951: checking for $ac_func" >&5
+echo "configure:2956: checking for $ac_func" >&5
 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 2956 "configure"
+#line 2961 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func(); below.  */
@@ -2975,7 +2980,7 @@
 
 ; return 0; }
 EOF
-if { (eval echo configure:2979: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:2984: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_func_$ac_func=yes"
 else
@@ -3002,12 +3007,12 @@
    for ac_func in gmtime_r localtime_r readdir_r getpwuid_r getcwd
 do
 echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:3006: checking for $ac_func" >&5
+echo "configure:3011: checking for $ac_func" >&5
 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 3011 "configure"
+#line 3016 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func(); below.  */
@@ -3030,7 +3035,7 @@
 
 ; return 0; }
 EOF
-if { (eval echo configure:3034: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:3039: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_func_$ac_func=yes"
 else
@@ -3057,12 +3062,12 @@
    for ac_func in access stat mkdir rename rmdir unlink realpath
 do
 echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:3061: checking for $ac_func" >&5
+echo "configure:3066: checking for $ac_func" >&5
 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 3066 "configure"
+#line 3071 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func(); below.  */
@@ -3085,7 +3090,7 @@
 
 ; return 0; }
 EOF
-if { (eval echo configure:3089: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:3094: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_func_$ac_func=yes"
 else
@@ -3112,12 +3117,12 @@
    for ac_func in inet_aton inet_addr
 do
 echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:3116: checking for $ac_func" >&5
+echo "configure:3121: checking for $ac_func" >&5
 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 3121 "configure"
+#line 3126 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func(); below.  */
@@ -3140,7 +3145,7 @@
 
 ; return 0; }
 EOF
-if { (eval echo configure:3144: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:3149: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_func_$ac_func=yes"
 else
@@ -3167,12 +3172,12 @@
    for ac_func in inet_pton uname inet_ntoa
 do
 echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:3171: checking for $ac_func" >&5
+echo "configure:3176: checking for $ac_func" >&5
 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 3176 "configure"
+#line 3181 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func(); below.  */
@@ -3195,7 +3200,7 @@
 
 ; return 0; }
 EOF
-if { (eval echo configure:3199: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:3204: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_func_$ac_func=yes"
 else
@@ -3223,12 +3228,12 @@
    for ac_func in gethostbyname_r
 do
 echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:3227: checking for $ac_func" >&5
+echo "configure:3232: checking for $ac_func" >&5
 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 3232 "configure"
+#line 3237 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func(); below.  */
@@ -3251,7 +3256,7 @@
 
 ; return 0; }
 EOF
-if { (eval echo configure:3255: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:3260: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_func_$ac_func=yes"
 else
@@ -3278,7 +3283,7 @@
      # We look for the one that returns `int'.
      # Hopefully this check is robust enough.
      cat > conftest.$ac_ext <<EOF
-#line 3282 "configure"
+#line 3287 "configure"
 #include "confdefs.h"
 #include <netdb.h>
 EOF
@@ -3298,7 +3303,7 @@
      *" -D_REENTRANT "*) ;;
      *)
 		echo $ac_n "checking whether gethostbyname_r declaration requires -D_REENTRANT""... $ac_c" 1>&6
-echo "configure:3302: checking whether gethostbyname_r declaration requires -D_REENTRANT" >&5
+echo "configure:3307: checking whether gethostbyname_r declaration requires -D_REENTRANT" >&5
 if eval "test \"`echo '$''{'libjava_cv_gethostbyname_r_needs_reentrant'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -3311,14 +3316,14 @@
 cross_compiling=$ac_cv_prog_cxx_cross
 
 	  cat > conftest.$ac_ext <<EOF
-#line 3315 "configure"
+#line 3320 "configure"
 #include "confdefs.h"
 #include <netdb.h>
 int main() {
 gethostbyname_r("", 0, 0);
 ; return 0; }
 EOF
-if { (eval echo configure:3322: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:3327: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   libjava_cv_gethostbyname_r_needs_reentrant=no
 else
@@ -3328,14 +3333,14 @@
   		CPPFLAGS_SAVE="$CPPFLAGS"
 		CPPFLAGS="$CPPFLAGS -D_REENTRANT"
 		cat > conftest.$ac_ext <<EOF
-#line 3332 "configure"
+#line 3337 "configure"
 #include "confdefs.h"
 #include <netdb.h>
 int main() {
 gethostbyname_r("", 0, 0);
 ; return 0; }
 EOF
-if { (eval echo configure:3339: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:3344: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   libjava_cv_gethostbyname_r_needs_reentrant=yes
 else
@@ -3370,12 +3375,12 @@
      esac
 
      echo $ac_n "checking for struct hostent_data""... $ac_c" 1>&6
-echo "configure:3374: checking for struct hostent_data" >&5
+echo "configure:3379: checking for struct hostent_data" >&5
 if eval "test \"`echo '$''{'libjava_cv_struct_hostent_data'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   	cat > conftest.$ac_ext <<EOF
-#line 3379 "configure"
+#line 3384 "configure"
 #include "confdefs.h"
 
 #if GETHOSTBYNAME_R_NEEDS_REENTRANT && !defined(_REENTRANT)
@@ -3386,7 +3391,7 @@
 struct hostent_data data;
 ; return 0; }
 EOF
-if { (eval echo configure:3390: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:3395: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   libjava_cv_struct_hostent_data=yes
 else
@@ -3415,12 +3420,12 @@
    for ac_func in gethostbyaddr_r
 do
 echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:3419: checking for $ac_func" >&5
+echo "configure:3424: checking for $ac_func" >&5
 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 3424 "configure"
+#line 3429 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func(); below.  */
@@ -3443,7 +3448,7 @@
 
 ; return 0; }
 EOF
-if { (eval echo configure:3447: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:3452: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_func_$ac_func=yes"
 else
@@ -3470,7 +3475,7 @@
      # We look for the one that returns `int'.
      # Hopefully this check is robust enough.
      cat > conftest.$ac_ext <<EOF
-#line 3474 "configure"
+#line 3479 "configure"
 #include "confdefs.h"
 #include <netdb.h>
 EOF
@@ -3494,12 +3499,12 @@
    for ac_func in gethostname
 do
 echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:3498: checking for $ac_func" >&5
+echo "configure:3503: checking for $ac_func" >&5
 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 3503 "configure"
+#line 3508 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func(); below.  */
@@ -3522,7 +3527,7 @@
 
 ; return 0; }
 EOF
-if { (eval echo configure:3526: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:3531: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_func_$ac_func=yes"
 else
@@ -3546,7 +3551,7 @@
 EOF
 
      cat > conftest.$ac_ext <<EOF
-#line 3550 "configure"
+#line 3555 "configure"
 #include "confdefs.h"
 #include <unistd.h>
 EOF
@@ -3577,12 +3582,12 @@
       for ac_func in pthread_mutexattr_settype pthread_mutexattr_setkind_np
 do
 echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:3581: checking for $ac_func" >&5
+echo "configure:3586: checking for $ac_func" >&5
 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 3586 "configure"
+#line 3591 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func(); below.  */
@@ -3605,7 +3610,7 @@
 
 ; return 0; }
 EOF
-if { (eval echo configure:3609: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:3614: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_func_$ac_func=yes"
 else
@@ -3635,12 +3640,12 @@
       for ac_func in sched_yield
 do
 echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:3639: checking for $ac_func" >&5
+echo "configure:3644: checking for $ac_func" >&5
 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 3644 "configure"
+#line 3649 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func(); below.  */
@@ -3663,7 +3668,7 @@
 
 ; return 0; }
 EOF
-if { (eval echo configure:3667: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:3672: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_func_$ac_func=yes"
 else
@@ -3685,7 +3690,7 @@
 else
   echo "$ac_t""no" 1>&6
 echo $ac_n "checking for sched_yield in -lrt""... $ac_c" 1>&6
-echo "configure:3689: checking for sched_yield in -lrt" >&5
+echo "configure:3694: checking for sched_yield in -lrt" >&5
 ac_lib_var=`echo rt'_'sched_yield | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -3693,7 +3698,7 @@
   ac_save_LIBS="$LIBS"
 LIBS="-lrt  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 3697 "configure"
+#line 3702 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -3704,7 +3709,7 @@
 sched_yield()
 ; return 0; }
 EOF
-if { (eval echo configure:3708: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:3713: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -3730,7 +3735,7 @@
   echo "$ac_t""no" 1>&6
 
 	  echo $ac_n "checking for sched_yield in -lposix4""... $ac_c" 1>&6
-echo "configure:3734: checking for sched_yield in -lposix4" >&5
+echo "configure:3739: checking for sched_yield in -lposix4" >&5
 ac_lib_var=`echo posix4'_'sched_yield | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -3738,7 +3743,7 @@
   ac_save_LIBS="$LIBS"
 LIBS="-lposix4  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 3742 "configure"
+#line 3747 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -3749,7 +3754,7 @@
 sched_yield()
 ; return 0; }
 EOF
-if { (eval echo configure:3753: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:3758: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -3785,7 +3790,7 @@
       # We can save a little space at runtime if the mutex has m_count
       # or __m_count.  This is a nice hack for Linux.
       cat > conftest.$ac_ext <<EOF
-#line 3789 "configure"
+#line 3794 "configure"
 #include "confdefs.h"
 #include <pthread.h>
 int main() {
@@ -3794,7 +3799,7 @@
         
 ; return 0; }
 EOF
-if { (eval echo configure:3798: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:3803: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   cat >> confdefs.h <<\EOF
 #define PTHREAD_MUTEX_HAVE_M_COUNT 1
@@ -3806,7 +3811,7 @@
   rm -rf conftest*
   
 	cat > conftest.$ac_ext <<EOF
-#line 3810 "configure"
+#line 3815 "configure"
 #include "confdefs.h"
 #include <pthread.h>
 int main() {
@@ -3815,7 +3820,7 @@
 	  
 ; return 0; }
 EOF
-if { (eval echo configure:3819: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:3824: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   cat >> confdefs.h <<\EOF
 #define PTHREAD_MUTEX_HAVE___M_COUNT 1
@@ -3835,12 +3840,12 @@
    for ac_func in gettimeofday time ftime
 do
 echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:3839: checking for $ac_func" >&5
+echo "configure:3844: checking for $ac_func" >&5
 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 3844 "configure"
+#line 3849 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func(); below.  */
@@ -3863,7 +3868,7 @@
 
 ; return 0; }
 EOF
-if { (eval echo configure:3867: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:3872: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_func_$ac_func=yes"
 else
@@ -3894,12 +3899,12 @@
    for ac_func in memmove
 do
 echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:3898: checking for $ac_func" >&5
+echo "configure:3903: checking for $ac_func" >&5
 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 3903 "configure"
+#line 3908 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func(); below.  */
@@ -3922,7 +3927,7 @@
 
 ; return 0; }
 EOF
-if { (eval echo configure:3926: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:3931: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_func_$ac_func=yes"
 else
@@ -3952,12 +3957,12 @@
    for ac_func in memcpy
 do
 echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:3956: checking for $ac_func" >&5
+echo "configure:3961: checking for $ac_func" >&5
 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 3961 "configure"
+#line 3966 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func(); below.  */
@@ -3980,7 +3985,7 @@
 
 ; return 0; }
 EOF
-if { (eval echo configure:3984: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:3989: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_func_$ac_func=yes"
 else
@@ -4028,7 +4033,7 @@
    #--------------------------------------------------------------------
 
    echo $ac_n "checking for socket libraries""... $ac_c" 1>&6
-echo "configure:4032: checking for socket libraries" >&5
+echo "configure:4037: checking for socket libraries" >&5
 if eval "test \"`echo '$''{'gcj_cv_lib_sockets'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -4036,12 +4041,12 @@
      gcj_checkBoth=0
      unset ac_cv_func_connect
      echo $ac_n "checking for connect""... $ac_c" 1>&6
-echo "configure:4040: checking for connect" >&5
+echo "configure:4045: checking for connect" >&5
 if eval "test \"`echo '$''{'ac_cv_func_connect'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 4045 "configure"
+#line 4050 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char connect(); below.  */
@@ -4064,7 +4069,7 @@
 
 ; return 0; }
 EOF
-if { (eval echo configure:4068: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:4073: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_func_connect=yes"
 else
@@ -4087,7 +4092,7 @@
      if test "$gcj_checkSocket" = 1; then
 	 unset ac_cv_func_connect
 	 echo $ac_n "checking for main in -lsocket""... $ac_c" 1>&6
-echo "configure:4091: checking for main in -lsocket" >&5
+echo "configure:4096: checking for main in -lsocket" >&5
 ac_lib_var=`echo socket'_'main | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -4095,14 +4100,14 @@
   ac_save_LIBS="$LIBS"
 LIBS="-lsocket  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 4099 "configure"
+#line 4104 "configure"
 #include "confdefs.h"
 
 int main() {
 main()
 ; return 0; }
 EOF
-if { (eval echo configure:4106: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:4111: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -4129,12 +4134,12 @@
 	 LIBS="$LIBS -lsocket -lnsl"
 	 unset ac_cv_func_accept
 	 echo $ac_n "checking for accept""... $ac_c" 1>&6
-echo "configure:4133: checking for accept" >&5
+echo "configure:4138: checking for accept" >&5
 if eval "test \"`echo '$''{'ac_cv_func_accept'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 4138 "configure"
+#line 4143 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char accept(); below.  */
@@ -4157,7 +4162,7 @@
 
 ; return 0; }
 EOF
-if { (eval echo configure:4161: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:4166: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_func_accept=yes"
 else
@@ -4184,12 +4189,12 @@
      gcj_oldLibs=$LIBS
      LIBS="$LIBS $gcj_cv_lib_sockets"
      echo $ac_n "checking for gethostbyname""... $ac_c" 1>&6
-echo "configure:4188: checking for gethostbyname" >&5
+echo "configure:4193: checking for gethostbyname" >&5
 if eval "test \"`echo '$''{'ac_cv_func_gethostbyname'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 4193 "configure"
+#line 4198 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char gethostbyname(); below.  */
@@ -4212,7 +4217,7 @@
 
 ; return 0; }
 EOF
-if { (eval echo configure:4216: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:4221: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_func_gethostbyname=yes"
 else
@@ -4230,7 +4235,7 @@
 else
   echo "$ac_t""no" 1>&6
 echo $ac_n "checking for main in -lnsl""... $ac_c" 1>&6
-echo "configure:4234: checking for main in -lnsl" >&5
+echo "configure:4239: checking for main in -lnsl" >&5
 ac_lib_var=`echo nsl'_'main | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -4238,14 +4243,14 @@
   ac_save_LIBS="$LIBS"
 LIBS="-lnsl  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 4242 "configure"
+#line 4247 "configure"
 #include "confdefs.h"
 
 int main() {
 main()
 ; return 0; }
 EOF
-if { (eval echo configure:4249: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:4254: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -4277,7 +4282,7 @@
 
    if test "$with_system_zlib" = yes; then
       echo $ac_n "checking for deflate in -lz""... $ac_c" 1>&6
-echo "configure:4281: checking for deflate in -lz" >&5
+echo "configure:4286: checking for deflate in -lz" >&5
 ac_lib_var=`echo z'_'deflate | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -4285,7 +4290,7 @@
   ac_save_LIBS="$LIBS"
 LIBS="-lz  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 4289 "configure"
+#line 4294 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -4296,7 +4301,7 @@
 deflate()
 ; return 0; }
 EOF
-if { (eval echo configure:4300: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:4305: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -4325,7 +4330,7 @@
    # requires -ldl.
    if test "$GC" = boehm; then
       echo $ac_n "checking for main in -ldl""... $ac_c" 1>&6
-echo "configure:4329: checking for main in -ldl" >&5
+echo "configure:4334: checking for main in -ldl" >&5
 ac_lib_var=`echo dl'_'main | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -4333,14 +4338,14 @@
   ac_save_LIBS="$LIBS"
 LIBS="-ldl  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 4337 "configure"
+#line 4342 "configure"
 #include "confdefs.h"
 
 int main() {
 main()
 ; return 0; }
 EOF
-if { (eval echo configure:4344: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:4349: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -4460,7 +4465,7 @@
 # See if gcj supports -fuse-divide-subroutine.  gcc 2.95 does not, and
 # we want to continue to support that version.
 echo $ac_n "checking whether gcj supports -fuse-divide-subroutine""... $ac_c" 1>&6
-echo "configure:4464: checking whether gcj supports -fuse-divide-subroutine" >&5
+echo "configure:4469: checking whether gcj supports -fuse-divide-subroutine" >&5
 cat > conftest.java << 'END'
 public class conftest { }
 END
@@ -4480,17 +4485,17 @@
 do
 ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:4484: checking for $ac_hdr" >&5
+echo "configure:4489: checking for $ac_hdr" >&5
 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 4489 "configure"
+#line 4494 "configure"
 #include "confdefs.h"
 #include <$ac_hdr>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:4494: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:4499: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
   rm -rf conftest*
@@ -4520,17 +4525,17 @@
 do
 ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:4524: checking for $ac_hdr" >&5
+echo "configure:4529: checking for $ac_hdr" >&5
 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 4529 "configure"
+#line 4534 "configure"
 #include "confdefs.h"
 #include <$ac_hdr>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:4534: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:4539: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
   rm -rf conftest*
@@ -4558,12 +4563,12 @@
 
 
 echo $ac_n "checking for ANSI C header files""... $ac_c" 1>&6
-echo "configure:4562: checking for ANSI C header files" >&5
+echo "configure:4567: checking for ANSI C header files" >&5
 if eval "test \"`echo '$''{'ac_cv_header_stdc'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 4567 "configure"
+#line 4572 "configure"
 #include "confdefs.h"
 #include <stdlib.h>
 #include <stdarg.h>
@@ -4571,7 +4576,7 @@
 #include <float.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:4575: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:4580: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
   rm -rf conftest*
@@ -4588,7 +4593,7 @@
 if test $ac_cv_header_stdc = yes; then
   # SunOS 4.x string.h does not declare mem*, contrary to ANSI.
 cat > conftest.$ac_ext <<EOF
-#line 4592 "configure"
+#line 4597 "configure"
 #include "confdefs.h"
 #include <string.h>
 EOF
@@ -4606,7 +4611,7 @@
 if test $ac_cv_header_stdc = yes; then
   # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI.
 cat > conftest.$ac_ext <<EOF
-#line 4610 "configure"
+#line 4615 "configure"
 #include "confdefs.h"
 #include <stdlib.h>
 EOF
@@ -4627,7 +4632,7 @@
   :
 else
   cat > conftest.$ac_ext <<EOF
-#line 4631 "configure"
+#line 4636 "configure"
 #include "confdefs.h"
 #include <ctype.h>
 #define ISLOWER(c) ('a' <= (c) && (c) <= 'z')
@@ -4638,7 +4643,7 @@
 exit (0); }
 
 EOF
-if { (eval echo configure:4642: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:4647: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
 then
   :
 else
@@ -4662,12 +4667,12 @@
 fi
 
 echo $ac_n "checking for ssize_t""... $ac_c" 1>&6
-echo "configure:4666: checking for ssize_t" >&5
+echo "configure:4671: checking for ssize_t" >&5
 if eval "test \"`echo '$''{'ac_cv_type_ssize_t'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 4671 "configure"
+#line 4676 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #if STDC_HEADERS
@@ -4696,9 +4701,9 @@
 
 
 echo $ac_n "checking for in_addr_t""... $ac_c" 1>&6
-echo "configure:4700: checking for in_addr_t" >&5
+echo "configure:4705: checking for in_addr_t" >&5
 cat > conftest.$ac_ext <<EOF
-#line 4702 "configure"
+#line 4707 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #if STDC_HEADERS
@@ -4712,7 +4717,7 @@
 in_addr_t foo;
 ; return 0; }
 EOF
-if { (eval echo configure:4716: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:4721: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   cat >> confdefs.h <<\EOF
 #define HAVE_IN_ADDR_T 1
@@ -4728,16 +4733,16 @@
 rm -f conftest*
 
 echo $ac_n "checking whether struct ip_mreq is in netinet/in.h""... $ac_c" 1>&6
-echo "configure:4732: checking whether struct ip_mreq is in netinet/in.h" >&5
+echo "configure:4737: checking whether struct ip_mreq is in netinet/in.h" >&5
 cat > conftest.$ac_ext <<EOF
-#line 4734 "configure"
+#line 4739 "configure"
 #include "confdefs.h"
 #include <netinet/in.h>
 int main() {
 struct ip_mreq mreq;
 ; return 0; }
 EOF
-if { (eval echo configure:4741: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:4746: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   cat >> confdefs.h <<\EOF
 #define HAVE_STRUCT_IP_MREQ 1
@@ -4753,16 +4758,16 @@
 rm -f conftest*
 
 echo $ac_n "checking whether struct sockaddr_in6 is in netinet/in.h""... $ac_c" 1>&6
-echo "configure:4757: checking whether struct sockaddr_in6 is in netinet/in.h" >&5
+echo "configure:4762: checking whether struct sockaddr_in6 is in netinet/in.h" >&5
 cat > conftest.$ac_ext <<EOF
-#line 4759 "configure"
+#line 4764 "configure"
 #include "confdefs.h"
 #include <netinet/in.h>
 int main() {
 struct sockaddr_in6 addr6;
 ; return 0; }
 EOF
-if { (eval echo configure:4766: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:4771: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   cat >> confdefs.h <<\EOF
 #define HAVE_INET6 1
@@ -4778,16 +4783,16 @@
 rm -f conftest*
 
 echo $ac_n "checking for socklen_t in sys/socket.h""... $ac_c" 1>&6
-echo "configure:4782: checking for socklen_t in sys/socket.h" >&5
+echo "configure:4787: checking for socklen_t in sys/socket.h" >&5
 cat > conftest.$ac_ext <<EOF
-#line 4784 "configure"
+#line 4789 "configure"
 #include "confdefs.h"
 #include <sys/socket.h>
 int main() {
 socklen_t x = 5;
 ; return 0; }
 EOF
-if { (eval echo configure:4791: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:4796: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   cat >> confdefs.h <<\EOF
 #define HAVE_SOCKLEN_T 1
@@ -4803,16 +4808,16 @@
 rm -f conftest*
 
 echo $ac_n "checking for tm_gmtoff in struct tm""... $ac_c" 1>&6
-echo "configure:4807: checking for tm_gmtoff in struct tm" >&5
+echo "configure:4812: checking for tm_gmtoff in struct tm" >&5
 cat > conftest.$ac_ext <<EOF
-#line 4809 "configure"
+#line 4814 "configure"
 #include "confdefs.h"
 #include <time.h>
 int main() {
 struct tm tim; tim.tm_gmtoff = 0;
 ; return 0; }
 EOF
-if { (eval echo configure:4816: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:4821: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   cat >> confdefs.h <<\EOF
 #define STRUCT_TM_HAS_GMTOFF 1
@@ -4825,16 +4830,16 @@
   rm -rf conftest*
   echo "$ac_t""no" 1>&6
    echo $ac_n "checking for global timezone variable""... $ac_c" 1>&6
-echo "configure:4829: checking for global timezone variable" >&5
+echo "configure:4834: checking for global timezone variable" >&5
             cat > conftest.$ac_ext <<EOF
-#line 4831 "configure"
+#line 4836 "configure"
 #include "confdefs.h"
 #include <time.h>
 int main() {
 long z2 = timezone;
 ; return 0; }
 EOF
-if { (eval echo configure:4838: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:4843: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   cat >> confdefs.h <<\EOF
 #define HAVE_TIMEZONE 1
@@ -4854,19 +4859,19 @@
 # The Ultrix 4.2 mips builtin alloca declared by alloca.h only works
 # for constant arguments.  Useless!
 echo $ac_n "checking for working alloca.h""... $ac_c" 1>&6
-echo "configure:4858: checking for working alloca.h" >&5
+echo "configure:4863: checking for working alloca.h" >&5
 if eval "test \"`echo '$''{'ac_cv_header_alloca_h'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 4863 "configure"
+#line 4868 "configure"
 #include "confdefs.h"
 #include <alloca.h>
 int main() {
 char *p = alloca(2 * sizeof(int));
 ; return 0; }
 EOF
-if { (eval echo configure:4870: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:4875: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   ac_cv_header_alloca_h=yes
 else
@@ -4887,12 +4892,12 @@
 fi
 
 echo $ac_n "checking for alloca""... $ac_c" 1>&6
-echo "configure:4891: checking for alloca" >&5
+echo "configure:4896: checking for alloca" >&5
 if eval "test \"`echo '$''{'ac_cv_func_alloca_works'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 4896 "configure"
+#line 4901 "configure"
 #include "confdefs.h"
 
 #ifdef __GNUC__
@@ -4920,7 +4925,7 @@
 char *p = (char *) alloca(1);
 ; return 0; }
 EOF
-if { (eval echo configure:4924: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:4929: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   ac_cv_func_alloca_works=yes
 else
@@ -4952,12 +4957,12 @@
 
 
 echo $ac_n "checking whether alloca needs Cray hooks""... $ac_c" 1>&6
-echo "configure:4956: checking whether alloca needs Cray hooks" >&5
+echo "configure:4961: checking whether alloca needs Cray hooks" >&5
 if eval "test \"`echo '$''{'ac_cv_os_cray'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 4961 "configure"
+#line 4966 "configure"
 #include "confdefs.h"
 #if defined(CRAY) && ! defined(CRAY2)
 webecray
@@ -4982,12 +4987,12 @@
 if test $ac_cv_os_cray = yes; then
 for ac_func in _getb67 GETB67 getb67; do
   echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:4986: checking for $ac_func" >&5
+echo "configure:4991: checking for $ac_func" >&5
 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 4991 "configure"
+#line 4996 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func(); below.  */
@@ -5010,7 +5015,7 @@
 
 ; return 0; }
 EOF
-if { (eval echo configure:5014: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:5019: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_func_$ac_func=yes"
 else
@@ -5037,7 +5042,7 @@
 fi
 
 echo $ac_n "checking stack direction for C alloca""... $ac_c" 1>&6
-echo "configure:5041: checking stack direction for C alloca" >&5
+echo "configure:5046: checking stack direction for C alloca" >&5
 if eval "test \"`echo '$''{'ac_cv_c_stack_direction'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -5045,7 +5050,7 @@
   ac_cv_c_stack_direction=0
 else
   cat > conftest.$ac_ext <<EOF
-#line 5049 "configure"
+#line 5054 "configure"
 #include "confdefs.h"
 find_stack_direction ()
 {
@@ -5064,7 +5069,7 @@
   exit (find_stack_direction() < 0);
 }
 EOF
-if { (eval echo configure:5068: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:5073: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
 then
   ac_cv_c_stack_direction=1
 else
@@ -5091,7 +5096,7 @@
 # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:5095: checking for $ac_word" >&5
+echo "configure:5100: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_PERL'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else

-- 
Anthony Green                                               Cygnus Solutions
                                                       Sunnyvale, California

From java-patches-return-367-listarch-java-patches=sourceware.cygnus.com@sourceware.cygnus.com Sun Jan 09 22:59:09 2000
Return-Path: <java-patches-return-367-listarch-java-patches=sourceware.cygnus.com@sourceware.cygnus.com>
Delivered-To: listarch-java-patches@sourceware.cygnus.com
Received: (qmail 24680 invoked by alias); 9 Jan 2000 22:59:08 -0000
Mailing-List: contact java-patches-help@sourceware.cygnus.com; run by ezmlm
Precedence: bulk
List-Subscribe: <mailto:java-patches-subscribe@sourceware.cygnus.com>
List-Archive: <http://sourceware.cygnus.com/ml/java-patches/>
List-Post: <mailto:java-patches@sourceware.cygnus.com>
List-Help: <mailto:java-patches-help@sourceware.cygnus.com>, <http://sourceware.cygnus.com/ml/#faqs>
Sender: java-patches-owner@sourceware.cygnus.com
Delivered-To: mailing list java-patches@sourceware.cygnus.com
Received: (qmail 24633 invoked from network); 9 Jan 2000 22:59:06 -0000
Date: Sun, 9 Jan 2000 14:59:03 -0800
Message-Id: <200001092259.OAA18286@hoser.cygnus.com>
From: Anthony Green <green@cygnus.com>
To: java-patches@sourceware.cygnus.com, gcc-patches@gcc.gnu.org
Subject: java patches for string concatonation
X-Organization: Cygnus Solutions, Sunnyvale, California
X-URL: http://www.cygnus.com/~green


Here are a pair of patches - one for the compiler and one for the
runtime.  Once reviewed they should be committed at the same time.

When gcj sees string concatonation with the "+" operator, and the
first operand (op1) is either a String reference or a string literal,
we emit a call to `new StringBuffer(op1)' and append op2.  If op1 is
null then this constructor should be throwing a NullPointerException,
however, right now it is filling the buffer with "null".

I've appended two patches below.  One is to libgcj's StringBuffer
implementation.  It removes the special case for null arguments so it
will throw a NullPointerException in those cases.

The second is a compiler patch.  It will only call `new
StringBuffer(op1)' if it knows op1 is a constant.  If there's any
chance that it may be null, we have to use `new
StringBuffer().append(op1)'.

Note the old comment in StringBuffer.java:

-      // Note: nowhere does it say that we should handle a null
-      // argument here.  In fact, the JCL implies that we should not.
-      // But this leads to an asymmetry: `null + ""' will fail, while
-      // `"" + null' will work.

The compiler change corrects this problem.  The behaviour is
symmetrical now, and the bytecode output is identical to jikes'.
Sun's javac does something slightly different, but exhibits the same
behaviour.


2000-01-09  Anthony Green  <green@cygnus.com>

	    * java/lang/StringBuffer.java (StringBuffer): Don't special case
	    null argument.

Index: libjava/java/lang/StringBuffer.java
===================================================================
RCS file: /cvs/java/libgcj/libjava/java/lang/StringBuffer.java,v
retrieving revision 1.2
diff -u -r1.2 StringBuffer.java
--- StringBuffer.java	1999/04/30 09:30:53	1.2
+++ StringBuffer.java	2000/01/09 22:27:32
@@ -241,12 +241,9 @@
 
   public StringBuffer (String str)
     {
-      // Note: nowhere does it say that we should handle a null
-      // argument here.  In fact, the JCL implies that we should not.
-      // But this leads to an asymmetry: `null + ""' will fail, while
-      // `"" + null' will work.
-      if (str == null)
-      str = "null";
+      // The documentation is not clear, but experimentation with
+      // other implementations indicates that StringBuffer(null)
+      // should throw a NullPointerException.
       count = str.length();
       // JLS: The initial capacity of the string buffer is 16 plus the
       // length of the argument string.



2000-01-09  Anthony Green  <green@cygnus.com>

	    * parse.y (build_string_concatenation): Only use
	    StringBuffer(String) shortcut if String arg is constant.

Index: gcc/java/parse.y
===================================================================
RCS file: /cvs/gcc/egcs/gcc/java/parse.y,v
retrieving revision 1.128
diff -u -r1.128 parse.y
--- parse.y	2000/01/07 20:28:11	1.128
+++ parse.y	2000/01/09 22:33:04
@@ -10222,9 +10222,9 @@
   if (!IS_CRAFTED_STRING_BUFFER_P (op1))
     {
       /* Two solutions here: 
-       1) OP1 is a string reference, we call new StringBuffer(OP1)
+	 1) OP1 is a constant string reference, we call new StringBuffer(OP1)
	  2) OP1 is something else, we call new StringBuffer().append(OP1). */
-      if (JSTRING_TYPE_P (TREE_TYPE (op1)))
+      if (TREE_CONSTANT (op1) && JSTRING_TYPE_P (TREE_TYPE (op1)))
       op1 = BUILD_STRING_BUFFER (op1);
       else
       {

-- 
Anthony Green                                               Cygnus Solutions
                                                       Sunnyvale, California

From java-patches-return-368-listarch-java-patches=sourceware.cygnus.com@sourceware.cygnus.com Mon Jan 10 01:13:25 2000
Return-Path: <java-patches-return-368-listarch-java-patches=sourceware.cygnus.com@sourceware.cygnus.com>
Delivered-To: listarch-java-patches@sourceware.cygnus.com
Received: (qmail 3679 invoked by alias); 10 Jan 2000 01:13:24 -0000
Mailing-List: contact java-patches-help@sourceware.cygnus.com; run by ezmlm
Precedence: bulk
List-Subscribe: <mailto:java-patches-subscribe@sourceware.cygnus.com>
List-Archive: <http://sourceware.cygnus.com/ml/java-patches/>
List-Post: <mailto:java-patches@sourceware.cygnus.com>
List-Help: <mailto:java-patches-help@sourceware.cygnus.com>, <http://sourceware.cygnus.com/ml/#faqs>
Sender: java-patches-owner@sourceware.cygnus.com
Delivered-To: mailing list java-patches@sourceware.cygnus.com
Received: (qmail 3628 invoked from network); 10 Jan 2000 01:13:23 -0000
Date: Sun, 9 Jan 2000 17:13:20 -0800 (PST)
Message-Id: <200001100113.RAA03328@ferrule.cygnus.com>
From: Tom Tromey <tromey@cygnus.com>
To: Anthony Green <green@cygnus.com>
Cc: java-patches@sourceware.cygnus.com, gcc-patches@gcc.gnu.org
Subject: Re: java patches for string concatonation
In-Reply-To: <200001092259.OAA18286@hoser.cygnus.com>
References: <200001092259.OAA18286@hoser.cygnus.com>
X-Zippy:  Well, I'm a classic ANAL RETENTIVE!!  And I'm looking for a way to
 VICARIOUSLY experience some reason to LIVE!!
X-Attribution:  Tom

Anthony> When gcj sees string concatonation with the "+" operator, and
Anthony> the first operand (op1) is either a String reference or a
Anthony> string literal, we emit a call to `new StringBuffer(op1)' and
Anthony> append op2.  If op1 is null then this constructor should be
Anthony> throwing a NullPointerException, however, right now it is
Anthony> filling the buffer with "null".

The libgcj side is fine provided that the compiler side goes in too.

Eventually I think we should stop using StringBuffer to implement
string concatenation, and instead use something faster.  For example,
we could use a StringBuffer-like class (that would also be used by the
StringBuffer implementation) which does not have any synchronization.

We could even allocate the buffer on the stack in some siuations, or
perhaps partially allocate it on the stack (and revert to the heap on
overflow).

Tom

From java-patches-return-369-listarch-java-patches=sourceware.cygnus.com@sourceware.cygnus.com Mon Jan 10 02:12:36 2000
Return-Path: <java-patches-return-369-listarch-java-patches=sourceware.cygnus.com@sourceware.cygnus.com>
Delivered-To: listarch-java-patches@sourceware.cygnus.com
Received: (qmail 11046 invoked by alias); 10 Jan 2000 02:12:35 -0000
Mailing-List: contact java-patches-help@sourceware.cygnus.com; run by ezmlm
Precedence: bulk
List-Subscribe: <mailto:java-patches-subscribe@sourceware.cygnus.com>
List-Archive: <http://sourceware.cygnus.com/ml/java-patches/>
List-Post: <mailto:java-patches@sourceware.cygnus.com>
List-Help: <mailto:java-patches-help@sourceware.cygnus.com>, <http://sourceware.cygnus.com/ml/#faqs>
Sender: java-patches-owner@sourceware.cygnus.com
Delivered-To: mailing list java-patches@sourceware.cygnus.com
Received: (qmail 11027 invoked from network); 10 Jan 2000 02:12:35 -0000
Message-ID: <387940FE.570FF7A7@sigma6.com>
Date: Sun, 09 Jan 2000 21:16:30 -0500
From: Jeff Sturm <jsturm@sigma6.com>
Organization: sigma6
X-Mailer: Mozilla 4.04 [en] (WinNT; I)
MIME-Version: 1.0
To: Tom Tromey <tromey@cygnus.com>
CC: java-patches@sourceware.cygnus.com
Subject: Re: java patches for string concatonation
References: <200001092259.OAA18286@hoser.cygnus.com> <200001100113.RAA03328@ferrule.cygnus.com>
Content-Type: text/plain; charset=us-ascii
Content-Transfer-Encoding: 7bit

Tom Tromey wrote:
> Eventually I think we should stop using StringBuffer to implement
> string concatenation, and instead use something faster.  For example,
> we could use a StringBuffer-like class (that would also be used by the
> StringBuffer implementation) which does not have any synchronization.

For native compilation, I agree.  However, using anything but
StringBuffer would jeopardize compatibility in the bytecode compiler. 
So if this optimization is done at the tree level it may have to be
switched off for bytecode generation.

Another possible way to improve string concatenation is to have the
compiler guess at the eventual buffer size, or a reasonable upper bound,
rather than allocating 16 bytes by default.

> We could even allocate the buffer on the stack in some siuations, or
> perhaps partially allocate it on the stack (and revert to the heap on
> overflow).

Stack allocation is an interesting idea but perhaps not so useful for
string concatenation... in many cases the stack buffer would have to be
copied to permanent heap storage when constructing the String object.

--
Jeff Sturm
jsturm@sigma6.com

From java-patches-return-370-listarch-java-patches=sourceware.cygnus.com@sourceware.cygnus.com Mon Jan 10 16:40:04 2000
Return-Path: <java-patches-return-370-listarch-java-patches=sourceware.cygnus.com@sourceware.cygnus.com>
Delivered-To: listarch-java-patches@sourceware.cygnus.com
Received: (qmail 20038 invoked by alias); 10 Jan 2000 16:40:03 -0000
Mailing-List: contact java-patches-help@sourceware.cygnus.com; run by ezmlm
Precedence: bulk
List-Subscribe: <mailto:java-patches-subscribe@sourceware.cygnus.com>
List-Archive: <http://sourceware.cygnus.com/ml/java-patches/>
List-Post: <mailto:java-patches@sourceware.cygnus.com>
List-Help: <mailto:java-patches-help@sourceware.cygnus.com>, <http://sourceware.cygnus.com/ml/#faqs>
Sender: java-patches-owner@sourceware.cygnus.com
Delivered-To: mailing list java-patches@sourceware.cygnus.com
Received: (qmail 19986 invoked from network); 10 Jan 2000 16:40:02 -0000
From: Alexandre Petit-Bianco <apbianco@cygnus.com>
MIME-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Content-Transfer-Encoding: 7bit
Message-ID: <14458.2912.86739.757934@deliverance.cygnus.com>
Date: Mon, 10 Jan 2000 08:40:00 -0800 (PST)
To: Anthony Green <green@cygnus.com>
Cc: java-patches@sourceware.cygnus.com, gcc-patches@gcc.gnu.org
Subject: Re: java patches for string concatonation
In-Reply-To: <200001092259.OAA18286@hoser.cygnus.com>
References: <200001092259.OAA18286@hoser.cygnus.com>
X-Mailer: VM 6.62 under Emacs 19.34.1
X-Organization: Cygnus Solutions, Sunnyvale CA, USA.
X-URL: http://www.serialhacker.org


Anthony Green writes:

> Index: gcc/java/parse.y
> ===================================================================
> RCS file: /cvs/gcc/egcs/gcc/java/parse.y,v
> retrieving revision 1.128
> diff -u -r1.128 parse.y

OK to go. Thanks Anthony.

./A

From java-patches-return-371-listarch-java-patches=sourceware.cygnus.com@sourceware.cygnus.com Mon Jan 10 19:49:26 2000
Return-Path: <java-patches-return-371-listarch-java-patches=sourceware.cygnus.com@sourceware.cygnus.com>
Delivered-To: listarch-java-patches@sourceware.cygnus.com
Received: (qmail 26136 invoked by alias); 10 Jan 2000 19:49:26 -0000
Mailing-List: contact java-patches-help@sourceware.cygnus.com; run by ezmlm
Precedence: bulk
List-Subscribe: <mailto:java-patches-subscribe@sourceware.cygnus.com>
List-Archive: <http://sourceware.cygnus.com/ml/java-patches/>
List-Post: <mailto:java-patches@sourceware.cygnus.com>
List-Help: <mailto:java-patches-help@sourceware.cygnus.com>, <http://sourceware.cygnus.com/ml/#faqs>
Sender: java-patches-owner@sourceware.cygnus.com
Delivered-To: mailing list java-patches@sourceware.cygnus.com
Received: (qmail 26110 invoked from network); 10 Jan 2000 19:49:19 -0000
To: Java Patch List <java-patches@sourceware.cygnus.com> 
Subject: Patch: portability fixes from Jeff Sturm
X-Zippy:  I'm thinking about DIGITAL READ-OUT systems and
 computer-generated IMAGE FORMATIONS..
X-Attribution:  Tom
Bcc:
Reply-To:  tromey@cygnus.com
From:  Tom Tromey <tromey@cygnus.com>
Date: 10 Jan 2000 12:52:45 -0700
Message-ID: <874scl901e.fsf@cygnus.com>
Lines: 126
X-Mailer: Gnus v5.5/Emacs 20.3

I'm checking in the appended patch, which fixes some HP build
problems.

2000-01-10  Jeff Sturm  <jsturm@sigma6.com>

	* java/lang/natMath.cc (pow): Cast args to `double', not
	`jdouble'.
	(atan2): Likewise.
	(IEEEremainder): Likewise.
	* java/lang/mprec.h: Don't wrap includes in `extern "C"'.
	* java/lang/fdlibm.h: Don't wrap includes in `extern "C"'.

Tom

Index: java/lang/fdlibm.h
===================================================================
RCS file: /cvs/java/libgcj/libjava/java/lang/fdlibm.h,v
retrieving revision 1.2
diff -u -r1.2 fdlibm.h
--- fdlibm.h	1999/06/24 20:41:47	1.2
+++ fdlibm.h	2000/01/10 19:44:27
@@ -2,7 +2,7 @@
 /* @(#)fdlibm.h 5.1 93/09/24 */
 /*
  * ====================================================
- * Copyright (C) 1993 by Sun Microsystems, Inc. All rights reserved.
+ * Copyright (C) 1993, 2000 by Sun Microsystems, Inc. All rights reserved.
  *
  * Developed at SunPro, a Sun Microsystems, Inc. business.
  * Permission to use, copy, modify, and distribute this
@@ -12,10 +12,6 @@
  */
 
 
-#ifdef __cplusplus
-extern "C" {
-#endif
-
 #include <config.h>
 #include <stdlib.h>
 
@@ -47,6 +43,10 @@
 /* These typedefs are true for the targets running Java. */
 
 #define _IEEE_LIBM
+
+#ifdef __cplusplus
+extern "C" {
+#endif
 
 /*
  * ANSI/POSIX
Index: java/lang/mprec.h
===================================================================
RCS file: /cvs/java/libgcj/libjava/java/lang/mprec.h,v
retrieving revision 1.3
diff -u -r1.3 mprec.h
--- mprec.h	1999/07/12 09:40:07	1.3
+++ mprec.h	2000/01/10 19:44:32
@@ -2,7 +2,7 @@
  *
  * The author of this software is David M. Gay.
  *
- * Copyright (c) 1991 by AT&T.
+ * Copyright (c) 1991, 2000 by AT&T.
  *
  * Permission to use, copy, modify, and distribute this software for any
  * purpose without fee is hereby granted, provided that this entire notice
@@ -26,10 +26,6 @@
 	dmg@research.att.com or research!dmg
  */
 
-#ifdef __cplusplus
-extern "C" {
-#endif
-
 #include <config.h>
 #include "ieeefp.h"
 
@@ -51,6 +47,9 @@
 #include <sys/config.h>
 #endif
 
+#ifdef __cplusplus
+extern "C" {
+#endif
 
 /* ISO C9X int type declarations */
 
Index: java/lang/natMath.cc
===================================================================
RCS file: /cvs/java/libgcj/libjava/java/lang/natMath.cc,v
retrieving revision 1.2
diff -u -r1.2 natMath.cc
--- natMath.cc	1999/09/10 22:03:08	1.2
+++ natMath.cc	2000/01/10 19:44:32
@@ -1,4 +1,4 @@
-/* Copyright (C) 1998, 1999  Cygnus Solutions
+/* Copyright (C) 1998, 1999, 2000  Cygnus Solutions
 
    This file is part of libgcj.
 
@@ -59,7 +59,7 @@
 
 jdouble java::lang::Math::atan2(jdouble y, jdouble x)
 {
-  return (jdouble)::atan2((jdouble)y, (jdouble)x);
+  return (jdouble)::atan2((double)y, (double)x);
 }  
 
 jdouble java::lang::Math::log(jdouble x)
@@ -79,12 +79,12 @@
 
 jdouble java::lang::Math::pow(jdouble y, jdouble x)
 {
-  return (jdouble)::pow((jdouble)y, (jdouble)x);
+  return (jdouble)::pow((double)y, (double)x);
 }  
 
 jdouble java::lang::Math::IEEEremainder(jdouble y, jdouble x)
 {
-  return (jdouble)::__ieee754_remainder((jdouble)y, (jdouble)x);
+  return (jdouble)::__ieee754_remainder((double)y, (double)x);
 }  
 
 jdouble java::lang::Math::abs(jdouble x)

From java-patches-return-372-listarch-java-patches=sourceware.cygnus.com@sourceware.cygnus.com Tue Jan 11 18:58:37 2000
Return-Path: <java-patches-return-372-listarch-java-patches=sourceware.cygnus.com@sourceware.cygnus.com>
Delivered-To: listarch-java-patches@sourceware.cygnus.com
Received: (qmail 9488 invoked by alias); 11 Jan 2000 18:58:36 -0000
Mailing-List: contact java-patches-help@sourceware.cygnus.com; run by ezmlm
Precedence: bulk
List-Subscribe: <mailto:java-patches-subscribe@sourceware.cygnus.com>
List-Archive: <http://sourceware.cygnus.com/ml/java-patches/>
List-Post: <mailto:java-patches@sourceware.cygnus.com>
List-Help: <mailto:java-patches-help@sourceware.cygnus.com>, <http://sourceware.cygnus.com/ml/#faqs>
Sender: java-patches-owner@sourceware.cygnus.com
Delivered-To: mailing list java-patches@sourceware.cygnus.com
Received: (qmail 9350 invoked from network); 11 Jan 2000 18:58:24 -0000
To: Java Patch List <java-patches@sourceware.cygnus.com> 
Subject: Patch: new test
X-Zippy:  Do you have exactly what I want in a plaid poindexter bar bat??
X-Attribution:  Tom
Bcc:
Reply-To:  tromey@cygnus.com
From:  Tom Tromey <tromey@cygnus.com>
Date: 11 Jan 2000 12:02:35 -0700
Message-ID: <87wvpg77p0.fsf@cygnus.com>
Lines: 35
X-Mailer: Gnus v5.5/Emacs 20.3

I'm committing this patch, which adds a new regression test.
This test program currently segvs on my machine.

2000-01-11  Tom Tromey  <tromey@cygnus.com>

	* libjava.lang/klass.out: New file.
	* libjava.lang/klass.java: New file.

Tom

Index: libjava.lang/klass.java
===================================================================
RCS file: klass.java
diff -N klass.java
--- /dev/null	Tue May  5 13:32:27 1998
+++ klass.java	Tue Jan 11 10:55:49 2000
@@ -0,0 +1,10 @@
+public class klass
+{
+  public static void main (String[] args)
+  {
+    Class ic1 = Integer.TYPE;
+    int[] foo = new int[3];
+    Class ic2 = foo.getClass().getComponentType();
+    System.out.println(ic1.equals(ic2));
+  }
+}
Index: libjava.lang/klass.out
===================================================================
RCS file: klass.out
diff -N klass.out
--- /dev/null	Tue May  5 13:32:27 1998
+++ klass.out	Tue Jan 11 10:55:49 2000
@@ -0,0 +1 @@
+true

From java-patches-return-373-listarch-java-patches=sourceware.cygnus.com@sourceware.cygnus.com Wed Jan 12 21:13:13 2000
Return-Path: <java-patches-return-373-listarch-java-patches=sourceware.cygnus.com@sourceware.cygnus.com>
Delivered-To: listarch-java-patches@sourceware.cygnus.com
Received: (qmail 23594 invoked by alias); 12 Jan 2000 21:13:13 -0000
Mailing-List: contact java-patches-help@sourceware.cygnus.com; run by ezmlm
Precedence: bulk
List-Subscribe: <mailto:java-patches-subscribe@sourceware.cygnus.com>
List-Archive: <http://sourceware.cygnus.com/ml/java-patches/>
List-Post: <mailto:java-patches@sourceware.cygnus.com>
List-Help: <mailto:java-patches-help@sourceware.cygnus.com>, <http://sourceware.cygnus.com/ml/#faqs>
Sender: java-patches-owner@sourceware.cygnus.com
Delivered-To: mailing list java-patches@sourceware.cygnus.com
Received: (qmail 23575 invoked from network); 12 Jan 2000 21:13:07 -0000
To: Java Patch List <java-patches@sourceware.cygnus.com> 
Cc: Kresten Krab Thorup <krab@gnu.org> 
Subject: _Jv_FindClass
X-Zippy:  I'm not available for comment..
X-Attribution:  Tom
Bcc:
Reply-To:  tromey@cygnus.com
From:  Tom Tromey <tromey@cygnus.com>
Date: 12 Jan 2000 14:17:51 -0700
Message-ID: <87g0w36lc0.fsf@cygnus.com>
Lines: 14
X-Mailer: Gnus v5.5/Emacs 20.3

In _Jv_FindClass I see this:

	  // if "loader" delegateted the loadClass operation
	  // to another loader, register explicitly
	  // that he is also an initiating loader of the
	  // given class.  	  

	  if (klass && (klass->getClassLoader () != loader))
	    _Jv_RegisterInitiatingLoader (klass, 0);

Shouldn't the second argument to _Jv_RegisterInitiatingLoader be
`loader'?

Tom

From java-patches-return-374-listarch-java-patches=sourceware.cygnus.com@sourceware.cygnus.com Thu Jan 13 12:27:00 2000
Return-Path: <java-patches-return-374-listarch-java-patches=sourceware.cygnus.com@sourceware.cygnus.com>
Delivered-To: listarch-java-patches@sourceware.cygnus.com
Received: (qmail 28218 invoked by alias); 13 Jan 2000 12:26:59 -0000
Mailing-List: contact java-patches-help@sourceware.cygnus.com; run by ezmlm
Precedence: bulk
List-Subscribe: <mailto:java-patches-subscribe@sourceware.cygnus.com>
List-Archive: <http://sourceware.cygnus.com/ml/java-patches/>
List-Post: <mailto:java-patches@sourceware.cygnus.com>
List-Help: <mailto:java-patches-help@sourceware.cygnus.com>, <http://sourceware.cygnus.com/ml/#faqs>
Sender: java-patches-owner@sourceware.cygnus.com
Delivered-To: mailing list java-patches@sourceware.cygnus.com
Received: (qmail 28197 invoked from network); 13 Jan 2000 12:26:57 -0000
To: tromey@cygnus.com
Cc: Java Patch List <java-patches@sourceware.cygnus.com>
Subject: Re: _Jv_FindClass
References: <87g0w36lc0.fsf@cygnus.com>
From: Kresten Krab Thorup <krab@daimi.au.dk>
Date: 13 Jan 2000 13:26:49 +0100
In-Reply-To: Tom Tromey's message of "12 Jan 2000 14:17:51 -0700"
Message-ID: <xz64sciqhrq.fsf@xenon.daimi.au.dk>
Lines: 42
X-Mailer: Gnus v5.7/Emacs 20.5
Mime-Version: 1.0
Content-Type: text/plain; charset=US-ASCII
Content-Transfer-Encoding: 7bit

Tom Tromey <tromey@cygnus.com> writes:

> In _Jv_FindClass I see this:
> 
> 	  // if "loader" delegateted the loadClass operation
> 	  // to another loader, register explicitly
> 	  // that he is also an initiating loader of the
> 	  // given class.  	  
> 
> 	  if (klass && (klass->getClassLoader () != loader))
> 	    _Jv_RegisterInitiatingLoader (klass, 0);
> 
> Shouldn't the second argument to _Jv_RegisterInitiatingLoader be
> `loader'?

It seems like you're right.

I don't remember the details, but here are some comments off the top
of my head.

Loader `NULL' represents the bootstrap loader, i.e. the non-existent
loader for the classes linked into the application.

Every class has a number of initiating loaders, and one of these is
the loader that actually did the loading (the defining loader).
Often, a class loader will delegate to the boot loader (in case of all
the linked-in classes), and thus the original loader needs to also be
registered.

The result of getClassLoader() is the defining loader.

The defining loader is implicitly an initiating loader, so it is not
explicitly registered in the table for initiating loaders in the GCJ
runtime. 


-- Kresten

 Kresten Krab Thorup           "I like my eggs ploded"
 Department of Computer Science, University of Aarhus
 Aabogade 34, DK-8200 Aarhus N, Denmark
 +45 8942 5665 (office), +45 2343 4626 (mobile)

From java-patches-return-375-listarch-java-patches=sourceware.cygnus.com@sourceware.cygnus.com Thu Jan 13 18:13:06 2000
Return-Path: <java-patches-return-375-listarch-java-patches=sourceware.cygnus.com@sourceware.cygnus.com>
Delivered-To: listarch-java-patches@sourceware.cygnus.com
Received: (qmail 1448 invoked by alias); 13 Jan 2000 18:13:06 -0000
Mailing-List: contact java-patches-help@sourceware.cygnus.com; run by ezmlm
Precedence: bulk
List-Subscribe: <mailto:java-patches-subscribe@sourceware.cygnus.com>
List-Archive: <http://sourceware.cygnus.com/ml/java-patches/>
List-Post: <mailto:java-patches@sourceware.cygnus.com>
List-Help: <mailto:java-patches-help@sourceware.cygnus.com>, <http://sourceware.cygnus.com/ml/#faqs>
Sender: java-patches-owner@sourceware.cygnus.com
Delivered-To: mailing list java-patches@sourceware.cygnus.com
Received: (qmail 1413 invoked from network); 13 Jan 2000 18:12:57 -0000
To: Java Patch List <java-patches@sourceware.cygnus.com> 
Subject: Patch: classloader fix
X-Zippy:  If elected, Zippy pledges to each and every American
 a 55-year-old houseboy...
X-Attribution:  Tom
Bcc:
Reply-To:  tromey@cygnus.com
From:  Tom Tromey <tromey@cygnus.com>
Date: 13 Jan 2000 11:12:08 -0700
Message-ID: <8766wx7sef.fsf@cygnus.com>
Lines: 55
X-Mailer: Gnus v5.5/Emacs 20.3

This patch fixes the ClassLoader buglet I found yesterday.  The bug is
that we erroneously register the system class loader, and not the
actual initiating class loader, as one of class' initiating class
loaders.  I'm checking it in.

2000-01-13  Tom Tromey  <tromey@cygnus.com>

	* java/lang/natClassLoader.cc (_Jv_FindClass): Register `loader',
	not system loader, as initiating loader.


Tom

Index: java/lang/natClassLoader.cc
===================================================================
RCS file: /cvs/java/libgcj/libjava/java/lang/natClassLoader.cc,v
retrieving revision 1.12
diff -u -r1.12 natClassLoader.cc
--- natClassLoader.cc	1999/10/22 19:43:41	1.12
+++ natClassLoader.cc	2000/01/13 18:09:36
@@ -1,6 +1,6 @@
 // natClassLoader.cc - Implementation of java.lang.ClassLoader native methods.
 
-/* Copyright (C) 1999  Cygnus Solutions
+/* Copyright (C) 1999, 2000  Cygnus Solutions
 
    This file is part of libgcj.
 
@@ -437,13 +437,11 @@
 	  // Load using a user-defined loader, jvmspec 5.3.2
 	  klass = loader->loadClass(sname, false);
 
-	  // if "loader" delegateted the loadClass operation
-	  // to another loader, register explicitly
-	  // that he is also an initiating loader of the
-	  // given class.  	  
-
+	  // If "loader" delegated the loadClass operation to another
+	  // loader, explicitly register that it is also an initiating
+	  // loader of the given class.
 	  if (klass && (klass->getClassLoader () != loader))
-	    _Jv_RegisterInitiatingLoader (klass, 0);
+	    _Jv_RegisterInitiatingLoader (klass, loader);
 	}
       else 
 	{
@@ -454,7 +452,7 @@
 	      sys = java::lang::ClassLoader::getSystemClassLoader ();
 	    }
 
-	  // Load using the bootstrap loader jmspec 5.3.1.
+	  // Load using the bootstrap loader jvmspec 5.3.1.
 	  klass = sys->loadClass (sname, false); 
 
 	  // Register that we're an initiating loader.

From java-patches-return-376-listarch-java-patches=sourceware.cygnus.com@sourceware.cygnus.com Thu Jan 13 21:08:26 2000
Return-Path: <java-patches-return-376-listarch-java-patches=sourceware.cygnus.com@sourceware.cygnus.com>
Delivered-To: listarch-java-patches@sourceware.cygnus.com
Received: (qmail 2996 invoked by alias); 13 Jan 2000 21:08:26 -0000
Mailing-List: contact java-patches-help@sourceware.cygnus.com; run by ezmlm
Precedence: bulk
List-Subscribe: <mailto:java-patches-subscribe@sourceware.cygnus.com>
List-Archive: <http://sourceware.cygnus.com/ml/java-patches/>
List-Post: <mailto:java-patches@sourceware.cygnus.com>
List-Help: <mailto:java-patches-help@sourceware.cygnus.com>, <http://sourceware.cygnus.com/ml/#faqs>
Sender: java-patches-owner@sourceware.cygnus.com
Delivered-To: mailing list java-patches@sourceware.cygnus.com
Received: (qmail 2958 invoked from network); 13 Jan 2000 21:08:24 -0000
Date: Thu, 13 Jan 2000 17:07:59 -0500
From: gchambers@linuxbox
Message-Id: <200001132207.RAA17346@linuxbox.provsol.com>
To: java-patches@sourceware.cygnus.com
Subject: -fno-rtti documentation patch
Cc: gchambers@provsol.com

Here's a patch to update the FAQ to mention -fno-rtti for CNI C++ source.

Index: ChangeLog
===================================================================
RCS file: /cvs/java/htdocs/ChangeLog,v
retrieving revision 1.16
diff -h -r1.16 ChangeLog
0a1,4
> 2000-01-06  Glenn Chambers <gchambers@provsol.com>
> 	* faq.html: Add text about -fno-rtti.
> 	Fix bogus close-tag left behind in my last edit.
> 
Index: faq.html
===================================================================
RCS file: /cvs/java/htdocs/faq.html,v
retrieving revision 1.9
diff -h -r1.9 faq.html
87a88
>             <li><a href="#4_6">I'm getting link errors!</a> 
556a558,571
>       <dl>
>         <dt>&nbsp; </dt>
>       </dl>
>       <dl>
>         <dt>
>           <h3><a name="4_6">4.6 I'm getting link errors</a></h3>
>         </dt>
>         <blockquote>
>         <p>If you get errors at link time that refer to
>           'undefined reference to `java::lang::Object type_info function',
>           verify that you have compiled any CNI C++ files with the
>           -fno_rtti option.
>         </blockquote>
>       </dl>
683c698
<         <p>Glenn Chambers</a> has created a couple 
---
>         <p>Glenn Chambers has created a couple 
686a702,705
>         </p>
>         <p>
>         Note that you must compile the C++ files used for CNI with the
>         -fno-rtti option.

From java-patches-return-377-listarch-java-patches=sourceware.cygnus.com@sourceware.cygnus.com Sat Jan 15 16:11:53 2000
Return-Path: <java-patches-return-377-listarch-java-patches=sourceware.cygnus.com@sourceware.cygnus.com>
Delivered-To: listarch-java-patches@sourceware.cygnus.com
Received: (qmail 23422 invoked by alias); 15 Jan 2000 16:11:53 -0000
Mailing-List: contact java-patches-help@sourceware.cygnus.com; run by ezmlm
Precedence: bulk
List-Subscribe: <mailto:java-patches-subscribe@sourceware.cygnus.com>
List-Archive: <http://sourceware.cygnus.com/ml/java-patches/>
List-Post: <mailto:java-patches@sourceware.cygnus.com>
List-Help: <mailto:java-patches-help@sourceware.cygnus.com>, <http://sourceware.cygnus.com/ml/#faqs>
Sender: java-patches-owner@sourceware.cygnus.com
Delivered-To: mailing list java-patches@sourceware.cygnus.com
Received: (qmail 23403 invoked from network); 15 Jan 2000 16:11:51 -0000
X-Authentication-Warning: cc42593-a.taylor1.mi.home.com: jsturm owned process doing -bs
Date: Sat, 15 Jan 2000 11:03:23 -0500 (EST)
From: Jeff Sturm <jsturm@sigma6.com>
X-Sender: jsturm@cc42593-a.taylor1.mi.home.com
To: java-patches@sourceware.cygnus.com
Subject: Patches for java.io.StreamTokenizer
In-Reply-To: <387FAF38.7A990182@sigma6.com>
Message-ID: <Pine.LNX.4.10.10001151044590.1063-100000@cc42593-a.taylor1.mi.home.com>
MIME-Version: 1.0
Content-Type: TEXT/PLAIN; charset=US-ASCII

The patch below prevents an infinite loop in StreamTokenizer.  (Attempting
to unread(-1) on a PushbackReader causes the next read to return 65535.  I
thought this was a bug in PushbackReader, but other implementations seem
to do the same thing.  I guess the consequence of unread(-1) is simply
undefined.)

There are other problems in StreamTokenizer that probably can't be fixed
by a small patch.  For example, "-." is incorrectly read as a number,
causing NumberFormatException.  IMHO the body of nextToken() needs to be
reimplemented as a FSM.  Would it be worthwhile to rewrite this class, or
can we consider getting it from the Classpath project instead?


2000-01-15  Jeff Sturm	<jsturm@sigma6.com>

	* java/io/StreamTokenizer.java (nextToken): Avoid unread(TT_EOF).

Index: StreamTokenizer.java
===================================================================
RCS file: /cvs/java/libgcj/libjava/java/io/StreamTokenizer.java,v
retrieving revision 1.1.1.1
diff -u -r1.1.1.1 StreamTokenizer.java
--- StreamTokenizer.java	1999/04/07 14:52:36	1.1.1.1
+++ StreamTokenizer.java	2000/01/15 15:38:03
@@ -179,7 +179,7 @@
 
 	  // Throw away \n if in combination with \r.
 	  if (ch == '\r' && (ch = in.read()) != '\n')
-	    in.unread(ch);
+	    if (ch != TT_EOF) in.unread(ch);
 	  if (eolSignificant)
 	    return (ttype = TT_EOL);
 	}
@@ -192,7 +192,7 @@
 	  {
 	    // Read ahead to see if this is an ordinary '-' rather than numeric.
 	    ch = in.read();
-	    in.unread(ch);
+	    if (ch != TT_EOF) in.unread(ch);
 	    if (isNumeric(ch) && ch != '-')
 	      ch = '-';
 	    else
@@ -209,7 +209,7 @@
 	  else
 	    tokbuf.append((char) ch);
 
-	in.unread(ch);
+	if (ch != TT_EOF) in.unread(ch);
 	ttype = TT_NUMBER;
 	nval = Double.valueOf(tokbuf.toString()).doubleValue();
       }
@@ -219,7 +219,7 @@
 	tokbuf.append((char) ch);
 	while (isAlphabetic(ch = in.read()) || isNumeric(ch))
 	  tokbuf.append((char) ch);
-	in.unread(ch);
+	if (ch != TT_EOF) in.unread(ch);
 	ttype = TT_WORD;
 	sval = tokbuf.toString();
 	if (lowerCase)
@@ -229,7 +229,7 @@
       {
 	while ((ch = in.read()) != '\n' && ch != '\r' && ch != TT_EOF)
 	  ;
-	in.unread(ch);
+	if (ch != TT_EOF) in.unread(ch);
 	return nextToken();	// Recursive, but not too deep in normal cases.
       }
     else if (isQuote(ch))
@@ -277,7 +277,7 @@
 			  }
 		      }
 
-		    in.unread(nextch);
+		    if (nextch != TT_EOF) in.unread(nextch);
 		}
 
 	    tokbuf.append((char) ch);
@@ -285,7 +285,7 @@
 
 	// Throw away matching quote char.
 	if (ch != ttype)
-	  in.unread(ch);
+	  if (ch != TT_EOF) in.unread(ch);
 
 	sval = tokbuf.toString();
       }
@@ -296,7 +296,7 @@
 	    {
 	      while ((ch = in.read()) != '\n' && ch != '\r' && ch != TT_EOF)
 		;
-	      in.unread(ch);
+	      if (ch != TT_EOF) in.unread(ch);
 	      return nextToken(); // Recursive, but not too deep in normal cases
 	    }
 	  else if (ch == '*' && slashStar) 
@@ -308,16 +308,15 @@
 		    if ((ch = in.read()) == '/')
 		      break;
 		    else
-		      in.unread(ch);
+		      if (ch != TT_EOF) in.unread(ch);
 		  else if (ch == '\n' || ch == '\r')
 		    {
 		      lineNumber++;
 		      if (ch == '\r' && (ch = in.read()) != '\n')
-			in.unread(ch);
+		        if (ch != TT_EOF) in.unread(ch);
 		    }
 		  else if (ch == TT_EOF)
 		    {
-		      in.unread(ch);
 		      break;
 		    }
 		}
@@ -325,7 +324,7 @@
 	    }
 	  else
 	    {
-	      in.unread(ch);
+	      if (ch != TT_EOF) in.unread(ch);
 	      ch = '/';
 	    }
 
--
Jeff Sturm
jsturm@sigma6.com


From java-patches-return-378-listarch-java-patches=sourceware.cygnus.com@sourceware.cygnus.com Sun Jan 16 02:10:39 2000
Return-Path: <java-patches-return-378-listarch-java-patches=sourceware.cygnus.com@sourceware.cygnus.com>
Delivered-To: listarch-java-patches@sourceware.cygnus.com
Received: (qmail 8722 invoked by alias); 16 Jan 2000 02:10:39 -0000
Mailing-List: contact java-patches-help@sourceware.cygnus.com; run by ezmlm
Precedence: bulk
List-Subscribe: <mailto:java-patches-subscribe@sourceware.cygnus.com>
List-Archive: <http://sourceware.cygnus.com/ml/java-patches/>
List-Post: <mailto:java-patches@sourceware.cygnus.com>
List-Help: <mailto:java-patches-help@sourceware.cygnus.com>, <http://sourceware.cygnus.com/ml/#faqs>
Sender: java-patches-owner@sourceware.cygnus.com
Delivered-To: mailing list java-patches@sourceware.cygnus.com
Received: (qmail 8691 invoked from network); 16 Jan 2000 02:10:37 -0000
Date: Sat, 15 Jan 2000 18:10:35 -0800 (PST)
Message-Id: <200001160210.SAA05948@ferrule.cygnus.com>
From: Tom Tromey <tromey@cygnus.com>
To: java-patches@sourceware.cygnus.com, gchambers@provsol.com
Subject: Re: -fno-rtti documentation patch
In-Reply-To: <200001132207.RAA17346@linuxbox.provsol.com>
References: <200001132207.RAA17346@linuxbox.provsol.com>
X-Zippy:  Can I have an IMPULSE ITEM instead?
X-Attribution:  Tom

>>>>> "Glenn" == gchambers  <gchambers@linuxbox> writes:

Glenn> Here's a patch to update the FAQ to mention -fno-rtti for CNI
Glenn> C++ source.

I checked this in.

Two minor nits:

1. Please make context (-c) or uni- (-u) diffs.
   These are much easier to read

2. You need a blank line between the ChangeLog header and the body of
   the entry.

Thanks a lot!

Tom

From java-patches-return-379-listarch-java-patches=sourceware.cygnus.com@sourceware.cygnus.com Sun Jan 16 03:07:36 2000
Return-Path: <java-patches-return-379-listarch-java-patches=sourceware.cygnus.com@sourceware.cygnus.com>
Delivered-To: listarch-java-patches@sourceware.cygnus.com
Received: (qmail 12301 invoked by alias); 16 Jan 2000 03:07:36 -0000
Mailing-List: contact java-patches-help@sourceware.cygnus.com; run by ezmlm
Precedence: bulk
List-Subscribe: <mailto:java-patches-subscribe@sourceware.cygnus.com>
List-Archive: <http://sourceware.cygnus.com/ml/java-patches/>
List-Post: <mailto:java-patches@sourceware.cygnus.com>
List-Help: <mailto:java-patches-help@sourceware.cygnus.com>, <http://sourceware.cygnus.com/ml/#faqs>
Sender: java-patches-owner@sourceware.cygnus.com
Delivered-To: mailing list java-patches@sourceware.cygnus.com
Received: (qmail 12274 invoked from network); 16 Jan 2000 03:07:35 -0000
Date: Sat, 15 Jan 2000 19:07:32 -0800 (PST)
Message-Id: <200001160307.TAA06130@ferrule.cygnus.com>
From: Tom Tromey <tromey@cygnus.com>
To: Jeff Sturm <jsturm@sigma6.com>
Cc: java-patches@sourceware.cygnus.com
Subject: Re: Patches for java.io.StreamTokenizer
In-Reply-To: <Pine.LNX.4.10.10001151044590.1063-100000@cc42593-a.taylor1.mi.home.com>
References: <387FAF38.7A990182@sigma6.com>
	<Pine.LNX.4.10.10001151044590.1063-100000@cc42593-a.taylor1.mi.home.com>
X-Zippy:  ..  the HIGHWAY is made out of LIME JELLO and my HONDA
 is a barbequed OYSTER!  Yum!
X-Attribution:  Tom

>>>>> "Jeff" == Jeff Sturm <jsturm@sigma6.com> writes:

Jeff> The patch below prevents an infinite loop in StreamTokenizer.
Jeff> (Attempting to unread(-1) on a PushbackReader causes the next
Jeff> read to return 65535.  I thought this was a bug in
Jeff> PushbackReader, but other implementations seem to do the same
Jeff> thing.  I guess the consequence of unread(-1) is simply
Jeff> undefined.)

The JCL book says that PushbackReader.unread() pushes back the
low-order 2 bytes of the argument.  The online JDK 1.2 docs say
nothing.

Jeff> There are other problems in StreamTokenizer that probably can't
Jeff> be fixed by a small patch.  For example, "-." is incorrectly
Jeff> read as a number, causing NumberFormatException.  IMHO the body
Jeff> of nextToken() needs to be reimplemented as a FSM.  Would it be
Jeff> worthwhile to rewrite this class, or can we consider getting it
Jeff> from the Classpath project instead?

The current plan is to choose between libgcj and Classpath classes on
a case-by-case basis -- assuming RMS gives his ok to the whole process
(I don't have a clue why it is taking so long).

What I'd really like to see are Mauve tests that we can use to help
make the determination.

My only problems with this patch are coding style bugs:

Jeff>  	  if (ch == '\r' && (ch = in.read()) != '\n')
Jeff> -	    in.unread(ch);
Jeff> +	    if (ch != TT_EOF) in.unread(ch);

We don't put the body on the same line as the "if" (there are a few of
these in the patch).  Also, nested if's required braces.

Jeff>  		    else
Jeff> -		      in.unread(ch);
Jeff> +		      if (ch != TT_EOF) in.unread(ch);

Here the "if" should be on the same line as the "else".

Jeff>  		      if (ch == '\r' && (ch = in.read()) != '\n')
Jeff> -			in.unread(ch);
Jeff> +		        if (ch != TT_EOF) in.unread(ch);

Here you should just add another "&&" clause to the "if".
(Warning in advance: the "&&" must come after a line break, not
before.)

If you make these changes, I'll check this in.

Thanks,
Tom

From java-patches-return-380-listarch-java-patches=sourceware.cygnus.com@sourceware.cygnus.com Sun Jan 16 17:29:51 2000
Return-Path: <java-patches-return-380-listarch-java-patches=sourceware.cygnus.com@sourceware.cygnus.com>
Delivered-To: listarch-java-patches@sourceware.cygnus.com
Received: (qmail 20029 invoked by alias); 16 Jan 2000 17:29:50 -0000
Mailing-List: contact java-patches-help@sourceware.cygnus.com; run by ezmlm
Precedence: bulk
List-Subscribe: <mailto:java-patches-subscribe@sourceware.cygnus.com>
List-Archive: <http://sourceware.cygnus.com/ml/java-patches/>
List-Post: <mailto:java-patches@sourceware.cygnus.com>
List-Help: <mailto:java-patches-help@sourceware.cygnus.com>, <http://sourceware.cygnus.com/ml/#faqs>
Sender: java-patches-owner@sourceware.cygnus.com
Delivered-To: mailing list java-patches@sourceware.cygnus.com
Received: (qmail 20010 invoked from network); 16 Jan 2000 17:29:48 -0000
X-Authentication-Warning: cc42593-a.taylor1.mi.home.com: jsturm owned process doing -bs
Date: Sun, 16 Jan 2000 12:33:53 -0500 (EST)
From: Jeff Sturm <jsturm@sigma6.com>
X-Sender: jsturm@cc42593-a.taylor1.mi.home.com
To: Tom Tromey <tromey@cygnus.com>
cc: java-patches@sourceware.cygnus.com
Subject: Re: Patches for java.io.StreamTokenizer
In-Reply-To: <200001160307.TAA06130@ferrule.cygnus.com>
Message-ID: <Pine.LNX.4.10.10001161230320.604-100000@cc42593-a.taylor1.mi.home.com>
MIME-Version: 1.0
Content-Type: TEXT/PLAIN; charset=US-ASCII



On Sat, 15 Jan 2000, Tom Tromey wrote:
> My only problems with this patch are coding style bugs:

OK... here's my 2nd take:

2000-01-16  Jeff Sturm  <jsturm@sigma6.com>
	* java/io/StreamTokenizer.java (nextToken): Avoid unread(TT_EOF).

Index: StreamTokenizer.java
===================================================================
RCS file: /cvs/java/libgcj/libjava/java/io/StreamTokenizer.java,v
retrieving revision 1.1.1.1
diff -u -r1.1.1.1 StreamTokenizer.java
--- StreamTokenizer.java	1999/04/07 14:52:36	1.1.1.1
+++ StreamTokenizer.java	2000/01/16 17:18:37
@@ -179,7 +179,10 @@
 
 	  // Throw away \n if in combination with \r.
 	  if (ch == '\r' && (ch = in.read()) != '\n')
-	    in.unread(ch);
+	    {
+	      if (ch != TT_EOF)
+		in.unread(ch);
+	    }
 	  if (eolSignificant)
 	    return (ttype = TT_EOL);
 	}
@@ -192,7 +195,8 @@
 	  {
 	    // Read ahead to see if this is an ordinary '-' rather than numeric.
 	    ch = in.read();
-	    in.unread(ch);
+	    if (ch != TT_EOF)
+	      in.unread(ch);
 	    if (isNumeric(ch) && ch != '-')
 	      ch = '-';
 	    else
@@ -209,7 +213,8 @@
 	  else
 	    tokbuf.append((char) ch);
 
-	in.unread(ch);
+	if (ch != TT_EOF)
+	  in.unread(ch);
 	ttype = TT_NUMBER;
 	nval = Double.valueOf(tokbuf.toString()).doubleValue();
       }
@@ -219,7 +224,8 @@
 	tokbuf.append((char) ch);
 	while (isAlphabetic(ch = in.read()) || isNumeric(ch))
 	  tokbuf.append((char) ch);
-	in.unread(ch);
+	if (ch != TT_EOF)
+	  in.unread(ch);
 	ttype = TT_WORD;
 	sval = tokbuf.toString();
 	if (lowerCase)
@@ -229,7 +235,8 @@
       {
 	while ((ch = in.read()) != '\n' && ch != '\r' && ch != TT_EOF)
 	  ;
-	in.unread(ch);
+	if (ch != TT_EOF)
+	  in.unread(ch);
 	return nextToken();	// Recursive, but not too deep in normal cases.
       }
     else if (isQuote(ch))
@@ -277,14 +284,15 @@
 			  }
 		      }
 
-		    in.unread(nextch);
+		    if (nextch != TT_EOF)
+		      in.unread(nextch);
 		}
 
 	    tokbuf.append((char) ch);
 	  }
 
 	// Throw away matching quote char.
-	if (ch != ttype)
+	if (ch != ttype && ch != TT_EOF)
 	  in.unread(ch);
 
 	sval = tokbuf.toString();
@@ -296,7 +304,8 @@
 	    {
 	      while ((ch = in.read()) != '\n' && ch != '\r' && ch != TT_EOF)
 		;
-	      in.unread(ch);
+	      if (ch != TT_EOF)
+		in.unread(ch);
 	      return nextToken(); // Recursive, but not too deep in normal cases
 	    }
 	  else if (ch == '*' && slashStar) 
@@ -305,19 +314,23 @@
 		{
 	          ch = in.read();
 		  if (ch == '*')
-		    if ((ch = in.read()) == '/')
-		      break;
-		    else
-		      in.unread(ch);
+		    {
+		      if ((ch = in.read()) == '/')
+			break;
+		      else if (ch != TT_EOF)
+			in.unread(ch);
+		    }
 		  else if (ch == '\n' || ch == '\r')
 		    {
 		      lineNumber++;
 		      if (ch == '\r' && (ch = in.read()) != '\n')
-			in.unread(ch);
+			{
+		          if (ch != TT_EOF)
+			    in.unread(ch);
+			}
 		    }
 		  else if (ch == TT_EOF)
 		    {
-		      in.unread(ch);
 		      break;
 		    }
 		}
@@ -325,7 +338,8 @@
 	    }
 	  else
 	    {
-	      in.unread(ch);
+	      if (ch != TT_EOF)
+		in.unread(ch);
 	      ch = '/';
 	    }
 

From java-patches-return-381-listarch-java-patches=sourceware.cygnus.com@sourceware.cygnus.com Sun Jan 16 19:32:02 2000
Return-Path: <java-patches-return-381-listarch-java-patches=sourceware.cygnus.com@sourceware.cygnus.com>
Delivered-To: listarch-java-patches@sourceware.cygnus.com
Received: (qmail 3085 invoked by alias); 16 Jan 2000 19:32:02 -0000
Mailing-List: contact java-patches-help@sourceware.cygnus.com; run by ezmlm
Precedence: bulk
List-Subscribe: <mailto:java-patches-subscribe@sourceware.cygnus.com>
List-Archive: <http://sourceware.cygnus.com/ml/java-patches/>
List-Post: <mailto:java-patches@sourceware.cygnus.com>
List-Help: <mailto:java-patches-help@sourceware.cygnus.com>, <http://sourceware.cygnus.com/ml/#faqs>
Sender: java-patches-owner@sourceware.cygnus.com
Delivered-To: mailing list java-patches@sourceware.cygnus.com
Received: (qmail 3058 invoked from network); 16 Jan 2000 19:32:00 -0000
Date: Sun, 16 Jan 2000 11:31:57 -0800
Message-Id: <200001161931.LAA24665@hoser.cygnus.com>
From: Anthony Green <green@cygnus.com>
To: java-patches@sourceware.cygnus.com
Subject: new test case
X-Organization: Cygnus Solutions, Sunnyvale, California
X-URL: http://www.cygnus.com/~green


New test case.  It appears to be fixed already.

2000-01-16  Anthony Green  <green@cygnus.com>

	* libjava.lang/pr109.out: New file.
	* libjava.lang/pr109.java: New file.

Index: libjava/testsuite/libjava.lang/pr109.java
===================================================================
RCS file: pr109.java
diff -N pr109.java
--- /dev/null	Tue May  5 13:32:27 1998
+++ pr109.java	Sun Jan 16 11:30:06 2000
@@ -0,0 +1,25 @@
+// PR 109
+
+// Running the test code produces the output "0" instead of the
+// expected "01234".
+
+// The break statement exits both for-loops (not just the innermost
+// one) if the (single statement) body of the outer for-loop is not
+// enclosed in braces. Affects more deeply nested loops in the same
+// way.
+
+public class pr109
+{
+  public static void main (String argv[])
+    {
+      int i, j;
+
+      for (i = 0; i < 5; i++)
+      for (j = 0; j < 2; j++)
+        {
+	     if (j == 1)
+	           break;
+		       System.out.print (i);
+		         }
+    }
+}
Index: libjava/testsuite/libjava.lang/pr109.out
===================================================================
RCS file: pr109.out
diff -N pr109.out
--- /dev/null	Tue May  5 13:32:27 1998
+++ pr109.out	Sun Jan 16 11:30:06 2000
@@ -0,0 +1 @@
+01234

From java-patches-return-382-listarch-java-patches=sourceware.cygnus.com@sourceware.cygnus.com Sun Jan 16 19:54:31 2000
Return-Path: <java-patches-return-382-listarch-java-patches=sourceware.cygnus.com@sourceware.cygnus.com>
Delivered-To: listarch-java-patches@sourceware.cygnus.com
Received: (qmail 6263 invoked by alias); 16 Jan 2000 19:54:31 -0000
Mailing-List: contact java-patches-help@sourceware.cygnus.com; run by ezmlm
Precedence: bulk
List-Subscribe: <mailto:java-patches-subscribe@sourceware.cygnus.com>
List-Archive: <http://sourceware.cygnus.com/ml/java-patches/>
List-Post: <mailto:java-patches@sourceware.cygnus.com>
List-Help: <mailto:java-patches-help@sourceware.cygnus.com>, <http://sourceware.cygnus.com/ml/#faqs>
Sender: java-patches-owner@sourceware.cygnus.com
Delivered-To: mailing list java-patches@sourceware.cygnus.com
Received: (qmail 6237 invoked from network); 16 Jan 2000 19:54:30 -0000
Date: Sun, 16 Jan 2000 11:54:27 -0800
Message-Id: <200001161954.LAA24686@hoser.cygnus.com>
From: Anthony Green <green@cygnus.com>
To: java-patches@sourceware.cygnus.com
Subject: More new test code
X-Organization: Cygnus Solutions, Sunnyvale, California
X-URL: http://www.cygnus.com/~green


More test code...

2000-01-16  Anthony Green  <green@cygnus.com>

	    * libjava.lang/pr83.out: New file.
	    * libjava.lang/pr83.java: New file.

Index: libjava/testsuite/libjava.lang/pr83.java
===================================================================
RCS file: pr83.java
diff -N pr83.java
--- /dev/null	Tue May  5 13:32:27 1998
+++ pr83.java	Sun Jan 16 11:53:39 2000
@@ -0,0 +1,39 @@
+// PR 83
+
+/*
+ * test that caught null pointers exceptions in finalizers work correctly
+ * and that local variables are accessible in null pointer exception handlers.
+ */
+import java.io.*;
+
+public class pr83 {
+    
+    static String s;
+    
+    public static void main(String[] args) {
+	System.out.println(tryfinally() + s);
+    }
+    
+    public static String tryfinally() {
+	String yuck = null;
+	String local_s = null;
+	
+	try {
+	    return "This is ";
+	} finally {
+	    try {
+		local_s = "Perfect";
+		/* trigger null pointer exception */
+		String x = yuck.toLowerCase();
+	    } catch (Exception _) {
+		/* 
+		 * when the null pointer exception is caught, we must still
+		 * be able to access local_s.
+		 * Our return address for the finally clause must also still
+		 * be intact.
+		 */
+		s = local_s;
+	    }
+	}
+    }
+}
Index: libjava/testsuite/libjava.lang/pr83.out
===================================================================
RCS file: pr83.out
diff -N pr83.out
--- /dev/null	Tue May  5 13:32:27 1998
+++ pr83.out	Sun Jan 16 11:53:39 2000
@@ -0,0 +1 @@
+This is Perfect

From java-patches-return-383-listarch-java-patches=sourceware.cygnus.com@sourceware.cygnus.com Sun Jan 16 20:25:27 2000
Return-Path: <java-patches-return-383-listarch-java-patches=sourceware.cygnus.com@sourceware.cygnus.com>
Delivered-To: listarch-java-patches@sourceware.cygnus.com
Received: (qmail 9351 invoked by alias); 16 Jan 2000 20:25:26 -0000
Mailing-List: contact java-patches-help@sourceware.cygnus.com; run by ezmlm
Precedence: bulk
List-Subscribe: <mailto:java-patches-subscribe@sourceware.cygnus.com>
List-Archive: <http://sourceware.cygnus.com/ml/java-patches/>
List-Post: <mailto:java-patches@sourceware.cygnus.com>
List-Help: <mailto:java-patches-help@sourceware.cygnus.com>, <http://sourceware.cygnus.com/ml/#faqs>
Sender: java-patches-owner@sourceware.cygnus.com
Delivered-To: mailing list java-patches@sourceware.cygnus.com
Received: (qmail 9326 invoked from network); 16 Jan 2000 20:25:25 -0000
Date: Sun, 16 Jan 2000 12:25:22 -0800
Message-Id: <200001162025.MAA24726@hoser.cygnus.com>
From: Anthony Green <green@cygnus.com>
To: java-patches@sourceware.cygnus.com
Subject: testsuite patch: handle regexp match files
X-Organization: Cygnus Solutions, Sunnyvale, California
X-URL: http://www.cygnus.com/~green


libjava.lang contained partial support for regexp match files.  This
finishes off the job.

2000-01-16  Anthony Green  <green@cygnus.com>

	    * libjava.lang/lang.exp: Handle regexp matches correctly.

Index: libjava/testsuite/libjava.lang/lang.exp
===================================================================
RCS file: /cvs/java/libgcj/libjava/testsuite/libjava.lang/lang.exp,v
retrieving revision 1.1
diff -u -r1.1 lang.exp
--- lang.exp	1999/10/04 03:30:54	1.1
+++ lang.exp	2000/01/16 20:22:38
@@ -1,11 +1,11 @@
 global srcdir subdir
 
-catch "glob -nocomplain ${srcdir}/${subdir}/*.out" srcfiles
+catch "glob -nocomplain ${srcdir}/${subdir}/*.xpo ${srcdir}/${subdir}/*.out" srcfiles
 verbose "srcfiles are $srcfiles"
 
 set prefix ""
 foreach x $srcfiles {
-    regsub "\\.out$" $x "" prefix
+    regsub "\\.(out|xpo)$" $x "" prefix
     set bname [file tail $prefix]
 
     if [file exists $srcdir/$subdir/${bname}.xpo] {

-- 
Anthony Green                                                        Red Hat
                                                       Sunnyvale, California

From java-patches-return-384-listarch-java-patches=sourceware.cygnus.com@sourceware.cygnus.com Sun Jan 16 20:29:18 2000
Return-Path: <java-patches-return-384-listarch-java-patches=sourceware.cygnus.com@sourceware.cygnus.com>
Delivered-To: listarch-java-patches@sourceware.cygnus.com
Received: (qmail 9563 invoked by alias); 16 Jan 2000 20:29:18 -0000
Mailing-List: contact java-patches-help@sourceware.cygnus.com; run by ezmlm
Precedence: bulk
List-Subscribe: <mailto:java-patches-subscribe@sourceware.cygnus.com>
List-Archive: <http://sourceware.cygnus.com/ml/java-patches/>
List-Post: <mailto:java-patches@sourceware.cygnus.com>
List-Help: <mailto:java-patches-help@sourceware.cygnus.com>, <http://sourceware.cygnus.com/ml/#faqs>
Sender: java-patches-owner@sourceware.cygnus.com
Delivered-To: mailing list java-patches@sourceware.cygnus.com
Received: (qmail 9538 invoked from network); 16 Jan 2000 20:29:18 -0000
Date: Sun, 16 Jan 2000 12:29:15 -0800
Message-Id: <200001162029.MAA24729@hoser.cygnus.com>
From: Anthony Green <green@cygnus.com>
To: java-patches@sourceware.cygnus.com
Subject: More new test code
X-Organization: Cygnus Solutions, Sunnyvale, California
X-URL: http://www.cygnus.com/~green


More new test code.  Uses regexp matching.

2000-01-16  Anthony Green  <green@cygnus.com>

	    * libjava.lang/pr93.xpo: New file.
	    * libjava.lang/pr93.java: New file.

Index: libjava/testsuite/libjava.lang/pr93.java
===================================================================
RCS file: pr93.java
diff -N pr93.java
--- /dev/null	Tue May  5 13:32:27 1998
+++ pr93.java	Sun Jan 16 12:26:51 2000
@@ -0,0 +1,24 @@
+// PR 93
+
+// Programs compiled with current libgcj dump core sometime after
+// garbage collection.
+
+public class pr93 
+{
+    public static void main(String[] args) {
+	java.util.Random generator = new java.util.Random();
+	Runtime runtime = Runtime.getRuntime();
+
+	System.out.println("free memory = " + runtime.freeMemory());
+	System.out.println("total memory = " + runtime.totalMemory());
+
+	for (int n = 0; n < 10000; n++) {
+	    byte[] junk = new byte[(generator.nextInt() & 0x7fffffff) % 512];
+	}
+	
+	runtime.gc();
+
+	System.out.println("free memory = " + runtime.freeMemory());
+	System.out.println("total memory = " + runtime.totalMemory());
+    }
+}
Index: libjava/testsuite/libjava.lang/pr93.xpo
===================================================================
RCS file: pr93.xpo
diff -N pr93.xpo
--- /dev/null	Tue May  5 13:32:27 1998
+++ pr93.xpo	Sun Jan 16 12:26:51 2000
@@ -0,0 +1,4 @@
+free memory = [0-9]*
+total memory = [0-9]*
+free memory = [0-9]*
+total memory = [0-9]*

From java-patches-return-385-listarch-java-patches=sourceware.cygnus.com@sourceware.cygnus.com Sun Jan 16 21:00:04 2000
Return-Path: <java-patches-return-385-listarch-java-patches=sourceware.cygnus.com@sourceware.cygnus.com>
Delivered-To: listarch-java-patches@sourceware.cygnus.com
Received: (qmail 12605 invoked by alias); 16 Jan 2000 21:00:04 -0000
Mailing-List: contact java-patches-help@sourceware.cygnus.com; run by ezmlm
Precedence: bulk
List-Subscribe: <mailto:java-patches-subscribe@sourceware.cygnus.com>
List-Archive: <http://sourceware.cygnus.com/ml/java-patches/>
List-Post: <mailto:java-patches@sourceware.cygnus.com>
List-Help: <mailto:java-patches-help@sourceware.cygnus.com>, <http://sourceware.cygnus.com/ml/#faqs>
Sender: java-patches-owner@sourceware.cygnus.com
Delivered-To: mailing list java-patches@sourceware.cygnus.com
Received: (qmail 12565 invoked from network); 16 Jan 2000 21:00:03 -0000
Date: Sun, 16 Jan 2000 12:59:59 -0800
Message-Id: <200001162059.MAA24759@hoser.cygnus.com>
From: Anthony Green <green@cygnus.com>
To: java-patches@sourceware.cygnus.com
Subject: Still more test code
X-Organization: Cygnus Solutions, Sunnyvale, California
X-URL: http://www.cygnus.com/~green


2000-01-16  Anthony Green  <green@cygnus.com>

	    * libjava.lang/pr133.out: New file.
	    * libjava.lang/pr133.java: New file.

	    * libjava.lang/pr100.xpo: New file.
	    * libjava.lang/pr100.java: New file.

Index: libjava/testsuite/libjava.lang/pr100.java
===================================================================
RCS file: pr100.java
diff -N pr100.java
--- /dev/null	Tue May  5 13:32:27 1998
+++ pr100.java	Sun Jan 16 12:58:03 2000
@@ -0,0 +1,13 @@
+// PR 100
+
+// Second call to hashcode causes SEGV when dynamically linking.
+
+public class pr100
+{
+    public static void main(String[] args) {
+	pr100 ht = new pr100();
+	
+	System.err.println(ht.hashCode());
+	System.err.println(ht.getClass().hashCode());
+    }
+}
Index: libjava/testsuite/libjava.lang/pr100.xpo
===================================================================
RCS file: pr100.xpo
diff -N pr100.xpo
--- /dev/null	Tue May  5 13:32:27 1998
+++ pr100.xpo	Sun Jan 16 12:58:03 2000
@@ -0,0 +1,2 @@
+[0-9]+
+[0-9]+
Index: libjava/testsuite/libjava.lang/pr133.java
===================================================================
RCS file: pr133.java
diff -N pr133.java
--- /dev/null	Tue May  5 13:32:27 1998
+++ pr133.java	Sun Jan 16 12:58:03 2000
@@ -0,0 +1,34 @@
+// PR 133
+
+// System.exit(0) appears to hang the program.
+
+public class pr133 {
+    public static void main(String argv[])
+    {
+        String name;
+
+        if (argv.length == 0) {
+            name = "Rocket J. Squirrel";
+        } else {
+            name = argv[0];
+        }
+
+        new pr133(name).identifySelf();
+        System.out.println("goodbye");
+
+        System.exit(0);
+    }
+
+    public pr133 (String name)
+    {
+        v_name = name;
+    }
+    
+    public void identifySelf()
+    {
+        System.out.println("This is a pr133 instance named " + v_name);
+        System.out.println("Leaving identifySelf()...");
+    }
+
+    private String v_name;
+}
Index: libjava/testsuite/libjava.lang/pr133.out
===================================================================
RCS file: pr133.out
diff -N pr133.out
--- /dev/null	Tue May  5 13:32:27 1998
+++ pr133.out	Sun Jan 16 12:58:03 2000
@@ -0,0 +1,3 @@
+This is a pr133 instance named Rocket J. Squirrel
+Leaving identifySelf()...
+goodbye

From java-patches-return-386-listarch-java-patches=sourceware.cygnus.com@sourceware.cygnus.com Sun Jan 16 21:12:02 2000
Return-Path: <java-patches-return-386-listarch-java-patches=sourceware.cygnus.com@sourceware.cygnus.com>
Delivered-To: listarch-java-patches@sourceware.cygnus.com
Received: (qmail 13090 invoked by alias); 16 Jan 2000 21:12:02 -0000
Mailing-List: contact java-patches-help@sourceware.cygnus.com; run by ezmlm
Precedence: bulk
List-Subscribe: <mailto:java-patches-subscribe@sourceware.cygnus.com>
List-Archive: <http://sourceware.cygnus.com/ml/java-patches/>
List-Post: <mailto:java-patches@sourceware.cygnus.com>
List-Help: <mailto:java-patches-help@sourceware.cygnus.com>, <http://sourceware.cygnus.com/ml/#faqs>
Sender: java-patches-owner@sourceware.cygnus.com
Delivered-To: mailing list java-patches@sourceware.cygnus.com
Received: (qmail 13064 invoked from network); 16 Jan 2000 21:12:01 -0000
Date: Sun, 16 Jan 2000 13:11:57 -0800 (PST)
Message-Id: <200001162111.NAA06726@ferrule.cygnus.com>
From: Tom Tromey <tromey@cygnus.com>
To: Anthony Green <green@cygnus.com>
Cc: java-patches@sourceware.cygnus.com
Subject: Re: new test case
In-Reply-To: <200001161931.LAA24665@hoser.cygnus.com>
References: <200001161931.LAA24665@hoser.cygnus.com>
X-Zippy:  ..  Now KEN and BARBIE are PERMANENTLY ADDICTED to MIND-ALTERING DRUGS..
X-Attribution:  Tom

>>>>> "Anthony" == Anthony Green <green@cygnus.com> writes:

Anthony> New test case.  It appears to be fixed already.

Cool, thanks.

Anthony> 2000-01-16  Anthony Green  <green@cygnus.com>
Anthony> 	* libjava.lang/pr109.out: New file.
Anthony> 	* libjava.lang/pr109.java: New file.

I think we should put something like "test for PR libgcj/109" into
these ChangeLog entries so that the commit message for tests ends up
in the PR as well.  Comments?

Tom

From java-patches-return-387-listarch-java-patches=sourceware.cygnus.com@sourceware.cygnus.com Sun Jan 16 21:18:21 2000
Return-Path: <java-patches-return-387-listarch-java-patches=sourceware.cygnus.com@sourceware.cygnus.com>
Delivered-To: listarch-java-patches@sourceware.cygnus.com
Received: (qmail 13380 invoked by alias); 16 Jan 2000 21:18:21 -0000
Mailing-List: contact java-patches-help@sourceware.cygnus.com; run by ezmlm
Precedence: bulk
List-Subscribe: <mailto:java-patches-subscribe@sourceware.cygnus.com>
List-Archive: <http://sourceware.cygnus.com/ml/java-patches/>
List-Post: <mailto:java-patches@sourceware.cygnus.com>
List-Help: <mailto:java-patches-help@sourceware.cygnus.com>, <http://sourceware.cygnus.com/ml/#faqs>
Sender: java-patches-owner@sourceware.cygnus.com
Delivered-To: mailing list java-patches@sourceware.cygnus.com
Received: (qmail 13355 invoked from network); 16 Jan 2000 21:18:21 -0000
Date: Sun, 16 Jan 2000 13:18:18 -0800
Message-Id: <200001162118.NAA24794@hoser.cygnus.com>
From: Anthony Green <green@cygnus.com>
To: tromey@cygnus.com
CC: java-patches@sourceware.cygnus.com
In-reply-to: <200001162111.NAA06726@ferrule.cygnus.com> (message from Tom
	Tromey on Sun, 16 Jan 2000 13:11:57 -0800 (PST))
Subject: Re: new test case
X-Organization: Cygnus Solutions, Sunnyvale, California
X-URL: http://www.cygnus.com/~green
References: <200001161931.LAA24665@hoser.cygnus.com> <200001162111.NAA06726@ferrule.cygnus.com>


Tom wrote:
> I think we should put something like "test for PR libgcj/109" into
> these ChangeLog entries so that the commit message for tests ends up
> in the PR as well.  Comments?

Ah yes.  I forgot about this.

BTW - I'm looking at why Thread_1 is failing.

The expected output is:
 
test 0
daemon done
joined
active count = 2
test 1
true
still alive: false
test 2
interrupted

But I can't imagine why we are expecting "active count = 2".  I think
"active count = 0" is correct.

AG

-- 
Anthony Green                                                        Red Hat
                                                       Sunnyvale, California

From java-patches-return-388-listarch-java-patches=sourceware.cygnus.com@sourceware.cygnus.com Sun Jan 16 21:20:18 2000
Return-Path: <java-patches-return-388-listarch-java-patches=sourceware.cygnus.com@sourceware.cygnus.com>
Delivered-To: listarch-java-patches@sourceware.cygnus.com
Received: (qmail 13740 invoked by alias); 16 Jan 2000 21:20:18 -0000
Mailing-List: contact java-patches-help@sourceware.cygnus.com; run by ezmlm
Precedence: bulk
List-Subscribe: <mailto:java-patches-subscribe@sourceware.cygnus.com>
List-Archive: <http://sourceware.cygnus.com/ml/java-patches/>
List-Post: <mailto:java-patches@sourceware.cygnus.com>
List-Help: <mailto:java-patches-help@sourceware.cygnus.com>, <http://sourceware.cygnus.com/ml/#faqs>
Sender: java-patches-owner@sourceware.cygnus.com
Delivered-To: mailing list java-patches@sourceware.cygnus.com
Received: (qmail 13715 invoked from network); 16 Jan 2000 21:20:18 -0000
Date: Sun, 16 Jan 2000 13:20:14 -0800 (PST)
Message-Id: <200001162120.NAA06739@ferrule.cygnus.com>
From: Tom Tromey <tromey@cygnus.com>
To: Anthony Green <green@cygnus.com>
Cc: tromey@cygnus.com, java-patches@sourceware.cygnus.com
Subject: Re: new test case
In-Reply-To: <200001162118.NAA24794@hoser.cygnus.com>
References: <200001161931.LAA24665@hoser.cygnus.com>
	<200001162111.NAA06726@ferrule.cygnus.com>
	<200001162118.NAA24794@hoser.cygnus.com>
X-Zippy:  Pardon me, but do you know what it means to be TRULY ONE
 with your BOOTH!
X-Attribution:  Tom

>>>>> "Anthony" == Anthony Green <green@cygnus.com> writes:

Anthony> BTW - I'm looking at why Thread_1 is failing.

I think Thread_1 is buggy.  The last time I looked at it seriously, I
noticed it had race conditions.  Simply deleting it might be the most
reasonable approach.

Tom

From java-patches-return-389-listarch-java-patches=sourceware.cygnus.com@sourceware.cygnus.com Sun Jan 16 21:32:19 2000
Return-Path: <java-patches-return-389-listarch-java-patches=sourceware.cygnus.com@sourceware.cygnus.com>
Delivered-To: listarch-java-patches@sourceware.cygnus.com
Received: (qmail 14329 invoked by alias); 16 Jan 2000 21:32:19 -0000
Mailing-List: contact java-patches-help@sourceware.cygnus.com; run by ezmlm
Precedence: bulk
List-Subscribe: <mailto:java-patches-subscribe@sourceware.cygnus.com>
List-Archive: <http://sourceware.cygnus.com/ml/java-patches/>
List-Post: <mailto:java-patches@sourceware.cygnus.com>
List-Help: <mailto:java-patches-help@sourceware.cygnus.com>, <http://sourceware.cygnus.com/ml/#faqs>
Sender: java-patches-owner@sourceware.cygnus.com
Delivered-To: mailing list java-patches@sourceware.cygnus.com
Received: (qmail 14304 invoked from network); 16 Jan 2000 21:32:18 -0000
Date: Sun, 16 Jan 2000 13:32:15 -0800 (PST)
Message-Id: <200001162132.NAA06753@ferrule.cygnus.com>
From: Tom Tromey <tromey@cygnus.com>
To: Jeff Sturm <jsturm@sigma6.com>
Cc: Tom Tromey <tromey@cygnus.com>, java-patches@sourceware.cygnus.com
Subject: Re: Patches for java.io.StreamTokenizer
In-Reply-To: <Pine.LNX.4.10.10001161230320.604-100000@cc42593-a.taylor1.mi.home.com>
References: <200001160307.TAA06130@ferrule.cygnus.com>
	<Pine.LNX.4.10.10001161230320.604-100000@cc42593-a.taylor1.mi.home.com>
X-Zippy:  OVER the underpass!  UNDER the overpass!  Around the FUTURE
 and BEYOND REPAIR!!
X-Attribution:  Tom

>>>>> "Jeff" == Jeff Sturm <jsturm@sigma6.com> writes:

Jeff> 2000-01-16  Jeff Sturm  <jsturm@sigma6.com>
Jeff> 	* java/io/StreamTokenizer.java (nextToken): Avoid unread(TT_EOF).

I checked this in.
Thanks.

Tom

From java-patches-return-390-listarch-java-patches=sourceware.cygnus.com@sourceware.cygnus.com Sun Jan 16 23:33:57 2000
Return-Path: <java-patches-return-390-listarch-java-patches=sourceware.cygnus.com@sourceware.cygnus.com>
Delivered-To: listarch-java-patches@sourceware.cygnus.com
Received: (qmail 29271 invoked by alias); 16 Jan 2000 23:33:57 -0000
Mailing-List: contact java-patches-help@sourceware.cygnus.com; run by ezmlm
Precedence: bulk
List-Subscribe: <mailto:java-patches-subscribe@sourceware.cygnus.com>
List-Archive: <http://sourceware.cygnus.com/ml/java-patches/>
List-Post: <mailto:java-patches@sourceware.cygnus.com>
List-Help: <mailto:java-patches-help@sourceware.cygnus.com>, <http://sourceware.cygnus.com/ml/#faqs>
Sender: java-patches-owner@sourceware.cygnus.com
Delivered-To: mailing list java-patches@sourceware.cygnus.com
Received: (qmail 29252 invoked from network); 16 Jan 2000 23:33:55 -0000
Message-ID: <388255CC.9F94D842@albatross.co.nz>
Date: Mon, 17 Jan 2000 12:35:41 +1300
From: Bryce McKinlay <bryce@albatross.co.nz>
X-Mailer: Mozilla 4.7 [en] (X11; U; Linux 2.3.25 i686)
X-Accept-Language: en
MIME-Version: 1.0
To: Tom Tromey <tromey@cygnus.com>
CC: Anthony Green <green@cygnus.com>, java-patches@sourceware.cygnus.com
Subject: Re: new test case
References: <200001161931.LAA24665@hoser.cygnus.com>
		<200001162111.NAA06726@ferrule.cygnus.com>
		<200001162118.NAA24794@hoser.cygnus.com> <200001162120.NAA06739@ferrule.cygnus.com>
Content-Type: multipart/alternative;
 boundary="------------911584F66199FB60478AE253"


--------------911584F66199FB60478AE253
Content-Type: text/plain; charset=us-ascii
Content-Transfer-Encoding: 7bit

Tom Tromey wrote:

> >>>>> "Anthony" == Anthony Green <green@cygnus.com> writes:
>
> Anthony> BTW - I'm looking at why Thread_1 is failing.
>
> I think Thread_1 is buggy.  The last time I looked at it seriously, I
> noticed it had race conditions.  Simply deleting it might be the most
> reasonable approach.

The expected output is wrong. "active count" should be 0, there is no race in
that part due to the join. However the JOIN_TIMEOUT part of the test has an
obvious race.

It would be a shame to not have any thread tests in the test suite. Perhaps we
should fix & clean up Thread_1, and extend it to cover more stuff (like more
interrupt() corner cases).

regards

  [ bryce ]


--------------911584F66199FB60478AE253
Content-Type: text/html; charset=us-ascii
Content-Transfer-Encoding: 7bit

<!doctype html public "-//w3c//dtd html 4.0 transitional//en">
<html>
Tom Tromey wrote:
<blockquote TYPE=CITE>>>>>> "Anthony" == Anthony Green &lt;green@cygnus.com>
writes:
<p>Anthony> BTW - I'm looking at why Thread_1 is failing.
<p>I think Thread_1 is buggy.&nbsp; The last time I looked at it seriously,
I
<br>noticed it had race conditions.&nbsp; Simply deleting it might be the
most
<br>reasonable approach.</blockquote>
<tt>The expected output is wrong. "active count" should be 0, there is
no race in that part due to the join. However the JOIN_TIMEOUT part of
the test has an obvious race.</tt><tt></tt>
<p><tt>It would be a shame to not have any thread tests in the test suite.
Perhaps we should fix &amp; clean up Thread_1, and extend it to cover more
stuff (like more interrupt() corner cases).</tt>
<p>regards
<p>&nbsp; [ bryce ]
<br>&nbsp;</html>

--------------911584F66199FB60478AE253--

From java-patches-return-391-listarch-java-patches=sourceware.cygnus.com@sourceware.cygnus.com Mon Jan 17 02:15:28 2000
Return-Path: <java-patches-return-391-listarch-java-patches=sourceware.cygnus.com@sourceware.cygnus.com>
Delivered-To: listarch-java-patches@sourceware.cygnus.com
Received: (qmail 16275 invoked by alias); 17 Jan 2000 02:15:28 -0000
Mailing-List: contact java-patches-help@sourceware.cygnus.com; run by ezmlm
Precedence: bulk
List-Subscribe: <mailto:java-patches-subscribe@sourceware.cygnus.com>
List-Archive: <http://sourceware.cygnus.com/ml/java-patches/>
List-Post: <mailto:java-patches@sourceware.cygnus.com>
List-Help: <mailto:java-patches-help@sourceware.cygnus.com>, <http://sourceware.cygnus.com/ml/#faqs>
Sender: java-patches-owner@sourceware.cygnus.com
Delivered-To: mailing list java-patches@sourceware.cygnus.com
Received: (qmail 16250 invoked from network); 17 Jan 2000 02:15:27 -0000
Date: Sun, 16 Jan 2000 18:15:24 -0800 (PST)
Message-Id: <200001170215.SAA06941@ferrule.cygnus.com>
From: Tom Tromey <tromey@cygnus.com>
To: Bryce McKinlay <bryce@albatross.co.nz>
Cc: Tom Tromey <tromey@cygnus.com>, Anthony Green <green@cygnus.com>,
        java-patches@sourceware.cygnus.com
Subject: Re: new test case
In-Reply-To: <388255CC.9F94D842@albatross.co.nz>
References: <200001161931.LAA24665@hoser.cygnus.com>
	<200001162111.NAA06726@ferrule.cygnus.com>
	<200001162118.NAA24794@hoser.cygnus.com>
	<200001162120.NAA06739@ferrule.cygnus.com>
	<388255CC.9F94D842@albatross.co.nz>
X-Zippy:  Are you selling NYLON OIL WELLS??  If so, we can use TWO DOZEN!!
X-Attribution:  Tom

Bryce> It would be a shame to not have any thread tests in the test
Bryce> suite. Perhaps we should fix & clean up Thread_1, and extend it
Bryce> to cover more stuff (like more interrupt() corner cases).

Feel free to hack it as you want...

Tom

From java-patches-return-392-listarch-java-patches=sourceware.cygnus.com@sourceware.cygnus.com Mon Jan 17 16:37:11 2000
Return-Path: <java-patches-return-392-listarch-java-patches=sourceware.cygnus.com@sourceware.cygnus.com>
Delivered-To: listarch-java-patches@sourceware.cygnus.com
Received: (qmail 31100 invoked by alias); 17 Jan 2000 16:37:11 -0000
Mailing-List: contact java-patches-help@sourceware.cygnus.com; run by ezmlm
Precedence: bulk
List-Subscribe: <mailto:java-patches-subscribe@sourceware.cygnus.com>
List-Archive: <http://sourceware.cygnus.com/ml/java-patches/>
List-Post: <mailto:java-patches@sourceware.cygnus.com>
List-Help: <mailto:java-patches-help@sourceware.cygnus.com>, <http://sourceware.cygnus.com/ml/#faqs>
Sender: java-patches-owner@sourceware.cygnus.com
Delivered-To: mailing list java-patches@sourceware.cygnus.com
Received: (qmail 31079 invoked from network); 17 Jan 2000 16:37:09 -0000
Date: 17 Jan 2000 16:37:08 -0000
Message-ID: <20000117163708.5851.qmail@pasanda.cygnus.co.uk>
From: Andrew Haley <aph@pasanda.cygnus.co.uk>
To: java-patches@sourceware.cygnus.com
Subject: Throwable.printStackTrace ()

I've checked in code to print stack traces.  It's not yet perfect, but
I figured that it's such a useful debugging tool that it makes no
sense to wait for perfection.

Notes:

1.  I use a glibc specific backtrace() library call to retrieve the
backtrace data.  However, this isn't a very difficult thing to write
and there are versions of this routine for most ABIs in glibc, so I
don't think this is a big portability problem.

2.  I run a copy of addr2line to convert a code pointer to the name of
a routine.  If this program isn't installed or isn't in your path
you'll just get a hex dump.  However, you can capture this dump and
run it through addr2line on another host to get a symbolic stack
trace.  This is probably the best solution for small embedded systems.

It might have been easier to use System.exec() to run addr2line rather
than the low-level system call interface that I use.  However, I
didn't want the possibility of another exception being thrown while
looking up a name for stack trace.  Also, it would be useful to print
out stack traces for other programming languages.

The _Jv_name_finder class (which does the address lookups) is designed
to be extensible, so other ways of converting a pointer to a class and
method name may be added.  It might be possible to use reflective data
to do this, but we'd lose the ability to print the names of library
routines without reflective data.

3.  Symbols in shared objects aren't demangled.  It's fairly easy to
fix this by piping the stack trace through c++filt.  I could do this
automatically if people think it's a good idea.

4.  Exceptions thrown by bytecode classes print a backtrace through
the interpreter, rather than through the bytecode.

5.  Stack traces are limited to 128 elements.  This could easily be
changed, but otherwise accidental infinite recursion would print
megabytes of useless stack dump.

6.  I use the dladdr() library call to find symbols in shared objects.
This is another glibc dependency.

Andrew.

2000-01-14  Andrew Haley  <aph@cygnus.com>

	* java/lang/natThrowable.cc: New file.

	* java/lang/Throwable.java (fillInStackTrace): Make native.
	(printStackTrace): Call native method to do this.
	(Throwable): Call fillInStackTrace.
	(stackTrace): New variable.
	
	* include/jvm.h: Add _Jv_ThisExecutable functions.
	
	* prims.cc: (_Jv_execName): New variable.
	(catch_segv): Call fillInStackTrace.
	(catch_fpe): Ditto.
	(_Jv_ThisExecutable): New functions.
	(JvRunMain): Set the name of this executable.

	* Makefile.am: Add java/lang/natThrowable.cc.
	Add name-finder.cc.
	* Makefile.in: Rebuilt.

	* acconfig.h: Add HAVE_PROC_SELF_EXE.

	* configure.in: Force link with __frame_state_for in
	FORCELIBGCCSPEC.  Add new checks for backtrace.
	* include/config.h.in: Rebuilt.

	* name-finder.cc: New file.
	* include/name-finder.h: New file.
	

From java-patches-return-393-listarch-java-patches=sourceware.cygnus.com@sourceware.cygnus.com Mon Jan 17 18:55:51 2000
Return-Path: <java-patches-return-393-listarch-java-patches=sourceware.cygnus.com@sourceware.cygnus.com>
Delivered-To: listarch-java-patches@sourceware.cygnus.com
Received: (qmail 23664 invoked by alias); 17 Jan 2000 18:55:51 -0000
Mailing-List: contact java-patches-help@sourceware.cygnus.com; run by ezmlm
Precedence: bulk
List-Subscribe: <mailto:java-patches-subscribe@sourceware.cygnus.com>
List-Archive: <http://sourceware.cygnus.com/ml/java-patches/>
List-Post: <mailto:java-patches@sourceware.cygnus.com>
List-Help: <mailto:java-patches-help@sourceware.cygnus.com>, <http://sourceware.cygnus.com/ml/#faqs>
Sender: java-patches-owner@sourceware.cygnus.com
Delivered-To: mailing list java-patches@sourceware.cygnus.com
Received: (qmail 23591 invoked from network); 17 Jan 2000 18:55:21 -0000
To: Java Patch List <java-patches@sourceware.cygnus.com> 
Subject: Patch: prims.cc cleanup
X-Zippy:  I can see you GUYS an' GALS need a LOT of HELP...You're all very
 STUPID!!  I used to be STUPID, too..before I started watching UHF-TV!!
X-Attribution:  Tom
Bcc:
Reply-To:  tromey@cygnus.com
From:  Tom Tromey <tromey@cygnus.com>
Date: 17 Jan 2000 11:56:33 -0700
Message-ID: <87ln5o5xy6.fsf@cygnus.com>
Lines: 34
X-Mailer: Gnus v5.5/Emacs 20.3

I'm checking in this patch, which fixes a minor bug in prims.cc.  When
originally written, the state values weren't even semi-publically
available.  Now they are.

2000-01-15  Tom Tromey  <tromey@cygnus.com>

	* prims.cc (_Jv_PrimClass): Use `JV_STATE_NOTHING', not `0'.

Tom

Index: prims.cc
===================================================================
RCS file: /cvs/java/libgcj/libjava/prims.cc,v
retrieving revision 1.16
diff -u -r1.16 prims.cc
--- prims.cc	2000/01/17 15:43:32	1.16
+++ prims.cc	2000/01/17 18:54:01
@@ -1,6 +1,6 @@
 // prims.cc - Code for core of runtime environment.
 
-/* Copyright (C) 1998, 1999  Cygnus Solutions
+/* Copyright (C) 1998, 1999, 2000  Cygnus Solutions
 
    This file is part of libgcj.
 
@@ -558,7 +558,7 @@
       interfaces = NULL;
       loader = NULL;
       interface_count = 0;
-      state = 0;		// FIXME.
+      state = JV_STATE_NOTHING;
       thread = NULL;
     }
 };

From java-patches-return-394-listarch-java-patches=sourceware.cygnus.com@sourceware.cygnus.com Mon Jan 17 19:15:14 2000
Return-Path: <java-patches-return-394-listarch-java-patches=sourceware.cygnus.com@sourceware.cygnus.com>
Delivered-To: listarch-java-patches@sourceware.cygnus.com
Received: (qmail 25310 invoked by alias); 17 Jan 2000 19:15:13 -0000
Mailing-List: contact java-patches-help@sourceware.cygnus.com; run by ezmlm
Precedence: bulk
List-Subscribe: <mailto:java-patches-subscribe@sourceware.cygnus.com>
List-Archive: <http://sourceware.cygnus.com/ml/java-patches/>
List-Post: <mailto:java-patches@sourceware.cygnus.com>
List-Help: <mailto:java-patches-help@sourceware.cygnus.com>, <http://sourceware.cygnus.com/ml/#faqs>
Sender: java-patches-owner@sourceware.cygnus.com
Delivered-To: mailing list java-patches@sourceware.cygnus.com
Received: (qmail 25277 invoked from network); 17 Jan 2000 19:14:51 -0000
To: Java Patch List <java-patches@sourceware.cygnus.com> 
Subject: Patch: dynamic loading
X-Zippy:  --- I have seen the FUN ---
X-Attribution:  Tom
Bcc:
Reply-To:  tromey@cygnus.com
From:  Tom Tromey <tromey@cygnus.com>
Date: 17 Jan 2000 12:15:51 -0700
Message-ID: <87k8l85x20.fsf@cygnus.com>
Lines: 315
X-Mailer: Gnus v5.5/Emacs 20.3

I'm committing the appended patch.
It adds dynamic loading capabilities to libgcj.

With this patch, on native platforms, Runtime.loadLibrary will now
work correctly.

In addition, Class.forName() will try to load a series of shared
objects in order to find the requested class.  If a class
`gnu.quux.whatever' is requested, libgcj will first look for
`gnu-quux-whatever.so', then `gnu-quux.so', and finally `gnu.so'
(actually it will also look for `.la' and `.dll' files -- it uses ltdl
to do the searching).


2000-01-17  Tom Tromey  <tromey@cygnus.com>

	* java/lang/Runtime.java (loadLibraryInternal): Declare.
	* java/lang/natClassLoader.cc (_Jv_FindClass): Removed dead copy.
	(_Jv_FindClassInCache): Likewise.
	(_Jv_FindClass): Don't conditionalize body on INTERPRETER.
	(findSystemClass): Try to load class from compiled module.
	Include Runtime.h.
	* java/lang/natRuntime.cc (load): Use UTF-8 copy of filename.
	(loadLibrary): Likewise.
	(lt_preloaded_symbols): Define.
	(loadLibraryInternal): New method.
	* include/config.h.in: Rebuilt.
	* acconfig.h (USE_LTDL): Added.
	* Makefile.am (SUBDIRS): Added $(DIRLTDL).
	(INCLUDES): Added $(INCLTDL).b
	(libgcj_la_DEPENDENCIES): Added $(LIBLTDL).
	(libgcj_la_LIBADD): Likewise.
	* aclocal.m4, configure: Rebuilt.
	* configure.in: Added libltdl support.

Tom

Index: acconfig.h
===================================================================
RCS file: /cvs/java/libgcj/libjava/acconfig.h,v
retrieving revision 1.14
diff -u -r1.14 acconfig.h
--- acconfig.h	2000/01/17 15:43:32	1.14
+++ acconfig.h	2000/01/17 19:11:02
@@ -125,3 +125,6 @@
  
 /* Define if getuid() and friends are missing.  */
 #undef NO_GETUID
+
+/* Define if libltdl is in use.  */
+#undef USE_LTDL
Index: configure.in
===================================================================
RCS file: /cvs/java/libgcj/libjava/configure.in,v
retrieving revision 1.46
diff -u -r1.46 configure.in
--- configure.in	2000/01/17 15:43:32	1.46
+++ configure.in	2000/01/17 19:11:08
@@ -17,7 +17,20 @@
 
 AM_CONFIG_HEADER(include/config.h)
 
+# Only use libltdl for native builds.
+if test -z "${with_cross_host}"; then
+   AC_LIBLTDL_CONVENIENCE
+   AC_LIBTOOL_DLOPEN
+   DIRLTDL=libltdl
+   AC_DEFINE(USE_LTDL)
+   # Sigh.  Libtool's macro doesn't do the right thing.
+   INCLTDL="-I\$(top_srcdir)/libltdl $INCLTDL"
+fi
+AC_SUBST(INCLTDL)
+AC_SUBST(LIBLTDL)
+AC_SUBST(DIRLTDL)
 AM_PROG_LIBTOOL
+AC_CONFIG_SUBDIRS($DIRLDL)
 
 if test -z "$with_target_subdir" || test "$with_target_subdir" = "."; then
    COMPPATH=.
Index: java/lang/Runtime.java
===================================================================
RCS file: /cvs/java/libgcj/libjava/java/lang/Runtime.java,v
retrieving revision 1.4
diff -u -r1.4 Runtime.java
--- Runtime.java	1999/06/09 17:42:23	1.4
+++ Runtime.java	2000/01/17 19:11:13
@@ -1,6 +1,6 @@
 // Runtime.java - Runtime class.
 
-/* Copyright (C) 1998, 1999  Cygnus Solutions
+/* Copyright (C) 1998, 1999, 2000  Cygnus Solutions
 
    This file is part of libgcj.
 
@@ -96,6 +96,12 @@
 
   public native void load (String pathname);
   public native void loadLibrary (String libname);
+
+  // This is a helper function for the ClassLoader which can load
+  // compiled libraries.  Returns true if library (which is just the
+  // base name -- path searching is done by this function) was loaded,
+  // false otherwise.
+  native boolean loadLibraryInternal (String libname);
 
   public native void runFinalization ();
 
Index: java/lang/natClassLoader.cc
===================================================================
RCS file: /cvs/java/libgcj/libjava/java/lang/natClassLoader.cc,v
retrieving revision 1.13
diff -u -r1.13 natClassLoader.cc
--- natClassLoader.cc	2000/01/13 18:13:31	1.13
+++ natClassLoader.cc	2000/01/17 19:11:16
@@ -34,6 +34,7 @@
 #include <java/lang/ClassCircularityError.h>
 #include <java/lang/IncompatibleClassChangeError.h>
 #include <java/lang/reflect/Modifier.h>
+#include <java/lang/Runtime.h>
 
 #define CloneableClass _CL_Q34java4lang9Cloneable
 extern java::lang::Class CloneableClass;
@@ -193,7 +194,35 @@
 jclass
 gnu::gcj::runtime::VMClassLoader::findSystemClass (jstring name)
 {
-  return _Jv_FindClassInCache (_Jv_makeUtf8Const (name), 0);
+  _Jv_Utf8Const *name_u = _Jv_makeUtf8Const (name);
+  jclass klass = _Jv_FindClassInCache (name_u, 0);
+
+  if (! klass)
+    {
+      // Turn `gnu.pkg.quux' into `gnu-pkg-quux'.  Then search for a
+      // module named (eg, on Linux) `gnu-pkg-quux.so', followed by
+      // `gnu-pkg.so' and `gnu.so'.  If loading one of these causes
+      // the class to appear in the cache, then use it.
+      jstring so_base_name = name->replace ('.', '-');
+
+      while (! klass && so_base_name && so_base_name->length() > 0)
+	{
+	  using namespace ::java::lang;
+	  Runtime *rt = Runtime::getRuntime();
+	  jboolean loaded = rt->loadLibraryInternal (so_base_name);
+
+	  jint nd = so_base_name->lastIndexOf ('-');
+	  if (nd == -1)
+	    so_base_name = NULL;
+	  else
+	    so_base_name = so_base_name->substring (0, nd);
+
+	  if (loaded)
+	    klass = _Jv_FindClassInCache (name_u, 0);
+	}
+    }
+
+  return klass;
 }
 
 jclass
@@ -403,31 +432,11 @@
   _Jv_RegisterClasses (classes);
 }
 
-#if 0
-// NOTE: this one is out of date with the new loader stuff...
 jclass
-_Jv_FindClassInCache (jstring name, java::lang::ClassLoader *loader)
-{
-  JvSynchronize sync (&ClassClass);
-  jint hash = name->hashCode();
-  jclass klass = loaded_classes[(_Jv_ushort) hash % HASH_LEN];
-  for ( ; klass; klass = klass->next)
-    {
-      if (loader == klass->loader
-	  && _Jv_equal (klass->name, name, hash))
-	break;
-    }
-  _Jv_MonitorExit (&ClassClass);
-  return klass;
-}
-#endif
-
-jclass _Jv_FindClass (_Jv_Utf8Const *name,
-		      java::lang::ClassLoader *loader)
+_Jv_FindClass (_Jv_Utf8Const *name, java::lang::ClassLoader *loader)
 {
   jclass klass = _Jv_FindClassInCache (name, loader);
 
-#ifdef INTERPRETER
   if (! klass)
     {
       jstring sname = _Jv_NewStringUTF (name->data);
@@ -466,43 +475,9 @@
       // we're loading, so that they can refer to themselves. 
       _Jv_WaitForState (klass, JV_STATE_LOADED);
     }
-#endif
 
   return klass;
 }
-
-#if 0
-// NOTE: this one is out of date with the new class loader stuff...
-jclass
-_Jv_FindClass (jstring name, java::lang::ClassLoader *loader)
-{
-  jclass klass = _Jv_FindClassInCache (name, loader);
-  if (! klass)
-    {
-      if (loader)
-	{
-	  klass = loader->loadClass(name);
-	}
-      else
-	{
-	  // jmspec 5.3.1.2
-	  
-	  // delegate to the system loader
-	  klass = java::lang::ClassLoader::system.loadClass (sname);
-	  
-	  // register that we're an initiating loader
-	  if (klass)
-	    _Jv_RegisterInitiatingLoader (klass, 0);
-	}
-    }
-  else
-    {
-      _Jv_WaitForState (klass, JV_STATE_LOADED);
-    }
-  
-  return klass;
-}
-#endif
 
 jclass
 _Jv_NewClass (_Jv_Utf8Const *name, jclass superclass,
Index: java/lang/natRuntime.cc
===================================================================
RCS file: /cvs/java/libgcj/libjava/java/lang/natRuntime.cc,v
retrieving revision 1.3
diff -u -r1.3 natRuntime.cc
--- natRuntime.cc	1999/09/10 22:03:08	1.3
+++ natRuntime.cc	2000/01/17 19:11:16
@@ -1,6 +1,6 @@
 // natRuntime.cc - Implementation of native side of Runtime class.
 
-/* Copyright (C) 1998, 1999  Cygnus Solutions
+/* Copyright (C) 1998, 1999, 2000  Cygnus Solutions
 
    This file is part of libgcj.
 
@@ -20,6 +20,10 @@
 
 #ifdef USE_LTDL
 #include <ltdl.h>
+
+/* FIXME: we don't always need this.  The next libtool will let us use
+   AC_LTDL_PREOPEN to see if we do.  */
+const lt_dlsymlist lt_preloaded_symbols[1] = { { 0, 0 } };
 #endif
 
 void
@@ -56,8 +60,12 @@
   checkLink (path);
   using namespace java::lang;
 #ifdef USE_LTDL
+  jint len = _Jv_GetStringUTFLength (path);
+  char buf[len + 1];
+  jsize total = JvGetStringUTFRegion (path, 0, path->length(), buf);
+  buf[total] = '\0';
   // FIXME: make sure path is absolute.
-  lt_dlhandle h = lt_dlopen (FIXME);
+  lt_dlhandle h = lt_dlopen (buf);
   if (h == NULL)
     {
       const char *msg = lt_dlerror ();
@@ -76,8 +84,12 @@
   checkLink (lib);
   using namespace java::lang;
 #ifdef USE_LTDL
+  jint len = _Jv_GetStringUTFLength (lib);
+  char buf[len + 1];
+  jsize total = JvGetStringUTFRegion (lib, 0, lib->length(), buf);
+  buf[total] = '\0';
   // FIXME: make sure path is absolute.
-  lt_dlhandle h = lt_dlopenext (FIXME);
+  lt_dlhandle h = lt_dlopenext (buf);
   if (h == NULL)
     {
       const char *msg = lt_dlerror ();
@@ -86,6 +98,24 @@
 #else
   _Jv_Throw (new UnknownError
 	     (JvNewStringLatin1 ("Runtime.loadLibrary not implemented")));
+#endif /* USE_LTDL */
+}
+
+jboolean
+java::lang::Runtime::loadLibraryInternal (jstring lib)
+{
+  JvSynchronize sync (this);
+  using namespace java::lang;
+#ifdef USE_LTDL
+  jint len = _Jv_GetStringUTFLength (lib);
+  char buf[len + 1];
+  jsize total = JvGetStringUTFRegion (lib, 0, lib->length(), buf);
+  buf[total] = '\0';
+  // FIXME: make sure path is absolute.
+  lt_dlhandle h = lt_dlopenext (buf);
+  return h != NULL;
+#else
+  return false;
 #endif /* USE_LTDL */
 }
 

From java-patches-return-395-listarch-java-patches=sourceware.cygnus.com@sourceware.cygnus.com Tue Jan 18 04:03:19 2000
Return-Path: <java-patches-return-395-listarch-java-patches=sourceware.cygnus.com@sourceware.cygnus.com>
Delivered-To: listarch-java-patches@sourceware.cygnus.com
Received: (qmail 19912 invoked by alias); 18 Jan 2000 04:03:18 -0000
Mailing-List: contact java-patches-help@sourceware.cygnus.com; run by ezmlm
Precedence: bulk
List-Subscribe: <mailto:java-patches-subscribe@sourceware.cygnus.com>
List-Archive: <http://sourceware.cygnus.com/ml/java-patches/>
List-Post: <mailto:java-patches@sourceware.cygnus.com>
List-Help: <mailto:java-patches-help@sourceware.cygnus.com>, <http://sourceware.cygnus.com/ml/#faqs>
Sender: java-patches-owner@sourceware.cygnus.com
Delivered-To: mailing list java-patches@sourceware.cygnus.com
Received: (qmail 19892 invoked from network); 18 Jan 2000 04:03:16 -0000
Message-ID: <3883E678.254ADE3@albatross.co.nz>
Date: Tue, 18 Jan 2000 17:05:12 +1300
From: Bryce McKinlay <bryce@albatross.co.nz>
X-Mailer: Mozilla 4.7 [en] (X11; U; Linux 2.3.25 i686)
X-Accept-Language: en
MIME-Version: 1.0
To: tromey@cygnus.com
CC: Java Patch List <java-patches@sourceware.cygnus.com>
Subject: Re: Patch: dynamic loading
References: <87k8l85x20.fsf@cygnus.com>
Content-Type: text/plain; charset=us-ascii
Content-Transfer-Encoding: 7bit

Tom Tromey wrote:

> I'm committing the appended patch.
> It adds dynamic loading capabilities to libgcj.
>
> With this patch, on native platforms, Runtime.loadLibrary will now
> work correctly.

Tom,

Doing a build out of cvs I'm getting:

Making all in libltdl
/bin/sh: libltdl: No such file or directory

The libjava/libltdl directory exists in my souce tree but never gets created
configured in the build tree.

Any ideas?

  [ bryce ]


From java-patches-return-396-listarch-java-patches=sourceware.cygnus.com@sourceware.cygnus.com Tue Jan 18 05:24:42 2000
Return-Path: <java-patches-return-396-listarch-java-patches=sourceware.cygnus.com@sourceware.cygnus.com>
Delivered-To: listarch-java-patches@sourceware.cygnus.com
Received: (qmail 29686 invoked by alias); 18 Jan 2000 05:24:42 -0000
Mailing-List: contact java-patches-help@sourceware.cygnus.com; run by ezmlm
Precedence: bulk
List-Subscribe: <mailto:java-patches-subscribe@sourceware.cygnus.com>
List-Archive: <http://sourceware.cygnus.com/ml/java-patches/>
List-Post: <mailto:java-patches@sourceware.cygnus.com>
List-Help: <mailto:java-patches-help@sourceware.cygnus.com>, <http://sourceware.cygnus.com/ml/#faqs>
Sender: java-patches-owner@sourceware.cygnus.com
Delivered-To: mailing list java-patches@sourceware.cygnus.com
Received: (qmail 29661 invoked from network); 18 Jan 2000 05:24:42 -0000
Date: Mon, 17 Jan 2000 21:24:40 -0800 (PST)
Message-Id: <200001180524.VAA07879@ferrule.cygnus.com>
From: Tom Tromey <tromey@cygnus.com>
To: Bryce McKinlay <bryce@albatross.co.nz>
Cc: tromey@cygnus.com, Java Patch List <java-patches@sourceware.cygnus.com>
Subject: Re: Patch: dynamic loading
In-Reply-To: <3883E678.254ADE3@albatross.co.nz>
References: <87k8l85x20.fsf@cygnus.com>
	<3883E678.254ADE3@albatross.co.nz>
X-Zippy:  Quick, sing me the BUDAPEST NATIONAL ANTHEM!!
X-Attribution:  Tom

Bryce> The libjava/libltdl directory exists in my souce tree but never
Bryce> gets created configured in the build tree.
Bryce> Any ideas?

Typo on my part.  (And I swear I tested this patch!)
I'll check in the patch in a minute.

Tom

From java-patches-return-397-listarch-java-patches=sourceware.cygnus.com@sourceware.cygnus.com Tue Jan 18 05:26:42 2000
Return-Path: <java-patches-return-397-listarch-java-patches=sourceware.cygnus.com@sourceware.cygnus.com>
Delivered-To: listarch-java-patches@sourceware.cygnus.com
Received: (qmail 29859 invoked by alias); 18 Jan 2000 05:26:42 -0000
Mailing-List: contact java-patches-help@sourceware.cygnus.com; run by ezmlm
Precedence: bulk
List-Subscribe: <mailto:java-patches-subscribe@sourceware.cygnus.com>
List-Archive: <http://sourceware.cygnus.com/ml/java-patches/>
List-Post: <mailto:java-patches@sourceware.cygnus.com>
List-Help: <mailto:java-patches-help@sourceware.cygnus.com>, <http://sourceware.cygnus.com/ml/#faqs>
Sender: java-patches-owner@sourceware.cygnus.com
Delivered-To: mailing list java-patches@sourceware.cygnus.com
Received: (qmail 29839 invoked from network); 18 Jan 2000 05:26:38 -0000
To: Java Patch List <java-patches@sourceware.cygnus.com> 
Subject: Patch: typo in configure.in
X-Zippy:  Xerox your lunch and file it under ``sex offenders!''
X-Attribution:  Tom
Bcc:
Reply-To:  tromey@cygnus.com
From:  Tom Tromey <tromey@cygnus.com>
Date: 17 Jan 2000 22:27:04 -0700
Message-ID: <87embg54rb.fsf@cygnus.com>
Lines: 25
X-Mailer: Gnus v5.5/Emacs 20.3

This fixes a typo in my recent dynamic loading patch.

2000-01-17  Tom Tromey  <tromey@cygnus.com>

	* configure: Rebuilt.
	* configure.in: Fixed typo in AC_CONFIG_SUBDIRS call.

Tom

Index: configure.in
===================================================================
RCS file: /cvs/java/libgcj/libjava/configure.in,v
retrieving revision 1.47
diff -u -r1.47 configure.in
--- configure.in	2000/01/17 19:22:20	1.47
+++ configure.in	2000/01/18 05:25:21
@@ -30,7 +30,7 @@
 AC_SUBST(LIBLTDL)
 AC_SUBST(DIRLTDL)
 AM_PROG_LIBTOOL
-AC_CONFIG_SUBDIRS($DIRLDL)
+AC_CONFIG_SUBDIRS($DIRLTDL)
 
 if test -z "$with_target_subdir" || test "$with_target_subdir" = "."; then
    COMPPATH=.

From java-patches-return-398-listarch-java-patches=sourceware.cygnus.com@sourceware.cygnus.com Tue Jan 18 06:14:27 2000
Return-Path: <java-patches-return-398-listarch-java-patches=sourceware.cygnus.com@sourceware.cygnus.com>
Delivered-To: listarch-java-patches@sourceware.cygnus.com
Received: (qmail 1129 invoked by alias); 18 Jan 2000 06:14:27 -0000
Mailing-List: contact java-patches-help@sourceware.cygnus.com; run by ezmlm
Precedence: bulk
List-Subscribe: <mailto:java-patches-subscribe@sourceware.cygnus.com>
List-Archive: <http://sourceware.cygnus.com/ml/java-patches/>
List-Post: <mailto:java-patches@sourceware.cygnus.com>
List-Help: <mailto:java-patches-help@sourceware.cygnus.com>, <http://sourceware.cygnus.com/ml/#faqs>
Sender: java-patches-owner@sourceware.cygnus.com
Delivered-To: mailing list java-patches@sourceware.cygnus.com
Received: (qmail 1108 invoked from network); 18 Jan 2000 06:14:22 -0000
To: Java Patch List <java-patches@sourceware.cygnus.com> 
Subject: Patch: fixlet to Throwable
X-Zippy:  MERYL STREEP is my obstetrician!
X-Attribution:  Tom
Bcc:
Reply-To:  tromey@cygnus.com
From:  Tom Tromey <tromey@cygnus.com>
Date: 17 Jan 2000 23:15:06 -0700
Message-ID: <87d7qz6h3p.fsf@cygnus.com>
Lines: 29
X-Mailer: Gnus v5.5/Emacs 20.3

I'm committing this patch.
It changes Throwable.fillInStackTrace so that it always returns a
value, even when the stack trace isn't computed.

2000-01-17  Tom Tromey  <tromey@cygnus.com>

	* java/lang/natThrowable.cc (fillInStackTrace): Return `this' even
	when backtrace can't be computed.

Tom

Index: java/lang/natThrowable.cc
===================================================================
RCS file: /cvs/java/libgcj/libjava/java/lang/natThrowable.cc,v
retrieving revision 1.1
diff -u -r1.1 natThrowable.cc
--- natThrowable.cc	2000/01/17 15:43:32	1.1
+++ natThrowable.cc	2000/01/18 06:09:47
@@ -57,9 +57,9 @@
   // ???  Might this cause a problem if the byte array isn't aligned?
   stackTrace = JvNewByteArray (n * sizeof p[0]);
   memcpy (elements (stackTrace), p+1, (n * sizeof p[0]));
+#endif
 
   return this;
-#endif
 }
 
 void 

From java-patches-return-399-listarch-java-patches=sourceware.cygnus.com@sourceware.cygnus.com Wed Jan 19 02:19:12 2000
Return-Path: <java-patches-return-399-listarch-java-patches=sourceware.cygnus.com@sourceware.cygnus.com>
Delivered-To: listarch-java-patches@sourceware.cygnus.com
Received: (qmail 7160 invoked by alias); 19 Jan 2000 02:19:12 -0000
Mailing-List: contact java-patches-help@sourceware.cygnus.com; run by ezmlm
Precedence: bulk
List-Subscribe: <mailto:java-patches-subscribe@sourceware.cygnus.com>
List-Archive: <http://sourceware.cygnus.com/ml/java-patches/>
List-Post: <mailto:java-patches@sourceware.cygnus.com>
List-Help: <mailto:java-patches-help@sourceware.cygnus.com>, <http://sourceware.cygnus.com/ml/#faqs>
Sender: java-patches-owner@sourceware.cygnus.com
Delivered-To: mailing list java-patches@sourceware.cygnus.com
Received: (qmail 7141 invoked from network); 19 Jan 2000 02:19:10 -0000
Message-ID: <38851F9D.D6B238B6@albatross.co.nz>
Date: Wed, 19 Jan 2000 15:21:17 +1300
From: Bryce McKinlay <bryce@albatross.co.nz>
X-Mailer: Mozilla 4.7 [en] (X11; U; Linux 2.3.25 i686)
X-Accept-Language: en
MIME-Version: 1.0
To: java-patches@sourceware.cygnus.com
Subject: patch: --disable-interpreter
Content-Type: text/plain; charset=us-ascii
Content-Transfer-Encoding: 7bit

It seems natural to me to provide a "--disable-interpreter" configure option now
that the interpreter is enabled by default on some platforms. Is this patch ok?

  [ bryce ]

===================================================================
RCS file: /cvs/java/libgcj/libjava/configure.in,v
retrieving revision 1.49
diff -u -r1.49 configure.in
--- configure.in        2000/01/18 14:41:08     1.49
+++ configure.in        2000/01/19 02:14:43
@@ -78,6 +78,10 @@
     libgcj_interpreter=yes
   fi)

+AC_ARG_ENABLE(interpreter,
+[  --disable-interpreter   disable bytecode interpreter],
+    libgcj_interpreter=no)
+
 if test "$libgcj_interpreter" = yes; then
    AC_DEFINE(INTERPRETER)
 fi


From java-patches-return-400-listarch-java-patches=sourceware.cygnus.com@sourceware.cygnus.com Wed Jan 19 03:02:01 2000
Return-Path: <java-patches-return-400-listarch-java-patches=sourceware.cygnus.com@sourceware.cygnus.com>
Delivered-To: listarch-java-patches@sourceware.cygnus.com
Received: (qmail 13548 invoked by alias); 19 Jan 2000 03:02:01 -0000
Mailing-List: contact java-patches-help@sourceware.cygnus.com; run by ezmlm
Precedence: bulk
List-Subscribe: <mailto:java-patches-subscribe@sourceware.cygnus.com>
List-Archive: <http://sourceware.cygnus.com/ml/java-patches/>
List-Post: <mailto:java-patches@sourceware.cygnus.com>
List-Help: <mailto:java-patches-help@sourceware.cygnus.com>, <http://sourceware.cygnus.com/ml/#faqs>
Sender: java-patches-owner@sourceware.cygnus.com
Delivered-To: mailing list java-patches@sourceware.cygnus.com
Received: (qmail 13526 invoked from network); 19 Jan 2000 03:01:59 -0000
Message-ID: <388529A6.268B5BE3@albatross.co.nz>
Date: Wed, 19 Jan 2000 16:04:06 +1300
From: Bryce McKinlay <bryce@albatross.co.nz>
X-Mailer: Mozilla 4.7 [en] (X11; U; Linux 2.3.25 i686)
X-Accept-Language: en
MIME-Version: 1.0
To: java-patches@sourceware.cygnus.com
Subject: htdocs patch: cvsweb link
Content-Type: text/plain; charset=us-ascii
Content-Transfer-Encoding: 7bit

I couldn't find a link to sourceware's cvsweb on the gcj pages, which I use
fairly regularly. So I checked in this addition:

regards

  [ bryce ]


2000-01-18  Bryce McKinlay  <bryce@albatross.co.nz>

        * download.html: Add link to cvsweb.

===================================================================
RCS file: /cvs/java/htdocs/download.html,v
retrieving revision 1.1
diff -u -r1.1 download.html
--- download.html       1999/09/07 00:34:01     1.1
+++ download.html       2000/01/19 02:57:53
@@ -101,6 +101,10 @@
 </pre>
 </small>

+<p>
+You can also <a
href="http://sourceware.cygnus.com/cgi-bin/cvsweb.cgi/libgcj/?cvsroot=java">
+view the cvs archive</a> via cvsweb.
+
 </td></tr>
 </table>


From java-patches-return-401-listarch-java-patches=sourceware.cygnus.com@sourceware.cygnus.com Wed Jan 19 04:11:36 2000
Return-Path: <java-patches-return-401-listarch-java-patches=sourceware.cygnus.com@sourceware.cygnus.com>
Delivered-To: listarch-java-patches@sourceware.cygnus.com
Received: (qmail 25251 invoked by alias); 19 Jan 2000 04:11:35 -0000
Mailing-List: contact java-patches-help@sourceware.cygnus.com; run by ezmlm
Precedence: bulk
List-Subscribe: <mailto:java-patches-subscribe@sourceware.cygnus.com>
List-Archive: <http://sourceware.cygnus.com/ml/java-patches/>
List-Post: <mailto:java-patches@sourceware.cygnus.com>
List-Help: <mailto:java-patches-help@sourceware.cygnus.com>, <http://sourceware.cygnus.com/ml/#faqs>
Sender: java-patches-owner@sourceware.cygnus.com
Delivered-To: mailing list java-patches@sourceware.cygnus.com
Received: (qmail 25226 invoked from network); 19 Jan 2000 04:11:34 -0000
Date: Tue, 18 Jan 2000 20:11:32 -0800 (PST)
Message-Id: <200001190411.UAA18085@ferrule.cygnus.com>
From: Tom Tromey <tromey@cygnus.com>
To: Bryce McKinlay <bryce@albatross.co.nz>
Cc: java-patches@sourceware.cygnus.com
Subject: Re: patch: --disable-interpreter
In-Reply-To: <38851F9D.D6B238B6@albatross.co.nz>
References: <38851F9D.D6B238B6@albatross.co.nz>
X-Zippy:  RELATIVES!!
X-Attribution:  Tom

>>>>> "Bryce" == Bryce McKinlay <bryce@albatross.co.nz> writes:

Bryce> It seems natural to me to provide a "--disable-interpreter"
Bryce> configure option now that the interpreter is enabled by default
Bryce> on some platforms. Is this patch ok?

configure will automatically recognize --disable-interpreter since we
already have an AC_ARG_ENABLE for it.  We just have to convince it to
do the right thing.

So this patch isn't the one.

The right thing to do is to add a case to the "if" inside the existing
AC_ARG_ENABLE.  Something like:

  elif test "$enable_interpreter" = no; then
    libgcj_interpreter=no
  fi

Tom

From java-patches-return-402-listarch-java-patches=sourceware.cygnus.com@sourceware.cygnus.com Wed Jan 19 04:52:28 2000
Return-Path: <java-patches-return-402-listarch-java-patches=sourceware.cygnus.com@sourceware.cygnus.com>
Delivered-To: listarch-java-patches@sourceware.cygnus.com
Received: (qmail 30456 invoked by alias); 19 Jan 2000 04:52:28 -0000
Mailing-List: contact java-patches-help@sourceware.cygnus.com; run by ezmlm
Precedence: bulk
List-Subscribe: <mailto:java-patches-subscribe@sourceware.cygnus.com>
List-Archive: <http://sourceware.cygnus.com/ml/java-patches/>
List-Post: <mailto:java-patches@sourceware.cygnus.com>
List-Help: <mailto:java-patches-help@sourceware.cygnus.com>, <http://sourceware.cygnus.com/ml/#faqs>
Sender: java-patches-owner@sourceware.cygnus.com
Delivered-To: mailing list java-patches@sourceware.cygnus.com
Received: (qmail 30431 invoked from network); 19 Jan 2000 04:52:26 -0000
Message-ID: <38854389.325F56E9@albatross.co.nz>
Date: Wed, 19 Jan 2000 17:54:34 +1300
From: Bryce McKinlay <bryce@albatross.co.nz>
X-Mailer: Mozilla 4.7 [en] (X11; U; Linux 2.3.25 i686)
X-Accept-Language: en
MIME-Version: 1.0
To: java-patches@sourceware.cygnus.com
Subject: natThrowable.lo multiple definition error
Content-Type: text/plain; charset=us-ascii
Content-Transfer-Encoding: 7bit

I'm getting a link error (gcc 2.95.2):

/home/bryce/projects/libgcj/build/i686-pc-linux-gnu/libjava/java/lang/Throwable.h:16:
multiple definition of `java::lang::Throwable::getMessage(void)'
java/lang/Throwable.lo:/home/bryce/projects/libgcj/build/i686-pc-linux-gnu/libjava/../../../libjava/java/lang/Throwable.java:38:
first defined here
/usr/bin/ld: Warning: size of symbol `java::lang::Throwable::getMessage(void)'
changed from 17 to 13 in java/lang/natThrowable.lo
collect2: ld returned 1 exit status

gchj is creating an inline definition of getMessage() and for some reason the
symbol for that method is showing up in both natThrowable.lo and Throwable.lo

The fix seems to be to remove the `#pragma implementation "Throwable.h"' from
natThrowable.cc. Is this the right thing to do?

  [ bryce ]



===================================================================
RCS file: /cvs/java/libgcj/libjava/java/lang/natThrowable.cc,v
retrieving revision 1.2
diff -u -r1.2 natThrowable.cc
--- natThrowable.cc     2000/01/18 06:22:13     1.2
+++ natThrowable.cc     2000/01/19 04:35:39
@@ -17,8 +17,6 @@

 #include <string.h>

-#pragma implementation "Throwable.h"
-
 #include <gcj/cni.h>
 #include <jvm.h>
 #include <java/lang/Object.h>



From java-patches-return-403-listarch-java-patches=sourceware.cygnus.com@sourceware.cygnus.com Wed Jan 19 04:54:34 2000
Return-Path: <java-patches-return-403-listarch-java-patches=sourceware.cygnus.com@sourceware.cygnus.com>
Delivered-To: listarch-java-patches@sourceware.cygnus.com
Received: (qmail 30622 invoked by alias); 19 Jan 2000 04:54:34 -0000
Mailing-List: contact java-patches-help@sourceware.cygnus.com; run by ezmlm
Precedence: bulk
List-Subscribe: <mailto:java-patches-subscribe@sourceware.cygnus.com>
List-Archive: <http://sourceware.cygnus.com/ml/java-patches/>
List-Post: <mailto:java-patches@sourceware.cygnus.com>
List-Help: <mailto:java-patches-help@sourceware.cygnus.com>, <http://sourceware.cygnus.com/ml/#faqs>
Sender: java-patches-owner@sourceware.cygnus.com
Delivered-To: mailing list java-patches@sourceware.cygnus.com
Received: (qmail 30602 invoked from network); 19 Jan 2000 04:54:32 -0000
Message-ID: <38854407.9B80A95@albatross.co.nz>
Date: Wed, 19 Jan 2000 17:56:39 +1300
From: Bryce McKinlay <bryce@albatross.co.nz>
X-Mailer: Mozilla 4.7 [en] (X11; U; Linux 2.3.25 i686)
X-Accept-Language: en
MIME-Version: 1.0
To: Tom Tromey <tromey@cygnus.com>
CC: java-patches@sourceware.cygnus.com
Subject: Re: patch: --disable-interpreter
References: <38851F9D.D6B238B6@albatross.co.nz> <200001190411.UAA18085@ferrule.cygnus.com>
Content-Type: text/plain; charset=us-ascii
Content-Transfer-Encoding: 7bit

Tom Tromey wrote:

> The right thing to do is to add a case to the "if" inside the existing
> AC_ARG_ENABLE.  Something like:
>
>   elif test "$enable_interpreter" = no; then
>     libgcj_interpreter=no
>   fi

Okay, that seems to work. Can somebody else check this in? I'm not sure if my
autoconf is 100% up to date.

===================================================================
RCS file: /cvs/java/libgcj/libjava/configure.in,v
retrieving revision 1.49
diff -u -r1.49 configure.in
--- configure.in        2000/01/18 14:41:08     1.49
+++ configure.in        2000/01/19 04:52:45
@@ -76,6 +76,8 @@
   if test "$enable_interpreter" = yes; then
     # This can also be set in configure.host.
     libgcj_interpreter=yes
+  elif test "$enable_interpreter" = no; then
+    libgcj_interpreter=no
   fi)

 if test "$libgcj_interpreter" = yes; then



From java-patches-return-404-listarch-java-patches=sourceware.cygnus.com@sourceware.cygnus.com Wed Jan 19 05:09:19 2000
Return-Path: <java-patches-return-404-listarch-java-patches=sourceware.cygnus.com@sourceware.cygnus.com>
Delivered-To: listarch-java-patches@sourceware.cygnus.com
Received: (qmail 3565 invoked by alias); 19 Jan 2000 05:09:19 -0000
Mailing-List: contact java-patches-help@sourceware.cygnus.com; run by ezmlm
Precedence: bulk
List-Subscribe: <mailto:java-patches-subscribe@sourceware.cygnus.com>
List-Archive: <http://sourceware.cygnus.com/ml/java-patches/>
List-Post: <mailto:java-patches@sourceware.cygnus.com>
List-Help: <mailto:java-patches-help@sourceware.cygnus.com>, <http://sourceware.cygnus.com/ml/#faqs>
Sender: java-patches-owner@sourceware.cygnus.com
Delivered-To: mailing list java-patches@sourceware.cygnus.com
Received: (qmail 3540 invoked from network); 19 Jan 2000 05:09:18 -0000
Date: Tue, 18 Jan 2000 21:09:15 -0800 (PST)
Message-Id: <200001190509.VAA03187@ferrule.cygnus.com>
From: Tom Tromey <tromey@cygnus.com>
To: Bryce McKinlay <bryce@albatross.co.nz>
Cc: Tom Tromey <tromey@cygnus.com>, java-patches@sourceware.cygnus.com
Subject: Re: patch: --disable-interpreter
In-Reply-To: <38854407.9B80A95@albatross.co.nz>
References: <38851F9D.D6B238B6@albatross.co.nz>
	<200001190411.UAA18085@ferrule.cygnus.com>
	<38854407.9B80A95@albatross.co.nz>
X-Zippy:  How do I get HOME?
X-Attribution:  Tom

Bryce> Okay, that seems to work. Can somebody else check this in? I'm
Bryce> not sure if my autoconf is 100% up to date.

I checked it in.

Tom

From java-patches-return-405-listarch-java-patches=sourceware.cygnus.com@sourceware.cygnus.com Wed Jan 19 05:26:04 2000
Return-Path: <java-patches-return-405-listarch-java-patches=sourceware.cygnus.com@sourceware.cygnus.com>
Delivered-To: listarch-java-patches@sourceware.cygnus.com
Received: (qmail 5042 invoked by alias); 19 Jan 2000 05:26:04 -0000
Mailing-List: contact java-patches-help@sourceware.cygnus.com; run by ezmlm
Precedence: bulk
List-Subscribe: <mailto:java-patches-subscribe@sourceware.cygnus.com>
List-Archive: <http://sourceware.cygnus.com/ml/java-patches/>
List-Post: <mailto:java-patches@sourceware.cygnus.com>
List-Help: <mailto:java-patches-help@sourceware.cygnus.com>, <http://sourceware.cygnus.com/ml/#faqs>
Sender: java-patches-owner@sourceware.cygnus.com
Delivered-To: mailing list java-patches@sourceware.cygnus.com
Received: (qmail 5013 invoked from network); 19 Jan 2000 05:25:59 -0000
Message-ID: <38854B62.EEBD4C9F@albatross.co.nz>
Date: Wed, 19 Jan 2000 18:28:02 +1300
From: Bryce McKinlay <bryce@albatross.co.nz>
X-Mailer: Mozilla 4.7 [en] (X11; U; Linux 2.3.25 i686)
X-Accept-Language: en
MIME-Version: 1.0
To: Andrew Haley <aph@pasanda.cygnus.co.uk>
CC: java-patches@sourceware.cygnus.com
Subject: Re: Throwable.printStackTrace ()
References: <20000117163708.5851.qmail@pasanda.cygnus.co.uk>
Content-Type: text/plain; charset=us-ascii
Content-Transfer-Encoding: 7bit

Andrew Haley wrote:

> I've checked in code to print stack traces.  It's not yet perfect, but
> I figured that it's such a useful debugging tool that it makes no
> sense to wait for perfection.

Very cool!!

One comment I would have is that the output may be a bit more verbose than
needed. For example, consider the following stack traces produced by a simple
test program, running under both the IBM VM and gcj:

$ java ExceptionTest
java.lang.Exception
        at ExceptionTest.bar(ExceptionTest.java:23)
        at ExceptionTest.foo(ExceptionTest.java:18)
        at ExceptionTest.main(ExceptionTest.java:8

$ ./exceptiontest
java.lang.Exception
   at 0x400caa48: __Q34java4lang9Throwable (/usr/local/gcc/lib/libgcj.so.1)
   at 0x400beafb: __Q34java4lang9Exception (/usr/local/gcc/lib/libgcj.so.1)
   at 0x0804b2bb: ExceptionTest::bar(int)
(/home/bryce/projects/tests/ExceptionTest.java:22)
   at 0x0804b286: ExceptionTest::foo(void)
(/home/bryce/projects/tests/ExceptionTest.java:18)
   at 0x0804b217: ExceptionTest::main(JArray<java::lang::String *> *)
(/home/bryce/projects/tests/ExceptionTest.java:8)
   at 0x4010ca30: run__Q34java4lang11FirstThread
(/usr/local/gcc/lib/libgcj.so.1)
   at 0x400c81b2: run___Q34java4lang6Thread (/usr/local/gcc/lib/libgcj.so.1)
   at 0x40111fea: run____Q34java4lang6ThreadPQ34java4lang6Object
(/usr/local/gcc/lib/libgcj.so.1)
   at 0x401222e2: _Jv_ThreadSetPriority__FP12_Jv_Thread_ti
(/usr/local/gcc/lib/libgcj.so.1)
   at 0x401d0c56: GC_start_routine (/usr/local/gcc/lib/libgcjgc.so.1)
   at 0x401e6eca: pthread_detach (/lib/libpthread.so.0)

Hmm. I suggest that first two lines and everything below main() are redundant
for the vast majority of debugging tasks. And how useful is having the address?

regards

  [ bryce ]


From java-patches-return-406-listarch-java-patches=sourceware.cygnus.com@sourceware.cygnus.com Wed Jan 19 06:34:56 2000
Return-Path: <java-patches-return-406-listarch-java-patches=sourceware.cygnus.com@sourceware.cygnus.com>
Delivered-To: listarch-java-patches@sourceware.cygnus.com
Received: (qmail 16562 invoked by alias); 19 Jan 2000 06:34:56 -0000
Mailing-List: contact java-patches-help@sourceware.cygnus.com; run by ezmlm
Precedence: bulk
List-Subscribe: <mailto:java-patches-subscribe@sourceware.cygnus.com>
List-Archive: <http://sourceware.cygnus.com/ml/java-patches/>
List-Post: <mailto:java-patches@sourceware.cygnus.com>
List-Help: <mailto:java-patches-help@sourceware.cygnus.com>, <http://sourceware.cygnus.com/ml/#faqs>
Sender: java-patches-owner@sourceware.cygnus.com
Delivered-To: mailing list java-patches@sourceware.cygnus.com
Received: (qmail 16537 invoked from network); 19 Jan 2000 06:34:54 -0000
Date: Tue, 18 Jan 2000 22:34:50 -0800 (PST)
Message-Id: <200001190634.WAA03292@ferrule.cygnus.com>
From: Tom Tromey <tromey@cygnus.com>
To: Bryce McKinlay <bryce@albatross.co.nz>
Cc: java-patches@sourceware.cygnus.com
Subject: Re: natThrowable.lo multiple definition error
In-Reply-To: <38854389.325F56E9@albatross.co.nz>
References: <38854389.325F56E9@albatross.co.nz>
X-Zippy:  Where's th' DAFFY DUCK EXHIBIT??
X-Attribution:  Tom

>>>>> "Bryce" == Bryce McKinlay <bryce@albatross.co.nz> writes:

Bryce> The fix seems to be to remove the `#pragma implementation
Bryce> "Throwable.h"' from natThrowable.cc. Is this the right thing to
Bryce> do?

This seems ok to me.
Go ahead and check it in.

Elsewhere we only use #pragma implementation when we definitely know
we want the inline functions in the header to be "outlined".  But that
isn't the case here.

Something for the CNI docs, I think.

Tom

From java-patches-return-407-listarch-java-patches=sourceware.cygnus.com@sourceware.cygnus.com Wed Jan 19 11:16:12 2000
Return-Path: <java-patches-return-407-listarch-java-patches=sourceware.cygnus.com@sourceware.cygnus.com>
Delivered-To: listarch-java-patches@sourceware.cygnus.com
Received: (qmail 30281 invoked by alias); 19 Jan 2000 11:16:11 -0000
Mailing-List: contact java-patches-help@sourceware.cygnus.com; run by ezmlm
Precedence: bulk
List-Subscribe: <mailto:java-patches-subscribe@sourceware.cygnus.com>
List-Archive: <http://sourceware.cygnus.com/ml/java-patches/>
List-Post: <mailto:java-patches@sourceware.cygnus.com>
List-Help: <mailto:java-patches-help@sourceware.cygnus.com>, <http://sourceware.cygnus.com/ml/#faqs>
Sender: java-patches-owner@sourceware.cygnus.com
Delivered-To: mailing list java-patches@sourceware.cygnus.com
Received: (qmail 30257 invoked from network); 19 Jan 2000 11:16:09 -0000
Date: 19 Jan 2000 11:16:06 -0000
Message-ID: <20000119111606.11764.qmail@pasanda.cygnus.co.uk>
From: Andrew Haley <aph@pasanda.cygnus.co.uk>
To: bryce@albatross.co.nz
CC: java-patches@sourceware.cygnus.com
In-reply-to: <38854B62.EEBD4C9F@albatross.co.nz> (message from Bryce McKinlay
	on Wed, 19 Jan 2000 18:28:02 +1300)
Subject: Re: Throwable.printStackTrace ()

> Date: Wed, 19 Jan 2000 18:28:02 +1300
> From: Bryce McKinlay <bryce@albatross.co.nz>
> 
> Andrew Haley wrote:
> 
> > I've checked in code to print stack traces.  It's not yet perfect, but
> > I figured that it's such a useful debugging tool that it makes no
> > sense to wait for perfection.
> 
> Very cool!!
> 
> One comment I would have is that the output may be a bit more verbose than
> needed. For example, consider the following stack traces produced by a simple
> test program, running under both the IBM VM and gcj:

Sure, our stack trace gives so much more information than the IBM VM.
That's a feature!  I wasn't trying to emulate what Sun do, but to do
something better.

> $ java ExceptionTest
> java.lang.Exception
>         at ExceptionTest.bar(ExceptionTest.java:23)
>         at ExceptionTest.foo(ExceptionTest.java:18)
>         at ExceptionTest.main(ExceptionTest.java:8
> 
> $ ./exceptiontest
> java.lang.Exception
>    at 0x400caa48: __Q34java4lang9Throwable (/usr/local/gcc/lib/libgcj.so.1)
>    at 0x400beafb: __Q34java4lang9Exception (/usr/local/gcc/lib/libgcj.so.1)
>    at 0x0804b2bb: ExceptionTest::bar(int)
> (/home/bryce/projects/tests/ExceptionTest.java:22)
>    at 0x0804b286: ExceptionTest::foo(void)
> (/home/bryce/projects/tests/ExceptionTest.java:18)
>    at 0x0804b217: ExceptionTest::main(JArray<java::lang::String *> *)
> (/home/bryce/projects/tests/ExceptionTest.java:8)
>    at 0x4010ca30: run__Q34java4lang11FirstThread
> (/usr/local/gcc/lib/libgcj.so.1)
>    at 0x400c81b2: run___Q34java4lang6Thread (/usr/local/gcc/lib/libgcj.so.1)
>    at 0x40111fea: run____Q34java4lang6ThreadPQ34java4lang6Object
> (/usr/local/gcc/lib/libgcj.so.1)
>    at 0x401222e2: _Jv_ThreadSetPriority__FP12_Jv_Thread_ti
> (/usr/local/gcc/lib/libgcj.so.1)
>    at 0x401d0c56: GC_start_routine (/usr/local/gcc/lib/libgcjgc.so.1)
>    at 0x401e6eca: pthread_detach (/lib/libpthread.so.0)
> 
> Hmm. I suggest that first two lines and everything below main() are
> redundant for the vast majority of debugging tasks.

Perhaps, but don't forget that one of the things stack traces will be
used for is sending bug reports to the mailing list, where such info
is valuable.  We could certainly lose the first two lines, but the
function signatures are very useful, and I very much like the fact
that you can see where the thread started.

Also, I have a bias because I get to debug the exception handler
mechanism!

> And how useful is having the address?

Hmm.  Without the address you would not be able to distinguish between
identical static symbols.

Andrew.

From java-patches-return-408-listarch-java-patches=sourceware.cygnus.com@sourceware.cygnus.com Wed Jan 19 17:28:38 2000
Return-Path: <java-patches-return-408-listarch-java-patches=sourceware.cygnus.com@sourceware.cygnus.com>
Delivered-To: listarch-java-patches@sourceware.cygnus.com
Received: (qmail 22518 invoked by alias); 19 Jan 2000 17:28:38 -0000
Mailing-List: contact java-patches-help@sourceware.cygnus.com; run by ezmlm
Precedence: bulk
List-Subscribe: <mailto:java-patches-subscribe@sourceware.cygnus.com>
List-Archive: <http://sourceware.cygnus.com/ml/java-patches/>
List-Post: <mailto:java-patches@sourceware.cygnus.com>
List-Help: <mailto:java-patches-help@sourceware.cygnus.com>, <http://sourceware.cygnus.com/ml/#faqs>
Sender: java-patches-owner@sourceware.cygnus.com
Delivered-To: mailing list java-patches@sourceware.cygnus.com
Received: (qmail 22497 invoked from network); 19 Jan 2000 17:28:34 -0000
To: Java Patch List <java-patches@sourceware.cygnus.com> 
Subject: Patch: inner class test case
X-Zippy:  I think I am an overnight sensation right now!!
X-Attribution:  Tom
Bcc:
Reply-To:  tromey@cygnus.com
From:  Tom Tromey <tromey@cygnus.com>
Date: 19 Jan 2000 10:30:14 -0700
Message-ID: <877lh655qx.fsf@cygnus.com>
Lines: 28
X-Mailer: Gnus v5.5/Emacs 20.3

I'm committing this patch.  It is a test case for inner classes.
(No, the inner class code isn't in the compiler yet.)

2000-01-18  Tom Tromey  <tromey@cygnus.com>

	* libjava.compile/inner_pub.java: New file.

Tom

? libjava.compile/G19990210_1.class
Index: libjava.compile/inner_pub.java
===================================================================
RCS file: inner_pub.java
diff -N inner_pub.java
--- /dev/null	Tue May  5 13:32:27 1998
+++ inner_pub.java	Wed Jan 19 08:45:39 2000
@@ -0,0 +1,11 @@
+// Test to ensure that public inner classes work.
+
+public class inner_pub
+{
+  public class really_inner
+  {
+    int z;
+  }
+
+  really_inner foo;
+}

From java-patches-return-409-listarch-java-patches=sourceware.cygnus.com@sourceware.cygnus.com Wed Jan 19 18:33:40 2000
Return-Path: <java-patches-return-409-listarch-java-patches=sourceware.cygnus.com@sourceware.cygnus.com>
Delivered-To: listarch-java-patches@sourceware.cygnus.com
Received: (qmail 3088 invoked by alias); 19 Jan 2000 18:33:40 -0000
Mailing-List: contact java-patches-help@sourceware.cygnus.com; run by ezmlm
Precedence: bulk
List-Subscribe: <mailto:java-patches-subscribe@sourceware.cygnus.com>
List-Archive: <http://sourceware.cygnus.com/ml/java-patches/>
List-Post: <mailto:java-patches@sourceware.cygnus.com>
List-Help: <mailto:java-patches-help@sourceware.cygnus.com>, <http://sourceware.cygnus.com/ml/#faqs>
Sender: java-patches-owner@sourceware.cygnus.com
Delivered-To: mailing list java-patches@sourceware.cygnus.com
Received: (qmail 3049 invoked from network); 19 Jan 2000 18:33:27 -0000
To: Java Patch List <java-patches@sourceware.cygnus.com> 
Subject: Patch: copyright change
X-Zippy:  Don't SANFORIZE me!!
X-Attribution:  Tom
Bcc:
Reply-To:  tromey@cygnus.com
From:  Tom Tromey <tromey@cygnus.com>
Date: 19 Jan 2000 11:33:50 -0700
Message-ID: <8766wp6hdd.fsf@cygnus.com>
Lines: 9
X-Mailer: Gnus v5.5/Emacs 20.3

I'm checking in a rather large patch which changes all files to be
copyright Red Hat instead of Cygnus.  I'm not going to post the patch
since it is very large, and I did it mechanically.

2000-01-19  Tom Tromey  <tromey@cygnus.com>

	* All files: Updated copyright to reflect Cygnus purchase.

Tom

From java-patches-return-410-listarch-java-patches=sourceware.cygnus.com@sourceware.cygnus.com Wed Jan 19 18:55:41 2000
Return-Path: <java-patches-return-410-listarch-java-patches=sourceware.cygnus.com@sourceware.cygnus.com>
Delivered-To: listarch-java-patches@sourceware.cygnus.com
Received: (qmail 9149 invoked by alias); 19 Jan 2000 18:55:41 -0000
Mailing-List: contact java-patches-help@sourceware.cygnus.com; run by ezmlm
Precedence: bulk
List-Subscribe: <mailto:java-patches-subscribe@sourceware.cygnus.com>
List-Archive: <http://sourceware.cygnus.com/ml/java-patches/>
List-Post: <mailto:java-patches@sourceware.cygnus.com>
List-Help: <mailto:java-patches-help@sourceware.cygnus.com>, <http://sourceware.cygnus.com/ml/#faqs>
Sender: java-patches-owner@sourceware.cygnus.com
Delivered-To: mailing list java-patches@sourceware.cygnus.com
Received: (qmail 9128 invoked from network); 19 Jan 2000 18:55:37 -0000
To: Java Patch List <java-patches@sourceware.cygnus.com> 
Subject: Patch: don't use #pragma implementation
X-Zippy:  I am deeply CONCERNED and I want something GOOD for BREAKFAST!
X-Attribution:  Tom
Bcc:
Reply-To:  tromey@cygnus.com
From:  Tom Tromey <tromey@cygnus.com>
Date: 19 Jan 2000 11:56:39 -0700
Message-ID: <874sc96gbc.fsf@cygnus.com>
Lines: 26
X-Mailer: Gnus v5.5/Emacs 20.3

I'm checking in this patch from Bryce.

2000-01-19  Tom Tromey  <tromey@cygnus.com>

	* java/lang/natThrowable.cc: Don't use `#pragma implementation'.
	From Bryce McKinlay.


Tom

Index: java/lang/natThrowable.cc
===================================================================
RCS file: /cvs/java/libgcj/libjava/java/lang/natThrowable.cc,v
retrieving revision 1.2
diff -u -r1.2 natThrowable.cc
--- natThrowable.cc	2000/01/18 06:22:13	1.2
+++ natThrowable.cc	2000/01/19 18:54:00
@@ -17,8 +17,6 @@
 
 #include <string.h>
 
-#pragma implementation "Throwable.h"
-
 #include <gcj/cni.h>
 #include <jvm.h>
 #include <java/lang/Object.h>

From java-patches-return-411-listarch-java-patches=sourceware.cygnus.com@sourceware.cygnus.com Wed Jan 19 21:03:49 2000
Return-Path: <java-patches-return-411-listarch-java-patches=sourceware.cygnus.com@sourceware.cygnus.com>
Delivered-To: listarch-java-patches@sourceware.cygnus.com
Received: (qmail 27001 invoked by alias); 19 Jan 2000 21:03:48 -0000
Mailing-List: contact java-patches-help@sourceware.cygnus.com; run by ezmlm
Precedence: bulk
List-Subscribe: <mailto:java-patches-subscribe@sourceware.cygnus.com>
List-Archive: <http://sourceware.cygnus.com/ml/java-patches/>
List-Post: <mailto:java-patches@sourceware.cygnus.com>
List-Help: <mailto:java-patches-help@sourceware.cygnus.com>, <http://sourceware.cygnus.com/ml/#faqs>
Sender: java-patches-owner@sourceware.cygnus.com
Delivered-To: mailing list java-patches@sourceware.cygnus.com
Received: (qmail 26967 invoked from network); 19 Jan 2000 21:03:29 -0000
To: Java Patch List <java-patches@sourceware.cygnus.com> 
Cc: Kresten Krab Thorup <krab@gnu.org> 
Subject: Patch: no more %esi
X-Zippy:  YOW!!  Now I understand advanced MICROBIOLOGY
 and th' new TAX REFORM laws!!
X-Attribution:  Tom
Bcc:
Reply-To:  tromey@cygnus.com
From:  Tom Tromey <tromey@cygnus.com>
Date: 19 Jan 2000 14:04:24 -0700
Message-ID: <87zou14vtz.fsf@cygnus.com>
Lines: 53
X-Mailer: Gnus v5.5/Emacs 20.3

I'm checking in the appended patch, which removes the use of %esi from
the interpreter.  This code causes problems with some versions of g++.

Kresten, I assume this code is a performance hack?  Does it make a
measurable difference when this code is included?  If it does, then we
might want to enable it, but with a different register.  If it
doesn't, then there's no harm leaving it out.  (Unfortunately I
currently don't have time to do any profiling.)

2000-01-19  Tom Tromey  <tromey@cygnus.com>

	* interpret.cc (PC_REGISTER_ASM): Removed.

Tom

Index: interpret.cc
===================================================================
RCS file: /cvs/java/libgcj/libjava/interpret.cc,v
retrieving revision 1.7
diff -u -r1.7 interpret.cc
--- interpret.cc	2000/01/19 18:39:23	1.7
+++ interpret.cc	2000/01/19 20:57:12
@@ -1,6 +1,6 @@
 // interpret.cc - Code for the interpreter
 
-/* Copyright (C) 1999  Red Hat, Inc.
+/* Copyright (C) 1999, 2000  Red Hat, Inc.
 
    This file is part of libgcj.
 
@@ -403,19 +403,13 @@
 */
 
 
-#ifdef __i386__
-#define PC_REGISTER_ASM  asm("%esi")
-#else
-#define PC_REGISTER_ASM
-#endif
-
 void _Jv_InterpMethod::continue1 (_Jv_InterpMethodInvocation *inv)
 {
   using namespace java::lang::reflect;
 
-  register _Jv_word      *sp                  = inv->sp;
-  register unsigned char *pc PC_REGISTER_ASM  = inv->pc;
-  _Jv_word               *locals              = inv->local_base ();
+  register _Jv_word      *sp     = inv->sp;
+  register unsigned char *pc     = inv->pc;
+  _Jv_word               *locals = inv->local_base ();
 
   _Jv_word *pool_data   = defining_class->constants.data;
   

From java-patches-return-412-listarch-java-patches=sourceware.cygnus.com@sourceware.cygnus.com Wed Jan 19 21:39:19 2000
Return-Path: <java-patches-return-412-listarch-java-patches=sourceware.cygnus.com@sourceware.cygnus.com>
Delivered-To: listarch-java-patches@sourceware.cygnus.com
Received: (qmail 32395 invoked by alias); 19 Jan 2000 21:39:19 -0000
Mailing-List: contact java-patches-help@sourceware.cygnus.com; run by ezmlm
Precedence: bulk
List-Subscribe: <mailto:java-patches-subscribe@sourceware.cygnus.com>
List-Archive: <http://sourceware.cygnus.com/ml/java-patches/>
List-Post: <mailto:java-patches@sourceware.cygnus.com>
List-Help: <mailto:java-patches-help@sourceware.cygnus.com>, <http://sourceware.cygnus.com/ml/#faqs>
Sender: java-patches-owner@sourceware.cygnus.com
Delivered-To: mailing list java-patches@sourceware.cygnus.com
Received: (qmail 32057 invoked from network); 19 Jan 2000 21:38:24 -0000
To: Java Patch List <java-patches@sourceware.cygnus.com> 
Subject: Patch: many inner class tests
X-Zippy:  World War Three can be averted by adherence to a strictly enforced
 dress code!
X-Attribution:  Tom
Bcc:
Reply-To:  tromey@cygnus.com
From:  Tom Tromey <tromey@cygnus.com>
Date: 19 Jan 2000 14:39:34 -0700
Message-ID: <87ya9l4u7d.fsf@cygnus.com>
Lines: 1116
X-Mailer: Gnus v5.5/Emacs 20.3

I'm checking in this huge patch, which adds a bunch of tests for inner
classes.  These tests were all written by Alex, but a couple were
lightly hacked by me (some name changes).

More inner class tests will follow as time permits.  If you know of
useful inner class test cases (corner cases or whatever), you're
encouraged to send them (either as patches, or as a .java file
directly to me if you want).

2000-01-19  Alexandre Petit-Bianco  <apbianco@cygnus.com>

	* libjava.lang/anon.java, libjava.lang/anon2.java,
	libjava.lang/anon3.java, libjava.lang/anon4.java,
	libjava.lang/direct_read.java, libjava.lang/direct_write.java,
	libjava.lang/indirect.java, libjava.lang/indirect_read.java,
	libjava.lang/indirect_write.java, libjava.lang/inner1.java,
	libjava.lang/inner2.java, libjava.lang/inner3.java,
	libjava.lang/inner4.java, libjava.lang/inner_array.java,
	libjava.lang/multiple_finit.java,
	libjava.lang/private_direct_read.java,
	libjava.lang/private_direct_write.java,
	libjava.lang/private_indirect_read.java,
	libjava.lang/private_indirect_write.java,
	libjava.lang/search_outer.java, libjava.lang/tmi.java,
	libjava.lang/tp.java, libjava.lang/update_outer.java: New file.

Tom

Index: libjava.lang/anon.java
===================================================================
RCS file: anon.java
diff -N anon.java
--- /dev/null	Tue May  5 13:32:27 1998
+++ anon.java	Wed Jan 19 13:25:56 2000
@@ -0,0 +1,52 @@
+// Class anon
+// Generated on Wed Dec 29 10:07:09 PST 1999
+//
+
+
+interface itf {int count = 0;void setCount (int i);int getCount ();}
+
+class anon {
+
+  int count = 34;
+
+  class x implements itf {
+      int count = 3;
+      public void setCount (int j) { }
+      public int getCount () { return count*3; }
+  }
+
+
+  itf foo () {
+      class y implements itf {
+	  int count = 3;
+	  public void setCount (int j) { count = j; }
+	  public int getCount () { return count+1; }
+      }
+      return new y ();
+  }
+
+  itf bar () {
+    return new itf () { 
+      // The class defined right here will implement `itf'
+      int count = 5;
+      public void setCount (int j) { count = j; }
+      public int getCount () { return count+1; }
+    } ;
+  }
+
+  void test () {
+    itf a = foo ();
+    itf b = bar ();
+    x   c = this.new x ();
+    System.out.println (a.getCount ());
+    System.out.println (b.getCount ());
+    System.out.println (c.getCount ());
+    System.out.println (this.count);
+  }
+  
+  public static void main (String[] arg)
+  {
+    System.out.println ("Testing class `anon'...");
+    new anon ().test ();
+  }
+}
Index: libjava.lang/anon.out
===================================================================
RCS file: anon.out
diff -N anon.out
--- /dev/null	Tue May  5 13:32:27 1998
+++ anon.out	Wed Jan 19 13:25:56 2000
@@ -0,0 +1,5 @@
+Testing class `anon'...
+4
+6
+9
+34
Index: libjava.lang/anon2.java
===================================================================
RCS file: anon2.java
diff -N anon2.java
--- /dev/null	Tue May  5 13:32:27 1998
+++ anon2.java	Wed Jan 19 13:25:56 2000
@@ -0,0 +1,50 @@
+// Class anon2
+// Generated on Wed Dec 29 10:07:09 PST 1999
+//
+
+
+class anon2 {
+
+  int count = 34;
+  int field;
+
+  anon2 () { System.out.println ("anon2()"); } 
+
+  anon2 (foobar x) { 
+    System.out.println ("Yikes!"+x.zoink());
+  }
+
+  anon2 foo () {
+      class y extends anon2 {
+          int count = 3;
+          public void setCount (int j) { count = j; }
+          public int getCount () { return count+1; }
+	  y (int i) { System.out.println ("y(int)"); }
+      }
+      return new y (3);
+  }
+
+  anon2 bar () {
+    foobar xyz = new foobar ();
+    return new anon2 (xyz) { 
+      int count = 5;
+      public void setCount (int j) { field = 3; count = j; }
+      public int getCount () { return count+1; }
+    } ;
+  }
+
+  void test () {
+   anon2 b = bar ();
+   anon2 c = foo ();
+  }
+  
+  public static void main (String[] arg)
+  {
+    System.out.println ("Testing class `anon2'...");
+    new anon2 ().test ();
+  }
+}
+
+class foobar {
+  public String zoink() { return " zoinked"; }
+}
Index: libjava.lang/anon2.out
===================================================================
RCS file: anon2.out
diff -N anon2.out
--- /dev/null	Tue May  5 13:32:27 1998
+++ anon2.out	Wed Jan 19 13:25:56 2000
@@ -0,0 +1,5 @@
+Testing class `anon2'...
+anon2()
+Yikes! zoinked
+anon2()
+y(int)
Index: libjava.lang/anon3.java
===================================================================
RCS file: anon3.java
diff -N anon3.java
--- /dev/null	Tue May  5 13:32:27 1998
+++ anon3.java	Wed Jan 19 13:25:56 2000
@@ -0,0 +1,28 @@
+// Class anon3
+// Generated on Wed Dec 29 10:07:09 PST 1999
+//
+
+
+class anon3 {
+
+  itf bar () {
+    return new itf () { 
+      int count = 5;
+      public void setCount (int j) { count = 3; }
+      public int getCount () { return count; }
+    } ;
+  }
+
+  void test () {
+   itf x = bar ();
+   System.out.println (x.getCount ());
+  }
+  
+  public static void main (String[] arg)
+  {
+    System.out.println ("Testing class `anon3'...");
+    new anon3 ().test ();
+  }
+}
+
+interface itf { void setCount (int j); int getCount(); int count = 0; }
Index: libjava.lang/anon3.out
===================================================================
RCS file: anon3.out
diff -N anon3.out
--- /dev/null	Tue May  5 13:32:27 1998
+++ anon3.out	Wed Jan 19 13:25:56 2000
@@ -0,0 +1,2 @@
+Testing class `annon3'...
+5
Index: libjava.lang/anon4.java
===================================================================
RCS file: anon4.java
diff -N anon4.java
--- /dev/null	Tue May  5 13:32:27 1998
+++ anon4.java	Wed Jan 19 13:25:56 2000
@@ -0,0 +1,30 @@
+// Class anon4
+// Generated on Wed Dec 29 10:07:09 PST 1999
+//
+
+
+class anon4 {
+
+  private int field = 3;
+
+  itf bar () {
+    return new itf () { 
+      int count = 5;
+      public void setCount (int j) { count = 3+field; }
+      public int getCount () { return count+field; }
+    } ;
+  }
+
+  void test () {
+   itf x = bar ();
+   System.out.println (x.getCount ());
+  }
+  
+  public static void main (String[] arg)
+  {
+    System.out.println ("Testing class `anon4'...");
+    new anon4 ().test ();
+  }
+}
+
+interface itf { void setCount (int j); int getCount(); int count = 0; }
Index: libjava.lang/anon4.out
===================================================================
RCS file: anon4.out
diff -N anon4.out
--- /dev/null	Tue May  5 13:32:27 1998
+++ anon4.out	Wed Jan 19 13:25:56 2000
@@ -0,0 +1,2 @@
+Testing class `anon4'...
+8
Index: libjava.lang/direct_read.java
===================================================================
RCS file: direct_read.java
diff -N direct_read.java
--- /dev/null	Tue May  5 13:32:27 1998
+++ direct_read.java	Wed Jan 19 13:25:56 2000
@@ -0,0 +1,27 @@
+// Class direct_read
+// Generated on Sat Nov 13 23:26:34 UTC 1999
+//
+
+class direct_read {
+
+  int foo;
+
+  class direct_read_inner {
+    void test () {
+      int x = foo;
+      System.out.println ("x="+x);
+    }
+  }
+
+  void foo ()
+  {
+    foo = 670;
+    direct_read_inner inn = this.new direct_read_inner ();
+    inn.test ();
+  }  
+  public static void main (String[] arg)
+  {
+    System.out.println ("Testing class `direct_read'...");
+    new direct_read().foo ();
+  }
+}
Index: libjava.lang/direct_read.out
===================================================================
RCS file: direct_read.out
diff -N direct_read.out
--- /dev/null	Tue May  5 13:32:27 1998
+++ direct_read.out	Wed Jan 19 13:25:56 2000
@@ -0,0 +1,2 @@
+Testing class `direct_read'...
+x=670
Index: libjava.lang/direct_write.java
===================================================================
RCS file: direct_write.java
diff -N direct_write.java
--- /dev/null	Tue May  5 13:32:27 1998
+++ direct_write.java	Wed Jan 19 13:25:56 2000
@@ -0,0 +1,27 @@
+// Class direct_write
+// Generated on Mon Nov 15 17:10:56 UTC 1999
+//
+
+class direct_write {
+
+  int foo;
+
+  class direct_write_inner {
+    void test () {
+      foo  = 670;
+    }
+  }
+
+  void foo ()
+  {
+    foo = 650;
+    direct_write_inner inn = this.new direct_write_inner ();
+    inn.test ();
+    System.out.println ("foo="+foo);
+  }  
+  public static void main (String[] arg)
+  {
+    System.out.println ("Testing class `direct_write'...");
+    new direct_write().foo ();
+  }
+}
Index: libjava.lang/direct_write.out
===================================================================
RCS file: direct_write.out
diff -N direct_write.out
--- /dev/null	Tue May  5 13:32:27 1998
+++ direct_write.out	Wed Jan 19 13:25:56 2000
@@ -0,0 +1,2 @@
+Testing class `direct_write'...
+foo=670
Index: libjava.lang/indirect.java
===================================================================
RCS file: indirect.java
diff -N indirect.java
--- /dev/null	Tue May  5 13:32:27 1998
+++ indirect.java	Wed Jan 19 13:25:56 2000
@@ -0,0 +1,33 @@
+// Class indirect
+// Generated on Tue Nov 16 15:53:14 UTC 1999
+// Several indirection to enclosing class
+
+class indirect {
+
+  private int foo;
+
+  class indirect_inner {
+    class other {
+      class inner {
+        void test () {
+          int x = foo;
+          System.out.println ("x="+foo);
+	  foo = 671;
+        }
+      }
+    }
+
+  }
+  void foo ()
+  {
+    foo = 670; 
+    indirect_inner inn = this.new indirect_inner ();
+    this.new indirect_inner().new other().new inner ().test ();
+    System.out.println ("foo="+foo);
+  }  
+  public static void main (String[] arg)
+  {
+    System.out.println ("Testing class `indirect'...");
+    new indirect().foo ();
+  }
+}
Index: libjava.lang/indirect.out
===================================================================
RCS file: indirect.out
diff -N indirect.out
--- /dev/null	Tue May  5 13:32:27 1998
+++ indirect.out	Wed Jan 19 13:25:56 2000
@@ -0,0 +1,3 @@
+Testing class `indirect'...
+x=670
+foo=671
Index: libjava.lang/indirect_read.java
===================================================================
RCS file: indirect_read.java
diff -N indirect_read.java
--- /dev/null	Tue May  5 13:32:27 1998
+++ indirect_read.java	Wed Jan 19 13:25:56 2000
@@ -0,0 +1,33 @@
+// Class indirect_read
+// Generated on Mon Nov 15 17:20:40 UTC 1999
+//
+
+class indirect_read {
+
+  int foo;
+
+  class indirect_read_inner {
+    void test () {
+    }
+
+    class other {
+      void testx () {
+        int x = foo;
+	System.out.println ("x="+x);
+      }
+    }
+
+  }
+  void foo ()
+  {
+    foo = 670;
+    indirect_read_inner inn = this.new indirect_read_inner ();
+    indirect_read_inner.other o = inn.new other ();
+    o.testx ();
+  }  
+  public static void main (String[] arg)
+  {
+    System.out.println ("Testing class `indirect_read'...");
+    new indirect_read().foo ();
+  }
+}
Index: libjava.lang/indirect_read.out
===================================================================
RCS file: indirect_read.out
diff -N indirect_read.out
--- /dev/null	Tue May  5 13:32:27 1998
+++ indirect_read.out	Wed Jan 19 13:25:56 2000
@@ -0,0 +1,2 @@
+Testing class `indirect_read'...
+x=670
Index: libjava.lang/indirect_write.java
===================================================================
RCS file: indirect_write.java
diff -N indirect_write.java
--- /dev/null	Tue May  5 13:32:27 1998
+++ indirect_write.java	Wed Jan 19 13:25:56 2000
@@ -0,0 +1,32 @@
+// Class indirect_write
+// Generated on Tue Nov 16 15:01:24 UTC 1999
+//
+
+class indirect_write {
+
+  int foo;
+
+  class indirect_write_inner {
+    void test () {
+    }
+
+    class other {
+      void testx () {
+        foo = 670;
+      }
+    }
+
+  }
+  void foo ()
+  {
+    indirect_write_inner inn = this.new indirect_write_inner ();
+    indirect_write_inner.other x = inn.new other ();
+    x.testx();
+    System.out.println ("foo="+foo);
+  }  
+  public static void main (String[] arg)
+  {
+    System.out.println ("Testing class `indirect_write'...");
+    new indirect_write().foo ();
+  }
+}
Index: libjava.lang/indirect_write.out
===================================================================
RCS file: indirect_write.out
diff -N indirect_write.out
--- /dev/null	Tue May  5 13:32:27 1998
+++ indirect_write.out	Wed Jan 19 13:25:56 2000
@@ -0,0 +1,2 @@
+Testing class `indirect_write'...
+foo=670
Index: libjava.lang/inner1.java
===================================================================
RCS file: inner1.java
diff -N inner1.java
--- /dev/null	Tue May  5 13:32:27 1998
+++ inner1.java	Wed Jan 19 13:25:56 2000
@@ -0,0 +1,36 @@
+// Class inner1
+// Generated on Thu Nov  4 16:35:03 PST 1999
+//
+
+class inner1 {
+  int i;
+  void foo () {
+    inner1.z x1 = new z();
+    inner1.z.y x = x1.new y();
+    x.bar ();
+    x.print();
+  }
+  public static void main (String[] arg)
+  {
+    System.out.println ("Testing class `inner1'...");
+    new inner1 ().foo();
+  }
+  class z {
+    int j;
+    void foo () {
+      inner1.this.i = 3; 
+    }
+    class y { 
+      int k;
+      void bar () {
+        inner1.this.i = 3;
+        z.this.j = 4;
+        y.this.k = 34;
+      }
+      void print () {
+        System.out.println ("i="+i+", j="+j+", k="+k);
+      }
+    }
+  }
+}
+
Index: libjava.lang/inner1.out
===================================================================
RCS file: inner1.out
diff -N inner1.out
--- /dev/null	Tue May  5 13:32:27 1998
+++ inner1.out	Wed Jan 19 13:25:56 2000
@@ -0,0 +1,2 @@
+Testing class `inner1'...
+i=3, j=4, k=34
Index: libjava.lang/inner2.java
===================================================================
RCS file: inner2.java
diff -N inner2.java
--- /dev/null	Tue May  5 13:32:27 1998
+++ inner2.java	Wed Jan 19 13:25:56 2000
@@ -0,0 +1,18 @@
+// Class inner2
+// Generated on Mon Dec  6 14:32:34 PST 1999
+//
+
+class inner2 {
+  int foo = 1999;
+  void foo () 
+  {
+    inner2.this.foo = 666;
+    System.out.println (inner2.this.foo);
+  }
+  void print () {System.out.println (foo);}
+  public static void main (String[] arg)
+  {
+    System.out.println ("Testing class `inner2'...");
+    new inner2().foo ();
+  }
+}
Index: libjava.lang/inner2.out
===================================================================
RCS file: inner2.out
diff -N inner2.out
--- /dev/null	Tue May  5 13:32:27 1998
+++ inner2.out	Wed Jan 19 13:25:56 2000
@@ -0,0 +1,2 @@
+Testing class `inner2'...
+666
Index: libjava.lang/inner3.java
===================================================================
RCS file: inner3.java
diff -N inner3.java
--- /dev/null	Tue May  5 13:32:27 1998
+++ inner3.java	Wed Jan 19 13:25:56 2000
@@ -0,0 +1,23 @@
+// Class inner3
+// Generated on Tue Dec  7 11:37:43 PST 1999
+//
+
+class inner3 {
+  int bar;
+  public static void main (String[] arg)
+  {
+    System.out.println ("Testing class `inner3'...");
+    new inner3().bar ();
+  }
+  void bar () {
+    t xx = this.new t ();
+    xx.bar ();
+  }
+  void foo () { bar = 3; }
+  class t {
+    void bar () {
+      inner3.this.foo ();
+      System.out.println (inner3.this.bar);
+    }
+  }
+}
Index: libjava.lang/inner3.out
===================================================================
RCS file: inner3.out
diff -N inner3.out
--- /dev/null	Tue May  5 13:32:27 1998
+++ inner3.out	Wed Jan 19 13:25:56 2000
@@ -0,0 +1,2 @@
+Testing class `inner3'...
+3
Index: libjava.lang/inner4.java
===================================================================
RCS file: inner4.java
diff -N inner4.java
--- /dev/null	Tue May  5 13:32:27 1998
+++ inner4.java	Wed Jan 19 13:25:56 2000
@@ -0,0 +1,34 @@
+// Class inner4
+// Generated on Tue Dec  7 11:43:48 PST 1999
+//
+
+class inner4 {
+    static private int xyz () { return 3; }
+    private String f;
+  
+    String p () {
+	return "public String p()";
+    }
+
+    private String pp (int x, byte y, char c) {
+	return "private String pp("+x+", "+y+", "+c+")";
+    }
+
+    void foo () {
+	t xxx = this.new t();
+	xxx.bar ();
+        pp (3, (byte)34, 'C');
+    }
+    public static void main (String[] arg)
+    {
+	System.out.println ("Testing class `inner4'...");
+	new inner4().foo();
+    }
+    class t {
+	void bar () {
+            System.out.println (p ());
+	    System.out.println (pp (3, (byte)34, 'C'));
+            System.out.println (xyz ());
+	}
+    }
+}
Index: libjava.lang/inner4.out
===================================================================
RCS file: inner4.out
diff -N inner4.out
--- /dev/null	Tue May  5 13:32:27 1998
+++ inner4.out	Wed Jan 19 13:25:56 2000
@@ -0,0 +1,4 @@
+Testing class `inner4'...
+public String p()
+private String pp(3, 34, C)
+3
Index: libjava.lang/inner_array.java
===================================================================
RCS file: inner_array.java
diff -N inner_array.java
--- /dev/null	Tue May  5 13:32:27 1998
+++ inner_array.java	Wed Jan 19 13:25:56 2000
@@ -0,0 +1,30 @@
+// Class inner_array
+// Generated on Fri Nov 19 13:19:47 PST 1999
+//
+
+class inner_array {
+
+  private int[] foo;
+
+  class array_inner {
+    void test () {
+      int x = foo[2];
+      System.out.println ("x="+x);
+      foo [1] = 34;
+      foo [1]++;
+    }
+  }
+  void foo ()
+  {
+    foo = new int [3];
+    foo[2]=670;
+    array_inner inn = this.new array_inner ();
+    inn.test ();
+    System.out.println ("foo[1]="+foo[1]);
+  }  
+  public static void main (String[] arg)
+  {
+    System.out.println ("Testing class `inner_array'...");
+    new inner_array().foo ();
+  }
+}
Index: libjava.lang/inner_array.out
===================================================================
RCS file: inner_array.out
diff -N inner_array.out
--- /dev/null	Tue May  5 13:32:27 1998
+++ inner_array.out	Wed Jan 19 13:25:56 2000
@@ -0,0 +1,3 @@
+Testing class `inner_array'...
+x=670
+foo[1]=35
Index: libjava.lang/multiple_finit.java
===================================================================
RCS file: multiple_finit.java
diff -N multiple_finit.java
--- /dev/null	Tue May  5 13:32:27 1998
+++ multiple_finit.java	Wed Jan 19 13:25:56 2000
@@ -0,0 +1,28 @@
+// Class multiple_finit
+// Generated on Mon Jan  3 20:07:18 PST 2000
+//
+
+class multiple_finit {
+
+  int foo = 99;
+
+  class multiple_finit_inner {
+    int inner = 34;
+    void test () {
+      System.out.println (inner);
+      System.out.println (foo);
+    }
+  }
+  void foo (String s)
+  {
+    multiple_finit_inner inn = this.new multiple_finit_inner ();
+    inn.test ();
+    System.out.println (foo);
+  }  
+  void testx () { }
+  public static void main (String[] arg)
+  {
+    System.out.println ("Testing class `multiple_finit'...");
+    new multiple_finit().foo ("");
+  }
+}
Index: libjava.lang/multiple_finit.out
===================================================================
RCS file: multiple_finit.out
diff -N multiple_finit.out
--- /dev/null	Tue May  5 13:32:27 1998
+++ multiple_finit.out	Wed Jan 19 13:25:56 2000
@@ -0,0 +1,4 @@
+Testing class `multiple_finit'...
+34
+99
+99
Index: libjava.lang/private_direct_read.java
===================================================================
RCS file: private_direct_read.java
diff -N private_direct_read.java
--- /dev/null	Tue May  5 13:32:27 1998
+++ private_direct_read.java	Wed Jan 19 13:25:56 2000
@@ -0,0 +1,26 @@
+// Class private_direct_read
+// Generated on Tue Nov 16 15:04:13 UTC 1999
+//
+
+class private_direct_read {
+
+  private int foo;
+
+  class private_direct_read_inner {
+    void test () {
+      int x = foo;
+      System.out.println ("x="+x);
+    }
+  }
+  void foo ()
+  {
+    foo = 670;
+    private_direct_read_inner inn = this.new private_direct_read_inner ();
+    inn.test ();
+  }  
+  public static void main (String[] arg)
+  {
+    System.out.println ("Testing class `private_direct_read'...");
+    new private_direct_read().foo ();
+  }
+}
Index: libjava.lang/private_direct_read.out
===================================================================
RCS file: private_direct_read.out
diff -N private_direct_read.out
--- /dev/null	Tue May  5 13:32:27 1998
+++ private_direct_read.out	Wed Jan 19 13:25:56 2000
@@ -0,0 +1,2 @@
+Testing class `private_direct_read'...
+x=670
Index: libjava.lang/private_direct_write.java
===================================================================
RCS file: private_direct_write.java
diff -N private_direct_write.java
--- /dev/null	Tue May  5 13:32:27 1998
+++ private_direct_write.java	Wed Jan 19 13:25:56 2000
@@ -0,0 +1,25 @@
+// Class private_direct_write
+// Generated on Tue Nov 16 15:05:54 UTC 1999
+//
+
+class private_direct_write {
+
+  private int foo;
+
+  class private_direct_write_inner {
+    void test () {
+      foo = 670;
+    }
+  }
+  void foo ()
+  {
+    private_direct_write_inner inn = this.new private_direct_write_inner ();
+    inn.test ();
+    System.out.println ("foo="+foo);
+  }  
+  public static void main (String[] arg)
+  {
+    System.out.println ("Testing class `private_direct_write'...");
+    new private_direct_write().foo ();
+  }
+}
Index: libjava.lang/private_indirect_read.java
===================================================================
RCS file: private_indirect_read.java
diff -N private_indirect_read.java
--- /dev/null	Tue May  5 13:32:27 1998
+++ private_indirect_read.java	Wed Jan 19 13:25:56 2000
@@ -0,0 +1,32 @@
+// Class private_indirect_read
+// Generated on Tue Nov 16 15:34:56 UTC 1999
+//
+
+class private_indirect_read {
+
+  private int foo;
+
+  class private_indirect_read_inner {
+    void test () {
+    }
+    class other {
+      void testx () {
+        int x = foo;
+        System.out.println ("x="+x);
+      }
+    }
+
+  }
+  void foo ()
+  {
+    foo=670;
+    private_indirect_read_inner inn = this.new private_indirect_read_inner ();
+    private_indirect_read_inner.other o = inn.new other ();
+    o.testx();
+  }  
+  public static void main (String[] arg)
+  {
+    System.out.println ("Testing class `private_indirect_read'...");
+    new private_indirect_read().foo ();
+  }
+}
Index: libjava.lang/private_indirect_write.java
===================================================================
RCS file: private_indirect_write.java
diff -N private_indirect_write.java
--- /dev/null	Tue May  5 13:32:27 1998
+++ private_indirect_write.java	Wed Jan 19 13:25:56 2000
@@ -0,0 +1,32 @@
+// Class private_indirect_write
+// Generated on Tue Nov 16 15:44:49 UTC 1999
+//
+
+class private_indirect_write {
+
+  private int foo;
+
+  class private_indirect_write_inner {
+    void test () {
+    }
+
+    class other {
+      void test () {
+        foo = 670;
+      }
+    }
+
+  }
+  void foo ()
+  {
+    private_indirect_write_inner inn = this.new private_indirect_write_inner ();
+    private_indirect_write_inner.other x = inn.new other ();
+    x.test ();
+    System.out.println ("foo="+foo);
+  }  
+  public static void main (String[] arg)
+  {
+    System.out.println ("Testing class `private_indirect_write'...");
+    new private_indirect_write().foo ();
+  }
+}
Index: libjava.lang/search_outer.java
===================================================================
RCS file: search_outer.java
diff -N search_outer.java
--- /dev/null	Tue May  5 13:32:27 1998
+++ search_outer.java	Wed Jan 19 13:25:56 2000
@@ -0,0 +1,28 @@
+// Class search_outer.java
+// Generated on Thu Nov 18 18:40:43 UTC 1999
+//
+
+class search_outer {
+
+  private int foo;
+
+  class search_outer_inner {
+    void test () {
+      foo++;
+      System.out.println ("foo="+foo);
+      foo += 3;
+      System.out.println ("foo="+foo);
+    }
+  }
+  void foo ()
+  {
+    foo = 3;
+    search_outer_inner inn = this.new search_outer_inner ();
+    inn.test ();
+  }  
+  public static void main (String[] arg)
+  {
+    System.out.println ("Testing class `search_outer'...");
+    new search_outer().foo ();
+  }
+}
Index: libjava.lang/search_outer.out
===================================================================
RCS file: search_outer.out
diff -N search_outer.out
--- /dev/null	Tue May  5 13:32:27 1998
+++ search_outer.out	Wed Jan 19 13:25:56 2000
@@ -0,0 +1,3 @@
+Testing class `search_outer'...
+foo=4
+foo=7
Index: libjava.lang/tmi.java
===================================================================
RCS file: tmi.java
diff -N tmi.java
--- /dev/null	Tue May  5 13:32:27 1998
+++ tmi.java	Wed Jan 19 13:25:56 2000
@@ -0,0 +1,43 @@
+// Class t
+// Generated on Thu Nov  4 16:35:03 PST 1999
+//
+
+class tmi {
+  int i;
+  void foo () {
+    tmi.z x1 = new z();
+    tmi.z.y x = x1.new y();
+    x.bar ();
+    x.print();
+    tmi.this.i = 666;
+    x.print();
+    tmi.this.print();
+  }
+  void print () {
+    System.out.println ("tmi.print()");
+  }
+  public static void main (String[] arg)
+  {
+    System.out.println ("Testing class `tmi'...");
+    new tmi ().foo();
+  }
+  class z {
+    int j;
+    void foo () {
+      tmi.this.i = 3; 
+    }
+    class y { 
+      int k;
+      void bar () {
+        tmi.this.i = 3;
+        tmi.this.print ();
+        z.this.j = 4;
+        y.this.k = 34;
+      }
+      void print () {
+        System.out.println ("i="+i+", j="+j+", k="+k);
+      }
+    }
+  }
+}
+
Index: libjava.lang/tmi.out
===================================================================
RCS file: tmi.out
diff -N tmi.out
--- /dev/null	Tue May  5 13:32:27 1998
+++ tmi.out	Wed Jan 19 13:25:56 2000
@@ -0,0 +1,5 @@
+Testing class `tmi'...
+tmi.print()
+i=3, j=4, k=34
+i=666, j=4, k=34
+tmi.print()
Index: libjava.lang/tp.java
===================================================================
RCS file: tp.java
diff -N tp.java
--- /dev/null	Tue May  5 13:32:27 1998
+++ tp.java	Wed Jan 19 13:25:56 2000
@@ -0,0 +1,36 @@
+// Class tp
+// Generated on Thu Nov  4 16:35:03 PST 1999
+//
+
+class tp {
+  private int i;
+  void foo () {
+    tp.z x1 = new z();
+    tp.z.y x = x1.new y();
+    x.bar ();
+    x.print();
+  }
+  public static void main (String[] arg)
+  {
+    System.out.println ("Testing class `tp'...");
+    new tp ().foo();
+  }
+  class z {
+    private int j;
+    void foo () {
+      tp.this.i = 3; 
+    }
+    class y { 
+      private int k;
+      void bar () {
+        tp.this.i = 3;
+        z.this.j = 4;
+        y.this.k = 34;
+      }
+      void print () {
+        System.out.println ("i="+i+", j="+j+", k="+k);
+      }
+    }
+  }
+}
+
Index: libjava.lang/tp.out
===================================================================
RCS file: tp.out
diff -N tp.out
--- /dev/null	Tue May  5 13:32:27 1998
+++ tp.out	Wed Jan 19 13:25:56 2000
@@ -0,0 +1,2 @@
+Testing class `tp'...
+i=3, j=4, k=34
Index: libjava.lang/update_outer.java
===================================================================
RCS file: update_outer.java
diff -N update_outer.java
--- /dev/null	Tue May  5 13:32:27 1998
+++ update_outer.java	Wed Jan 19 13:25:56 2000
@@ -0,0 +1,28 @@
+// Class update_outer
+// Generated on Thu Nov 18 21:37:21 UTC 1999
+//
+
+class update_outer {
+
+  private String foo;
+
+  class update_outer_inner {
+    void test () {
+      foo += " M$";
+      System.out.println ("foo=`"+foo+"'");
+    }
+
+
+  }
+  void foo ()
+  {
+    foo = "780";
+    update_outer_inner inn = this.new update_outer_inner ();
+    inn.test ();
+  }  
+  public static void main (String[] arg)
+  {
+    System.out.println ("Testing class `update_outer'...");
+    new update_outer().foo ();
+  }
+}
Index: libjava.lang/update_outer.out
===================================================================
RCS file: update_outer.out
diff -N update_outer.out
--- /dev/null	Tue May  5 13:32:27 1998
+++ update_outer.out	Wed Jan 19 13:25:56 2000
@@ -0,0 +1,2 @@
+Testing class `update_outer'...
+foo=`780 M$'

From java-patches-return-413-listarch-java-patches=sourceware.cygnus.com@sourceware.cygnus.com Thu Jan 20 16:49:42 2000
Return-Path: <java-patches-return-413-listarch-java-patches=sourceware.cygnus.com@sourceware.cygnus.com>
Delivered-To: listarch-java-patches@sourceware.cygnus.com
Received: (qmail 4001 invoked by alias); 20 Jan 2000 16:49:42 -0000
Mailing-List: contact java-patches-help@sourceware.cygnus.com; run by ezmlm
Precedence: bulk
List-Subscribe: <mailto:java-patches-subscribe@sourceware.cygnus.com>
List-Archive: <http://sourceware.cygnus.com/ml/java-patches/>
List-Post: <mailto:java-patches@sourceware.cygnus.com>
List-Help: <mailto:java-patches-help@sourceware.cygnus.com>, <http://sourceware.cygnus.com/ml/#faqs>
Sender: java-patches-owner@sourceware.cygnus.com
Delivered-To: mailing list java-patches@sourceware.cygnus.com
Received: (qmail 3767 invoked from network); 20 Jan 2000 16:49:23 -0000
To: Java Patch List <java-patches@sourceware.cygnus.com> 
Subject: Patch: minor cleanup
X-Zippy:  Don't worry, nobody really LISTENS to lectures in MOSCOW, either!
 ..  FRENCH, HISTORY, ADVANCED CALCULUS, COMPUTER PROGRAMMING,
 BLACK STUDIES, SOCIOBIOLOGY!..  Are there any QUESTIONS??
X-Attribution:  Tom
Bcc:
Reply-To:  tromey@cygnus.com
From:  Tom Tromey <tromey@cygnus.com>
Date: 20 Jan 2000 09:51:18 -0700
Message-ID: <87r9fc4rg9.fsf@cygnus.com>
Lines: 59
X-Mailer: Gnus v5.5/Emacs 20.3

I'm checking in this minor cleanup patch.  It removes a couple of
unnecessary defines.  I really should make the Class information
visible to C++ via gcjh somehow...

2000-01-20  Tom Tromey  <tromey@cygnus.com>

	* resolve.cc (StringClass): Removed.
	* defineclass.cc (StringClass): Removed.

Tom

Index: defineclass.cc
===================================================================
RCS file: /cvs/java/libgcj/libjava/defineclass.cc,v
retrieving revision 1.6
diff -u -r1.6 defineclass.cc
--- defineclass.cc	2000/01/19 18:39:23	1.6
+++ defineclass.cc	2000/01/20 16:47:37
@@ -1,6 +1,6 @@
 // defineclass.cc - defining a class from .class format.
 
-/* Copyright (C) 1999  Red Hat, Inc.
+/* Copyright (C) 1999, 2000  Red Hat, Inc.
 
    This file is part of libgcj.
 
@@ -42,8 +42,6 @@
 
 #define ClassClass _CL_Q34java4lang5Class
 extern java::lang::Class ClassClass;
-#define StringClass _CL_Q34java4lang6String
-extern java::lang::Class StringClass;
 #define ClassObject _CL_Q34java4lang6Object
 extern java::lang::Class ClassObject;
 
Index: resolve.cc
===================================================================
RCS file: /cvs/java/libgcj/libjava/resolve.cc,v
retrieving revision 1.8
diff -u -r1.8 resolve.cc
--- resolve.cc	2000/01/19 18:39:23	1.8
+++ resolve.cc	2000/01/20 16:47:44
@@ -1,6 +1,6 @@
 // resolve.cc - Code for linking and resolving classes and pool entries.
 
-/* Copyright (C) 1999  Red Hat, Inc.
+/* Copyright (C) 1999, 2000  Red Hat, Inc.
 
    This file is part of libgcj.
 
@@ -40,8 +40,6 @@
 static void throw_class_format_error (char *msg)
 	__attribute__ ((__noreturn__));
 
-#define StringClass _CL_Q34java4lang6String
-extern java::lang::Class StringClass;
 #define ClassObject _CL_Q34java4lang6Object
 extern java::lang::Class ClassObject;
 #define ObjectClass _CL_Q34java4lang6Object

From java-patches-return-414-listarch-java-patches=sourceware.cygnus.com@sourceware.cygnus.com Fri Jan 21 10:12:05 2000
Return-Path: <java-patches-return-414-listarch-java-patches=sourceware.cygnus.com@sourceware.cygnus.com>
Delivered-To: listarch-java-patches@sourceware.cygnus.com
Received: (qmail 19737 invoked by alias); 21 Jan 2000 10:12:04 -0000
Mailing-List: contact java-patches-help@sourceware.cygnus.com; run by ezmlm
Precedence: bulk
List-Subscribe: <mailto:java-patches-subscribe@sourceware.cygnus.com>
List-Archive: <http://sourceware.cygnus.com/ml/java-patches/>
List-Post: <mailto:java-patches@sourceware.cygnus.com>
List-Help: <mailto:java-patches-help@sourceware.cygnus.com>, <http://sourceware.cygnus.com/ml/#faqs>
Sender: java-patches-owner@sourceware.cygnus.com
Delivered-To: mailing list java-patches@sourceware.cygnus.com
Received: (qmail 19715 invoked from network); 21 Jan 2000 10:12:02 -0000
To: tromey@cygnus.com
Cc: Java Patch List <java-patches@sourceware.cygnus.com>
Subject: Re: Patch: no more %esi
References: <87zou14vtz.fsf@cygnus.com>
From: Kresten Krab Thorup <krab@daimi.au.dk>
Date: 21 Jan 2000 11:11:44 +0100
In-Reply-To: Tom Tromey's message of "19 Jan 2000 14:04:24 -0700"
Message-ID: <xz6ogaf7mzj.fsf@ariel.daimi.au.dk>
Lines: 19
X-Mailer: Gnus v5.7/Emacs 20.5
Mime-Version: 1.0
Content-Type: text/plain; charset=US-ASCII
Content-Transfer-Encoding: 7bit

Tom Tromey <tromey@cygnus.com> writes:

> I'm checking in the appended patch, which removes the use of %esi from
> the interpreter.  This code causes problems with some versions of g++.
> 
> Kresten, I assume this code is a performance hack?  Does it make a
> measurable difference when this code is included?  If it does, then we
> might want to enable it, but with a different register.  If it
> doesn't, then there's no harm leaving it out.  (Unfortunately I
> currently don't have time to do any profiling.)

Quite allright.  I don't remember how much this improves performance.

-- Kresten

 Kresten Krab Thorup           "I like my eggs ploded"
 Department of Computer Science, University of Aarhus
 Aabogade 34, DK-8200 Aarhus N, Denmark
 +45 8942 5665 (office), +45 2343 4626 (mobile)

From java-patches-return-415-listarch-java-patches=sourceware.cygnus.com@sourceware.cygnus.com Fri Jan 21 21:13:00 2000
Return-Path: <java-patches-return-415-listarch-java-patches=sourceware.cygnus.com@sourceware.cygnus.com>
Delivered-To: listarch-java-patches@sourceware.cygnus.com
Received: (qmail 6959 invoked by alias); 21 Jan 2000 21:13:00 -0000
Mailing-List: contact java-patches-help@sourceware.cygnus.com; run by ezmlm
Precedence: bulk
List-Subscribe: <mailto:java-patches-subscribe@sourceware.cygnus.com>
List-Archive: <http://sourceware.cygnus.com/ml/java-patches/>
List-Post: <mailto:java-patches@sourceware.cygnus.com>
List-Help: <mailto:java-patches-help@sourceware.cygnus.com>, <http://sourceware.cygnus.com/ml/#faqs>
Sender: java-patches-owner@sourceware.cygnus.com
Delivered-To: mailing list java-patches@sourceware.cygnus.com
Received: (qmail 6938 invoked from network); 21 Jan 2000 21:12:56 -0000
To: Java Patch List <java-patches@sourceware.cygnus.com> 
Subject: Patch: another JDK 1.1 test
X-Zippy:  World War Three can be averted by adherence to a strictly enforced
 dress code!
X-Attribution:  Tom
Bcc:
Reply-To:  tromey@cygnus.com
From:  Tom Tromey <tromey@cygnus.com>
Date: 21 Jan 2000 14:15:09 -0700
Message-ID: <87iu0n3z4y.fsf@cygnus.com>
Lines: 32
X-Mailer: Gnus v5.5/Emacs 20.3

I'm checking in this patch, which adds a test for JDK 1.1 "blank
final" variables.

2000-01-20  Tom Tromey  <tromey@cygnus.com>

        * libjava.compile/BlankFinal.java: New file.

Tom

Index: libjava.compile/BlankFinal.java
===================================================================
RCS file: BlankFinal.java
diff -N BlankFinal.java
--- /dev/null	Tue May  5 13:32:27 1998
+++ BlankFinal.java	Fri Jan 21 13:11:49 2000
@@ -0,0 +1,16 @@
+// Test to see if "blank final" variables work.
+// From Mo DeJong <mdejong@cygnus.com>
+
+public class BlankFinal {
+    static final boolean cond;
+
+    static {
+        try
+        {
+            cond = true;
+        }
+        catch(Exception e) {
+            // do nothing
+        }
+    }
+}

From java-patches-return-416-listarch-java-patches=sourceware.cygnus.com@sourceware.cygnus.com Fri Jan 21 23:49:31 2000
Return-Path: <java-patches-return-416-listarch-java-patches=sourceware.cygnus.com@sourceware.cygnus.com>
Delivered-To: listarch-java-patches@sourceware.cygnus.com
Received: (qmail 31797 invoked by alias); 21 Jan 2000 23:49:31 -0000
Mailing-List: contact java-patches-help@sourceware.cygnus.com; run by ezmlm
Precedence: bulk
List-Subscribe: <mailto:java-patches-subscribe@sourceware.cygnus.com>
List-Archive: <http://sourceware.cygnus.com/ml/java-patches/>
List-Post: <mailto:java-patches@sourceware.cygnus.com>
List-Help: <mailto:java-patches-help@sourceware.cygnus.com>, <http://sourceware.cygnus.com/ml/#faqs>
Sender: java-patches-owner@sourceware.cygnus.com
Delivered-To: mailing list java-patches@sourceware.cygnus.com
Received: (qmail 30290 invoked from network); 21 Jan 2000 23:46:16 -0000
To: Java Patch List <java-patches@sourceware.cygnus.com> 
Subject: Patch: JNI
X-Zippy:  It don't mean a THING if you ain't got that SWING!!
X-Attribution:  Tom
Bcc:
Reply-To:  tromey@cygnus.com
From:  Tom Tromey <tromey@cygnus.com>
Date: 21 Jan 2000 16:45:09 -0700
Message-ID: <87hfg73s6y.fsf@cygnus.com>
Lines: 2612
X-Mailer: Gnus v5.5/Emacs 20.3

I'm committing the appended patch.  This patch implements a large
chunk of JNI.  JNI still doesn't work, but this is a step in that
direction.

2000-01-21  Tom Tromey  <tromey@cygnus.com>

	* java/lang/reflect/natConstructor.cc (newInstance): Use
	_Jv_CallAnyMethodA.
	* include/jvm.h: Declare _Jv_CallAnyMethodA.
	* java/lang/reflect/natMethod.cc (_Jv_CallAnyMethodA): Renamed
	from _Jv_CallNonvirtualMethodA.  Changed interface; overloaded.
	Include <jni.h>.
	(COPY): Removed.
	(invoke): Use _Jv_CallAnyMethodA.
	(VAL): Redefined.
	* java/lang/Class.h (Class): Declare JvGetFirstStaticField,
	JvNumStaticFields, JvNumMethods, and JvGetFirstMethod as friend
	functions.
	(struct _Jv_Method): Added getNextMethod method.
	(JvNumMethods): New function.
	(JvGetFirstMethod): Likewise.
	* gcj/field.h (JvGetFirstStaticField): New function.
	(JvNumStaticFields): Likewise.
	(getNextField): Renamed from getNextInstanceField.
	(struct _Jv_Field): New method getClass.
	* jni.cc: Wrote many new functions.
	* include/jni.h (JNI_TRUE): Define.
	(JNI_FALSE): Likewise.
	(jobject, jclass, jstring, jarray, jthrowable, jobjectArray,
	jbyteArray, jshortArray, jintArray, jlongArray, jbooleanArray,
	jcharArray, jfloatArray, jdoubleArray): New typedefs.
	(jfieldID, jmethodID): Likewise.
	(JNI_COMMIT, JNI_ABORT): New defines.
	(JNINativeMethod): New struct.
	(struct JNINativeInterface): Correctly declared more entries.
	(class _Jv_JNIEnv): Added `ex' member.
	(JNI_VERSION_1_1): New define.
	(JNI_VERSION_1_2): Likewise.

	* boehm.cc (_Jv_MarkObj): Use getNextField, not
	getNextInstanceField.

Tom

Index: boehm.cc
===================================================================
RCS file: /cvs/java/libgcj/libjava/boehm.cc,v
retrieving revision 1.12
diff -u -r1.12 boehm.cc
--- boehm.cc	2000/01/19 18:39:23	1.12
+++ boehm.cc	2000/01/21 23:41:38
@@ -1,6 +1,6 @@
 // boehm.cc - interface between libjava and Boehm GC.
 
-/* Copyright (C) 1998, 1999  Red Hat, Inc.
+/* Copyright (C) 1998, 1999, 2000  Red Hat, Inc.
 
    This file is part of libgcj.
 
@@ -256,7 +256,7 @@
 		  MAYBE_MARK (w, mark_stack_ptr, mark_stack_limit,
 			      obj, elabel);
 		}
-	      field = field->getNextInstanceField ();
+	      field = field->getNextField ();
 	    }
 	  klass = klass->getSuperclass();
 	}
Index: jni.cc
===================================================================
RCS file: /cvs/java/libgcj/libjava/jni.cc,v
retrieving revision 1.3
diff -u -r1.3 jni.cc
--- jni.cc	2000/01/19 18:39:23	1.3
+++ jni.cc	2000/01/21 23:41:44
@@ -1,6 +1,6 @@
 // jni.cc - JNI implementation, including the jump table.
 
-/* Copyright (C) 1998, 1999  Red Hat, Inc.
+/* Copyright (C) 1998, 1999, 2000  Red Hat, Inc.
 
    This file is part of libgcj.
 
@@ -8,13 +8,79 @@
 Libgcj License.  Please consult the file "LIBGCJ_LICENSE" for
 details.  */
 
+// Note: currently we take the approach of not checking most
+// arguments.  Instead we could do more checking conditionally (e.g.,
+// if DEBUG is defined).  That might be beneficial in some cases,
+// though to me it seems that one could just as easily use the
+// debugger.
+
 #include <config.h>
 
 #include <stddef.h>
 
+// Must define this before jni.h.
+#define GCJ_JV_JNIENV_FRIEND \
+    friend jthrowable &get_throwable (JNIEnv *)
+
+#include <gcj/cni.h>
+#include <jvm.h>
+#include <java-assert.h>
 #include <jni.h>
 #include <gcj/field.h>
+#include <java/lang/Throwable.h>
+#include <java/lang/ArrayIndexOutOfBoundsException.h>
+#include <java/lang/InstantiationException.h>
+#include <java/lang/NoSuchFieldError.h>
+#include <java/lang/NoSuchMethodError.h>
+#include <java/lang/reflect/Constructor.h>
+#include <java/lang/reflect/Modifier.h>
+
+#define ClassClass _CL_Q34java4lang5Class
+extern java::lang::Class ClassClass;
+#define ObjectClass _CL_Q34java4lang6Object
+extern java::lang::Class ObjectClass;
+
+// This enum is used to select different template instantiations in
+// the invocation code.
+enum invocation_type
+{
+  normal,
+  nonvirtual,
+  static_type,
+  constructor
+};
+
+
+
+// Tell the GC that a certain pointer is live.
+static void
+mark_for_gc (void *)
+{
+  // FIXME.
+}
+
+// Unmark a pointer.
+static void
+unmark_for_gc (void *)
+{
+  // FIXME.
+}
+
+// Return throwable in env.
+jthrowable &
+get_throwable (JNIEnv *env)
+{
+  return env->ex;
+}
+
+
 
+static jint
+_Jv_JNI_GetVersion (JNIEnv *)
+{
+  return JNI_VERSION_1_2;
+}
+
 static jclass
 _Jv_JNI_GetSuperclass (JNIEnv *, jclass clazz)
 {
@@ -27,34 +93,556 @@
   return clazz1->isAssignableFrom (clazz2);
 }
 
+static jint
+_Jv_JNI_Throw (JNIEnv *env, jthrowable obj)
+{
+  get_throwable (env) = obj;
+  return 0;
+}
+
+static jint
+_Jv_JNI_ThrowNew (JNIEnv *env, jclass clazz, const char *message)
+{
+  using namespace java::lang::reflect;
+
+  JArray<jclass> *argtypes
+    = (JArray<jclass> *) JvNewObjectArray (1, &ClassClass, NULL);
+
+  jclass *elts = elements (argtypes);
+  elts[0] = &StringClass;
+
+  // FIXME: exception processing.
+  Constructor *cons = clazz->getConstructor (argtypes);
+
+  jobjectArray values = JvNewObjectArray (1, &StringClass, NULL);
+  jobject *velts = elements (values);
+  velts[0] = JvNewStringUTF (message);
+
+  // FIXME: exception processing.
+  jobject obj = cons->newInstance (values);
+
+  get_throwable (env) = reinterpret_cast<jthrowable> (obj);
+  return 0;
+}
+
+static jthrowable
+_Jv_JNI_ExceptionOccurred (JNIEnv *env)
+{
+  return get_throwable (env);
+}
+
+static void
+_Jv_JNI_ExceptionDescribe (JNIEnv *env)
+{
+  if (get_throwable (env) != NULL)
+    get_throwable (env)->printStackTrace();
+}
+
+static void
+_Jv_JNI_ExceptionClear (JNIEnv *env)
+{
+  get_throwable (env) = NULL;
+}
+
+static void
+_Jv_JNI_FatalError (JNIEnv *, const char *message)
+{
+  JvFail (message);
+}
+
+static jboolean
+_Jv_JNI_IsSameObject (JNIEnv *, jobject obj1, jobject obj2)
+{
+  return obj1 == obj2;
+}
+
 static jobject
-_Jv_JNI_GetObjectField (JNIEnv *, jobject obj, jfieldID field) 
+_Jv_JNI_AllocObject (JNIEnv *env, jclass clazz)
 {
-  return _Jv_GetObjectField (obj, field);
+  jobject obj = NULL;
+  using namespace java::lang::reflect;
+  if (clazz->isInterface() || Modifier::isAbstract(clazz->getModifiers()))
+    get_throwable (env) = new java::lang::InstantiationException ();
+  else
+    {
+      // FIXME: exception processing.
+      // FIXME: will this work for String?
+      obj = JvAllocObject (clazz);
+    }
+
+  return obj;
 }
 
-static jbyte
-_Jv_JNI_GetByteField (JNIEnv *, jobject obj, jfieldID field) 
+static jclass
+_Jv_JNI_GetObjectClass (JNIEnv *, jobject obj)
 {
-  return _Jv_GetByteField (obj, field);
+  return obj->getClass();
 }
 
-static jshort
-_Jv_JNI_GetShortField (JNIEnv *, jobject obj, jfieldID field) 
+static jboolean
+_Jv_JNI_IsInstanceOf (JNIEnv *, jobject obj, jclass clazz)
 {
-  return _Jv_GetShortField (obj, field);
+  return clazz->isInstance(obj);
 }
 
-static jint
-_Jv_JNI_GetIntField (JNIEnv *, jobject obj, jfieldID field) 
+
+
+//
+// This section concerns method invocation.
+//
+
+template<jboolean is_static>
+static jmethodID
+_Jv_JNI_GetAnyMethodID (JNIEnv *env, jclass clazz,
+			const char *name, const char *sig)
+{
+  // FIXME: exception processing.
+  _Jv_InitClass (clazz);
+
+  _Jv_Utf8Const *name_u = _Jv_makeUtf8Const ((char *) name, -1);
+  _Jv_Utf8Const *sig_u = _Jv_makeUtf8Const ((char *) sig, -1);
+
+  JvAssert (! clazz->isPrimitive());
+
+  using namespace java::lang::reflect;
+
+  while (clazz != NULL)
+    {
+      jint count = JvNumMethods (clazz);
+      jmethodID meth = JvGetFirstMethod (clazz);
+
+      for (jint i = 0; i < count; ++i)
+	{
+	  if (((is_static && Modifier::isStatic (meth->accflags))
+	       || (! is_static && ! Modifier::isStatic (meth->accflags)))
+	      && _Jv_equalUtf8Consts (meth->name, name_u)
+	      && _Jv_equalUtf8Consts (meth->signature, sig_u))
+	    return meth;
+
+	  meth = meth->getNextMethod();
+	}
+
+      clazz = clazz->getSuperclass ();
+    }
+
+  get_throwable (env) = new java::lang::NoSuchMethodError ();
+  return NULL;
+}
+
+// This is a helper function which turns a va_list into an array of
+// `jvalue's.  It needs signature information in order to do its work.
+// The array of values must already be allocated.
+static void
+array_from_valist (jvalue *values, JArray<jclass> *arg_types, va_list vargs)
+{
+  jclass *arg_elts = elements (arg_types);
+  for (int i = 0; i < arg_types->length; ++i)
+    {
+      if (arg_elts[i] == JvPrimClass (byte))
+	values[i].b = va_arg (vargs, jbyte);
+      else if (arg_elts[i] == JvPrimClass (short))
+	values[i].s = va_arg (vargs, jshort);
+      else if (arg_elts[i] == JvPrimClass (int))
+	values[i].i = va_arg (vargs, jint);
+      else if (arg_elts[i] == JvPrimClass (long))
+	values[i].j = va_arg (vargs, jlong);
+      else if (arg_elts[i] == JvPrimClass (float))
+	values[i].f = va_arg (vargs, jfloat);
+      else if (arg_elts[i] == JvPrimClass (double))
+	values[i].d = va_arg (vargs, jdouble);
+      else if (arg_elts[i] == JvPrimClass (boolean))
+	values[i].z = va_arg (vargs, jboolean);
+      else if (arg_elts[i] == JvPrimClass (char))
+	values[i].c = va_arg (vargs, jchar);
+      else
+	{
+	  // An object.
+	  values[i].l = va_arg (vargs, jobject);
+	}
+    }
+}
+
+// This can call any sort of method: virtual, "nonvirtual", static, or
+// constructor.
+template<typename T, invocation_type style>
+static T
+_Jv_JNI_CallAnyMethodV (JNIEnv *env, jobject obj, jclass klass,
+			jmethodID id, va_list vargs)
+{
+  if (style == normal)
+    id = _Jv_LookupDeclaredMethod (obj->getClass (), id->name, id->signature);
+
+  jclass decl_class = klass ? klass : obj->getClass ();
+  JvAssert (decl_class != NULL);
+
+  jclass return_type;
+  JArray<jclass> *arg_types;
+  // FIXME: exception processing.
+  _Jv_GetTypesFromSignature (id, decl_class,
+			     &arg_types, &return_type);
+
+  jvalue args[arg_types->length];
+  array_from_valist (args, arg_types, vargs);
+
+  jvalue result;
+  jthrowable ex = _Jv_CallAnyMethodA (obj, return_type, id,
+				      style == constructor,
+				      arg_types, args, &result);
+
+  if (ex != NULL)
+    get_throwable (env) = ex;
+
+  // We cheat a little here.  FIXME.
+  return * (T *) &result;
+}
+
+template<typename T, invocation_type style>
+static T
+_Jv_JNI_CallAnyMethod (JNIEnv *env, jobject obj, jclass klass,
+		       jmethodID method, ...)
+{
+  va_list args;
+  T result;
+
+  va_start (args, method);
+  result = _Jv_JNI_CallAnyMethodV<T, style> (env, obj, klass, method, args);
+  va_end (args);
+
+  return result;
+}
+
+template<typename T, invocation_type style>
+static T
+_Jv_JNI_CallAnyMethodA (JNIEnv *env, jobject obj, jclass klass,
+			jmethodID id, jvalue *args)
+{
+  if (style == normal)
+    id = _Jv_LookupDeclaredMethod (obj->getClass (), id->name, id->signature);
+
+  jclass decl_class = klass ? klass : obj->getClass ();
+  JvAssert (decl_class != NULL);
+
+  jclass return_type;
+  JArray<jclass> *arg_types;
+  // FIXME: exception processing.
+  _Jv_GetTypesFromSignature (id, decl_class,
+			     &arg_types, &return_type);
+
+  jvalue result;
+  jthrowable ex = _Jv_CallAnyMethodA (obj, return_type, id,
+				      style == constructor,
+				      arg_types, args, &result);
+
+  if (ex != NULL)
+    get_throwable (env) = ex;
+
+  // We cheat a little here.  FIXME.
+  return * (T *) &result;
+}
+
+template<invocation_type style>
+static void
+_Jv_JNI_CallAnyVoidMethodV (JNIEnv *env, jobject obj, jclass klass,
+			    jmethodID id, va_list vargs)
+{
+  if (style == normal)
+    id = _Jv_LookupDeclaredMethod (obj->getClass (), id->name, id->signature);
+
+  jclass decl_class = klass ? klass : obj->getClass ();
+  JvAssert (decl_class != NULL);
+
+  jclass return_type;
+  JArray<jclass> *arg_types;
+  // FIXME: exception processing.
+  _Jv_GetTypesFromSignature (id, decl_class,
+			     &arg_types, &return_type);
+
+  jvalue args[arg_types->length];
+  array_from_valist (args, arg_types, vargs);
+
+  jthrowable ex = _Jv_CallAnyMethodA (obj, return_type, id,
+				      style == constructor,
+				      arg_types, args, NULL);
+
+  if (ex != NULL)
+    get_throwable (env) = ex;
+}
+
+template<invocation_type style>
+static void
+_Jv_JNI_CallAnyVoidMethod (JNIEnv *env, jobject obj, jclass klass,
+			   jmethodID method, ...)
+{
+  va_list args;
+
+  va_start (args, method);
+  _Jv_JNI_CallAnyVoidMethodV<style> (env, obj, klass, method, args);
+  va_end (args);
+}
+
+template<invocation_type style>
+static void
+_Jv_JNI_CallAnyVoidMethodA (JNIEnv *env, jobject obj, jclass klass,
+			    jmethodID id, jvalue *args)
+{
+  if (style == normal)
+    id = _Jv_LookupDeclaredMethod (obj->getClass (), id->name, id->signature);
+
+  jclass decl_class = klass ? klass : obj->getClass ();
+  JvAssert (decl_class != NULL);
+
+  jclass return_type;
+  JArray<jclass> *arg_types;
+  // FIXME: exception processing.
+  _Jv_GetTypesFromSignature (id, decl_class,
+			     &arg_types, &return_type);
+
+  jthrowable ex = _Jv_CallAnyMethodA (obj, return_type, id,
+				      style == constructor,
+				      arg_types, args, NULL);
+
+  if (ex != NULL)
+    get_throwable (env) = ex;
+}
+
+// Functions with this signature are used to implement functions in
+// the CallMethod family.
+template<typename T>
+static T
+_Jv_JNI_CallMethodV (JNIEnv *env, jobject obj, jmethodID id, va_list args)
+{
+  return _Jv_JNI_CallAnyMethodV<T, normal> (env, obj, NULL, id, args);
+}
+
+// Functions with this signature are used to implement functions in
+// the CallMethod family.
+template<typename T>
+static T
+_Jv_JNI_CallMethod (JNIEnv *env, jobject obj, jmethodID id, ...)
+{
+  va_list args;
+  T result;
+
+  va_start (args, id);
+  result = _Jv_JNI_CallAnyMethodV<T, normal> (env, obj, NULL, id, args);
+  va_end (args);
+
+  return result;
+}
+
+// Functions with this signature are used to implement functions in
+// the CallMethod family.
+template<typename T>
+static T
+_Jv_JNI_CallMethodA (JNIEnv *env, jobject obj, jmethodID id, jvalue *args)
+{
+  return _Jv_JNI_CallAnyMethodA<T, normal> (env, obj, NULL, id, args);
+}
+
+static void
+_Jv_JNI_CallVoidMethodV (JNIEnv *env, jobject obj, jmethodID id, va_list args)
+{
+  _Jv_JNI_CallAnyVoidMethodV<normal> (env, obj, NULL, id, args);
+}
+
+static void
+_Jv_JNI_CallVoidMethod (JNIEnv *env, jobject obj, jmethodID id, ...)
+{
+  va_list args;
+
+  va_start (args, id);
+  _Jv_JNI_CallAnyVoidMethodV<normal> (env, obj, NULL, id, args);
+  va_end (args);
+}
+
+static void
+_Jv_JNI_CallVoidMethodA (JNIEnv *env, jobject obj, jmethodID id, jvalue *args)
+{
+  _Jv_JNI_CallAnyVoidMethodA<normal> (env, obj, NULL, id, args);
+}
+
+// Functions with this signature are used to implement functions in
+// the CallStaticMethod family.
+template<typename T>
+static T
+_Jv_JNI_CallStaticMethodV (JNIEnv *env, jclass klass,
+			   jmethodID id, va_list args)
+{
+  return _Jv_JNI_CallAnyMethodV<T, static_type> (env, NULL, klass, id, args);
+}
+
+// Functions with this signature are used to implement functions in
+// the CallStaticMethod family.
+template<typename T>
+static T
+_Jv_JNI_CallStaticMethod (JNIEnv *env, jclass klass, jmethodID id, ...)
+{
+  va_list args;
+  T result;
+
+  va_start (args, id);
+  result = _Jv_JNI_CallAnyMethodV<T, static_type> (env, NULL, klass,
+						   id, args);
+  va_end (args);
+
+  return result;
+}
+
+// Functions with this signature are used to implement functions in
+// the CallStaticMethod family.
+template<typename T>
+static T
+_Jv_JNI_CallStaticMethodA (JNIEnv *env, jclass klass, jmethodID id,
+			   jvalue *args)
+{
+  return _Jv_JNI_CallAnyMethodA<T, static_type> (env, NULL, klass, id, args);
+}
+
+static void
+_Jv_JNI_CallStaticVoidMethodV (JNIEnv *env, jclass klass, jmethodID id,
+			       va_list args)
+{
+  _Jv_JNI_CallAnyVoidMethodV<static_type> (env, NULL, klass, id, args);
+}
+
+static void
+_Jv_JNI_CallStaticVoidMethod (JNIEnv *env, jclass klass, jmethodID id, ...)
+{
+  va_list args;
+
+  va_start (args, id);
+  _Jv_JNI_CallAnyVoidMethodV<static_type> (env, NULL, klass, id, args);
+  va_end (args);
+}
+
+static void
+_Jv_JNI_CallStaticVoidMethodA (JNIEnv *env, jclass klass, jmethodID id,
+			       jvalue *args)
+{
+  _Jv_JNI_CallAnyVoidMethodA<static_type> (env, NULL, klass, id, args);
+}
+
+static jobject
+_Jv_JNI_NewObjectV (JNIEnv *env, jclass klass,
+		    jmethodID id, va_list args)
+{
+  return _Jv_JNI_CallAnyMethodV<jobject, constructor> (env, NULL, klass,
+						       id, args);
+}
+
+static jobject
+_Jv_JNI_NewObject (JNIEnv *env, jclass klass, jmethodID id, ...)
+{
+  va_list args;
+  jobject result;
+
+  va_start (args, id);
+  result = _Jv_JNI_CallAnyMethodV<jobject, constructor> (env, NULL, klass,
+							 id, args);
+  va_end (args);
+
+  return result;
+}
+
+static jobject
+_Jv_JNI_NewObjectA (JNIEnv *env, jclass klass, jmethodID id,
+		    jvalue *args)
+{
+  return _Jv_JNI_CallAnyMethodA<jobject, constructor> (env, NULL, klass,
+						       id, args);
+}
+
+
+
+template<typename T>
+static T
+_Jv_JNI_GetField (JNIEnv *, jobject obj, jfieldID field) 
+{
+  T *ptr = (T *) ((char *) obj + field->getOffset ());
+  return *ptr;
+}
+
+template<typename T>
+static void
+_Jv_JNI_SetField (JNIEnv *, jobject obj, jfieldID field, T value)
+{
+  T *ptr = (T *) ((char *) obj + field->getOffset ());
+  *ptr = value;
+}
+
+template<jboolean is_static>
+static jfieldID
+_Jv_JNI_GetAnyFieldID (JNIEnv *env, jclass clazz,
+		       const char *name, const char *sig)
+{
+  // FIXME: exception processing.
+  _Jv_InitClass (clazz);
+
+  _Jv_Utf8Const *a_name = _Jv_makeUtf8Const ((char *) name, -1);
+
+  jclass field_class = NULL;
+  if (sig[0] == '[')
+    field_class = _Jv_FindClassFromSignature ((char *) sig, NULL);
+  else
+    {
+      _Jv_Utf8Const *sig_u = _Jv_makeUtf8Const ((char *) sig, -1);
+      field_class = _Jv_FindClass (sig_u, NULL);
+    }
+
+  // FIXME: what if field_class == NULL?
+
+  while (clazz != NULL)
+    {
+      jint count = (is_static
+		    ? JvNumStaticFields (clazz)
+		    : JvNumInstanceFields (clazz));
+      jfieldID field = (is_static
+			? JvGetFirstStaticField (clazz)
+			: JvGetFirstInstanceField (clazz));
+      for (jint i = 0; i < count; ++i)
+	{
+	  // The field is resolved as a side effect of class
+	  // initialization.
+	  JvAssert (field->isResolved ());
+
+	  _Jv_Utf8Const *f_name = field->getNameUtf8Const(clazz);
+
+	  if (_Jv_equalUtf8Consts (f_name, a_name)
+	      && field->getClass() == field_class)
+	    return field;
+
+	  field = field->getNextField ();
+	}
+
+      clazz = clazz->getSuperclass ();
+    }
+
+  get_throwable (env) = new java::lang::NoSuchFieldError ();
+  return NULL;
+}
+
+template<typename T>
+static T
+_Jv_JNI_GetStaticField (JNIEnv *, jclass, jfieldID field)
+{
+  T *ptr = (T *) field->u.addr;
+  return *ptr;
+}
+
+template<typename T>
+static void
+_Jv_JNI_SetStaticField (JNIEnv *, jclass, jfieldID field, T value)
 {
-  return _Jv_GetIntField (obj, field);
+  T *ptr = (T *) field->u.addr;
+  *ptr = value;
 }
 
-static jlong
-_Jv_JNI_GetLongField (JNIEnv *, jobject obj, jfieldID field) 
+static jstring
+_Jv_JNI_NewString (JNIEnv *, const jchar *unichars, jsize len)
 {
-  return _Jv_GetLongField (obj, field);
+  // FIXME: exception processing.
+  jstring r = _Jv_NewString (unichars, len);
+  return r;
 }
 
 static jsize
@@ -63,6 +651,173 @@
   return string->length();
 }
 
+static const jchar *
+_Jv_JNI_GetStringChars (JNIEnv *, jstring string, jboolean *isCopy)
+{
+  jchar *result = _Jv_GetStringChars (string);
+  mark_for_gc (result);
+  if (isCopy)
+    *isCopy = false;
+  return (const jchar *) result;
+}
+
+static void
+_Jv_JNI_ReleaseStringChars (JNIEnv *, jstring, const jchar *chars)
+{
+  unmark_for_gc ((void *) chars);
+}
+
+static jstring
+_Jv_JNI_NewStringUTF (JNIEnv *, const char *bytes)
+{
+  // FIXME: exception processing.
+  jstring r = JvNewStringUTF (bytes);
+  return r;
+}
+
+static jsize
+_Jv_JNI_GetStringUTFLength (JNIEnv *, jstring string)
+{
+  return JvGetStringUTFLength (string);
+}
+
+static const char *
+_Jv_JNI_GetStringUTFChars (JNIEnv *, jstring string, jboolean *isCopy)
+{
+  jsize len = JvGetStringUTFLength (string);
+  // FIXME: exception processing.
+  char *r = (char *) _Jv_Malloc (len + 1);
+  JvGetStringUTFRegion (string, 0, len, r);
+  r[len] = '\0';
+
+  if (isCopy)
+    *isCopy = true;
+
+  return (const char *) r;
+}
+
+static void
+_Jv_JNI_ReleaseStringUTFChars (JNIEnv *, jstring, const char *utf)
+{
+  _Jv_Free ((void *) utf);
+}
+
+static jsize
+_Jv_JNI_GetArrayLength (JNIEnv *, jarray array)
+{
+  return array->length;
+}
+
+static jarray
+_Jv_JNI_NewObjectArray (JNIEnv *, jsize length, jclass elementClass,
+			jobject init)
+{
+  // FIXME: exception processing.
+  jarray result = JvNewObjectArray (length, elementClass, init);
+  return result;
+}
+
+static jobject
+_Jv_JNI_GetObjectArrayElement (JNIEnv *, jobjectArray array, jsize index)
+{
+  jobject *elts = elements (array);
+  return elts[index];
+}
+
+static void
+_Jv_JNI_SetObjectArrayElement (JNIEnv *, jobjectArray array, jsize index,
+			       jobject value)
+{
+  // FIXME: exception processing.
+  _Jv_CheckArrayStore (array, value);
+  jobject *elts = elements (array);
+  elts[index] = value;
+}
+
+template<typename T, jclass K>
+static JArray<T> *
+_Jv_JNI_NewPrimitiveArray (JNIEnv *, jsize length)
+{
+  return (JArray<T> *) _Jv_NewPrimArray (K, length);
+}
+
+template<typename T>
+static T *
+_Jv_JNI_GetPrimitiveArrayElements (JNIEnv *, JArray<T> *array,
+				   jboolean *isCopy)
+{
+  T *elts = elements (array);
+  if (isCopy)
+    {
+      // We elect never to copy.
+      *isCopy = false;
+    }
+  mark_for_gc (elts);
+  return elts;
+}
+
+template<typename T>
+static void
+_Jv_JNI_ReleasePrimitiveArrayElements (JNIEnv *, JArray<T> *,
+				       T *elems, jint /* mode */)
+{
+  // Note that we ignore MODE.  We can do this because we never copy
+  // the array elements.  My reading of the JNI documentation is that
+  // this is an option for the implementor.
+  unmark_for_gc (elems);
+}
+
+template<typename T>
+static void
+_Jv_JNI_GetPrimitiveArrayRegion (JNIEnv *env, JArray<T> *array,
+				 jsize start, jsize len,
+				 T *buf)
+{
+  if (start < 0 || len >= array->length || start + len >= array->length)
+    {
+      // FIXME: index.
+      get_throwable (env) = new java::lang::ArrayIndexOutOfBoundsException ();
+    }
+  else
+    {
+      T *elts = elements (array) + start;
+      memcpy (buf, elts, len * sizeof (T));
+    }
+}
+
+template<typename T>
+static void
+_Jv_JNI_SetPrimitiveArrayRegion (JNIEnv *env, JArray<T> *array, 
+				 jsize start, jsize len, T *buf)
+{
+  if (start < 0 || len >= array->length || start + len >= array->length)
+    {
+      // FIXME: index.
+      get_throwable (env) = new java::lang::ArrayIndexOutOfBoundsException ();
+    }
+  else
+    {
+      T *elts = elements (array) + start;
+      memcpy (elts, buf, len * sizeof (T));
+    }
+}
+
+static jint
+_Jv_JNI_MonitorEnter (JNIEnv *, jobject obj)
+{
+  // FIXME: exception processing.
+  jint r = _Jv_MonitorEnter (obj);
+  return r;
+}
+
+static jint
+_Jv_JNI_MonitorExit (JNIEnv *, jobject obj)
+{
+  // FIXME: exception processing.
+  jint r = _Jv_MonitorExit (obj);
+  return r;
+}
+
 // JDK 1.2
 jobject
 _Jv_JNI_ToReflectedField (JNIEnv *, jclass cls, jfieldID fieldID)
@@ -82,227 +837,234 @@
 }
 
 #define NOT_IMPL NULL
+#define RESERVED NULL
 
 struct JNINativeInterface _Jv_JNIFunctions =
 {
-  NULL,
-  NULL,
-  NULL,
-  NULL,
-  NOT_IMPL /* GetVersion */,
+  RESERVED,
+  RESERVED,
+  RESERVED,
+  RESERVED,
+  _Jv_JNI_GetVersion,
   NOT_IMPL /* DefineClass */,
   NOT_IMPL /* FindClass */,
-  NULL,
-  NULL,
-  NULL,
+  RESERVED,
+  RESERVED,
+  RESERVED,
   _Jv_JNI_GetSuperclass,
   IsAssignableFrom,
-  NULL,
-  NOT_IMPL /* Throw */,
-  NOT_IMPL /* ThrowNew */,
-  NOT_IMPL /* ExceptionOccurred */,
-  NOT_IMPL /* ExceptionDescribe */,
-  NOT_IMPL /* ExceptionClear */,
-  NOT_IMPL /* FatalError */,
-  NOT_IMPL /* NULL */,
-  NOT_IMPL /* NULL */,
+  RESERVED,
+  _Jv_JNI_Throw,
+  _Jv_JNI_ThrowNew,
+  _Jv_JNI_ExceptionOccurred,
+  _Jv_JNI_ExceptionDescribe,
+  _Jv_JNI_ExceptionClear,
+  _Jv_JNI_FatalError,
+  RESERVED,
+  RESERVED,
   NOT_IMPL /* NewGlobalRef */,
   NOT_IMPL /* DeleteGlobalRef */,
   NOT_IMPL /* DeleteLocalRef */,
-  NOT_IMPL /* IsSameObject */,
-  NOT_IMPL /* NULL */,
-  NOT_IMPL /* NULL */,
-  NOT_IMPL /* AllocObject */,
-  NOT_IMPL /* NewObject */,
-  NOT_IMPL /* NewObjectV */,
-  NOT_IMPL /* NewObjectA */,
-  NOT_IMPL /* GetObjectClass */,
-  NOT_IMPL /* IsInstanceOf */,
-  NOT_IMPL /* GetMethodID */,
-  NOT_IMPL /* CallObjectMethod */,
-  NOT_IMPL /* CallObjectMethodV */,
-  NOT_IMPL /* CallObjectMethodA */,
-  NOT_IMPL /* CallBooleanMethod */,
-  NOT_IMPL /* CallBooleanMethodV */,
-  NOT_IMPL /* CallBooleanMethodA */,
-  NOT_IMPL /* CallByteMethod */,
-  NOT_IMPL /* CallByteMethodV */,
-  NOT_IMPL /* CallByteMethodA */,
-  NOT_IMPL /* CallCharMethod */,
-  NOT_IMPL /* CallCharMethodV */,
-  NOT_IMPL /* CallCharMethodA */,
-  NOT_IMPL /* CallShortMethod */,
-  NOT_IMPL /* CallShortMethodV */,
-  NOT_IMPL /* CallShortMethodA */,
-  NOT_IMPL /* CallIntMethod */,
-  NOT_IMPL /* CallIntMethodV */,
-  NOT_IMPL /* CallIntMethodA */,
-  NOT_IMPL /* CallLongMethod */,
-  NOT_IMPL /* CallLongMethodV */,
-  NOT_IMPL /* CallLongMethodA */,
-  NOT_IMPL /* CallFloatMethod */,
-  NOT_IMPL /* CallFloatMethodV */,
-  NOT_IMPL /* CallFloatMethodA */,
-  NOT_IMPL /* CallDoubleMethod */,
-  NOT_IMPL /* CallDoubleMethodV */,
-  NOT_IMPL /* CallDoubleMethodA */,
-  NOT_IMPL /* CallVoidMethod */,
-  NOT_IMPL /* CallVoidMethodV */,
-  NOT_IMPL /* CallVoidMethodA */,
-  NOT_IMPL /* CallNonvirtualObjectMethod */,
-  NOT_IMPL /* CallNonvirtualObjectMethodV */,
-  NOT_IMPL /* CallNonvirtualObjectMethodA */,
-  NOT_IMPL /* CallNonvirtualBooleanMethod */,
-  NOT_IMPL /* CallNonvirtualBooleanMethodV */,
-  NOT_IMPL /* CallNonvirtualBooleanMethodA */,
-  NOT_IMPL /* CallNonvirtualByteMethod */,
-  NOT_IMPL /* CallNonvirtualByteMethodV */,
-  NOT_IMPL /* CallNonvirtualByteMethodA */,
-  NOT_IMPL /* CallNonvirtualCharMethod */,
-  NOT_IMPL /* CallNonvirtualCharMethodV */,
-  NOT_IMPL /* CallNonvirtualCharMethodA */,
-  NOT_IMPL /* CallNonvirtualShortMethod */,
-  NOT_IMPL /* CallNonvirtualShortMethodV */,
-  NOT_IMPL /* CallNonvirtualShortMethodA */,
-  NOT_IMPL /* CallNonvirtualIntMethod */,
-  NOT_IMPL /* CallNonvirtualIntMethodV */,
-  NOT_IMPL /* CallNonvirtualIntMethodA */,
-  NOT_IMPL /* CallNonvirtualLongMethod */,
-  NOT_IMPL /* CallNonvirtualLongMethodV */,
-  NOT_IMPL /* CallNonvirtualLongMethodA */,
-  NOT_IMPL /* CallNonvirtualFloatMethod */,
-  NOT_IMPL /* CallNonvirtualFloatMethodV */,
-  NOT_IMPL /* CallNonvirtualFloatMethodA */,
-  NOT_IMPL /* CallNonvirtualDoubleMethod */,
-  NOT_IMPL /* CallNonvirtualDoubleMethodV */,
-  NOT_IMPL /* CallNonvirtualDoubleMethodA */,
-  NOT_IMPL /* CallNonvirtualVoidMethod */,
-  NOT_IMPL /* CallNonvirtualVoidMethodV */,
-  NOT_IMPL /* CallNonvirtualVoidMethodA */,
-  NOT_IMPL /* GetFieldID */,
-  _Jv_JNI_GetObjectField,
-  NOT_IMPL /* GetBooleanField */,
-  _Jv_JNI_GetByteField,
-  NOT_IMPL /* GetCharField */,
-  _Jv_JNI_GetShortField,
-  _Jv_JNI_GetIntField,
-  _Jv_JNI_GetLongField,
-  NOT_IMPL /* GetFloatField */,
-  NOT_IMPL /* GetDoubleField */,
-  NOT_IMPL /* SetObjectField */,
-  NOT_IMPL /* SetBooleanField */,
-  NOT_IMPL /* SetByteField */,
-  NOT_IMPL /* SetCharField */,
-  NOT_IMPL /* SetShortField */,
-  NOT_IMPL /* SetIntField */,
-  NOT_IMPL /* SetLongField */,
-  NOT_IMPL /* SetFloatField */,
-  NOT_IMPL /* SetDoubleField */,
-  NOT_IMPL /* GetStaticMethodID */,
-  NOT_IMPL /* CallStaticObjectMethod */,
-  NOT_IMPL /* CallStaticObjectMethodV */,
-  NOT_IMPL /* CallStaticObjectMethodA */,
-  NOT_IMPL /* CallStaticBooleanMethod */,
-  NOT_IMPL /* CallStaticBooleanMethodV */,
-  NOT_IMPL /* CallStaticBooleanMethodA */,
-  NOT_IMPL /* CallStaticByteMethod */,
-  NOT_IMPL /* CallStaticByteMethodV */,
-  NOT_IMPL /* CallStaticByteMethodA */,
-  NOT_IMPL /* CallStaticCharMethod */,
-  NOT_IMPL /* CallStaticCharMethodV */,
-  NOT_IMPL /* CallStaticCharMethodA */,
-  NOT_IMPL /* CallStaticShortMethod */,
-  NOT_IMPL /* CallStaticShortMethodV */,
-  NOT_IMPL /* CallStaticShortMethodA */,
-  NOT_IMPL /* CallStaticIntMethod */,
-  NOT_IMPL /* CallStaticIntMethodV */,
-  NOT_IMPL /* CallStaticIntMethodA */,
-  NOT_IMPL /* CallStaticLongMethod */,
-  NOT_IMPL /* CallStaticLongMethodV */,
-  NOT_IMPL /* CallStaticLongMethodA */,
-  NOT_IMPL /* CallStaticFloatMethod */,
-  NOT_IMPL /* CallStaticFloatMethodV */,
-  NOT_IMPL /* CallStaticFloatMethodA */,
-  NOT_IMPL /* CallStaticDoubleMethod */,
-  NOT_IMPL /* CallStaticDoubleMethodV */,
-  NOT_IMPL /* CallStaticDoubleMethodA */,
-  NOT_IMPL /* CallStaticVoidMethod */,
-  NOT_IMPL /* CallStaticVoidMethodV */,
-  NOT_IMPL /* CallStaticVoidMethodA */,
-  NOT_IMPL /* GetStaticFieldID */,
-  NOT_IMPL /* GetStaticObjectField */,
-  NOT_IMPL /* GetStaticBooleanField */,
-  NOT_IMPL /* GetStaticByteField */,
-  NOT_IMPL /* GetStaticCharField */,
-  NOT_IMPL /* GetStaticShortField */,
-  NOT_IMPL /* GetStaticIntField */,
-  NOT_IMPL /* GetStaticLongField */,
-  NOT_IMPL /* GetStaticFloatField */,
-  NOT_IMPL /* GetStaticDoubleField */,
-  NOT_IMPL /* SetStaticObjectField */,
-  NOT_IMPL /* SetStaticBooleanField */,
-  NOT_IMPL /* SetStaticByteField */,
-  NOT_IMPL /* SetStaticCharField */,
-  NOT_IMPL /* SetStaticShortField */,
-  NOT_IMPL /* SetStaticIntField */,
-  NOT_IMPL /* SetStaticLongField */,
-  NOT_IMPL /* SetStaticFloatField */,
-  NOT_IMPL /* SetStaticDoubleField */,
-  NOT_IMPL /* NewString */,
+  _Jv_JNI_IsSameObject,
+  RESERVED,
+  RESERVED,
+  _Jv_JNI_AllocObject,
+  _Jv_JNI_NewObject,
+  _Jv_JNI_NewObjectV,
+  _Jv_JNI_NewObjectA,
+  _Jv_JNI_GetObjectClass,
+  _Jv_JNI_IsInstanceOf,
+  _Jv_JNI_GetAnyMethodID<false>,
+
+  _Jv_JNI_CallMethod<jobject>,
+  _Jv_JNI_CallMethodV<jobject>,
+  _Jv_JNI_CallMethodA<jobject>,
+  _Jv_JNI_CallMethod<jboolean>,
+  _Jv_JNI_CallMethodV<jboolean>,
+  _Jv_JNI_CallMethodA<jboolean>,
+  _Jv_JNI_CallMethod<jbyte>,
+  _Jv_JNI_CallMethodV<jbyte>,
+  _Jv_JNI_CallMethodA<jbyte>,
+  _Jv_JNI_CallMethod<jchar>,
+  _Jv_JNI_CallMethodV<jchar>,
+  _Jv_JNI_CallMethodA<jchar>,
+  _Jv_JNI_CallMethod<jshort>,
+  _Jv_JNI_CallMethodV<jshort>,
+  _Jv_JNI_CallMethodA<jshort>,
+  _Jv_JNI_CallMethod<jint>,
+  _Jv_JNI_CallMethodV<jint>,
+  _Jv_JNI_CallMethodA<jint>,
+  _Jv_JNI_CallMethod<jlong>,
+  _Jv_JNI_CallMethodV<jlong>,
+  _Jv_JNI_CallMethodA<jlong>,
+  _Jv_JNI_CallMethod<jfloat>,
+  _Jv_JNI_CallMethodV<jfloat>,
+  _Jv_JNI_CallMethodA<jfloat>,
+  _Jv_JNI_CallMethod<jdouble>,
+  _Jv_JNI_CallMethodV<jdouble>,
+  _Jv_JNI_CallMethodA<jdouble>,
+  _Jv_JNI_CallVoidMethod,
+  _Jv_JNI_CallVoidMethodV,
+  _Jv_JNI_CallVoidMethodA,
+
+  // Nonvirtual method invocation functions follow.
+  _Jv_JNI_CallAnyMethod<jobject, nonvirtual>,
+  _Jv_JNI_CallAnyMethodV<jobject, nonvirtual>,
+  _Jv_JNI_CallAnyMethodA<jobject, nonvirtual>,
+  _Jv_JNI_CallAnyMethod<jboolean, nonvirtual>,
+  _Jv_JNI_CallAnyMethodV<jboolean, nonvirtual>,
+  _Jv_JNI_CallAnyMethodA<jboolean, nonvirtual>,
+  _Jv_JNI_CallAnyMethod<jbyte, nonvirtual>,
+  _Jv_JNI_CallAnyMethodV<jbyte, nonvirtual>,
+  _Jv_JNI_CallAnyMethodA<jbyte, nonvirtual>,
+  _Jv_JNI_CallAnyMethod<jchar, nonvirtual>,
+  _Jv_JNI_CallAnyMethodV<jchar, nonvirtual>,
+  _Jv_JNI_CallAnyMethodA<jchar, nonvirtual>,
+  _Jv_JNI_CallAnyMethod<jshort, nonvirtual>,
+  _Jv_JNI_CallAnyMethodV<jshort, nonvirtual>,
+  _Jv_JNI_CallAnyMethodA<jshort, nonvirtual>,
+  _Jv_JNI_CallAnyMethod<jint, nonvirtual>,
+  _Jv_JNI_CallAnyMethodV<jint, nonvirtual>,
+  _Jv_JNI_CallAnyMethodA<jint, nonvirtual>,
+  _Jv_JNI_CallAnyMethod<jlong, nonvirtual>,
+  _Jv_JNI_CallAnyMethodV<jlong, nonvirtual>,
+  _Jv_JNI_CallAnyMethodA<jlong, nonvirtual>,
+  _Jv_JNI_CallAnyMethod<jfloat, nonvirtual>,
+  _Jv_JNI_CallAnyMethodV<jfloat, nonvirtual>,
+  _Jv_JNI_CallAnyMethodA<jfloat, nonvirtual>,
+  _Jv_JNI_CallAnyMethod<jdouble, nonvirtual>,
+  _Jv_JNI_CallAnyMethodV<jdouble, nonvirtual>,
+  _Jv_JNI_CallAnyMethodA<jdouble, nonvirtual>,
+  _Jv_JNI_CallAnyVoidMethod<nonvirtual>,
+  _Jv_JNI_CallAnyVoidMethodV<nonvirtual>,
+  _Jv_JNI_CallAnyVoidMethodA<nonvirtual>,
+
+  _Jv_JNI_GetAnyFieldID<false>,
+  _Jv_JNI_GetField<jobject>,
+  _Jv_JNI_GetField<jboolean>,
+  _Jv_JNI_GetField<jbyte>,
+  _Jv_JNI_GetField<jchar>,
+  _Jv_JNI_GetField<jshort>,
+  _Jv_JNI_GetField<jint>,
+  _Jv_JNI_GetField<jlong>,
+  _Jv_JNI_GetField<jfloat>,
+  _Jv_JNI_GetField<jdouble>,
+  _Jv_JNI_SetField,
+  _Jv_JNI_SetField,
+  _Jv_JNI_SetField,
+  _Jv_JNI_SetField,
+  _Jv_JNI_SetField,
+  _Jv_JNI_SetField,
+  _Jv_JNI_SetField,
+  _Jv_JNI_SetField,
+  _Jv_JNI_SetField,
+  _Jv_JNI_GetAnyMethodID<true>,
+
+  _Jv_JNI_CallStaticMethod<jobject>,
+  _Jv_JNI_CallStaticMethodV<jobject>,
+  _Jv_JNI_CallStaticMethodA<jobject>,
+  _Jv_JNI_CallStaticMethod<jboolean>,
+  _Jv_JNI_CallStaticMethodV<jboolean>,
+  _Jv_JNI_CallStaticMethodA<jboolean>,
+  _Jv_JNI_CallStaticMethod<jbyte>,
+  _Jv_JNI_CallStaticMethodV<jbyte>,
+  _Jv_JNI_CallStaticMethodA<jbyte>,
+  _Jv_JNI_CallStaticMethod<jchar>,
+  _Jv_JNI_CallStaticMethodV<jchar>,
+  _Jv_JNI_CallStaticMethodA<jchar>,
+  _Jv_JNI_CallStaticMethod<jshort>,
+  _Jv_JNI_CallStaticMethodV<jshort>,
+  _Jv_JNI_CallStaticMethodA<jshort>,
+  _Jv_JNI_CallStaticMethod<jint>,
+  _Jv_JNI_CallStaticMethodV<jint>,
+  _Jv_JNI_CallStaticMethodA<jint>,
+  _Jv_JNI_CallStaticMethod<jlong>,
+  _Jv_JNI_CallStaticMethodV<jlong>,
+  _Jv_JNI_CallStaticMethodA<jlong>,
+  _Jv_JNI_CallStaticMethod<jfloat>,
+  _Jv_JNI_CallStaticMethodV<jfloat>,
+  _Jv_JNI_CallStaticMethodA<jfloat>,
+  _Jv_JNI_CallStaticMethod<jdouble>,
+  _Jv_JNI_CallStaticMethodV<jdouble>,
+  _Jv_JNI_CallStaticMethodA<jdouble>,
+  _Jv_JNI_CallStaticVoidMethod,
+  _Jv_JNI_CallStaticVoidMethodV,
+  _Jv_JNI_CallStaticVoidMethodA,
+
+  _Jv_JNI_GetAnyFieldID<true>,
+  _Jv_JNI_GetStaticField<jobject>,
+  _Jv_JNI_GetStaticField<jboolean>,
+  _Jv_JNI_GetStaticField<jbyte>,
+  _Jv_JNI_GetStaticField<jchar>,
+  _Jv_JNI_GetStaticField<jshort>,
+  _Jv_JNI_GetStaticField<jint>,
+  _Jv_JNI_GetStaticField<jlong>,
+  _Jv_JNI_GetStaticField<jfloat>,
+  _Jv_JNI_GetStaticField<jdouble>,
+  _Jv_JNI_SetStaticField,
+  _Jv_JNI_SetStaticField,
+  _Jv_JNI_SetStaticField,
+  _Jv_JNI_SetStaticField,
+  _Jv_JNI_SetStaticField,
+  _Jv_JNI_SetStaticField,
+  _Jv_JNI_SetStaticField,
+  _Jv_JNI_SetStaticField,
+  _Jv_JNI_SetStaticField,
+  _Jv_JNI_NewString,
   _Jv_JNI_GetStringLength,
-  NOT_IMPL /* GetStringChars */,
-  NOT_IMPL /* ReleaseStringChars */,
-  NOT_IMPL /* NewStringUTF */,
-  NOT_IMPL /* GetStringUTFLength */,
-  NOT_IMPL /* GetStringUTFChars */,
-  NOT_IMPL /* ReleaseStringUTFChars */,
-  NOT_IMPL /* GetArrayLength */,
-  NOT_IMPL /* NewObjectArray */,
-  NOT_IMPL /* GetObjectArrayElement */,
-  NOT_IMPL /* SetObjectArrayElement */,
-  NOT_IMPL /* NewBooleanArray */,
-  NOT_IMPL /* NewByteArray */,
-  NOT_IMPL /* NewCharArray */,
-  NOT_IMPL /* NewShortArray */,
-  NOT_IMPL /* NewIntArray */,
-  NOT_IMPL /* NewLongArray */,
-  NOT_IMPL /* NewFloatArray */,
-  NOT_IMPL /* NewDoubleArray */,
-  NOT_IMPL /* GetBooleanArrayElements */,
-  NOT_IMPL /* GetByteArrayElements */,
-  NOT_IMPL /* GetCharArrayElements */,
-  NOT_IMPL /* GetShortArrayElements */,
-  NOT_IMPL /* GetIntArrayElements */,
-  NOT_IMPL /* GetLongArrayElements */,
-  NOT_IMPL /* GetFloatArrayElements */,
-  NOT_IMPL /* GetDoubleArrayElements */,
-  NOT_IMPL /* ReleaseBooleanArrayElements */,
-  NOT_IMPL /* ReleaseByteArrayElements */,
-  NOT_IMPL /* ReleaseCharArrayElements */,
-  NOT_IMPL /* ReleaseShortArrayElements */,
-  NOT_IMPL /* ReleaseIntArrayElements */,
-  NOT_IMPL /* ReleaseLongArrayElements */,
-  NOT_IMPL /* ReleaseFloatArrayElements */,
-  NOT_IMPL /* ReleaseDoubleArrayElements */,
-  NOT_IMPL /* GetBooleanArrayRegion */,
-  NOT_IMPL /* GetByteArrayRegion */,
-  NOT_IMPL /* GetCharArrayRegion */,
-  NOT_IMPL /* GetShortArrayRegion */,
-  NOT_IMPL /* GetIntArrayRegion */,
-  NOT_IMPL /* GetLongArrayRegion */,
-  NOT_IMPL /* GetFloatArrayRegion */,
-  NOT_IMPL /* GetDoubleArrayRegion */,
-  NOT_IMPL /* SetBooleanArrayRegion */,
-  NOT_IMPL /* SetByteArrayRegion */,
-  NOT_IMPL /* SetCharArrayRegion */,
-  NOT_IMPL /* SetShortArrayRegion */,
-  NOT_IMPL /* SetIntArrayRegion */,
-  NOT_IMPL /* SetLongArrayRegion */,
-  NOT_IMPL /* SetFloatArrayRegion */,
-  NOT_IMPL /* SetDoubleArrayRegion */,
+  _Jv_JNI_GetStringChars,
+  _Jv_JNI_ReleaseStringChars,
+  _Jv_JNI_NewStringUTF,
+  _Jv_JNI_GetStringUTFLength,
+  _Jv_JNI_GetStringUTFChars,
+  _Jv_JNI_ReleaseStringUTFChars,
+  _Jv_JNI_GetArrayLength,
+  _Jv_JNI_NewObjectArray,
+  _Jv_JNI_GetObjectArrayElement,
+  _Jv_JNI_SetObjectArrayElement,
+  _Jv_JNI_NewPrimitiveArray<jboolean, JvPrimClass (boolean)>,
+  _Jv_JNI_NewPrimitiveArray<jbyte, JvPrimClass (byte)>,
+  _Jv_JNI_NewPrimitiveArray<jchar, JvPrimClass (char)>,
+  _Jv_JNI_NewPrimitiveArray<jshort, JvPrimClass (short)>,
+  _Jv_JNI_NewPrimitiveArray<jint, JvPrimClass (int)>,
+  _Jv_JNI_NewPrimitiveArray<jlong, JvPrimClass (long)>,
+  _Jv_JNI_NewPrimitiveArray<jfloat, JvPrimClass (float)>,
+  _Jv_JNI_NewPrimitiveArray<jdouble, JvPrimClass (double)>,
+  _Jv_JNI_GetPrimitiveArrayElements,
+  _Jv_JNI_GetPrimitiveArrayElements,
+  _Jv_JNI_GetPrimitiveArrayElements,
+  _Jv_JNI_GetPrimitiveArrayElements,
+  _Jv_JNI_GetPrimitiveArrayElements,
+  _Jv_JNI_GetPrimitiveArrayElements,
+  _Jv_JNI_GetPrimitiveArrayElements,
+  _Jv_JNI_GetPrimitiveArrayElements,
+  _Jv_JNI_ReleasePrimitiveArrayElements,
+  _Jv_JNI_ReleasePrimitiveArrayElements,
+  _Jv_JNI_ReleasePrimitiveArrayElements,
+  _Jv_JNI_ReleasePrimitiveArrayElements,
+  _Jv_JNI_ReleasePrimitiveArrayElements,
+  _Jv_JNI_ReleasePrimitiveArrayElements,
+  _Jv_JNI_ReleasePrimitiveArrayElements,
+  _Jv_JNI_ReleasePrimitiveArrayElements,
+  _Jv_JNI_GetPrimitiveArrayRegion,
+  _Jv_JNI_GetPrimitiveArrayRegion,
+  _Jv_JNI_GetPrimitiveArrayRegion,
+  _Jv_JNI_GetPrimitiveArrayRegion,
+  _Jv_JNI_GetPrimitiveArrayRegion,
+  _Jv_JNI_GetPrimitiveArrayRegion,
+  _Jv_JNI_GetPrimitiveArrayRegion,
+  _Jv_JNI_GetPrimitiveArrayRegion,
+  _Jv_JNI_SetPrimitiveArrayRegion,
+  _Jv_JNI_SetPrimitiveArrayRegion,
+  _Jv_JNI_SetPrimitiveArrayRegion,
+  _Jv_JNI_SetPrimitiveArrayRegion,
+  _Jv_JNI_SetPrimitiveArrayRegion,
+  _Jv_JNI_SetPrimitiveArrayRegion,
+  _Jv_JNI_SetPrimitiveArrayRegion,
+  _Jv_JNI_SetPrimitiveArrayRegion,
   NOT_IMPL /* RegisterNatives */,
   NOT_IMPL /* UnregisterNatives */,
-  NOT_IMPL /* MonitorEnter */,
-  NOT_IMPL /* MonitorExit */,
+  _Jv_JNI_MonitorEnter,
+  _Jv_JNI_MonitorExit,
   NOT_IMPL /* GetJavaVM */,
 };
Index: gcj/field.h
===================================================================
RCS file: /cvs/java/libgcj/libjava/gcj/field.h,v
retrieving revision 1.2
diff -u -r1.2 field.h
--- field.h	2000/01/19 18:39:23	1.2
+++ field.h	2000/01/21 23:41:44
@@ -1,6 +1,6 @@
 // field.h - Header file for fieldID instances.  -*- c++ -*-
 
-/* Copyright (C) 1998, 1999  Red Hat, Inc.
+/* Copyright (C) 1998, 1999, 2000  Red Hat, Inc.
 
    This file is part of libgcj.
 
@@ -30,7 +30,7 @@
   _Jv_ushort		flags;
 
 #ifdef COMPACT_FIELDS
-  short			nameIndex;  /* ofsfet in class's name table */
+  short			nameIndex;  /* offset in class's name table */
 #else
   _Jv_ushort		bsize;  /* not really needed ... */
 #endif
@@ -51,7 +51,7 @@
   jobject getObjectField (jobject obj)
   { return *(jobject *)((char *)obj + getOffset ()); }
 
-  jfieldID getNextInstanceField () { return this + 1; }
+  jfieldID getNextField () { return this + 1; }
 
   jboolean isRef () 
     { 
@@ -66,6 +66,12 @@
 	}
     }
 
+  jclass getClass ()
+  {
+    JvAssert (isResolved ());
+    return type;
+  }
+
   // FIXME - may need to mask off internal flags.
   int getModifiers() { return flags; }
 
@@ -79,6 +85,7 @@
 };
 
 #ifdef __cplusplus
+
 inline jbyte
 _Jv_GetStaticByteField (jclass, _Jv_Field* field)
 {
@@ -151,6 +158,18 @@
   return klass->field_count - klass->static_field_count;
 }
 
+extern inline jfieldID
+JvGetFirstStaticField (jclass klass)
+{
+  return &(klass->fields[0]);
+}
+
+extern inline jint
+JvNumStaticFields (jclass klass)
+{
+  return klass->static_field_count;
+}
+
 extern inline jboolean
 JvFieldIsRef (jfieldID field)
 {
@@ -164,6 +183,6 @@
 }
 #endif /* defined (__GCJ_CNI_H__) */
 
-#endif
+#endif /* __cplusplus */
 
 #endif /* __GCJ_FIELD_H */
Index: gcj/method.h
===================================================================
RCS file: /cvs/java/libgcj/libjava/gcj/method.h,v
retrieving revision 1.3
diff -u -r1.3 method.h
--- method.h	2000/01/19 18:39:24	1.3
+++ method.h	2000/01/21 23:41:44
@@ -1,6 +1,6 @@
-// java-method.h - Header file for methodID instances.  -*- c++ -*-
+// method.h - Header file for methodID instances.  -*- c++ -*-
 
-/* Copyright (C) 1999  Red Hat, Inc.
+/* Copyright (C) 1999, 2000  Red Hat, Inc.
 
    This file is part of libgcj.
 
@@ -11,8 +11,10 @@
 #ifndef __GCJ_METHOD_H__
 #define __GCJ_METHOD_H__
 
+#include <java/lang/Class.h>
+
 extern inline jmethodID
-_Jv_FromReflectedMethod(java::lang::reflect::Method *method)
+_Jv_FromReflectedMethod (java::lang::reflect::Method *method)
 {
   return (jmethodID)
     ((char *) method->declaringClass->methods + method->offset);
Index: include/jni.h
===================================================================
RCS file: /cvs/java/libgcj/libjava/include/jni.h,v
retrieving revision 1.4
diff -u -r1.4 jni.h
--- jni.h	2000/01/19 18:39:25	1.4
+++ jni.h	2000/01/21 23:41:49
@@ -1,4 +1,4 @@
-/* Copyright (C) 1998, 1999  Red Hat, Inc.
+/* Copyright (C) 1998, 1999, 2000  Red Hat, Inc.
 
    This file is part of libgcj.
 
@@ -6,6 +6,11 @@
 Libgcj License.  Please consult the file "LIBGCJ_LICENSE" for
 details.  */
 
+/* Note: this file must be compilable by the C compiler (for now,
+   assuming GNU C is ok).  This means you must never use `//'
+   comments, and all C++-specific code must be conditional on
+   __cplusplus.  */
+
 #ifndef __GCJ_JNI_H__
 #define __GCJ_JNI_H__
 
@@ -14,12 +19,16 @@
 
 #ifdef __cplusplus
 
-// This is wrong, because it pollutes the name-space too much!
+/* This is wrong, because it pollutes the name-space too much! */
 #include <gcj/javaprims.h>
 
 typedef struct _Jv_JNIEnv JNIEnv;
-#else
 
+#define JNI_TRUE true
+#define JNI_FALSE false
+
+#else /* __cplusplus */
+
 typedef int    jbyte  __attribute__((__mode__(__QI__)));
 typedef int    jshort __attribute__((__mode__(__HI__)));
 typedef int    jint   __attribute__((__mode__(__SI__)));
@@ -30,20 +39,51 @@
 typedef double jdouble;
 typedef jint jsize;
 
+typedef void *jobject;
+typedef jobject jclass;
+typedef jobject jstring;
+typedef jobject jarray;
+typedef jobject jthrowable;
+typedef jobject jobjectArray;
+typedef jobject jbyteArray;
+typedef jobject jshortArray;
+typedef jobject jintArray;
+typedef jobject jlongArray;
+typedef jobject jbooleanArray;
+typedef jobject jcharArray;
+typedef jobject jfloatArray;
+typedef jobject jdoubleArray;
+
+/* Dummy defines.  */
+typedef void *jfieldID;
+typedef void *jmethodID;
+
 typedef const struct JNINativeInterface *JNIEnv;
-#endif
+
+#define JNI_TRUE 1
+#define JNI_TRUE 0
+
+#endif /* __cplusplus */
+
+/* Version numbers.  */
+#define JNI_VERSION_1_1 0x00010001
+#define JNI_VERSION_1_2 0x00010002
+
+/* Used when releasing array elements.  */
+#define JNI_COMMIT 1
+#define JNI_ABORT  2
 
 typedef union jvalue
 {
   jboolean z;
   jbyte    b;
   jchar    c;
-  jshort  s;
-  jint    i;
+  jshort   s;
+  jint     i;
   jlong    j;
-  jfloat  f;
+  jfloat   f;
   jdouble  d;
-  jobject l;
+  jobject  l;
 } jvalue;
 
 typedef void * (*_Jv_func)(...);
@@ -54,7 +94,7 @@
   _Jv_func reserved1;
   _Jv_func reserved2;
   _Jv_func reserved3;
-  _Jv_func GetVersion;
+  jint     (*GetVersion)                   (JNIEnv*);
   _Jv_func DefineClass;
   _Jv_func FindClass;
   _Jv_func reserved4;
@@ -64,233 +104,415 @@
   jboolean (*IsAssignableFrom)             (JNIEnv*, jclass, jclass);
   _Jv_func reserved7;
   jint     (*Throw)                        (JNIEnv*, jthrowable);
-  _Jv_func ThrowNew;
-  _Jv_func ExceptionOccurred;
-  _Jv_func ExceptionDescribe;
-  _Jv_func ExceptionClear;
-  _Jv_func FatalError;
+  jint     (*ThrowNew)                     (JNIEnv*, jclass, const char *);
+  jthrowable (*ExceptionOccurred)          (JNIEnv *);
+  void     (*ExceptionDescribe)            (JNIEnv *);
+  void     (*ExceptionClear)               (JNIEnv *);
+  void     (*FatalError)                   (JNIEnv *, const char *);
   _Jv_func reserved8;
   _Jv_func reserved9;
   _Jv_func NewGlobalRef;
   _Jv_func DeleteGlobalRef;
   _Jv_func DeleteLocalRef;
-  _Jv_func IsSameObject;
+  jboolean (*IsSameObject)                 (JNIEnv *, jobject, jobject);
   _Jv_func reserved10;
   _Jv_func reserved11;
-  _Jv_func AllocObject;
-  _Jv_func NewObject;
-  _Jv_func NewObjectV;
-  _Jv_func NewObjectA;
-  _Jv_func GetObjectClass;
-  _Jv_func IsInstanceOf;
-  _Jv_func GetMethodID;
-  _Jv_func CallObjectMethod;
-  _Jv_func CallObjectMethodV;
-  _Jv_func CallObjectMethodA;
-  _Jv_func CallBooleanMethod;
-  _Jv_func CallBooleanMethodV;
-  _Jv_func CallBooleanMethodA;
-  _Jv_func CallByteMethod;
-  _Jv_func CallByteMethodV;
-  _Jv_func CallByteMethodA;
-  _Jv_func CallCharMethod;
-  _Jv_func CallCharMethodV;
-  _Jv_func CallCharMethodA;
-  _Jv_func CallShortMethod;
-  _Jv_func CallShortMethodV;
-  _Jv_func CallShortMethodA;
-  _Jv_func CallIntMethod;
-  _Jv_func CallIntMethodV;
-  _Jv_func CallIntMethodA;
-  _Jv_func CallLongMethod;
-  _Jv_func CallLongMethodV;
-  _Jv_func CallLongMethodA;
-  _Jv_func CallFloatMethod;
-  _Jv_func CallFloatMethodV;
-  _Jv_func CallFloatMethodA;
-  _Jv_func CallDoubleMethod;
-  _Jv_func CallDoubleMethodV;
-  _Jv_func CallDoubleMethodA;
-  _Jv_func CallVoidMethod;
-  _Jv_func CallVoidMethodV;
-  _Jv_func CallVoidMethodA;
-  _Jv_func CallNonvirtualObjectMethod;
-  _Jv_func CallNonvirtualObjectMethodV;
-  _Jv_func CallNonvirtualObjectMethodA;
-  jboolean (*CallNonvirtualBooleanMethod)  (JNIEnv*, jobject, jclass, jmethodID, ...);
-  jboolean (*CallNonvirtualBooleanMethodV) (JNIEnv*, jobject, jclass, jmethodID, _Jv_va_list);
-  jboolean (*CallNonvirtualBooleanMethodA) (JNIEnv*, jobject, jclass, jmethodID, jvalue*);
-  _Jv_func CallNonvirtualByteMethod;
-  _Jv_func CallNonvirtualByteMethodV;
-  _Jv_func CallNonvirtualByteMethodA;
-  _Jv_func CallNonvirtualCharMethod;
-  _Jv_func CallNonvirtualCharMethodV;
-  _Jv_func CallNonvirtualCharMethodA;
-  _Jv_func CallNonvirtualShortMethod;
-  _Jv_func CallNonvirtualShortMethodV;
-  _Jv_func CallNonvirtualShortMethodA;
-  _Jv_func CallNonvirtualIntMethod;
-  _Jv_func CallNonvirtualIntMethodV;
-  _Jv_func CallNonvirtualIntMethodA;
-  _Jv_func CallNonvirtualLongMethod;
-  _Jv_func CallNonvirtualLongMethodV;
-  _Jv_func CallNonvirtualLongMethodA;
-  _Jv_func CallNonvirtualFloatMethod;
-  _Jv_func CallNonvirtualFloatMethodV;
-  _Jv_func CallNonvirtualFloatMethodA;
-  _Jv_func CallNonvirtualDoubleMethod;
-  jdouble  (*CallNonvirtualDoubleMethodV)  (JNIEnv*, jobject, jclass, jmethodID, _Jv_va_list);
-  _Jv_func CallNonvirtualDoubleMethodA;
-  _Jv_func CallNonvirtualVoidMethod;
-  _Jv_func CallNonvirtualVoidMethodV;
-  _Jv_func CallNonvirtualVoidMethodA;
-  _Jv_func GetFieldID;
-  jobject  (*GetObjectField)               (JNIEnv*, jobject, jfieldID);
-  jboolean (*GetBooleanField)              (JNIEnv*, jobject, jfieldID);
-  jbyte    (*GetByteField)                 (JNIEnv*, jobject, jfieldID);
-  jchar    (*GetCharField)                 (JNIEnv*, jobject, jfieldID);
-  jshort   (*GetShortField)                (JNIEnv*, jobject, jfieldID);
-  jint     (*GetIntField)                  (JNIEnv*, jobject, jfieldID);
-  jlong    (*GetLongField)                 (JNIEnv*, jobject, jfieldID);
-  jfloat   (*GetFloatField)                (JNIEnv*, jobject, jfieldID);
-  jdouble  (*GetDoubleField)               (JNIEnv*, jobject, jfieldID);
-  _Jv_func SetObjectField;
-  _Jv_func SetBooleanField;
-  _Jv_func SetByteField;
-  _Jv_func SetCharField;
-  _Jv_func SetShortField;
-  _Jv_func SetIntField;
-  _Jv_func SetLongField;
-  _Jv_func SetFloatField;
-  _Jv_func SetDoubleField;
-  _Jv_func GetStaticMethodID;
-  _Jv_func CallStaticObjectMethod;
-  _Jv_func CallStaticObjectMethodV;
-  _Jv_func CallStaticObjectMethodA;
-  _Jv_func CallStaticBooleanMethod;
-  _Jv_func CallStaticBooleanMethodV;
-  _Jv_func CallStaticBooleanMethodA;
-  _Jv_func CallStaticByteMethod;
-  _Jv_func CallStaticByteMethodV;
-  _Jv_func CallStaticByteMethodA;
-  _Jv_func CallStaticCharMethod;
-  _Jv_func CallStaticCharMethodV;
-  _Jv_func CallStaticCharMethodA;
-  _Jv_func CallStaticShortMethod;
-  _Jv_func CallStaticShortMethodV;
-  _Jv_func CallStaticShortMethodA;
-  _Jv_func CallStaticIntMethod;
-  _Jv_func CallStaticIntMethodV;
-  _Jv_func CallStaticIntMethodA;
-  _Jv_func CallStaticLongMethod;
-  _Jv_func CallStaticLongMethodV;
-  _Jv_func CallStaticLongMethodA;
-  _Jv_func CallStaticFloatMethod;
-  _Jv_func CallStaticFloatMethodV;
-  _Jv_func CallStaticFloatMethodA;
-  _Jv_func CallStaticDoubleMethod;
-  _Jv_func CallStaticDoubleMethodV;
-  _Jv_func CallStaticDoubleMethodA;
-  _Jv_func CallStaticVoidMethod;
-  _Jv_func CallStaticVoidMethodV;
-  _Jv_func CallStaticVoidMethodA;
-  _Jv_func GetStaticFieldID;
-  _Jv_func GetStaticObjectField;
-  _Jv_func GetStaticBooleanField;
-  _Jv_func GetStaticByteField;
-  _Jv_func GetStaticCharField;
-  _Jv_func GetStaticShortField;
-  _Jv_func GetStaticIntField;
-  _Jv_func GetStaticLongField;
-  _Jv_func GetStaticFloatField;
-  _Jv_func GetStaticDoubleField;
-  _Jv_func SetStaticObjectField;
-  _Jv_func SetStaticBooleanField;
-  _Jv_func SetStaticByteField;
-  _Jv_func SetStaticCharField;
-  _Jv_func SetStaticShortField;
-  _Jv_func SetStaticIntField;
-  _Jv_func SetStaticLongField;
-  _Jv_func SetStaticFloatField;
-  _Jv_func SetStaticDoubleField;
-  _Jv_func NewString;
-  jint     (*GetStringLength)              (JNIEnv*, jstring);
-  _Jv_func GetStringChars;
-  _Jv_func ReleaseStringChars;
-  _Jv_func NewStringUTF;
-  _Jv_func GetStringUTFLength;
-  _Jv_func GetStringUTFChars;
-  _Jv_func ReleaseStringUTFChars;
-  _Jv_func GetArrayLength;
-  _Jv_func NewObjectArray;
-  _Jv_func GetObjectArrayElement;
-  _Jv_func SetObjectArrayElement;
-  _Jv_func NewBooleanArray;
-  _Jv_func NewByteArray;
-  _Jv_func NewCharArray;
-  _Jv_func NewShortArray;
-  _Jv_func NewIntArray;
-  _Jv_func NewLongArray;
-  _Jv_func NewFloatArray;
-  _Jv_func NewDoubleArray;
-  _Jv_func GetBooleanArrayElements;
-  _Jv_func GetByteArrayElements;
-  _Jv_func GetCharArrayElements;
-  _Jv_func GetShortArrayElements;
-  _Jv_func GetIntArrayElements;
-  _Jv_func GetLongArrayElements;
-  _Jv_func GetFloatArrayElements;
-  _Jv_func GetDoubleArrayElements;
-  _Jv_func ReleaseBooleanArrayElements;
-  _Jv_func ReleaseByteArrayElements;
-  _Jv_func ReleaseCharArrayElements;
-  _Jv_func ReleaseShortArrayElements;
-  _Jv_func ReleaseIntArrayElements;
-  _Jv_func ReleaseLongArrayElements;
-  _Jv_func ReleaseFloatArrayElements;
-  _Jv_func ReleaseDoubleArrayElements;
-  _Jv_func GetBooleanArrayRegion;
-  _Jv_func GetByteArrayRegion;
-  _Jv_func GetCharArrayRegion;
-  _Jv_func GetShortArrayRegion;
-  _Jv_func GetIntArrayRegion;
-  _Jv_func GetLongArrayRegion;
-  _Jv_func GetFloatArrayRegion;
-  _Jv_func GetDoubleArrayRegion;
-  _Jv_func SetBooleanArrayRegion;
-  _Jv_func SetByteArrayRegion;
-  _Jv_func SetCharArrayRegion;
-  _Jv_func SetShortArrayRegion;
-  _Jv_func SetIntArrayRegion;
-  _Jv_func SetLongArrayRegion;
-  _Jv_func SetFloatArrayRegion;
-  _Jv_func SetDoubleArrayRegion;
+
+  jobject  (*AllocObject)                  (JNIEnv *, jclass);
+  jobject (*NewObject)			   (JNIEnv *, jclass, jmethodID, ...);
+  jobject (*NewObjectV)			   (JNIEnv *, jclass, jmethodID,
+					    _Jv_va_list);
+  jobject (*NewObjectA)			   (JNIEnv *, jclass, jmethodID,
+					    jvalue *);
+
+  jclass   (*GetObjectClass)               (JNIEnv *, jobject);
+  jboolean (*IsInstanceOf)                 (JNIEnv *, jobject, jclass);
+  jmethodID (*GetMethodID)                 (JNIEnv *, jclass, const char *,
+					    const char *);
+
+  jobject 	(*CallObjectMethod)	   (JNIEnv *, jobject, jmethodID,
+					    ...);
+  jobject 	(*CallObjectMethodV)	   (JNIEnv *, jobject, jmethodID,
+					    _Jv_va_list);
+  jobject 	(*CallObjectMethodA)	   (JNIEnv *, jobject, jmethodID,
+					    jvalue *);
+  jboolean 	(*CallBooleanMethod)	   (JNIEnv *, jobject, jmethodID,
+					    ...);
+  jboolean 	(*CallBooleanMethodV)	   (JNIEnv *, jobject, jmethodID,
+					    _Jv_va_list);
+  jboolean 	(*CallBooleanMethodA)	   (JNIEnv *, jobject, jmethodID,
+					    jvalue *);
+  jbyte 	(*CallByteMethod)	   (JNIEnv *, jobject, jmethodID,
+					    ...);
+  jbyte 	(*CallByteMethodV)	   (JNIEnv *, jobject, jmethodID,
+					    _Jv_va_list);
+  jbyte 	(*CallByteMethodA)	   (JNIEnv *, jobject, jmethodID,
+					    jvalue *);
+  jchar 	(*CallCharMethod)	   (JNIEnv *, jobject, jmethodID,
+					    ...);
+  jchar 	(*CallCharMethodV)	   (JNIEnv *, jobject, jmethodID,
+					    _Jv_va_list);
+  jchar 	(*CallCharMethodA)	   (JNIEnv *, jobject, jmethodID,
+					    jvalue *);
+  jshort 	(*CallShortMethod)	   (JNIEnv *, jobject, jmethodID,
+					    ...);
+  jshort 	(*CallShortMethodV)	   (JNIEnv *, jobject, jmethodID,
+					    _Jv_va_list);
+  jshort 	(*CallShortMethodA)	   (JNIEnv *, jobject, jmethodID,
+					    jvalue *);
+  jint 		(*CallIntMethod)	   (JNIEnv *, jobject, jmethodID,
+					    ...);
+  jint 		(*CallIntMethodV)	   (JNIEnv *, jobject, jmethodID,
+					    _Jv_va_list);
+  jint 		(*CallIntMethodA)	   (JNIEnv *, jobject, jmethodID,
+					    jvalue *);
+  jlong 	(*CallLongMethod)	   (JNIEnv *, jobject, jmethodID,
+					    ...);
+  jlong 	(*CallLongMethodV)	   (JNIEnv *, jobject, jmethodID,
+					    _Jv_va_list);
+  jlong 	(*CallLongMethodA)	   (JNIEnv *, jobject, jmethodID,
+					    jvalue *);
+  jfloat 	(*CallFloatMethod)	   (JNIEnv *, jobject, jmethodID,
+					    ...);
+  jfloat 	(*CallFloatMethodV)	   (JNIEnv *, jobject, jmethodID,
+					    _Jv_va_list);
+  jfloat 	(*CallFloatMethodA)	   (JNIEnv *, jobject, jmethodID,
+					    jvalue *);
+  jdouble 	(*CallDoubleMethod)	   (JNIEnv *, jobject, jmethodID,
+					    ...);
+  jdouble 	(*CallDoubleMethodV)	   (JNIEnv *, jobject, jmethodID,
+					    _Jv_va_list);
+  jdouble 	(*CallDoubleMethodA)	   (JNIEnv *, jobject, jmethodID,
+					    jvalue *);
+  void  	(*CallVoidMethod)	   (JNIEnv *, jobject, jmethodID,
+					    ...);
+  void  	(*CallVoidMethodV)	   (JNIEnv *, jobject, jmethodID,
+					    _Jv_va_list);
+  void  	(*CallVoidMethodA)	   (JNIEnv *, jobject, jmethodID,
+					    jvalue *);
+
+  jobject   (*CallNonvirtualObjectMethod)  (JNIEnv *, jobject, jclass,
+					    jmethodID, ...);
+  jobject   (*CallNonvirtualObjectMethodV) (JNIEnv *, jobject, jclass,
+					    jmethodID, _Jv_va_list);
+  jobject   (*CallNonvirtualObjectMethodA) (JNIEnv *, jobject, jclass,
+					    jmethodID, jvalue *);
+  jboolean  (*CallNonvirtualBooleanMethod) (JNIEnv *, jobject, jclass,
+					    jmethodID, ...);
+  jboolean  (*CallNonvirtualBooleanMethodV) (JNIEnv *, jobject, jclass,
+					     jmethodID, _Jv_va_list);
+  jboolean  (*CallNonvirtualBooleanMethodA) (JNIEnv *, jobject, jclass,
+					     jmethodID, jvalue *);
+  jbyte     (*CallNonvirtualByteMethod)	   (JNIEnv *, jobject, jclass,
+					    jmethodID, ...);
+  jbyte     (*CallNonvirtualByteMethodV)   (JNIEnv *, jobject, jclass,
+					    jmethodID, _Jv_va_list);
+  jbyte     (*CallNonvirtualByteMethodA)   (JNIEnv *, jobject, jclass,
+					    jmethodID, jvalue *);
+  jchar     (*CallNonvirtualCharMethod)	   (JNIEnv *, jobject, jclass,
+					    jmethodID, ...);
+  jchar     (*CallNonvirtualCharMethodV)   (JNIEnv *, jobject, jclass,
+					    jmethodID, _Jv_va_list);
+  jchar     (*CallNonvirtualCharMethodA)   (JNIEnv *, jobject, jclass,
+					    jmethodID, jvalue *);
+  jshort    (*CallNonvirtualShortMethod)   (JNIEnv *, jobject, jclass,
+					    jmethodID, ...);
+  jshort    (*CallNonvirtualShortMethodV)  (JNIEnv *, jobject, jclass,
+					    jmethodID, _Jv_va_list);
+  jshort    (*CallNonvirtualShortMethodA)  (JNIEnv *, jobject, jclass,
+					    jmethodID, jvalue *);
+  jint 	    (*CallNonvirtualIntMethod)	   (JNIEnv *, jobject, jclass,
+					    jmethodID, ...);
+  jint 	    (*CallNonvirtualIntMethodV)	   (JNIEnv *, jobject, jclass,
+					    jmethodID, _Jv_va_list);
+  jint 	    (*CallNonvirtualIntMethodA)	   (JNIEnv *, jobject, jclass,
+					    jmethodID, jvalue *);
+  jlong     (*CallNonvirtualLongMethod)	   (JNIEnv *, jobject, jclass,
+					    jmethodID, ...);
+  jlong     (*CallNonvirtualLongMethodV)   (JNIEnv *, jobject, jclass,
+					    jmethodID, _Jv_va_list);
+  jlong     (*CallNonvirtualLongMethodA)   (JNIEnv *, jobject, jclass,
+					    jmethodID, jvalue *);
+  jfloat    (*CallNonvirtualFloatMethod)   (JNIEnv *, jobject, jclass,
+					    jmethodID, ...);
+  jfloat    (*CallNonvirtualFloatMethodV)  (JNIEnv *, jobject, jclass,
+					    jmethodID, _Jv_va_list);
+  jfloat    (*CallNonvirtualFloatMethodA)  (JNIEnv *, jobject, jclass,
+					    jmethodID, jvalue *);
+  jdouble   (*CallNonvirtualDoubleMethod)  (JNIEnv *, jobject, jclass,
+					    jmethodID, ...);
+  jdouble   (*CallNonvirtualDoubleMethodV) (JNIEnv *, jobject, jclass,
+					    jmethodID, _Jv_va_list);
+  jdouble   (*CallNonvirtualDoubleMethodA) (JNIEnv *, jobject, jclass,
+					    jmethodID, jvalue *);
+  void      (*CallNonvirtualVoidMethod)	   (JNIEnv *, jobject, jclass,
+					    jmethodID, ...);
+  void      (*CallNonvirtualVoidMethodV)   (JNIEnv *, jobject, jclass,
+					    jmethodID, _Jv_va_list);
+  void      (*CallNonvirtualVoidMethodA)   (JNIEnv *, jobject, jclass,
+					    jmethodID, jvalue *);
+
+  jfieldID      (*GetFieldID)              (JNIEnv *, jclass, const char *,
+					    const char *);
+
+  jobject  (*GetObjectField)               (JNIEnv *, jobject, jfieldID);
+  jboolean (*GetBooleanField)              (JNIEnv *, jobject, jfieldID);
+  jbyte    (*GetByteField)                 (JNIEnv *, jobject, jfieldID);
+  jchar    (*GetCharField)                 (JNIEnv *, jobject, jfieldID);
+  jshort   (*GetShortField)                (JNIEnv *, jobject, jfieldID);
+  jint     (*GetIntField)                  (JNIEnv *, jobject, jfieldID);
+  jlong    (*GetLongField)                 (JNIEnv *, jobject, jfieldID);
+  jfloat   (*GetFloatField)                (JNIEnv *, jobject, jfieldID);
+  jdouble  (*GetDoubleField)               (JNIEnv *, jobject, jfieldID);
+
+  void		(*SetObjectField)	   (JNIEnv *, jobject,
+					    jfieldID, jobject);
+  void		(*SetBooleanField)	   (JNIEnv *, jobject,
+					    jfieldID, jboolean);
+  void		(*SetByteField)		   (JNIEnv *, jobject,
+					    jfieldID, jbyte);
+  void		(*SetCharField)		   (JNIEnv *, jobject,
+					    jfieldID, jchar);
+  void		(*SetShortField)	   (JNIEnv *, jobject,
+					    jfieldID, jshort);
+  void		(*SetIntField)		   (JNIEnv *, jobject,
+					    jfieldID, jint);
+  void		(*SetLongField)		   (JNIEnv *, jobject,
+					    jfieldID, jlong);
+  void		(*SetFloatField)	   (JNIEnv *, jobject,
+					    jfieldID, jfloat);
+  void		(*SetDoubleField)	   (JNIEnv *, jobject,
+					    jfieldID, jdouble);
+
+  jmethodID (*GetStaticMethodID)           (JNIEnv *, jclass, const char *,
+					    const char *);
+
+  jobject 	(*CallStaticObjectMethod)  (JNIEnv *, jclass, jmethodID,
+					    ...);
+  jobject 	(*CallStaticObjectMethodV) (JNIEnv *, jclass, jmethodID,
+					    _Jv_va_list);
+  jobject 	(*CallStaticObjectMethodA) (JNIEnv *, jclass, jmethodID,
+					    jvalue *);
+  jboolean 	(*CallStaticBooleanMethod) (JNIEnv *, jclass, jmethodID,
+					    ...);
+  jboolean 	(*CallStaticBooleanMethodV) (JNIEnv *, jclass, jmethodID,
+					     _Jv_va_list);
+  jboolean 	(*CallStaticBooleanMethodA) (JNIEnv *, jclass, jmethodID,
+					     jvalue *);
+  jbyte 	(*CallStaticByteMethod)    (JNIEnv *, jclass, jmethodID,
+					    ...);
+  jbyte 	(*CallStaticByteMethodV)   (JNIEnv *, jclass, jmethodID,
+					    _Jv_va_list);
+  jbyte 	(*CallStaticByteMethodA)   (JNIEnv *, jclass, jmethodID,
+					    jvalue *);
+  jchar 	(*CallStaticCharMethod)    (JNIEnv *, jclass, jmethodID,
+					    ...);
+  jchar 	(*CallStaticCharMethodV)   (JNIEnv *, jclass, jmethodID,
+					    _Jv_va_list);
+  jchar 	(*CallStaticCharMethodA)   (JNIEnv *, jclass, jmethodID,
+					    jvalue *);
+  jshort 	(*CallStaticShortMethod)   (JNIEnv *, jclass, jmethodID,
+					    ...);
+  jshort 	(*CallStaticShortMethodV)  (JNIEnv *, jclass, jmethodID,
+					    _Jv_va_list);
+  jshort 	(*CallStaticShortMethodA)  (JNIEnv *, jclass, jmethodID,
+					    jvalue *);
+  jint 		(*CallStaticIntMethod) 	   (JNIEnv *, jclass, jmethodID,
+					    ...);
+  jint 		(*CallStaticIntMethodV)    (JNIEnv *, jclass, jmethodID,
+					    _Jv_va_list);
+  jint 		(*CallStaticIntMethodA)    (JNIEnv *, jclass, jmethodID,
+					    jvalue *);
+  jlong 	(*CallStaticLongMethod)    (JNIEnv *, jclass, jmethodID,
+					    ...);
+  jlong 	(*CallStaticLongMethodV)   (JNIEnv *, jclass, jmethodID,
+					    _Jv_va_list);
+  jlong 	(*CallStaticLongMethodA)   (JNIEnv *, jclass, jmethodID,
+					    jvalue *);
+  jfloat 	(*CallStaticFloatMethod)   (JNIEnv *, jclass, jmethodID,
+					    ...);
+  jfloat 	(*CallStaticFloatMethodV)  (JNIEnv *, jclass, jmethodID,
+					    _Jv_va_list);
+  jfloat 	(*CallStaticFloatMethodA)  (JNIEnv *, jclass, jmethodID,
+					    jvalue *);
+  jdouble 	(*CallStaticDoubleMethod)  (JNIEnv *, jclass, jmethodID,
+					    ...);
+  jdouble 	(*CallStaticDoubleMethodV) (JNIEnv *, jclass, jmethodID,
+					    _Jv_va_list);
+  jdouble 	(*CallStaticDoubleMethodA) (JNIEnv *, jclass, jmethodID,
+					    jvalue *);
+  void  	(*CallStaticVoidMethod)    (JNIEnv *, jclass, jmethodID,
+					    ...);
+  void  	(*CallStaticVoidMethodV)   (JNIEnv *, jclass, jmethodID,
+					    _Jv_va_list);
+  void  	(*CallStaticVoidMethodA)   (JNIEnv *, jclass, jmethodID,
+					    jvalue *);
+
+  jfieldID      (*GetStaticFieldID)        (JNIEnv *, jclass, const char *,
+					    const char *);
+
+  jobject	(*GetStaticObjectField)	   (JNIEnv *, jclass, jfieldID);
+  jboolean	(*GetStaticBooleanField)   (JNIEnv *, jclass, jfieldID);
+  jbyte		(*GetStaticByteField)	   (JNIEnv *, jclass, jfieldID);
+  jchar		(*GetStaticCharField)	   (JNIEnv *, jclass, jfieldID);
+  jshort	(*GetStaticShortField)	   (JNIEnv *, jclass, jfieldID);
+  jint		(*GetStaticIntField)	   (JNIEnv *, jclass, jfieldID);
+  jlong		(*GetStaticLongField)	   (JNIEnv *, jclass, jfieldID);
+  jfloat	(*GetStaticFloatField)	   (JNIEnv *, jclass, jfieldID);
+  jdouble	(*GetStaticDoubleField)	   (JNIEnv *, jclass, jfieldID);
+
+  void 		(*SetStaticObjectField)	   (JNIEnv *, jclass,
+					    jfieldID, jobject);
+  void 		(*SetStaticBooleanField)   (JNIEnv *, jclass,
+					    jfieldID, jboolean);
+  void 		(*SetStaticByteField)	   (JNIEnv *, jclass,
+					    jfieldID, jbyte);
+  void 		(*SetStaticCharField)	   (JNIEnv *, jclass,
+					    jfieldID, jchar);
+  void 		(*SetStaticShortField)	   (JNIEnv *, jclass,
+					    jfieldID, jshort);
+  void 		(*SetStaticIntField)	   (JNIEnv *, jclass,
+					    jfieldID, jint);
+  void 		(*SetStaticLongField)	   (JNIEnv *, jclass,
+					    jfieldID, jlong);
+  void 		(*SetStaticFloatField)	   (JNIEnv *, jclass,
+					    jfieldID, jfloat);
+  void 		(*SetStaticDoubleField)	   (JNIEnv *, jclass,
+					    jfieldID, jdouble);
+
+  jstring  (*NewString)                    (JNIEnv *, const jchar *, jsize);
+  jint     (*GetStringLength)              (JNIEnv *, jstring);
+  const jchar * (*GetStringChars)          (JNIEnv *, jstring, jboolean *);
+  void     (*ReleaseStringChars)           (JNIEnv *, jstring, const jchar *);
+  jstring  (*NewStringUTF)                 (JNIEnv *, const char *);
+  jsize    (*GetStringUTFLength)           (JNIEnv *, jstring);
+  const char * (*GetStringUTFChars)        (JNIEnv *, jstring, jboolean *);
+  void     (*ReleaseStringUTFChars)        (JNIEnv *, jstring, const char *);
+  jsize    (*GetArrayLength)               (JNIEnv *, jarray);
+  jarray   (*NewObjectArray)               (JNIEnv *, jsize, jclass, jobject);
+  jobject  (*GetObjectArrayElement)        (JNIEnv *, jobjectArray, jsize);
+  void     (*SetObjectArrayElement)        (JNIEnv *, jobjectArray, jsize,
+					    jobject);
+
+  jbooleanArray (*NewBooleanArray)	   (JNIEnv *, jsize);
+  jbyteArray    (*NewByteArray)		   (JNIEnv *, jsize);
+  jcharArray    (*NewCharArray)		   (JNIEnv *, jsize);
+  jshortArray   (*NewShortArray)	   (JNIEnv *, jsize);
+  jintArray     (*NewIntArray)		   (JNIEnv *, jsize);
+  jlongArray    (*NewLongArray)		   (JNIEnv *, jsize);
+  jfloatArray   (*NewFloatArray)	   (JNIEnv *, jsize);
+  jdoubleArray  (*NewDoubleArray)	   (JNIEnv *, jsize);
+
+  jboolean *	(*GetBooleanArrayElements) (JNIEnv *, jbooleanArray,
+					    jboolean *);
+  jbyte *	(*GetByteArrayElements)	   (JNIEnv *, jbyteArray,
+					    jboolean *);
+  jchar *	(*GetCharArrayElements)	   (JNIEnv *, jcharArray,
+					    jboolean *);
+  jshort *	(*GetShortArrayElements)   (JNIEnv *, jshortArray,
+					    jboolean *);
+  jint *	(*GetIntArrayElements)	   (JNIEnv *, jintArray,
+					    jboolean *);
+  jlong *	(*GetLongArrayElements)	   (JNIEnv *, jlongArray,
+					    jboolean *);
+  jfloat *	(*GetFloatArrayElements)   (JNIEnv *, jfloatArray,
+					    jboolean *);
+  jdouble *	(*GetDoubleArrayElements)  (JNIEnv *, jdoubleArray,
+					    jboolean *);
+
+  void		(*ReleaseBooleanArrayElements) (JNIEnv *, jbooleanArray,
+						jboolean *, jint);
+  void		(*ReleaseByteArrayElements)    (JNIEnv *, jbyteArray,
+					        jbyte *, jint);
+  void		(*ReleaseCharArrayElements)    (JNIEnv *, jcharArray,
+						jchar *, jint);
+  void		(*ReleaseShortArrayElements)   (JNIEnv *, jshortArray,
+						jshort *, jint);
+  void		(*ReleaseIntArrayElements)     (JNIEnv *, jintArray,
+						jint *, jint);
+  void		(*ReleaseLongArrayElements)    (JNIEnv *, jlongArray,
+						jlong *, jint);
+  void		(*ReleaseFloatArrayElements)   (JNIEnv *, jfloatArray,
+						jfloat *, jint);
+  void		(*ReleaseDoubleArrayElements)  (JNIEnv *, jdoubleArray,
+						jdouble *, jint);
+
+  void 		(*GetBooleanArrayRegion)   (JNIEnv *, jbooleanArray,
+					    jsize, jsize, jboolean *);
+  void 		(*GetByteArrayRegion)	   (JNIEnv *, jbooleanArray,
+					    jsize, jsize, jboolean *);
+  void 		(*GetCharArrayRegion)	   (JNIEnv *, jbooleanArray,
+					    jsize, jsize, jboolean *);
+  void 		(*GetShortArrayRegion)	   (JNIEnv *, jbooleanArray,
+					    jsize, jsize, jboolean *);
+  void 		(*GetIntArrayRegion)	   (JNIEnv *, jbooleanArray,
+					    jsize, jsize, jboolean *);
+  void 		(*GetLongArrayRegion)	   (JNIEnv *, jbooleanArray,
+					    jsize, jsize, jboolean *);
+  void 		(*GetFloatArrayRegion)	   (JNIEnv *, jbooleanArray,
+					    jsize, jsize, jboolean *);
+  void 		(*GetDoubleArrayRegion)	   (JNIEnv *, jbooleanArray,
+					    jsize, jsize, jboolean *);
+
+  void 		(*SetBooleanArrayRegion)   (JNIEnv *, jbooleanArray,
+					    jsize, jsize, jboolean *);
+  void 		(*SetByteArrayRegion)	   (JNIEnv *, jbooleanArray,
+					    jsize, jsize, jboolean *);
+  void 		(*SetCharArrayRegion)	   (JNIEnv *, jbooleanArray,
+					    jsize, jsize, jboolean *);
+  void 		(*SetShortArrayRegion)	   (JNIEnv *, jbooleanArray,
+					    jsize, jsize, jboolean *);
+  void 		(*SetIntArrayRegion)	   (JNIEnv *, jbooleanArray,
+					    jsize, jsize, jboolean *);
+  void 		(*SetLongArrayRegion)	   (JNIEnv *, jbooleanArray,
+					    jsize, jsize, jboolean *);
+  void 		(*SetFloatArrayRegion)	   (JNIEnv *, jbooleanArray,
+					    jsize, jsize, jboolean *);
+  void 		(*SetDoubleArrayRegion)	   (JNIEnv *, jbooleanArray,
+					    jsize, jsize, jboolean *);
+
   _Jv_func RegisterNatives;
   _Jv_func UnregisterNatives;
-  _Jv_func MonitorEnter;
-  _Jv_func MonitorExit;
+  jint     (*MonitorEnter)                 (JNIEnv *, jobject);
+  jint     (*MonitorExit)                  (JNIEnv *, jobject);
   _Jv_func GetJavaVM;
 };
 
+/* This structure is used when registering native methods.  */
+typedef struct
+{
+  char *name;
+  char *signature;
+  void *fnPtr;			/* Sigh.  */
+} JNINativeMethod;
+
 #ifdef __cplusplus
 
-struct _Jv_JNIEnv
+class _Jv_JNIEnv
 {
+public:
+  /* The method table.  */
   struct JNINativeInterface *p;
 
-  jclass GetSuperclass (jclass cl);
-  jsize GetStringLength (jstring str);
+private:
+  /* The current exception.  */
+  jthrowable ex;
+
+  /* This doesn't really protect the private contents, because anybody
+     can set this macro.  However, if they do set it then they at
+     least know they are doing something unportable.  */
+#ifdef GCJ_JV_JNIENV_FRIEND
+  GCJ_JV_JNIENV_FRIEND;
+#endif
 
-};
+public:
+  jclass GetSuperclass (jclass cl)
+  { return p->GetSuperclass (this, cl); }
 
-extern inline jclass
-_Jv_JNIEnv::GetSuperclass (jclass cl)
-{ return p->GetSuperclass (this, cl); }
-
-extern inline jsize
-_Jv_JNIEnv::GetStringLength (jstring str)
-{ return p->GetStringLength (this, str); }
+  jsize GetStringLength (jstring str)
+  { return p->GetStringLength (this, str); }
+};
 
-#endif
+#endif /* __cplusplus */
 
 #endif /* __GCJ_JNI_H__ */
Index: include/jvm.h
===================================================================
RCS file: /cvs/java/libgcj/libjava/include/jvm.h,v
retrieving revision 1.11
diff -u -r1.11 jvm.h
--- jvm.h	2000/01/19 18:39:25	1.11
+++ jvm.h	2000/01/21 23:41:49
@@ -1,6 +1,6 @@
 // jvm.h - Header file for private implementation information. -*- c++ -*-
 
-/* Copyright (C) 1998, 1999  Red Hat, Inc.
+/* Copyright (C) 1998, 1999, 2000  Red Hat, Inc.
 
    This file is part of libgcj.
 
@@ -166,9 +166,20 @@
 				       jclass declaringClass,
 				       JArray<jclass> **arg_types_out,
 				       jclass *return_type_out);
-extern jobject _Jv_CallNonvirtualMethodA (jobject, jclass,
-					  jmethodID, jboolean,
-					  JArray<jclass> *, jobjectArray);
+
+extern jobject _Jv_CallAnyMethodA (jobject obj, jclass return_type,
+				   jmethodID meth, jboolean is_constructor,
+				   JArray<jclass> *parameter_types,
+				   jobjectArray args);
+
+union jvalue;
+extern jthrowable _Jv_CallAnyMethodA (jobject obj,
+				      jclass return_type,
+				      jmethodID meth,
+				      jboolean is_constructor,
+				      JArray<jclass> *parameter_types,
+				      jvalue *args,
+				      jvalue *result);
 
 extern jobject _Jv_NewMultiArray (jclass, jint ndims, jint* dims)
   __attribute__((__malloc__));
Index: java/lang/Class.h
===================================================================
RCS file: /cvs/java/libgcj/libjava/java/lang/Class.h,v
retrieving revision 1.12
diff -u -r1.12 Class.h
--- Class.h	2000/01/19 18:39:25	1.12
+++ Class.h	2000/01/21 23:41:54
@@ -60,6 +60,9 @@
   _Jv_Utf8Const *signature;
   unsigned short accflags;
   void *ncode;
+
+  _Jv_Method *getNextMethod ()
+  { return this + 1; }
 };
 
 #define JV_PRIMITIVE_VTABLE ((_Jv_VTable *) -1)
@@ -168,13 +171,19 @@
 
   friend jfieldID JvGetFirstInstanceField (jclass);
   friend jint JvNumInstanceFields (jclass);
+  friend jfieldID JvGetFirstStaticField (jclass);
+  friend jint JvNumStaticFields (jclass);
+
   friend jobject _Jv_AllocObject (jclass, jint);
   friend jobjectArray _Jv_NewObjectArray (jsize, jclass, jobject);
   friend jobject _Jv_NewPrimArray (jclass, jint);
   friend jobject _Jv_JNI_ToReflectedField (_Jv_JNIEnv *, jclass, jfieldID);
   friend jfieldID _Jv_FromReflectedField (java::lang::reflect::Field *);
+
   friend jmethodID _Jv_FromReflectedMethod (java::lang::reflect::Method *);
   friend jmethodID _Jv_FromReflectedConstructor (java::lang::reflect::Constructor *);
+  friend jint JvNumMethods (jclass);
+  friend jmethodID JvGetFirstMethod (jclass);
 
   friend class _Jv_PrimClass;
 
@@ -256,5 +265,18 @@
   // initialization.
   java::lang::Thread *thread;
 };
+
+
+extern inline jint
+JvNumMethods (jclass klass)
+{
+  return klass->method_count;
+}
+
+extern inline jmethodID
+JvGetFirstMethod (jclass klass)
+{
+  return &klass->methods[0];
+}
 
 #endif /* __JAVA_LANG_CLASS_H__ */
Index: java/lang/reflect/natConstructor.cc
===================================================================
RCS file: /cvs/java/libgcj/libjava/java/lang/reflect/natConstructor.cc,v
retrieving revision 1.2
diff -u -r1.2 natConstructor.cc
--- natConstructor.cc	2000/01/19 18:39:26	1.2
+++ natConstructor.cc	2000/01/21 23:42:02
@@ -48,6 +48,6 @@
   jmethodID meth = _Jv_FromReflectedConstructor (this);
   // In the constructor case the return type is the type of the
   // constructor.
-  return _Jv_CallNonvirtualMethodA (NULL, declaringClass, meth, true,
-				    parameter_types, args);
+  return _Jv_CallAnyMethodA (NULL, declaringClass, meth, true,
+			     parameter_types, args);
 }
Index: java/lang/reflect/natMethod.cc
===================================================================
RCS file: /cvs/java/libgcj/libjava/java/lang/reflect/natMethod.cc,v
retrieving revision 1.7
diff -u -r1.7 natMethod.cc
--- natMethod.cc	2000/01/19 18:39:26	1.7
+++ natMethod.cc	2000/01/21 23:42:02
@@ -12,6 +12,7 @@
 
 #include <gcj/cni.h>
 #include <jvm.h>
+#include <jni.h>
 
 #include <java/lang/reflect/Method.h>
 #include <java/lang/reflect/Constructor.h>
@@ -187,8 +188,8 @@
       meth = _Jv_LookupDeclaredMethod (k, meth->name, meth->signature);
     }
 
-  return _Jv_CallNonvirtualMethodA (obj, return_type, meth, false,
-				    parameter_types, args);
+  return _Jv_CallAnyMethodA (obj, return_type, meth, false,
+			     parameter_types, args);
 }
 
 jint
@@ -311,23 +312,22 @@
 // functions.  It handles both Methods and Constructors, and it can
 // handle any return type.  In the Constructor case, the `obj'
 // argument is unused and should be NULL; also, the `return_type' is
-// the class that the constructor will construct.
-jobject
-_Jv_CallNonvirtualMethodA (jobject obj,
-			   jclass return_type,
-			   jmethodID meth,
-			   jboolean is_constructor,
-			   JArray<jclass> *parameter_types,
-			   jobjectArray args)
+// the class that the constructor will construct.  RESULT is a pointer
+// to a `jvalue' (see jni.h); for a void method this should be NULL.
+// This function returns an exception (if one was thrown), or NULL if
+// the call went ok.
+jthrowable
+_Jv_CallAnyMethodA (jobject obj,
+		    jclass return_type,
+		    jmethodID meth,
+		    jboolean is_constructor,
+		    JArray<jclass> *parameter_types,
+		    jvalue *args,
+		    jvalue *result)
 {
   JvAssert (! is_constructor || ! obj);
   JvAssert (! is_constructor || ! return_type);
 
-  // FIXME: access checks.
-
-  if (parameter_types->length != args->length)
-    JvThrow (new java::lang::IllegalArgumentException);
-
   // See whether call needs an object as the first argument.  A
   // constructor does need a `this' argument, but it is one we create.
   jboolean needs_this = false;
@@ -349,7 +349,6 @@
 					      * sizeof (ffi_type *));
 
   jclass *paramelts = elements (parameter_types);
-  jobject *argelts = elements (args);
 
   // FIXME: at some point the compiler is going to add extra arguments
   // to some functions.  In particular we are going to do this for
@@ -376,22 +375,11 @@
 
   for (int arg = 0; i < param_count; ++i, ++arg)
     {
-      jclass k = argelts[arg] ? argelts[arg]->getClass() : NULL;
-      argtypes[i] = get_ffi_type (k);
+      argtypes[i] = get_ffi_type (paramelts[arg]);
       if (paramelts[arg]->isPrimitive())
-	{
-	  if (! argelts[arg]
-	      || ! k
-	      || ! can_widen (k, paramelts[arg]))
-	    JvThrow (new java::lang::IllegalArgumentException);
-	  size += paramelts[arg]->size();
-	}
+	size += paramelts[arg]->size();
       else
-	{
-	  if (argelts[arg] && ! paramelts[arg]->isAssignableFrom (k))
-	    JvThrow (new java::lang::IllegalArgumentException);
-	  size += sizeof (jobject);
-	}
+	size += sizeof (jobject);
     }
 
   ffi_cif cif;
@@ -404,89 +392,162 @@
   char *p = (char *) alloca (size);
   void **values = (void **) alloca (param_count * sizeof (void *));
 
-#define COPY(Where, What, Type) \
-  do { \
-    Type val = (What); \
-    memcpy ((Where), &val, sizeof (Type)); \
-    values[i] = (Where); \
-    Where += sizeof (Type); \
-  } while (0)
-
   i = 0;
   if (needs_this)
     {
-      COPY (p, obj, jobject);
+      values[i] = p;
+      memcpy (p, &obj, sizeof (jobject));
+      p += sizeof (jobject);
       ++i;
     }
 
   for (int arg = 0; i < param_count; ++i, ++arg)
     {
-      java::lang::Number *num = (java::lang::Number *) argelts[arg];
-      if (paramelts[arg] == JvPrimClass (byte))
-	COPY (p, num->byteValue(), jbyte);
-      else if (paramelts[arg] == JvPrimClass (short))
-	COPY (p, num->shortValue(), jshort);
-      else if (paramelts[arg] == JvPrimClass (int))
-	COPY (p, num->intValue(), jint);
-      else if (paramelts[arg] == JvPrimClass (long))
-	COPY (p, num->longValue(), jlong);
-      else if (paramelts[arg] == JvPrimClass (float))
-	COPY (p, num->floatValue(), jfloat);
-      else if (paramelts[arg] == JvPrimClass (double))
-	COPY (p, num->doubleValue(), jdouble);
-      else if (paramelts[arg] == JvPrimClass (boolean))
-	COPY (p, ((java::lang::Boolean *) argelts[arg])->booleanValue(),
-	      jboolean);
-      else if (paramelts[arg] == JvPrimClass (char))
-	COPY (p, ((java::lang::Character *) argelts[arg])->charValue(), jchar);
+      int tsize;
+      if (paramelts[arg]->isPrimitive())
+	tsize = paramelts[arg]->size();
       else
-	{
-	  JvAssert (! paramelts[arg]->isPrimitive());
-	  COPY (p, argelts[arg], jobject);
-	}
+	tsize = sizeof (jobject);
+
+      // Copy appropriate bits from the jvalue into the ffi array.
+      // FIXME: we could do this copying all in one loop, above, by
+      // over-allocating a bit.
+      values[i] = p;
+      memcpy (p, &args[arg], tsize);
+      p += tsize;
     }
 
   // FIXME: initialize class here.
 
-  // Largest possible value.  Hopefully it is aligned!
-  jdouble ret_value;
   java::lang::Throwable *ex;
   using namespace java::lang;
   using namespace java::lang::reflect;
   ex = Method::hack_trampoline ((gnu::gcj::RawData *) &cif,
 				(gnu::gcj::RawData *) meth->ncode,
-				(gnu::gcj::RawData *) &ret_value,
+				(gnu::gcj::RawData *) result,
 				(gnu::gcj::RawData *) values);
 
+  if (ex)
+    // FIXME: this is wrong for JNI.  But if we just return the
+    // exception, then the non-JNI cases won't be able to distinguish
+    // it from exceptions we might generate ourselves.  Sigh.
+    ex = new InvocationTargetException (ex);
+
+  if (is_constructor)
+    result->l = obj;
+
+  return ex;
+}
+
+// This is another version of _Jv_CallAnyMethodA, but this one does
+// more checking and is used by the reflection (and not JNI) code.
+jobject
+_Jv_CallAnyMethodA (jobject obj,
+		    jclass return_type,
+		    jmethodID meth,
+		    jboolean is_constructor,
+		    JArray<jclass> *parameter_types,
+		    jobjectArray args)
+{
+  // FIXME: access checks.
+
+  if (parameter_types->length != args->length)
+    JvThrow (new java::lang::IllegalArgumentException);
+
+  int param_count = parameter_types->length;
+
+  jclass *paramelts = elements (parameter_types);
+  jobject *argelts = elements (args);
+  jvalue argvals[param_count];
+
+#define COPY(Where, What, Type) \
+  do { \
+    Type val = (What); \
+    memcpy ((Where), &val, sizeof (Type)); \
+  } while (0)
+
+  for (int i = 0; i < param_count; ++i)
+    {
+      jclass k = argelts[i] ? argelts[i]->getClass() : NULL;
+      if (paramelts[i]->isPrimitive())
+	{
+	  if (! argelts[i]
+	      || ! k
+	      || ! can_widen (k, paramelts[i]))
+	    JvThrow (new java::lang::IllegalArgumentException);
+	}
+      else
+	{
+	  if (argelts[i] && ! paramelts[i]->isAssignableFrom (k))
+	    JvThrow (new java::lang::IllegalArgumentException);
+	}
+
+      java::lang::Number *num = (java::lang::Number *) argelts[i];
+      if (paramelts[i] == JvPrimClass (byte))
+	COPY (&argvals[i], num->byteValue(), jbyte);
+      else if (paramelts[i] == JvPrimClass (short))
+	COPY (&argvals[i], num->shortValue(), jshort);
+      else if (paramelts[i] == JvPrimClass (int))
+	COPY (&argvals[i], num->intValue(), jint);
+      else if (paramelts[i] == JvPrimClass (long))
+	COPY (&argvals[i], num->longValue(), jlong);
+      else if (paramelts[i] == JvPrimClass (float))
+	COPY (&argvals[i], num->floatValue(), jfloat);
+      else if (paramelts[i] == JvPrimClass (double))
+	COPY (&argvals[i], num->doubleValue(), jdouble);
+      else if (paramelts[i] == JvPrimClass (boolean))
+	COPY (&argvals[i],
+	      ((java::lang::Boolean *) argelts[i])->booleanValue(),
+	      jboolean);
+      else if (paramelts[i] == JvPrimClass (char))
+	COPY (&argvals[i],
+	      ((java::lang::Character *) argelts[i])->charValue(),
+	      jchar);
+      else
+	{
+	  JvAssert (! paramelts[i]->isPrimitive());
+	  COPY (&argvals[i], argelts[i], jobject);
+	}
+    }
+
+  jvalue ret_value;
+  java::lang::Throwable *ex = _Jv_CallAnyMethodA (obj,
+						  return_type,
+						  meth,
+						  is_constructor,
+						  parameter_types,
+						  argvals,
+						  &ret_value);
+
   if (ex)
-    JvThrow (new InvocationTargetException (ex));
+    JvThrow (ex);
 
   jobject r;
-#define VAL(Wrapper, Type)  (new Wrapper (* (Type *) &ret_value))
+#define VAL(Wrapper, Field)  (new Wrapper (ret_value.Field))
   if (is_constructor)
-    r = obj;
-  else if (return_type == JvPrimClass (byte))
-    r = VAL (java::lang::Byte, jbyte);
+    r = ret_value.l;
+  else  if (return_type == JvPrimClass (byte))
+    r = VAL (java::lang::Byte, b);
   else if (return_type == JvPrimClass (short))
-    r = VAL (java::lang::Short, jshort);
+    r = VAL (java::lang::Short, s);
   else if (return_type == JvPrimClass (int))
-    r = VAL (java::lang::Integer, jint);
+    r = VAL (java::lang::Integer, i);
   else if (return_type == JvPrimClass (long))
-    r = VAL (java::lang::Long, jlong);
+    r = VAL (java::lang::Long, j);
   else if (return_type == JvPrimClass (float))
-    r = VAL (java::lang::Float, jfloat);
+    r = VAL (java::lang::Float, f);
   else if (return_type == JvPrimClass (double))
-    r = VAL (java::lang::Double, jdouble);
+    r = VAL (java::lang::Double, d);
   else if (return_type == JvPrimClass (boolean))
-    r = VAL (java::lang::Boolean, jboolean);
+    r = VAL (java::lang::Boolean, z);
   else if (return_type == JvPrimClass (char))
-    r = VAL (java::lang::Character, jchar);
+    r = VAL (java::lang::Character, c);
   else if (return_type == JvPrimClass (void))
     r = NULL;
   else
     {
       JvAssert (return_type == NULL || ! return_type->isPrimitive());
-      r = * (Object **) &ret_value;
+      r = ret_value.l;
     }
 
   return r;

From java-patches-return-417-listarch-java-patches=sourceware.cygnus.com@sourceware.cygnus.com Sat Jan 22 21:31:27 2000
Return-Path: <java-patches-return-417-listarch-java-patches=sourceware.cygnus.com@sourceware.cygnus.com>
Delivered-To: listarch-java-patches@sourceware.cygnus.com
Received: (qmail 27241 invoked by alias); 22 Jan 2000 21:31:27 -0000
Mailing-List: contact java-patches-help@sourceware.cygnus.com; run by ezmlm
Precedence: bulk
List-Subscribe: <mailto:java-patches-subscribe@sourceware.cygnus.com>
List-Archive: <http://sourceware.cygnus.com/ml/java-patches/>
List-Post: <mailto:java-patches@sourceware.cygnus.com>
List-Help: <mailto:java-patches-help@sourceware.cygnus.com>, <http://sourceware.cygnus.com/ml/#faqs>
Sender: java-patches-owner@sourceware.cygnus.com
Delivered-To: mailing list java-patches@sourceware.cygnus.com
Received: (qmail 27215 invoked from network); 22 Jan 2000 21:31:22 -0000
Date: Sat, 22 Jan 2000 13:31:22 -0800
Message-Id: <200001222131.NAA04446@decepticon.cygnus.com>
X-Authentication-Warning: decepticon.cygnus.com: green set sender to green@cygnus.com using -f
From: Anthony Green <green@cygnus.com>
To: java-patches@sourceware.cygnus.com
Subject: g++ bug work-around
X-Organization: Red Hat, Sunnyvale, California
X-URL: http://www.cygnus.com/~green
Reply-to: green@redhat.com


I just committed this test and work-around for a bug that exists in
recent versions of g++.

2000-01-22  Anthony Green  <green@redhat.com>

	* include/config.h.in: Rebuilt.
	* acconfig.h: Add undef for __NO_MATH_INLINES.
	* configure: Rebuilt.
	* configure.in: Add test for `g++ -O2 -ffloat-store' bug.

Index: acconfig.h
===================================================================
RCS file: /cvs/java/libgcj/libjava/acconfig.h,v
retrieving revision 1.16
diff -u -r1.16 acconfig.h
--- acconfig.h	2000/01/18 14:41:08	1.16
+++ acconfig.h	2000/01/22 21:08:30
@@ -131,3 +131,6 @@
 
 /* Define if libltdl is in use.  */
 #undef USE_LTDL
+
+/* Define if g++ has a bug preventing us from inlining math routines.  */
+#undef __NO_MATH_INLINES
Index: configure.in
===================================================================
RCS file: /cvs/java/libgcj/libjava/configure.in,v
retrieving revision 1.50
diff -u -r1.50 configure.in
--- configure.in	2000/01/19 05:06:03	1.50
+++ configure.in	2000/01/22 21:08:33
@@ -624,6 +624,16 @@
 
 AC_SUBST(AM_RUNTESTFLAGS)
 
+dnl Work around a g++ bug.  Reported to gcc-bugs@gcc.gnu.org on Jan 22, 2000.
+AC_MSG_CHECKING([for g++ -ffloat-store bug])
+save_CFLAGS="$CFLAGS"
+CFLAGS="-x c++ -O2 -ffloat-store"
+AC_TRY_COMPILE([#include <math.h>], , 
+  [AC_MSG_RESULT(no)],
+  [AC_DEFINE(__NO_MATH_INLINES)
+   AC_MSG_RESULT(yes)])
+CFLAGS="$save_CFLAGS"
+
 dnl We check for sys/filio.h because Solaris 2.5 defines FIONREAD there.
 dnl On that system, sys/ioctl.h will not include sys/filio.h unless
 dnl BSD_COMP is defined; just including sys/filio.h is simpler.
Index: configure
===================================================================
RCS file: /cvs/java/libgcj/libjava/configure,v
retrieving revision 1.52
diff -u -r1.52 configure
--- configure	2000/01/19 05:06:03	1.52
+++ configure	2000/01/22 21:08:45
@@ -4338,21 +4338,49 @@
 
 
 
+echo $ac_n "checking for g++ -ffloat-store bug""... $ac_c" 1>&6
+echo "configure:4343: checking for g++ -ffloat-store bug" >&5
+save_CFLAGS="$CFLAGS"
+CFLAGS="-x c++ -O2 -ffloat-store"
+cat > conftest.$ac_ext <<EOF
+#line 4347 "configure"
+#include "confdefs.h"
+#include <math.h>
+int main() {
+
+; return 0; }
+EOF
+if { (eval echo configure:4354: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+  rm -rf conftest*
+  echo "$ac_t""no" 1>&6
+else
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+  rm -rf conftest*
+  cat >> confdefs.h <<\EOF
+#define __NO_MATH_INLINES 1
+EOF
+
+   echo "$ac_t""yes" 1>&6
+fi
+rm -f conftest*
+CFLAGS="$save_CFLAGS"
+
 for ac_hdr in unistd.h bstring.h sys/time.h sys/types.h fcntl.h sys/ioctl.h sys/filio.h sys/stat.h sys/select.h sys/socket.h netinet/in.h arpa/inet.h netdb.h pwd.h sys/config.h inttypes.h stdint.h
 do
 ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:4346: checking for $ac_hdr" >&5
+echo "configure:4374: checking for $ac_hdr" >&5
 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 4351 "configure"
+#line 4379 "configure"
 #include "confdefs.h"
 #include <$ac_hdr>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:4356: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:4384: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
   rm -rf conftest*
@@ -4382,17 +4410,17 @@
 do
 ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:4386: checking for $ac_hdr" >&5
+echo "configure:4414: checking for $ac_hdr" >&5
 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 4391 "configure"
+#line 4419 "configure"
 #include "confdefs.h"
 #include <$ac_hdr>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:4396: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:4424: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
   rm -rf conftest*
@@ -4420,12 +4448,12 @@
 
 
 echo $ac_n "checking for ANSI C header files""... $ac_c" 1>&6
-echo "configure:4424: checking for ANSI C header files" >&5
+echo "configure:4452: checking for ANSI C header files" >&5
 if eval "test \"`echo '$''{'ac_cv_header_stdc'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 4429 "configure"
+#line 4457 "configure"
 #include "confdefs.h"
 #include <stdlib.h>
 #include <stdarg.h>
@@ -4433,7 +4461,7 @@
 #include <float.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:4437: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:4465: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
   rm -rf conftest*
@@ -4450,7 +4478,7 @@
 if test $ac_cv_header_stdc = yes; then
   # SunOS 4.x string.h does not declare mem*, contrary to ANSI.
 cat > conftest.$ac_ext <<EOF
-#line 4454 "configure"
+#line 4482 "configure"
 #include "confdefs.h"
 #include <string.h>
 EOF
@@ -4468,7 +4496,7 @@
 if test $ac_cv_header_stdc = yes; then
   # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI.
 cat > conftest.$ac_ext <<EOF
-#line 4472 "configure"
+#line 4500 "configure"
 #include "confdefs.h"
 #include <stdlib.h>
 EOF
@@ -4489,7 +4517,7 @@
   :
 else
   cat > conftest.$ac_ext <<EOF
-#line 4493 "configure"
+#line 4521 "configure"
 #include "confdefs.h"
 #include <ctype.h>
 #define ISLOWER(c) ('a' <= (c) && (c) <= 'z')
@@ -4500,7 +4528,7 @@
 exit (0); }
 
 EOF
-if { (eval echo configure:4504: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:4532: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
 then
   :
 else
@@ -4524,12 +4552,12 @@
 fi
 
 echo $ac_n "checking for ssize_t""... $ac_c" 1>&6
-echo "configure:4528: checking for ssize_t" >&5
+echo "configure:4556: checking for ssize_t" >&5
 if eval "test \"`echo '$''{'ac_cv_type_ssize_t'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 4533 "configure"
+#line 4561 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #if STDC_HEADERS
@@ -4558,9 +4586,9 @@
 
 
 echo $ac_n "checking for in_addr_t""... $ac_c" 1>&6
-echo "configure:4562: checking for in_addr_t" >&5
+echo "configure:4590: checking for in_addr_t" >&5
 cat > conftest.$ac_ext <<EOF
-#line 4564 "configure"
+#line 4592 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #if STDC_HEADERS
@@ -4574,7 +4602,7 @@
 in_addr_t foo;
 ; return 0; }
 EOF
-if { (eval echo configure:4578: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:4606: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   cat >> confdefs.h <<\EOF
 #define HAVE_IN_ADDR_T 1
@@ -4590,16 +4618,16 @@
 rm -f conftest*
 
 echo $ac_n "checking whether struct ip_mreq is in netinet/in.h""... $ac_c" 1>&6
-echo "configure:4594: checking whether struct ip_mreq is in netinet/in.h" >&5
+echo "configure:4622: checking whether struct ip_mreq is in netinet/in.h" >&5
 cat > conftest.$ac_ext <<EOF
-#line 4596 "configure"
+#line 4624 "configure"
 #include "confdefs.h"
 #include <netinet/in.h>
 int main() {
 struct ip_mreq mreq;
 ; return 0; }
 EOF
-if { (eval echo configure:4603: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:4631: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   cat >> confdefs.h <<\EOF
 #define HAVE_STRUCT_IP_MREQ 1
@@ -4615,16 +4643,16 @@
 rm -f conftest*
 
 echo $ac_n "checking whether struct sockaddr_in6 is in netinet/in.h""... $ac_c" 1>&6
-echo "configure:4619: checking whether struct sockaddr_in6 is in netinet/in.h" >&5
+echo "configure:4647: checking whether struct sockaddr_in6 is in netinet/in.h" >&5
 cat > conftest.$ac_ext <<EOF
-#line 4621 "configure"
+#line 4649 "configure"
 #include "confdefs.h"
 #include <netinet/in.h>
 int main() {
 struct sockaddr_in6 addr6;
 ; return 0; }
 EOF
-if { (eval echo configure:4628: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:4656: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   cat >> confdefs.h <<\EOF
 #define HAVE_INET6 1
@@ -4640,16 +4668,16 @@
 rm -f conftest*
 
 echo $ac_n "checking for socklen_t in sys/socket.h""... $ac_c" 1>&6
-echo "configure:4644: checking for socklen_t in sys/socket.h" >&5
+echo "configure:4672: checking for socklen_t in sys/socket.h" >&5
 cat > conftest.$ac_ext <<EOF
-#line 4646 "configure"
+#line 4674 "configure"
 #include "confdefs.h"
 #include <sys/socket.h>
 int main() {
 socklen_t x = 5;
 ; return 0; }
 EOF
-if { (eval echo configure:4653: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:4681: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   cat >> confdefs.h <<\EOF
 #define HAVE_SOCKLEN_T 1
@@ -4665,16 +4693,16 @@
 rm -f conftest*
 
 echo $ac_n "checking for tm_gmtoff in struct tm""... $ac_c" 1>&6
-echo "configure:4669: checking for tm_gmtoff in struct tm" >&5
+echo "configure:4697: checking for tm_gmtoff in struct tm" >&5
 cat > conftest.$ac_ext <<EOF
-#line 4671 "configure"
+#line 4699 "configure"
 #include "confdefs.h"
 #include <time.h>
 int main() {
 struct tm tim; tim.tm_gmtoff = 0;
 ; return 0; }
 EOF
-if { (eval echo configure:4678: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:4706: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   cat >> confdefs.h <<\EOF
 #define STRUCT_TM_HAS_GMTOFF 1
@@ -4687,16 +4715,16 @@
   rm -rf conftest*
   echo "$ac_t""no" 1>&6
    echo $ac_n "checking for global timezone variable""... $ac_c" 1>&6
-echo "configure:4691: checking for global timezone variable" >&5
+echo "configure:4719: checking for global timezone variable" >&5
             cat > conftest.$ac_ext <<EOF
-#line 4693 "configure"
+#line 4721 "configure"
 #include "confdefs.h"
 #include <time.h>
 int main() {
 long z2 = timezone;
 ; return 0; }
 EOF
-if { (eval echo configure:4700: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:4728: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   cat >> confdefs.h <<\EOF
 #define HAVE_TIMEZONE 1
@@ -4716,19 +4744,19 @@
 # The Ultrix 4.2 mips builtin alloca declared by alloca.h only works
 # for constant arguments.  Useless!
 echo $ac_n "checking for working alloca.h""... $ac_c" 1>&6
-echo "configure:4720: checking for working alloca.h" >&5
+echo "configure:4748: checking for working alloca.h" >&5
 if eval "test \"`echo '$''{'ac_cv_header_alloca_h'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 4725 "configure"
+#line 4753 "configure"
 #include "confdefs.h"
 #include <alloca.h>
 int main() {
 char *p = alloca(2 * sizeof(int));
 ; return 0; }
 EOF
-if { (eval echo configure:4732: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:4760: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   ac_cv_header_alloca_h=yes
 else
@@ -4749,12 +4777,12 @@
 fi
 
 echo $ac_n "checking for alloca""... $ac_c" 1>&6
-echo "configure:4753: checking for alloca" >&5
+echo "configure:4781: checking for alloca" >&5
 if eval "test \"`echo '$''{'ac_cv_func_alloca_works'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 4758 "configure"
+#line 4786 "configure"
 #include "confdefs.h"
 
 #ifdef __GNUC__
@@ -4782,7 +4810,7 @@
 char *p = (char *) alloca(1);
 ; return 0; }
 EOF
-if { (eval echo configure:4786: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:4814: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   ac_cv_func_alloca_works=yes
 else
@@ -4814,12 +4842,12 @@
 
 
 echo $ac_n "checking whether alloca needs Cray hooks""... $ac_c" 1>&6
-echo "configure:4818: checking whether alloca needs Cray hooks" >&5
+echo "configure:4846: checking whether alloca needs Cray hooks" >&5
 if eval "test \"`echo '$''{'ac_cv_os_cray'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 4823 "configure"
+#line 4851 "configure"
 #include "confdefs.h"
 #if defined(CRAY) && ! defined(CRAY2)
 webecray
@@ -4844,12 +4872,12 @@
 if test $ac_cv_os_cray = yes; then
 for ac_func in _getb67 GETB67 getb67; do
   echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:4848: checking for $ac_func" >&5
+echo "configure:4876: checking for $ac_func" >&5
 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 4853 "configure"
+#line 4881 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func(); below.  */
@@ -4872,7 +4900,7 @@
 
 ; return 0; }
 EOF
-if { (eval echo configure:4876: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:4904: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_func_$ac_func=yes"
 else
@@ -4899,7 +4927,7 @@
 fi
 
 echo $ac_n "checking stack direction for C alloca""... $ac_c" 1>&6
-echo "configure:4903: checking stack direction for C alloca" >&5
+echo "configure:4931: checking stack direction for C alloca" >&5
 if eval "test \"`echo '$''{'ac_cv_c_stack_direction'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -4907,7 +4935,7 @@
   ac_cv_c_stack_direction=0
 else
   cat > conftest.$ac_ext <<EOF
-#line 4911 "configure"
+#line 4939 "configure"
 #include "confdefs.h"
 find_stack_direction ()
 {
@@ -4926,7 +4954,7 @@
   exit (find_stack_direction() < 0);
 }
 EOF
-if { (eval echo configure:4930: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:4958: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
 then
   ac_cv_c_stack_direction=1
 else
@@ -4953,7 +4981,7 @@
 # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:4957: checking for $ac_word" >&5
+echo "configure:4985: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_PERL'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
Index: include/config.h.in
===================================================================
RCS file: /cvs/java/libgcj/libjava/include/config.h.in,v
retrieving revision 1.20
diff -u -r1.20 config.h.in
--- config.h.in	2000/01/18 14:41:08	1.20
+++ config.h.in	2000/01/22 21:08:46
@@ -149,6 +149,9 @@
 /* Define if libltdl is in use.  */
 #undef USE_LTDL
 
+/* Define if g++ has a bug preventing us from inlining math routines.  */
+#undef __NO_MATH_INLINES
+
 /* Define if you have the access function.  */
 #undef HAVE_ACCESS

From java-patches-return-418-listarch-java-patches=sourceware.cygnus.com@sourceware.cygnus.com Wed Jan 26 00:55:43 2000
Return-Path: <java-patches-return-418-listarch-java-patches=sourceware.cygnus.com@sourceware.cygnus.com>
Delivered-To: listarch-java-patches@sourceware.cygnus.com
Received: (qmail 28987 invoked by alias); 26 Jan 2000 00:55:42 -0000
Mailing-List: contact java-patches-help@sourceware.cygnus.com; run by ezmlm
Precedence: bulk
List-Subscribe: <mailto:java-patches-subscribe@sourceware.cygnus.com>
List-Archive: <http://sourceware.cygnus.com/ml/java-patches/>
List-Post: <mailto:java-patches@sourceware.cygnus.com>
List-Help: <mailto:java-patches-help@sourceware.cygnus.com>, <http://sourceware.cygnus.com/ml/#faqs>
Sender: java-patches-owner@sourceware.cygnus.com
Delivered-To: mailing list java-patches@sourceware.cygnus.com
Received: (qmail 28961 invoked from network); 26 Jan 2000 00:55:40 -0000
Date: Tue, 25 Jan 2000 16:55:39 -0800 (PST)
Message-Id: <200001260055.QAA23725@ferrule.cygnus.com>
From: Tom Tromey <tromey@cygnus.com>
To: Java Patch List <java-patches@sourceware.cygnus.com>
Subject: Patch: type cleanups
X-Zippy:  LBJ, LBJ, how many JOKES did you tell today??!
X-Attribution:  Tom

I'm commmitting the appended patch.  It changes parts of the libgcj
implementation to use Java types instead of C++ types where
appropriate.

Tue Jan 25 08:51:16 2000  Tom Tromey  <tromey@ferrule.cygnus.com>

	* gcj/field.h (struct _Jv_Field): Use "jshort" as type for
	nameIndex.  Use "jint" as type for boffset.
	* java/lang/Class.h (struct _Jv_Method): Made accflags a
	_Jv_ushort.
	(Class): Likewise.  Also changed type of method_count,
	vtable_method_count, size_in_bytes, field_count,
	static_field_count, interface_count.
	* gcj/array.h (__JArray): Made `length' a const jsize, not an
	int.

Tom


Index: gcj/array.h
===================================================================
RCS file: /cvs/java/libgcj/libjava/gcj/array.h,v
retrieving revision 1.4
diff -u -r1.4 array.h
--- array.h	2000/01/19 18:39:23	1.4
+++ array.h	2000/01/26 00:54:40
@@ -18,7 +18,9 @@
 class __JArray : public java::lang::Object
 {
 public:
-  int length;
+  // FIXME: we'd like this to be `const' but that causes problems with
+  // the C++ compiler.
+  jsize length;
   friend jsize JvGetArrayLength (__JArray*);
 };
 
Index: gcj/field.h
===================================================================
RCS file: /cvs/java/libgcj/libjava/gcj/field.h,v
retrieving revision 1.3
diff -u -r1.3 field.h
--- field.h	2000/01/21 23:50:30	1.3
+++ field.h	2000/01/26 00:54:40
@@ -30,13 +30,13 @@
   _Jv_ushort		flags;
 
 #ifdef COMPACT_FIELDS
-  short			nameIndex;  /* offset in class's name table */
+  jshort		nameIndex;  /* offset in class's name table */
 #else
   _Jv_ushort		bsize;  /* not really needed ... */
 #endif
 
   union {
-    int			boffset;  /* offset in bytes for instance field */
+    jint		boffset;  /* offset in bytes for instance field */
     void*		addr;  /* address of static field */
   } u;
 
Index: java/lang/Class.h
===================================================================
RCS file: /cvs/java/libgcj/libjava/java/lang/Class.h,v
retrieving revision 1.13
diff -u -r1.13 Class.h
--- Class.h	2000/01/21 23:50:31	1.13
+++ Class.h	2000/01/26 00:54:40
@@ -58,7 +58,7 @@
 {
   _Jv_Utf8Const *name;
   _Jv_Utf8Const *signature;
-  unsigned short accflags;
+  _Jv_ushort accflags;
   void *ncode;
 
   _Jv_Method *getNextMethod ()
@@ -229,7 +229,7 @@
   // Name of class.
   _Jv_Utf8Const *name;
   // Access flags for class.
-  unsigned short accflags;
+  _Jv_ushort accflags;
   // The superclass, or null for Object.
   jclass superclass;
   // Class constants.
@@ -240,17 +240,17 @@
   _Jv_Method *methods;
   // Number of methods.  If this class is primitive, this holds the
   // character used to represent this type in a signature.
-  short method_count;
+  jshort method_count;
   // Number of methods in the vtable.
-  short vtable_method_count;
+  jshort vtable_method_count;
   // The fields.
   _Jv_Field *fields;
   // Size of instance fields, in bytes.
-  int size_in_bytes;
+  jint size_in_bytes;
   // Total number of fields (instance and static).
-  short field_count;
+  jshort field_count;
   // Number of static fields.
-  short static_field_count;
+  jshort static_field_count;
   // The vtbl for all objects of this class.
   _Jv_VTable *vtable;
   // Interfaces implemented by this class.
@@ -258,7 +258,7 @@
   // The class loader for this class.
   java::lang::ClassLoader *loader;
   // Number of interfaces.
-  short interface_count;
+  jshort interface_count;
   // State of this class.
   jbyte state;
   // The thread which has locked this class.  Used during class

From java-patches-return-419-listarch-java-patches=sourceware.cygnus.com@sourceware.cygnus.com Wed Jan 26 00:56:29 2000
Return-Path: <java-patches-return-419-listarch-java-patches=sourceware.cygnus.com@sourceware.cygnus.com>
Delivered-To: listarch-java-patches@sourceware.cygnus.com
Received: (qmail 29534 invoked by alias); 26 Jan 2000 00:56:29 -0000
Mailing-List: contact java-patches-help@sourceware.cygnus.com; run by ezmlm
Precedence: bulk
List-Subscribe: <mailto:java-patches-subscribe@sourceware.cygnus.com>
List-Archive: <http://sourceware.cygnus.com/ml/java-patches/>
List-Post: <mailto:java-patches@sourceware.cygnus.com>
List-Help: <mailto:java-patches-help@sourceware.cygnus.com>, <http://sourceware.cygnus.com/ml/#faqs>
Sender: java-patches-owner@sourceware.cygnus.com
Delivered-To: mailing list java-patches@sourceware.cygnus.com
Received: (qmail 29509 invoked from network); 26 Jan 2000 00:56:29 -0000
Date: Tue, 25 Jan 2000 16:56:28 -0800 (PST)
Message-Id: <200001260056.QAA23734@ferrule.cygnus.com>
From: Tom Tromey <tromey@cygnus.com>
To: Java Patch List <java-patches@sourceware.cygnus.com>
Subject: Patch: remove debugging print
X-Zippy:  I'm having an EMOTIONAL OUTBURST!!  But, uh, WHY is there a WAFFLE
 in my PAJAMA POCKET??
X-Attribution:  Tom

I'm committing the appended patch, which removes a debugging print
from the interpreter.

Tue Jan 25 08:51:16 2000  Tom Tromey  <tromey@ferrule.cygnus.com>

	* interpret.cc (run): Don't call println.
	Don't include PrintStream.h.

Tom

Index: interpret.cc
===================================================================
RCS file: /cvs/java/libgcj/libjava/interpret.cc,v
retrieving revision 1.8
diff -u -r1.8 interpret.cc
--- interpret.cc	2000/01/19 21:08:03	1.8
+++ interpret.cc	2000/01/26 00:54:46
@@ -22,7 +22,6 @@
 #include <java/lang/String.h>
 #include <java/lang/Integer.h>
 #include <java/lang/StringBuffer.h>
-#include <java/io/PrintStream.h>
 #include <java/lang/Class.h>
 #include <java/lang/reflect/Modifier.h>
 #include <java/lang/ClassCastException.h>
@@ -285,9 +284,6 @@
   /** handle an exception */
   if ( find_exception (ex, inv) )
     goto next_segment;
-
-  java::lang::System::out->println 
-    (_Jv_NewStringUTF (self->name->data));
 
   return ex;
 }

From java-patches-return-420-listarch-java-patches=sourceware.cygnus.com@sourceware.cygnus.com Wed Jan 26 23:44:28 2000
Return-Path: <java-patches-return-420-listarch-java-patches=sourceware.cygnus.com@sourceware.cygnus.com>
Delivered-To: listarch-java-patches@sourceware.cygnus.com
Received: (qmail 7898 invoked by alias); 26 Jan 2000 23:44:27 -0000
Mailing-List: contact java-patches-help@sourceware.cygnus.com; run by ezmlm
Precedence: bulk
List-Subscribe: <mailto:java-patches-subscribe@sourceware.cygnus.com>
List-Archive: <http://sourceware.cygnus.com/ml/java-patches/>
List-Post: <mailto:java-patches@sourceware.cygnus.com>
List-Help: <mailto:java-patches-help@sourceware.cygnus.com>, <http://sourceware.cygnus.com/ml/#faqs>
Sender: java-patches-owner@sourceware.cygnus.com
Delivered-To: mailing list java-patches@sourceware.cygnus.com
Received: (qmail 7868 invoked from network); 26 Jan 2000 23:44:26 -0000
Date: Wed, 26 Jan 2000 15:44:24 -0800 (PST)
Message-Id: <200001262344.PAA27947@ferrule.cygnus.com>
From: Tom Tromey <tromey@cygnus.com>
To: Java Patch List <java-patches@sourceware.cygnus.com>
Subject: Patch: fixlet in resolve.cc
X-Zippy:  Barbie says, Take quaaludes in gin and go to a disco right away!
 But Ken says, WOO-WOO!!  No credit at ``Mr. Liquor''!!
X-Attribution:  Tom

I'm checking in this fix to resolve.cc.

2000-01-26  Tom Tromey  <tromey@cygnus.com>

	* resolve.cc (get_ffi_type_from_signature): Handle case where
	boolean is an int.

Tom

Index: resolve.cc
===================================================================
RCS file: /cvs/java/libgcj/libjava/resolve.cc,v
retrieving revision 1.9
diff -u -r1.9 resolve.cc
--- resolve.cc	2000/01/20 17:32:26	1.9
+++ resolve.cc	2000/01/26 23:43:35
@@ -856,6 +856,16 @@
       break;
 
     case 'Z':
+      // On some platforms a bool is a byte, on others an int.
+      if (sizeof (jboolean) == sizeof (jbyte))
+	return &ffi_type_sint8;
+      else
+	{
+	  JvAssert (sizeof (jbyte) == sizeof (jint));
+	  return &ffi_type_sint32;
+	}
+      break;
+
     case 'B':
       return &ffi_type_sint8;
       break;

From java-patches-return-421-listarch-java-patches=sourceware.cygnus.com@sourceware.cygnus.com Wed Jan 26 23:56:27 2000
Return-Path: <java-patches-return-421-listarch-java-patches=sourceware.cygnus.com@sourceware.cygnus.com>
Delivered-To: listarch-java-patches@sourceware.cygnus.com
Received: (qmail 11493 invoked by alias); 26 Jan 2000 23:56:27 -0000
Mailing-List: contact java-patches-help@sourceware.cygnus.com; run by ezmlm
Precedence: bulk
List-Subscribe: <mailto:java-patches-subscribe@sourceware.cygnus.com>
List-Archive: <http://sourceware.cygnus.com/ml/java-patches/>
List-Post: <mailto:java-patches@sourceware.cygnus.com>
List-Help: <mailto:java-patches-help@sourceware.cygnus.com>, <http://sourceware.cygnus.com/ml/#faqs>
Sender: java-patches-owner@sourceware.cygnus.com
Delivered-To: mailing list java-patches@sourceware.cygnus.com
Received: (qmail 11468 invoked from network); 26 Jan 2000 23:56:26 -0000
Date: Wed, 26 Jan 2000 15:56:25 -0800 (PST)
Message-Id: <200001262356.PAA16112@ferrule.cygnus.com>
From: Tom Tromey <tromey@cygnus.com>
To: Java Patch List <java-patches@sourceware.cygnus.com>
Subject: Patch: more JNI work
X-Zippy:  I just got my PRINCE bumper sticker..
 But now I can't remember WHO he is...
X-Attribution:  Tom

I'm checking in the appended patch, which implements another chunk of
JNI.  It still doesn't work, but it is a bit closer.

2000-01-26  Tom Tromey  <tromey@cygnus.com>

	* gcj/method.h (JvNumMethods): Moved from Class.h.
	(JvGetFirstMethod): Likewise.
	* java/lang/Class.h (Object): Updated decl of
	_Jv_JNI_ToReflectedField.
	(Object): Added _Jv_JNI_ToReflectedMethod as a friend.
	* Makefile.in: Rebuilt.
	* Makefile.am (java/lang/reflect/Field.h): Added `jboolean'
	argument of _Jv_JNI_ToReflectedField.
	(java/lang/reflect/Constructor.h): Added _Jv_JNI_ToReflectedMethod
	as a friend.
	(java/lang/reflect/Method.h): Likewise.
	* include/jni.h (class _Jv_JNIEnv): Added `klass' member.  Use
	__GCJ_JNI_IMPL__.
	(jweak): New typedef.
	(struct JNINativeInterface): Correctly declare remaining entries.
	* jni.cc: Include Class.h, ClassLoader.h.
	(_Jv_JNI_FindClass): New function.
	(_Jv_JNI_DefineClass): New function.
	(_Jv_JNI_conversion_call): New function.
	(_Jv_JNI_FindClass): Use current class loader to find class.
	(_Jv_JNI_ExceptionCheck): New function.
	(_Jv_JNI_FromReflectedField): Now static.
	(MethodClass): New define.
	(_Jv_JNI_FromReflectedMethod): New function.
	(_Jv_JNI_ToReflectedMethod): Likewise.
	Include Method.h.
	(_Jv_JNI_IsAssignableFrom): Renamed.
	(_Jv_JNI_GetStringRegion): New function.
	Include StringIndexOutOfBoundsException.h.
	(_Jv_JNI_GetStringUTFRegion): New function.
	(_Jv_JNIFunctions): Updated for new functions.
	(_Jv_JNI_GetPrimitiveArrayCritical): New function
	(_Jv_JNI_ReleasePrimitiveArrayCritical): Likewise.
	(_Jv_JNI_GetStringCritical): New function.
	(_Jv_JNI_ReleaseStringCritical): Likewise.
	(get_throwable): Removed.
	(GCJ_JV_JNIENV_FRIEND): Removed.
	(__GCJ_JNI_IMPL__): Define.
	Include method.h.

Tom

Index: Makefile.am
===================================================================
RCS file: /cvs/java/libgcj/libjava/Makefile.am,v
retrieving revision 1.42
diff -u -r1.42 Makefile.am
--- Makefile.am	2000/01/17 19:22:20	1.42
+++ Makefile.am	2000/01/26 23:53:43
@@ -235,12 +235,13 @@
 	$(GCJH) -classpath $(top_builddir) \
 	    -friend 'jmethodID _Jv_FromReflectedConstructor (java::lang::reflect::Constructor *);' \
 	    -friend 'java::lang::Class;' \
+	    -friend 'jobject _Jv_JNI_ToReflectedMethod (_Jv_JNIEnv *, jclass, jmethodID, jboolean);' \
 	    $(basename $<)
 
 java/lang/reflect/Field.h: java/lang/reflect/Field.class libgcj.zip
 	$(GCJH) -classpath $(top_builddir) \
 	    -friend 'jfieldID _Jv_FromReflectedField (java::lang::reflect::Field *);' \
-	    -friend 'jobject _Jv_JNI_ToReflectedField (_Jv_JNIEnv*, jclass, jfieldID);' \
+	    -friend 'jobject _Jv_JNI_ToReflectedField (_Jv_JNIEnv*, jclass, jfieldID, jboolean);' \
 	    -friend 'java::lang::Class;' \
 	    $(basename $<)
 
@@ -248,6 +249,7 @@
 	$(GCJH) -classpath $(top_builddir) \
 	    -friend 'jmethodID _Jv_FromReflectedMethod (java::lang::reflect::Method *);' \
 	    -friend 'java::lang::Class;' \
+	    -friend 'jobject _Jv_JNI_ToReflectedMethod (_Jv_JNIEnv *, jclass, jmethodID, jboolean);' \
 	    $(basename $<)
 
 gnu/gcj/runtime/VMClassLoader.h: gnu/gcj/runtime/VMClassLoader.class libgcj.zip
Index: jni.cc
===================================================================
RCS file: /cvs/java/libgcj/libjava/jni.cc,v
retrieving revision 1.4
diff -u -r1.4 jni.cc
--- jni.cc	2000/01/21 23:50:30	1.4
+++ jni.cc	2000/01/26 23:53:43
@@ -18,28 +18,37 @@
 
 #include <stddef.h>
 
-// Must define this before jni.h.
-#define GCJ_JV_JNIENV_FRIEND \
-    friend jthrowable &get_throwable (JNIEnv *)
+// Define this before including jni.h.
+#define __GCJ_JNI_IMPL__
 
 #include <gcj/cni.h>
 #include <jvm.h>
 #include <java-assert.h>
 #include <jni.h>
-#include <gcj/field.h>
+
+#include <java/lang/Class.h>
+#include <java/lang/ClassLoader.h>
 #include <java/lang/Throwable.h>
 #include <java/lang/ArrayIndexOutOfBoundsException.h>
+#include <java/lang/StringIndexOutOfBoundsException.h>
 #include <java/lang/InstantiationException.h>
 #include <java/lang/NoSuchFieldError.h>
 #include <java/lang/NoSuchMethodError.h>
 #include <java/lang/reflect/Constructor.h>
+#include <java/lang/reflect/Method.h>
 #include <java/lang/reflect/Modifier.h>
 
+#include <gcj/method.h>
+#include <gcj/field.h>
+
 #define ClassClass _CL_Q34java4lang5Class
 extern java::lang::Class ClassClass;
 #define ObjectClass _CL_Q34java4lang6Object
 extern java::lang::Class ObjectClass;
 
+#define MethodClass _CL_Q44java4lang7reflect6Method
+extern java::lang::Class MethodClass;
+
 // This enum is used to select different template instantiations in
 // the invocation code.
 enum invocation_type
@@ -50,6 +59,9 @@
   constructor
 };
 
+// Forward declaration.
+extern struct JNINativeInterface _Jv_JNIFunctions;
+
 
 
 // Tell the GC that a certain pointer is live.
@@ -66,13 +78,6 @@
   // FIXME.
 }
 
-// Return throwable in env.
-jthrowable &
-get_throwable (JNIEnv *env)
-{
-  return env->ex;
-}
-
 
 
 static jint
@@ -82,13 +87,55 @@
 }
 
 static jclass
+_Jv_JNI_DefineClass (JNIEnv *, jobject loader, 
+		     const jbyte *buf, jsize bufLen)
+{
+  jbyteArray bytes = JvNewByteArray (bufLen);
+  jbyte *elts = elements (bytes);
+  memcpy (elts, buf, bufLen * sizeof (jbyte));
+
+  java::lang::ClassLoader *l
+    = reinterpret_cast<java::lang::ClassLoader *> (loader);
+
+  // FIXME: exception processing.
+  jclass result = l->defineClass (bytes, 0, bufLen);
+  return result;
+}
+
+static jclass
+_Jv_JNI_FindClass (JNIEnv *env, const char *name)
+{
+  // FIXME: assume that NAME isn't too long.
+  int len = strlen (name);
+  char s[len + 1];
+  for (int i = 0; i <= len; ++i)
+    s[i] = (name[i] == '/') ? '.' : name[i];
+  jstring n = JvNewStringUTF (s);
+
+  java::lang::ClassLoader *loader;
+  if (env->klass == NULL)
+    {
+      // FIXME: should use getBaseClassLoader, but we don't have that
+      // yet.
+      loader = java::lang::ClassLoader::getSystemClassLoader ();
+    }
+  else
+    loader = env->klass->getClassLoader ();
+
+  // FIXME: exception processing.
+  jclass r = loader->findClass (n);
+
+  return r;
+}
+
+static jclass
 _Jv_JNI_GetSuperclass (JNIEnv *, jclass clazz)
 {
   return clazz->getSuperclass ();
 }
 
 static jboolean
-IsAssignableFrom(JNIEnv *, jclass clazz1, jclass clazz2)
+_Jv_JNI_IsAssignableFrom(JNIEnv *, jclass clazz1, jclass clazz2)
 {
   return clazz1->isAssignableFrom (clazz2);
 }
@@ -96,7 +143,7 @@
 static jint
 _Jv_JNI_Throw (JNIEnv *env, jthrowable obj)
 {
-  get_throwable (env) = obj;
+  env->ex = obj;
   return 0;
 }
 
@@ -121,27 +168,34 @@
   // FIXME: exception processing.
   jobject obj = cons->newInstance (values);
 
-  get_throwable (env) = reinterpret_cast<jthrowable> (obj);
+  env->ex = reinterpret_cast<jthrowable> (obj);
   return 0;
 }
 
 static jthrowable
 _Jv_JNI_ExceptionOccurred (JNIEnv *env)
 {
-  return get_throwable (env);
+  // FIXME: create local reference.
+  return env->ex;
 }
 
 static void
 _Jv_JNI_ExceptionDescribe (JNIEnv *env)
 {
-  if (get_throwable (env) != NULL)
-    get_throwable (env)->printStackTrace();
+  if (env->ex != NULL)
+    env->ex->printStackTrace();
 }
 
 static void
 _Jv_JNI_ExceptionClear (JNIEnv *env)
+{
+  env->ex = NULL;
+}
+
+static jboolean
+_Jv_JNI_ExceptionCheck (JNIEnv *env)
 {
-  get_throwable (env) = NULL;
+  return env->ex != NULL;
 }
 
 static void
@@ -162,7 +216,7 @@
   jobject obj = NULL;
   using namespace java::lang::reflect;
   if (clazz->isInterface() || Modifier::isAbstract(clazz->getModifiers()))
-    get_throwable (env) = new java::lang::InstantiationException ();
+    env->ex = new java::lang::InstantiationException ();
   else
     {
       // FIXME: exception processing.
@@ -225,7 +279,7 @@
       clazz = clazz->getSuperclass ();
     }
 
-  get_throwable (env) = new java::lang::NoSuchMethodError ();
+  env->ex = new java::lang::NoSuchMethodError ();
   return NULL;
 }
 
@@ -290,7 +344,7 @@
 				      arg_types, args, &result);
 
   if (ex != NULL)
-    get_throwable (env) = ex;
+    env->ex = ex;
 
   // We cheat a little here.  FIXME.
   return * (T *) &result;
@@ -334,7 +388,7 @@
 				      arg_types, args, &result);
 
   if (ex != NULL)
-    get_throwable (env) = ex;
+    env->ex = ex;
 
   // We cheat a little here.  FIXME.
   return * (T *) &result;
@@ -365,7 +419,7 @@
 				      arg_types, args, NULL);
 
   if (ex != NULL)
-    get_throwable (env) = ex;
+    env->ex = ex;
 }
 
 template<invocation_type style>
@@ -402,7 +456,7 @@
 				      arg_types, args, NULL);
 
   if (ex != NULL)
-    get_throwable (env) = ex;
+    env->ex = ex;
 }
 
 // Functions with this signature are used to implement functions in
@@ -617,7 +671,7 @@
       clazz = clazz->getSuperclass ();
     }
 
-  get_throwable (env) = new java::lang::NoSuchFieldError ();
+  env->ex = new java::lang::NoSuchFieldError ();
   return NULL;
 }
 
@@ -702,6 +756,44 @@
   _Jv_Free ((void *) utf);
 }
 
+static void
+_Jv_JNI_GetStringRegion (JNIEnv *env, jstring string, jsize start, jsize len,
+			 jchar *buf)
+{
+  jchar *result = _Jv_GetStringChars (string);
+  if (start < 0 || start > string->length ()
+      || len < 0 || start + len > string->length ())
+    env->ex = new java::lang::StringIndexOutOfBoundsException ();
+  else
+    memcpy (buf, &result[start], len * sizeof (jchar));
+}
+
+static void
+_Jv_JNI_GetStringUTFRegion (JNIEnv *env, jstring str, jsize start,
+			    jsize len, char *buf)
+{
+  if (start < 0 || start > str->length ()
+      || len < 0 || start + len > str->length ())
+    env->ex = new java::lang::StringIndexOutOfBoundsException ();
+  else
+    _Jv_GetStringUTFRegion (str, start, len, buf);
+}
+
+static const jchar *
+_Jv_JNI_GetStringCritical (JNIEnv *, jstring str, jboolean *isCopy)
+{
+  jchar *result = _Jv_GetStringChars (str);
+  if (isCopy)
+    *isCopy = false;
+  return result;
+}
+
+static void
+_Jv_JNI_ReleaseStringCritical (JNIEnv *, jstring, const jchar *)
+{
+  // Nothing.
+}
+
 static jsize
 _Jv_JNI_GetArrayLength (JNIEnv *, jarray array)
 {
@@ -776,7 +868,7 @@
   if (start < 0 || len >= array->length || start + len >= array->length)
     {
       // FIXME: index.
-      get_throwable (env) = new java::lang::ArrayIndexOutOfBoundsException ();
+      env->ex = new java::lang::ArrayIndexOutOfBoundsException ();
     }
   else
     {
@@ -793,7 +885,7 @@
   if (start < 0 || len >= array->length || start + len >= array->length)
     {
       // FIXME: index.
-      get_throwable (env) = new java::lang::ArrayIndexOutOfBoundsException ();
+      env->ex = new java::lang::ArrayIndexOutOfBoundsException ();
     }
   else
     {
@@ -802,6 +894,25 @@
     }
 }
 
+static void *
+_Jv_JNI_GetPrimitiveArrayCritical (JNIEnv *, jarray array,
+				   jboolean *isCopy)
+{
+  // FIXME: does this work?
+  jclass klass = array->getClass()->getComponentType();
+  JvAssert (klass->isPrimitive ());
+  char *r = _Jv_GetArrayElementFromElementType (array, klass);
+  if (isCopy)
+    *isCopy = false;
+  return r;
+}
+
+static void
+_Jv_JNI_ReleasePrimitiveArrayCritical (JNIEnv *, jarray, void *, jint)
+{
+  // Nothing.
+}
+
 static jint
 _Jv_JNI_MonitorEnter (JNIEnv *, jobject obj)
 {
@@ -820,22 +931,94 @@
 
 // JDK 1.2
 jobject
-_Jv_JNI_ToReflectedField (JNIEnv *, jclass cls, jfieldID fieldID)
+_Jv_JNI_ToReflectedField (JNIEnv *, jclass cls, jfieldID fieldID,
+			  jboolean)
 {
+  // FIXME: exception processing.
   java::lang::reflect::Field *field = new java::lang::reflect::Field();
   field->declaringClass = cls;
   field->offset = (char*) fieldID - (char *) cls->fields;
   field->name = _Jv_NewStringUtf8Const (fieldID->getNameUtf8Const (cls));
+  // FIXME: make a local reference.
   return field;
 }
 
 // JDK 1.2
-jfieldID
-_Jv_JNI_FromReflectedField (JNIEnv *, java::lang::reflect::Field *field)
+static jfieldID
+_Jv_JNI_FromReflectedField (JNIEnv *, jobject f)
 {
+  using namespace java::lang::reflect;
+
+  Field *field = reinterpret_cast<Field *> (f);
   return _Jv_FromReflectedField (field);
 }
 
+jobject
+_Jv_JNI_ToReflectedMethod (JNIEnv *, jclass klass, jmethodID id,
+			   jboolean)
+{
+  using namespace java::lang::reflect;
+
+  // FIXME.
+  static _Jv_Utf8Const *init_name = _Jv_makeUtf8Const ("<init>", 6);
+
+  jobject result;
+  if (_Jv_equalUtf8Consts (id->name, init_name))
+    {
+      // A constructor.
+      Constructor *cons = new Constructor ();
+      cons->offset = (char *) id - (char *) &klass->methods;
+      cons->declaringClass = klass;
+      result = cons;
+    }
+  else
+    {
+      Method *meth = new Method ();
+      meth->offset = (char *) id - (char *) &klass->methods;
+      meth->declaringClass = klass;
+      result = meth;
+    }
+
+  // FIXME: make a local reference.
+  return result;
+}
+
+static jmethodID
+_Jv_JNI_FromReflectedMethod (JNIEnv *, jobject method)
+{
+  using namespace java::lang::reflect;
+  if ((&MethodClass)->isInstance (method))
+    return _Jv_FromReflectedMethod (reinterpret_cast<Method *> (method));
+  return
+    _Jv_FromReflectedConstructor (reinterpret_cast<Constructor *> (method));
+}
+
+
+
+// This function is the stub which is used to turn an ordinary (CNI)
+// method call into a JNI call.
+#if 0
+template<typename T>
+static T
+_Jv_JNI_conversion_call (fixme)
+{
+  JNIEnv env;
+
+  env.p = &_Jv_JNIFunctions;
+  env.ex = NULL;
+  env.klass = FIXME;
+
+  T result = FIXME_ffi_call (args);
+
+  if (env.ex)
+    JvThrow (env.ex);
+
+  return T;
+}
+#endif
+
+
+
 #define NOT_IMPL NULL
 #define RESERVED NULL
 
@@ -846,28 +1029,28 @@
   RESERVED,
   RESERVED,
   _Jv_JNI_GetVersion,
-  NOT_IMPL /* DefineClass */,
-  NOT_IMPL /* FindClass */,
-  RESERVED,
-  RESERVED,
-  RESERVED,
+  _Jv_JNI_DefineClass,
+  _Jv_JNI_FindClass,
+  _Jv_JNI_FromReflectedMethod,
+  _Jv_JNI_FromReflectedField,
+  _Jv_JNI_ToReflectedMethod,
   _Jv_JNI_GetSuperclass,
-  IsAssignableFrom,
-  RESERVED,
+  _Jv_JNI_IsAssignableFrom,
+  _Jv_JNI_ToReflectedField,
   _Jv_JNI_Throw,
   _Jv_JNI_ThrowNew,
   _Jv_JNI_ExceptionOccurred,
   _Jv_JNI_ExceptionDescribe,
   _Jv_JNI_ExceptionClear,
   _Jv_JNI_FatalError,
-  RESERVED,
-  RESERVED,
+  NOT_IMPL,
+  NOT_IMPL,
   NOT_IMPL /* NewGlobalRef */,
   NOT_IMPL /* DeleteGlobalRef */,
   NOT_IMPL /* DeleteLocalRef */,
   _Jv_JNI_IsSameObject,
-  RESERVED,
-  RESERVED,
+  NOT_IMPL,
+  NOT_IMPL,
   _Jv_JNI_AllocObject,
   _Jv_JNI_NewObject,
   _Jv_JNI_NewObjectV,
@@ -1067,4 +1250,16 @@
   _Jv_JNI_MonitorEnter,
   _Jv_JNI_MonitorExit,
   NOT_IMPL /* GetJavaVM */,
+
+  _Jv_JNI_GetStringRegion,
+  _Jv_JNI_GetStringUTFRegion,
+  _Jv_JNI_GetPrimitiveArrayCritical,
+  _Jv_JNI_ReleasePrimitiveArrayCritical,
+  _Jv_JNI_GetStringCritical,
+  _Jv_JNI_ReleaseStringCritical,
+
+  NOT_IMPL /* newweakglobalref */,
+  NOT_IMPL /* deleteweakglobalref */,
+
+  _Jv_JNI_ExceptionCheck
 };
Index: gcj/method.h
===================================================================
RCS file: /cvs/java/libgcj/libjava/gcj/method.h,v
retrieving revision 1.4
diff -u -r1.4 method.h
--- method.h	2000/01/21 23:50:30	1.4
+++ method.h	2000/01/26 23:53:43
@@ -27,4 +27,16 @@
     ((char *) constructor->declaringClass->methods + constructor->offset);
 }
 
+extern inline jint
+JvNumMethods (jclass klass)
+{
+  return klass->method_count;
+}
+
+extern inline jmethodID
+JvGetFirstMethod (jclass klass)
+{
+  return &klass->methods[0];
+}
+
 #endif /* __GCJ_METHOD_H__ */
Index: include/jni.h
===================================================================
RCS file: /cvs/java/libgcj/libjava/include/jni.h,v
retrieving revision 1.5
diff -u -r1.5 jni.h
--- jni.h	2000/01/21 23:50:31	1.5
+++ jni.h	2000/01/26 23:53:43
@@ -65,6 +65,9 @@
 
 #endif /* __cplusplus */
 
+/* FIXME: this is wrong.  */
+typedef jobject jweak;
+
 /* Version numbers.  */
 #define JNI_VERSION_1_1 0x00010001
 #define JNI_VERSION_1_2 0x00010002
@@ -88,36 +91,58 @@
 
 typedef void * (*_Jv_func)(...);
 
+/* This structure is used when registering native methods.  */
+typedef struct
+{
+  char *name;
+  char *signature;
+  void *fnPtr;			/* Sigh.  */
+} JNINativeMethod;
+
+/* FIXME: this is just a placeholder.  */
+typedef int JavaVM;
+
 struct JNINativeInterface
 {
   _Jv_func reserved0;
   _Jv_func reserved1;
   _Jv_func reserved2;
   _Jv_func reserved3;
-  jint     (*GetVersion)                   (JNIEnv*);
-  _Jv_func DefineClass;
-  _Jv_func FindClass;
-  _Jv_func reserved4;
-  _Jv_func reserved5;
-  _Jv_func reserved6;
-  jclass   (*GetSuperclass)                (JNIEnv*, jclass);
-  jboolean (*IsAssignableFrom)             (JNIEnv*, jclass, jclass);
-  _Jv_func reserved7;
-  jint     (*Throw)                        (JNIEnv*, jthrowable);
-  jint     (*ThrowNew)                     (JNIEnv*, jclass, const char *);
+
+  jint     (*GetVersion)                   (JNIEnv *);
+  jclass   (*DefineClass)                  (JNIEnv *, jobject,
+					    const jbyte *, jsize);
+  jclass   (*FindClass)                    (JNIEnv *, const char *);
+
+  jmethodID (*FromReflectedMethod)	   (JNIEnv *, jobject);
+  jfieldID  (*FromReflectedField)	   (JNIEnv *, jobject);
+  jobject   (*ToReflectedMethod)	   (JNIEnv *, jclass, jmethodID,
+					    jboolean);
+
+  jclass   (*GetSuperclass)                (JNIEnv *, jclass);
+  jboolean (*IsAssignableFrom)             (JNIEnv *, jclass, jclass);
+
+  jobject  (*ToReflectedField)		   (JNIEnv *, jclass, jfieldID,
+					    jboolean);
+
+  jint     (*Throw)                        (JNIEnv *, jthrowable);
+  jint     (*ThrowNew)                     (JNIEnv *, jclass, const char *);
   jthrowable (*ExceptionOccurred)          (JNIEnv *);
   void     (*ExceptionDescribe)            (JNIEnv *);
   void     (*ExceptionClear)               (JNIEnv *);
   void     (*FatalError)                   (JNIEnv *, const char *);
-  _Jv_func reserved8;
-  _Jv_func reserved9;
-  _Jv_func NewGlobalRef;
-  _Jv_func DeleteGlobalRef;
-  _Jv_func DeleteLocalRef;
+
+  jint     (*PushLocalFrame)		   (JNIEnv *, jint);
+  jobject  (*PopLocalFrame)		   (JNIEnv *, jobject result);
+
+  jobject  (*NewGlobalRef)                 (JNIEnv *, jobject);
+  void     (*DeleteGlobalRef)              (JNIEnv *, jobject);
+  void     (*DeleteLocalRef)               (JNIEnv *, jobject);;
   jboolean (*IsSameObject)                 (JNIEnv *, jobject, jobject);
-  _Jv_func reserved10;
-  _Jv_func reserved11;
 
+  jobject  (*NewLocalRef)		   (JNIEnv *, jobject);
+  jint     (*EnsureLocalCapacity)	   (JNIEnv *, jint);
+
   jobject  (*AllocObject)                  (JNIEnv *, jclass);
   jobject (*NewObject)			   (JNIEnv *, jclass, jmethodID, ...);
   jobject (*NewObjectV)			   (JNIEnv *, jclass, jmethodID,
@@ -471,21 +496,30 @@
   void 		(*SetDoubleArrayRegion)	   (JNIEnv *, jbooleanArray,
 					    jsize, jsize, jboolean *);
 
-  _Jv_func RegisterNatives;
-  _Jv_func UnregisterNatives;
+  jint     (*RegisterNatives)              (JNIEnv *, jclass,
+					    const JNINativeMethod *, jint);
+  jint     (*UnregisterNatives)            (JNIEnv *, jclass);
   jint     (*MonitorEnter)                 (JNIEnv *, jobject);
   jint     (*MonitorExit)                  (JNIEnv *, jobject);
-  _Jv_func GetJavaVM;
-};
+  jint     (*GetJavaVM)                    (JNIEnv *, JavaVM **);
 
-/* This structure is used when registering native methods.  */
-typedef struct
-{
-  char *name;
-  char *signature;
-  void *fnPtr;			/* Sigh.  */
-} JNINativeMethod;
+  void	   (*GetStringRegion)	           (JNIEnv *, jstring, jsize,
+					    jsize, jchar *);
+  void     (*GetStringUTFRegion)	   (JNIEnv *, jstring, jsize,
+					    jsize, char *);
+
+  void * (*GetPrimitiveArrayCritical)      (JNIEnv *, jarray, jboolean *);
+  void   (*ReleasePrimitiveArrayCritical)  (JNIEnv *, jarray, void *, jint);
+
+  const jchar * (*GetStringCritical)       (JNIEnv *, jstring, jboolean *);
+  void          (*ReleaseStringCritical)   (JNIEnv *, jstring, const jchar *);
+
+  jweak  (*NewWeakGlobalRef)               (JNIEnv *, jobject);
+  void   (*DeleteWeakGlobalRef)            (JNIEnv *, jweak);
 
+  jboolean	(*ExceptionCheck)	   (JNIEnv *);
+};
+
 #ifdef __cplusplus
 
 class _Jv_JNIEnv
@@ -494,16 +528,15 @@
   /* The method table.  */
   struct JNINativeInterface *p;
 
+  /* FIXME: this is really ugly.  */
+#ifndef __GCJ_JNI_IMPL__
 private:
+#endif
   /* The current exception.  */
   jthrowable ex;
 
-  /* This doesn't really protect the private contents, because anybody
-     can set this macro.  However, if they do set it then they at
-     least know they are doing something unportable.  */
-#ifdef GCJ_JV_JNIENV_FRIEND
-  GCJ_JV_JNIENV_FRIEND;
-#endif
+  /* The class of the current native method.  */
+  jclass klass;
 
 public:
   jclass GetSuperclass (jclass cl)
Index: java/lang/Class.h
===================================================================
RCS file: /cvs/java/libgcj/libjava/java/lang/Class.h,v
retrieving revision 1.14
diff -u -r1.14 Class.h
--- Class.h	2000/01/26 00:55:50	1.14
+++ Class.h	2000/01/26 23:53:43
@@ -177,7 +177,11 @@
   friend jobject _Jv_AllocObject (jclass, jint);
   friend jobjectArray _Jv_NewObjectArray (jsize, jclass, jobject);
   friend jobject _Jv_NewPrimArray (jclass, jint);
-  friend jobject _Jv_JNI_ToReflectedField (_Jv_JNIEnv *, jclass, jfieldID);
+
+  friend jobject _Jv_JNI_ToReflectedField (_Jv_JNIEnv *, jclass, jfieldID,
+					   jboolean);
+  friend jobject _Jv_JNI_ToReflectedMethod (_Jv_JNIEnv *, jclass, jmethodID,
+					    jboolean);
   friend jfieldID _Jv_FromReflectedField (java::lang::reflect::Field *);
 
   friend jmethodID _Jv_FromReflectedMethod (java::lang::reflect::Method *);
@@ -265,18 +269,5 @@
   // initialization.
   java::lang::Thread *thread;
 };
-
-
-extern inline jint
-JvNumMethods (jclass klass)
-{
-  return klass->method_count;
-}
-
-extern inline jmethodID
-JvGetFirstMethod (jclass klass)
-{
-  return &klass->methods[0];
-}
 
 #endif /* __JAVA_LANG_CLASS_H__ */

From java-patches-return-422-listarch-java-patches=sourceware.cygnus.com@sourceware.cygnus.com Fri Jan 28 19:59:13 2000
Return-Path: <java-patches-return-422-listarch-java-patches=sourceware.cygnus.com@sourceware.cygnus.com>
Delivered-To: listarch-java-patches@sourceware.cygnus.com
Received: (qmail 13068 invoked by alias); 28 Jan 2000 19:59:12 -0000
Mailing-List: contact java-patches-help@sourceware.cygnus.com; run by ezmlm
Precedence: bulk
List-Subscribe: <mailto:java-patches-subscribe@sourceware.cygnus.com>
List-Archive: <http://sourceware.cygnus.com/ml/java-patches/>
List-Post: <mailto:java-patches@sourceware.cygnus.com>
List-Help: <mailto:java-patches-help@sourceware.cygnus.com>, <http://sourceware.cygnus.com/ml/#faqs>
Sender: java-patches-owner@sourceware.cygnus.com
Delivered-To: mailing list java-patches@sourceware.cygnus.com
Received: (qmail 13017 invoked from network); 28 Jan 2000 19:58:35 -0000
To: Java Patch List <java-patches@sourceware.cygnus.com> 
Subject: Patch: multilib -vs- ffi
X-Zippy:  Where do your SOCKS go when you lose them in th' WASHER?
X-Attribution:  Tom
Bcc:
Reply-To:  tromey@cygnus.com
From:  Tom Tromey <tromey@cygnus.com>
Date: 28 Jan 2000 13:01:02 -0700
Message-ID: <87hffyufsx.fsf@cygnus.com>
Lines: 25
X-Mailer: Gnus v5.5/Emacs 20.3

I'm committing the appended patch, which fixes multilib builds.

2000-01-28  Tom Tromey  <tromey@cygnus.com>

	* Makefile.in: Rebuilt.
	* Makefile.am (LIBFFIINCS): Added MULTIBUILDTOP.

Tom

Index: Makefile.am
===================================================================
RCS file: /cvs/java/libgcj/libjava/Makefile.am,v
retrieving revision 1.43
diff -u -r1.43 Makefile.am
--- Makefile.am	2000/01/26 23:56:36	1.43
+++ Makefile.am	2000/01/28 19:49:40
@@ -87,7 +87,7 @@
 JCFLAGS = -g -L$(here)
 JC1FLAGS = -g -L$(here) @LIBGCJ_JAVAFLAGS@
 
-LIBFFIINCS = -I$(top_srcdir)/../libffi/include -I../libffi/include
+LIBFFIINCS = -I$(top_srcdir)/../libffi/include -I$(MULTIBUILDTOP)../libffi/include
 
 INCLUDES = -I$(top_srcdir) -Iinclude -I$(top_srcdir)/include \
 	$(GCINCS) $(THREADINCS) $(INCLTDL) \

From java-patches-return-423-listarch-java-patches=sourceware.cygnus.com@sourceware.cygnus.com Sat Jan 29 01:17:15 2000
Return-Path: <java-patches-return-423-listarch-java-patches=sourceware.cygnus.com@sourceware.cygnus.com>
Delivered-To: listarch-java-patches@sourceware.cygnus.com
Received: (qmail 2348 invoked by alias); 29 Jan 2000 01:17:14 -0000
Mailing-List: contact java-patches-help@sourceware.cygnus.com; run by ezmlm
Precedence: bulk
List-Subscribe: <mailto:java-patches-subscribe@sourceware.cygnus.com>
List-Archive: <http://sourceware.cygnus.com/ml/java-patches/>
List-Post: <mailto:java-patches@sourceware.cygnus.com>
List-Help: <mailto:java-patches-help@sourceware.cygnus.com>, <http://sourceware.cygnus.com/ml/#faqs>
Sender: java-patches-owner@sourceware.cygnus.com
Delivered-To: mailing list java-patches@sourceware.cygnus.com
Received: (qmail 2323 invoked from network); 29 Jan 2000 01:17:13 -0000
Date: Fri, 28 Jan 2000 17:17:09 -0800
Message-Id: <200001290117.RAA08577@hoser.cygnus.com>
X-Authentication-Warning: hoser.cygnus.com: green set sender to green@cygnus.com using -f
From: Anthony Green <green@cygnus.com>
To: java-patches@sourceware.cygnus.com
CC: geoffk@redhat.com
Subject: data_start botch
X-Organization: Red Hat, Sunnyvale, California
X-URL: http://www.cygnus.com/~green
Reply-to: green@redhat.com


Somehow I botched a patch application.  We were missing an important
line that was supposed to be in a previous patch.  I've committed this
fix:


Fri Jan 28 17:13:20 2000  Anthony Green  <green@cygnus.com>

	* gcconfig.h (DATASTART): Add missing extern declaration
	for data_start on powerpc.

Index: gcconfig.h
===================================================================
RCS file: /cvs/java/libgcj/boehm-gc/gcconfig.h,v
retrieving revision 1.8
diff -u -p -u -r1.8 gcconfig.h
--- gcconfig.h	1999/12/20 05:55:34	1.8
+++ gcconfig.h	2000/01/29 01:15:22
@@ -532,6 +532,7 @@
 #     undef STACK_GRAN
 #     define STACK_GRAN 0x10000000
 	/* Stack usually starts at 0x80000000 */
+      extern int data_start;
 #     define DATASTART (&data_start)
       extern int _end;
 #     define DATAEND (&_end)



AG

-- 
Anthony Green                                                        Red Hat
                                                       Sunnyvale, California

From java-patches-return-424-listarch-java-patches=sourceware.cygnus.com@sourceware.cygnus.com Sun Jan 30 22:08:42 2000
Return-Path: <java-patches-return-424-listarch-java-patches=sourceware.cygnus.com@sourceware.cygnus.com>
Delivered-To: listarch-java-patches@sourceware.cygnus.com
Received: (qmail 20886 invoked by alias); 30 Jan 2000 22:08:42 -0000
Mailing-List: contact java-patches-help@sourceware.cygnus.com; run by ezmlm
Precedence: bulk
List-Subscribe: <mailto:java-patches-subscribe@sourceware.cygnus.com>
List-Archive: <http://sourceware.cygnus.com/ml/java-patches/>
List-Post: <mailto:java-patches@sourceware.cygnus.com>
List-Help: <mailto:java-patches-help@sourceware.cygnus.com>, <http://sourceware.cygnus.com/ml/#faqs>
Sender: java-patches-owner@sourceware.cygnus.com
Delivered-To: mailing list java-patches@sourceware.cygnus.com
Received: (qmail 20852 invoked from network); 30 Jan 2000 22:08:33 -0000
To: Java Patch List <java-patches@sourceware.cygnus.com> 
Subject: Patch: new inner class test
X-Zippy:  ..  I wonder if I ought to tell them about my PREVIOUS LIFE
 as a COMPLETE STRANGER?
X-Attribution:  Tom
Bcc:
Reply-To:  tromey@cygnus.com
From:  Tom Tromey <tromey@cygnus.com>
Date: 30 Jan 2000 15:11:27 -0700
Message-ID: <874sbvus4w.fsf@cygnus.com>
Lines: 44
X-Mailer: Gnus v5.5/Emacs 20.3

I'm checking in this patch, which adds a new inner class test.

2000-01-30  Alexandre Petit-Bianco  <apbianco@cygnus.com>

	* libjava.lang/final_inner.java: New file.
	* libjava.lang/final_inner.out: Likewise.

Tom

Index: libjava.lang/final_inner.java
===================================================================
RCS file: final_inner.java
diff -N final_inner.java
--- /dev/null	Tue May  5 13:32:27 1998
+++ final_inner.java	Sun Jan 30 14:06:42 2000
@@ -0,0 +1,19 @@
+// Class final_inner
+// Generated on Tue Jan 18 13:35:19 PST 2000
+//
+
+class final_inner {
+
+  void foo (final String s, final int i) {
+      class bar {
+          void printI () { System.out.println (s+i); }
+      }
+      new bar ().printI ();
+  }
+
+  public static void main (String[] arg)
+  {
+    System.out.println ("Testing class `final_inner'...");
+    new final_inner ().foo ("The Number ", 666);
+  }
+}
Index: libjava.lang/final_inner.out
===================================================================
RCS file: final_inner.out
diff -N final_inner.out
--- /dev/null	Tue May  5 13:32:27 1998
+++ final_inner.out	Sun Jan 30 14:06:42 2000
@@ -0,0 +1,2 @@
+Testing class `final_inner'...
+The Number 666

From java-patches-return-425-listarch-java-patches=sourceware.cygnus.com@sourceware.cygnus.com Mon Jan 31 04:49:15 2000
Return-Path: <java-patches-return-425-listarch-java-patches=sourceware.cygnus.com@sourceware.cygnus.com>
Delivered-To: listarch-java-patches@sourceware.cygnus.com
Received: (qmail 9883 invoked by alias); 31 Jan 2000 04:49:15 -0000
Mailing-List: contact java-patches-help@sourceware.cygnus.com; run by ezmlm
Precedence: bulk
List-Subscribe: <mailto:java-patches-subscribe@sourceware.cygnus.com>
List-Archive: <http://sourceware.cygnus.com/ml/java-patches/>
List-Post: <mailto:java-patches@sourceware.cygnus.com>
List-Help: <mailto:java-patches-help@sourceware.cygnus.com>, <http://sourceware.cygnus.com/ml/#faqs>
Sender: java-patches-owner@sourceware.cygnus.com
Delivered-To: mailing list java-patches@sourceware.cygnus.com
Received: (qmail 9773 invoked from network); 31 Jan 2000 04:48:41 -0000
To: Java Patch List <java-patches@sourceware.cygnus.com> 
Subject: Patch: iconv()-based encoding and decoding
X-Zippy:  I feel partially hydrogenated!
X-Attribution:  Tom
Bcc:
Reply-To:  tromey@cygnus.com
From:  Tom Tromey <tromey@cygnus.com>
Date: 30 Jan 2000 21:50:36 -0700
Message-ID: <87snzeu9nn.fsf@cygnus.com>
Lines: 400
X-Mailer: Gnus v5.5/Emacs 20.3

I'm committing the appended patch.  It changes libgcj to use iconv()
as a fallback when looking for character set encoders.  This code
hasn't yet been tested, because for some reason (that I have yet to
investigate) my system doesn't have iconv() in libc.

2000-01-30  Tom Tromey  <tromey@cygnus.com>

	* include/config.h.in: Rebuilt.
	* acconfig.h (HAVE_ICONV): Define.
	* configure: Rebuilt.
	* configure.in: Check for `iconv' function.
	* gnu/gcj/convert/BytesToUnicode.java (getDecoder): Try iconv if
	no specific encoder exists.
	* gnu/gcj/convert/UnicodeToBytes.java (getEncoder): Try iconv if
	no specific encoder exists.
	* Makefile.in: Rebuilt.
	* Makefile.am (convert_source_files): Mention Input_iconv.java and
	Output_iconv.java.
	(nat_source_files): Added natIconv.cc.
	* gnu/gcj/convert/natIconv.cc: New file.
	* gnu/gcj/convert/Input_iconv.java: New file.
	* gnu/gcj/convert/Output_iconv.java: New file.

Tom

Index: acconfig.h
===================================================================
RCS file: /cvs/java/libgcj/libjava/acconfig.h,v
retrieving revision 1.17
diff -u -r1.17 acconfig.h
--- acconfig.h	2000/01/22 21:15:57	1.17
+++ acconfig.h	2000/01/31 04:41:55
@@ -134,3 +134,6 @@
 
 /* Define if g++ has a bug preventing us from inlining math routines.  */
 #undef __NO_MATH_INLINES
+
+/* Define if you have working iconv() function.  */
+#undef HAVE_ICONV
Index: configure.in
===================================================================
RCS file: /cvs/java/libgcj/libjava/configure.in,v
retrieving revision 1.51
diff -u -r1.51 configure.in
--- configure.in	2000/01/22 21:15:57	1.51
+++ configure.in	2000/01/31 04:42:01
@@ -372,7 +372,7 @@
 else
    AC_CHECK_FUNCS(strerror ioctl select fstat open fsync sleep)
    AC_CHECK_FUNCS(gmtime_r localtime_r readdir_r getpwuid_r getcwd)
-   AC_CHECK_FUNCS(access stat mkdir rename rmdir unlink realpath)
+   AC_CHECK_FUNCS(access stat mkdir rename rmdir unlink realpath iconv)
    AC_CHECK_FUNCS(inet_aton inet_addr, break)
    AC_CHECK_FUNCS(inet_pton uname inet_ntoa)
    AC_CHECK_FUNCS(backtrace fork execvp pipe)
Index: Makefile.am
===================================================================
RCS file: /cvs/java/libgcj/libjava/Makefile.am,v
retrieving revision 1.44
diff -u -r1.44 Makefile.am
--- Makefile.am	2000/01/28 20:00:21	1.44
+++ Makefile.am	2000/01/31 04:42:10
@@ -447,11 +447,13 @@
 gnu/gcj/convert/Input_JavaSrc.java \
 gnu/gcj/convert/Input_SJIS.java \
 gnu/gcj/convert/Input_UTF8.java	\
+gnu/gcj/convert/Input_iconv.java \
 gnu/gcj/convert/Output_8859_1.java \
 gnu/gcj/convert/Output_EUCJIS.java \
 gnu/gcj/convert/Output_JavaSrc.java \
 gnu/gcj/convert/Output_SJIS.java \
 gnu/gcj/convert/Output_UTF8.java \
+gnu/gcj/convert/Output_iconv.java \
 gnu/gcj/convert/UnicodeToBytes.java
 
 ## List of all .java files for which the .h file is maintained by
@@ -787,6 +789,7 @@
 gnu/gcj/convert/JIS0208_to_Unicode.cc \
 gnu/gcj/convert/JIS0212_to_Unicode.cc \
 gnu/gcj/convert/Unicode_to_JIS.cc \
+gnu/gcj/convert/natIconv.cc \
 gnu/gcj/convert/natInput_EUCJIS.cc \
 gnu/gcj/convert/natInput_SJIS.cc \
 gnu/gcj/convert/natOutput_EUCJIS.cc \
Index: gnu/gcj/convert/BytesToUnicode.java
===================================================================
RCS file: /cvs/java/libgcj/libjava/gnu/gcj/convert/BytesToUnicode.java,v
retrieving revision 1.4
diff -u -r1.4 BytesToUnicode.java
--- BytesToUnicode.java	2000/01/19 18:39:24	1.4
+++ BytesToUnicode.java	2000/01/31 04:42:10
@@ -1,4 +1,4 @@
-/* Copyright (C) 1999  Red Hat, Inc.
+/* Copyright (C) 1999, 2000  Red Hat, Inc.
 
    This file is part of libgcj.
 
@@ -69,8 +69,15 @@
       } 
     catch (Throwable ex) 
       { 
-	throw new java.io.UnsupportedEncodingException(encoding
-						       + " (" + ex + ')');
+	try
+	  {
+	    return new Input_iconv (encoding);
+	  }
+	catch (Throwable _)
+	  {
+	    throw new java.io.UnsupportedEncodingException(encoding
+							   + " (" + ex + ')');
+	  }
       }
   }
 
Index: gnu/gcj/convert/Input_iconv.java
===================================================================
RCS file: Input_iconv.java
diff -N Input_iconv.java
--- /dev/null	Tue May  5 13:32:27 1998
+++ Input_iconv.java	Sun Jan 30 20:42:15 2000
@@ -0,0 +1,42 @@
+// Input_iconv.java -- Java side of iconv() reader.
+
+/* Copyright (C) 2000  Red Hat, Inc.
+
+   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.convert;
+import gnu.gcj.RawData;
+import java.io.UnsupportedEncodingException;
+
+/**
+ * Convert bytes in some iconv-supported encoding to Unicode.
+ * @author Tom Tromey <tromey@redhat.com>
+ * @date January 30, 2000
+ */
+
+public class Input_iconv extends BytesToUnicode
+{
+  public Input_iconv (String encoding) throws UnsupportedEncodingException
+  {
+    this.encoding = encoding;
+    this.handle = null;
+    init (encoding);
+  }
+
+  public String getName() { return encoding; }
+
+  public native void finalize ();
+  private native void init (String encoding)
+    throws UnsupportedEncodingException;
+  public native int read (char[] outbuffer, int outpos, int count);
+
+  // The encoding we're using.
+  private String encoding;
+
+  // The iconv handle.
+  private RawData handle;
+}
Index: gnu/gcj/convert/Output_iconv.java
===================================================================
RCS file: Output_iconv.java
diff -N Output_iconv.java
--- /dev/null	Tue May  5 13:32:27 1998
+++ Output_iconv.java	Sun Jan 30 20:43:30 2000
@@ -0,0 +1,42 @@
+// Output_iconv.java -- Java side of iconv() writer.
+
+/* Copyright (C) 2000  Red Hat, Inc.
+
+   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.convert;
+import gnu.gcj.RawData;
+import java.io.UnsupportedEncodingException;
+
+/**
+ * Convert Unicode to bytes in some iconv-supported encoding.
+ * @author Tom Tromey <tromey@redhat.com>
+ * @date January 30, 2000
+ */
+
+public class Output_iconv extends UnicodeToBytes
+{
+  public Output_iconv (String encoding) throws UnsupportedEncodingException
+  {
+    this.encoding = encoding;
+    this.handle = null;
+    init (encoding);
+  }
+
+  public String getName() { return encoding; }
+
+  public native void finalize ();
+  private native void init (String encoding)
+    throws UnsupportedEncodingException;
+  public native int write (char[] inbuffer, int inpos, int count);
+
+  // The encoding we're using.
+  private String encoding;
+
+  // The iconv handle.
+  private RawData handle;
+}
Index: gnu/gcj/convert/UnicodeToBytes.java
===================================================================
RCS file: /cvs/java/libgcj/libjava/gnu/gcj/convert/UnicodeToBytes.java,v
retrieving revision 1.3
diff -u -r1.3 UnicodeToBytes.java
--- UnicodeToBytes.java	2000/01/19 18:39:24	1.3
+++ UnicodeToBytes.java	2000/01/31 04:43:30
@@ -1,4 +1,4 @@
-/* Copyright (C) 1999  Red Hat, Inc.
+/* Copyright (C) 1999, 2000  Red Hat, Inc.
 
    This file is part of libgcj.
 
@@ -67,8 +67,16 @@
       } 
     catch (Throwable ex) 
       { 
-	throw new java.io.UnsupportedEncodingException(encoding + " ("
-						       + ex + ')');
+	try
+	  {
+	    return new Output_iconv (encoding);
+	  }
+	catch (Throwable _)
+	  {
+	    // Put the original exception in the throwable.
+	    throw new java.io.UnsupportedEncodingException(encoding + " ("
+							   + ex + ')');
+	  }
       }
   }
 
@@ -105,5 +113,4 @@
     str.getChars(inpos, srcEnd, work, 0);
     return write(work, inpos, inlength);
   }
-
 }
Index: gnu/gcj/convert/natIconv.cc
===================================================================
RCS file: natIconv.cc
diff -N natIconv.cc
--- /dev/null	Tue May  5 13:32:27 1998
+++ natIconv.cc	Sun Jan 30 20:46:08 2000
@@ -0,0 +1,142 @@
+// Input_iconv.java -- Java side of iconv() reader.
+
+/* Copyright (C) 2000  Red Hat, Inc.
+
+   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: Tom Tromey <tromey@redhat.com>.  */
+
+#include <config.h>
+
+#include <gcj/cni.h>
+#include <jvm.h>
+
+#include <gnu/gcj/convert/Input_iconv.h>
+#include <gnu/gcj/convert/Output_iconv.h>
+#include <java/io/UnsupportedEncodingException.h>
+
+#ifdef HAVE_ICONV
+#include <iconv.h>
+#endif
+
+void
+gnu::gcj::convert::Input_iconv::init (jstring encoding)
+{
+#ifdef HAVE_ICONV
+  jsize len = _Jv_GetStringUTFLength (encoding);
+  char buffer[len];
+  _Jv_GetStringUTFRegion (encoding, 0, len, buffer);
+
+  iconv_t h = iconv_open ("UCS-2", buffer);
+  if (h == (iconv_t) -1)
+    JvThrow (new java::io::UnsupportedEncodingException);
+
+  JvAssert (h != NULL);
+  handle = reinterpret_cast<gnu::gcj::RawData *> (h);
+#else /* HAVE_ICONV */
+  // If no iconv, just throw an exception.
+  JvThrow (new java::io::UnsupportedEncodingException);
+#endif /* HAVE_ICONV */
+}
+
+void
+gnu::gcj::convert::Input_iconv::finalize (void)
+{
+#ifdef HAVE_ICONV
+  if (handle == NULL)
+    {
+      iconv_close ((iconv_t) handle);
+      handle = NULL;
+    }
+#endif /* HAVE_ICONV */
+}
+
+jint
+gnu::gcj::convert::Input_iconv::read (jcharArray outbuffer,
+				      jint outpos, jint count)
+{
+#ifdef HAVE_ICONV
+  jint origpos = outpos;
+
+  jbyte *bytes = elements (inbuffer);
+  jchar *out = elements (outbuffer);
+  size_t inavail = inlength - inpos;
+  size_t old_in = inavail;
+  size_t outavail = count;
+  size_t old_out = outavail;
+
+  size_t r = iconv ((iconv_t) handle,
+		    &bytes[inpos], &inavail,
+		    &out[outpos], &outavail);
+  // FIXME: what if R==-1?
+
+  inpos += old_in - inavail;
+  return old_out - outavail;
+#else /* HAVE_ICONV */
+  return -1;
+#endif /* HAVE_ICONV */
+}
+
+void
+gnu::gcj::convert::Output_iconv::init (jstring encoding)
+{
+#ifdef HAVE_ICONV
+  jsize len = _Jv_GetStringUTFLength (encoding);
+  char buffer[len];
+  _Jv_GetStringUTFRegion (encoding, 0, len, buffer);
+
+  iconv_t h = iconv_open (buffer, "UCS-2");
+  if (h == (iconv_t) -1)
+    JvThrow (new java::io::UnsupportedEncodingException);
+
+  JvAssert (h != NULL);
+  handle = reinterpret_cast<gnu::gcj::RawData *> (h);
+#else /* HAVE_ICONV */
+  // If no iconv, just throw an exception.
+  JvThrow (new java::io::UnsupportedEncodingException);
+#endif /* HAVE_ICONV */
+}
+
+void
+gnu::gcj::convert::Output_iconv::finalize (void)
+{
+#ifdef HAVE_ICONV
+  if (handle == NULL)
+    {
+      iconv_close ((iconv_t) handle);
+      handle = NULL;
+    }
+#endif /* HAVE_ICONV */
+}
+
+jint
+gnu::gcj::convert::Output_iconv::write (jcharArray inbuffer,
+					jint inpos, jint count)
+{
+#ifdef HAVE_ICONV
+  jint origpos = outpos;
+
+  jchar *chars = elements (inbuffer);
+  jbyte *out = elements (buf);
+
+  size_t inavail = count;
+  size_t old_in = count;
+
+  size_t outavail = buf->length - count;
+  size_t old_out = outavail;
+
+  size_t r = iconv ((iconv_t) handle,
+		    &chars[inpos], &inavail,
+		    &out[count], &outavail);
+  // FIXME: what if R==-1?
+
+  count += old_out - outavail;
+  return old_in - inavail;
+#else /* HAVE_ICONV */
+  return -1;
+#endif /* HAVE_ICONV */
+}

From java-patches-return-426-listarch-java-patches=sourceware.cygnus.com@sourceware.cygnus.com Mon Jan 31 08:50:43 2000
Return-Path: <java-patches-return-426-listarch-java-patches=sourceware.cygnus.com@sourceware.cygnus.com>
Delivered-To: listarch-java-patches@sourceware.cygnus.com
Received: (qmail 21563 invoked by alias); 31 Jan 2000 08:50:43 -0000
Mailing-List: contact java-patches-help@sourceware.cygnus.com; run by ezmlm
Precedence: bulk
List-Subscribe: <mailto:java-patches-subscribe@sourceware.cygnus.com>
List-Archive: <http://sourceware.cygnus.com/ml/java-patches/>
List-Post: <mailto:java-patches@sourceware.cygnus.com>
List-Help: <mailto:java-patches-help@sourceware.cygnus.com>, <http://sourceware.cygnus.com/ml/#faqs>
Sender: java-patches-owner@sourceware.cygnus.com
Delivered-To: mailing list java-patches@sourceware.cygnus.com
Received: (qmail 21538 invoked from network); 31 Jan 2000 08:50:40 -0000
Date: Mon, 31 Jan 2000 00:50:39 -0800
Message-Id: <200001310850.AAA14637@decepticon.cygnus.com>
X-Authentication-Warning: decepticon.cygnus.com: green set sender to green@cygnus.com using -f
From: Anthony Green <green@cygnus.com>
To: tromey@cygnus.com
CC: java-patches@sourceware.cygnus.com
In-reply-to: <87snzeu9nn.fsf@cygnus.com> (message from Tom Tromey on 30 Jan
	2000 21:50:36 -0700)
Subject: Re: Patch: iconv()-based encoding and decoding
X-Organization: Red Hat, Sunnyvale, California
X-URL: http://www.cygnus.com/~green
Reply-to: green@redhat.com
References:  <87snzeu9nn.fsf@cygnus.com>


Tom wrote:
> I'm committing the appended patch.  It changes libgcj to use iconv()
> as a fallback when looking for character set encoders.  This code
> hasn't yet been tested, because for some reason (that I have yet to
> investigate) my system doesn't have iconv() in libc.

I'm committing these fixes which are needed in order to compile
natIconv.cc.  I don't know if they are correct, but it builds now.

Mon Jan 31 00:43:15 2000  Anthony Green  <green@cygnus.com>

    * gnu/gcj/convert/natIconv.cc (read): Minor fixes.
    (write): Ditto.

Index: natIconv.cc
===================================================================
RCS file: /cvs/java/libgcj/libjava/gnu/gcj/convert/natIconv.cc,v
retrieving revision 1.1
diff -u -p -u -r1.1 natIconv.cc
--- natIconv.cc	2000/01/31 04:53:47	1.1
+++ natIconv.cc	2000/01/31 08:46:16
@@ -69,9 +69,12 @@ gnu::gcj::convert::Input_iconv::read (jc
   size_t outavail = count;
   size_t old_out = outavail;
 
+  const char *inbuf = (const char *) &bytes[inpos];
+  char *outbuf = (char *) &out[outpos];
+
   size_t r = iconv ((iconv_t) handle,
-		    &bytes[inpos], &inavail,
-		    &out[outpos], &outavail);
+		    &inbuf, &inavail,
+		    &outbuf, &outavail);
   // FIXME: what if R==-1?
 
   inpos += old_in - inavail;
@@ -118,7 +121,7 @@ gnu::gcj::convert::Output_iconv::write (
 					jint inpos, jint count)
 {
 #ifdef HAVE_ICONV
-  jint origpos = outpos;
+  jint origpos = inpos;
 
   jchar *chars = elements (inbuffer);
   jbyte *out = elements (buf);
@@ -129,9 +132,12 @@ gnu::gcj::convert::Output_iconv::write (
   size_t outavail = buf->length - count;
   size_t old_out = outavail;
 
+  const char *inbuf = (const char *) &chars[inpos];
+  char *outbuf = (char *) &out[count];
+
   size_t r = iconv ((iconv_t) handle,
-		    &chars[inpos], &inavail,
-		    &out[count], &outavail);
+		    &inbuf, &inavail,
+		    &outbuf, &outavail);
   // FIXME: what if R==-1?
 
   count += old_out - outavail;


AG

-- 
Anthony Green                                                        Red Hat
                                                       Sunnyvale, California

From java-patches-return-427-listarch-java-patches=sourceware.cygnus.com@sourceware.cygnus.com Mon Jan 31 16:01:10 2000
Return-Path: <java-patches-return-427-listarch-java-patches=sourceware.cygnus.com@sourceware.cygnus.com>
Delivered-To: listarch-java-patches@sourceware.cygnus.com
Received: (qmail 23326 invoked by alias); 31 Jan 2000 16:01:10 -0000
Mailing-List: contact java-patches-help@sourceware.cygnus.com; run by ezmlm
Precedence: bulk
List-Subscribe: <mailto:java-patches-subscribe@sourceware.cygnus.com>
List-Archive: <http://sourceware.cygnus.com/ml/java-patches/>
List-Post: <mailto:java-patches@sourceware.cygnus.com>
List-Help: <mailto:java-patches-help@sourceware.cygnus.com>, <http://sourceware.cygnus.com/ml/#faqs>
Sender: java-patches-owner@sourceware.cygnus.com
Delivered-To: mailing list java-patches@sourceware.cygnus.com
Received: (qmail 23289 invoked from network); 31 Jan 2000 16:01:08 -0000
Date: Mon, 31 Jan 2000 08:01:07 -0800 (PST)
Message-Id: <200001311601.IAA12265@ferrule.cygnus.com>
From: Tom Tromey <tromey@cygnus.com>
To: green@redhat.com
Cc: tromey@cygnus.com, java-patches@sourceware.cygnus.com
Subject: Re: Patch: iconv()-based encoding and decoding
In-Reply-To: <200001310850.AAA14637@decepticon.cygnus.com>
References: <87snzeu9nn.fsf@cygnus.com>
	<200001310850.AAA14637@decepticon.cygnus.com>
X-Zippy:  I'm QUIETLY reading the latest issue of ``BOWLING WORLD''
 while my wife and two children stand QUIETLY BY..
X-Attribution:  Tom

Anthony> I'm committing these fixes which are needed in order to compile
Anthony> natIconv.cc.  I don't know if they are correct, but it builds now.

Oops.  Thanks.

T

From java-patches-return-428-listarch-java-patches=sourceware.cygnus.com@sourceware.cygnus.com Tue Feb 01 06:13:28 2000
Return-Path: <java-patches-return-428-listarch-java-patches=sourceware.cygnus.com@sourceware.cygnus.com>
Delivered-To: listarch-java-patches@sourceware.cygnus.com
Received: (qmail 28037 invoked by alias); 1 Feb 2000 06:13:27 -0000
Mailing-List: contact java-patches-help@sourceware.cygnus.com; run by ezmlm
Precedence: bulk
List-Subscribe: <mailto:java-patches-subscribe@sourceware.cygnus.com>
List-Archive: <http://sourceware.cygnus.com/ml/java-patches/>
List-Post: <mailto:java-patches@sourceware.cygnus.com>
List-Help: <mailto:java-patches-help@sourceware.cygnus.com>, <http://sourceware.cygnus.com/ml/#faqs>
Sender: java-patches-owner@sourceware.cygnus.com
Delivered-To: mailing list java-patches@sourceware.cygnus.com
Received: (qmail 27996 invoked from network); 1 Feb 2000 06:12:23 -0000
To: Java Patch List <java-patches@sourceware.cygnus.com> 
Subject: Patch: references for JNI
X-Zippy:  This PIZZA symbolizes my COMPLETE EMOTIONAL RECOVERY!!
X-Attribution:  Tom
Bcc:
Reply-To:  tromey@cygnus.com
From:  Tom Tromey <tromey@cygnus.com>
Date: 31 Jan 2000 23:15:13 -0700
Message-ID: <873drdtpn2.fsf@cygnus.com>
Lines: 688
X-Mailer: Gnus v5.5/Emacs 20.3

I'm committing the appended patch.  It adds support for global and
local references to our JNI implementation.  This implementation takes
a fairly miserable approach, but I don't think there is any point in
implementing anything better right now.  If we decide to allow for a
fully copying GC, then we're going to have to approach this
differently.  (One better implementation also requires revamping the
GC interface, but I'm not ready to do that yet either.)

2000-01-31  Tom Tromey  <tromey@cygnus.com>

	* prims.cc (_Jv_MallocUnchecked): New function.
	(main_init): Call _Jv_JNI_Init.
	* include/jvm.h (_Jv_MallocUnchecked): Declare.
	(_Jv_JNI_Init): Declare.
	* jni.cc: Include Hashtable.h, OutOfMemoryError.h, Integer.h,
	<string.h>.
	(_Jv_JNI_NewGlobalRef): New function.
	(_Jv_JNI_DeleteGlobalRef): New function.
	(_Jv_JNI_DeleteLocalRef): New function.
	(_Jv_JNI_conversion_call): Initialize and clear local reference
	frame.
	(_Jv_JNI_NewLocalRef): New function.
	(struct _Jv_JNI_LocalFrame): New structure.
	(_Jv_JNI_PushLocalFrame): New function.
	(_Jv_JNI_EnsureLocalCapacity): New function.
	(FRAME_SIZE): New define.
	(_Jv_JNI_GetStringChars): Mark string, not characters.
	(_Jv_JNI_ReleaseStringChars): Unmark string, not characters.
	(_Jv_JNI_GetPrimitiveArrayElements): Mark array, not elements.
	(_Jv_JNI_ReleasePrimitiveArrayElements): Unmark array, not
	elements.
	(_Jv_JNI_DefineClass): Make return value a local ref.
	(_Jv_JNI_FindClass): Likewise.
	(_Jv_JNI_GetSuperclass): Likewise.
	(_Jv_JNI_ExceptionOccurred): Likewise.
	(_Jv_JNI_AllocObject): Likewise.
	(_Jv_JNI_GetObjectClass): Likewise.
	(_Jv_JNI_CallAnyMethodV): Likewise.
	(_Jv_JNI_NewString): Likewise.
	(_Jv_JNI_NewStringUTF): Likewise.
	(_Jv_JNI_NewObjectArray): Likewise.
	(_Jv_JNI_GetObjectArrayElement): Likewise.
	(_Jv_JNI_ToReflectedField): Likewise.
	(_Jv_JNI_ToReflectedMethod): Likewise.
	(_Jv_JNIFunctions): Updated table for new functions.
	(_Jv_JNI_Init): New function.
	(mark_for_gc): Wrote.
	(unmark_for_gc): Wrote.
	* include/jni.h (struct JNINativeInterface): Removed name from
	PopLocalFrame parameter.
	(class _Jv_JNIEnv): Added `locals' field.

Tom

Index: prims.cc
===================================================================
RCS file: /cvs/java/libgcj/libjava/prims.cc,v
retrieving revision 1.19
diff -u -r1.19 prims.cc
--- prims.cc	2000/01/19 18:39:23	1.19
+++ prims.cc	2000/02/01 06:09:32
@@ -687,6 +687,8 @@
   sigemptyset (&act.sa_mask);
   act.sa_flags = 0;
   sigaction (SIGPIPE, &act, NULL);
+
+  _Jv_JNI_Init ();
 }
 
 #ifndef DISABLE_GETENV_PROPERTIES
@@ -914,6 +916,14 @@
 }
 
 
+
+void *
+_Jv_MallocUnchecked (jsize size)
+{
+  if (size == 0)
+    size = 1;
+  return malloc ((size_t) size);
+}
 
 void *
 _Jv_Malloc (jsize size)
Index: jni.cc
===================================================================
RCS file: /cvs/java/libgcj/libjava/jni.cc,v
retrieving revision 1.5
diff -u -r1.5 jni.cc
--- jni.cc	2000/01/26 23:56:36	1.5
+++ jni.cc	2000/02/01 06:09:37
@@ -17,6 +17,7 @@
 #include <config.h>
 
 #include <stddef.h>
+#include <string.h>
 
 // Define this before including jni.h.
 #define __GCJ_JNI_IMPL__
@@ -37,6 +38,9 @@
 #include <java/lang/reflect/Constructor.h>
 #include <java/lang/reflect/Method.h>
 #include <java/lang/reflect/Modifier.h>
+#include <java/lang/OutOfMemoryError.h>
+#include <java/util/Hashtable.h>
+#include <java/lang/Integer.h>
 
 #include <gcj/method.h>
 #include <gcj/field.h>
@@ -62,22 +66,204 @@
 // Forward declaration.
 extern struct JNINativeInterface _Jv_JNIFunctions;
 
+// Number of slots in the default frame.  The VM must allow at least
+// 16.
+#define FRAME_SIZE 32
+
+// This structure is used to keep track of local references.
+struct _Jv_JNI_LocalFrame
+{
+  // This is true if this frame object represents a pushed frame (eg
+  // from PushLocalFrame).
+  int marker :  1;
+
+  // Number of elements in frame.
+  int size   : 31;
+
+  // Next frame in chain.
+  _Jv_JNI_LocalFrame *next;
+
+  // The elements.  These are allocated using the C "struct hack".
+  jobject vec[0];
+};
+
+// This holds a reference count for all local and global references.
+static java::util::Hashtable *ref_table;
+
 
 
+void
+_Jv_JNI_Init (void)
+{
+  ref_table = new java::util::Hashtable;
+}
+
 // Tell the GC that a certain pointer is live.
 static void
-mark_for_gc (void *)
+mark_for_gc (jobject obj)
 {
-  // FIXME.
+  JvSynchronize sync (ref_table);
+
+  using namespace java::lang;
+  Integer *refcount = (Integer *) ref_table->get (obj);
+  jint val = (refcount == NULL) ? 0 : refcount->intValue ();
+  ref_table->put (obj, new Integer (val + 1));
 }
 
 // Unmark a pointer.
 static void
-unmark_for_gc (void *)
+unmark_for_gc (jobject obj)
 {
-  // FIXME.
+  JvSynchronize sync (ref_table);
+
+  using namespace java::lang;
+  Integer *refcount = (Integer *) ref_table->get (obj);
+  JvAssert (refcount);
+  jint val = refcount->intValue () - 1;
+  if (val == 0)
+    ref_table->remove (obj);
+  else
+    ref_table->put (obj, new Integer (val));
+}
+
+
+
+static jobject
+_Jv_JNI_NewGlobalRef (JNIEnv *, jobject obj)
+{
+  mark_for_gc (obj);
+  return obj;
+}
+
+static void
+_Jv_JNI_DeleteGlobalRef (JNIEnv *, jobject obj)
+{
+  unmark_for_gc (obj);
+}
+
+static void
+_Jv_JNI_DeleteLocalRef (JNIEnv *env, jobject obj)
+{
+  _Jv_JNI_LocalFrame *frame;
+
+  for (frame = env->locals; frame != NULL; frame = frame->next)
+    {
+      for (int i = 0; i < FRAME_SIZE; ++i)
+	{
+	  if (frame->vec[i] == obj)
+	    {
+	      frame->vec[i] = NULL;
+	      unmark_for_gc (obj);
+	      return;
+	    }
+	}
+
+      // Don't go past a marked frame.
+      JvAssert (! frame->marker);
+    }
+
+  JvAssert (0);
+}
+
+static jint
+_Jv_JNI_EnsureLocalCapacity (JNIEnv *env, jint size)
+{
+  // It is easier to just always allocate a new frame of the requested
+  // size.  This isn't the most efficient thing, but for now we don't
+  // care.  Note that _Jv_JNI_PushLocalFrame relies on this right now.
+
+  _Jv_JNI_LocalFrame *frame
+    = (_Jv_JNI_LocalFrame *) _Jv_MallocUnchecked (sizeof (_Jv_JNI_LocalFrame)
+						  + size * sizeof (jobject));
+  if (frame == NULL)
+    {
+      // FIXME: exception processing.
+      env->ex = new java::lang::OutOfMemoryError;
+      return -1;
+    }
+
+  frame->marker = true;
+  frame->size = size;
+  memset (&frame->vec[0], 0, size * sizeof (jobject));
+  frame->next = env->locals;
+  env->locals = frame;
+
+  return 0;
 }
 
+static jint
+_Jv_JNI_PushLocalFrame (JNIEnv *env, jint size)
+{
+  jint r = _Jv_JNI_EnsureLocalCapacity (env, size);
+  if (r < 0)
+    return r;
+
+  // The new frame is on top.
+  env->locals->marker = true;
+
+  return 0;
+}
+
+static jobject
+_Jv_JNI_NewLocalRef (JNIEnv *env, jobject obj)
+{
+  // Try to find an open slot somewhere in the topmost frame.
+  _Jv_JNI_LocalFrame *frame = env->locals;
+  bool done = false, set = false;
+  while (frame != NULL && ! done)
+    {
+      for (int i = 0; i < frame->size; ++i)
+	if (frame->vec[i] == NULL)
+	  {
+	    set = true;
+	    done = true;
+	    frame->vec[i] = obj;
+	    break;
+	  }
+    }
+
+  if (! set)
+    {
+      // No slots, so we allocate a new frame.  According to the spec
+      // we could just die here.  FIXME: return value.
+      _Jv_JNI_EnsureLocalCapacity (env, 16);
+      // We know the first element of the new frame will be ok.
+      env->locals->vec[0] = obj;
+    }
+
+  mark_for_gc (obj);
+  return obj;
+}
+
+static jobject
+_Jv_JNI_PopLocalFrame (JNIEnv *env, jobject result)
+{
+  _Jv_JNI_LocalFrame *rf = env->locals;
+
+  bool done = false;
+  while (rf != NULL && ! done)
+    {  
+      for (int i = 0; i < rf->size; ++i)
+	if (rf->vec[i] != NULL)
+	  unmark_for_gc (rf->vec[i]);
+
+      // If the frame we just freed is the marker frame, we are done.
+      done = rf->marker;
+
+      _Jv_JNI_LocalFrame *n = rf->next;
+      // When N==NULL, we've reached the stack-allocated frame, and we
+      // must not free it.  However, we must be sure to clear all its
+      // elements, since we might conceivably reuse it.
+      if (n == NULL)
+	memset (&rf->vec[0], 0, rf->size * sizeof (jobject));
+      else
+	_Jv_Free (rf);
+      rf = n;
+    }
+
+  return result == NULL ? NULL : _Jv_JNI_NewLocalRef (env, result);
+}
+
 
 
 static jint
@@ -87,7 +273,7 @@
 }
 
 static jclass
-_Jv_JNI_DefineClass (JNIEnv *, jobject loader, 
+_Jv_JNI_DefineClass (JNIEnv *env, jobject loader, 
 		     const jbyte *buf, jsize bufLen)
 {
   jbyteArray bytes = JvNewByteArray (bufLen);
@@ -99,7 +285,7 @@
 
   // FIXME: exception processing.
   jclass result = l->defineClass (bytes, 0, bufLen);
-  return result;
+  return (jclass) _Jv_JNI_NewLocalRef (env, result);
 }
 
 static jclass
@@ -125,13 +311,13 @@
   // FIXME: exception processing.
   jclass r = loader->findClass (n);
 
-  return r;
+  return (jclass) _Jv_JNI_NewLocalRef (env, r);
 }
 
 static jclass
-_Jv_JNI_GetSuperclass (JNIEnv *, jclass clazz)
+_Jv_JNI_GetSuperclass (JNIEnv *env, jclass clazz)
 {
-  return clazz->getSuperclass ();
+  return (jclass) _Jv_JNI_NewLocalRef (env, clazz->getSuperclass ());
 }
 
 static jboolean
@@ -175,8 +361,7 @@
 static jthrowable
 _Jv_JNI_ExceptionOccurred (JNIEnv *env)
 {
-  // FIXME: create local reference.
-  return env->ex;
+  return (jthrowable) _Jv_JNI_NewLocalRef (env, env->ex);
 }
 
 static void
@@ -204,6 +389,8 @@
   JvFail (message);
 }
 
+
+
 static jboolean
 _Jv_JNI_IsSameObject (JNIEnv *, jobject obj1, jobject obj2)
 {
@@ -224,13 +411,13 @@
       obj = JvAllocObject (clazz);
     }
 
-  return obj;
+  return _Jv_JNI_NewLocalRef (env, obj);
 }
 
 static jclass
-_Jv_JNI_GetObjectClass (JNIEnv *, jobject obj)
+_Jv_JNI_GetObjectClass (JNIEnv *env, jobject obj)
 {
-  return obj->getClass();
+  return (jclass) _Jv_JNI_NewLocalRef (env, obj->getClass());
 }
 
 static jboolean
@@ -346,6 +533,14 @@
   if (ex != NULL)
     env->ex = ex;
 
+  if (! return_type->isPrimitive ())
+    {
+      // Make sure we create a local reference.  The cast hackery is
+      // to avoid problems for template instantations we know won't be
+      // used.
+      return (T) (long long) _Jv_JNI_NewLocalRef (env, result.l);
+    }
+
   // We cheat a little here.  FIXME.
   return * (T *) &result;
 }
@@ -390,6 +585,14 @@
   if (ex != NULL)
     env->ex = ex;
 
+  if (! return_type->isPrimitive ())
+    {
+      // Make sure we create a local reference.  The cast hackery is
+      // to avoid problems for template instantations we know won't be
+      // used.
+      return (T) (long long) _Jv_JNI_NewLocalRef (env, result.l);
+    }
+
   // We cheat a little here.  FIXME.
   return * (T *) &result;
 }
@@ -608,6 +811,7 @@
 
 
 
+// FIXME: local reference
 template<typename T>
 static T
 _Jv_JNI_GetField (JNIEnv *, jobject obj, jfieldID field) 
@@ -675,6 +879,7 @@
   return NULL;
 }
 
+// FIXME: local reference
 template<typename T>
 static T
 _Jv_JNI_GetStaticField (JNIEnv *, jclass, jfieldID field)
@@ -692,11 +897,11 @@
 }
 
 static jstring
-_Jv_JNI_NewString (JNIEnv *, const jchar *unichars, jsize len)
+_Jv_JNI_NewString (JNIEnv *env, const jchar *unichars, jsize len)
 {
   // FIXME: exception processing.
   jstring r = _Jv_NewString (unichars, len);
-  return r;
+  return (jstring) _Jv_JNI_NewLocalRef (env, r);
 }
 
 static jsize
@@ -709,24 +914,24 @@
 _Jv_JNI_GetStringChars (JNIEnv *, jstring string, jboolean *isCopy)
 {
   jchar *result = _Jv_GetStringChars (string);
-  mark_for_gc (result);
+  mark_for_gc (string);
   if (isCopy)
     *isCopy = false;
   return (const jchar *) result;
 }
 
 static void
-_Jv_JNI_ReleaseStringChars (JNIEnv *, jstring, const jchar *chars)
+_Jv_JNI_ReleaseStringChars (JNIEnv *, jstring string, const jchar *)
 {
-  unmark_for_gc ((void *) chars);
+  unmark_for_gc (string);
 }
 
 static jstring
-_Jv_JNI_NewStringUTF (JNIEnv *, const char *bytes)
+_Jv_JNI_NewStringUTF (JNIEnv *env, const char *bytes)
 {
   // FIXME: exception processing.
-  jstring r = JvNewStringUTF (bytes);
-  return r;
+  jstring result = JvNewStringUTF (bytes);
+  return (jstring) _Jv_JNI_NewLocalRef (env, result);
 }
 
 static jsize
@@ -801,19 +1006,19 @@
 }
 
 static jarray
-_Jv_JNI_NewObjectArray (JNIEnv *, jsize length, jclass elementClass,
+_Jv_JNI_NewObjectArray (JNIEnv *env, jsize length, jclass elementClass,
 			jobject init)
 {
   // FIXME: exception processing.
   jarray result = JvNewObjectArray (length, elementClass, init);
-  return result;
+  return (jarray) _Jv_JNI_NewLocalRef (env, result);
 }
 
 static jobject
-_Jv_JNI_GetObjectArrayElement (JNIEnv *, jobjectArray array, jsize index)
+_Jv_JNI_GetObjectArrayElement (JNIEnv *env, jobjectArray array, jsize index)
 {
   jobject *elts = elements (array);
-  return elts[index];
+  return _Jv_JNI_NewLocalRef (env, elts[index]);
 }
 
 static void
@@ -828,9 +1033,11 @@
 
 template<typename T, jclass K>
 static JArray<T> *
-_Jv_JNI_NewPrimitiveArray (JNIEnv *, jsize length)
+_Jv_JNI_NewPrimitiveArray (JNIEnv *env, jsize length)
 {
-  return (JArray<T> *) _Jv_NewPrimArray (K, length);
+  // FIXME: exception processing.
+  return (JArray<T> *) _Jv_JNI_NewLocalRef (env,
+					    _Jv_NewPrimArray (K, length));
 }
 
 template<typename T>
@@ -844,19 +1051,19 @@
       // We elect never to copy.
       *isCopy = false;
     }
-  mark_for_gc (elts);
+  mark_for_gc (array);
   return elts;
 }
 
 template<typename T>
 static void
-_Jv_JNI_ReleasePrimitiveArrayElements (JNIEnv *, JArray<T> *,
-				       T *elems, jint /* mode */)
+_Jv_JNI_ReleasePrimitiveArrayElements (JNIEnv *, JArray<T> *array,
+				       T *, jint /* mode */)
 {
   // Note that we ignore MODE.  We can do this because we never copy
   // the array elements.  My reading of the JNI documentation is that
   // this is an option for the implementor.
-  unmark_for_gc (elems);
+  unmark_for_gc (array);
 }
 
 template<typename T>
@@ -931,7 +1138,7 @@
 
 // JDK 1.2
 jobject
-_Jv_JNI_ToReflectedField (JNIEnv *, jclass cls, jfieldID fieldID,
+_Jv_JNI_ToReflectedField (JNIEnv *env, jclass cls, jfieldID fieldID,
 			  jboolean)
 {
   // FIXME: exception processing.
@@ -939,8 +1146,7 @@
   field->declaringClass = cls;
   field->offset = (char*) fieldID - (char *) cls->fields;
   field->name = _Jv_NewStringUtf8Const (fieldID->getNameUtf8Const (cls));
-  // FIXME: make a local reference.
-  return field;
+  return _Jv_JNI_NewLocalRef (env, field);
 }
 
 // JDK 1.2
@@ -954,7 +1160,7 @@
 }
 
 jobject
-_Jv_JNI_ToReflectedMethod (JNIEnv *, jclass klass, jmethodID id,
+_Jv_JNI_ToReflectedMethod (JNIEnv *env, jclass klass, jmethodID id,
 			   jboolean)
 {
   using namespace java::lang::reflect;
@@ -979,8 +1185,7 @@
       result = meth;
     }
 
-  // FIXME: make a local reference.
-  return result;
+  return _Jv_JNI_NewLocalRef (env, result);
 }
 
 static jmethodID
@@ -1003,13 +1208,26 @@
 _Jv_JNI_conversion_call (fixme)
 {
   JNIEnv env;
+  _Jv_JNI_LocalFrame *frame
+    = (_Jv_JNI_LocalFrame *) alloca (sizeof (_Jv_JNI_LocalFrame)
+				     + FRAME_SIZE * sizeof (jobject));
 
   env.p = &_Jv_JNIFunctions;
   env.ex = NULL;
   env.klass = FIXME;
+  env.locals = frame;
 
+  frame->marker = true;
+  frame->next = NULL;
+  frame->size = FRAME_SIZE;
+  for (int i = 0; i < frame->size; ++i)
+    frame->vec[i] = NULL;
+
   T result = FIXME_ffi_call (args);
 
+  while (env.locals != NULL)
+    _Jv_JNI_PopLocalFrame (&env, result);
+
   if (env.ex)
     JvThrow (env.ex);
 
@@ -1043,14 +1261,18 @@
   _Jv_JNI_ExceptionDescribe,
   _Jv_JNI_ExceptionClear,
   _Jv_JNI_FatalError,
-  NOT_IMPL,
-  NOT_IMPL,
-  NOT_IMPL /* NewGlobalRef */,
-  NOT_IMPL /* DeleteGlobalRef */,
-  NOT_IMPL /* DeleteLocalRef */,
+
+  _Jv_JNI_PushLocalFrame,
+  _Jv_JNI_PopLocalFrame,
+  _Jv_JNI_NewGlobalRef,
+  _Jv_JNI_DeleteGlobalRef,
+  _Jv_JNI_DeleteLocalRef,
+
   _Jv_JNI_IsSameObject,
-  NOT_IMPL,
-  NOT_IMPL,
+
+  _Jv_JNI_NewLocalRef,
+  _Jv_JNI_EnsureLocalCapacity,
+
   _Jv_JNI_AllocObject,
   _Jv_JNI_NewObject,
   _Jv_JNI_NewObjectV,
Index: include/jni.h
===================================================================
RCS file: /cvs/java/libgcj/libjava/include/jni.h,v
retrieving revision 1.6
diff -u -r1.6 jni.h
--- jni.h	2000/01/26 23:56:36	1.6
+++ jni.h	2000/02/01 06:09:41
@@ -133,7 +133,7 @@
   void     (*FatalError)                   (JNIEnv *, const char *);
 
   jint     (*PushLocalFrame)		   (JNIEnv *, jint);
-  jobject  (*PopLocalFrame)		   (JNIEnv *, jobject result);
+  jobject  (*PopLocalFrame)		   (JNIEnv *, jobject);
 
   jobject  (*NewGlobalRef)                 (JNIEnv *, jobject);
   void     (*DeleteGlobalRef)              (JNIEnv *, jobject);
@@ -537,6 +537,9 @@
 
   /* The class of the current native method.  */
   jclass klass;
+
+  /* The chain of local frames.  */
+  struct _Jv_JNI_LocalFrame *locals;
 
 public:
   jclass GetSuperclass (jclass cl)
Index: include/jvm.h
===================================================================
RCS file: /cvs/java/libgcj/libjava/include/jvm.h,v
retrieving revision 1.12
diff -u -r1.12 jvm.h
--- jvm.h	2000/01/21 23:50:31	1.12
+++ jvm.h	2000/02/01 06:09:42
@@ -72,6 +72,10 @@
 /* Register a finalizer.  */
 void _Jv_RegisterFinalizer (void *object, _Jv_FinalizerFunc *method);
 
+/* Allocate some unscanned, unmoveable memory.  Return NULL if out of
+   memory.  */
+void *_Jv_MallocUnchecked (jsize size) __attribute__((__malloc__));
+
 /* Run finalizers for objects ready to be finalized..  */
 void _Jv_RunFinalizers (void);
 /* Run all finalizers.  Should be called only before exit.  */
@@ -196,5 +200,9 @@
 /* get/set the name of the running executable. */
 extern char *_Jv_ThisExecutable (void);
 extern void _Jv_ThisExecutable (const char *);
+
+/* Initialize JNI.  */
+extern void _Jv_JNI_Init (void);
+
 
 #endif /* __JAVA_JVM_H__ */

From java-patches-return-429-listarch-java-patches=sourceware.cygnus.com@sourceware.cygnus.com Tue Feb 01 16:31:30 2000
Return-Path: <java-patches-return-429-listarch-java-patches=sourceware.cygnus.com@sourceware.cygnus.com>
Delivered-To: listarch-java-patches@sourceware.cygnus.com
Received: (qmail 27761 invoked by alias); 1 Feb 2000 16:31:29 -0000
Mailing-List: contact java-patches-help@sourceware.cygnus.com; run by ezmlm
Precedence: bulk
List-Subscribe: <mailto:java-patches-subscribe@sourceware.cygnus.com>
List-Archive: <http://sourceware.cygnus.com/ml/java-patches/>
List-Post: <mailto:java-patches@sourceware.cygnus.com>
List-Help: <mailto:java-patches-help@sourceware.cygnus.com>, <http://sourceware.cygnus.com/ml/#faqs>
Sender: java-patches-owner@sourceware.cygnus.com
Delivered-To: mailing list java-patches@sourceware.cygnus.com
Received: (qmail 27724 invoked from network); 1 Feb 2000 16:31:18 -0000
To: Java Patch List <java-patches@sourceware.cygnus.com> 
Subject: Patch: local references and GetField
X-Zippy:  They don't hire PERSONAL PINHEADS, Mr. Toad!
X-Attribution:  Tom
Bcc:
Reply-To:  tromey@cygnus.com
From:  Tom Tromey <tromey@cygnus.com>
Date: 01 Feb 2000 09:33:55 -0700
Message-ID: <871z6wubkc.fsf@cygnus.com>
Lines: 55
X-Mailer: Gnus v5.5/Emacs 20.3

I'm committing the appended patch.
It adds local reference support to the two places it was missing.

2000-02-01  Tom Tromey  <tromey@cygnus.com>

	* jni.cc (_Jv_JNI_GetField): Specialize for jobject.
	(_Jv_JNI_GetStaticField): Likewise.

Tom

Index: jni.cc
===================================================================
RCS file: /cvs/java/libgcj/libjava/jni.cc,v
retrieving revision 1.6
diff -u -r1.6 jni.cc
--- jni.cc	2000/02/01 06:14:25	1.6
+++ jni.cc	2000/02/01 16:29:25
@@ -811,7 +811,6 @@
 
 
 
-// FIXME: local reference
 template<typename T>
 static T
 _Jv_JNI_GetField (JNIEnv *, jobject obj, jfieldID field) 
@@ -820,6 +819,14 @@
   return *ptr;
 }
 
+template<>
+static jobject
+_Jv_JNI_GetField<jobject> (JNIEnv *env, jobject obj, jfieldID field)
+{
+  jobject *ptr = (jobject *) ((char *) obj + field->getOffset ());
+  return _Jv_JNI_NewLocalRef (env, *ptr);
+}
+
 template<typename T>
 static void
 _Jv_JNI_SetField (JNIEnv *, jobject obj, jfieldID field, T value)
@@ -886,6 +893,14 @@
 {
   T *ptr = (T *) field->u.addr;
   return *ptr;
+}
+
+template<>
+static jobject
+_Jv_JNI_GetStaticField<jobject> (JNIEnv *env, jclass, jfieldID field)
+{
+  jobject *ptr = (jobject *) field->u.addr;
+  return _Jv_JNI_NewLocalRef (env, *ptr);
 }
 
 template<typename T>

From java-patches-return-430-listarch-java-patches=sourceware.cygnus.com@sourceware.cygnus.com Tue Feb 01 17:33:15 2000
Return-Path: <java-patches-return-430-listarch-java-patches=sourceware.cygnus.com@sourceware.cygnus.com>
Delivered-To: listarch-java-patches@sourceware.cygnus.com
Received: (qmail 10322 invoked by alias); 1 Feb 2000 17:33:15 -0000
Mailing-List: contact java-patches-help@sourceware.cygnus.com; run by ezmlm
Precedence: bulk
List-Subscribe: <mailto:java-patches-subscribe@sourceware.cygnus.com>
List-Archive: <http://sourceware.cygnus.com/ml/java-patches/>
List-Post: <mailto:java-patches@sourceware.cygnus.com>
List-Help: <mailto:java-patches-help@sourceware.cygnus.com>, <http://sourceware.cygnus.com/ml/#faqs>
Sender: java-patches-owner@sourceware.cygnus.com
Delivered-To: mailing list java-patches@sourceware.cygnus.com
Received: (qmail 10300 invoked from network); 1 Feb 2000 17:33:03 -0000
To: Java Patch List <java-patches@sourceware.cygnus.com> 
Subject: Patch: local reference bug fixes
X-Zippy:  They don't hire PERSONAL PINHEADS, Mr. Toad!
X-Attribution:  Tom
Bcc:
Reply-To:  tromey@cygnus.com
From:  Tom Tromey <tromey@cygnus.com>
Date: 01 Feb 2000 10:36:30 -0700
Message-ID: <87ya94su3l.fsf@cygnus.com>
Lines: 159
X-Mailer: Gnus v5.5/Emacs 20.3

I'm committing the appended patch.

It makes a minor change to how PopLocalFrame works, and it introduces
a cleaner method for wrapping object returns as local references.

2000-02-01  Tom Tromey  <tromey@cygnus.com>

	* jni.cc (_Jv_JNI_PopLocalFrame): Leave loop when `n == NULL'.
	(_Jv_JNI_conversion_call): _Jv_JNI_PopLocalFrame will never leave
	`locals == NULL'.
	(wrap_value): New function.
	(_Jv_JNI_CallAnyMethodV): Use it.
	(_Jv_JNI_CallAnyMethodA): Likewise.
	(_Jv_JNI_GetField): Use wrap_value; removed specialized version.
	(_Jv_JNI_GetStaticField): Likewise.

Tom

Index: jni.cc
===================================================================
RCS file: /cvs/java/libgcj/libjava/jni.cc,v
retrieving revision 1.7
diff -u -r1.7 jni.cc
--- jni.cc	2000/02/01 16:32:21	1.7
+++ jni.cc	2000/02/01 17:30:54
@@ -255,15 +255,35 @@
       // must not free it.  However, we must be sure to clear all its
       // elements, since we might conceivably reuse it.
       if (n == NULL)
-	memset (&rf->vec[0], 0, rf->size * sizeof (jobject));
-      else
-	_Jv_Free (rf);
+	{
+	  memset (&rf->vec[0], 0, rf->size * sizeof (jobject));
+	  break;
+	}
+
+      _Jv_Free (rf);
       rf = n;
     }
 
   return result == NULL ? NULL : _Jv_JNI_NewLocalRef (env, result);
 }
 
+// This function is used from other template functions.  It wraps the
+// return value appropriately; we specialize it so that object returns
+// are turned into local references.
+template<typename T>
+static T
+wrap_value (JNIEnv *, T value)
+{
+  return value;
+}
+
+template<>
+static jobject
+wrap_value (JNIEnv *env, jobject value)
+{
+  return _Jv_JNI_NewLocalRef (env, value);
+}
+
 
 
 static jint
@@ -533,16 +553,8 @@
   if (ex != NULL)
     env->ex = ex;
 
-  if (! return_type->isPrimitive ())
-    {
-      // Make sure we create a local reference.  The cast hackery is
-      // to avoid problems for template instantations we know won't be
-      // used.
-      return (T) (long long) _Jv_JNI_NewLocalRef (env, result.l);
-    }
-
   // We cheat a little here.  FIXME.
-  return * (T *) &result;
+  return wrap_value (env, * (T *) &result);
 }
 
 template<typename T, invocation_type style>
@@ -585,16 +597,8 @@
   if (ex != NULL)
     env->ex = ex;
 
-  if (! return_type->isPrimitive ())
-    {
-      // Make sure we create a local reference.  The cast hackery is
-      // to avoid problems for template instantations we know won't be
-      // used.
-      return (T) (long long) _Jv_JNI_NewLocalRef (env, result.l);
-    }
-
   // We cheat a little here.  FIXME.
-  return * (T *) &result;
+  return wrap_value (env, * (T *) &result);
 }
 
 template<invocation_type style>
@@ -813,18 +817,10 @@
 
 template<typename T>
 static T
-_Jv_JNI_GetField (JNIEnv *, jobject obj, jfieldID field) 
+_Jv_JNI_GetField (JNIEnv *env, jobject obj, jfieldID field) 
 {
   T *ptr = (T *) ((char *) obj + field->getOffset ());
-  return *ptr;
-}
-
-template<>
-static jobject
-_Jv_JNI_GetField<jobject> (JNIEnv *env, jobject obj, jfieldID field)
-{
-  jobject *ptr = (jobject *) ((char *) obj + field->getOffset ());
-  return _Jv_JNI_NewLocalRef (env, *ptr);
+  return wrap_value (env, *ptr);
 }
 
 template<typename T>
@@ -886,21 +882,12 @@
   return NULL;
 }
 
-// FIXME: local reference
 template<typename T>
 static T
-_Jv_JNI_GetStaticField (JNIEnv *, jclass, jfieldID field)
+_Jv_JNI_GetStaticField (JNIEnv *env, jclass, jfieldID field)
 {
   T *ptr = (T *) field->u.addr;
-  return *ptr;
-}
-
-template<>
-static jobject
-_Jv_JNI_GetStaticField<jobject> (JNIEnv *env, jclass, jfieldID field)
-{
-  jobject *ptr = (jobject *) field->u.addr;
-  return _Jv_JNI_NewLocalRef (env, *ptr);
+  return wrap_value (env, *ptr);
 }
 
 template<typename T>
@@ -1240,8 +1227,11 @@
 
   T result = FIXME_ffi_call (args);
 
-  while (env.locals != NULL)
-    _Jv_JNI_PopLocalFrame (&env, result);
+  do
+    {
+      _Jv_JNI_PopLocalFrame (&env, result);
+    }
+  while (env.locals != frame);
 
   if (env.ex)
     JvThrow (env.ex);

From java-patches-return-431-listarch-java-patches=sourceware.cygnus.com@sourceware.cygnus.com Tue Feb 01 21:05:13 2000
Return-Path: <java-patches-return-431-listarch-java-patches=sourceware.cygnus.com@sourceware.cygnus.com>
Delivered-To: listarch-java-patches@sourceware.cygnus.com
Received: (qmail 16623 invoked by alias); 1 Feb 2000 21:05:12 -0000
Mailing-List: contact java-patches-help@sourceware.cygnus.com; run by ezmlm
Precedence: bulk
List-Subscribe: <mailto:java-patches-subscribe@sourceware.cygnus.com>
List-Archive: <http://sourceware.cygnus.com/ml/java-patches/>
List-Post: <mailto:java-patches@sourceware.cygnus.com>
List-Help: <mailto:java-patches-help@sourceware.cygnus.com>, <http://sourceware.cygnus.com/ml/#faqs>
Sender: java-patches-owner@sourceware.cygnus.com
Delivered-To: mailing list java-patches@sourceware.cygnus.com
Received: (qmail 16504 invoked from network); 1 Feb 2000 21:03:51 -0000
To: Java Patch List <java-patches@sourceware.cygnus.com> 
Subject: Patch: C++ -vs- jni.h
X-Zippy:  Everybody is going somewhere!!  It's probably a garage sale
 or a disaster Movie!!
X-Attribution:  Tom
Bcc:
Reply-To:  tromey@cygnus.com
From:  Tom Tromey <tromey@cygnus.com>
Date: 01 Feb 2000 14:05:40 -0700
Message-ID: <87wvooskez.fsf@cygnus.com>
Lines: 885
X-Mailer: Gnus v5.5/Emacs 20.3

I'm committing this patch.  It adds inline member functions for all
JNI calls to the _Jv_JNIEnv class.

2000-02-01  Tom Tromey  <tromey@cygnus.com>

	* include/jni.h (class _Jv_JNIEnv): Added all C++ inline methods.
Tom

Index: include/jni.h
===================================================================
RCS file: /cvs/java/libgcj/libjava/include/jni.h,v
retrieving revision 1.7
diff -u -r1.7 jni.h
--- jni.h	2000/02/01 06:14:26	1.7
+++ jni.h	2000/02/01 21:00:25
@@ -542,13 +542,864 @@
   struct _Jv_JNI_LocalFrame *locals;
 
 public:
-  jclass GetSuperclass (jclass cl)
-  { return p->GetSuperclass (this, cl); }
+  jint GetVersion ()
+  { return p->GetVersion (this); }
 
-  jsize GetStringLength (jstring str)
-  { return p->GetStringLength (this, str); }
-};
+  jclass DefineClass (jobject obj0, const jbyte * val1, jsize val2)
+  { return p->DefineClass (this, obj0, val1, val2); }
+
+  jclass FindClass (const char * val0)
+  { return p->FindClass (this, val0); }
+
+  jmethodID FromReflectedMethod (jobject obj0)
+  { return p->FromReflectedMethod (this, obj0); }
+
+  jfieldID FromReflectedField (jobject obj0)
+  { return p->FromReflectedField (this, obj0); }
+
+  jobject ToReflectedMethod (jclass cl0, jmethodID meth1, jboolean val2)
+  { return p->ToReflectedMethod (this, cl0, meth1, val2); }
+
+  jclass GetSuperclass (jclass cl0)
+  { return p->GetSuperclass (this, cl0); }
+
+  jboolean IsAssignableFrom (jclass cl0, jclass cl1)
+  { return p->IsAssignableFrom (this, cl0, cl1); }
+
+  jobject ToReflectedField (jclass cl0, jfieldID fld1, jboolean val2)
+  { return p->ToReflectedField (this, cl0, fld1, val2); }
+
+  jint Throw (jthrowable val0)
+  { return p->Throw (this, val0); }
+
+  jint ThrowNew (jclass cl0, const char * val1)
+  { return p->ThrowNew (this, cl0, val1); }
+
+  jthrowable ExceptionOccurred ()
+  { return p->ExceptionOccurred (this); }
+
+  void ExceptionDescribe ()
+  { p->ExceptionDescribe (this); }
+
+  void ExceptionClear ()
+  { p->ExceptionClear (this); }
+
+  void FatalError (const char * val0)
+  { p->FatalError (this, val0); }
+
+  jint PushLocalFrame (jint val0)
+  { return p->PushLocalFrame (this, val0); }
+
+  jobject PopLocalFrame (jobject obj0)
+  { return p->PopLocalFrame (this, obj0); }
+
+  jobject NewGlobalRef (jobject obj0)
+  { return p->NewGlobalRef (this, obj0); }
+
+  void DeleteGlobalRef (jobject obj0)
+  { p->DeleteGlobalRef (this, obj0); }
+
+  void DeleteLocalRef (jobject obj0)
+  { p->DeleteLocalRef (this, obj0); }
+
+  jboolean IsSameObject (jobject obj0, jobject obj1)
+  { return p->IsSameObject (this, obj0, obj1); }
+
+  jobject NewLocalRef (jobject obj0)
+  { return p->NewLocalRef (this, obj0); }
+
+  jint EnsureLocalCapacity (jint val0)
+  { return p->EnsureLocalCapacity (this, val0); }
+
+  jobject AllocObject (jclass cl0)
+  { return p->AllocObject (this, cl0); }
+
+  jobject NewObject (jclass cl0, jmethodID meth1, ...)
+  {
+    _Jv_va_list args;
+    va_start (args, meth1);
+    jobject result = p->NewObjectV (this, cl0, meth1, args);
+    va_end (args);
+    return result;
+  }
+
+  jobject NewObjectV (jclass cl0, jmethodID meth1, _Jv_va_list val2)
+  { return p->NewObjectV (this, cl0, meth1, val2); }
+
+  jobject NewObjectA (jclass cl0, jmethodID meth1, jvalue * val2)
+  { return p->NewObjectA (this, cl0, meth1, val2); }
+
+  jclass GetObjectClass (jobject obj0)
+  { return p->GetObjectClass (this, obj0); }
+
+  jboolean IsInstanceOf (jobject obj0, jclass cl1)
+  { return p->IsInstanceOf (this, obj0, cl1); }
+
+  jmethodID GetMethodID (jclass cl0, const char * val1, const char * val2)
+  { return p->GetMethodID (this, cl0, val1, val2); }
+
+  jobject CallObjectMethod (jobject obj0, jmethodID meth1, ...)
+  {
+    _Jv_va_list args;
+    va_start (args, meth1);
+    jobject result = p->CallObjectMethodV (this, obj0, meth1, args);
+    va_end (args);
+    return result;
+  }
+
+  jobject CallObjectMethodV (jobject obj0, jmethodID meth1, _Jv_va_list val2)
+  { return p->CallObjectMethodV (this, obj0, meth1, val2); }
+
+  jobject CallObjectMethodA (jobject obj0, jmethodID meth1, jvalue * val2)
+  { return p->CallObjectMethodA (this, obj0, meth1, val2); }
+
+  jboolean CallBooleanMethod (jobject obj0, jmethodID meth1, ...)
+  {
+    _Jv_va_list args;
+    va_start (args, meth1);
+    jboolean result = p->CallBooleanMethodV (this, obj0, meth1, args);
+    va_end (args);
+    return result;
+  }
+
+  jboolean CallBooleanMethodV (jobject obj0, jmethodID meth1, _Jv_va_list val2)
+  { return p->CallBooleanMethodV (this, obj0, meth1, val2); }
+
+  jboolean CallBooleanMethodA (jobject obj0, jmethodID meth1, jvalue * val2)
+  { return p->CallBooleanMethodA (this, obj0, meth1, val2); }
+
+  jbyte CallByteMethod (jobject obj0, jmethodID meth1, ...)
+  {
+    _Jv_va_list args;
+    va_start (args, meth1);
+    jbyte result = p->CallByteMethodV (this, obj0, meth1, args);
+    va_end (args);
+    return result;
+  }
+
+  jbyte CallByteMethodV (jobject obj0, jmethodID meth1, _Jv_va_list val2)
+  { return p->CallByteMethodV (this, obj0, meth1, val2); }
+
+  jbyte CallByteMethodA (jobject obj0, jmethodID meth1, jvalue * val2)
+  { return p->CallByteMethodA (this, obj0, meth1, val2); }
+
+  jchar CallCharMethod (jobject obj0, jmethodID meth1, ...)
+  {
+    _Jv_va_list args;
+    va_start (args, meth1);
+    jchar result = p->CallCharMethodV (this, obj0, meth1, args);
+    va_end (args);
+    return result;
+  }
+
+  jchar CallCharMethodV (jobject obj0, jmethodID meth1, _Jv_va_list val2)
+  { return p->CallCharMethodV (this, obj0, meth1, val2); }
+
+  jchar CallCharMethodA (jobject obj0, jmethodID meth1, jvalue * val2)
+  { return p->CallCharMethodA (this, obj0, meth1, val2); }
+
+  jshort CallShortMethod (jobject obj0, jmethodID meth1, ...)
+  {
+    _Jv_va_list args;
+    va_start (args, meth1);
+    jshort result = p->CallShortMethodV (this, obj0, meth1, args);
+    va_end (args);
+    return result;
+  }
+
+  jshort CallShortMethodV (jobject obj0, jmethodID meth1, _Jv_va_list val2)
+  { return p->CallShortMethodV (this, obj0, meth1, val2); }
+
+  jshort CallShortMethodA (jobject obj0, jmethodID meth1, jvalue * val2)
+  { return p->CallShortMethodA (this, obj0, meth1, val2); }
+
+  jint CallIntMethod (jobject obj0, jmethodID meth1, ...)
+  {
+    _Jv_va_list args;
+    va_start (args, meth1);
+    jint result = p->CallIntMethodV (this, obj0, meth1, args);
+    va_end (args);
+    return result;
+  }
+
+  jint CallIntMethodV (jobject obj0, jmethodID meth1, _Jv_va_list val2)
+  { return p->CallIntMethodV (this, obj0, meth1, val2); }
+
+  jint CallIntMethodA (jobject obj0, jmethodID meth1, jvalue * val2)
+  { return p->CallIntMethodA (this, obj0, meth1, val2); }
+
+  jlong CallLongMethod (jobject obj0, jmethodID meth1, ...)
+  {
+    _Jv_va_list args;
+    va_start (args, meth1);
+    jlong result = p->CallLongMethodV (this, obj0, meth1, args);
+    va_end (args);
+    return result;
+  }
+
+  jlong CallLongMethodV (jobject obj0, jmethodID meth1, _Jv_va_list val2)
+  { return p->CallLongMethodV (this, obj0, meth1, val2); }
+
+  jlong CallLongMethodA (jobject obj0, jmethodID meth1, jvalue * val2)
+  { return p->CallLongMethodA (this, obj0, meth1, val2); }
+
+  jfloat CallFloatMethod (jobject obj0, jmethodID meth1, ...)
+  {
+    _Jv_va_list args;
+    va_start (args, meth1);
+    jfloat result = p->CallFloatMethodV (this, obj0, meth1, args);
+    va_end (args);
+    return result;
+  }
+
+  jfloat CallFloatMethodV (jobject obj0, jmethodID meth1, _Jv_va_list val2)
+  { return p->CallFloatMethodV (this, obj0, meth1, val2); }
+
+  jfloat CallFloatMethodA (jobject obj0, jmethodID meth1, jvalue * val2)
+  { return p->CallFloatMethodA (this, obj0, meth1, val2); }
+
+  jdouble CallDoubleMethod (jobject obj0, jmethodID meth1, ...)
+  {
+    _Jv_va_list args;
+    va_start (args, meth1);
+    jdouble result = p->CallDoubleMethodV (this, obj0, meth1, args);
+    va_end (args);
+    return result;
+  }
+
+  jdouble CallDoubleMethodV (jobject obj0, jmethodID meth1, _Jv_va_list val2)
+  { return p->CallDoubleMethodV (this, obj0, meth1, val2); }
+
+  jdouble CallDoubleMethodA (jobject obj0, jmethodID meth1, jvalue * val2)
+  { return p->CallDoubleMethodA (this, obj0, meth1, val2); }
+
+  void CallVoidMethod (jobject obj0, jmethodID meth1, ...)
+  {
+    _Jv_va_list args;
+    va_start (args, meth1);
+    p->CallVoidMethodV (this, obj0, meth1, args);
+    va_end (args);
+  }
+
+  void CallVoidMethodV (jobject obj0, jmethodID meth1, _Jv_va_list val2)
+  { p->CallVoidMethodV (this, obj0, meth1, val2); }
+
+  void CallVoidMethodA (jobject obj0, jmethodID meth1, jvalue * val2)
+  { p->CallVoidMethodA (this, obj0, meth1, val2); }
+
+  jobject CallNonvirtualObjectMethod (jobject obj0, jclass cl1, jmethodID meth2, ...)
+  {
+    _Jv_va_list args;
+    va_start (args, cl1);
+    jobject result = p->CallNonvirtualObjectMethodV (this, obj0, cl1, meth2, args);
+    va_end (args);
+    return result;
+  }
+
+  jobject CallNonvirtualObjectMethodV (jobject obj0, jclass cl1, jmethodID meth2, _Jv_va_list val3)
+  { return p->CallNonvirtualObjectMethodV (this, obj0, cl1, meth2, val3); }
+
+  jobject CallNonvirtualObjectMethodA (jobject obj0, jclass cl1, jmethodID meth2, jvalue * val3)
+  { return p->CallNonvirtualObjectMethodA (this, obj0, cl1, meth2, val3); }
+
+  jboolean CallNonvirtualBooleanMethod (jobject obj0, jclass cl1, jmethodID meth2, ...)
+  {
+    _Jv_va_list args;
+    va_start (args, cl1);
+    jboolean result = p->CallNonvirtualBooleanMethodV (this, obj0, cl1, meth2, args);
+    va_end (args);
+    return result;
+  }
+
+  jboolean CallNonvirtualBooleanMethodV (jobject obj0, jclass cl1, jmethodID meth2, _Jv_va_list val3)
+  { return p->CallNonvirtualBooleanMethodV (this, obj0, cl1, meth2, val3); }
+
+  jboolean CallNonvirtualBooleanMethodA (jobject obj0, jclass cl1, jmethodID meth2, jvalue * val3)
+  { return p->CallNonvirtualBooleanMethodA (this, obj0, cl1, meth2, val3); }
+
+  jbyte CallNonvirtualByteMethod (jobject obj0, jclass cl1, jmethodID meth2, ...)
+  {
+    _Jv_va_list args;
+    va_start (args, cl1);
+    jbyte result = p->CallNonvirtualByteMethodV (this, obj0, cl1, meth2, args);
+    va_end (args);
+    return result;
+  }
+
+  jbyte CallNonvirtualByteMethodV (jobject obj0, jclass cl1, jmethodID meth2, _Jv_va_list val3)
+  { return p->CallNonvirtualByteMethodV (this, obj0, cl1, meth2, val3); }
+
+  jbyte CallNonvirtualByteMethodA (jobject obj0, jclass cl1, jmethodID meth2, jvalue * val3)
+  { return p->CallNonvirtualByteMethodA (this, obj0, cl1, meth2, val3); }
+
+  jchar CallNonvirtualCharMethod (jobject obj0, jclass cl1, jmethodID meth2, ...)
+  {
+    _Jv_va_list args;
+    va_start (args, cl1);
+    jchar result = p->CallNonvirtualCharMethodV (this, obj0, cl1, meth2, args);
+    va_end (args);
+    return result;
+  }
+
+  jchar CallNonvirtualCharMethodV (jobject obj0, jclass cl1, jmethodID meth2, _Jv_va_list val3)
+  { return p->CallNonvirtualCharMethodV (this, obj0, cl1, meth2, val3); }
+
+  jchar CallNonvirtualCharMethodA (jobject obj0, jclass cl1, jmethodID meth2, jvalue * val3)
+  { return p->CallNonvirtualCharMethodA (this, obj0, cl1, meth2, val3); }
+
+  jshort CallNonvirtualShortMethod (jobject obj0, jclass cl1, jmethodID meth2, ...)
+  {
+    _Jv_va_list args;
+    va_start (args, cl1);
+    jshort result = p->CallNonvirtualShortMethodV (this, obj0, cl1, meth2, args);
+    va_end (args);
+    return result;
+  }
+
+  jshort CallNonvirtualShortMethodV (jobject obj0, jclass cl1, jmethodID meth2, _Jv_va_list val3)
+  { return p->CallNonvirtualShortMethodV (this, obj0, cl1, meth2, val3); }
+
+  jshort CallNonvirtualShortMethodA (jobject obj0, jclass cl1, jmethodID meth2, jvalue * val3)
+  { return p->CallNonvirtualShortMethodA (this, obj0, cl1, meth2, val3); }
+
+  jint CallNonvirtualIntMethod (jobject obj0, jclass cl1, jmethodID meth2, ...)
+  {
+    _Jv_va_list args;
+    va_start (args, cl1);
+    jint result = p->CallNonvirtualIntMethodV (this, obj0, cl1, meth2, args);
+    va_end (args);
+    return result;
+  }
+
+  jint CallNonvirtualIntMethodV (jobject obj0, jclass cl1, jmethodID meth2, _Jv_va_list val3)
+  { return p->CallNonvirtualIntMethodV (this, obj0, cl1, meth2, val3); }
+
+  jint CallNonvirtualIntMethodA (jobject obj0, jclass cl1, jmethodID meth2, jvalue * val3)
+  { return p->CallNonvirtualIntMethodA (this, obj0, cl1, meth2, val3); }
+
+  jlong CallNonvirtualLongMethod (jobject obj0, jclass cl1, jmethodID meth2, ...)
+  {
+    _Jv_va_list args;
+    va_start (args, cl1);
+    jlong result = p->CallNonvirtualLongMethodV (this, obj0, cl1, meth2, args);
+    va_end (args);
+    return result;
+  }
+
+  jlong CallNonvirtualLongMethodV (jobject obj0, jclass cl1, jmethodID meth2, _Jv_va_list val3)
+  { return p->CallNonvirtualLongMethodV (this, obj0, cl1, meth2, val3); }
+
+  jlong CallNonvirtualLongMethodA (jobject obj0, jclass cl1, jmethodID meth2, jvalue * val3)
+  { return p->CallNonvirtualLongMethodA (this, obj0, cl1, meth2, val3); }
+
+  jfloat CallNonvirtualFloatMethod (jobject obj0, jclass cl1, jmethodID meth2, ...)
+  {
+    _Jv_va_list args;
+    va_start (args, cl1);
+    jfloat result = p->CallNonvirtualFloatMethodV (this, obj0, cl1, meth2, args);
+    va_end (args);
+    return result;
+  }
+
+  jfloat CallNonvirtualFloatMethodV (jobject obj0, jclass cl1, jmethodID meth2, _Jv_va_list val3)
+  { return p->CallNonvirtualFloatMethodV (this, obj0, cl1, meth2, val3); }
+
+  jfloat CallNonvirtualFloatMethodA (jobject obj0, jclass cl1, jmethodID meth2, jvalue * val3)
+  { return p->CallNonvirtualFloatMethodA (this, obj0, cl1, meth2, val3); }
+
+  jdouble CallNonvirtualDoubleMethod (jobject obj0, jclass cl1, jmethodID meth2, ...)
+  {
+    _Jv_va_list args;
+    va_start (args, cl1);
+    jdouble result = p->CallNonvirtualDoubleMethodV (this, obj0, cl1, meth2, args);
+    va_end (args);
+    return result;
+  }
+
+  jdouble CallNonvirtualDoubleMethodV (jobject obj0, jclass cl1, jmethodID meth2, _Jv_va_list val3)
+  { return p->CallNonvirtualDoubleMethodV (this, obj0, cl1, meth2, val3); }
+
+  jdouble CallNonvirtualDoubleMethodA (jobject obj0, jclass cl1, jmethodID meth2, jvalue * val3)
+  { return p->CallNonvirtualDoubleMethodA (this, obj0, cl1, meth2, val3); }
+
+  void CallNonvirtualVoidMethod (jobject obj0, jclass cl1, jmethodID meth2, ...)
+  {
+    _Jv_va_list args;
+    va_start (args, cl1);
+    p->CallNonvirtualVoidMethodV (this, obj0, cl1, meth2, args);
+    va_end (args);
+  }
+
+  void CallNonvirtualVoidMethodV (jobject obj0, jclass cl1, jmethodID meth2, _Jv_va_list val3)
+  { p->CallNonvirtualVoidMethodV (this, obj0, cl1, meth2, val3); }
+
+  void CallNonvirtualVoidMethodA (jobject obj0, jclass cl1, jmethodID meth2, jvalue * val3)
+  { p->CallNonvirtualVoidMethodA (this, obj0, cl1, meth2, val3); }
+
+  jfieldID GetFieldID (jclass cl0, const char * val1, const char * val2)
+  { return p->GetFieldID (this, cl0, val1, val2); }
+
+  jobject GetObjectField (jobject obj0, jfieldID fld1)
+  { return p->GetObjectField (this, obj0, fld1); }
+
+  jboolean GetBooleanField (jobject obj0, jfieldID fld1)
+  { return p->GetBooleanField (this, obj0, fld1); }
+
+  jbyte GetByteField (jobject obj0, jfieldID fld1)
+  { return p->GetByteField (this, obj0, fld1); }
+
+  jchar GetCharField (jobject obj0, jfieldID fld1)
+  { return p->GetCharField (this, obj0, fld1); }
+
+  jshort GetShortField (jobject obj0, jfieldID fld1)
+  { return p->GetShortField (this, obj0, fld1); }
+
+  jint GetIntField (jobject obj0, jfieldID fld1)
+  { return p->GetIntField (this, obj0, fld1); }
+
+  jlong GetLongField (jobject obj0, jfieldID fld1)
+  { return p->GetLongField (this, obj0, fld1); }
+
+  jfloat GetFloatField (jobject obj0, jfieldID fld1)
+  { return p->GetFloatField (this, obj0, fld1); }
+
+  jdouble GetDoubleField (jobject obj0, jfieldID fld1)
+  { return p->GetDoubleField (this, obj0, fld1); }
+
+  void SetObjectField (jobject obj0, jfieldID fld1, jobject obj2)
+  { p->SetObjectField (this, obj0, fld1, obj2); }
+
+  void SetBooleanField (jobject obj0, jfieldID fld1, jboolean val2)
+  { p->SetBooleanField (this, obj0, fld1, val2); }
+
+  void SetByteField (jobject obj0, jfieldID fld1, jbyte val2)
+  { p->SetByteField (this, obj0, fld1, val2); }
+
+  void SetCharField (jobject obj0, jfieldID fld1, jchar val2)
+  { p->SetCharField (this, obj0, fld1, val2); }
+
+  void SetShortField (jobject obj0, jfieldID fld1, jshort val2)
+  { p->SetShortField (this, obj0, fld1, val2); }
+
+  void SetIntField (jobject obj0, jfieldID fld1, jint val2)
+  { p->SetIntField (this, obj0, fld1, val2); }
+
+  void SetLongField (jobject obj0, jfieldID fld1, jlong val2)
+  { p->SetLongField (this, obj0, fld1, val2); }
+
+  void SetFloatField (jobject obj0, jfieldID fld1, jfloat val2)
+  { p->SetFloatField (this, obj0, fld1, val2); }
+
+  void SetDoubleField (jobject obj0, jfieldID fld1, jdouble val2)
+  { p->SetDoubleField (this, obj0, fld1, val2); }
+
+  jmethodID GetStaticMethodID (jclass cl0, const char * val1, const char * val2)
+  { return p->GetStaticMethodID (this, cl0, val1, val2); }
+
+  jobject CallStaticObjectMethod (jclass cl0, jmethodID meth1, ...)
+  {
+    _Jv_va_list args;
+    va_start (args, meth1);
+    jobject result = p->CallStaticObjectMethodV (this, cl0, meth1, args);
+    va_end (args);
+    return result;
+  }
+
+  jobject CallStaticObjectMethodV (jclass cl0, jmethodID meth1, _Jv_va_list val2)
+  { return p->CallStaticObjectMethodV (this, cl0, meth1, val2); }
+
+  jobject CallStaticObjectMethodA (jclass cl0, jmethodID meth1, jvalue * val2)
+  { return p->CallStaticObjectMethodA (this, cl0, meth1, val2); }
 
+  jboolean CallStaticBooleanMethod (jclass cl0, jmethodID meth1, ...)
+  {
+    _Jv_va_list args;
+    va_start (args, meth1);
+    jboolean result = p->CallStaticBooleanMethodV (this, cl0, meth1, args);
+    va_end (args);
+    return result;
+  }
+
+  jboolean CallStaticBooleanMethodV (jclass cl0, jmethodID meth1, _Jv_va_list val2)
+  { return p->CallStaticBooleanMethodV (this, cl0, meth1, val2); }
+
+  jboolean CallStaticBooleanMethodA (jclass cl0, jmethodID meth1, jvalue * val2)
+  { return p->CallStaticBooleanMethodA (this, cl0, meth1, val2); }
+
+  jbyte CallStaticByteMethod (jclass cl0, jmethodID meth1, ...)
+  {
+    _Jv_va_list args;
+    va_start (args, meth1);
+    jbyte result = p->CallStaticByteMethodV (this, cl0, meth1, args);
+    va_end (args);
+    return result;
+  }
+
+  jbyte CallStaticByteMethodV (jclass cl0, jmethodID meth1, _Jv_va_list val2)
+  { return p->CallStaticByteMethodV (this, cl0, meth1, val2); }
+
+  jbyte CallStaticByteMethodA (jclass cl0, jmethodID meth1, jvalue * val2)
+  { return p->CallStaticByteMethodA (this, cl0, meth1, val2); }
+
+  jchar CallStaticCharMethod (jclass cl0, jmethodID meth1, ...)
+  {
+    _Jv_va_list args;
+    va_start (args, meth1);
+    jchar result = p->CallStaticCharMethodV (this, cl0, meth1, args);
+    va_end (args);
+    return result;
+  }
+
+  jchar CallStaticCharMethodV (jclass cl0, jmethodID meth1, _Jv_va_list val2)
+  { return p->CallStaticCharMethodV (this, cl0, meth1, val2); }
+
+  jchar CallStaticCharMethodA (jclass cl0, jmethodID meth1, jvalue * val2)
+  { return p->CallStaticCharMethodA (this, cl0, meth1, val2); }
+
+  jshort CallStaticShortMethod (jclass cl0, jmethodID meth1, ...)
+  {
+    _Jv_va_list args;
+    va_start (args, meth1);
+    jshort result = p->CallStaticShortMethodV (this, cl0, meth1, args);
+    va_end (args);
+    return result;
+  }
+
+  jshort CallStaticShortMethodV (jclass cl0, jmethodID meth1, _Jv_va_list val2)
+  { return p->CallStaticShortMethodV (this, cl0, meth1, val2); }
+
+  jshort CallStaticShortMethodA (jclass cl0, jmethodID meth1, jvalue * val2)
+  { return p->CallStaticShortMethodA (this, cl0, meth1, val2); }
+
+  jint CallStaticIntMethod (jclass cl0, jmethodID meth1, ...)
+  {
+    _Jv_va_list args;
+    va_start (args, meth1);
+    jint result = p->CallStaticIntMethodV (this, cl0, meth1, args);
+    va_end (args);
+    return result;
+  }
+
+  jint CallStaticIntMethodV (jclass cl0, jmethodID meth1, _Jv_va_list val2)
+  { return p->CallStaticIntMethodV (this, cl0, meth1, val2); }
+
+  jint CallStaticIntMethodA (jclass cl0, jmethodID meth1, jvalue * val2)
+  { return p->CallStaticIntMethodA (this, cl0, meth1, val2); }
+
+  jlong CallStaticLongMethod (jclass cl0, jmethodID meth1, ...)
+  {
+    _Jv_va_list args;
+    va_start (args, meth1);
+    jlong result = p->CallStaticLongMethodV (this, cl0, meth1, args);
+    va_end (args);
+    return result;
+  }
+
+  jlong CallStaticLongMethodV (jclass cl0, jmethodID meth1, _Jv_va_list val2)
+  { return p->CallStaticLongMethodV (this, cl0, meth1, val2); }
+
+  jlong CallStaticLongMethodA (jclass cl0, jmethodID meth1, jvalue * val2)
+  { return p->CallStaticLongMethodA (this, cl0, meth1, val2); }
+
+  jfloat CallStaticFloatMethod (jclass cl0, jmethodID meth1, ...)
+  {
+    _Jv_va_list args;
+    va_start (args, meth1);
+    jfloat result = p->CallStaticFloatMethodV (this, cl0, meth1, args);
+    va_end (args);
+    return result;
+  }
+
+  jfloat CallStaticFloatMethodV (jclass cl0, jmethodID meth1, _Jv_va_list val2)
+  { return p->CallStaticFloatMethodV (this, cl0, meth1, val2); }
+
+  jfloat CallStaticFloatMethodA (jclass cl0, jmethodID meth1, jvalue * val2)
+  { return p->CallStaticFloatMethodA (this, cl0, meth1, val2); }
+
+  jdouble CallStaticDoubleMethod (jclass cl0, jmethodID meth1, ...)
+  {
+    _Jv_va_list args;
+    va_start (args, meth1);
+    jdouble result = p->CallStaticDoubleMethodV (this, cl0, meth1, args);
+    va_end (args);
+    return result;
+  }
+
+  jdouble CallStaticDoubleMethodV (jclass cl0, jmethodID meth1, _Jv_va_list val2)
+  { return p->CallStaticDoubleMethodV (this, cl0, meth1, val2); }
+
+  jdouble CallStaticDoubleMethodA (jclass cl0, jmethodID meth1, jvalue * val2)
+  { return p->CallStaticDoubleMethodA (this, cl0, meth1, val2); }
+
+  void CallStaticVoidMethod (jclass cl0, jmethodID meth1, ...)
+  {
+    _Jv_va_list args;
+    va_start (args, meth1);
+    p->CallStaticVoidMethodV (this, cl0, meth1, args);
+    va_end (args);
+  }
+
+  void CallStaticVoidMethodV (jclass cl0, jmethodID meth1, _Jv_va_list val2)
+  { p->CallStaticVoidMethodV (this, cl0, meth1, val2); }
+
+  void CallStaticVoidMethodA (jclass cl0, jmethodID meth1, jvalue * val2)
+  { p->CallStaticVoidMethodA (this, cl0, meth1, val2); }
+
+  jfieldID GetStaticFieldID (jclass cl0, const char * val1, const char * val2)
+  { return p->GetStaticFieldID (this, cl0, val1, val2); }
+
+  jobject GetStaticObjectField (jclass cl0, jfieldID fld1)
+  { return p->GetStaticObjectField (this, cl0, fld1); }
+
+  jboolean GetStaticBooleanField (jclass cl0, jfieldID fld1)
+  { return p->GetStaticBooleanField (this, cl0, fld1); }
+
+  jbyte GetStaticByteField (jclass cl0, jfieldID fld1)
+  { return p->GetStaticByteField (this, cl0, fld1); }
+
+  jchar GetStaticCharField (jclass cl0, jfieldID fld1)
+  { return p->GetStaticCharField (this, cl0, fld1); }
+
+  jshort GetStaticShortField (jclass cl0, jfieldID fld1)
+  { return p->GetStaticShortField (this, cl0, fld1); }
+
+  jint GetStaticIntField (jclass cl0, jfieldID fld1)
+  { return p->GetStaticIntField (this, cl0, fld1); }
+
+  jlong GetStaticLongField (jclass cl0, jfieldID fld1)
+  { return p->GetStaticLongField (this, cl0, fld1); }
+
+  jfloat GetStaticFloatField (jclass cl0, jfieldID fld1)
+  { return p->GetStaticFloatField (this, cl0, fld1); }
+
+  jdouble GetStaticDoubleField (jclass cl0, jfieldID fld1)
+  { return p->GetStaticDoubleField (this, cl0, fld1); }
+
+  void SetStaticObjectField (jclass cl0, jfieldID fld1, jobject obj2)
+  { p->SetStaticObjectField (this, cl0, fld1, obj2); }
+
+  void SetStaticBooleanField (jclass cl0, jfieldID fld1, jboolean val2)
+  { p->SetStaticBooleanField (this, cl0, fld1, val2); }
+
+  void SetStaticByteField (jclass cl0, jfieldID fld1, jbyte val2)
+  { p->SetStaticByteField (this, cl0, fld1, val2); }
+
+  void SetStaticCharField (jclass cl0, jfieldID fld1, jchar val2)
+  { p->SetStaticCharField (this, cl0, fld1, val2); }
+
+  void SetStaticShortField (jclass cl0, jfieldID fld1, jshort val2)
+  { p->SetStaticShortField (this, cl0, fld1, val2); }
+
+  void SetStaticIntField (jclass cl0, jfieldID fld1, jint val2)
+  { p->SetStaticIntField (this, cl0, fld1, val2); }
+
+  void SetStaticLongField (jclass cl0, jfieldID fld1, jlong val2)
+  { p->SetStaticLongField (this, cl0, fld1, val2); }
+
+  void SetStaticFloatField (jclass cl0, jfieldID fld1, jfloat val2)
+  { p->SetStaticFloatField (this, cl0, fld1, val2); }
+
+  void SetStaticDoubleField (jclass cl0, jfieldID fld1, jdouble val2)
+  { p->SetStaticDoubleField (this, cl0, fld1, val2); }
+
+  jstring NewString (const jchar * val0, jsize val1)
+  { return p->NewString (this, val0, val1); }
+
+  jint GetStringLength (jstring val0)
+  { return p->GetStringLength (this, val0); }
+
+  const jchar * GetStringChars (jstring val0, jboolean * val1)
+  { return p->GetStringChars (this, val0, val1); }
+
+  void ReleaseStringChars (jstring val0, const jchar * val1)
+  { p->ReleaseStringChars (this, val0, val1); }
+
+  jstring NewStringUTF (const char * val0)
+  { return p->NewStringUTF (this, val0); }
+
+  jsize GetStringUTFLength (jstring val0)
+  { return p->GetStringUTFLength (this, val0); }
+
+  const char * GetStringUTFChars (jstring val0, jboolean * val1)
+  { return p->GetStringUTFChars (this, val0, val1); }
+
+  void ReleaseStringUTFChars (jstring val0, const char * val1)
+  { p->ReleaseStringUTFChars (this, val0, val1); }
+
+  jsize GetArrayLength (jarray val0)
+  { return p->GetArrayLength (this, val0); }
+
+  jarray NewObjectArray (jsize val0, jclass cl1, jobject obj2)
+  { return p->NewObjectArray (this, val0, cl1, obj2); }
+
+  jobject GetObjectArrayElement (jobjectArray val0, jsize val1)
+  { return p->GetObjectArrayElement (this, val0, val1); }
+
+  void SetObjectArrayElement (jobjectArray val0, jsize val1, jobject obj2)
+  { p->SetObjectArrayElement (this, val0, val1, obj2); }
+
+  jbooleanArray NewBooleanArray (jsize val0)
+  { return p->NewBooleanArray (this, val0); }
+
+  jbyteArray NewByteArray (jsize val0)
+  { return p->NewByteArray (this, val0); }
+
+  jcharArray NewCharArray (jsize val0)
+  { return p->NewCharArray (this, val0); }
+
+  jshortArray NewShortArray (jsize val0)
+  { return p->NewShortArray (this, val0); }
+
+  jintArray NewIntArray (jsize val0)
+  { return p->NewIntArray (this, val0); }
+
+  jlongArray NewLongArray (jsize val0)
+  { return p->NewLongArray (this, val0); }
+
+  jfloatArray NewFloatArray (jsize val0)
+  { return p->NewFloatArray (this, val0); }
+
+  jdoubleArray NewDoubleArray (jsize val0)
+  { return p->NewDoubleArray (this, val0); }
+
+  jboolean * GetBooleanArrayElements (jbooleanArray val0, jboolean * val1)
+  { return p->GetBooleanArrayElements (this, val0, val1); }
+
+  jbyte * GetByteArrayElements (jbyteArray val0, jboolean * val1)
+  { return p->GetByteArrayElements (this, val0, val1); }
+
+  jchar * GetCharArrayElements (jcharArray val0, jboolean * val1)
+  { return p->GetCharArrayElements (this, val0, val1); }
+
+  jshort * GetShortArrayElements (jshortArray val0, jboolean * val1)
+  { return p->GetShortArrayElements (this, val0, val1); }
+
+  jint * GetIntArrayElements (jintArray val0, jboolean * val1)
+  { return p->GetIntArrayElements (this, val0, val1); }
+
+  jlong * GetLongArrayElements (jlongArray val0, jboolean * val1)
+  { return p->GetLongArrayElements (this, val0, val1); }
+
+  jfloat * GetFloatArrayElements (jfloatArray val0, jboolean * val1)
+  { return p->GetFloatArrayElements (this, val0, val1); }
+
+  jdouble * GetDoubleArrayElements (jdoubleArray val0, jboolean * val1)
+  { return p->GetDoubleArrayElements (this, val0, val1); }
+
+  void ReleaseBooleanArrayElements (jbooleanArray val0, jboolean * val1, jint val2)
+  { p->ReleaseBooleanArrayElements (this, val0, val1, val2); }
+
+  void ReleaseByteArrayElements (jbyteArray val0, jbyte * val1, jint val2)
+  { p->ReleaseByteArrayElements (this, val0, val1, val2); }
+
+  void ReleaseCharArrayElements (jcharArray val0, jchar * val1, jint val2)
+  { p->ReleaseCharArrayElements (this, val0, val1, val2); }
+
+  void ReleaseShortArrayElements (jshortArray val0, jshort * val1, jint val2)
+  { p->ReleaseShortArrayElements (this, val0, val1, val2); }
+
+  void ReleaseIntArrayElements (jintArray val0, jint * val1, jint val2)
+  { p->ReleaseIntArrayElements (this, val0, val1, val2); }
+
+  void ReleaseLongArrayElements (jlongArray val0, jlong * val1, jint val2)
+  { p->ReleaseLongArrayElements (this, val0, val1, val2); }
+
+  void ReleaseFloatArrayElements (jfloatArray val0, jfloat * val1, jint val2)
+  { p->ReleaseFloatArrayElements (this, val0, val1, val2); }
+
+  void ReleaseDoubleArrayElements (jdoubleArray val0, jdouble * val1, jint val2)
+  { p->ReleaseDoubleArrayElements (this, val0, val1, val2); }
+
+  void GetBooleanArrayRegion (jbooleanArray val0, jsize val1, jsize val2, jboolean * val3)
+  { p->GetBooleanArrayRegion (this, val0, val1, val2, val3); }
+
+  void GetByteArrayRegion (jbooleanArray val0, jsize val1, jsize val2, jboolean * val3)
+  { p->GetByteArrayRegion (this, val0, val1, val2, val3); }
+
+  void GetCharArrayRegion (jbooleanArray val0, jsize val1, jsize val2, jboolean * val3)
+  { p->GetCharArrayRegion (this, val0, val1, val2, val3); }
+
+  void GetShortArrayRegion (jbooleanArray val0, jsize val1, jsize val2, jboolean * val3)
+  { p->GetShortArrayRegion (this, val0, val1, val2, val3); }
+
+  void GetIntArrayRegion (jbooleanArray val0, jsize val1, jsize val2, jboolean * val3)
+  { p->GetIntArrayRegion (this, val0, val1, val2, val3); }
+
+  void GetLongArrayRegion (jbooleanArray val0, jsize val1, jsize val2, jboolean * val3)
+  { p->GetLongArrayRegion (this, val0, val1, val2, val3); }
+
+  void GetFloatArrayRegion (jbooleanArray val0, jsize val1, jsize val2, jboolean * val3)
+  { p->GetFloatArrayRegion (this, val0, val1, val2, val3); }
+
+  void GetDoubleArrayRegion (jbooleanArray val0, jsize val1, jsize val2, jboolean * val3)
+  { p->GetDoubleArrayRegion (this, val0, val1, val2, val3); }
+
+  void SetBooleanArrayRegion (jbooleanArray val0, jsize val1, jsize val2, jboolean * val3)
+  { p->SetBooleanArrayRegion (this, val0, val1, val2, val3); }
+
+  void SetByteArrayRegion (jbooleanArray val0, jsize val1, jsize val2, jboolean * val3)
+  { p->SetByteArrayRegion (this, val0, val1, val2, val3); }
+
+  void SetCharArrayRegion (jbooleanArray val0, jsize val1, jsize val2, jboolean * val3)
+  { p->SetCharArrayRegion (this, val0, val1, val2, val3); }
+
+  void SetShortArrayRegion (jbooleanArray val0, jsize val1, jsize val2, jboolean * val3)
+  { p->SetShortArrayRegion (this, val0, val1, val2, val3); }
+
+  void SetIntArrayRegion (jbooleanArray val0, jsize val1, jsize val2, jboolean * val3)
+  { p->SetIntArrayRegion (this, val0, val1, val2, val3); }
+
+  void SetLongArrayRegion (jbooleanArray val0, jsize val1, jsize val2, jboolean * val3)
+  { p->SetLongArrayRegion (this, val0, val1, val2, val3); }
+
+  void SetFloatArrayRegion (jbooleanArray val0, jsize val1, jsize val2, jboolean * val3)
+  { p->SetFloatArrayRegion (this, val0, val1, val2, val3); }
+
+  void SetDoubleArrayRegion (jbooleanArray val0, jsize val1, jsize val2, jboolean * val3)
+  { p->SetDoubleArrayRegion (this, val0, val1, val2, val3); }
+
+  jint RegisterNatives (jclass cl0, const JNINativeMethod * val1, jint val2)
+  { return p->RegisterNatives (this, cl0, val1, val2); }
+
+  jint UnregisterNatives (jclass cl0)
+  { return p->UnregisterNatives (this, cl0); }
+
+  jint MonitorEnter (jobject obj0)
+  { return p->MonitorEnter (this, obj0); }
+
+  jint MonitorExit (jobject obj0)
+  { return p->MonitorExit (this, obj0); }
+
+  jint GetJavaVM (JavaVM ** val0)
+  { return p->GetJavaVM (this, val0); }
+
+  void GetStringRegion (jstring val0, jsize val1, jsize val2, jchar * val3)
+  { p->GetStringRegion (this, val0, val1, val2, val3); }
+
+  void GetStringUTFRegion (jstring val0, jsize val1, jsize val2, char * val3)
+  { p->GetStringUTFRegion (this, val0, val1, val2, val3); }
+
+  void * GetPrimitiveArrayCritical (jarray val0, jboolean * val1)
+  { return p->GetPrimitiveArrayCritical (this, val0, val1); }
+
+  void ReleasePrimitiveArrayCritical (jarray val0, void * val1, jint val2)
+  { p->ReleasePrimitiveArrayCritical (this, val0, val1, val2); }
+
+  const jchar * GetStringCritical (jstring val0, jboolean * val1)
+  { return p->GetStringCritical (this, val0, val1); }
+
+  void ReleaseStringCritical (jstring val0, const jchar * val1)
+  { p->ReleaseStringCritical (this, val0, val1); }
+
+  jweak NewWeakGlobalRef (jobject obj0)
+  { return p->NewWeakGlobalRef (this, obj0); }
+
+  void DeleteWeakGlobalRef (jweak val0)
+  { p->DeleteWeakGlobalRef (this, val0); }
+
+  jboolean ExceptionCheck ()
+  { return p->ExceptionCheck (this); }
+};
 #endif /* __cplusplus */
 
 #endif /* __GCJ_JNI_H__ */

From java-patches-return-432-listarch-java-patches=sourceware.cygnus.com@sourceware.cygnus.com Wed Feb 02 01:45:50 2000
Return-Path: <java-patches-return-432-listarch-java-patches=sourceware.cygnus.com@sourceware.cygnus.com>
Delivered-To: listarch-java-patches@sourceware.cygnus.com
Received: (qmail 4456 invoked by alias); 2 Feb 2000 01:45:50 -0000
Mailing-List: contact java-patches-help@sourceware.cygnus.com; run by ezmlm
Precedence: bulk
List-Subscribe: <mailto:java-patches-subscribe@sourceware.cygnus.com>
List-Archive: <http://sourceware.cygnus.com/ml/java-patches/>
List-Post: <mailto:java-patches@sourceware.cygnus.com>
List-Help: <mailto:java-patches-help@sourceware.cygnus.com>, <http://sourceware.cygnus.com/ml/#faqs>
Sender: java-patches-owner@sourceware.cygnus.com
Delivered-To: mailing list java-patches@sourceware.cygnus.com
Received: (qmail 4427 invoked from network); 2 Feb 2000 01:45:32 -0000
To: Java Patch List <java-patches@sourceware.cygnus.com> 
Subject: Patch: fix for `...' arguments in jni.h
X-Zippy:  Is it clean in other dimensions?
X-Attribution:  Tom
Bcc:
Reply-To:  tromey@cygnus.com
From:  Tom Tromey <tromey@cygnus.com>
Date: 01 Feb 2000 18:49:07 -0700
Message-ID: <87puugs7ak.fsf@cygnus.com>
Lines: 106
X-Mailer: Gnus v5.5/Emacs 20.3

My recent patch to jni.h had a bug which somehow escaped detection.
This patch fixes it.

2000-02-01  Tom Tromey  <tromey@cygnus.com>

	* include/jni.h (class _Jv_JNIEnv): Corrected calls using `...'.

Tom

Index: include/jni.h
===================================================================
RCS file: /cvs/java/libgcj/libjava/include/jni.h,v
retrieving revision 1.8
diff -u -r1.8 jni.h
--- jni.h	2000/02/01 21:04:44	1.8
+++ jni.h	2000/02/02 01:42:46
@@ -790,7 +790,7 @@
   jobject CallNonvirtualObjectMethod (jobject obj0, jclass cl1, jmethodID meth2, ...)
   {
     _Jv_va_list args;
-    va_start (args, cl1);
+    va_start (args, meth2);
     jobject result = p->CallNonvirtualObjectMethodV (this, obj0, cl1, meth2, args);
     va_end (args);
     return result;
@@ -805,7 +805,7 @@
   jboolean CallNonvirtualBooleanMethod (jobject obj0, jclass cl1, jmethodID meth2, ...)
   {
     _Jv_va_list args;
-    va_start (args, cl1);
+    va_start (args, meth2);
     jboolean result = p->CallNonvirtualBooleanMethodV (this, obj0, cl1, meth2, args);
     va_end (args);
     return result;
@@ -820,7 +820,7 @@
   jbyte CallNonvirtualByteMethod (jobject obj0, jclass cl1, jmethodID meth2, ...)
   {
     _Jv_va_list args;
-    va_start (args, cl1);
+    va_start (args, meth2);
     jbyte result = p->CallNonvirtualByteMethodV (this, obj0, cl1, meth2, args);
     va_end (args);
     return result;
@@ -835,7 +835,7 @@
   jchar CallNonvirtualCharMethod (jobject obj0, jclass cl1, jmethodID meth2, ...)
   {
     _Jv_va_list args;
-    va_start (args, cl1);
+    va_start (args, meth2);
     jchar result = p->CallNonvirtualCharMethodV (this, obj0, cl1, meth2, args);
     va_end (args);
     return result;
@@ -850,7 +850,7 @@
   jshort CallNonvirtualShortMethod (jobject obj0, jclass cl1, jmethodID meth2, ...)
   {
     _Jv_va_list args;
-    va_start (args, cl1);
+    va_start (args, meth2);
     jshort result = p->CallNonvirtualShortMethodV (this, obj0, cl1, meth2, args);
     va_end (args);
     return result;
@@ -865,7 +865,7 @@
   jint CallNonvirtualIntMethod (jobject obj0, jclass cl1, jmethodID meth2, ...)
   {
     _Jv_va_list args;
-    va_start (args, cl1);
+    va_start (args, meth2);
     jint result = p->CallNonvirtualIntMethodV (this, obj0, cl1, meth2, args);
     va_end (args);
     return result;
@@ -880,7 +880,7 @@
   jlong CallNonvirtualLongMethod (jobject obj0, jclass cl1, jmethodID meth2, ...)
   {
     _Jv_va_list args;
-    va_start (args, cl1);
+    va_start (args, meth2);
     jlong result = p->CallNonvirtualLongMethodV (this, obj0, cl1, meth2, args);
     va_end (args);
     return result;
@@ -895,7 +895,7 @@
   jfloat CallNonvirtualFloatMethod (jobject obj0, jclass cl1, jmethodID meth2, ...)
   {
     _Jv_va_list args;
-    va_start (args, cl1);
+    va_start (args, meth2);
     jfloat result = p->CallNonvirtualFloatMethodV (this, obj0, cl1, meth2, args);
     va_end (args);
     return result;
@@ -910,7 +910,7 @@
   jdouble CallNonvirtualDoubleMethod (jobject obj0, jclass cl1, jmethodID meth2, ...)
   {
     _Jv_va_list args;
-    va_start (args, cl1);
+    va_start (args, meth2);
     jdouble result = p->CallNonvirtualDoubleMethodV (this, obj0, cl1, meth2, args);
     va_end (args);
     return result;
@@ -925,7 +925,7 @@
   void CallNonvirtualVoidMethod (jobject obj0, jclass cl1, jmethodID meth2, ...)
   {
     _Jv_va_list args;
-    va_start (args, cl1);
+    va_start (args, meth2);
     p->CallNonvirtualVoidMethodV (this, obj0, cl1, meth2, args);
     va_end (args);
   }

From java-patches-return-433-listarch-java-patches=sourceware.cygnus.com@sourceware.cygnus.com Wed Feb 02 01:53:18 2000
Return-Path: <java-patches-return-433-listarch-java-patches=sourceware.cygnus.com@sourceware.cygnus.com>
Delivered-To: listarch-java-patches@sourceware.cygnus.com
Received: (qmail 6500 invoked by alias); 2 Feb 2000 01:53:17 -0000
Mailing-List: contact java-patches-help@sourceware.cygnus.com; run by ezmlm
Precedence: bulk
List-Subscribe: <mailto:java-patches-subscribe@sourceware.cygnus.com>
List-Archive: <http://sourceware.cygnus.com/ml/java-patches/>
List-Post: <mailto:java-patches@sourceware.cygnus.com>
List-Help: <mailto:java-patches-help@sourceware.cygnus.com>, <http://sourceware.cygnus.com/ml/#faqs>
Sender: java-patches-owner@sourceware.cygnus.com
Delivered-To: mailing list java-patches@sourceware.cygnus.com
Received: (qmail 6478 invoked from network); 2 Feb 2000 01:53:01 -0000
To: Java Patch List <java-patches@sourceware.cygnus.com> 
Subject: Patch: JNI method invocation
X-Zippy:  Remember, in 2039, MOUSSE & PASTA will be available
 ONLY by prescription!!
X-Attribution:  Tom
Bcc:
Reply-To:  tromey@cygnus.com
From:  Tom Tromey <tromey@cygnus.com>
Date: 01 Feb 2000 18:56:33 -0700
Message-ID: <87oga0s6y6.fsf@cygnus.com>
Lines: 151
X-Mailer: Gnus v5.5/Emacs 20.3

This patch gives libgcj the ability to call JNI functions for
otherwise interpreted classes.  JNI functions for compiled classes are
still unimplemented (this requires compiler changes).  JNI function
lookup isn't done, so JNI still doesn't work.  We aren't too far away
from testing, though.

2000-02-01  Tom Tromey  <tromey@cygnus.com>

	* include/java-interp.h (_Jv_JNI_conversion_call): Declare.
	* resolve.cc (ncode): Use _Jv_JNI_conversion_call when
	constructing the closure if the function is native.
	* jni.cc (_Jv_JNI_conversion_call): Now returns `void'.  No longer
	a template function, #if'd out, or static.
	Include <java-interp.h>.

Tom

Index: jni.cc
===================================================================
RCS file: /cvs/java/libgcj/libjava/jni.cc,v
retrieving revision 1.8
diff -u -r1.8 jni.cc
--- jni.cc	2000/02/01 17:36:05	1.8
+++ jni.cc	2000/02/02 01:49:01
@@ -45,6 +45,8 @@
 #include <gcj/method.h>
 #include <gcj/field.h>
 
+#include <java-interp.h>
+
 #define ClassClass _CL_Q34java4lang5Class
 extern java::lang::Class ClassClass;
 #define ObjectClass _CL_Q34java4lang6Object
@@ -1204,11 +1206,14 @@
 
 // This function is the stub which is used to turn an ordinary (CNI)
 // method call into a JNI call.
-#if 0
-template<typename T>
-static T
-_Jv_JNI_conversion_call (fixme)
+void
+_Jv_JNI_conversion_call (ffi_cif *cif,
+			 void *ret,
+			 ffi_raw *args,
+			 void *__this)
 {
+  _Jv_InterpMethod* _this = (_Jv_InterpMethod*)__this;
+
   JNIEnv env;
   _Jv_JNI_LocalFrame *frame
     = (_Jv_JNI_LocalFrame *) alloca (sizeof (_Jv_JNI_LocalFrame)
@@ -1216,7 +1221,7 @@
 
   env.p = &_Jv_JNIFunctions;
   env.ex = NULL;
-  env.klass = FIXME;
+  env.klass = _this->defining_class;
   env.locals = frame;
 
   frame->marker = true;
@@ -1225,20 +1230,24 @@
   for (int i = 0; i < frame->size; ++i)
     frame->vec[i] = NULL;
 
-  T result = FIXME_ffi_call (args);
+  // FIXME: we should mark every reference parameter as a local.  For
+  // now we assume a conservative GC, and we assume that the
+  // references are on the stack somewhere.
+
+  ffi_raw_call (cif,
+		NULL, // FIXME: function pointer.
+		ret,
+		args);
 
   do
     {
-      _Jv_JNI_PopLocalFrame (&env, result);
+      _Jv_JNI_PopLocalFrame (&env, NULL);
     }
   while (env.locals != frame);
 
   if (env.ex)
     JvThrow (env.ex);
-
-  return T;
 }
-#endif
 
 
 
Index: resolve.cc
===================================================================
RCS file: /cvs/java/libgcj/libjava/resolve.cc,v
retrieving revision 1.10
diff -u -r1.10 resolve.cc
--- resolve.cc	2000/01/26 23:44:40	1.10
+++ resolve.cc	2000/02/02 01:49:09
@@ -1022,7 +1022,13 @@
 
   args_raw_size = ffi_raw_size (&closure->cif);
 
-  if ((self->accflags & Modifier::SYNCHRONIZED) != 0)
+  if ((self->accflags & Modifier::NATIVE) != 0)
+    {
+      // FIXME: for now we assume that all native methods for
+      // interpreted code use JNI.
+      fun = (ffi_closure_fun) &_Jv_JNI_conversion_call;
+    }
+  else if ((self->accflags & Modifier::SYNCHRONIZED) != 0)
     {
       if (staticp)
 	fun = (ffi_closure_fun)&_Jv_InterpMethod::run_synch_class;
Index: include/java-interp.h
===================================================================
RCS file: /cvs/java/libgcj/libjava/include/java-interp.h,v
retrieving revision 1.4
diff -u -r1.4 java-interp.h
--- java-interp.h	2000/01/19 18:39:25	1.4
+++ java-interp.h	2000/02/02 01:49:13
@@ -1,6 +1,6 @@
 // java-interp.h - Header file for the bytecode interpreter.  -*- c++ -*-
 
-/* Copyright (C) 1999  Red Hat, Inc.
+/* Copyright (C) 1999, 2000  Red Hat, Inc.
 
    This file is part of libgcj.
 
@@ -121,6 +121,9 @@
   friend class gnu::gcj::runtime::MethodInvocation;
 
   friend void _Jv_PrepareClass(jclass);
+
+  // This function is used when making a JNI call from the interpreter.
+  friend void _Jv_JNI_conversion_call (ffi_cif *, void *, ffi_raw *, void *);
 };
 
 class _Jv_InterpMethodInvocation {
Index: include/jvm.h
===================================================================
RCS file: /cvs/java/libgcj/libjava/include/jvm.h,v
retrieving revision 1.13
diff -u -r1.13 jvm.h
--- jvm.h	2000/02/01 06:14:26	1.13
+++ jvm.h	2000/02/02 01:49:13
@@ -204,5 +204,4 @@
 /* Initialize JNI.  */
 extern void _Jv_JNI_Init (void);
 
-
 #endif /* __JAVA_JVM_H__ */

From java-patches-return-434-listarch-java-patches=sourceware.cygnus.com@sourceware.cygnus.com Thu Feb 03 17:15:58 2000
Return-Path: <java-patches-return-434-listarch-java-patches=sourceware.cygnus.com@sourceware.cygnus.com>
Delivered-To: listarch-java-patches@sourceware.cygnus.com
Received: (qmail 23969 invoked by alias); 3 Feb 2000 17:15:58 -0000
Mailing-List: contact java-patches-help@sourceware.cygnus.com; run by ezmlm
Precedence: bulk
List-Subscribe: <mailto:java-patches-subscribe@sourceware.cygnus.com>
List-Archive: <http://sourceware.cygnus.com/ml/java-patches/>
List-Post: <mailto:java-patches@sourceware.cygnus.com>
List-Help: <mailto:java-patches-help@sourceware.cygnus.com>, <http://sourceware.cygnus.com/ml/#faqs>
Sender: java-patches-owner@sourceware.cygnus.com
Delivered-To: mailing list java-patches@sourceware.cygnus.com
Received: (qmail 23948 invoked from network); 3 Feb 2000 17:15:53 -0000
To: Java Patch List <java-patches@sourceware.cygnus.com> 
Subject: Patch: PipedOutputStream.write
X-Zippy:  I'm having a MID-WEEK CRISIS!
X-Attribution:  Tom
Bcc:
Reply-To:  tromey@cygnus.com
From:  Tom Tromey <tromey@cygnus.com>
Date: 03 Feb 2000 10:19:58 -0700
Message-ID: <874sbqryo1.fsf@cygnus.com>
Lines: 47
X-Mailer: Gnus v5.5/Emacs 20.3

I'm committing this patch, which adds a missing method to
PipedOutputStream.

2000-02-03  Tom Tromey  <tromey@cygnus.com>

	* java/io/PipedOutputStream.java (write(byte[], int, int)): New
	method.

Tom

Index: java/io/PipedOutputStream.java
===================================================================
RCS file: /cvs/java/libgcj/libjava/java/io/PipedOutputStream.java,v
retrieving revision 1.2
diff -u -r1.2 PipedOutputStream.java
--- PipedOutputStream.java	2000/01/19 18:39:25	1.2
+++ PipedOutputStream.java	2000/02/03 17:14:53
@@ -1,6 +1,6 @@
 // PipedOutputStream.java - Write bytes to a pipe.
 
-/* Copyright (C) 1998, 1999  Red Hat, Inc.
+/* Copyright (C) 1998, 1999, 2000  Red Hat, Inc.
 
    This file is part of libgcj.
 
@@ -81,12 +81,15 @@
     destination.receive(oneByte);
   }
 
-  // This is mentioned in the JCL book, but we don't really need it.
-  // If there were a corresponding receive() method on
-  // PipedInputStream then we could get better performance using
-  // this.
-  // public void write (byte[] buffer, int offset, int count)
-  // throws IOException;
+  public void write (byte[] buffer, int offset, int count) throws IOException
+  {
+    if (closed)
+      throw new IOException ();
+    if (offset < 0 || count < 0 || offset + count > buffer.length)
+      throw new ArrayIndexOutOfBoundsException ();
+    for (int i = 0; i < count; ++i)
+      destination.receive (buffer[offset + i]);
+  }
 
   // Instance variables.
   private PipedInputStream destination;

From java-patches-return-435-listarch-java-patches=sourceware.cygnus.com@sourceware.cygnus.com Thu Feb 03 18:25:10 2000
Return-Path: <java-patches-return-435-listarch-java-patches=sourceware.cygnus.com@sourceware.cygnus.com>
Delivered-To: listarch-java-patches@sourceware.cygnus.com
Received: (qmail 4677 invoked by alias); 3 Feb 2000 18:25:10 -0000
Mailing-List: contact java-patches-help@sourceware.cygnus.com; run by ezmlm
Precedence: bulk
List-Subscribe: <mailto:java-patches-subscribe@sourceware.cygnus.com>
List-Archive: <http://sourceware.cygnus.com/ml/java-patches/>
List-Post: <mailto:java-patches@sourceware.cygnus.com>
List-Help: <mailto:java-patches-help@sourceware.cygnus.com>, <http://sourceware.cygnus.com/ml/#faqs>
Sender: java-patches-owner@sourceware.cygnus.com
Delivered-To: mailing list java-patches@sourceware.cygnus.com
Received: (qmail 4649 invoked from network); 3 Feb 2000 18:24:51 -0000
To: Java Patch List <java-patches@sourceware.cygnus.com> 
Subject: Patch: missing 1.1 methods
X-Zippy:  I represent a sardine!!
X-Attribution:  Tom
Bcc:
Reply-To:  tromey@cygnus.com
From:  Tom Tromey <tromey@cygnus.com>
Date: 03 Feb 2000 11:28:48 -0700
Message-ID: <871z6urvhb.fsf@cygnus.com>
Lines: 317
X-Mailer: Gnus v5.5/Emacs 20.3

I'm committing this patch.  It adds a number of methods which are in
1.1 but not previously in libgcj.

2000-02-03  Tom Tromey  <tromey@cygnus.com>

	* java/util/Calendar.java (toString): New method.
	* java/util/SimpleTimeZone.java (clone): New method.
	(toString): New method.
	* java/util/TimeZone.java (clone): New method.
	* java/text/SimpleDateFormat.java (clone): New method.
	* java/text/NumberFormat.java (clone): New method.
	(equals): New method.
	* java/text/Format.java (clone): New method.
	* java/text/DateFormatSymbols.java (DateFormatSymbols): New
	constructor.
	(clone): New method.
	* java/text/DateFormat.java (clone): New method.
	* java/text/Collator.java (clone): New method.

Tom

Index: java/text/Collator.java
===================================================================
RCS file: /cvs/java/libgcj/libjava/java/text/Collator.java,v
retrieving revision 1.3
diff -u -r1.3 Collator.java
--- Collator.java	2000/01/19 18:39:26	1.3
+++ Collator.java	2000/02/03 18:23:10
@@ -1,6 +1,6 @@
 // Collator.java - Locale-sensitive string comparison.
 
-/* Copyright (C) 1999  Red Hat, Inc.
+/* Copyright (C) 1999, 2000  Red Hat, Inc.
 
    This file is part of libgcj.
 
@@ -54,6 +54,11 @@
   public boolean equals (String source, String target)
   {
     return compare (source, target) == 0;
+  }
+
+  public Object clone ()
+  {
+    return super.clone ();
   }
 
   public static synchronized Locale[] getAvailableLocales ()
Index: java/text/DateFormat.java
===================================================================
RCS file: /cvs/java/libgcj/libjava/java/text/DateFormat.java,v
retrieving revision 1.3
diff -u -r1.3 DateFormat.java
--- DateFormat.java	2000/01/19 18:39:26	1.3
+++ DateFormat.java	2000/02/03 18:23:10
@@ -1,4 +1,4 @@
-/* Copyright (C) 1998, 1999  Red Hat, Inc.
+/* Copyright (C) 1998, 1999, 2000  Red Hat, Inc.
 
    This file is part of libgcj.
 
@@ -60,6 +60,12 @@
       return false;
     DateFormat d = (DateFormat) obj;
     return calendar.equals(d.calendar) && numberFormat.equals(d.numberFormat);
+  }
+
+  public Object clone ()
+  {
+    // We know the superclass just call's Object's generic cloner.
+    return super.clone ();
   }
 
   public final StringBuffer format (Object obj,
Index: java/text/DateFormatSymbols.java
===================================================================
RCS file: /cvs/java/libgcj/libjava/java/text/DateFormatSymbols.java,v
retrieving revision 1.2
diff -u -r1.2 DateFormatSymbols.java
--- DateFormatSymbols.java	2000/01/19 18:39:26	1.2
+++ DateFormatSymbols.java	2000/02/03 18:23:15
@@ -1,4 +1,4 @@
-/* Copyright (C) 1998, 1999  Red Hat, Inc.
+/* Copyright (C) 1998, 1999, 2000  Red Hat, Inc.
 
    This file is part of libgcj.
 
@@ -121,6 +121,19 @@
     this (Locale.getDefault());
   }
 
+  // Copy constructor.
+  private DateFormatSymbols (DateFormatSymbols old)
+  {
+    ampms = old.ampms;
+    eras = old.eras;
+    localPatternChars = old.localPatternChars;
+    months = old.months;
+    shortMonths = old.shortMonths;
+    shortWeekdays = old.shortWeekdays;
+    weekdays = old.weekdays;
+    zoneStrings = old.zoneStrings;
+  }
+
   public String[] getAmPmStrings()
   {
     return ampms;
@@ -249,6 +262,11 @@
 	    && equals(shortWeekdays, other.shortWeekdays)
 	    && equals(weekdays, other.weekdays)
 	    && equals(zoneStrings, other.zoneStrings));
+  }
+
+  public Object clone ()
+  {
+    return new DateFormatSymbols (this);
   }
 
   public int hashCode ()
Index: java/text/Format.java
===================================================================
RCS file: /cvs/java/libgcj/libjava/java/text/Format.java,v
retrieving revision 1.2
diff -u -r1.2 Format.java
--- Format.java	2000/01/19 18:39:26	1.2
+++ Format.java	2000/02/03 18:23:15
@@ -1,4 +1,4 @@
-/* Copyright (C) 1998, 1999  Red Hat, Inc.
+/* Copyright (C) 1998, 1999, 2000  Red Hat, Inc.
 
    This file is part of libgcj.
 
@@ -47,5 +47,10 @@
 	throw new ParseException("parseObject failed", index);
       }
     return result;
+  }
+
+  public Object clone ()
+  {
+    return super.clone ();
   }
 }
Index: java/text/NumberFormat.java
===================================================================
RCS file: /cvs/java/libgcj/libjava/java/text/NumberFormat.java,v
retrieving revision 1.3
diff -u -r1.3 NumberFormat.java
--- NumberFormat.java	2000/01/19 18:39:27	1.3
+++ NumberFormat.java	2000/02/03 18:23:15
@@ -1,4 +1,4 @@
-/* Copyright (C) 1998, 1999  Red Hat, Inc.
+/* Copyright (C) 1998, 1999, 2000  Red Hat, Inc.
 
    This file is part of libgcj.
 
@@ -49,6 +49,27 @@
 
   public abstract StringBuffer format (long number,
 				       StringBuffer sbuf, FieldPosition pos);
+
+  public Object clone ()
+  {
+    // We know the superclass just uses Object's generic cloner.
+    // Why not just inherit?  Because the online docs specify that
+    // this method exists for this class.
+    return super.clone ();
+  }
+
+  public boolean equals (Object obj)
+  {
+    if (! (obj instanceof NumberFormat))
+      return false;
+    NumberFormat nf = (NumberFormat) obj;
+    return (groupingUsed == nf.groupingUsed
+	    && maximumFractionDigits == nf.maximumFractionDigits
+	    && maximumIntegerDigits == nf.maximumIntegerDigits
+	    && minimumFractionDigits == nf.minimumFractionDigits
+	    && minimumIntegerDigits == nf.minimumIntegerDigits
+	    && parseIntegerOnly == nf.parseIntegerOnly);
+  }
 
   public static Locale[] getAvailableLocales ()
     {
Index: java/text/SimpleDateFormat.java
===================================================================
RCS file: /cvs/java/libgcj/libjava/java/text/SimpleDateFormat.java,v
retrieving revision 1.2
diff -u -r1.2 SimpleDateFormat.java
--- SimpleDateFormat.java	2000/01/19 18:39:27	1.2
+++ SimpleDateFormat.java	2000/02/03 18:23:18
@@ -1,4 +1,4 @@
-/* Copyright (C) 1998, 1999  Red Hat, Inc.
+/* Copyright (C) 1998, 1999, 2000  Red Hat, Inc.
 
    This file is part of libgcj.
 
@@ -510,6 +510,12 @@
 	    && DateFormatSymbols.equals(formatData, other.formatData)
 	    && DateFormatSymbols.equals(defaultCenturyStart,
 					other.defaultCenturyStart));
+  }
+
+  public Object clone ()
+  {
+    // We know the superclass just call's Object's generic cloner.
+    return super.clone ();
   }
 
   public int hashCode ()
Index: java/util/Calendar.java
===================================================================
RCS file: /cvs/java/libgcj/libjava/java/util/Calendar.java,v
retrieving revision 1.4
diff -u -r1.4 Calendar.java
--- Calendar.java	2000/01/19 18:39:27	1.4
+++ Calendar.java	2000/02/03 18:23:18
@@ -1,4 +1,4 @@
-/* Copyright (C) 1998, 1999  Red Hat, Inc.
+/* Copyright (C) 1998, 1999, 2000  Red Hat, Inc.
 
    This file is part of libgcj.
 
@@ -106,6 +106,21 @@
       {
 	throw new RuntimeException("internal error - "+ex);
       }
+  }
+
+  public String toString ()
+  {
+    // We have much latitude in how we implement this.
+    return ("areFieldsSet " + areFieldsSet
+	    + "; fields " + fields
+	    + "; firstDayOfWeek " + firstDayOfWeek
+	    + "; isSet " + isSet
+	    + "; isTimeSet " + isTimeSet
+	    + "; lenient " + lenient
+	    + "; minimalDaysInFirstWeek " + minimalDaysInFirstWeek
+	    + "; nextStamp " + nextStamp
+	    + "; time " + time
+	    + "; zone " + zone);
   }
 
   public static Calendar getInstance ()
Index: java/util/SimpleTimeZone.java
===================================================================
RCS file: /cvs/java/libgcj/libjava/java/util/SimpleTimeZone.java,v
retrieving revision 1.2
diff -u -r1.2 SimpleTimeZone.java
--- SimpleTimeZone.java	2000/01/19 18:39:27	1.2
+++ SimpleTimeZone.java	2000/02/03 18:23:18
@@ -1,4 +1,4 @@
-/* Copyright (C) 1998, 1999  Red Hat, Inc.
+/* Copyright (C) 1998, 1999, 2000  Red Hat, Inc.
 
    This file is part of libgcj.
 
@@ -167,6 +167,32 @@
       return false;
     SimpleTimeZone other = (SimpleTimeZone) obj;
     return getID() == other.getID() && hasSameRules(other);
+  }
+
+  public Object clone ()
+  {
+    // We know the superclass just call's Object's generic cloner.
+    return super.clone ();
+  }
+
+  public String toString ()
+  {
+    // The docs don't say much about how we might implement this.
+    // We choose a debugging implementation.
+    return ("dstSavings " + dstSavings
+	    + "; rawOffset " + rawOffset
+	    + "; startDay " + startDay
+	    + "; startDayOfWeek " + startDayOfWeek
+	    + "; startMode " + startMode
+	    + "; startMonth " + startMonth
+	    + "; startTime " + startTime
+	    + "; startYear " + startYear
+	    + "; endDay " + endDay
+	    + "; endDayOfWeek " + endDayOfWeek
+	    + "; endMode " + endMode
+	    + "; endMonth " + endMonth
+	    + "; endTime " + endTime
+	    + "; useDaylight " + useDaylight);
   }
 
   public int hashCode ()
Index: java/util/TimeZone.java
===================================================================
RCS file: /cvs/java/libgcj/libjava/java/util/TimeZone.java,v
retrieving revision 1.3
diff -u -r1.3 TimeZone.java
--- TimeZone.java	2000/01/19 18:39:27	1.3
+++ TimeZone.java	2000/02/03 18:23:20
@@ -1,4 +1,4 @@
-/* Copyright (C) 1998, 1999  Red Hat, Inc.
+/* Copyright (C) 1998, 1999, 2000  Red Hat, Inc.
 
    This file is part of libgcj.
 
@@ -152,7 +152,11 @@
     return this == other;
   }
 
-  // public Object clone ();
+  public Object clone ()
+  {
+    // Just use Object's generic cloner.
+    return super.clone ();
+  }
 
   // Names of timezones.  This array is kept in parallel with
   // rawOffsets.  This list comes from the JCL 1.1 book.

From java-patches-return-436-listarch-java-patches=sourceware.cygnus.com@sourceware.cygnus.com Fri Feb 04 20:33:59 2000
Return-Path: <java-patches-return-436-listarch-java-patches=sourceware.cygnus.com@sourceware.cygnus.com>
Delivered-To: listarch-java-patches@sourceware.cygnus.com
Received: (qmail 9259 invoked by alias); 4 Feb 2000 20:33:59 -0000
Mailing-List: contact java-patches-help@sourceware.cygnus.com; run by ezmlm
Precedence: bulk
List-Subscribe: <mailto:java-patches-subscribe@sourceware.cygnus.com>
List-Archive: <http://sourceware.cygnus.com/ml/java-patches/>
List-Post: <mailto:java-patches@sourceware.cygnus.com>
List-Help: <mailto:java-patches-help@sourceware.cygnus.com>, <http://sourceware.cygnus.com/ml/#faqs>
Sender: java-patches-owner@sourceware.cygnus.com
Delivered-To: mailing list java-patches@sourceware.cygnus.com
Received: (qmail 9072 invoked from network); 4 Feb 2000 20:33:34 -0000
To: Java Patch List <java-patches@sourceware.cygnus.com> 
Subject: Patch: even more JNI work
X-Zippy:  Now, my ENTIRE LIFE is flashing before my EYES as I park my DODGE
 DART in your EXXON service area for a COMPLETE LUBRICATION!!
X-Attribution:  Tom
Bcc:
Reply-To:  tromey@cygnus.com
From:  Tom Tromey <tromey@cygnus.com>
Date: 04 Feb 2000 13:37:39 -0700
Message-ID: <87n1pgr9f0.fsf@cygnus.com>
Lines: 576
X-Mailer: Gnus v5.5/Emacs 20.3

I'm checking in this patch.  It changes libgcj to look up JNI
functions in the libraries that have been loaded.  This is done in an
extremely stupid way (we check for the symbol in every library).  I
don't see any better way to do it though.

This patch also fixes a buglet in natClassLoader.cc (some globals that
should have been static were not).

2000-02-04  Tom Tromey  <tromey@cygnus.com>

	* defineclass.cc (handleMethodsBegin): Allocate _Jv_MethodBase
	pointers.
	(handleMethodsEnd): Fixed error messages.  Create a _Jv_JNIMethod
	if the method is native.
	* resolve.cc (ncode): Don't handle native methods.
	(_Jv_JNIMethod::ncode): New method.
	(_Jv_PrepareClass): Handle native methods.
	* jni.cc (call): Renamed from _Jv_JNI_conversion_call.
	Include AbstractMethodError.h.
	(add_char): New function.
	(mangled_name): Likewise.
	* include/java-interp.h (class _Jv_JNIMethod): New class.
	(class _Jv_MethodBase): New class.
	(class _Jv_InterpMethod): Derive from _Jv_MethodBase.
	(_Jv_InterpClass): Changed `interpreted_methods' field to type
	`_Jv_MethodBase'.

	* include/jvm.h (_Jv_FindSymbolInExecutable): Declare.
	* java/lang/natRuntime.cc (libraries_size, libraries_count,
	libraries): New globals.
	(add_library): New function.
	(_Jv_FindSymbolInExecutable): New function.

	* java/lang/natClassLoader.cc (initiated_classes, loaded_classes):
	Now static.

Tom

Index: defineclass.cc
===================================================================
RCS file: /cvs/java/libgcj/libjava/defineclass.cc,v
retrieving revision 1.7
diff -u -r1.7 defineclass.cc
--- defineclass.cc	2000/01/20 17:32:26	1.7
+++ defineclass.cc	2000/02/04 20:26:27
@@ -1142,13 +1142,15 @@
 
 
 
-void _Jv_ClassReader::handleMethodsBegin (int count)
+void
+_Jv_ClassReader::handleMethodsBegin (int count)
 {
   def->methods = (_Jv_Method*)
     _Jv_AllocBytesChecked (sizeof (_Jv_Method)*count);
 
-  def->interpreted_methods = (_Jv_InterpMethod**)
-    _Jv_AllocBytesChecked (sizeof (_Jv_InterpMethod*) * count);
+  def->interpreted_methods
+    = (_Jv_MethodBase **) _Jv_AllocBytesChecked (sizeof (_Jv_MethodBase *)
+						 * count);
 
   for (int i = 0; i < count; i++)
     def->interpreted_methods[i] = 0;
@@ -1230,7 +1232,8 @@
   (int method_index, int exc_index, 
    int start_pc, int end_pc, int handler_pc, int catch_type)
 {
-  _Jv_InterpMethod *method = def->interpreted_methods[method_index];
+  _Jv_InterpMethod *method = reinterpret_cast<_Jv_InterpMethod *>
+    (def->interpreted_methods[method_index]);
   _Jv_InterpException *exc = method->exceptions ();
 
   exc[exc_index].start_pc     = start_pc;
@@ -1246,17 +1249,29 @@
   for (int i = 0; i < def->method_count; i++)
     {
       _Jv_Method *method = &def->methods[i];
-      if (method->accflags & (Modifier::NATIVE | Modifier::ABSTRACT))
+      if ((method->accflags & Modifier::NATIVE) != 0)
 	{
 	  if (def->interpreted_methods[i] != 0)
-	    throw_class_format_error ("code provided "
-				      "for abstract or native method");
+	    throw_class_format_error ("code provided for native method");
+	  else
+	    {
+	      _Jv_JNIMethod *m = (_Jv_JNIMethod *)
+		_Jv_AllocBytesChecked (sizeof (_Jv_JNIMethod));
+	      m->defining_class = def;
+	      m->self = method;
+	      m->function = NULL;
+	      def->interpreted_methods[i] = m;
+	    }
 	}
+      else if ((method->accflags & Modifier::ABSTRACT) != 0)
+	{
+	  if (def->interpreted_methods[i] != 0)
+	    throw_class_format_error ("code provided for abstract method");
+	}
       else
 	{
 	  if (def->interpreted_methods[i] == 0)
-	    throw_class_format_error ("abstract or native method "
-				      "with no code");
+	    throw_class_format_error ("method with no code");
 	}
     }
 
Index: jni.cc
===================================================================
RCS file: /cvs/java/libgcj/libjava/jni.cc,v
retrieving revision 1.9
diff -u -r1.9 jni.cc
--- jni.cc	2000/02/02 01:55:03	1.9
+++ jni.cc	2000/02/04 20:26:52
@@ -32,6 +32,7 @@
 #include <java/lang/Throwable.h>
 #include <java/lang/ArrayIndexOutOfBoundsException.h>
 #include <java/lang/StringIndexOutOfBoundsException.h>
+#include <java/lang/AbstractMethodError.h>
 #include <java/lang/InstantiationException.h>
 #include <java/lang/NoSuchFieldError.h>
 #include <java/lang/NoSuchMethodError.h>
@@ -1204,15 +1205,95 @@
 
 
 
+// Add a character to the buffer, encoding properly.
+static void
+add_char (char *buf, jchar c, int *here)
+{
+  if (c == '_')
+    {
+      buf[(*here)++] = '_';
+      buf[(*here)++] = '1';
+    }
+  else if (c == ';')
+    {
+      buf[(*here)++] = '_';
+      buf[(*here)++] = '2';
+    }
+  else if (c == '[')
+    {
+      buf[(*here)++] = '_';
+      buf[(*here)++] = '3';
+    }
+  else if (c == '/')
+    buf[(*here)++] = '_';
+  if ((c >= '0' && c <= '9')
+      || (c >= 'a' && c <= 'z')
+      || (c >= 'A' && c <= 'Z'))
+    buf[(*here)++] = (char) c;
+  else
+    {
+      // "Unicode" character.
+      buf[(*here)++] = '_';
+      buf[(*here)++] = '0';
+      // FIXME: hex.  FIXME: use upper or lower case?
+    }
+}
+
+// Compute a mangled name for a native function.  This computes the
+// long name, and also returns an index which indicates where a NUL
+// can be placed to create the short name.  This function assumes that
+// the buffer is large enough for its results.
+static void
+mangled_name (jclass klass, _Jv_Utf8Const *func_name,
+	      _Jv_Utf8Const *signature, char *buf, int *long_start)
+{
+  strcpy (buf, "Java_");
+  int here = 5;
+
+  // Add fully qualified class name.
+  jchar *chars = _Jv_GetStringChars (klass->getName ());
+  jint len = klass->getName ()->length ();
+  for (int i = 0; i < len; ++i)
+    add_char (buf, chars[i], &here);
+
+  // Don't use add_char because we need a literal `_'.
+  buf[here++] = '_';
+
+  const unsigned char *fn = (const unsigned char *) func_name->data;
+  const unsigned char *limit = fn + func_name->length;
+  for (int i = 0; ; ++i)
+    {
+      int ch = UTF8_GET (fn, limit);
+      if (ch < 0)
+	break;
+      add_char (buf, ch, &here);
+    }
+
+  // This is where the long signature begins.
+  *long_start = here;
+  buf[here++] = '_';
+  buf[here++] = '_';
+
+  const unsigned char *sig = (const unsigned char *) signature->data;
+  limit = sig + signature->length;
+  JvAssert (signature[0] == '(');
+  for (int i = 1; ; ++i)
+    {
+      int ch = UTF8_GET (sig, limit);
+      if (ch == ')' || ch < 0)
+	break;
+      add_char (buf, ch, &here);
+    }
+
+  buf[here] = '\0';
+}
+
 // This function is the stub which is used to turn an ordinary (CNI)
 // method call into a JNI call.
 void
-_Jv_JNI_conversion_call (ffi_cif *cif,
-			 void *ret,
-			 ffi_raw *args,
-			 void *__this)
+_Jv_JNIMethod::call (ffi_cif *cif, void *ret, ffi_raw *args, void *__this)
 {
-  _Jv_InterpMethod* _this = (_Jv_InterpMethod*)__this;
+  _Jv_JNIMethod* _this = (_Jv_JNIMethod *) __this;
 
   JNIEnv env;
   _Jv_JNI_LocalFrame *frame
@@ -1233,11 +1314,34 @@
   // FIXME: we should mark every reference parameter as a local.  For
   // now we assume a conservative GC, and we assume that the
   // references are on the stack somewhere.
+
+  // We cache the value that we find, of course, but if we don't find
+  // a value we don't cache that fact -- we might subsequently load a
+  // library which finds the function in question.
+  if (_this->function == NULL)
+    {
+      char buf[10 + 6 * (_this->self->name->length
+			 + _this->self->signature->length)];
+      int long_start;
+      mangled_name (_this->defining_class, _this->self->name,
+		    _this->self->signature, buf, &long_start);
+      char c = buf[long_start];
+      buf[long_start] = '\0';
+      _this->function = _Jv_FindSymbolInExecutable (buf);
+      if (_this->function == NULL)
+	{
+	  buf[long_start] = c;
+	  _this->function = _Jv_FindSymbolInExecutable (buf);
+	  if (_this->function == NULL)
+	    {
+	      jstring str = JvNewStringUTF (_this->self->name->data);
+	      JvThrow (new java::lang::AbstractMethodError (str));
+	    }
+	}
+    }
 
-  ffi_raw_call (cif,
-		NULL, // FIXME: function pointer.
-		ret,
-		args);
+  // The actual call to the JNI function.
+  ffi_raw_call (cif, (void (*) (...)) _this->function, ret, args);
 
   do
     {
Index: resolve.cc
===================================================================
RCS file: /cvs/java/libgcj/libjava/resolve.cc,v
retrieving revision 1.11
diff -u -r1.11 resolve.cc
--- resolve.cc	2000/02/02 01:55:03	1.11
+++ resolve.cc	2000/02/04 20:26:54
@@ -563,21 +563,21 @@
      have code -- for static constructors. */
   for (int i = 0; i < clz->method_count; i++)
     {
-      _Jv_InterpMethod *imeth = clz->interpreted_methods[i];
+      _Jv_MethodBase *imeth = clz->interpreted_methods[i];
 
-      if (imeth != 0)		// it could be abstract or native
+      if ((clz->methods[i].accflags & Modifier::NATIVE) != 0)
 	{
-	  clz->methods[i].ncode = imeth->ncode ();
+	  // You might think we could use a virtual `ncode' method in
+	  // the _Jv_MethodBase and unify the native and non-native
+	  // cases.  Well, we can't, because we don't allocate these
+	  // objects using `new', and thus they don't get a vtable.
+	  _Jv_JNIMethod *jnim = reinterpret_cast<_Jv_JNIMethod *> (imeth);
+	  clz->methods[i].ncode = jnim->ncode ();
 	}
-      else
+      else if (imeth != 0)		// it could be abstract
 	{
-	  if ((clz->methods[i].accflags & Modifier::NATIVE) != 0)
-	    {
-	      JvThrow
-		(new java::lang::VirtualMachineError
-		 (JvNewStringLatin1 
-		  ("the interpreter does not support native methods")));
-	    }
+	  _Jv_InterpMethod *im = reinterpret_cast<_Jv_InterpMethod *> (im);
+	  clz->methods[i].ncode = im->ncode ();
 	}
     }
 
@@ -588,13 +588,6 @@
       return;
     }
 
-  /* FIXME: native methods for interpreted classes should be handled, I
-   * dunno exactly how, but it seems that we should try to find them at
-   * this point, and if we fail, try again after <clinit>, since it
-   * could have caused additional code to be loaded.  Interfaces cannot
-   * have native methods (not even for static initialization). */
-
-
   /* Now onto the actual job: vtable layout.  First, count how many new
      methods we have */
   int new_method_count = 0;
@@ -1022,13 +1015,9 @@
 
   args_raw_size = ffi_raw_size (&closure->cif);
 
-  if ((self->accflags & Modifier::NATIVE) != 0)
-    {
-      // FIXME: for now we assume that all native methods for
-      // interpreted code use JNI.
-      fun = (ffi_closure_fun) &_Jv_JNI_conversion_call;
-    }
-  else if ((self->accflags & Modifier::SYNCHRONIZED) != 0)
+  JvAssert ((self->accflags & Modifier::NATIVE) == 0);
+
+  if ((self->accflags & Modifier::SYNCHRONIZED) != 0)
     {
       if (staticp)
 	fun = (ffi_closure_fun)&_Jv_InterpMethod::run_synch_class;
@@ -1040,10 +1029,49 @@
       fun = (ffi_closure_fun)&_Jv_InterpMethod::run_normal;
     }
 
+  ffi_prep_raw_closure (&closure->closure,
+			&closure->cif, 
+			fun,
+			(void*) this);
+
+  self->ncode = (void*)closure;
+  return self->ncode;
+}
+
+
+void *
+_Jv_JNIMethod::ncode ()
+{
+  using namespace java::lang::reflect;
+
+  if (self->ncode != 0)
+    return self->ncode;
+
+  jboolean staticp = (self->accflags & Modifier::STATIC) != 0;
+  int arg_count = count_arguments (self->signature, staticp);
+
+  ncode_closure *closure =
+    (ncode_closure*)_Jv_AllocBytesChecked (sizeof (ncode_closure)
+					+ arg_count * sizeof (ffi_type*));
+
+  init_cif (self->signature,
+	    arg_count,
+	    staticp,
+	    &closure->cif,
+	    &closure->arg_types[0]);
+
+  ffi_closure_fun fun;
+
+  JvAssert ((self->accflags & Modifier::NATIVE) != 0);
+
+  // FIXME: for now we assume that all native methods for
+  // interpreted code use JNI.
+  fun = (ffi_closure_fun) &_Jv_JNIMethod::call;
+
   ffi_prep_raw_closure (&closure->closure,
-		     &closure->cif, 
-		     fun,
-		     (void*)this);
+			&closure->cif, 
+			fun,
+			(void*) this);
 
   self->ncode = (void*)closure;
   return self->ncode;
Index: include/java-interp.h
===================================================================
RCS file: /cvs/java/libgcj/libjava/include/java-interp.h,v
retrieving revision 1.5
diff -u -r1.5 java-interp.h
--- java-interp.h	2000/02/02 01:55:03	1.5
+++ java-interp.h	2000/02/04 20:26:58
@@ -14,6 +14,18 @@
 #include <jvm.h>
 #include <java-cpool.h>
 
+// Base class for method representations.  Subclasses are interpreted
+// and JNI methods.
+class _Jv_MethodBase
+{
+protected:
+  // The class which defined this method.
+  _Jv_InterpClass *defining_class;
+
+  // The method description.
+  _Jv_Method *self;
+};
+
 #ifdef INTERPRETER
 
 #pragma interface
@@ -65,9 +77,9 @@
   friend class _Jv_ClassReader;
   friend class _Jv_InterpMethod;
 };
-
-class _Jv_InterpMethod {
 
+class _Jv_InterpMethod : public _Jv_MethodBase
+{
   _Jv_ushort       max_stack;
   _Jv_ushort       max_locals;
   int              code_length;
@@ -75,9 +87,6 @@
   _Jv_ushort       exc_count;
   _Jv_ushort       args_raw_size;
 
-  _Jv_InterpClass *defining_class;
-  _Jv_Method      *self;
-
   unsigned char* bytecode () 
   {
     return 
@@ -121,9 +130,6 @@
   friend class gnu::gcj::runtime::MethodInvocation;
 
   friend void _Jv_PrepareClass(jclass);
-
-  // This function is used when making a JNI call from the interpreter.
-  friend void _Jv_JNI_conversion_call (ffi_cif *, void *, ffi_raw *, void *);
 };
 
 class _Jv_InterpMethodInvocation {
@@ -140,7 +146,7 @@
   
 class _Jv_InterpClass : public java::lang::Class
 {
-  _Jv_InterpMethod **interpreted_methods;
+  _Jv_MethodBase **interpreted_methods;
   _Jv_ushort        *field_initializers;
 
   friend class _Jv_ClassReader;
@@ -164,5 +170,20 @@
 };
 
 #endif /* INTERPRETER */
+
+class _Jv_JNIMethod : public _Jv_MethodBase
+{
+  // The underlying function.  If NULL we have to look for the
+  // function.
+  void *function;
+
+  // This function is used when making a JNI call from the interpreter.
+  static void call (ffi_cif *, void *, ffi_raw *, void *);
+
+  void *ncode ();
+
+  friend class _Jv_ClassReader;
+  friend void _Jv_PrepareClass(jclass);
+};
 
 #endif /* __JAVA_INTERP_H__ */
Index: include/jvm.h
===================================================================
RCS file: /cvs/java/libgcj/libjava/include/jvm.h,v
retrieving revision 1.14
diff -u -r1.14 jvm.h
--- jvm.h	2000/02/02 01:55:03	1.14
+++ jvm.h	2000/02/04 20:26:58
@@ -201,6 +201,9 @@
 extern char *_Jv_ThisExecutable (void);
 extern void _Jv_ThisExecutable (const char *);
 
+/* Return a pointer to a symbol in executable or loaded library.  */
+void *_Jv_FindSymbolInExecutable (const char *);
+
 /* Initialize JNI.  */
 extern void _Jv_JNI_Init (void);
 
Index: java/lang/natClassLoader.cc
===================================================================
RCS file: /cvs/java/libgcj/libjava/java/lang/natClassLoader.cc,v
retrieving revision 1.15
diff -u -r1.15 natClassLoader.cc
--- natClassLoader.cc	2000/01/19 18:39:26	1.15
+++ natClassLoader.cc	2000/02/04 20:27:08
@@ -308,8 +308,12 @@
     java::lang::ClassLoader *loader;
 };
 
-_Jv_LoaderInfo *initiated_classes[HASH_LEN];
-jclass loaded_classes[HASH_LEN];
+static _Jv_LoaderInfo *initiated_classes[HASH_LEN];
+static jclass loaded_classes[HASH_LEN];
+
+// This is the root of a linked list of classes
+
+
 
 jclass
 _Jv_FindClassInCache (_Jv_Utf8Const *name, java::lang::ClassLoader *loader)
Index: java/lang/natRuntime.cc
===================================================================
RCS file: /cvs/java/libgcj/libjava/java/lang/natRuntime.cc,v
retrieving revision 1.5
diff -u -r1.5 natRuntime.cc
--- natRuntime.cc	2000/01/19 18:39:26	1.5
+++ natRuntime.cc	2000/02/04 20:27:12
@@ -24,7 +24,52 @@
 /* FIXME: we don't always need this.  The next libtool will let us use
    AC_LTDL_PREOPEN to see if we do.  */
 const lt_dlsymlist lt_preloaded_symbols[1] = { { 0, 0 } };
-#endif
+
+// We keep track of all the libraries loaded by this application.  For
+// now we use them to look up symbols for JNI.  `libraries_size' holds
+// the total size of the buffer.  `libraries_count' is the number of
+// items which are in use.
+static int libraries_size;
+static int libraries_count;
+static lt_dlhandle *libraries;
+
+static void
+add_library (lt_dlhandle lib)
+{
+  if (libraries_count == libraries_size)
+    {
+      int ns = libraries_size * 2;
+      if (ns == 0)
+	ns = 10;
+      lt_dlhandle *n = (lt_dlhandle *) _Jv_Malloc (ns * sizeof (lt_dlhandle));
+      if (libraries)
+	{
+	  memcpy (n, libraries, libraries_size * sizeof (lt_dlhandle));
+	  _Jv_Free (libraries);
+	}
+      libraries = n;
+      libraries_size = ns;
+      for (int i = libraries_count; i < libraries_size; ++i)
+	libraries[i] = NULL;
+    }
+
+  libraries[libraries_count++] = lib;
+}
+
+void *
+_Jv_FindSymbolInExecutable (const char *symname)
+{
+  for (int i = 0; i < libraries_count; ++i)
+    {
+      void *r = lt_dlsym (libraries[i], symname);
+      if (r)
+	return r;
+    }
+
+  return lt_dlsym (NULL, symname);
+}
+
+#endif /* USE_LTDL */
 
 void
 java::lang::Runtime::exit (jint status)

From java-patches-return-437-listarch-java-patches=sourceware.cygnus.com@sourceware.cygnus.com Fri Feb 04 22:21:42 2000
Return-Path: <java-patches-return-437-listarch-java-patches=sourceware.cygnus.com@sourceware.cygnus.com>
Delivered-To: listarch-java-patches@sourceware.cygnus.com
Received: (qmail 32037 invoked by alias); 4 Feb 2000 22:21:41 -0000
Mailing-List: contact java-patches-help@sourceware.cygnus.com; run by ezmlm
Precedence: bulk
List-Subscribe: <mailto:java-patches-subscribe@sourceware.cygnus.com>
List-Archive: <http://sourceware.cygnus.com/ml/java-patches/>
List-Post: <mailto:java-patches@sourceware.cygnus.com>
List-Help: <mailto:java-patches-help@sourceware.cygnus.com>, <http://sourceware.cygnus.com/ml/#faqs>
Sender: java-patches-owner@sourceware.cygnus.com
Delivered-To: mailing list java-patches@sourceware.cygnus.com
Received: (qmail 32012 invoked from network); 4 Feb 2000 22:21:40 -0000
Date: Fri, 4 Feb 2000 14:21:35 -0800 (PST)
From: Warren Levy <warrenl@cygnus.com>
To: java-patches@sourceware.cygnus.com
cc: per@bothner.com
Subject: Patch: New support for java.math.BigInteger
Message-ID: <Pine.SOL.3.91.1000204141127.6070A-100000@fencer.cygnus.com>
MIME-Version: 1.0
Content-Type: TEXT/PLAIN; charset=US-ASCII

Folks,
I've just checked in code to handle java.math.BigInteger to sourceware's 
libgcj.  This is a Pure Java solution and credit for this goes mostly to 
Per Bothner <per@bothner.com>.  Per has let us use his MPN and IntNum 
classes from Kawa in libgcj.

2000-02-04  Warren Levy  <warrenl@cygnus.com>

        * Makefile.am: Added MPN.java and BigInteger.java.
        * Makefile.in: Rebuilt.
        * gnu/gcj/math/MPN.java: New file.  From Kawa by Per Bothner
        <per@bothner.com>.
        * java/math/BigInteger.java: New file.  Based primarily on
        Kawa's IntNum.java by Per Bothner <per@bothner.com>.


There are still a few BigInteger methods I haven't implemented; they're 
listed at the end of BigInteger.java.  Feel free to implement these if 
you wish.  The vast majority of BigInteger functionality though has been 
checked in, so hammer away at it.
--warrenl

From java-patches-return-438-listarch-java-patches=sourceware.cygnus.com@sourceware.cygnus.com Fri Feb 04 23:24:37 2000
Return-Path: <java-patches-return-438-listarch-java-patches=sourceware.cygnus.com@sourceware.cygnus.com>
Delivered-To: listarch-java-patches@sourceware.cygnus.com
Received: (qmail 11249 invoked by alias); 4 Feb 2000 23:24:37 -0000
Mailing-List: contact java-patches-help@sourceware.cygnus.com; run by ezmlm
Precedence: bulk
List-Subscribe: <mailto:java-patches-subscribe@sourceware.cygnus.com>
List-Archive: <http://sourceware.cygnus.com/ml/java-patches/>
List-Post: <mailto:java-patches@sourceware.cygnus.com>
List-Help: <mailto:java-patches-help@sourceware.cygnus.com>, <http://sourceware.cygnus.com/ml/#faqs>
Sender: java-patches-owner@sourceware.cygnus.com
Delivered-To: mailing list java-patches@sourceware.cygnus.com
Received: (qmail 11228 invoked from network); 4 Feb 2000 23:24:35 -0000
To: Warren Levy <warrenl@cygnus.com>
Cc: java-patches@sourceware.cygnus.com
Subject: Re: Patch: New support for java.math.BigInteger
References: <Pine.SOL.3.91.1000204141127.6070A-100000@fencer.cygnus.com>
From: Per Bothner <per@bothner.com>
Date: 04 Feb 2000 15:00:49 -0800
In-Reply-To: Warren Levy's message of "Fri, 4 Feb 2000 14:21:35 -0800 (PST)"
Message-ID: <m2snz8r2se.fsf@magnus.bothner.com>
Lines: 34
User-Agent: Gnus/5.070098 (Pterodactyl Gnus v0.98) XEmacs/21.2(beta14) (Dionysos)
MIME-Version: 1.0
Content-Type: text/plain; charset=us-ascii

Warren Levy <warrenl@cygnus.com> writes:

> I've just checked in code to handle java.math.BigInteger to sourceware's 
> libgcj.  This is a Pure Java solution and credit for this goes mostly to 
> Per Bothner <per@bothner.com>.  Per has let us use his MPN and IntNum 
> classes from Kawa in libgcj.

One thing Warren didn't mention, which I think is kinda cool, is that
MPN is basically a Pure Java version of the libgmp low-level routines
(the mpn_* functions).  In other words, it should be easy to write a
version that uses libgmp's highly tuned mpn_ functions instead.
There are some licensing and other issues so that we don't (at this
point at least) want to make that the default, but it would be nice
to set up a configure option to use libgmp instead of MPN.java.
(One caveat:  Except for the configure stuff, it should be trivial
to plug in gmp pn 32-bit systems,  On system where libgmp uses
64-bit "limbs" it is less obvious what to do.)

Perhaps writing the necesaary CNI glue plus the configure magic
might be a nice small project for a volunteer?

> There are still a few BigInteger methods I haven't implemented; they're 
> listed at the end of BigInteger.java.  Feel free to implement these if 
> you wish.  The vast majority of BigInteger functionality though has been 
> checked in, so hammer away at it.

You can use the gnu.math.BitOps class to write the logical operations,
including bitCount.

The BigInteger(String) and BigInteger(String, int radix) constructors
should be easy to write using IntNum's valueOf methods.
-- 
	--Per Bothner
per@bothner.com   http://www.bothner.com/~per/

From java-patches-return-439-listarch-java-patches=sourceware.cygnus.com@sourceware.cygnus.com Mon Feb 07 21:16:51 2000
Return-Path: <java-patches-return-439-listarch-java-patches=sourceware.cygnus.com@sourceware.cygnus.com>
Delivered-To: listarch-java-patches@sourceware.cygnus.com
Received: (qmail 29266 invoked by alias); 7 Feb 2000 21:16:50 -0000
Mailing-List: contact java-patches-help@sourceware.cygnus.com; run by ezmlm
Precedence: bulk
List-Subscribe: <mailto:java-patches-subscribe@sourceware.cygnus.com>
List-Archive: <http://sourceware.cygnus.com/ml/java-patches/>
List-Post: <mailto:java-patches@sourceware.cygnus.com>
List-Help: <mailto:java-patches-help@sourceware.cygnus.com>, <http://sourceware.cygnus.com/ml/#faqs>
Sender: java-patches-owner@sourceware.cygnus.com
Delivered-To: mailing list java-patches@sourceware.cygnus.com
Received: (qmail 29233 invoked from network); 7 Feb 2000 21:16:41 -0000
To: Java Patch List <java-patches@sourceware.cygnus.com> 
Subject: Patch: fix compilation with interpreter
X-Zippy:  Wow!  Look!!  A stray meatball!!  Let's interview it!
X-Attribution:  Tom
Bcc:
Reply-To:  tromey@cygnus.com
From:  Tom Tromey <tromey@cygnus.com>
Date: 07 Feb 2000 14:15:24 -0700
Message-ID: <87emaor9xv.fsf@cygnus.com>
Lines: 123
X-Mailer: Gnus v5.5/Emacs 20.3

Anthony pointed out to me that one of my recent JNI checkins broke
compilation when the interpreter was not enabled.  I'm checking in
this patch to fix the problem.

2000-02-07  Tom Tromey  <tromey@cygnus.com>

	* jni.cc (add_char): Conditional on INTERPRETER.
	(mangled_name): Likewise.
	(call): Likewise.
	* include/java-interp.h (class _Jv_MethodBase): Conditional on
	INTERPRETER.
	(class _Jv_JNIMethod): Likewise.

Tom

Index: jni.cc
===================================================================
RCS file: /cvs/java/libgcj/libjava/jni.cc,v
retrieving revision 1.10
diff -u -r1.10 jni.cc
--- jni.cc	2000/02/04 20:49:26	1.10
+++ jni.cc	2000/02/07 18:49:50
@@ -8,12 +8,6 @@
 Libgcj License.  Please consult the file "LIBGCJ_LICENSE" for
 details.  */
 
-// Note: currently we take the approach of not checking most
-// arguments.  Instead we could do more checking conditionally (e.g.,
-// if DEBUG is defined).  That might be beneficial in some cases,
-// though to me it seems that one could just as easily use the
-// debugger.
-
 #include <config.h>
 
 #include <stddef.h>
@@ -1205,6 +1199,8 @@
 
 
 
+#ifdef INTERPRETER
+
 // Add a character to the buffer, encoding properly.
 static void
 add_char (char *buf, jchar c, int *here)
@@ -1347,6 +1343,7 @@
     }
 
   // The actual call to the JNI function.
+  // FIXME: if this is a static function we must include the class!
   ffi_raw_call (cif, (void (*) (...)) _this->function, ret, args);
 
   do
@@ -1358,6 +1355,8 @@
   if (env.ex)
     JvThrow (env.ex);
 }
+
+#endif /* INTERPRETER */
 
 
 
Index: include/java-interp.h
===================================================================
RCS file: /cvs/java/libgcj/libjava/include/java-interp.h,v
retrieving revision 1.6
diff -u -r1.6 java-interp.h
--- java-interp.h	2000/02/04 20:49:27	1.6
+++ java-interp.h	2000/02/07 18:49:50
@@ -14,18 +14,6 @@
 #include <jvm.h>
 #include <java-cpool.h>
 
-// Base class for method representations.  Subclasses are interpreted
-// and JNI methods.
-class _Jv_MethodBase
-{
-protected:
-  // The class which defined this method.
-  _Jv_InterpClass *defining_class;
-
-  // The method description.
-  _Jv_Method *self;
-};
-
 #ifdef INTERPRETER
 
 #pragma interface
@@ -78,6 +66,18 @@
   friend class _Jv_InterpMethod;
 };
 
+// Base class for method representations.  Subclasses are interpreted
+// and JNI methods.
+class _Jv_MethodBase
+{
+protected:
+  // The class which defined this method.
+  _Jv_InterpClass *defining_class;
+
+  // The method description.
+  _Jv_Method *self;
+};
+
 class _Jv_InterpMethod : public _Jv_MethodBase
 {
   _Jv_ushort       max_stack;
@@ -169,8 +169,6 @@
   ffi_type *      arg_types[0];
 };
 
-#endif /* INTERPRETER */
-
 class _Jv_JNIMethod : public _Jv_MethodBase
 {
   // The underlying function.  If NULL we have to look for the
@@ -185,5 +183,7 @@
   friend class _Jv_ClassReader;
   friend void _Jv_PrepareClass(jclass);
 };
+
+#endif /* INTERPRETER */
 
 #endif /* __JAVA_INTERP_H__ */

From java-patches-return-440-listarch-java-patches=sourceware.cygnus.com@sourceware.cygnus.com Mon Feb 07 21:44:03 2000
Return-Path: <java-patches-return-440-listarch-java-patches=sourceware.cygnus.com@sourceware.cygnus.com>
Delivered-To: listarch-java-patches@sourceware.cygnus.com
Received: (qmail 4127 invoked by alias); 7 Feb 2000 21:44:03 -0000
Mailing-List: contact java-patches-help@sourceware.cygnus.com; run by ezmlm
Precedence: bulk
List-Subscribe: <mailto:java-patches-subscribe@sourceware.cygnus.com>
List-Archive: <http://sourceware.cygnus.com/ml/java-patches/>
List-Post: <mailto:java-patches@sourceware.cygnus.com>
List-Help: <mailto:java-patches-help@sourceware.cygnus.com>, <http://sourceware.cygnus.com/ml/#faqs>
Sender: java-patches-owner@sourceware.cygnus.com
Delivered-To: mailing list java-patches@sourceware.cygnus.com
Received: (qmail 3916 invoked from network); 7 Feb 2000 21:43:37 -0000
To: Java Patch List <java-patches@sourceware.cygnus.com> 
Subject: Patch: more 1.1 front-end tests
X-Zippy:  I'm wearing PAMPERS!!
X-Attribution:  Tom
Bcc:
Reply-To:  tromey@cygnus.com
From:  Tom Tromey <tromey@cygnus.com>
Date: 07 Feb 2000 14:29:08 -0700
Message-ID: <87bt5sr9az.fsf@cygnus.com>
Lines: 433
X-Mailer: Gnus v5.5/Emacs 20.3

I'm checking in this patch.  It adds a number of new 1.1 tests for the
compiler front end.  These tests are from Alex.

2000-02-07  Alexandre Petit-Bianco  <apbianco@cygnus.com>

	* libjava.lang/instinit2.out: New file.
	* libjava.lang/instinit2.java: New file.
	* libjava.lang/instinit.out: New file.
	* libjava.lang/instinit.java: New file.
	* libjava.lang/anonarray2.out: New file.
	* libjava.lang/anonarray2.java: New file.
	* libjava.lang/anonarray.out: New file.
	* libjava.lang/anonarray.java: New file.
	* libjava.lang/nested_with_ctor.out: New file.
	* libjava.lang/nested_with_ctor.java: New file.
	* libjava.lang/anfi.out: New file.
	* libjava.lang/anfi.java: New file.
	* libjava.lang/stub.out: New file.
	* libjava.lang/stub.java: New file.

Tom

Index: libjava.lang/anfi.java
===================================================================
RCS file: anfi.java
diff -N anfi.java
--- /dev/null	Tue May  5 13:32:27 1998
+++ anfi.java	Mon Feb  7 13:18:14 2000
@@ -0,0 +1,33 @@
+// Class anfi
+// Generated on Sat Jan 29 16:06:33 PST 2000
+// Anonymous with access to outer context locals
+
+class anfi {
+
+    itf foo (final String s, final int i) {
+        return new itf () {
+            String buff = s+" "+i;
+            public void setString (String s) { buff = s+" "+i; }
+            public String getString () { return buff; }
+        };
+    }
+
+    void test () {
+        itf x = foo ("Hello", 123);
+        System.out.println (x.getString ());
+        x.setString ("Frinkahedron");
+        System.out.println (x.getString ());
+    }
+
+    public static void main (String[] arg)
+    {
+        System.out.println ("Testing class `anfi'...");
+        new anfi().test();
+    }
+}
+
+interface itf {
+    void setString (String s);
+    String getString();
+    String buff = null;
+}
Index: libjava.lang/anfi.out
===================================================================
RCS file: anfi.out
diff -N anfi.out
--- /dev/null	Tue May  5 13:32:27 1998
+++ anfi.out	Mon Feb  7 13:18:14 2000
@@ -0,0 +1,3 @@
+Testing class `anfi'...
+Hello 123
+Frinkahedron 123
Index: libjava.lang/anonarray.java
===================================================================
RCS file: anonarray.java
diff -N anonarray.java
--- /dev/null	Tue May  5 13:32:27 1998
+++ anonarray.java	Mon Feb  7 13:18:14 2000
@@ -0,0 +1,22 @@
+// Class anonarray
+// Generated on Tue Feb  1 16:11:29 PST 2000
+// Simple anonymous array, of primitive types.
+
+class anonarray {
+
+  static void foo (int [][] x) {
+      for (int i = 0; i < x.length; i++)
+          {
+              for (int j = 0; j < x[i].length; j++)
+                  System.out.print (x[i][j]);
+              System.out.println();
+          }
+  }
+  
+  public static void main (String[] arg)
+  {  
+      foo (new int[][] {{2,3},{5,7}});
+      System.out.println ((new int [][] {{11,13},{17,19}}).length);
+      System.out.println ((new int [][] {{23,29},{31,37}})[0][1]);
+  }
+}
Index: libjava.lang/anonarray.out
===================================================================
RCS file: anonarray.out
diff -N anonarray.out
--- /dev/null	Tue May  5 13:32:27 1998
+++ anonarray.out	Mon Feb  7 13:18:14 2000
@@ -0,0 +1,4 @@
+23
+57
+2
+29
Index: libjava.lang/anonarray2.java
===================================================================
RCS file: anonarray2.java
diff -N anonarray2.java
--- /dev/null	Tue May  5 13:32:27 1998
+++ anonarray2.java	Mon Feb  7 13:18:14 2000
@@ -0,0 +1,22 @@
+// Class anonarray2
+// Generated on Tue Feb  1 21:14:06 PST 2000
+// Anonymous array, with a non primitive type.
+
+class anonarray2 {
+
+  static void foo (String [][] x) {
+      for (int i = 0; i < x.length; i++)
+          {
+              for (int j = 0; j < x[i].length; j++)
+                  System.out.print (x[i][j]);
+              System.out.println();
+          }
+  }
+
+  public static void main (String[] arg)
+  {
+      foo (new String[][] {{"2","3"},{"5","7"}});
+      System.out.println ((new String [][] {{"11","13"},{"17","19"}}).length);
+      System.out.println ((new String [][] {{"23","29"},{"31","37"}})[0][1]);
+  }
+}
Index: libjava.lang/anonarray2.out
===================================================================
RCS file: anonarray2.out
diff -N anonarray2.out
--- /dev/null	Tue May  5 13:32:27 1998
+++ anonarray2.out	Mon Feb  7 13:18:14 2000
@@ -0,0 +1,4 @@
+23
+57
+2
+29
Index: libjava.lang/instinit.java
===================================================================
RCS file: instinit.java
diff -N instinit.java
--- /dev/null	Tue May  5 13:32:27 1998
+++ instinit.java	Mon Feb  7 13:18:14 2000
@@ -0,0 +1,22 @@
+// Class instinit
+// Generated on Wed Feb  2 12:31:16 PST 2000
+// Simple instance initializer test case.
+
+class instinit extends foo {
+
+    String buffer = "No Oink! Oink!";
+
+    /* Instance initializer */
+    {
+        System.out.println ("Oinking...");
+    }
+    {
+        buffer = "Oink! Oink!";
+    }
+  
+    public static void main (String[] arg)
+    {
+        System.out.println ("Testing class `instinit'...");
+        System.out.println (new instinit ().buffer);
+    }
+}
Index: libjava.lang/instinit.out
===================================================================
RCS file: instinit.out
diff -N instinit.out
--- /dev/null	Tue May  5 13:32:27 1998
+++ instinit.out	Mon Feb  7 13:18:14 2000
@@ -0,0 +1,4 @@
+Testing class `instinit'...
+Plain old boring foo
+Oinking...
+Oink! Oink!
Index: libjava.lang/instinit2.java
===================================================================
RCS file: instinit2.java
diff -N instinit2.java
--- /dev/null	Tue May  5 13:32:27 1998
+++ instinit2.java	Mon Feb  7 13:18:14 2000
@@ -0,0 +1,31 @@
+// Class ii2
+// Generated on Wed Feb  2 17:52:49 PST 2000
+// The instance initializer throws a checked exception. This is OK
+// since the constructors declares it in its `throws' clause -- at
+// least that's what the specs are saying.
+
+class ii2 {
+
+    String buffer = "Oink Oink!";
+
+    {
+        System.out.println ("Checking the oink...");
+        if (buffer != null)
+            throw new Exception ("It just oinked");
+    }
+
+    ii2 () throws Exception
+    {
+        System.out.println ("Ctor");
+    }
+
+    public static void main (String[] arg)
+    {
+        System.out.println ("Testing class `ii2'...");
+        try {
+            System.out.println (new ii2 ().buffer);
+        } catch (Exception e) {
+            System.out.println (e.toString());
+        }
+    }
+} 
Index: libjava.lang/instinit2.out
===================================================================
RCS file: instinit2.out
diff -N instinit2.out
--- /dev/null	Tue May  5 13:32:27 1998
+++ instinit2.out	Mon Feb  7 13:18:14 2000
@@ -0,0 +1,4 @@
+Testing class `instinit2'...
+Ctor
+Checking the oink...
+java.lang.Exception: It just oinked
Index: libjava.lang/nested_with_ctor.java
===================================================================
RCS file: nested_with_ctor.java
diff -N nested_with_ctor.java
--- /dev/null	Tue May  5 13:32:27 1998
+++ nested_with_ctor.java	Mon Feb  7 13:18:14 2000
@@ -0,0 +1,27 @@
+// Class nested_with_ctor
+// Generated on Mon Jan 31 18:31:47 PST 2000
+// The nested class contains explicit constructors. Their argument
+// lists should be augmented with the alias initializer values when
+// the ctors are seen declared (as opposed to generated.)
+
+class nested_with_ctor {
+  
+  void fct(final String s, final int i)
+  {
+      class nested {
+          String buffer = s+i;
+          String getString () { return buffer; }
+          nested (int i) { buffer = "(int)"+i; }
+          nested () {}
+      }
+      nested x = new nested ();
+      System.out.println (x.getString ());
+      nested y = new nested (123);
+      System.out.println (y.getString ());
+  }
+  public static void main (String[] arg)
+  {
+    System.out.println ("Testing class `nested_with_ctor'...");
+    new nested_with_ctor ().fct ("Yikes!", 321);
+  }
+}
Index: libjava.lang/nested_with_ctor.out
===================================================================
RCS file: nested_with_ctor.out
diff -N nested_with_ctor.out
--- /dev/null	Tue May  5 13:32:27 1998
+++ nested_with_ctor.out	Mon Feb  7 13:18:14 2000
@@ -0,0 +1,3 @@
+Testing class `nested_with_ctor'...
+Yikes!321
+(int)123
Index: libjava.lang/stub.java
===================================================================
RCS file: stub.java
diff -N stub.java
--- /dev/null	Tue May  5 13:32:27 1998
+++ stub.java	Mon Feb  7 13:18:14 2000
@@ -0,0 +1,101 @@
+// Class stub
+// Generated on Fri Feb  4 20:23:47 PST 2000
+// A somewhat thorough test of function invocator generated stubs.
+
+class stub {
+
+    String ok;
+
+    void OK () {System.out.println (ok);}
+    void OK (int i) {System.out.println (ok+" "+i);}
+    static void testOK () {System.out.println ("OK");}
+    static void testOK (int i) {System.out.println ("OK "+i); }
+
+    // STATIC   PRIVATE         R_VALUE         ARGS
+    // No       No              No              No
+                                void    t1      () {OK();}
+    // Yes      No              No              No
+       static                   void    t2      () {testOK();}
+    // No       Yes             No              No
+                private         void    t3      () {OK();}
+    // Yes      Yes             No              No
+       static   private         void    t4      () {testOK();}
+    // No       No              Yes             No
+                                int     t5      () {return 5;}
+    // Yes      No              Yes             No
+       static                   int     t6      () {return 6;}
+    // No       Yes             Yes             No
+                private         int     t7      () {return 7;}
+    // Yes      Yes             Yes             No
+       static   private         int     t8      () {return 8;}
+
+    // No       No              No              Yes
+                                void    t9      (int i) {OK(i);}
+    // Yes      No              No              Yes
+       static                   void    t10     (int i) {testOK(i);}
+    // No       Yes             No              Yes
+                private         void    t11     (int i) {OK(i);}
+    // Yes      Yes             No              Yes
+       static   private         void    t12     (int i) {testOK(i);}
+    // No       No              Yes             Yes
+                                int     t13     (int i) {return i*2;}
+    // Yes      No              Yes             Yes
+       static                   int     t14     (int i) {return i*3;}
+    // No       Yes             Yes             Yes
+                private         int     t15     (int i) {return i*4;}
+    // Yes      Yes             Yes             Yes
+       static   private         int     t16     (int i) {return i*5;}
+
+    void foo ()
+    {
+        this.new bar ().test ();
+    }
+    class bar {
+        void test () {
+            ok = "OK";
+            t1 ();
+            t2 ();
+            t3 ();
+            t4 ();
+            System.out.println (t5());
+            System.out.println (t6());
+            System.out.println (t7());
+            System.out.println (t8());
+            t9 (9);
+            t10 (10);
+            t11 (11);
+            t12 (12);
+            System.out.println (t13(13));
+            System.out.println (t14(14));
+            System.out.println (t15(15));
+            System.out.println (t16(16));
+            this.new baz ().test ();
+        }
+        class baz {
+            void test () {
+                ok = "OKOK";
+                t1 ();
+                t2 ();
+                t3 ();
+                t4 ();
+                System.out.println (t5());
+                System.out.println (t6());
+                System.out.println (t7());
+                System.out.println (t8());
+                t9 (9);
+                t10 (10);
+                t11 (11);
+                t12 (12);
+                System.out.println (t13(13));
+                System.out.println (t14(14));
+                System.out.println (t15(15));
+                System.out.println (t16(16));
+            }
+        }
+    }
+    public static void main (String[] arg)
+    {   
+        System.out.println ("Testing class `stub'...");
+        new stub ().foo ();
+    }
+}
Index: libjava.lang/stub.out
===================================================================
RCS file: stub.out
diff -N stub.out
--- /dev/null	Tue May  5 13:32:27 1998
+++ stub.out	Mon Feb  7 13:18:14 2000
@@ -0,0 +1,33 @@
+Testing class `stub'...
+OK
+OK
+OK
+OK
+5
+6
+7
+8
+OK 9
+OK 10
+OK 11
+OK 12
+26
+42
+60
+80
+OKOK
+OK
+OKOK
+OK
+5
+6
+7
+8
+OKOK 9
+OK 10
+OKOK 11
+OK 12
+26
+42
+60
+80

From java-patches-return-441-listarch-java-patches=sourceware.cygnus.com@sourceware.cygnus.com Tue Feb 08 00:17:14 2000
Return-Path: <java-patches-return-441-listarch-java-patches=sourceware.cygnus.com@sourceware.cygnus.com>
Delivered-To: listarch-java-patches@sourceware.cygnus.com
Received: (qmail 6494 invoked by alias); 8 Feb 2000 00:17:13 -0000
Mailing-List: contact java-patches-help@sourceware.cygnus.com; run by ezmlm
Precedence: bulk
List-Subscribe: <mailto:java-patches-subscribe@sourceware.cygnus.com>
List-Archive: <http://sourceware.cygnus.com/ml/java-patches/>
List-Post: <mailto:java-patches@sourceware.cygnus.com>
List-Help: <mailto:java-patches-help@sourceware.cygnus.com>, <http://sourceware.cygnus.com/ml/#faqs>
Sender: java-patches-owner@sourceware.cygnus.com
Delivered-To: mailing list java-patches@sourceware.cygnus.com
Received: (qmail 6457 invoked from network); 8 Feb 2000 00:16:35 -0000
To: Java Patch List <java-patches@sourceware.cygnus.com> 
Subject: Patch: warnings from interpret.cc
X-Zippy:  Is this my STOP??
X-Attribution:  Tom
Bcc:
Reply-To:  tromey@cygnus.com
From:  Tom Tromey <tromey@cygnus.com>
Date: 07 Feb 2000 17:14:42 -0700
Message-ID: <8766w0r1n1.fsf@cygnus.com>
Lines: 61
X-Mailer: Gnus v5.5/Emacs 20.3

I'm checking in the appended patch, which eliminates a lot of spurious
warnings from the interpret.cc compilation.

2000-02-07  Tom Tromey  <tromey@cygnus.com>

	* interpret.cc (PUSHL): Don't use expression statement.
	(PUSHD): Likewise.
	(LOADL): Likewise.
	(STOREL): Likewise.

Tom

Index: interpret.cc
===================================================================
RCS file: /cvs/java/libgcj/libjava/interpret.cc,v
retrieving revision 1.9
diff -u -r1.9 interpret.cc
--- interpret.cc	2000/01/26 00:56:36	1.9
+++ interpret.cc	2000/02/08 00:14:11
@@ -87,12 +87,12 @@
 #define PUSHA(V)  (sp++)->o = (V)
 #define PUSHI(V)  (sp++)->i = (V)
 #define PUSHF(V)  (sp++)->f = (V)
-#define PUSHL(V)  ({ _Jv_word2 w2; w2.l=(V); \
+#define PUSHL(V)  do { _Jv_word2 w2; w2.l=(V); \
                      (sp++)->ia[0] = w2.ia[0]; \
-                     (sp++)->ia[0] = w2.ia[1]; })
-#define PUSHD(V)  ({ _Jv_word2 w2; w2.d=(V); \
+                     (sp++)->ia[0] = w2.ia[1]; } while (0)
+#define PUSHD(V)  do { _Jv_word2 w2; w2.d=(V); \
                      (sp++)->ia[0] = w2.ia[0]; \
-                     (sp++)->ia[0] = w2.ia[1]; })
+                     (sp++)->ia[0] = w2.ia[1]; } while (0)
 
 #define POPA()    ((--sp)->o)
 #define POPI()    ((jint) (--sp)->i) // cast since it may be promoted
@@ -107,20 +107,20 @@
 #define LOADA(I)  (sp++)->o = locals[I].o
 #define LOADI(I)  (sp++)->i = locals[I].i
 #define LOADF(I)  (sp++)->f = locals[I].f
-#define LOADL(I)  ({ jint __idx = (I); \
+#define LOADL(I)  do { jint __idx = (I); \
     (sp++)->ia[0] = locals[__idx].ia[0]; \
     (sp++)->ia[0] = locals[__idx+1].ia[0]; \
- })
+ } while (0)
 #define LOADD(I)  LOADL(I)
 
 
 #define STOREA(I) locals[I].o = (--sp)->o
 #define STOREI(I) locals[I].i = (--sp)->i
 #define STOREF(I) locals[I].f = (--sp)->f
-#define STOREL(I) ({ jint __idx = (I); \
+#define STOREL(I) do { jint __idx = (I); \
     locals[__idx+1].ia[0] = (--sp)->ia[0]; \
     locals[__idx].ia[0] = (--sp)->ia[0]; \
- })
+ } while (0)
 #define STORED(I) STOREL(I)
 
 #define PEEKI(I)  (locals+(I))->i

From java-patches-return-442-listarch-java-patches=sourceware.cygnus.com@sourceware.cygnus.com Tue Feb 08 00:22:55 2000
Return-Path: <java-patches-return-442-listarch-java-patches=sourceware.cygnus.com@sourceware.cygnus.com>
Delivered-To: listarch-java-patches@sourceware.cygnus.com
Received: (qmail 8117 invoked by alias); 8 Feb 2000 00:22:55 -0000
Mailing-List: contact java-patches-help@sourceware.cygnus.com; run by ezmlm
Precedence: bulk
List-Subscribe: <mailto:java-patches-subscribe@sourceware.cygnus.com>
List-Archive: <http://sourceware.cygnus.com/ml/java-patches/>
List-Post: <mailto:java-patches@sourceware.cygnus.com>
List-Help: <mailto:java-patches-help@sourceware.cygnus.com>, <http://sourceware.cygnus.com/ml/#faqs>
Sender: java-patches-owner@sourceware.cygnus.com
Delivered-To: mailing list java-patches@sourceware.cygnus.com
Received: (qmail 8057 invoked from network); 8 Feb 2000 00:22:21 -0000
To: Java Patch List <java-patches@sourceware.cygnus.com> 
Subject: Patch: JNI argument checking
X-Zippy:  I left my WALLET in the BATHROOM!!
X-Attribution:  Tom
Bcc:
Reply-To:  tromey@cygnus.com
From:  Tom Tromey <tromey@cygnus.com>
Date: 07 Feb 2000 17:20:12 -0700
Message-ID: <874sbkr1dv.fsf@cygnus.com>
Lines: 247
X-Mailer: Gnus v5.5/Emacs 20.3

I'm committing this patch.  It adds some argument checking (normally
disabled) to the JNI functions in jni.cc and it fixes a bug that
occurred in many places in jni.cc (we would try to make a local
reference out of a NULL pointer; there's no point).

2000-02-07  Tom Tromey  <tromey@cygnus.com>

	* jni.cc (ThrowableClass): New define.
	(_Jv_JNI_Throw): Check argument.
	(_Jv_JNI_ThrowNew): Likewise.
	(wrap_value): Don't wrap object if it is NULL.
	(_Jv_JNI_DefineClass): Use wrap_value.
	(_Jv_JNI_FindClass): Likewise.
	(_Jv_JNI_GetSuperclass): Likewise.
	(_Jv_JNI_ExceptionOccurred): Likewise.
	(_Jv_JNI_AllocObject): Likewise.
	(_Jv_JNI_GetObjectClass): Likewise.
	(_Jv_JNI_NewString): Likewise.
	(_Jv_JNI_NewStringUTF): Likewise.
	(_Jv_JNI_NewObjectArray): Likewise.
	(_Jv_JNI_GetObjectArrayElement): Likewise.
	(_Jv_JNI_NewPrimitiveArray): Likewise.
	(_Jv_JNI_ToReflectedField): Likewise.
	(_Jv_JNI_ToReflectedMethod): Likewise.
	(_Jv_JNI_AllocObject): Check argument.
	(_Jv_JNI_NewObjectV): Likewise.
	(_Jv_JNI_NewObject): Likewise.
	(_Jv_JNI_NewObjectA): Likewise.
	(_Jv_JNI_GetObjectClass): Likewise.
	(_Jv_JNI_GetField): Likewise.
	(_Jv_JNI_SetField): Likewise.

Tom

Index: jni.cc
===================================================================
RCS file: /cvs/java/libgcj/libjava/jni.cc,v
retrieving revision 1.11
diff -u -r1.11 jni.cc
--- jni.cc	2000/02/07 21:17:30	1.11
+++ jni.cc	2000/02/08 00:19:14
@@ -47,6 +47,8 @@
 #define ObjectClass _CL_Q34java4lang6Object
 extern java::lang::Class ObjectClass;
 
+#define ThrowableClass _CL_Q34java4lang9Throwable
+extern java::lang::Class ThrowableClass;
 #define MethodClass _CL_Q44java4lang7reflect6Method
 extern java::lang::Class MethodClass;
 
@@ -278,7 +280,7 @@
 static jobject
 wrap_value (JNIEnv *env, jobject value)
 {
-  return _Jv_JNI_NewLocalRef (env, value);
+  return value == NULL ? value : _Jv_JNI_NewLocalRef (env, value);
 }
 
 
@@ -302,7 +304,7 @@
 
   // FIXME: exception processing.
   jclass result = l->defineClass (bytes, 0, bufLen);
-  return (jclass) _Jv_JNI_NewLocalRef (env, result);
+  return (jclass) wrap_value (env, result);
 }
 
 static jclass
@@ -328,13 +330,13 @@
   // FIXME: exception processing.
   jclass r = loader->findClass (n);
 
-  return (jclass) _Jv_JNI_NewLocalRef (env, r);
+  return (jclass) wrap_value (env, r);
 }
 
 static jclass
 _Jv_JNI_GetSuperclass (JNIEnv *env, jclass clazz)
 {
-  return (jclass) _Jv_JNI_NewLocalRef (env, clazz->getSuperclass ());
+  return (jclass) wrap_value (env, clazz->getSuperclass ());
 }
 
 static jboolean
@@ -346,6 +348,8 @@
 static jint
 _Jv_JNI_Throw (JNIEnv *env, jthrowable obj)
 {
+  // We check in case the user did some funky cast.
+  JvAssert (obj != NULL && (&ThrowableClass)->isInstance (obj));
   env->ex = obj;
   return 0;
 }
@@ -355,6 +359,8 @@
 {
   using namespace java::lang::reflect;
 
+  JvAssert ((&ThrowableClass)->isAssignableFrom (clazz));
+
   JArray<jclass> *argtypes
     = (JArray<jclass> *) JvNewObjectArray (1, &ClassClass, NULL);
 
@@ -378,7 +384,7 @@
 static jthrowable
 _Jv_JNI_ExceptionOccurred (JNIEnv *env)
 {
-  return (jthrowable) _Jv_JNI_NewLocalRef (env, env->ex);
+  return (jthrowable) wrap_value (env, env->ex);
 }
 
 static void
@@ -419,6 +425,8 @@
 {
   jobject obj = NULL;
   using namespace java::lang::reflect;
+
+  JvAssert (clazz && ! clazz->isArray ());
   if (clazz->isInterface() || Modifier::isAbstract(clazz->getModifiers()))
     env->ex = new java::lang::InstantiationException ();
   else
@@ -428,13 +436,14 @@
       obj = JvAllocObject (clazz);
     }
 
-  return _Jv_JNI_NewLocalRef (env, obj);
+  return wrap_value (env, obj);
 }
 
 static jclass
 _Jv_JNI_GetObjectClass (JNIEnv *env, jobject obj)
 {
-  return (jclass) _Jv_JNI_NewLocalRef (env, obj->getClass());
+  JvAssert (obj);
+  return (jclass) wrap_value (env, obj->getClass());
 }
 
 static jboolean
@@ -784,6 +793,9 @@
 _Jv_JNI_NewObjectV (JNIEnv *env, jclass klass,
 		    jmethodID id, va_list args)
 {
+  JvAssert (klass && ! klass->isArray ());
+  JvAssert (! strcmp (id->name->data, "<init>")
+	    && ! strcmp (id->signature->data, "()V"));
   return _Jv_JNI_CallAnyMethodV<jobject, constructor> (env, NULL, klass,
 						       id, args);
 }
@@ -791,6 +803,10 @@
 static jobject
 _Jv_JNI_NewObject (JNIEnv *env, jclass klass, jmethodID id, ...)
 {
+  JvAssert (klass && ! klass->isArray ());
+  JvAssert (! strcmp (id->name->data, "<init>")
+	    && ! strcmp (id->signature->data, "()V"));
+
   va_list args;
   jobject result;
 
@@ -806,6 +822,9 @@
 _Jv_JNI_NewObjectA (JNIEnv *env, jclass klass, jmethodID id,
 		    jvalue *args)
 {
+  JvAssert (klass && ! klass->isArray ());
+  JvAssert (! strcmp (id->name->data, "<init>")
+	    && ! strcmp (id->signature->data, "()V"));
   return _Jv_JNI_CallAnyMethodA<jobject, constructor> (env, NULL, klass,
 						       id, args);
 }
@@ -816,6 +835,7 @@
 static T
 _Jv_JNI_GetField (JNIEnv *env, jobject obj, jfieldID field) 
 {
+  JvAssert (obj);
   T *ptr = (T *) ((char *) obj + field->getOffset ());
   return wrap_value (env, *ptr);
 }
@@ -824,6 +844,7 @@
 static void
 _Jv_JNI_SetField (JNIEnv *, jobject obj, jfieldID field, T value)
 {
+  JvAssert (obj);
   T *ptr = (T *) ((char *) obj + field->getOffset ());
   *ptr = value;
 }
@@ -900,7 +921,7 @@
 {
   // FIXME: exception processing.
   jstring r = _Jv_NewString (unichars, len);
-  return (jstring) _Jv_JNI_NewLocalRef (env, r);
+  return (jstring) wrap_value (env, r);
 }
 
 static jsize
@@ -930,7 +951,7 @@
 {
   // FIXME: exception processing.
   jstring result = JvNewStringUTF (bytes);
-  return (jstring) _Jv_JNI_NewLocalRef (env, result);
+  return (jstring) wrap_value (env, result);
 }
 
 static jsize
@@ -1010,14 +1031,14 @@
 {
   // FIXME: exception processing.
   jarray result = JvNewObjectArray (length, elementClass, init);
-  return (jarray) _Jv_JNI_NewLocalRef (env, result);
+  return (jarray) wrap_value (env, result);
 }
 
 static jobject
 _Jv_JNI_GetObjectArrayElement (JNIEnv *env, jobjectArray array, jsize index)
 {
   jobject *elts = elements (array);
-  return _Jv_JNI_NewLocalRef (env, elts[index]);
+  return wrap_value (env, elts[index]);
 }
 
 static void
@@ -1035,8 +1056,7 @@
 _Jv_JNI_NewPrimitiveArray (JNIEnv *env, jsize length)
 {
   // FIXME: exception processing.
-  return (JArray<T> *) _Jv_JNI_NewLocalRef (env,
-					    _Jv_NewPrimArray (K, length));
+  return (JArray<T> *) wrap_value (env, _Jv_NewPrimArray (K, length));
 }
 
 template<typename T>
@@ -1145,7 +1165,7 @@
   field->declaringClass = cls;
   field->offset = (char*) fieldID - (char *) cls->fields;
   field->name = _Jv_NewStringUtf8Const (fieldID->getNameUtf8Const (cls));
-  return _Jv_JNI_NewLocalRef (env, field);
+  return wrap_value (env, field);
 }
 
 // JDK 1.2
@@ -1184,7 +1204,7 @@
       result = meth;
     }
 
-  return _Jv_JNI_NewLocalRef (env, result);
+  return wrap_value (env, result);
 }
 
 static jmethodID

From java-patches-return-443-listarch-java-patches=sourceware.cygnus.com@sourceware.cygnus.com Tue Feb 08 00:27:08 2000
Return-Path: <java-patches-return-443-listarch-java-patches=sourceware.cygnus.com@sourceware.cygnus.com>
Delivered-To: listarch-java-patches@sourceware.cygnus.com
Received: (qmail 8513 invoked by alias); 8 Feb 2000 00:27:08 -0000
Mailing-List: contact java-patches-help@sourceware.cygnus.com; run by ezmlm
Precedence: bulk
List-Subscribe: <mailto:java-patches-subscribe@sourceware.cygnus.com>
List-Archive: <http://sourceware.cygnus.com/ml/java-patches/>
List-Post: <mailto:java-patches@sourceware.cygnus.com>
List-Help: <mailto:java-patches-help@sourceware.cygnus.com>, <http://sourceware.cygnus.com/ml/#faqs>
Sender: java-patches-owner@sourceware.cygnus.com
Delivered-To: mailing list java-patches@sourceware.cygnus.com
Received: (qmail 8441 invoked from network); 8 Feb 2000 00:26:51 -0000
To: Java Patch List <java-patches@sourceware.cygnus.com> 
Subject: Patch: JNI_OnLoad
X-Zippy:  Hmmm..  a CRIPPLED ACCOUNTANT with a FALAFEL sandwich is HIT
 by a TROLLEY-CAR..
X-Attribution:  Tom
Bcc:
Reply-To:  tromey@cygnus.com
From:  Tom Tromey <tromey@cygnus.com>
Date: 07 Feb 2000 17:24:31 -0700
Message-ID: <871z6or16o.fsf@cygnus.com>
Lines: 132
X-Mailer: Gnus v5.5/Emacs 20.3

I'm committing the appended patch.  It unifies Runtime.load and
Runtime.loadLibrary, so they are easier to maintain.  It also adds
preliminary (aka broken) support for JNI_OnLoad.

2000-02-07  Tom Tromey  <tromey@cygnus.com>

	* java/lang/Runtime.java (_load): Declare.
	(load, loadLibrary): Wrote in terms of _load.
	* java/lang/natRuntime.cc (load): Call JNI_OnLoad if it appears in
	library.
	(loadLibrary): Likewise.
	Include <jni.h>.
	(_load): New method.
	(loadLibrary, load): Removed.

Tom

Index: java/lang/Runtime.java
===================================================================
RCS file: /cvs/java/libgcj/libjava/java/lang/Runtime.java,v
retrieving revision 1.6
diff -u -r1.6 Runtime.java
--- Runtime.java	2000/01/19 18:39:26	1.6
+++ Runtime.java	2000/02/08 00:19:14
@@ -23,8 +23,7 @@
 /* Written using "Java Class Libraries", 2nd edition, ISBN 0-201-31002-3
  * "The Java Language Specification", ISBN 0-201-63451-1
  * plus online API docs for JDK 1.2 beta from http://www.javasoft.com.
- * Status:  All 1.1 methods exist.  exec(), load(), and loadLibrary()
- * are not fully implemented.
+ * Status:  All 1.1 methods exist.  exec() is not fully implemented.
  */
 
 public class Runtime
@@ -94,8 +93,17 @@
       s.checkLink(lib);
   }
 
-  public native void load (String pathname);
-  public native void loadLibrary (String libname);
+  private native void _load (String pathname, boolean do_search);
+
+  public void load (String pathname)
+  {
+    _load (pathname, false);
+  }
+
+  public void loadLibrary (String libname)
+  {
+    _load (libname, true);
+  }
 
   // This is a helper function for the ClassLoader which can load
   // compiled libraries.  Returns true if library (which is just the
Index: java/lang/natRuntime.cc
===================================================================
RCS file: /cvs/java/libgcj/libjava/java/lang/natRuntime.cc,v
retrieving revision 1.6
diff -u -r1.6 natRuntime.cc
--- natRuntime.cc	2000/02/04 20:49:27	1.6
+++ natRuntime.cc	2000/02/08 00:19:14
@@ -18,6 +18,8 @@
 #include <java/lang/UnknownError.h>
 #include <java/lang/UnsatisfiedLinkError.h>
 
+#include <jni.h>
+
 #ifdef USE_LTDL
 #include <ltdl.h>
 
@@ -99,7 +101,7 @@
 }
 
 void
-java::lang::Runtime::load (jstring path)
+java::lang::Runtime::_load (jstring path, jboolean do_search)
 {
   JvSynchronize sync (this);
   checkLink (path);
@@ -110,39 +112,29 @@
   jsize total = JvGetStringUTFRegion (path, 0, path->length(), buf);
   buf[total] = '\0';
   // FIXME: make sure path is absolute.
-  lt_dlhandle h = lt_dlopen (buf);
+  lt_dlhandle h = do_search ? lt_dlopenext (buf) : lt_dlopen (buf);
   if (h == NULL)
     {
       const char *msg = lt_dlerror ();
       _Jv_Throw (new UnsatisfiedLinkError (JvNewStringLatin1 (msg)));
     }
-#else
-  _Jv_Throw (new UnknownError
-	     (JvNewStringLatin1 ("Runtime.load not implemented")));
-#endif /* USE_LTDL */
-}
 
-void
-java::lang::Runtime::loadLibrary (jstring lib)
-{
-  JvSynchronize sync (this);
-  checkLink (lib);
-  using namespace java::lang;
-#ifdef USE_LTDL
-  jint len = _Jv_GetStringUTFLength (lib);
-  char buf[len + 1];
-  jsize total = JvGetStringUTFRegion (lib, 0, lib->length(), buf);
-  buf[total] = '\0';
-  // FIXME: make sure path is absolute.
-  lt_dlhandle h = lt_dlopenext (buf);
-  if (h == NULL)
+  void *onload = lt_dlsym (h, "JNI_OnLoad");
+  if (onload != NULL)
     {
-      const char *msg = lt_dlerror ();
-      _Jv_Throw (new UnsatisfiedLinkError (JvNewStringLatin1 (msg)));
+      // FIXME: need invocation API to get JavaVM.
+      jint vers = ((jint (*) (...)) onload) (NULL, NULL);
+      if (vers != JNI_VERSION_1_1 && vers != JNI_VERSION_1_2)
+	{
+	  // FIXME: unload the library.
+	  _Jv_Throw (new UnsatisfiedLinkError (JvNewStringLatin1 ("unrecognized version from JNI_OnLoad")));
+	}
     }
 #else
   _Jv_Throw (new UnknownError
-	     (JvNewStringLatin1 ("Runtime.loadLibrary not implemented")));
+	     (JvNewStringLatin1 (do_search
+				 ? "Runtime.loadLibrary not implemented"
+				 : "Runtime.load not implemented")));
 #endif /* USE_LTDL */
 }
 

From java-patches-return-444-listarch-java-patches=sourceware.cygnus.com@sourceware.cygnus.com Tue Feb 08 21:31:43 2000
Return-Path: <java-patches-return-444-listarch-java-patches=sourceware.cygnus.com@sourceware.cygnus.com>
Delivered-To: listarch-java-patches@sourceware.cygnus.com
Received: (qmail 1342 invoked by alias); 8 Feb 2000 21:31:43 -0000
Mailing-List: contact java-patches-help@sourceware.cygnus.com; run by ezmlm
Precedence: bulk
List-Subscribe: <mailto:java-patches-subscribe@sourceware.cygnus.com>
List-Archive: <http://sourceware.cygnus.com/ml/java-patches/>
List-Post: <mailto:java-patches@sourceware.cygnus.com>
List-Help: <mailto:java-patches-help@sourceware.cygnus.com>, <http://sourceware.cygnus.com/ml/#faqs>
Sender: java-patches-owner@sourceware.cygnus.com
Delivered-To: mailing list java-patches@sourceware.cygnus.com
Received: (qmail 1197 invoked from network); 8 Feb 2000 21:31:00 -0000
To: Java Patch List <java-patches@sourceware.cygnus.com> 
Subject: Patch: java.util.Properties
X-Zippy:  "THE LITTLE PINK FLESH SISTERS," I saw them at th' FLUORESCENT BULB
 MAKERS CONVENTION...
X-Attribution:  Tom
Bcc:
Reply-To:  tromey@cygnus.com
From:  Tom Tromey <tromey@cygnus.com>
Date: 08 Feb 2000 14:29:39 -0700
Message-ID: <87itzzpem4.fsf@cygnus.com>
Lines: 228
X-Mailer: Gnus v5.5/Emacs 20.3

I'm checking in the appended patch.  It brings java.util.Properties up
to JDK 1.2.

2000-02-08  Tom Tromey  <tromey@cygnus.com>

	* java/util/Properties.java (setProperty): New method.
	(store): New method.

Tom

Index: java/util/Properties.java
===================================================================
RCS file: /cvs/java/libgcj/libjava/java/util/Properties.java,v
retrieving revision 1.3
diff -u -r1.3 Properties.java
--- Properties.java	2000/01/19 18:39:27	1.3
+++ Properties.java	2000/02/08 21:28:34
@@ -1,6 +1,6 @@
 // Properties - Property list representation.
 
-/* Copyright (C) 1998, 1999  Red Hat, Inc.
+/* Copyright (C) 1998, 1999, 2000  Red Hat, Inc.
 
    This file is part of libgcj.
 
@@ -26,7 +26,7 @@
  */
 
 /* Written using "Java Class Libraries", 2nd edition, ISBN 0-201-31002-3
- * Status: Complete to JDK 1.1.
+ * Status: Complete to JDK 1.2.
  */
 
 public class Properties extends Hashtable
@@ -51,6 +51,11 @@
       return r;
     }
 
+  public Object setProperty (String key, String value)
+  {
+    return put (key, value);
+  }
+
   public void list (PrintStream out)
     {
       Enumeration e = propertyNames ();
@@ -282,99 +287,105 @@
     }
 
   public synchronized void save (OutputStream out, String comment)
-    {
+  {
+    try
+      {
+	store (out, comment);
+      }
+    catch (IOException _)
+      {
+      }
+  }
+
+  public synchronized void store (OutputStream out, String comment)
+    throws IOException
+  {
       // Use a buffer because writing a single string through
       // OutputStreamWriter is fairly expensive.
       BufferedWriter output
 	= new BufferedWriter (new OutputStreamWriter (out));
       String newline = System.getProperty("line.separator");
 
-      try
+      if (comment != null)
 	{
-	  if (comment != null)
-	    {
-	      // We just lose if COMMENT contains a newline.  This is
-	      // what JDK 1.1 does.
-	      output.write("#");
-	      output.write(comment);
-	      output.write(newline);
-	    }
-	  output.write("# ");
-	  output.write(new Date().toString());
+	  // We just lose if COMMENT contains a newline.  This is
+	  // what JDK 1.1 does.
+	  output.write("#");
+	  output.write(comment);
 	  output.write(newline);
+	}
+      output.write("# ");
+      output.write(new Date().toString());
+      output.write(newline);
 
-	  Enumeration keys = keys ();
-	  while (keys.hasMoreElements())
-	    {
-	      String key = (String) keys.nextElement();
-	      String value = (String) get (key);
+      Enumeration keys = keys ();
+      while (keys.hasMoreElements())
+	{
+	  String key = (String) keys.nextElement();
+	  String value = (String) get (key);
 
-	      // FIXME: JCL says that the key can contain many Unicode
-	      // characters.  But it also doesn't say we should encode
-	      // it in any way.
-	      // FIXME: if key contains ':', '=', or whitespace, must
-	      // quote it here.  Note that JDK 1.1 does not do this.
-	      output.write(key);
-	      output.write("=");
+	  // FIXME: JCL says that the key can contain many Unicode
+	  // characters.  But it also doesn't say we should encode
+	  // it in any way.
+	  // FIXME: if key contains ':', '=', or whitespace, must
+	  // quote it here.  Note that JDK 1.1 does not do this.
+	  output.write(key);
+	  output.write("=");
 
-	      boolean leading = true;
-	      for (int i = 0; i < value.length(); ++i)
+	  boolean leading = true;
+	  for (int i = 0; i < value.length(); ++i)
+	    {
+	      boolean new_lead = false;
+	      char c = value.charAt(i);
+	      switch (c)
 		{
-		  boolean new_lead = false;
-		  char c = value.charAt(i);
-		  switch (c)
-		    {
-		    case '\n':
-		      output.write("\\n");
-		      break;
-		    case '\r':
-		      output.write("\\r");
-		      break;
-		    case '\t':
-		      output.write("\\t");
-		      break;
-		    case '\\':
-		      output.write("\\\\");
-		      break;
+		case '\n':
+		  output.write("\\n");
+		  break;
+		case '\r':
+		  output.write("\\r");
+		  break;
+		case '\t':
+		  output.write("\\t");
+		  break;
+		case '\\':
+		  output.write("\\\\");
+		  break;
 
-		    case '#':
-		    case '!':
-		    case '=':
-		    case ':':
-		      output.write("\\");
-		      output.write(c);
-		      break;
+		case '#':
+		case '!':
+		case '=':
+		case ':':
+		  output.write("\\");
+		  output.write(c);
+		  break;
 
-		    case ' ':
-		      new_lead = leading;
-		      if (leading)
-			output.write("\\");
-		      output.write(c);
-		      break;
+		case ' ':
+		  new_lead = leading;
+		  if (leading)
+		    output.write("\\");
+		  output.write(c);
+		  break;
 
-		    default:
-		      if (c < '\u0020' || c > '\u007e')
-			{
-			  output.write("\\u");
-			  output.write(Character.forDigit(c >>> 12, 16));
-			  output.write(Character.forDigit((c >>> 8) & 0xff,
-							  16));
-			  output.write(Character.forDigit((c >>> 4) & 0xff,
-							  16));
-			  output.write(Character.forDigit(c & 0xff, 16));
-			}
-		      else
-			output.write(c);
+		default:
+		  if (c < '\u0020' || c > '\u007e')
+		    {
+		      output.write("\\u");
+		      output.write(Character.forDigit(c >>> 12, 16));
+		      output.write(Character.forDigit((c >>> 8) & 0xff,
+						      16));
+		      output.write(Character.forDigit((c >>> 4) & 0xff,
+						      16));
+		      output.write(Character.forDigit(c & 0xff, 16));
 		    }
-		  leading = new_lead;
+		  else
+		    output.write(c);
 		}
-	      output.write(newline);
+	      leading = new_lead;
 	    }
-
-	  output.flush();
-	}
-      catch (IOException ignore)
-	{
+	  output.write(newline);
 	}
-    }
+
+      output.flush();
+  }
 }

From java-patches-return-445-listarch-java-patches=sourceware.cygnus.com@sourceware.cygnus.com Wed Feb 09 20:32:52 2000
Return-Path: <java-patches-return-445-listarch-java-patches=sourceware.cygnus.com@sourceware.cygnus.com>
Delivered-To: listarch-java-patches@sourceware.cygnus.com
Received: (qmail 25761 invoked by alias); 9 Feb 2000 20:32:51 -0000
Mailing-List: contact java-patches-help@sourceware.cygnus.com; run by ezmlm
Precedence: bulk
List-Subscribe: <mailto:java-patches-subscribe@sourceware.cygnus.com>
List-Archive: <http://sourceware.cygnus.com/ml/java-patches/>
List-Post: <mailto:java-patches@sourceware.cygnus.com>
List-Help: <mailto:java-patches-help@sourceware.cygnus.com>, <http://sourceware.cygnus.com/ml/#faqs>
Sender: java-patches-owner@sourceware.cygnus.com
Delivered-To: mailing list java-patches@sourceware.cygnus.com
Received: (qmail 25739 invoked from network); 9 Feb 2000 20:32:47 -0000
To: Java Patch List <java-patches@sourceware.cygnus.com> 
Subject: Patch: inner class test
X-Zippy:  YOU PICKED KARL MALDEN'S NOSE!!
X-Attribution:  Tom
Bcc:
Reply-To:  tromey@cygnus.com
From:  Tom Tromey <tromey@cygnus.com>
Date: 09 Feb 2000 13:32:54 -0700
Message-ID: <87ya8unmkp.fsf@cygnus.com>
Lines: 27
X-Mailer: Gnus v5.5/Emacs 20.3

I'm checking in this patch, which adds another compiler test for inner
classes.

2000-02-09  Tom Tromey  <tromey@cygnus.com>

	* libjava.compile/inner_priv.java: New file.

Tom

Index: libjava.compile/inner_priv.java
===================================================================
RCS file: inner_priv.java
diff -N inner_priv.java
--- /dev/null	Tue May  5 13:32:27 1998
+++ inner_priv.java	Wed Feb  9 12:30:40 2000
@@ -0,0 +1,11 @@
+// Test to ensure that private inner classes are ok.
+
+public class inner_priv
+{
+  private class K
+  {
+    int z;
+  }
+
+  K foo;
+}

From java-patches-return-446-listarch-java-patches=sourceware.cygnus.com@sourceware.cygnus.com Wed Feb 09 20:49:24 2000
Return-Path: <java-patches-return-446-listarch-java-patches=sourceware.cygnus.com@sourceware.cygnus.com>
Delivered-To: listarch-java-patches@sourceware.cygnus.com
Received: (qmail 30143 invoked by alias); 9 Feb 2000 20:49:24 -0000
Mailing-List: contact java-patches-help@sourceware.cygnus.com; run by ezmlm
Precedence: bulk
List-Subscribe: <mailto:java-patches-subscribe@sourceware.cygnus.com>
List-Archive: <http://sourceware.cygnus.com/ml/java-patches/>
List-Post: <mailto:java-patches@sourceware.cygnus.com>
List-Help: <mailto:java-patches-help@sourceware.cygnus.com>, <http://sourceware.cygnus.com/ml/#faqs>
Sender: java-patches-owner@sourceware.cygnus.com
Delivered-To: mailing list java-patches@sourceware.cygnus.com
Received: (qmail 30102 invoked from network); 9 Feb 2000 20:49:18 -0000
To: Java Patch List <java-patches@sourceware.cygnus.com> 
Subject: Patch: anonymous array test
X-Zippy:  I hope I bought the right relish...  zzzzzzzzz...
X-Attribution:  Tom
Bcc:
Reply-To:  tromey@cygnus.com
From:  Tom Tromey <tromey@cygnus.com>
Date: 09 Feb 2000 13:49:28 -0700
Message-ID: <87wvoenlt3.fsf@cygnus.com>
Lines: 38
X-Mailer: Gnus v5.5/Emacs 20.3

I'm committing this patch, which is another anonymous array test from
Alex.

2000-02-07  Alexandre Petit-Bianco  <apbianco@cygnus.com>

	* libjava.lang/anonarray3.out: New file.
	* libjava.lang/anonarray3.java: New file.

Tom

Index: libjava.lang/anonarray3.java
===================================================================
RCS file: anonarray3.java
diff -N anonarray3.java
--- /dev/null	Tue May  5 13:32:27 1998
+++ anonarray3.java	Wed Feb  9 12:47:41 2000
@@ -0,0 +1,13 @@
+// Class anonarray3
+// Generated on Tue Feb  8 19:18:10 PST 2000
+//
+
+class anonarray3 {
+  private static final int[] foo (int x) {
+      return new int[] { x+1 };
+  }
+  public static void main (String[] arg)
+  {
+    System.out.println (foo (34)[0]);
+  }
+}
Index: libjava.lang/anonarray3.out
===================================================================
RCS file: anonarray3.out
diff -N anonarray3.out
--- /dev/null	Tue May  5 13:32:27 1998
+++ anonarray3.out	Wed Feb  9 12:47:41 2000
@@ -0,0 +1 @@
+35

From java-patches-return-447-listarch-java-patches=sourceware.cygnus.com@sourceware.cygnus.com Thu Feb 10 00:13:26 2000
Return-Path: <java-patches-return-447-listarch-java-patches=sourceware.cygnus.com@sourceware.cygnus.com>
Delivered-To: listarch-java-patches@sourceware.cygnus.com
Received: (qmail 3379 invoked by alias); 10 Feb 2000 00:13:25 -0000
Mailing-List: contact java-patches-help@sourceware.cygnus.com; run by ezmlm
Precedence: bulk
List-Subscribe: <mailto:java-patches-subscribe@sourceware.cygnus.com>
List-Archive: <http://sourceware.cygnus.com/ml/java-patches/>
List-Post: <mailto:java-patches@sourceware.cygnus.com>
List-Help: <mailto:java-patches-help@sourceware.cygnus.com>, <http://sourceware.cygnus.com/ml/#faqs>
Sender: java-patches-owner@sourceware.cygnus.com
Delivered-To: mailing list java-patches@sourceware.cygnus.com
Received: (qmail 3359 invoked from network); 10 Feb 2000 00:13:21 -0000
To: Java Patch List <java-patches@sourceware.cygnus.com> 
Subject: Patch: bug fix in iconv finalizer
X-Zippy:  Remember, in 2039, MOUSSE & PASTA will be available
 ONLY by prescription!!
X-Attribution:  Tom
Bcc:
Reply-To:  tromey@cygnus.com
From:  Tom Tromey <tromey@cygnus.com>
Date: 09 Feb 2000 17:13:35 -0700
Message-ID: <87u2jhoqxc.fsf@cygnus.com>
Lines: 36
X-Mailer: Gnus v5.5/Emacs 20.3

I'm committing the appended patch.  It fixes a stupid bug pointed out
to me by Andrew.

2000-02-09  Tom Tromey  <tromey@cygnus.com>

	* gnu/gcj/convert/natIconv.cc (Input_iconv::finalize): Call
	iconv_close when handle is not NULL.  Thanks to Andrew Haley.
	(Output_iconv::finalize): Likewise.

Tom

Index: gnu/gcj/convert/natIconv.cc
===================================================================
RCS file: /cvs/java/libgcj/libjava/gnu/gcj/convert/natIconv.cc,v
retrieving revision 1.2
diff -u -r1.2 natIconv.cc
--- natIconv.cc	2000/01/31 08:56:09	1.2
+++ natIconv.cc	2000/02/10 00:12:39
@@ -47,7 +47,7 @@
 gnu::gcj::convert::Input_iconv::finalize (void)
 {
 #ifdef HAVE_ICONV
-  if (handle == NULL)
+  if (handle != NULL)
     {
       iconv_close ((iconv_t) handle);
       handle = NULL;
@@ -108,7 +108,7 @@
 gnu::gcj::convert::Output_iconv::finalize (void)
 {
 #ifdef HAVE_ICONV
-  if (handle == NULL)
+  if (handle != NULL)
     {
       iconv_close ((iconv_t) handle);
       handle = NULL;

From java-patches-return-448-listarch-java-patches=sourceware.cygnus.com@sourceware.cygnus.com Thu Feb 10 00:15:38 2000
Return-Path: <java-patches-return-448-listarch-java-patches=sourceware.cygnus.com@sourceware.cygnus.com>
Delivered-To: listarch-java-patches@sourceware.cygnus.com
Received: (qmail 3633 invoked by alias); 10 Feb 2000 00:15:38 -0000
Mailing-List: contact java-patches-help@sourceware.cygnus.com; run by ezmlm
Precedence: bulk
List-Subscribe: <mailto:java-patches-subscribe@sourceware.cygnus.com>
List-Archive: <http://sourceware.cygnus.com/ml/java-patches/>
List-Post: <mailto:java-patches@sourceware.cygnus.com>
List-Help: <mailto:java-patches-help@sourceware.cygnus.com>, <http://sourceware.cygnus.com/ml/#faqs>
Sender: java-patches-owner@sourceware.cygnus.com
Delivered-To: mailing list java-patches@sourceware.cygnus.com
Received: (qmail 3612 invoked from network); 10 Feb 2000 00:15:34 -0000
To: Java Patch List <java-patches@sourceware.cygnus.com> 
Subject: Patch: register all loaded libraries
X-Zippy:  I'd like MY data-base JULIENNED and stir-fried!
X-Attribution:  Tom
Bcc:
Reply-To:  tromey@cygnus.com
From:  Tom Tromey <tromey@cygnus.com>
Date: 09 Feb 2000 17:15:48 -0700
Message-ID: <87snz1oqtn.fsf@cygnus.com>
Lines: 36
X-Mailer: Gnus v5.5/Emacs 20.3

I'm checking in the appended patch.  It fixes an oversight from an
earlier JNI patch; now all dynamically loaded libraries are correctly
registered.

2000-02-09  Tom Tromey  <tromey@cygnus.com>

	* java/lang/natRuntime.cc (_load): Call add_library.
	(loadLibraryInternal): Likewise.

Tom

Index: java/lang/natRuntime.cc
===================================================================
RCS file: /cvs/java/libgcj/libjava/java/lang/natRuntime.cc,v
retrieving revision 1.7
diff -u -r1.7 natRuntime.cc
--- natRuntime.cc	2000/02/08 00:26:58	1.7
+++ natRuntime.cc	2000/02/10 00:15:11
@@ -119,6 +119,8 @@
       _Jv_Throw (new UnsatisfiedLinkError (JvNewStringLatin1 (msg)));
     }
 
+  add_library (h);
+
   void *onload = lt_dlsym (h, "JNI_OnLoad");
   if (onload != NULL)
     {
@@ -150,6 +152,8 @@
   buf[total] = '\0';
   // FIXME: make sure path is absolute.
   lt_dlhandle h = lt_dlopenext (buf);
+  if (h != NULL)
+    add_library (h);
   return h != NULL;
 #else
   return false;

From java-patches-return-449-listarch-java-patches=sourceware.cygnus.com@sourceware.cygnus.com Thu Feb 10 11:50:04 2000
Return-Path: <java-patches-return-449-listarch-java-patches=sourceware.cygnus.com@sourceware.cygnus.com>
Delivered-To: listarch-java-patches@sourceware.cygnus.com
Received: (qmail 23266 invoked by alias); 10 Feb 2000 11:50:04 -0000
Mailing-List: contact java-patches-help@sourceware.cygnus.com; run by ezmlm
Precedence: bulk
List-Subscribe: <mailto:java-patches-subscribe@sourceware.cygnus.com>
List-Archive: <http://sourceware.cygnus.com/ml/java-patches/>
List-Post: <mailto:java-patches@sourceware.cygnus.com>
List-Help: <mailto:java-patches-help@sourceware.cygnus.com>, <http://sourceware.cygnus.com/ml/#faqs>
Sender: java-patches-owner@sourceware.cygnus.com
Delivered-To: mailing list java-patches@sourceware.cygnus.com
Received: (qmail 23247 invoked from network); 10 Feb 2000 11:50:03 -0000
X-Authentication-Warning: tcm-gw.tcm.hut.fi: smap set sender to <pekka.nikander@hut.fi> using -f
Message-ID: <38A2A5DB.B06AE423@hut.fi>
Date: Thu, 10 Feb 2000 13:49:47 +0200
From: Pekka Nikander <pekka.nikander@hut.fi>
Organization: HUT-TML
X-Mailer: Mozilla 4.7 [en] (X11; I; FreeBSD 3.2-RELEASE i386)
X-Accept-Language: en
MIME-Version: 1.0
To: java-patches@sourceware.cygnus.com
Subject: Patch: bug fix in parse.y(resolve_field_access)
Content-Type: text/plain; charset=us-ascii
Content-Transfer-Encoding: 7bit

When compiled with --enable-checking, gcj dumps core at
parse.y(remove_field_access) since it may attempt to
fetch a declaration name with DECL_NAME for something
that is an expression (tree type 'e') and not a declaration
(tree type 'd').  This might also be a bug in 
resolve_qualified_expression_name, but I couldn't figure
out where there.  Anyhow, this patch fixes the crash
and does not seem to have any ill effects.

To test, attemt to compile the following code when gcj
is compiled with --enable-checking. 

public class Test {
  public Bar bar() {
    return null;
  }

  public void foo(Zap obj) {
    if (!(bar().zap(obj.getZap()))) {
      return;
    }
  }
}

class Bar {
  public boolean zap(Class z) {
    return null;
  }
}

class Zap {
  public Class getZap() {
    return null;
  }
}

The compiler barfs at line 8.

$ /usr/local/rcx/bin/gcj -fclasspath=/home/pnr/rcx/java -c Test.java    
Test.java: In class `Test':
Test.java: In method `foo(Zap)':
Test.java:8: Tree check: expected class 'd', have 'e' (call_expr)
Test.java:8: Internal compiler error in `resolve_field_access', at
./parse.y:6616
Please submit a full bug report.

2000-02-10  Pekka Nikander  <pnr@teldanex.tcm.hut.fi>

	* parse.y (resolve_field_access): Add DECL_P(decl) 
	  before checking DECL_NAME(decl) for length_indentifier_node.

Index: parse.y
===================================================================
RCS file: /cvs/gcc/egcs/gcc/java/parse.y,v
retrieving revision 1.134
diff -c -3 -p -r1.134 parse.y
*************** resolve_field_access (qual_wfl, field_de
*** 6572,6578 ****
      return error_mark_node;

    /* Resolve the LENGTH field of an array here */
!   if (DECL_NAME (decl) == length_identifier_node && TYPE_ARRAY_P (type_found)
        && ! flag_emit_class_files && ! flag_emit_xref)
      {
        tree length = build_java_array_length_access (where_found);
--- 6613,6620 ----
      return error_mark_node;

    /* Resolve the LENGTH field of an array here */
!   if (DECL_P(decl) && DECL_NAME (decl) == length_identifier_node
!       && TYPE_ARRAY_P (type_found)
        && ! flag_emit_class_files && ! flag_emit_xref)
      {
        tree length = build_java_array_length_access (where_found);

From java-patches-return-450-listarch-java-patches=sourceware.cygnus.com@sourceware.cygnus.com Thu Feb 10 20:30:17 2000
Return-Path: <java-patches-return-450-listarch-java-patches=sourceware.cygnus.com@sourceware.cygnus.com>
Delivered-To: listarch-java-patches@sourceware.cygnus.com
Received: (qmail 28982 invoked by alias); 10 Feb 2000 20:30:17 -0000
Mailing-List: contact java-patches-help@sourceware.cygnus.com; run by ezmlm
Precedence: bulk
List-Subscribe: <mailto:java-patches-subscribe@sourceware.cygnus.com>
List-Archive: <http://sourceware.cygnus.com/ml/java-patches/>
List-Post: <mailto:java-patches@sourceware.cygnus.com>
List-Help: <mailto:java-patches-help@sourceware.cygnus.com>, <http://sourceware.cygnus.com/ml/#faqs>
Sender: java-patches-owner@sourceware.cygnus.com
Delivered-To: mailing list java-patches@sourceware.cygnus.com
Received: (qmail 28900 invoked from network); 10 Feb 2000 20:29:45 -0000
To: Java Patch List <java-patches@sourceware.cygnus.com> 
Subject: Patch: invocation API
X-Zippy:  I guess it was all a DREAM..  or an episode of HAWAII FIVE-O...
X-Attribution:  Tom
Bcc:
Reply-To:  tromey@cygnus.com
From:  Tom Tromey <tromey@cygnus.com>
Date: 10 Feb 2000 13:29:16 -0700
Message-ID: <87900sol7n.fsf@cygnus.com>
Lines: 750
X-Mailer: Gnus v5.5/Emacs 20.3

I'm committing the appended patch.  It implements most of the
invocation API, which is part of JNI.

JNI *still* doesn't work, but I'm reaching testing range at long last,
I think.

2000-02-10  Tom Tromey  <tromey@cygnus.com>

	* gnu/gcj/jni/natNativeThread.cc: New file.
	* gnu/gcj/jni/NativeThread.java: New file.
	* java/lang/Thread.java (data): Now a RawData.
	* include/jvm.h (_Jv_GetCurrentJNIEnv, _Jv_SetCurrentJNIEnv):
	Declare.
	* Makefile.in: Rebuilt.
	* Makefile.am (java/lang/Thread.h): New target.
	(ordinary_java_source_files): Added NativeThread.java.
	(nat_source_files): Added natNativeThread.cc.
	* java/lang/natThread.cc: Include <jni.h>
	(struct natThread): Added `jni_env' field.
	(_Jv_GetCurrentJNIEnv): New function.
	(_Jv_SetCurrentJNIEnv): Likewise.
	(initialize_native): Initialize jni_env.
	Include RawData.h.
	* jni.cc (ThreadGroupClass): New define.
	(_Jv_JNI_InvokeFunctions): New structure.
	(JNI_GetCreatedJavaVMs): New function.
	(the_vm): New global.
	(JNI_GetDefaultJavaVMInitArgs): New function.
	Include NativeThread.h.
	(NativeThreadClass): New define.
	(_Jv_JNI_EnsureLocalCapacity): Return JNI_ERR, not -1.
	(_Jv_JNI_DestroyJavaVM): New function.
	(_Jv_JNI_AttachCurrentThread): New function.
	(_Jv_JNI_DetachCurrentThread): New function.
	(_Jv_JNI_GetEnv): New function.
	(JNI_CreateJavaVM): New function.
	(_Jv_JNI_GetJavaVM): New function.
	(_Jv_JNIFunctions): Added entry for GetJavaVM.
	* include/jni.h (JavaVMAttachArgs): New structure.
	(JNI_EDETACHED): New define.
	(JNI_EVERSION): Likewise.
	(JavaVM): Define properly.
	(struct JNIInvokeInterface): New structure.
	(class _Jv_JavaVM): New class.
	(JNI_OnLoad, JNI_OnUnload): Declare.
	(JNI_GetDefaultJavaVMInitArgs, JNI_CreateJavaVM,
	JNI_GetCreatedJavaVMs): Declare.
	(JavaVMInitArgs): New typedef.
	(JavaVMOption): Likewise.
	(JNI_ERR): New define.
	(JNI_OK): Likewise.

Tom

Index: Makefile.am
===================================================================
RCS file: /cvs/java/libgcj/libjava/Makefile.am,v
retrieving revision 1.46
diff -u -r1.46 Makefile.am
--- Makefile.am	2000/02/04 22:00:35	1.46
+++ Makefile.am	2000/02/10 20:19:35
@@ -221,6 +221,16 @@
 		-friend 'void _Jv_RunMain (const char*, int, const char **);' \
 		$(basename $<)
 
+java/lang/Thread.h: java/lang/Thread.class libgcj.zip
+	$(GCJH) -classpath $(top_builddir) \
+		-prepend 'class _Jv_JNIEnv;' \
+## Eww.
+		-prepend 'extern "Java" { namespace gnu { namespace gcj { namespace jni { class NativeThread; } } } };' \
+		-friend '_Jv_JNIEnv * _Jv_GetCurrentJNIEnv ();' \
+		-friend 'void _Jv_SetCurrentJNIEnv (_Jv_JNIEnv *env);' \
+		-friend 'class gnu::gcj::jni::NativeThread;' \
+		$(basename $<)
+
 java/lang/String.h: java/lang/String.class libgcj.zip
 	$(GCJH) -classpath $(top_builddir) \
 	    -friend 'jchar* _Jv_GetStringChars (jstring str);' \
@@ -512,6 +522,7 @@
 ## convert_source_files.  If the .java file has a hand-maintained
 ## header, please list it in special_java_source_files.
 ordinary_java_source_files =  $(convert_source_files) \
+gnu/gcj/jni/NativeThread.java \
 gnu/gcj/runtime/MethodInvocation.java \
 gnu/gcj/runtime/VMClassLoader.java \
 gnu/gcj/text/BaseBreakIterator.java \
@@ -796,6 +807,7 @@
 gnu/gcj/convert/natInput_SJIS.cc \
 gnu/gcj/convert/natOutput_EUCJIS.cc \
 gnu/gcj/convert/natOutput_SJIS.cc \
+gnu/gcj/jni/natNativeThread.cc \
 java/io/natFile.cc \
 java/io/natFileDescriptor.cc \
 java/lang/natCharacter.cc \
Index: jni.cc
===================================================================
RCS file: /cvs/java/libgcj/libjava/jni.cc,v
retrieving revision 1.12
diff -u -r1.12 jni.cc
--- jni.cc	2000/02/08 00:23:09	1.12
+++ jni.cc	2000/02/10 20:19:52
@@ -36,6 +36,7 @@
 #include <java/lang/OutOfMemoryError.h>
 #include <java/util/Hashtable.h>
 #include <java/lang/Integer.h>
+#include <gnu/gcj/jni/NativeThread.h>
 
 #include <gcj/method.h>
 #include <gcj/field.h>
@@ -51,6 +52,10 @@
 extern java::lang::Class ThrowableClass;
 #define MethodClass _CL_Q44java4lang7reflect6Method
 extern java::lang::Class MethodClass;
+#define ThreadGroupClass _CL_Q34java4lang11ThreadGroup
+extern java::lang::Class ThreadGroupClass;
+#define NativeThreadClass _CL_Q43gnu3gcj3jni12NativeThread
+extern java::lang::Class ThreadGroupClass;
 
 // This enum is used to select different template instantiations in
 // the invocation code.
@@ -62,8 +67,9 @@
   constructor
 };
 
-// Forward declaration.
+// Forward declarations.
 extern struct JNINativeInterface _Jv_JNIFunctions;
+extern struct JNIInvokeInterface _Jv_JNI_InvokeFunctions;
 
 // Number of slots in the default frame.  The VM must allow at least
 // 16.
@@ -89,6 +95,9 @@
 // This holds a reference count for all local and global references.
 static java::util::Hashtable *ref_table;
 
+// The only VM.
+static JavaVM *the_vm;
+
 
 
 void
@@ -178,7 +187,7 @@
     {
       // FIXME: exception processing.
       env->ex = new java::lang::OutOfMemoryError;
-      return -1;
+      return JNI_ERR;
     }
 
   frame->marker = true;
@@ -1380,6 +1389,238 @@
 
 
 
+//
+// Invocation API.
+//
+
+// An internal helper function.
+static jint
+_Jv_JNI_AttachCurrentThread (JavaVM *, jstring name, void **penv, void *args)
+{
+  JavaVMAttachArgs *attach = reinterpret_cast<JavaVMAttachArgs *> (args);
+  java::lang::ThreadGroup *group = NULL;
+
+  if (attach)
+    {
+      // FIXME: do we really want to support 1.1?
+      if (attach->version != JNI_VERSION_1_2
+	  && attach->version != JNI_VERSION_1_1)
+	return JNI_EVERSION;
+
+      JvAssert ((&ThreadGroupClass)->isInstance (attach->group));
+      group = reinterpret_cast<java::lang::ThreadGroup *> (attach->group);
+    }
+
+  // Attaching an already-attached thread is a no-op.
+  if (_Jv_ThreadCurrent () != NULL)
+    return 0;
+
+  // FIXME: NULL return?
+  JNIEnv *env = (JNIEnv *) _Jv_MallocUnchecked (sizeof (JNIEnv));
+  env->p = &_Jv_JNIFunctions;
+  env->ex = NULL;
+  env->klass = NULL;
+  // FIXME: NULL return?
+  env->locals
+    = (_Jv_JNI_LocalFrame *) _Jv_MallocUnchecked (sizeof (_Jv_JNI_LocalFrame)
+						  + (FRAME_SIZE
+						     * sizeof (jobject)));
+  *penv = reinterpret_cast<void *> (env);
+
+  java::lang::Thread *t = new gnu::gcj::jni::NativeThread (group, name);
+  t = t;			// Avoid compiler warning.  Eww.
+  _Jv_SetCurrentJNIEnv (env);
+
+  return 0;
+}
+
+// This is the one actually used by JNI.
+static jint
+_Jv_JNI_AttachCurrentThread (JavaVM *vm, void **penv, void *args)
+{
+  return _Jv_JNI_AttachCurrentThread (vm, NULL, penv, args);
+}
+
+static jint
+_Jv_JNI_DestroyJavaVM (JavaVM *vm)
+{
+  JvAssert (the_vm && vm == the_vm);
+
+  JNIEnv *env;
+  if (_Jv_ThreadCurrent () != NULL)
+    {
+      jint r = _Jv_JNI_AttachCurrentThread (vm,
+					    JvNewStringLatin1 ("main"),
+					    reinterpret_cast<void **> (&env),
+					    NULL);
+      if (r < 0)
+	return r;
+    }
+  else
+    env = _Jv_GetCurrentJNIEnv ();
+
+  _Jv_ThreadWait ();
+
+  // Docs say that this always returns an error code.
+  return JNI_ERR;
+}
+
+static jint
+_Jv_JNI_DetachCurrentThread (JavaVM *)
+{
+  java::lang::Thread *t = _Jv_ThreadCurrent ();
+  if (t == NULL)
+    return JNI_EDETACHED;
+
+  // FIXME: we only allow threads attached via AttachCurrentThread to
+  // be detached.  I have no idea how we could implement detaching
+  // other threads, given the requirement that we must release all the
+  // monitors.  That just seems evil.
+  JvAssert ((&NativeThreadClass)->isInstance (t));
+
+  // FIXME: release the monitors.  We'll take this to mean all
+  // monitors acquired via the JNI interface.  This means we have to
+  // keep track of them.
+
+  gnu::gcj::jni::NativeThread *nt
+    = reinterpret_cast<gnu::gcj::jni::NativeThread *> (t);
+  nt->finish ();
+
+  return 0;
+}
+
+static jint
+_Jv_JNI_GetEnv (JavaVM *, void **penv, jint version)
+{
+  if (_Jv_ThreadCurrent () == NULL)
+    {
+      *penv = NULL;
+      return JNI_EDETACHED;
+    }
+
+  // FIXME: do we really want to support 1.1?
+  if (version != JNI_VERSION_1_2 && version != JNI_VERSION_1_1)
+    {
+      *penv = NULL;
+      return JNI_EVERSION;
+    }
+
+  *penv = (void *) _Jv_GetCurrentJNIEnv ();
+  return 0;
+}
+
+jint
+JNI_GetDefaultJavaVMInitArgs (void *args)
+{
+  jint version = * (jint *) args;
+  // Here we only support 1.2.
+  if (version != JNI_VERSION_1_2)
+    return JNI_EVERSION;
+
+  JavaVMInitArgs *ia = reinterpret_cast<JavaVMInitArgs *> (args);
+  ia->version = JNI_VERSION_1_2;
+  ia->nOptions = 0;
+  ia->options = NULL;
+  ia->ignoreUnrecognized = true;
+
+  return 0;
+}
+
+jint
+JNI_CreateJavaVM (JavaVM **vm, void **penv, void *args)
+{
+  JvAssert (! the_vm);
+  // FIXME: synchronize
+  JavaVM *nvm = (JavaVM *) _Jv_MallocUnchecked (sizeof (JavaVM));
+  if (nvm == NULL)
+    return JNI_ERR;
+  nvm->functions = &_Jv_JNI_InvokeFunctions;
+
+  // Parse the arguments.
+  if (args != NULL)
+    {
+      jint version = * (jint *) args;
+      // We only support 1.2.
+      if (version != JNI_VERSION_1_2)
+	return JNI_EVERSION;
+      JavaVMInitArgs *ia = reinterpret_cast<JavaVMInitArgs *> (args);
+      for (int i = 0; i < ia->nOptions; ++i)
+	{
+	  if (! strcmp (ia->options[i].optionString, "vfprintf")
+	      || ! strcmp (ia->options[i].optionString, "exit")
+	      || ! strcmp (ia->options[i].optionString, "abort"))
+	    {
+	      // We are required to recognize these, but for now we
+	      // don't handle them in any way.  FIXME.
+	      continue;
+	    }
+	  else if (! strncmp (ia->options[i].optionString,
+			      "-verbose", sizeof ("-verbose") - 1))
+	    {
+	      // We don't do anything with this option either.  We
+	      // might want to make sure the argument is valid, but we
+	      // don't really care all that much for now.
+	      continue;
+	    }
+	  else if (! strncmp (ia->options[i].optionString, "-D", 2))
+	    {
+	      // FIXME.
+	      continue;
+	    }
+	  else if (ia->ignoreUnrecognized)
+	    {
+	      if (ia->options[i].optionString[0] == '_'
+		  || ! strncmp (ia->options[i].optionString, "-X", 2))
+		continue;
+	    }
+
+	  return JNI_ERR;
+	}
+    }
+
+  jint r =_Jv_JNI_AttachCurrentThread (nvm, penv, NULL);
+  if (r < 0)
+    return r;
+
+  the_vm = nvm;
+  *vm = the_vm;
+  return 0;
+}
+
+jint
+JNI_GetCreatedJavaVMs (JavaVM **vm_buffer, jsize buf_len, jsize *n_vms)
+{
+  JvAssert (buf_len > 0);
+  // We only support a single VM.
+  if (the_vm != NULL)
+    {
+      vm_buffer[0] = the_vm;
+      *n_vms = 1;
+    }
+  else
+    *n_vms = 0;
+  return 0;
+}
+
+jint
+_Jv_JNI_GetJavaVM (JNIEnv *, JavaVM **vm)
+{
+  // FIXME: synchronize
+  if (! the_vm)
+    {
+      JavaVM *nvm = (JavaVM *) _Jv_MallocUnchecked (sizeof (JavaVM));
+      if (nvm == NULL)
+	return JNI_ERR;
+      nvm->functions = &_Jv_JNI_InvokeFunctions;
+      the_vm = nvm;
+    }
+
+  *vm = the_vm;
+  return 0;
+}
+
+
+
 #define NOT_IMPL NULL
 #define RESERVED NULL
 
@@ -1614,7 +1855,7 @@
   NOT_IMPL /* UnregisterNatives */,
   _Jv_JNI_MonitorEnter,
   _Jv_JNI_MonitorExit,
-  NOT_IMPL /* GetJavaVM */,
+  _Jv_JNI_GetJavaVM,
 
   _Jv_JNI_GetStringRegion,
   _Jv_JNI_GetStringUTFRegion,
@@ -1627,4 +1868,16 @@
   NOT_IMPL /* deleteweakglobalref */,
 
   _Jv_JNI_ExceptionCheck
+};
+
+struct JNIInvokeInterface _Jv_JNI_InvokeFunctions =
+{
+  RESERVED,
+  RESERVED,
+  RESERVED,
+
+  _Jv_JNI_DestroyJavaVM,
+  _Jv_JNI_AttachCurrentThread,
+  _Jv_JNI_DetachCurrentThread,
+  _Jv_JNI_GetEnv
 };
Index: gnu/gcj/jni/NativeThread.java
===================================================================
RCS file: NativeThread.java
diff -N NativeThread.java
--- /dev/null	Tue May  5 13:32:27 1998
+++ NativeThread.java	Thu Feb 10 12:19:57 2000
@@ -0,0 +1,28 @@
+// NativeThread.java - Wrapper for attached user threads.
+
+/* Copyright (C) 1998, 1999, 2000  Red Hat, Inc.
+
+   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.jni;
+
+/**
+ * @author Tom Tromey <tromey@cygnus.com>
+ * @date February 9, 2000
+ */
+
+public class NativeThread extends Thread
+{
+  public NativeThread (ThreadGroup g, String name)
+  {
+    super (g, null, name);
+    alive_flag = true;
+  }
+
+  // Call this to mark the thread as finished.
+  public native void finish ();
+}
Index: gnu/gcj/jni/natNativeThread.cc
===================================================================
RCS file: natNativeThread.cc
diff -N natNativeThread.cc
--- /dev/null	Tue May  5 13:32:27 1998
+++ natNativeThread.cc	Thu Feb 10 12:19:57 2000
@@ -0,0 +1,24 @@
+// natNativeThread.cc - Native side of attached threads.
+
+/* Copyright (C) 1998, 1999, 2000  Red Hat, Inc.
+
+   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.  */
+
+// Written by Tom Tromey <tromey@cygnus.com>
+
+#include <config.h>
+
+#include <gcj/cni.h>
+#include <jvm.h>
+#include <gnu/gcj/jni/NativeThread.h>
+#include <java/lang/Thread.h>
+
+void
+gnu::gcj::jni::NativeThread::finish ()
+{
+  finish_ ();
+}
Index: include/jni.h
===================================================================
RCS file: /cvs/java/libgcj/libjava/include/jni.h,v
retrieving revision 1.9
diff -u -r1.9 jni.h
--- jni.h	2000/02/02 01:47:01	1.9
+++ jni.h	2000/02/10 20:20:13
@@ -23,6 +23,7 @@
 #include <gcj/javaprims.h>
 
 typedef struct _Jv_JNIEnv JNIEnv;
+typedef struct _Jv_JavaVM JavaVM;
 
 #define JNI_TRUE true
 #define JNI_FALSE false
@@ -59,6 +60,7 @@
 typedef void *jmethodID;
 
 typedef const struct JNINativeInterface *JNIEnv;
+typedef const struct JNIInvokeInterface *JavaVM;
 
 #define JNI_TRUE 1
 #define JNI_TRUE 0
@@ -76,6 +78,32 @@
 #define JNI_COMMIT 1
 #define JNI_ABORT  2
 
+/* Error codes */
+#define JNI_OK            0
+#define JNI_ERR          -1
+#define JNI_EDETACHED    -2
+#define JNI_EVERSION     -3
+
+#ifdef __cplusplus
+extern "C"
+{
+#endif /* __cplusplus */
+
+/* These functions might be defined in libraries which we load; the
+   JNI implementation calls them at the appropriate times.  */
+extern jint JNI_OnLoad (JavaVM *, void *);
+extern void JNI_OnUnload (JavaVM *, void *);
+
+/* These functions are called by user code to start using the
+   invocation API.  */
+extern jint JNI_GetDefaultJavaVMInitArgs (void *);
+extern jint JNI_CreateJavaVM (JavaVM **, void **, void *);
+extern jint JNI_GetCreatedJavaVMs(JavaVM **, jsize, jsize *);
+
+#ifdef __cplusplus
+};
+#endif /* __cplusplus */
+
 typedef union jvalue
 {
   jboolean z;
@@ -99,9 +127,6 @@
   void *fnPtr;			/* Sigh.  */
 } JNINativeMethod;
 
-/* FIXME: this is just a placeholder.  */
-typedef int JavaVM;
-
 struct JNINativeInterface
 {
   _Jv_func reserved0;
@@ -1401,5 +1426,75 @@
   { return p->ExceptionCheck (this); }
 };
 #endif /* __cplusplus */
+
+/*
+ * Invocation API.
+ */
+
+struct JNIInvokeInterface
+{
+  _Jv_func reserved0;
+  _Jv_func reserved1;
+  _Jv_func reserved2;
+
+  jint (*DestroyJavaVM)         (JavaVM *);
+  jint (*AttachCurrentThread)   (JavaVM *, void **, void *);
+  jint (*DetachCurrentThread)   (JavaVM *);
+  jint (*GetEnv)                (JavaVM *, void **, jint);
+};
+
+#ifdef __cplusplus
+
+class _Jv_JavaVM
+{
+public:
+  const struct JNIInvokeInterface *functions;
+
+private:
+  /* FIXME: other fields.  */
+
+public:
+  jint DestroyJavaVM ()
+  { return functions->DestroyJavaVM (this); }
+
+  jint AttachCurrentThread (void **penv, void *args)
+  { return functions->AttachCurrentThread (this, penv, args); }
+
+  jint DetachCurrentThread ()
+  { return functions->DetachCurrentThread (this); }
+
+  jint GetEnv (void **penv, jint version)
+  { return functions->GetEnv (this, penv, version); }
+};
+#endif /* __cplusplus */
+
+typedef struct JavaVMAttachArgs
+{
+  jint version;			/* Must be JNI_VERSION_1_2.  */
+  char *name;			/* The name of the thread (or NULL).  */
+  jobject group;		/* Global ref of a ThreadGroup object
+				   (or NULL).  */
+} JavaVMAttachArgs;
+
+typedef struct JavaVMOption
+{
+  char *optionString;
+  void *extraInfo;
+} JavaVMOption;
+
+typedef struct JavaVMInitArgs
+{
+  /* Must be JNI_VERSION_1_2.  */
+  jint version;
+
+  /* Number of options.  */
+  jint nOptions;
+
+  /* Options to the VM.  */
+  JavaVMOption *options;
+
+  /* Whether we should ignore unrecognized options.  */
+  jboolean ignoreUnrecognized;
+} JavaVMInitArgs;
 
 #endif /* __GCJ_JNI_H__ */
Index: include/jvm.h
===================================================================
RCS file: /cvs/java/libgcj/libjava/include/jvm.h,v
retrieving revision 1.15
diff -u -r1.15 jvm.h
--- jvm.h	2000/02/04 20:49:27	1.15
+++ jvm.h	2000/02/10 20:20:13
@@ -207,4 +207,8 @@
 /* Initialize JNI.  */
 extern void _Jv_JNI_Init (void);
 
+/* Get or set the per-thread JNIEnv used by the invocation API.  */
+_Jv_JNIEnv *_Jv_GetCurrentJNIEnv ();
+void _Jv_SetCurrentJNIEnv (_Jv_JNIEnv *);
+
 #endif /* __JAVA_JVM_H__ */
Index: java/lang/Thread.java
===================================================================
RCS file: /cvs/java/libgcj/libjava/java/lang/Thread.java,v
retrieving revision 1.4
diff -u -r1.4 Thread.java
--- Thread.java	2000/01/19 18:39:26	1.4
+++ Thread.java	2000/02/10 20:20:13
@@ -1,6 +1,6 @@
 // Thread.java - Thread class.
 
-/* Copyright (C) 1998, 1999  Red Hat, Inc.
+/* Copyright (C) 1998, 1999, 2000  Red Hat, Inc.
 
    This file is part of libgcj.
 
@@ -10,6 +10,8 @@
 
 package java.lang;
 
+import gnu.gcj.RawData;
+
 /**
  * @author Tom Tromey <tromey@cygnus.com>
  * @date August 24, 1998 
@@ -297,11 +299,8 @@
   private boolean interrupt_flag;
   private boolean alive_flag;
 
-  // This is a bit odd.  We need a way to represent some data that is
-  // manipulated only by the native side of this class.  We represent
-  // it as a Java object reference.  However, it is not actually a
-  // Java object.
-  private Object data;
+  // Our native data.
+  private RawData data;
 
   // Next thread number to assign.
   private static int nextThreadNumber = 0;
Index: java/lang/natThread.cc
===================================================================
RCS file: /cvs/java/libgcj/libjava/java/lang/natThread.cc,v
retrieving revision 1.11
diff -u -r1.11 natThread.cc
--- natThread.cc	2000/02/10 17:15:22	1.11
+++ natThread.cc	2000/02/10 20:20:14
@@ -1,6 +1,6 @@
 // natThread.cc - Native part of Thread class.
 
-/* Copyright (C) 1998, 1999  Red Hat, Inc.
+/* Copyright (C) 1998, 1999, 2000  Red Hat, Inc.
 
    This file is part of libgcj.
 
@@ -23,7 +23,10 @@
 #include <java/lang/IllegalThreadStateException.h>
 #include <java/lang/InterruptedException.h>
 #include <java/lang/NullPointerException.h>
+#include <gnu/gcj/RawData.h>
 
+#include <jni.h>
+
 
 
 // This structure is used to represent all the data the native side
@@ -40,6 +43,9 @@
   // This is private data for the thread system layer.
   _Jv_Thread_t *thread;
 
+  // Each thread has its own JNI object.
+  JNIEnv *jni_env;
+
   // All threads waiting to join this thread are linked together and
   // waiting on their respective `interrupt' condition variables.
   // When this thread exits, it notifies each such thread by
@@ -83,10 +89,13 @@
   // own finalizer then we will need to reinitialize this structure at
   // any "interesting" point.
   natThread *nt = (natThread *) _Jv_AllocBytes (sizeof (natThread));
-  data = (jobject) nt;
+  data = reinterpret_cast<gnu::gcj::RawData *> (nt);
   _Jv_MutexInit (&nt->interrupt_mutex);
   _Jv_CondInit (&nt->interrupt_cond);
   _Jv_ThreadInitData (&nt->thread, this);
+  // FIXME: if JNI_ENV is set we will want to free it.  It is
+  // malloc()d.
+  nt->jni_env = NULL;
   nt->joiner = 0;
   nt->next = 0;
 }
@@ -323,4 +332,21 @@
 java::lang::Thread::yield (void)
 {
   _Jv_ThreadYield ();
+}
+
+JNIEnv *
+_Jv_GetCurrentJNIEnv ()
+{
+  java::lang::Thread *t = _Jv_ThreadCurrent ();
+  if (t == NULL)
+    return NULL;
+  return ((natThread *) t->data)->jni_env;
+}
+
+void
+_Jv_SetCurrentJNIEnv (JNIEnv *env)
+{
+  java::lang::Thread *t = _Jv_ThreadCurrent ();
+  JvAssert (t != NULL);
+  ((natThread *) t->data)->jni_env = env;
 }

From java-patches-return-451-listarch-java-patches=sourceware.cygnus.com@sourceware.cygnus.com Thu Feb 10 23:42:22 2000
Return-Path: <java-patches-return-451-listarch-java-patches=sourceware.cygnus.com@sourceware.cygnus.com>
Delivered-To: listarch-java-patches@sourceware.cygnus.com
Received: (qmail 31830 invoked by alias); 10 Feb 2000 23:42:22 -0000
Mailing-List: contact java-patches-help@sourceware.cygnus.com; run by ezmlm
Precedence: bulk
List-Subscribe: <mailto:java-patches-subscribe@sourceware.cygnus.com>
List-Archive: <http://sourceware.cygnus.com/ml/java-patches/>
List-Post: <mailto:java-patches@sourceware.cygnus.com>
List-Help: <mailto:java-patches-help@sourceware.cygnus.com>, <http://sourceware.cygnus.com/ml/#faqs>
Sender: java-patches-owner@sourceware.cygnus.com
Delivered-To: mailing list java-patches@sourceware.cygnus.com
Received: (qmail 31808 invoked from network); 10 Feb 2000 23:42:17 -0000
To: Java Patch List <java-patches@sourceware.cygnus.com> 
Subject: Patch: jni.h -vs- C
X-Zippy:  -- I can do ANYTHING ... I can even ... SHOPLIFT!!
X-Attribution:  Tom
Bcc:
Reply-To:  tromey@cygnus.com
From:  Tom Tromey <tromey@cygnus.com>
Date: 10 Feb 2000 16:42:46 -0700
Message-ID: <871z6koc95.fsf@cygnus.com>
Lines: 55
X-Mailer: Gnus v5.5/Emacs 20.3

There were a couple bugs in jni.h when it was used from C -- some old,
some new.  This patch fixes them.

I just ran my first JNI test and it worked.
(Don't get too happy yet -- it only works if your JNI method doesn't
actually try to use its arguments.)

2000-02-10  Tom Tromey  <tromey@cygnus.com>

	* include/jni.h (JNI_FALSE): Renamed from JNI_TRUE; oops.
	(jboolean): Declare as an attributed int, not a bool.
	(_Jv_func): Declare differently for C.

Tom

Index: include/jni.h
===================================================================
RCS file: /cvs/java/libgcj/libjava/include/jni.h,v
retrieving revision 1.10
diff -u -r1.10 jni.h
--- jni.h	2000/02/10 20:31:48	1.10
+++ jni.h	2000/02/10 23:38:50
@@ -34,7 +34,7 @@
 typedef int    jshort __attribute__((__mode__(__HI__)));
 typedef int    jint   __attribute__((__mode__(__SI__)));
 typedef int    jlong  __attribute__((__mode__(__DI__)));
-typedef bool   jboolean __attribute__((__mode__(__QI__)));
+typedef int    jboolean __attribute__((__mode__(__QI__)));
 typedef unsigned short jchar __attribute__((__mode__(__HI__)));
 typedef float  jfloat;
 typedef double jdouble;
@@ -62,8 +62,8 @@
 typedef const struct JNINativeInterface *JNIEnv;
 typedef const struct JNIInvokeInterface *JavaVM;
 
-#define JNI_TRUE 1
-#define JNI_TRUE 0
+#define JNI_TRUE  1
+#define JNI_FALSE 0
 
 #endif /* __cplusplus */
 
@@ -117,7 +117,11 @@
   jobject  l;
 } jvalue;
 
-typedef void * (*_Jv_func)(...);
+#ifdef __cplusplus
+typedef void * (*_Jv_func) (...);
+#else
+typedef void * (*_Jv_func) ();
+#endif
 
 /* This structure is used when registering native methods.  */
 typedef struct

From java-patches-return-452-listarch-java-patches=sourceware.cygnus.com@sourceware.cygnus.com Fri Feb 11 17:31:53 2000
Return-Path: <java-patches-return-452-listarch-java-patches=sourceware.cygnus.com@sourceware.cygnus.com>
Delivered-To: listarch-java-patches@sourceware.cygnus.com
Received: (qmail 13446 invoked by alias); 11 Feb 2000 17:31:53 -0000
Mailing-List: contact java-patches-help@sourceware.cygnus.com; run by ezmlm
Precedence: bulk
List-Subscribe: <mailto:java-patches-subscribe@sourceware.cygnus.com>
List-Archive: <http://sourceware.cygnus.com/ml/java-patches/>
List-Post: <mailto:java-patches@sourceware.cygnus.com>
List-Help: <mailto:java-patches-help@sourceware.cygnus.com>, <http://sourceware.cygnus.com/ml/#faqs>
Sender: java-patches-owner@sourceware.cygnus.com
Delivered-To: mailing list java-patches@sourceware.cygnus.com
Received: (qmail 13370 invoked from network); 11 Feb 2000 17:31:08 -0000
To: Java Patch List <java-patches@sourceware.cygnus.com> 
Subject: Patch: File.createTempFile
X-Zippy:  YOW!!  I am having FUN!!
X-Attribution:  Tom
Bcc:
Reply-To:  tromey@cygnus.com
From:  Tom Tromey <tromey@cygnus.com>
Date: 11 Feb 2000 10:31:41 -0700
Message-ID: <87ya8rmyrm.fsf@cygnus.com>
Lines: 201
X-Mailer: Gnus v5.5/Emacs 20.3

I'm committing the appended patch.
It adds a method I needed to java.io.File.

2000-02-10  Tom Tromey  <tromey@cygnus.com>

	* java/io/natFileDescriptorPosix.cc (open): Recognize EXCL flag.
	* java/io/FileDescriptor.java (EXCL): New static field.
	* java/io/File.java (tmpdir): New static field.
	(createTempFile): New method.
	(nextValue): New method.
	* java/lang/natSystem.cc (init_properties): Set java.io.tmpdir
	property.

Tom

Index: java/io/File.java
===================================================================
RCS file: /cvs/java/libgcj/libjava/java/io/File.java,v
retrieving revision 1.4
diff -u -r1.4 File.java
--- File.java	2000/01/19 18:39:25	1.4
+++ File.java	2000/02/11 17:29:55
@@ -1,6 +1,6 @@
 // File.java - File name
 
-/* Copyright (C) 1998, 1999  Red Hat, Inc.
+/* Copyright (C) 1998, 1999, 2000  Red Hat, Inc.
 
    This file is part of libgcj.
 
@@ -215,6 +215,68 @@
     return mkdirs (new File (path));
   }
 
+  private static String nextValue ()
+  {
+    return Long.toString(counter++, Character.MAX_RADIX);
+  }
+
+  public static File createTempFile (String prefix, String suffix,
+				     File directory)
+    throws IOException
+  {
+    FileDescriptor desc = new FileDescriptor ();
+
+    SecurityManager s = System.getSecurityManager();
+    if (s != null)
+      s.checkWrite (desc);
+
+    if (prefix.length () < 3)
+      throw new IllegalArgumentException ();
+    if (suffix == null)
+      suffix = ".tmp";
+
+    // FIXME: filename length varies by architecture and filesystem.
+    int max_length = 255;
+
+    // Truncation rules.
+    // `6' is the number of characters we generate.
+    if (prefix.length () + 6 + suffix.length () > max_length)
+      {
+	int suf_len = 0;
+	if (suffix.charAt(0) == '.')
+	  suf_len = 4;
+	suffix = suffix.substring(0, suf_len);
+	if (prefix.length () + 6 + suf_len > max_length)
+	  prefix = prefix.substring(0, max_length - 6 - suf_len);
+      }
+
+    // We don't care about the name because we set it later.
+    File ret = new File ("");
+    // How many times should we try?  We choose 100.
+    for (int i = 0; i < 100; ++i)
+      {
+	// This is ugly.
+	String l = prefix + (nextValue () + "ZZZZZZ").substring(0,6) + suffix;
+	try
+	  {
+	    desc.open (l, FileDescriptor.WRITE | FileDescriptor.EXCL);
+	    ret.setPath(l);
+	    return ret;
+	  }
+	catch (IOException _)
+	  {
+	  }
+      }
+
+    throw new IOException ("couldn't make temp file");
+  }
+
+  public static File createTempFile (String prefix, String suffix)
+    throws IOException
+  {
+    return createTempFile (prefix, suffix, null);
+  }
+
   private final native boolean performRenameTo (File dest);
   public boolean renameTo (File dest)
   {
@@ -234,9 +296,14 @@
   public static final String separator = System.getProperty("file.separator");
   public static final char separatorChar = separator.charAt(0);
 
+  private static final String tmpdir = System.getProperty("java.io.tmpdir");
 
   // The path.
   private String path;
+
+  // We keep a counter for use by createTempFile.  We choose the first
+  // value randomly to try to avoid clashes with other VMs.
+  private static long counter = Double.doubleToLongBits (Math.random ());
 
   // mkdirs() uses this to avoid repeated allocations.
   private final void setPath (String n)
Index: java/io/FileDescriptor.java
===================================================================
RCS file: /cvs/java/libgcj/libjava/java/io/FileDescriptor.java,v
retrieving revision 1.3
diff -u -r1.3 FileDescriptor.java
--- FileDescriptor.java	2000/01/19 18:39:25	1.3
+++ FileDescriptor.java	2000/02/11 17:29:55
@@ -1,6 +1,6 @@
 // FileDescriptor.java - Open file or device
 
-/* Copyright (C) 1998, 1999  Red Hat, Inc.
+/* Copyright (C) 1998, 1999, 2000  Red Hat, Inc.
 
    This file is part of libgcj.
 
@@ -36,6 +36,8 @@
   static final int READ   = 1;
   static final int WRITE  = 2;
   static final int APPEND = 4;
+  // EXCL is used only when making a temp file.
+  static final int EXCL   = 8;
 
   // These are WHENCE values for seek.
   static final int SET = 0;
Index: java/io/natFileDescriptorPosix.cc
===================================================================
RCS file: /cvs/java/libgcj/libjava/java/io/natFileDescriptorPosix.cc,v
retrieving revision 1.5
diff -u -r1.5 natFileDescriptorPosix.cc
--- natFileDescriptorPosix.cc	2000/01/19 18:39:25	1.5
+++ natFileDescriptorPosix.cc	2000/02/11 17:29:58
@@ -1,6 +1,6 @@
 // natFileDescriptor.cc - Native part of FileDescriptor class.
 
-/* Copyright (C) 1998, 1999  Red Hat, Inc.
+/* Copyright (C) 1998, 1999, 2000  Red Hat, Inc.
 
    This file is part of libgcj.
 
@@ -83,6 +83,7 @@
 #endif
 
   JvAssert ((jflags & READ) || (jflags & WRITE));
+  int mode = 0644;
   if ((jflags & READ) && (jflags & WRITE))
     flags |= O_RDWR;
   else if ((jflags & READ))
@@ -94,9 +95,16 @@
 	flags |= O_APPEND;
       else
 	flags |= O_TRUNC;
+
+      if ((jflags & EXCL))
+	{
+	  flags |= O_EXCL;
+	  // In this case we are making a temp file.
+	  mode = 0600;
+	}
     }
 
-  int fd = ::open (buf, flags, 0644);
+  int fd = ::open (buf, flags, mode);
   if (fd == -1)
     {
       char msg[MAXPATHLEN + 200];
Index: java/lang/natSystem.cc
===================================================================
RCS file: /cvs/java/libgcj/libjava/java/lang/natSystem.cc,v
retrieving revision 1.17
diff -u -r1.17 natSystem.cc
--- natSystem.cc	2000/01/19 18:39:26	1.17
+++ natSystem.cc	2000/02/11 17:30:02
@@ -270,11 +270,14 @@
   SET ("file.separator", "\\");
   SET ("path.separator", ";");
   SET ("line.separator", "\r\n");
+  SET ("java.io.tmpdir", "C:\\temp");
 #else
   // Unix.
   SET ("file.separator", "/");
   SET ("path.separator", ":");
   SET ("line.separator", "\n");
+  // FIXME: look at getenv("TMPDIR");
+  SET ("java.io.tmpdir", "/tmp");
 #endif
 
 #ifdef HAVE_UNAME

From java-patches-return-453-listarch-java-patches=sourceware.cygnus.com@sourceware.cygnus.com Fri Feb 11 18:42:59 2000
Return-Path: <java-patches-return-453-listarch-java-patches=sourceware.cygnus.com@sourceware.cygnus.com>
Delivered-To: listarch-java-patches@sourceware.cygnus.com
Received: (qmail 28006 invoked by alias); 11 Feb 2000 18:42:58 -0000
Mailing-List: contact java-patches-help@sourceware.cygnus.com; run by ezmlm
Precedence: bulk
List-Subscribe: <mailto:java-patches-subscribe@sourceware.cygnus.com>
List-Archive: <http://sourceware.cygnus.com/ml/java-patches/>
List-Post: <mailto:java-patches@sourceware.cygnus.com>
List-Help: <mailto:java-patches-help@sourceware.cygnus.com>, <http://sourceware.cygnus.com/ml/#faqs>
Sender: java-patches-owner@sourceware.cygnus.com
Delivered-To: mailing list java-patches@sourceware.cygnus.com
Received: (qmail 27962 invoked from network); 11 Feb 2000 18:42:53 -0000
To: Java Patch List <java-patches@sourceware.cygnus.com> 
Subject: Patch: bug fix for File.java
X-Zippy:  The Osmonds!  You are all Osmonds!!  Throwing up on a freeway at dawn!!!
X-Attribution:  Tom
Bcc:
Reply-To:  tromey@cygnus.com
From:  Tom Tromey <tromey@cygnus.com>
Date: 11 Feb 2000 11:43:36 -0700
Message-ID: <87snyzk2av.fsf@cygnus.com>
Lines: 26
X-Mailer: Gnus v5.5/Emacs 20.3

I'm committing this patch.
It ensures that the new File.createTempFile will never return the same
filename twice.

2000-02-11  Tom Tromey  <tromey@cygnus.com>

	* java/io/File.java (nextValue): Now synchronized.

Tom

Index: java/io/File.java
===================================================================
RCS file: /cvs/java/libgcj/libjava/java/io/File.java,v
retrieving revision 1.5
diff -u -r1.5 File.java
--- File.java	2000/02/11 17:32:52	1.5
+++ File.java	2000/02/11 18:15:47
@@ -215,7 +215,7 @@
     return mkdirs (new File (path));
   }
 
-  private static String nextValue ()
+  private static synchronized String nextValue ()
   {
     return Long.toString(counter++, Character.MAX_RADIX);
   }

From java-patches-return-454-listarch-java-patches=sourceware.cygnus.com@sourceware.cygnus.com Fri Feb 11 19:15:49 2000
Return-Path: <java-patches-return-454-listarch-java-patches=sourceware.cygnus.com@sourceware.cygnus.com>
Delivered-To: listarch-java-patches@sourceware.cygnus.com
Received: (qmail 1699 invoked by alias); 11 Feb 2000 19:15:48 -0000
Mailing-List: contact java-patches-help@sourceware.cygnus.com; run by ezmlm
Precedence: bulk
List-Subscribe: <mailto:java-patches-subscribe@sourceware.cygnus.com>
List-Archive: <http://sourceware.cygnus.com/ml/java-patches/>
List-Post: <mailto:java-patches@sourceware.cygnus.com>
List-Help: <mailto:java-patches-help@sourceware.cygnus.com>, <http://sourceware.cygnus.com/ml/#faqs>
Sender: java-patches-owner@sourceware.cygnus.com
Delivered-To: mailing list java-patches@sourceware.cygnus.com
Received: (qmail 1674 invoked from network); 11 Feb 2000 19:15:47 -0000
Date: Fri, 11 Feb 2000 11:15:43 -0800 (PST)
From: Warren Levy <warrenl@cygnus.com>
To: java-patches@sourceware.cygnus.com
Subject: Patch: Implemented bit operations in BigInteger
Message-ID: <Pine.SOL.3.91.1000211110940.854C-100000@fencer.cygnus.com>
MIME-Version: 1.0
Content-Type: TEXT/PLAIN; charset=US-ASCII

Folks,
I've checked in the following patch which includes most of the bit 
operations for java.math.BigInteger.  Again, credit goes to Per Bothner
<per@bothner.com> for use of his BitOps class from Kawa.
--warrenl


2000-02-04  Warren Levy  <warrenl@cygnus.com>

	* java/math/BigInteger.java(BigInteger(String, int)): New constructor.
	(BigInteger(String)): New constructor.
	(not): Rewritten using version from Kawa's BitOps class.
	(valueOf): New private methods from Kawa's BitOps class.
	(swappedOp): ditto.
	(bitOp): ditto.
	(setBitOp): ditto.
	(and): Implemented.
	(or): Implemented.
	(xor): Implemented.
	(andNot): Implemented.
	(clearBit): Implemented.
	(setBit): Implemented.
	(bitCount): Implemented.
	(toByteArray): Implemented.


Index: BigInteger.java
===================================================================
RCS file: /cvs/java/libgcj/libjava/java/math/BigInteger.java,v
retrieving revision 1.1
diff -u -p -r1.1 BigInteger.java
--- BigInteger.java	2000/02/04 22:00:36	1.1
+++ BigInteger.java	2000/02/11 19:07:46
@@ -21,7 +21,7 @@ import java.util.Random;
  * Written using on-line Java Platform 1.2 API Specification, as well
  * as "The Java Class Libraries", 2nd edition (Addison-Wesley, 1998).
  * 
- * Based primarily on IntNum.java by Per Bothner <per@bothner.com>
+ * Based primarily on IntNum.java BitOps.java by Per Bothner <per@bothner.com>
  * (found in Kawa 1.6.62).
  *
  * Status:  Believed complete and correct.
@@ -70,6 +70,18 @@ public class BigInteger extends Number i
     ival = value;
   }
 
+  public BigInteger(String val, int radix)
+  {
+    BigInteger result = valueOf(val, radix);
+    this.ival = result.ival;
+    this.words = result.words;
+  }
+
+  public BigInteger(String val)
+  {
+    this(val, 10);
+  }
+
   /* Create a new (non-shared) BigInteger, and initialize from a byte array. */
   public BigInteger(byte[] val)
   {
@@ -184,7 +196,7 @@ public class BigInteger extends Number i
       word = (word << 8) | (((int) bytes[bptr]) & 0xff);
     words[--nwords] = word;
 
-    // Elements remaining in byte[] is a  multiple of 4.
+    // Elements remaining in byte[] are a multiple of 4.
     while (nwords > 0)
       words[--nwords] = bytes[bptr++] << 24 |
 			(((int) bytes[bptr++]) & 0xff) << 16 |
@@ -339,13 +351,13 @@ public class BigInteger extends Number i
     return this;
   }
 
-  /** Add two ints, yielding an BigInteger. */
+  /** Add two ints, yielding a BigInteger. */
   private static final BigInteger add(int x, int y)
   {
     return BigInteger.make((long) x + (long) y);
   }
 
-  /** Add an BigInteger and an int, yielding a new BigInteger. */
+  /** Add a BigInteger and an int, yielding a new BigInteger. */
   private static BigInteger add(BigInteger x, int y)
   {
     if (x.words == null)
@@ -1183,15 +1195,6 @@ public class BigInteger extends Number i
       }
   }
 
-  public BigInteger not()
-  {
-    BigInteger result = new BigInteger();
-    result.ival = ival;
-    result.words = words;
-    result.setInvert();
-    return result;
-  }
-
   private void setShiftLeft(BigInteger x, int count)
   {
     int[] xwords;
@@ -1419,6 +1422,51 @@ public class BigInteger extends Number i
     return BigInteger.equals(this, (BigInteger) obj);
   }
 
+  private static BigInteger valueOf(String s, int radix)
+       throws NumberFormatException
+  {
+    int len = s.length();
+    // Testing (len < MPN.chars_per_word(radix)) would be more accurate,
+    // but slightly more expensive, for little practical gain.
+    if (len <= 15 && radix <= 16)
+      return BigInteger.make(Long.parseLong(s, radix));
+    
+    int byte_len = 0;
+    byte[] bytes = new byte[len];
+    boolean negative = false;
+    for (int i = 0;  i < len;  i++)
+      {
+	char ch = s.charAt(i);
+	if (ch == '-')
+	  negative = true;
+	else if (ch == '_' || (byte_len == 0 && (ch == ' ' || ch == '\t')))
+	  continue;
+	else
+	  {
+	    int digit = Character.digit(ch, radix);
+	    if (digit < 0)
+	      break;
+	    bytes[byte_len++] = (byte) digit;
+	  }
+      }
+    return valueOf(bytes, byte_len, negative, radix);
+  }
+
+  private static BigInteger valueOf(byte[] digits, int byte_len,
+				    boolean negative, int radix)
+  {
+    int chars_per_word = MPN.chars_per_word(radix);
+    int[] words = new int[byte_len / chars_per_word + 1];
+    int size = MPN.set_str(words, digits, byte_len, radix);
+    if (size == 0)
+      return ZERO;
+    if (words[size-1] < 0)
+      words[size++] = 0;
+    if (negative)
+      negate(words, words, size);
+    return make(words, size);
+  }
+
   public double doubleValue()
   {
     if (words == null)
@@ -1632,21 +1680,307 @@ public class BigInteger extends Number i
       return MPN.intLength(words, ival);
   }
 
-/* TODO:
+  public byte[] toByteArray()
+  {
+    // Determine number of bytes needed.  The method bitlength returns
+    // the size without the sign bit, so add one bit for that and then
+    // add 7 more to emulate the ceil function using integer math.
+    byte[] bytes = new byte[(bitLength() + 1 + 7) / 8];
+    int nbytes = bytes.length;
 
-  public BigInteger(String val, int radix)
+    int wptr = 0;
+    int word;
 
-  public BigInteger(String val)
+    // Deal with words array until one word or less is left to process.
+    // If BigInteger is an int, then it is in ival and nbytes will be <= 4.
+    while (nbytes > 4)
+      {
+	word = words[wptr++];
+	for (int i = 4; i > 0; --i, word >>= 8)
+          bytes[--nbytes] = (byte) word;
+      }
 
-  public BigInteger(int bitLength, int certainty, Random rnd)
+    // Deal with the last few bytes.  If BigInteger is an int, use ival.
+    word = (words == null) ? ival : words[wptr];
+    for ( ; nbytes > 0; word >>= 8)
+      bytes[--nbytes] = (byte) word;
+
+    return bytes;
+  }
+
+  /** Return the boolean opcode (for bitOp) for swapped operands.
+   * I.e. bitOp(swappedOp(op), x, y) == bitOp(op, y, x).
+   */
+  private static int swappedOp(int op)
+  {
+    return
+    "\000\001\004\005\002\003\006\007\010\011\014\015\012\013\016\017"
+    .charAt(op);
+  }
+
+  /** Do one the the 16 possible bit-wise operations of two BigIntegers. */
+  private static BigInteger bitOp(int op, BigInteger x, BigInteger y)
+  {
+    switch (op)
+      {
+        case 0:  return ZERO;
+        case 1:  return x.and(y);
+        case 3:  return x;
+        case 5:  return y;
+        case 15: return smallFixNums[-1 - minFixNum];	// Returns -1.
+      }
+    BigInteger result = new BigInteger();
+    setBitOp(result, op, x, y);
+    return result.canonicalize();
+  }
+
+  /** Do one the the 16 possible bit-wise operations of two BigIntegers. */
+  private static void setBitOp(BigInteger result, int op,
+			       BigInteger x, BigInteger y)
+  {
+    if (y.words == null) ;
+    else if (x.words == null || x.ival < y.ival)
+      {
+	BigInteger temp = x;  x = y;  y = temp;
+	op = swappedOp(op);
+      }
+    int xi;
+    int yi;
+    int xlen, ylen;
+    if (y.words == null)
+      {
+	yi = y.ival;
+	ylen = 1;
+      }
+    else
+      {
+	yi = y.words[0];
+	ylen = y.ival;
+      }
+    if (x.words == null)
+      {
+	xi = x.ival;
+	xlen = 1;
+      }
+    else
+      {
+	xi = x.words[0];
+	xlen = x.ival;
+      }
+    if (xlen > 1)
+      result.realloc(xlen);
+    int[] w = result.words;
+    int i = 0;
+    // Code for how to handle the remainder of x.
+    // 0:  Truncate to length of y.
+    // 1:  Copy rest of x.
+    // 2:  Invert rest of x.
+    int finish = 0;
+    int ni;
+    switch (op)
+      {
+      case 0:  // clr
+	ni = 0;
+	break;
+      case 1: // and
+	for (;;)
+	  {
+	    ni = xi & yi;
+	    if (i+1 >= ylen) break;
+	    w[i++] = ni;  xi = x.words[i];  yi = y.words[i];
+	  }
+	if (yi < 0) finish = 1;
+	break;
+      case 2: // andc2
+	for (;;)
+	  {
+	    ni = xi & ~yi;
+	    if (i+1 >= ylen) break;
+	    w[i++] = ni;  xi = x.words[i];  yi = y.words[i];
+	  }
+	if (yi >= 0) finish = 1;
+	break;
+      case 3:  // copy x
+	ni = xi;
+	finish = 1;  // Copy rest
+	break;
+      case 4: // andc1
+	for (;;)
+	  {
+	    ni = ~xi & yi;
+	    if (i+1 >= ylen) break;
+	    w[i++] = ni;  xi = x.words[i];  yi = y.words[i];
+	  }
+	if (yi < 0) finish = 2;
+	break;
+      case 5: // copy y
+	for (;;)
+	  {
+	    ni = yi;
+	    if (i+1 >= ylen) break;
+	    w[i++] = ni;  xi = x.words[i];  yi = y.words[i];
+	  }
+	break;
+      case 6:  // xor
+	for (;;)
+	  {
+	    ni = xi ^ yi;
+	    if (i+1 >= ylen) break;
+	    w[i++] = ni;  xi = x.words[i];  yi = y.words[i];
+	  }
+	finish = yi < 0 ? 2 : 1;
+	break;
+      case 7:  // ior
+	for (;;)
+	  {
+	    ni = xi | yi;
+	    if (i+1 >= ylen) break;
+	    w[i++] = ni;  xi = x.words[i];  yi = y.words[i];
+	  }
+	if (yi >= 0) finish = 1;
+	break;
+      case 8:  // nor
+	for (;;)
+	  {
+	    ni = ~(xi | yi);
+	    if (i+1 >= ylen) break;
+	    w[i++] = ni;  xi = x.words[i];  yi = y.words[i];
+	  }
+	if (yi >= 0)  finish = 2;
+	break;
+      case 9:  // eqv [exclusive nor]
+	for (;;)
+	  {
+	    ni = ~(xi ^ yi);
+	    if (i+1 >= ylen) break;
+	    w[i++] = ni;  xi = x.words[i];  yi = y.words[i];
+	  }
+	finish = yi >= 0 ? 2 : 1;
+	break;
+      case 10:  // c2
+	for (;;)
+	  {
+	    ni = ~yi;
+	    if (i+1 >= ylen) break;
+	    w[i++] = ni;  xi = x.words[i];  yi = y.words[i];
+	  }
+	break;
+      case 11:  // orc2
+	for (;;)
+	  {
+	    ni = xi | ~yi;
+	    if (i+1 >= ylen) break;
+	    w[i++] = ni;  xi = x.words[i];  yi = y.words[i];
+	  }
+	if (yi < 0)  finish = 1;
+	break;
+      case 12:  // c1
+	ni = ~xi;
+	finish = 2;
+	break;
+      case 13:  // orc1
+	for (;;)
+	  {
+	    ni = ~xi | yi;
+	    if (i+1 >= ylen) break;
+	    w[i++] = ni;  xi = x.words[i];  yi = y.words[i];
+	  }
+	if (yi >= 0) finish = 2;
+	break;
+      case 14:  // nand
+	for (;;)
+	  {
+	    ni = ~(xi & yi);
+	    if (i+1 >= ylen) break;
+	    w[i++] = ni;  xi = x.words[i];  yi = y.words[i];
+	  }
+	if (yi < 0) finish = 2;
+	break;
+      default:
+      case 15:  // set
+	ni = -1;
+	break;
+      }
+    // Here i==ylen-1; w[0]..w[i-1] have the correct result;
+    // and ni contains the correct result for w[i+1].
+    if (i+1 == xlen)
+      finish = 0;
+    switch (finish)
+      {
+      case 0:
+	if (i == 0 && w == null)
+	  {
+	    result.ival = ni;
+	    return;
+	  }
+	w[i++] = ni;
+	break;
+      case 1:  w[i] = ni;  while (++i < xlen)  w[i] = x.words[i];  break;
+      case 2:  w[i] = ni;  while (++i < xlen)  w[i] = ~x.words[i];  break;
+      }
+    result.ival = i;
+  }
 
-  public BigInteger and(BigInteger val)
+  /** Return the logical (bit-wise) "and" of a BigInteger and an int. */
+  private static BigInteger and(BigInteger x, int y)
+  {
+    if (x.words == null)
+      return BigInteger.make(x.ival & y);
+    if (y >= 0)
+      return BigInteger.make(x.words[0] & y);
+    int len = x.ival;
+    int[] words = new int[len];
+    words[0] = x.words[0] & y;
+    while (--len > 0)
+      words[len] = x.words[len];
+    return BigInteger.make(words, x.ival);
+  }
 
-  public BigInteger or(BigInteger val)
+  /** Return the logical (bit-wise) "and" of two BigIntegers. */
+  public BigInteger and(BigInteger y)
+  {
+    if (y.words == null)
+      return and(this, y.ival);
+    else if (words == null)
+      return and(y, ival);
 
-  public BigInteger xor(BigInteger val
+    BigInteger x = this;
+    if (ival < y.ival)
+      {
+        BigInteger temp = this;  x = y;  y = temp;
+      }
+    int i;
+    int len = y.isNegative() ? x.ival : y.ival;
+    int[] words = new int[len];
+    for (i = 0;  i < y.ival;  i++)
+      words[i] = x.words[i] & y.words[i];
+    for ( ; i < len;  i++)
+      words[i] = x.words[i];
+    return BigInteger.make(words, len);
+  }
 
+  /** Return the logical (bit-wise) "(inclusive) or" of two BigIntegers. */
+  public BigInteger or(BigInteger y)
+  {
+    return bitOp(7, this, y);
+  }
+
+  /** Return the logical (bit-wise) "exclusive or" of two BigIntegers. */
+  public BigInteger xor(BigInteger y)
+  {
+    return bitOp(6, this, y);
+  }
+
+  /** Return the logical (bit-wise) negation of a BigInteger. */
+  public BigInteger not()
+  {
+    return bitOp(12, this, ZERO);
+  }
+
   public BigInteger andNot(BigInteger val)
+  {
+    return and(val.not());
+  }
 
   public BigInteger clearBit(int n)
   {
@@ -1664,20 +1998,62 @@ public class BigInteger extends Number i
     return or(ONE.shiftLeft(n));
   }
 
+  // bit4count[I] is number of '1' bits in I.
+  private static final byte[] bit4_count = { 0, 1, 1, 2,  1, 2, 2, 3,
+					     1, 2, 2, 3,  2, 3, 3, 4};
+
+  private static int bitCount(int i)
+  {
+    int count = 0;
+    while (i != 0)
+      {
+	count += bit4_count[i & 15];
+	i >>>= 4;
+      }
+    return count;
+  }
+
+  private static int bitCount(int[] x, int len)
+  {
+    int count = 0;
+    while (--len >= 0)
+      count += bitCount(x[len]);
+    return count;
+  }
+
+  /** Count one bits in a BigInteger.
+   * If argument is negative, count zero bits instead. */
+  public int bitCount()
+  {
+    int i, x_len;
+    int[] x_words = words;
+    if (x_words == null)
+      {
+	x_len = 1;
+	i = bitCount(ival);
+      }
+    else
+      {
+	x_len = ival;
+	i = bitCount(x_words, x_len);
+      }
+    return isNegative() ? x_len * 32 - i : i;
+  }
+
+/* TODO:
+
+  public BigInteger(int bitLength, int certainty, Random rnd)
+
   public boolean testBit(int n)
 
   public BigInteger flipBit(int n)
 
   public int getLowestSetBit()
 
-  public int bitCount()
-
   public boolean isProbablePrime(int certainty)
 
   public BigInteger min(BigInteger val)
 
   public BigInteger max(BigInteger val)
-
-  public byte[] toByteArray()
 */
 }




From java-patches-return-455-listarch-java-patches=sourceware.cygnus.com@sourceware.cygnus.com Fri Feb 11 23:11:01 2000
Return-Path: <java-patches-return-455-listarch-java-patches=sourceware.cygnus.com@sourceware.cygnus.com>
Delivered-To: listarch-java-patches@sourceware.cygnus.com
Received: (qmail 22665 invoked by alias); 11 Feb 2000 23:11:00 -0000
Mailing-List: contact java-patches-help@sourceware.cygnus.com; run by ezmlm
Precedence: bulk
List-Subscribe: <mailto:java-patches-subscribe@sourceware.cygnus.com>
List-Archive: <http://sourceware.cygnus.com/ml/java-patches/>
List-Post: <mailto:java-patches@sourceware.cygnus.com>
List-Help: <mailto:java-patches-help@sourceware.cygnus.com>, <http://sourceware.cygnus.com/ml/#faqs>
Sender: java-patches-owner@sourceware.cygnus.com
Delivered-To: mailing list java-patches@sourceware.cygnus.com
Received: (qmail 22641 invoked from network); 11 Feb 2000 23:10:55 -0000
To: Java Patch List <java-patches@sourceware.cygnus.com> 
Subject: Patch: typo in interpret.cc
X-Zippy:  FOOLED you!  Absorb EGO SHATTERING impulse rays, polyester poltroon!!
X-Attribution:  Tom
Bcc:
Reply-To:  tromey@cygnus.com
From:  Tom Tromey <tromey@cygnus.com>
Date: 11 Feb 2000 16:11:41 -0700
Message-ID: <87itzvjpw2.fsf@cygnus.com>
Lines: 43
X-Mailer: Gnus v5.5/Emacs 20.3

I'm checking in the following patch, from Hans Boehm.
It fixes a bug in in the interpreter which is only visible on 64bit
platforms.

2000-02-11  Tom Tromey  <tromey@cygnus.com>

	* interpret.cc (continue1): Use STOREA, not STOREI, to implement
	astore instruction.  From Hans Boehm.

Tom

Index: THANKS
===================================================================
RCS file: /cvs/java/libgcj/libjava/THANKS,v
retrieving revision 1.8
diff -u -r1.8 THANKS
--- THANKS	1999/12/03 03:00:39	1.8
+++ THANKS	2000/02/11 23:09:30
@@ -5,7 +5,7 @@
 order.
 
 Geoff Berry for his object serialization work and various patches.
-Hans-J. Boehm for his garbage collector.
+Hans-J. Boehm for his garbage collector and other work.
 Godmar Back for his improvements and encouragement.
 Per Bothner for dreaming up, designing and implementing much of gcj.
 Steve Chamberlain for config fixes and the picoJava port.
Index: interpret.cc
===================================================================
RCS file: /cvs/java/libgcj/libjava/interpret.cc,v
retrieving revision 1.11
diff -u -r1.11 interpret.cc
--- interpret.cc	2000/02/10 17:15:22	1.11
+++ interpret.cc	2000/02/11 23:09:38
@@ -1080,7 +1080,7 @@
       NEXT_INSN;
 
      insn_astore:
-      STOREI (get1u (pc++));
+      STOREA (get1u (pc++));
       NEXT_INSN;
 
      insn_istore_0:

From java-patches-return-456-listarch-java-patches=sourceware.cygnus.com@sourceware.cygnus.com Sat Feb 12 03:48:42 2000
Return-Path: <java-patches-return-456-listarch-java-patches=sourceware.cygnus.com@sourceware.cygnus.com>
Delivered-To: listarch-java-patches@sourceware.cygnus.com
Received: (qmail 26087 invoked by alias); 12 Feb 2000 03:48:42 -0000
Mailing-List: contact java-patches-help@sourceware.cygnus.com; run by ezmlm
Precedence: bulk
List-Subscribe: <mailto:java-patches-subscribe@sourceware.cygnus.com>
List-Archive: <http://sourceware.cygnus.com/ml/java-patches/>
List-Post: <mailto:java-patches@sourceware.cygnus.com>
List-Help: <mailto:java-patches-help@sourceware.cygnus.com>, <http://sourceware.cygnus.com/ml/#faqs>
Sender: java-patches-owner@sourceware.cygnus.com
Delivered-To: mailing list java-patches@sourceware.cygnus.com
Received: (qmail 26061 invoked from network); 12 Feb 2000 03:48:38 -0000
Date: Fri, 11 Feb 2000 19:48:34 -0800
Message-Id: <200002120348.TAA00996@hoser.cygnus.com>
X-Authentication-Warning: hoser.cygnus.com: green set sender to green@cygnus.com using -f
From: Anthony Green <green@cygnus.com>
To: java-patches@sourceware.cygnus.com
Subject: More thanks
X-Organization: Red Hat, Sunnyvale, California
X-URL: http://www.cygnus.com/~green
Reply-to: green@redhat.com


I'm checking in the following two patches:


Fri Feb 11 19:16:40 2000  Anthony Green  <green@cygnus.com>

	* thanks.html: Updated.


Index: thanks.html
===================================================================
RCS file: /cvs/java/htdocs/thanks.html,v
retrieving revision 1.3
diff -u -p -u -r1.3 thanks.html
--- thanks.html	1999/12/03 02:59:36	1.3
+++ thanks.html	2000/02/12 03:22:45
@@ -61,9 +61,12 @@ Please keep this list in alphabetical or
 <p>
 <ul>
 <li>Geoff Berry for his object serialization work and various patches.
-<li>Hans-J. Boehm for his <a href="http://reality.sgi.com/boehm/gc.html">garbage collector</a>.
+<li>Hans-J. Boehm for his <a href="http://reality.sgi.com/boehm/gc.html">garbage collector</a> and other work.
 <li>Godmar Back for his improvements and encouragement.
+<li>Scott Bambrough for help porting the compiler.
 <li>Per Bothner for dreaming up, designing and implementing much of gcj.
+<li>Joerg Brunsmann for compiler hacking and help with the FAQ.
+<li>Glenn Chambers for help with the FAQ.
 <li>Steve Chamberlain for config fixes and the picoJava port.
 <li>John-Marc Chandonia for various library patches.
 <li>Eric Christopher for his porting help and clean-ups.
@@ -83,7 +86,8 @@ great compiler work.
 <li>All of the Mauve project <a href="http://sourceware.cygnus.com/cgi-bin/cvsweb.cgi/~checkout~/mauve/THANKS?rev=1.2&cvsroot=mauve&only_with_tag=HEAD">contributors</a>, for test code.
 <li>Rainer Orth for configuration clean-ups and porting help.
 <li>Alexandre Petit-Bianco for implementing much of the compiler, and continued maintainership.
-<li>Jeff Sturm for porting help and encouragement.
+<li>Bradley Schatz for his work on the FAQ.
+<li>Jeff Sturm for porting help, bug fixes, and encouragement.
 <li>Tom Tromey for his many contributions and libgcj maintainership.
 <li>Matt Welsh for help with Linux Threads.
 <li>Urban Widmark for help fixing java.io.
@@ -101,18 +105,22 @@ in testing GCJ:
 <li>David Billinghurst
 <li>Jim Blandy
 <li>Stephane Bortzmeyer
-<li>Joerg Brunsmann
 <li>Bradford Castalia
+<li>Ralph Doncaster
 <li>Richard Emberson
 <li>Mark K. Gardner
+<li>Charles Gauthier
 <li>Simon Gornall
 <li>John Griffin
 <li>Kevin B. Hendricks
 <li>Patrik Hagglund
 <li>Amancio Hasty 
 <li>Joep Jansen
 <li>Tobias Kuipers
+<li>Anand Krishnaswamy
+<li>Jesse Macnish
 <li>Anon A. Mous
+<li>Stefan Morrell
 <li>Pekka Nikander
 <li>Jon Olson
 <li>Paul Reilly
@@ -122,6 +130,7 @@ in testing GCJ:
 <li>Franz Sirl
 <li>Adam Sulmicki
 <li>Frederik Warg
+<li>David E. Young
 </ul>
 
 Thank you all!



Fri Feb 11 19:48:08 2000  Anthony Green  <green@cygnus.com>

	* THANKS: More thanks.


Index: libgcj/libjava/THANKS
===================================================================
RCS file: /cvs/java/libgcj/libjava/THANKS,v
retrieving revision 1.9
diff -u -p -u -r1.9 THANKS
--- THANKS	2000/02/11 23:24:28	1.9
+++ THANKS	2000/02/12 03:46:33
@@ -7,7 +7,10 @@ order.
 Geoff Berry for his object serialization work and various patches.
 Hans-J. Boehm for his garbage collector and other work.
 Godmar Back for his improvements and encouragement.
+Scott Bambrough for help porting the compiler.
 Per Bothner for dreaming up, designing and implementing much of gcj.
+Joerg Brunsmann for compiler hacking and help with the FAQ.
+Glenn Chambers for help with the FAQ.
 Steve Chamberlain for config fixes and the picoJava port.
 John-Marc Chandonia for various library patches.
 Eric Christopher for his porting help and clean-ups.
@@ -26,6 +29,7 @@ All of the Mauve project contributors, f
 Rainer Orth for configuration clean-ups and porting help.
 Alexandre Petit-Bianco for implementing much of the compiler, 
 	and continued maintainership.
+Bradley Schatz for his work on the FAQ.
 Jeff Sturm for porting help, bug fixes, and encouragement.
 Tom Tromey for his many contributions and libgcj maintainership.
 Matt Welsh for help with Linux Threads.
@@ -42,10 +46,11 @@ Chris Baldwin
 David Billinghurst
 Jim Blandy
 Stephane Bortzmeyer
-Joerg Brunsmann
 Bradford Castalia
+Ralph Doncaster
 Richard Emberson
 Mark K. Gardner
+Charles Gauthier
 Simon Gornall
 John Griffin
 Kevin B. Hendricks
@@ -53,7 +58,10 @@ Patrik Hagglund
 Amancio Hasty 
 Joep Jansen
 Tobias Kuipers
+Anand Krishnaswamy
+Jesse Macnish
 Anon A. Mous
+Stefan Morrell
 Pekka Nikander
 Jon Olson
 Paul Reilly
@@ -63,5 +71,6 @@ Marc Schifer
 Franz Sirl
 Adam Sulmicki 
 Frederik Warg 
+David E. Young
 
 Thank you all!

-- 
Anthony Green                                                        Red Hat
                                                       Sunnyvale, California

From java-patches-return-457-listarch-java-patches=sourceware.cygnus.com@sourceware.cygnus.com Sat Feb 12 18:34:55 2000
Return-Path: <java-patches-return-457-listarch-java-patches=sourceware.cygnus.com@sourceware.cygnus.com>
Delivered-To: listarch-java-patches@sourceware.cygnus.com
Received: (qmail 17266 invoked by alias); 12 Feb 2000 18:34:53 -0000
Mailing-List: contact java-patches-help@sourceware.cygnus.com; run by ezmlm
Precedence: bulk
List-Subscribe: <mailto:java-patches-subscribe@sourceware.cygnus.com>
List-Archive: <http://sourceware.cygnus.com/ml/java-patches/>
List-Post: <mailto:java-patches@sourceware.cygnus.com>
List-Help: <mailto:java-patches-help@sourceware.cygnus.com>, <http://sourceware.cygnus.com/ml/#faqs>
Sender: java-patches-owner@sourceware.cygnus.com
Delivered-To: mailing list java-patches@sourceware.cygnus.com
Received: (qmail 17197 invoked from network); 12 Feb 2000 18:34:38 -0000
To: Java Patch List <java-patches@sourceware.cygnus.com> 
Subject: Patch: New tests from Alex
X-Zippy:  I love FRUIT PICKERS!!
X-Attribution:  Tom
Bcc:
Reply-To:  tromey@cygnus.com
From:  Tom Tromey <tromey@cygnus.com>
Date: 12 Feb 2000 11:35:32 -0700
Message-ID: <8766vujmkr.fsf@cygnus.com>
Lines: 126
X-Mailer: Gnus v5.5/Emacs 20.3

I'm checking in a couple new tests from Alex.

2000-02-12  Alexandre Petit-Bianco  <apbianco@cygnus.com>

	* libjava.lang/inner_interface.out: New file.
	* libjava.lang/inner_interface.java: New file.
	* libjava.lang/final_int.out: New file.
	* libjava.lang/final_int.java: New file.
	* libjava.lang/final_static_and_friend.out: New file.
	* libjava.lang/final_static_and_friend.java: New file.

Tom

Index: libjava.lang/final_int.java
===================================================================
RCS file: final_int.java
diff -N final_int.java
--- /dev/null	Tue May  5 13:32:27 1998
+++ final_int.java	Sat Feb 12 10:33:21 2000
@@ -0,0 +1,22 @@
+// Class final_int
+// Generated on Sat Feb 12 01:27:46 PST 2000
+
+class final_int {
+
+  final int x = 30;
+
+  class foo {
+    int bar () {
+      return x;
+    }
+  }
+  void bar () {
+    int x = this.new foo ().bar ();
+    System.out.println (x);
+  }
+  public static void main (String[] arg)
+  {
+    System.out.println ("Testing class `final_int'...");
+    new final_int().bar ();
+  }
+}
Index: libjava.lang/final_int.out
===================================================================
RCS file: final_int.out
diff -N final_int.out
--- /dev/null	Tue May  5 13:32:27 1998
+++ final_int.out	Sat Feb 12 10:33:21 2000
@@ -0,0 +1,2 @@
+Testing class `final_int'...
+30
Index: libjava.lang/final_static_and_friend.java
===================================================================
RCS file: final_static_and_friend.java
diff -N final_static_and_friend.java
--- /dev/null	Tue May  5 13:32:27 1998
+++ final_static_and_friend.java	Sat Feb 12 10:33:21 2000
@@ -0,0 +1,17 @@
+// Class final_static_and_friend
+// Generated on Sat Feb 12 01:58:38 PST 2000
+
+class final_static_and_friend {
+    final int a = 34;
+    static int b = 34;
+    int c = 34;
+    void foo ()
+    {
+        System.out.println (a+b+c);
+    }
+    public static void main (String[] arg)
+    {
+        new final_static_and_friend ().foo ();
+    }
+
+}
Index: libjava.lang/final_static_and_friend.out
===================================================================
RCS file: final_static_and_friend.out
diff -N final_static_and_friend.out
--- /dev/null	Tue May  5 13:32:27 1998
+++ final_static_and_friend.out	Sat Feb 12 10:33:21 2000
@@ -0,0 +1 @@
+102
Index: libjava.lang/inner_interface.java
===================================================================
RCS file: inner_interface.java
diff -N inner_interface.java
--- /dev/null	Tue May  5 13:32:27 1998
+++ inner_interface.java	Sat Feb 12 10:33:21 2000
@@ -0,0 +1,27 @@
+// Class inner_interface
+// Generated on Fri Feb 11 16:29:04 PST 2000
+// Simple inner interface example.
+
+class inner_interface {
+  interface bar {
+      static final int field = 14022000;
+      public void inner_interface ();
+  }
+
+  class baz implements inner_interface.bar {
+    public void inner_interface ()
+    {
+      System.out.println ("This is baz.inner_interface "+field);
+    }
+  }
+
+  void x () {
+      this.new baz ().inner_interface ();
+  }
+
+  public static void main (String[] arg)
+  {
+    System.out.println ("Testing class `inner_interface'...");
+    new inner_interface ().x();
+  }
+}
Index: libjava.lang/inner_interface.out
===================================================================
RCS file: inner_interface.out
diff -N inner_interface.out
--- /dev/null	Tue May  5 13:32:27 1998
+++ inner_interface.out	Sat Feb 12 10:33:21 2000
@@ -0,0 +1,2 @@
+Testing class `inner_interface'...
+This is baz.inner_interface 14022000

From java-patches-return-458-listarch-java-patches=sourceware.cygnus.com@sourceware.cygnus.com Sat Feb 12 20:06:51 2000
Return-Path: <java-patches-return-458-listarch-java-patches=sourceware.cygnus.com@sourceware.cygnus.com>
Delivered-To: listarch-java-patches@sourceware.cygnus.com
Received: (qmail 26957 invoked by alias); 12 Feb 2000 20:06:49 -0000
Mailing-List: contact java-patches-help@sourceware.cygnus.com; run by ezmlm
Precedence: bulk
List-Subscribe: <mailto:java-patches-subscribe@sourceware.cygnus.com>
List-Archive: <http://sourceware.cygnus.com/ml/java-patches/>
List-Post: <mailto:java-patches@sourceware.cygnus.com>
List-Help: <mailto:java-patches-help@sourceware.cygnus.com>, <http://sourceware.cygnus.com/ml/#faqs>
Sender: java-patches-owner@sourceware.cygnus.com
Delivered-To: mailing list java-patches@sourceware.cygnus.com
Received: (qmail 26927 invoked from network); 12 Feb 2000 20:06:43 -0000
To: Java Patch List <java-patches@sourceware.cygnus.com> 
Subject: Patch: fix for File.createTempFile
X-Zippy:  I am deeply CONCERNED and I want something GOOD for BREAKFAST!
X-Attribution:  Tom
Bcc:
Reply-To:  tromey@cygnus.com
From:  Tom Tromey <tromey@cygnus.com>
Date: 12 Feb 2000 13:07:45 -0700
Message-ID: <87d7q22nhq.fsf@cygnus.com>
Lines: 28
X-Mailer: Gnus v5.5/Emacs 20.3

I'm committing the appended patch.  It changes File.createTempFile to
use the low bits of the internal counter, not the high bits.  The low
bits are the ones that change...

2000-02-12  Tom Tromey  <tromey@cygnus.com>

	* java/io/File.java (createTempFile): Use low bits from counter,
	not high bits.

Tom

Index: java/io/File.java
===================================================================
RCS file: /cvs/java/libgcj/libjava/java/io/File.java,v
retrieving revision 1.6
diff -u -r1.6 File.java
--- File.java	2000/02/11 18:44:37	1.6
+++ File.java	2000/02/12 19:56:08
@@ -256,7 +256,8 @@
     for (int i = 0; i < 100; ++i)
       {
 	// This is ugly.
-	String l = prefix + (nextValue () + "ZZZZZZ").substring(0,6) + suffix;
+	String t = "ZZZZZZ" + nextValue ();
+	String l = prefix + t.substring(t.length() - 6) + suffix;
 	try
 	  {
 	    desc.open (l, FileDescriptor.WRITE | FileDescriptor.EXCL);

From java-patches-return-459-listarch-java-patches=sourceware.cygnus.com@sourceware.cygnus.com Sat Feb 12 22:45:14 2000
Return-Path: <java-patches-return-459-listarch-java-patches=sourceware.cygnus.com@sourceware.cygnus.com>
Delivered-To: listarch-java-patches@sourceware.cygnus.com
Received: (qmail 11797 invoked by alias); 12 Feb 2000 22:45:14 -0000
Mailing-List: contact java-patches-help@sourceware.cygnus.com; run by ezmlm
Precedence: bulk
List-Subscribe: <mailto:java-patches-subscribe@sourceware.cygnus.com>
List-Archive: <http://sourceware.cygnus.com/ml/java-patches/>
List-Post: <mailto:java-patches@sourceware.cygnus.com>
List-Help: <mailto:java-patches-help@sourceware.cygnus.com>, <http://sourceware.cygnus.com/ml/#faqs>
Sender: java-patches-owner@sourceware.cygnus.com
Delivered-To: mailing list java-patches@sourceware.cygnus.com
Received: (qmail 11772 invoked from network); 12 Feb 2000 22:45:12 -0000
Date: Sat, 12 Feb 2000 14:45:09 -0800
Message-Id: <200002122245.OAA03898@hoser.cygnus.com>
X-Authentication-Warning: hoser.cygnus.com: green set sender to green@cygnus.com using -f
From: Anthony Green <green@cygnus.com>
To: java-patches@sourceware.cygnus.com
Subject: New inner class test
X-Organization: Red Hat, Sunnyvale, California
X-URL: http://www.cygnus.com/~green
Reply-to: green@redhat.com


I'm committing the following new test case...

2000-02-12  Anthony Green  <green@cygnus.com>

	    * libjava.compile/inner_inherit.java: New file.

Index: inner_inherit.java
===================================================================
RCS file: inner_inherit.java
diff -N inner_inherit.java
--- /dev/null	Tue May  5 13:32:27 1998
+++ inner_inherit.java	Sat Feb 12 14:43:42 2000
@@ -0,0 +1,14 @@
+// Test to insure that we can refer to methods inherited through an
+// inner class.
+
+public class inner_inherit
+{
+    private class Agent extends Thread {
+    }
+
+    public void f ()
+    {
+	Agent a = new Agent();
+	a.setDaemon(true);
+    }
+}

-- 
Anthony Green                                                        Red Hat
                                                       Sunnyvale, California

From java-patches-return-460-listarch-java-patches=sourceware.cygnus.com@sourceware.cygnus.com Sat Feb 12 22:56:59 2000
Return-Path: <java-patches-return-460-listarch-java-patches=sourceware.cygnus.com@sourceware.cygnus.com>
Delivered-To: listarch-java-patches@sourceware.cygnus.com
Received: (qmail 14513 invoked by alias); 12 Feb 2000 22:56:59 -0000
Mailing-List: contact java-patches-help@sourceware.cygnus.com; run by ezmlm
Precedence: bulk
List-Subscribe: <mailto:java-patches-subscribe@sourceware.cygnus.com>
List-Archive: <http://sourceware.cygnus.com/ml/java-patches/>
List-Post: <mailto:java-patches@sourceware.cygnus.com>
List-Help: <mailto:java-patches-help@sourceware.cygnus.com>, <http://sourceware.cygnus.com/ml/#faqs>
Sender: java-patches-owner@sourceware.cygnus.com
Delivered-To: mailing list java-patches@sourceware.cygnus.com
Received: (qmail 14488 invoked from network); 12 Feb 2000 22:56:58 -0000
Date: Sat, 12 Feb 2000 14:56:54 -0800
Message-Id: <200002122256.OAA03925@hoser.cygnus.com>
X-Authentication-Warning: hoser.cygnus.com: green set sender to green@cygnus.com using -f
From: Anthony Green <green@cygnus.com>
To: java-patches@sourceware.cygnus.com
Subject: Another inner class test
X-Organization: Red Hat, Sunnyvale, California
X-URL: http://www.cygnus.com/~green
Reply-to: green@redhat.com


I'm committing the following new test...

2000-02-12  Anthony Green  <green@cygnus.com>

	* libjava.compile/inner_data.java: New file.

Index: inner_data.java
===================================================================
RCS file: inner_data.java
diff -N inner_data.java
--- /dev/null	Tue May  5 13:32:27 1998
+++ inner_data.java	Sat Feb 12 14:55:27 2000
@@ -0,0 +1,14 @@
+// Test referencing protected data from parent of inner class.
+
+import java.util.Random;
+
+public class inner_data
+{
+    private class Randomer extends Random {
+	public long xxx ()
+	{
+	    return seed;
+	}
+    }
+}
+

-- 
Anthony Green                                                        Red Hat
                                                       Sunnyvale, California

From java-patches-return-461-listarch-java-patches=sourceware.cygnus.com@sourceware.cygnus.com Sat Feb 12 23:09:44 2000
Return-Path: <java-patches-return-461-listarch-java-patches=sourceware.cygnus.com@sourceware.cygnus.com>
Delivered-To: listarch-java-patches@sourceware.cygnus.com
Received: (qmail 15773 invoked by alias); 12 Feb 2000 23:09:44 -0000
Mailing-List: contact java-patches-help@sourceware.cygnus.com; run by ezmlm
Precedence: bulk
List-Subscribe: <mailto:java-patches-subscribe@sourceware.cygnus.com>
List-Archive: <http://sourceware.cygnus.com/ml/java-patches/>
List-Post: <mailto:java-patches@sourceware.cygnus.com>
List-Help: <mailto:java-patches-help@sourceware.cygnus.com>, <http://sourceware.cygnus.com/ml/#faqs>
Sender: java-patches-owner@sourceware.cygnus.com
Delivered-To: mailing list java-patches@sourceware.cygnus.com
Received: (qmail 15734 invoked from network); 12 Feb 2000 23:09:43 -0000
Date: Sat, 12 Feb 2000 15:09:40 -0800
Message-Id: <200002122309.PAA03942@hoser.cygnus.com>
X-Authentication-Warning: hoser.cygnus.com: green set sender to green@cygnus.com using -f
From: Anthony Green <green@cygnus.com>
To: java-patches@sourceware.cygnus.com
Subject: More test code
X-Organization: Red Hat, Sunnyvale, California
X-URL: http://www.cygnus.com/~green
Reply-to: green@redhat.com


I'm committing the following test case...

2000-02-12  Anthony Green  <green@cygnus.com>

        * libjava.compile/assignment.java: New file.


Index: assignment.java
===================================================================
RCS file: assignment.java
diff -N assignment.java
--- /dev/null	Tue May  5 13:32:27 1998
+++ assignment.java	Sat Feb 12 15:07:29 2000
@@ -0,0 +1,19 @@
+// A definite assignment test.
+
+public class assignment
+{
+  public static Byte foo ()
+    {
+      Byte b;
+	
+      while (true) {
+	try {
+	  b = Byte.decode ("42");
+	  break;
+	} catch (NumberFormatException ignored) {}
+      }
+
+      return b;
+    }
+}
+

-- 
Anthony Green                                                        Red Hat
                                                       Sunnyvale, California

From java-patches-return-462-listarch-java-patches=sourceware.cygnus.com@sourceware.cygnus.com Sat Feb 12 23:43:13 2000
Return-Path: <java-patches-return-462-listarch-java-patches=sourceware.cygnus.com@sourceware.cygnus.com>
Delivered-To: listarch-java-patches@sourceware.cygnus.com
Received: (qmail 18806 invoked by alias); 12 Feb 2000 23:43:13 -0000
Mailing-List: contact java-patches-help@sourceware.cygnus.com; run by ezmlm
Precedence: bulk
List-Subscribe: <mailto:java-patches-subscribe@sourceware.cygnus.com>
List-Archive: <http://sourceware.cygnus.com/ml/java-patches/>
List-Post: <mailto:java-patches@sourceware.cygnus.com>
List-Help: <mailto:java-patches-help@sourceware.cygnus.com>, <http://sourceware.cygnus.com/ml/#faqs>
Sender: java-patches-owner@sourceware.cygnus.com
Delivered-To: mailing list java-patches@sourceware.cygnus.com
Received: (qmail 18781 invoked from network); 12 Feb 2000 23:43:12 -0000
Date: Sat, 12 Feb 2000 15:43:09 -0800
Message-Id: <200002122343.PAA04502@hoser.cygnus.com>
X-Authentication-Warning: hoser.cygnus.com: green set sender to green@cygnus.com using -f
From: Anthony Green <green@cygnus.com>
To: java-patches@sourceware.cygnus.com
Subject: New test case
X-Organization: Red Hat, Sunnyvale, California
X-URL: http://www.cygnus.com/~green
Reply-to: green@redhat.com


I'm committing the following test case...

2000-02-12  Anthony Green  <green@cygnus.com>

	    * libjava.compile/comment.java: New file.

Index: comment.java
===================================================================
RCS file: comment.java
diff -N comment.java
--- /dev/null	Tue May  5 13:32:27 1998
+++ comment.java	Sat Feb 12 15:41:48 2000
@@ -0,0 +1,7 @@
+public class comment
+{
+  /***
+  // This is supposed to be a comment.
+  */
+}
+

AG

-- 
Anthony Green                                                        Red Hat
                                                       Sunnyvale, California

From java-patches-return-463-listarch-java-patches=sourceware.cygnus.com@sourceware.cygnus.com Sun Feb 13 18:13:28 2000
Return-Path: <java-patches-return-463-listarch-java-patches=sourceware.cygnus.com@sourceware.cygnus.com>
Delivered-To: listarch-java-patches@sourceware.cygnus.com
Received: (qmail 28446 invoked by alias); 13 Feb 2000 18:13:28 -0000
Mailing-List: contact java-patches-help@sourceware.cygnus.com; run by ezmlm
Precedence: bulk
List-Subscribe: <mailto:java-patches-subscribe@sourceware.cygnus.com>
List-Archive: <http://sourceware.cygnus.com/ml/java-patches/>
List-Post: <mailto:java-patches@sourceware.cygnus.com>
List-Help: <mailto:java-patches-help@sourceware.cygnus.com>, <http://sourceware.cygnus.com/ml/#faqs>
Sender: java-patches-owner@sourceware.cygnus.com
Delivered-To: mailing list java-patches@sourceware.cygnus.com
Received: (qmail 28421 invoked from network); 13 Feb 2000 18:13:27 -0000
Date: Sun, 13 Feb 2000 10:13:22 -0800
Message-Id: <200002131813.KAA05389@hoser.cygnus.com>
X-Authentication-Warning: hoser.cygnus.com: green set sender to green@cygnus.com using -f
From: Anthony Green <green@cygnus.com>
To: java-patches@sourceware.cygnus.com
Subject: configuration patch
X-Organization: Red Hat, Sunnyvale, California
X-URL: http://www.cygnus.com/~green
Reply-to: green@redhat.com


I just commtted the following patch...

2000-02-16  Anthony Green  <green@redhat.com>

        * configure.host: Use the same options for i386 and i486 as we do
        for i586 and i686.

Index: configure.host
===================================================================
RCS file: /cvs/java/libgcj/libjava/configure.host,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- configure.host	2000/01/09 22:25:53	1.7
+++ configure.host	2000/02/13 18:07:09	1.8
@@ -57,7 +57,7 @@
  	enable_java_net_default=no
  	enable_getenv_properties_default=no
 	;;
-  i686-*|i586-*)
+  i686-*|i586-*|i486-*|i386-*)
 	libgcj_flags="${libgcj_flags} -ffloat-store"
 	libgcj_interpreter=yes
 	DIVIDESPEC=-fno-use-divide-subroutine

-- 
Anthony Green                                                        Red Hat
                                                       Sunnyvale, California

From java-patches-return-464-listarch-java-patches=sourceware.cygnus.com@sourceware.cygnus.com Mon Feb 14 10:22:47 2000
Return-Path: <java-patches-return-464-listarch-java-patches=sourceware.cygnus.com@sourceware.cygnus.com>
Delivered-To: listarch-java-patches@sourceware.cygnus.com
Received: (qmail 11109 invoked by alias); 14 Feb 2000 10:22:47 -0000
Mailing-List: contact java-patches-help@sourceware.cygnus.com; run by ezmlm
Precedence: bulk
List-Subscribe: <mailto:java-patches-subscribe@sourceware.cygnus.com>
List-Archive: <http://sourceware.cygnus.com/ml/java-patches/>
List-Post: <mailto:java-patches@sourceware.cygnus.com>
List-Help: <mailto:java-patches-help@sourceware.cygnus.com>, <http://sourceware.cygnus.com/ml/#faqs>
Sender: java-patches-owner@sourceware.cygnus.com
Delivered-To: mailing list java-patches@sourceware.cygnus.com
Received: (qmail 11078 invoked from network); 14 Feb 2000 10:22:45 -0000
Date: Mon, 14 Feb 2000 02:22:42 -0800 (PST)
From: Warren Levy <warrenl@cygnus.com>
To: java-patches@sourceware.cygnus.com
Subject: Patch: BigInteger fully implemented
Message-ID: <Pine.SOL.3.91.1000214020522.6053A-100000@fencer.cygnus.com>
MIME-Version: 1.0
Content-Type: TEXT/PLAIN; charset=US-ASCII

Folks,
I'm checking in the following patch.  It includes implementations for the 
remainder of java.math.BigInteger and an improved way of dealing with the 
BigInteger.modPow method.  Enjoy!
--warrenl


2000-02-14  Warren Levy  <warrenl@cygnus.com>

	* gnu/gcj/math/MPN.java(findLowestBit): Made methods public.

	* java/math/BigInteger.java(BigInteger(int,int,java.util.Random):
	  New constructor.
	(min): Implemented.
	(max): Implemented.
	(modPow): Rewritten to not use the naive, slow, brute force approach.
	(isProbablePrime): Implemented.
	(testBit): Implemented.
	(flipBit): Implemented.
	(getLowestSetBit): Implemented.


Index: gnu/gcj/math/MPN.java
===================================================================
RCS file: /cvs/java/libgcj/libjava/gnu/gcj/math/MPN.java,v
retrieving revision 1.1
diff -u -p -r1.1 MPN.java
--- MPN.java	2000/02/04 22:00:36	1.1
+++ MPN.java	2000/02/14 10:04:23
@@ -571,7 +571,7 @@ public class MPN
 
   /** Return least i such that word&(1<<i). Assumes word!=0. */
 
-  static int findLowestBit (int word)
+  public static int findLowestBit (int word)
   {
     int i = 0;
     while ((word & 0xF) == 0)
@@ -591,7 +591,7 @@ public class MPN
 
   /** Return least i such that words & (1<<i). Assumes there is such an i. */
 
-  static int findLowestBit (int[] words)
+  public static int findLowestBit (int[] words)
   {
     for (int i = 0;  ; i++)
       {
Index: java/math/BigInteger.java
===================================================================
RCS file: /cvs/java/libgcj/libjava/java/math/BigInteger.java,v
retrieving revision 1.2
diff -u -p -r1.2 BigInteger.java
--- BigInteger.java	2000/02/11 19:09:03	1.2
+++ BigInteger.java	2000/02/14 10:04:25
@@ -19,7 +19,9 @@ import java.util.Random;
 
 /**
  * Written using on-line Java Platform 1.2 API Specification, as well
- * as "The Java Class Libraries", 2nd edition (Addison-Wesley, 1998).
+ * as "The Java Class Libraries", 2nd edition (Addison-Wesley, 1998) and
+ * "Applied Cryptography, Second Edition" by Bruce Schneier (Wiley, 1996).
+
  * 
  * Based primarily on IntNum.java BitOps.java by Per Bothner <per@bothner.com>
  * (found in Kawa 1.6.62).
@@ -60,6 +62,15 @@ public class BigInteger extends Number i
   private static final int TRUNCATE = 3;
   private static final int ROUND = 4;
 
+  /** When checking the probability of primes, it is most efficient to
+   * first check the factoring of small primes, so we'll use this array.
+   */
+  private static final int[] primes =
+    {   2,   3,   5,   7,  11,  13,  17,  19,  23,  29,  31,  37,  41,  43,
+       47,  53,  59,  61,  67,  71,  73,  79,  83,  89,  97, 101, 103, 107,
+      109, 113, 127, 131, 137, 139, 149, 151, 157, 163, 167, 173, 179, 181,
+      191, 193, 197, 199, 211, 223, 227, 229, 233, 239, 241, 251 };
+
   private BigInteger()
   {
   }
@@ -138,6 +149,21 @@ public class BigInteger extends Number i
     this.words = result.words;
   }
 
+  public BigInteger(int bitLength, int certainty, Random rnd)
+  {
+    this(bitLength, rnd);
+
+    // Keep going until we find a probable prime.
+    while (true)
+      {
+	if (isProbablePrime(certainty))
+	  return;
+
+	BigInteger next = new BigInteger(bitLength, rnd);
+	this.ival = next.ival;
+	this.words = next.words;
+      }
+  }
 
   /** Return a (possibly-shared) BigInteger with a given long value. */
   private static BigInteger make(long value)
@@ -290,6 +316,16 @@ public class BigInteger extends Number i
     return compareTo(this, val);
   }
 
+  public BigInteger min(BigInteger val)
+  {
+    return compareTo(this, val) < 0 ? this : val;
+  }
+
+  public BigInteger max(BigInteger val)
+  {
+    return compareTo(this, val) > 0 ? this : val;
+  }
+
   private final boolean isOdd()
   {
     int low = words == null ? ival : words[0];
@@ -1120,8 +1156,30 @@ public class BigInteger extends Number i
       return modInverse(m);
     if (exponent.isOne())
       return mod(m);
+
+    // To do this naively by first raising this to the power of exponent
+    // and then performing modulo m would be extremely expensive, especially
+    // for very large numbers.  The solution is found in Number Theory
+    // where a combination of partial powers and modulos can be done easily.
+    //
+    // We'll use the algorithm for Additive Chaining which can be found on
+    // p. 244 of "Applied Cryptography, Second Edition" by Bruce Schneier.
+    BigInteger s, t, u;
+    int i;
 
-    return pow(exponent).mod(m);
+    s = ONE;
+    t = this;
+    u = exponent;
+
+    while (!u.isZero())
+      {
+	if (u.and(ONE).isOne())
+	  s = times(s, t).mod(m);
+	u = u.shiftRight(1);
+	t = times(t, t).mod(m);
+      }
+
+    return s;
   }
 
   /** Calculate Greatest Common Divisor for non-negative ints. */
@@ -1184,6 +1242,72 @@ public class BigInteger extends Number i
     return result.canonicalize();
   }
 
+  public boolean isProbablePrime(int certainty)
+  {
+    /** We'll use the Rabin-Miller algorithm for doing a probabilistic
+     * primality test.  It is fast, easy and has faster decreasing odds of a
+     * composite passing than with other tests.  This means that this
+     * method will actually have a probability much greater than the
+     * 1 - .5^certainty specified in the JCL (p. 117), but I don't think
+     * anyone will complain about better performance with greater certainty.
+     *
+     * The Rabin-Miller algorithm can be found on pp. 259-261 of "Applied
+     * Cryptography, Second Edition" by Bruce Schneier.
+     */
+
+    // First rule out small prime factors and assure the number is odd.
+    for (int i = 0; i < primes.length; i++)
+      {
+	if (words == null && ival == primes[i])
+	  return true;
+        if (remainder(make(primes[i])).isZero())
+	  return false;
+      }
+
+    // Now perform the Rabin-Miller test.
+    // NB: I know that this can be simplified programatically, but
+    // I have tried to keep it as close as possible to the algorithm
+    // as written in the Schneier book for reference purposes.
+
+    // Set b to the number of times 2 evenly divides (this - 1).
+    // I.e. 2^b is the largest power of 2 that divides (this - 1).
+    BigInteger pMinus1 = add(this, -1);
+    int b = pMinus1.getLowestSetBit();
+
+    // Set m such that this = 1 + 2^b * m.
+    BigInteger m = pMinus1.divide(make(2L << b - 1));
+
+    Random rand = new Random();
+    while (certainty-- > 0)
+      {
+        // Pick a random number greater than 1 and less than this.
+	// The algorithm says to pick a small number to make the calculations
+	// go faster, but it doesn't say how small; we'll use 2 to 1024.
+	int a = rand.nextInt();
+	a = (a < 0 ? -a : a) % 1023 + 2;
+
+	BigInteger z = make(a).modPow(m, this);
+	if (z.isOne() || z.equals(pMinus1))
+	  continue;			// Passes the test; may be prime.
+
+	int i;
+	for (i = 0; i < b; )
+	  {
+	    if (z.isOne())
+	      return false;
+	    i++;
+	    if (z.equals(pMinus1))
+	      break;			// Passes the test; may be prime.
+
+	    z = z.modPow(make(2), this);
+	  }
+
+	if (i == b && !z.equals(pMinus1))
+	  return false;
+      }
+    return true;
+  }
+
   private void setInvert()
   {
     if (words == null)
@@ -1727,7 +1851,7 @@ public class BigInteger extends Number i
         case 1:  return x.and(y);
         case 3:  return x;
         case 5:  return y;
-        case 15: return smallFixNums[-1 - minFixNum];	// Returns -1.
+        case 15: return make(-1);
       }
     BigInteger result = new BigInteger();
     setBitOp(result, op, x, y);
@@ -1998,6 +2122,33 @@ public class BigInteger extends Number i
     return or(ONE.shiftLeft(n));
   }
 
+  public boolean testBit(int n)
+  {
+    if (n < 0)
+      throw new ArithmeticException();
+
+    return !and(ONE.shiftLeft(n)).isZero();
+  }
+
+  public BigInteger flipBit(int n)
+  {
+    if (n < 0)
+      throw new ArithmeticException();
+
+    return xor(ONE.shiftLeft(n));
+  }
+
+  public int getLowestSetBit()
+  {
+    if (isZero())
+      return -1;
+
+    if (words == null)
+      return MPN.findLowestBit(ival);
+    else
+      return MPN.findLowestBit(words);
+  }
+
   // bit4count[I] is number of '1' bits in I.
   private static final byte[] bit4_count = { 0, 1, 1, 2,  1, 2, 2, 3,
 					     1, 2, 2, 3,  2, 3, 3, 4};
@@ -2039,21 +2190,4 @@ public class BigInteger extends Number i
       }
     return isNegative() ? x_len * 32 - i : i;
   }
-
-/* TODO:
-
-  public BigInteger(int bitLength, int certainty, Random rnd)
-
-  public boolean testBit(int n)
-
-  public BigInteger flipBit(int n)
-
-  public int getLowestSetBit()
-
-  public boolean isProbablePrime(int certainty)
-
-  public BigInteger min(BigInteger val)
-
-  public BigInteger max(BigInteger val)
-*/
 }

From java-patches-return-465-listarch-java-patches=sourceware.cygnus.com@sourceware.cygnus.com Mon Feb 14 16:12:52 2000
Return-Path: <java-patches-return-465-listarch-java-patches=sourceware.cygnus.com@sourceware.cygnus.com>
Delivered-To: listarch-java-patches@sourceware.cygnus.com
Received: (qmail 703 invoked by alias); 14 Feb 2000 16:12:52 -0000
Mailing-List: contact java-patches-help@sourceware.cygnus.com; run by ezmlm
Precedence: bulk
List-Subscribe: <mailto:java-patches-subscribe@sourceware.cygnus.com>
List-Archive: <http://sourceware.cygnus.com/ml/java-patches/>
List-Post: <mailto:java-patches@sourceware.cygnus.com>
List-Help: <mailto:java-patches-help@sourceware.cygnus.com>, <http://sourceware.cygnus.com/ml/#faqs>
Sender: java-patches-owner@sourceware.cygnus.com
Delivered-To: mailing list java-patches@sourceware.cygnus.com
Received: (qmail 684 invoked from network); 14 Feb 2000 16:12:49 -0000
Message-ID: <38A8296F.5350@fernuni-hagen.de>
Date: Mon, 14 Feb 2000 17:12:31 +0100
From: Joerg Brunsmann <joerg.brunsmann@FernUni-Hagen.de>
Organization: Fernuniversitaet Hagen - Software Engineering 
              (Praktische Informatik III)
X-Mailer: Mozilla 3.04 (X11; I; SunOS 5.7 sun4u)
MIME-Version: 1.0
To: java-patches@sourceware.cygnus.com
Subject: [PATCH] faq.html
Content-Type: text/plain; charset=us-ascii
Content-Transfer-Encoding: 7bit

Hi,

just went through my mail box and thought this patch might
reflect the latest FAQs.

2000-02-14  Joerg Brunsmann  <joerg.brusmann@FernUni-Hagen.de>

        * faq.html: Some new faq entries. 


Index: htdocs/faq.html
===================================================================
RCS file: /cvs/java/htdocs/faq.html,v
retrieving revision 1.11
diff -c -3 -p -r1.11 faq.html
*** faq.html	2000/02/09 01:03:58	1.11
--- faq.html	2000/02/14 16:07:22
***************
*** 54,59 ****
--- 54,60 ----
              <li><a href="#1_4">Why isn't libgcj part of GCC?</a> 
              <li><a href="#1_5">Will gcj and libgcj work on my machine?</a> 
              <li><a href="#1_6">How can I debug my Java program?</a> 
+             <li><a href="#1_7">Can i interface byte-compiled and native java code?</a> 
            </ol>
          <li><a href="#2_0">Java Feature Support</a> 
            <ol>
***************
*** 86,91 ****
--- 87,94 ----
              <li><a href="#4_5">How does gcj resolve wether to compile .class or 
                .java files? </a> 
              <li><a href="#4_6">I'm getting link errors!</a> 
+             <li><a href="#4_7">I'm getting 'gcj: libgcj.spec: No such file or directory'</a> 
+             <li><a href="#4_8">How do I compile a more complex example</a> 
            </ol>
          <li><a href="#5_0">Runtime Questions</a> 
            <ol>
***************
*** 139,145 ****
          <dd>You can send simple bug fixes in as patches. Please follow the <a href="http://egcs.cygnus.com/contribute.html">GCC 
            guidelines for submitting patches</a>. For more complex changes, you 
            must sign copyright over to Cygnus. See the <a href="contrib.html">contribution</a> 
!           page for details.</dd>
          <p></p>
          <dt> 
            <hr>
--- 142,154 ----
          <dd>You can send simple bug fixes in as patches. Please follow the <a href="http://egcs.cygnus.com/contribute.html">GCC 
            guidelines for submitting patches</a>. For more complex changes, you 
            must sign copyright over to Cygnus. See the <a href="contrib.html">contribution</a> 
!           page for details.
!           You might also want to cvs check out the www documentation with
!           <p>
!           $ cvs -d:pserver:anoncvs@anoncvs.cygnus.com:/cvs/java co htdocs
!           <p>
!           enhance it and send the patches to java-patches@sourceware.cygnus.com
!         </dd>
          <p></p>
          <dt> 
            <hr>
***************
*** 170,175 ****
--- 179,214 ----
            you will need to use a recent development snapshot of gdb from <a href="ftp://sourceware.cygnus.com/pub/gdb/snapshots/">ftp://sourceware.cygnus.com/pub/gdb/snapshots/</a> because 
            the standard 4.18 does not have support for linux threads.</dd>
          <dt>&nbsp; </dt>
+ 
+ 
+         <dt> 
+           <hr>
+           <h3><a name="1_7">1.7 Can i interface byte-compiled and native java code</a></h3>
+         </dt>
+         <p> 
+         <dd>
+         Bryce McKinlay explains:
+ 	libgcj has a bytecode interpreter that allows you to mix .class files with
+ 	compiled code. It works pretty transparently: if a compiled version of a class is
+ 	not found in the application binary or linked shared libraries, the class loader
+ 	will search for a bytecode version in your classpath, much like a VM would. Be
+ 	sure to build libgcj with the --enable-interpreter option to enable this
+ 	functionality. Currently it only works on x86 linux AFAIK. The downside is that
+ 	the interpreter is unfortunately rather slow, so I doubt it will be useful in your
+ 	situation.
+         <p>
+ 	Recent snapshots of kaffe include some support for loading gcj compiled classes
+ 	into the VM environment. This might allow you to mix optimized native java/CNI
+ 	processing code with UI code running on kaffe's AWT. I havn't tried it but I
+ 	believe it mostly works apart from an issue with monitor locking. You might want
+ 	to contact Godmar Back if you are working with this.
+         <p>Tom Tromey has another use: You can even run a shared library which is 
+         compiled from java code and contains a main method with gij:<p>
+          $ gcj -shared -c -o HelloWorld.so HelloWorld.java<br>
+          $ gij HelloWorld
+           This works because gij uses Class.forName, which now knows how to load shared objects.
+         </dd>
+         <dt>&nbsp; </dt>
        </dl>
        <table border="0" cellpadding="4" width="95%">
          <tr bgcolor="#B0D0FF"> 
*************** collect2: ld returned 1 exit status
*** 475,485 ****
            option to indicate the class that has the desired <tt>main</tt> method. 
            This is because every Java class can have a <tt>main</tt> method, thus 
            you have to tell gcj which one to use.</dd>
          <dt>&nbsp;</dt>
          <hr>
        </dl>
        <dl> 
-         <dt>&nbsp; </dt>
          <dt> 
            <h3><a name="4_2">4.2 Can GCJ only handle source code?</a></h3>
          </dt>
--- 514,528 ----
            option to indicate the class that has the desired <tt>main</tt> method. 
            This is because every Java class can have a <tt>main</tt> method, thus 
            you have to tell gcj which one to use.</dd>
+          <p>
+          <dd>Also make sure to use the fully-qualified class name. If your class <i>Sample</i> is
+           defined in a package named <i>test</i> you'll have to issue:<p>
+            $ gcj -o sample --main=test.Sample Sample.o
+          </dd>
          <dt>&nbsp;</dt>
          <hr>
        </dl>
        <dl> 
          <dt> 
            <h3><a name="4_2">4.2 Can GCJ only handle source code?</a></h3>
          </dt>
*************** collect2: ld returned 1 exit status
*** 569,574 ****
--- 612,647 ----
            -fno_rtti option.
          </blockquote>
        </dl>
+       <dl>
+         <dt>
+           <h3><a name="4_7">4.7 I'm getting 'gcj: libgcj.spec: No such file or directory'</a></h3>
+         </dt>
+         <blockquote>
+         <p>Make sure you configure both libgcj and gcj the exact
+            same --prefix directory.
+         </blockquote>
+       </dl>
+       <dl>
+         <dt>
+           <h3><a name="4_8">4.8 How do I compile a more complex example</a></h3>
+         </dt>
+         <blockquote>
+         <p>Jeff Sturm explains: You'll probably want to use a Makefile, as you 
+         would in any non-trival C program.
+         You might try adding each object to a library, e.g.:<p>
+ 
+ 	  $ gcj -c Class1.java -o Class1.o<br>
+ 	  $ gcj -c Class2.java -o Class2.o<br>
+ 	  $ ar rv myclasses.a Class1.o Class2.o<br>
+ 	  $ ranlib myclasses.a
+         <p>
+ 	then:
+         <p>
+           $ gcj myprog.java --main=myprog myclasses.a -o myprog
+         </blockquote>
+       </dl>
+ 
+ 
        <dl> 
          <dt>&nbsp; </dt>
        </dl>
*************** collect2: ld returned 1 exit status
*** 648,658 ****
          </dd>
        </dl>
        <p></p>
-       <p> 
-       <dl> 
-         <dd>&nbsp;</dd>
-       </dl>
-       <dl> 
          <hr>
          <dt>&nbsp;</dt>
          <dt> 
--- 721,726 ----

From java-patches-return-466-listarch-java-patches=sourceware.cygnus.com@sourceware.cygnus.com Mon Feb 14 21:51:52 2000
Return-Path: <java-patches-return-466-listarch-java-patches=sourceware.cygnus.com@sourceware.cygnus.com>
Delivered-To: listarch-java-patches@sourceware.cygnus.com
Received: (qmail 20050 invoked by alias); 14 Feb 2000 21:51:52 -0000
Mailing-List: contact java-patches-help@sourceware.cygnus.com; run by ezmlm
Precedence: bulk
List-Subscribe: <mailto:java-patches-subscribe@sourceware.cygnus.com>
List-Archive: <http://sourceware.cygnus.com/ml/java-patches/>
List-Post: <mailto:java-patches@sourceware.cygnus.com>
List-Help: <mailto:java-patches-help@sourceware.cygnus.com>, <http://sourceware.cygnus.com/ml/#faqs>
Sender: java-patches-owner@sourceware.cygnus.com
Delivered-To: mailing list java-patches@sourceware.cygnus.com
Received: (qmail 20009 invoked from network); 14 Feb 2000 21:51:10 -0000
To: Java Patch List <java-patches@sourceware.cygnus.com> 
Cc: Hans Boehm <boehm@acm.org> 
Subject: Patch: dlopen -vs- Linux
X-Zippy:  WHY are we missing KOJAK?
X-Attribution:  Tom
Bcc:
Reply-To:  tromey@cygnus.com
From:  Tom Tromey <tromey@cygnus.com>
Date: 14 Feb 2000 14:52:15 -0700
Message-ID: <87ln4n1mgg.fsf@cygnus.com>
Lines: 86
X-Mailer: Gnus v5.5/Emacs 20.3

I'm committing the appended patch to the GC.
I implemented it following the comment in README.linux.

I haven't tested this in a situation where it would really matter.
Hans, feel free to tell me if you'd like the patch done differently.

2000-02-14  Tom Tromey  <tromey@cygnus.com>

	* gc.h (dlopen): Define as GC_dlopen on Linux.
	(GC_dlopen): Declare on Linux.
	* dyn_load.c (GC_dlopen): Define for Linux.

Tom

Index: gc.h
===================================================================
RCS file: /cvs/java/libgcj/boehm-gc/gc.h,v
retrieving revision 1.4
diff -u -r1.4 gc.h
--- gc.h	1999/11/01 23:15:51	1.4
+++ gc.h	2000/02/14 21:49:40
@@ -712,6 +712,10 @@
 
 # endif /* SOLARIS_THREADS */
 
+#if defined(LINUX_THREADS)
+  void * GC_dlopen(const char *path, int mode);
+# define dlopen GC_dlopen
+#endif
 
 #if defined(IRIX_THREADS) || defined(LINUX_THREADS) || defined(HPUX_THREADS)
 /* We treat these similarly. */
Index: dyn_load.c
===================================================================
RCS file: /cvs/java/libgcj/boehm-gc/dyn_load.c,v
retrieving revision 1.6
diff -u -r1.6 dyn_load.c
--- dyn_load.c	1999/11/04 17:25:07	1.6
+++ dyn_load.c	2000/02/14 21:49:45
@@ -32,7 +32,7 @@
 #include "gc_priv.h"
 
 /* BTL: avoid circular redefinition of dlopen if SOLARIS_THREADS defined */
-# if defined(SOLARIS_THREADS) && defined(dlopen)
+# if (defined(SOLARIS_THREADS) || defined(LINUX_THREADS)) && defined(dlopen)
     /* To support threads in Solaris, gc.h interposes on dlopen by       */
     /* defining "dlopen" to be "GC_dlopen", which is implemented below.  */
     /* However, both GC_FirstDLOpenedLinkMap() and GC_dlopen() use the   */
@@ -190,11 +190,6 @@
 }
 # endif  /* SOLARIS_THREADS */
 
-/* BTL: added to fix circular dlopen definition if SOLARIS_THREADS defined */
-# if defined(GC_must_restore_redefined_dlopen)
-#   define dlopen GC_dlopen
-# endif
-
 # ifndef USE_PROC_FOR_LIBRARIES
 void GC_register_dynamic_libraries()
 {
@@ -259,6 +254,25 @@
 
 # endif /* !USE_PROC ... */
 # endif /* SUNOS */
+
+#ifdef LINUX_THREADS
+#include <dlfcn.h>
+
+void * GC_dlopen(const char *path, int mode)
+{
+    void * result;
+    
+    LOCK();
+    result = dlopen(path, mode);
+    UNLOCK();
+    return(result);
+}
+#endif  /* LINUX_THREADS */
+
+/* BTL: added to fix circular dlopen definition if SOLARIS_THREADS defined */
+#if defined(GC_must_restore_redefined_dlopen)
+# define dlopen GC_dlopen
+#endif
 
 #if defined(LINUX) && defined(__ELF__) || defined(SCO_ELF)
 

From java-patches-return-467-listarch-java-patches=sourceware.cygnus.com@sourceware.cygnus.com Mon Feb 14 21:56:37 2000
Return-Path: <java-patches-return-467-listarch-java-patches=sourceware.cygnus.com@sourceware.cygnus.com>
Delivered-To: listarch-java-patches@sourceware.cygnus.com
Received: (qmail 22245 invoked by alias); 14 Feb 2000 21:56:37 -0000
Mailing-List: contact java-patches-help@sourceware.cygnus.com; run by ezmlm
Precedence: bulk
List-Subscribe: <mailto:java-patches-subscribe@sourceware.cygnus.com>
List-Archive: <http://sourceware.cygnus.com/ml/java-patches/>
List-Post: <mailto:java-patches@sourceware.cygnus.com>
List-Help: <mailto:java-patches-help@sourceware.cygnus.com>, <http://sourceware.cygnus.com/ml/#faqs>
Sender: java-patches-owner@sourceware.cygnus.com
Delivered-To: mailing list java-patches@sourceware.cygnus.com
Received: (qmail 22174 invoked from network); 14 Feb 2000 21:56:29 -0000
To: Java Patch List <java-patches@sourceware.cygnus.com> 
Subject: Patch: libltdl -vs- GC
X-Zippy:  I will establish the first SHOPPING MALL in NUTLEY, New Jersey...
X-Attribution:  Tom
Bcc:
Reply-To:  tromey@cygnus.com
From:  Tom Tromey <tromey@cygnus.com>
Date: 14 Feb 2000 14:58:00 -0700
Message-ID: <87k8k71m6v.fsf@cygnus.com>
Lines: 110
X-Mailer: Gnus v5.5/Emacs 20.3

I'm committing the appended patch.  It changes libltdl to notice when
we are using the Boehm GC, and then include <gc.h> accordingly.  This
is a bit of a hack, but it is required on systems where the GC
redefines dlopen.

2000-02-14  Tom Tromey  <tromey@cygnus.com>

	* ltdl.c: If HAVE_BOEHM_GC defined, includ gc.h.
	* Makefile.in: Rebuilt.
	* Makefile.am (INCLUDES): New macro.
	* config.h.in, configure: Rebuilt.
	* acconfig.h (HAVE_BOEHM_GC): Define.
	* configure.in: Handle --enable-java-gc.

Tom

Index: ChangeLog
===================================================================
RCS file: ChangeLog
diff -N ChangeLog
--- /dev/null	Mon Dec 31 20:00:00 1979
+++ ChangeLog	Mon Feb 14 13:27:42 2000
@@ -0,0 +1,9 @@
+2000-02-14  Tom Tromey  <tromey@cygnus.com>
+
+	* ltdl.c: If HAVE_BOEHM_GC defined, includ gc.h.
+	* Makefile.in: Rebuilt.
+	* Makefile.am (INCLUDES): New macro.
+	* config.h.in, configure: Rebuilt.
+	* acconfig.h (HAVE_BOEHM_GC): Define.
+	* configure.in: Handle --enable-java-gc.
+
Index: Makefile.am
===================================================================
RCS file: /cvs/cvsfiles/devo/libjava/libltdl/Makefile.am,v
retrieving revision 1.1.1.1
diff -u -r1.1.1.1 Makefile.am
--- Makefile.am	2000/01/17 19:02:33	1.1.1.1
+++ Makefile.am	2000/02/14 21:27:42
@@ -2,6 +2,8 @@
 
 AUTOMAKE_OPTIONS = no-dependencies foreign
 
+INCLUDES = $(GCINCS)
+
 if INSTALL_LTDL
 include_HEADERS = ltdl.h
 lib_LTLIBRARIES = libltdl.la
Index: acconfig.h
===================================================================
RCS file: /cvs/cvsfiles/devo/libjava/libltdl/acconfig.h,v
retrieving revision 1.1.1.1
diff -u -r1.1.1.1 acconfig.h
--- acconfig.h	2000/01/17 19:02:33	1.1.1.1
+++ acconfig.h	2000/02/14 21:27:45
@@ -10,3 +10,6 @@
 
 /* Define if you have the shl_load function.  */
 #undef HAVE_SHL_LOAD
+
+/* Define if you are using the Boehm GC.  */
+#undef HAVE_BOEHM_GC
Index: configure.in
===================================================================
RCS file: /cvs/cvsfiles/devo/libjava/libltdl/configure.in,v
retrieving revision 1.1.1.1
diff -u -r1.1.1.1 configure.in
--- configure.in	2000/01/17 19:02:33	1.1.1.1
+++ configure.in	2000/02/14 21:28:15
@@ -27,6 +27,22 @@
 AC_ARG_ENABLE(ltdl-install,
 [  --enable-ltdl-install   install libltdl])
 
+AC_MSG_CHECKING([for garbage collector to use])
+AC_ARG_ENABLE(java-gc,
+changequote(<<,>>)dnl
+<<  --enable-java-gc=TYPE   choose garbage collector [boehm]>>,
+changequote([,])
+  GC=$enableval,
+  GC=boehm)
+
+GCINCS=
+if test "$GC" = "boehm"; then
+   GCINCS='-I$(top_srcdir)/../../boehm-gc -I$(top_builddir)/../../boehm-gc'
+   GCINCS="$GCINCS `cat ../../boehm-gc/boehm-cflags`"
+   AC_DEFINE(HAVE_BOEHM_GC)
+fi
+AC_SUBST(GCINCS)
+
 AM_CONDITIONAL(INSTALL_LTDL, test x"${enable_ltdl_install-no}" != xno)
 AM_CONDITIONAL(CONVENIENCE_LTDL, test x"${enable_ltdl_convenience-no}" != xno)
 
Index: ltdl.c
===================================================================
RCS file: /cvs/cvsfiles/devo/libjava/libltdl/ltdl.c,v
retrieving revision 1.1.1.1
diff -u -r1.1.1.1 ltdl.c
--- ltdl.c	2000/01/17 19:02:33	1.1.1.1
+++ ltdl.c	2000/02/14 21:28:48
@@ -58,6 +58,10 @@
 #include <stdio.h>
 #endif
 
+#if HAVE_BOEHM_GC
+#include <gc.h>
+#endif
+
 #include "ltdl.h"
 
 /* max. filename length */

From java-patches-return-468-listarch-java-patches=sourceware.cygnus.com@sourceware.cygnus.com Tue Feb 15 06:50:15 2000
Return-Path: <java-patches-return-468-listarch-java-patches=sourceware.cygnus.com@sourceware.cygnus.com>
Delivered-To: listarch-java-patches@sourceware.cygnus.com
Received: (qmail 9039 invoked by alias); 15 Feb 2000 06:50:15 -0000
Mailing-List: contact java-patches-help@sourceware.cygnus.com; run by ezmlm
Precedence: bulk
List-Subscribe: <mailto:java-patches-subscribe@sourceware.cygnus.com>
List-Archive: <http://sourceware.cygnus.com/ml/java-patches/>
List-Post: <mailto:java-patches@sourceware.cygnus.com>
List-Help: <mailto:java-patches-help@sourceware.cygnus.com>, <http://sourceware.cygnus.com/ml/#faqs>
Sender: java-patches-owner@sourceware.cygnus.com
Delivered-To: mailing list java-patches@sourceware.cygnus.com
Received: (qmail 9016 invoked from network); 15 Feb 2000 06:50:12 -0000
Message-ID: <38A8F7BB.304334C7@albatross.co.nz>
Date: Tue, 15 Feb 2000 19:52:44 +1300
From: Bryce McKinlay <bryce@albatross.co.nz>
X-Mailer: Mozilla 4.7 [en] (X11; U; Linux 2.3.25 i686)
X-Accept-Language: en
MIME-Version: 1.0
To: java-patches@sourceware.cygnus.com
Subject: Patch: Thread.dumpStack()
Content-Type: multipart/mixed;
 boundary="------------EEC81653EA5E8E3D569757C5"

This is a multi-part message in MIME format.
--------------EEC81653EA5E8E3D569757C5
Content-Type: text/plain; charset=us-ascii
Content-Transfer-Encoding: 7bit

Now that we have Throwable.printStackTrace() we can implement Thread.dumpStack()
too.

        * java/lang/natThread.cc (dumpStack): Removed.
        * java/lang/Thread.java (dumpStack): Implemented.

  [ bryce ]


--------------EEC81653EA5E8E3D569757C5
Content-Type: text/plain; charset=us-ascii;
 name="dumpstack.patch"
Content-Transfer-Encoding: 7bit
Content-Disposition: inline;
 filename="dumpstack.patch"

Index: libjava/java/lang/Thread.java
===================================================================
RCS file: /cvs/java/libgcj/libjava/java/lang/Thread.java,v
retrieving revision 1.5
diff -u -r1.5 Thread.java
--- Thread.java	2000/02/10 20:31:48	1.5
+++ Thread.java	2000/02/15 06:36:07
@@ -49,7 +49,11 @@
   public native int countStackFrames ();
   public static native Thread currentThread ();
   public native void destroy ();
-  public static native void dumpStack ();
+  
+  public static void dumpStack ()
+  {
+    (new Exception ("Stack trace")).printStackTrace ();
+  }
 
   public static int enumerate (Thread[] threads)
   {
Index: libjava/java/lang/natThread.cc
===================================================================
RCS file: /cvs/java/libgcj/libjava/java/lang/natThread.cc,v
retrieving revision 1.12
diff -u -r1.12 natThread.cc
--- natThread.cc	2000/02/10 20:31:48	1.12
+++ natThread.cc	2000/02/15 06:36:08
@@ -123,15 +123,6 @@
 }
 
 void
-java::lang::Thread::dumpStack (void)
-{
-  // We don't implement this because it is very hard.  Once we have a
-  // VM, this could potentially ask the VM to do the dump in cases
-  // where it makes sense.
-  JvFail ("java::lang::Thread::dumpStack unimplemented");
-}
-
-void
 java::lang::Thread::interrupt (void)
 {
   interrupt_flag = true;

--------------EEC81653EA5E8E3D569757C5--

From java-patches-return-469-listarch-java-patches=sourceware.cygnus.com@sourceware.cygnus.com Tue Feb 15 06:51:30 2000
Return-Path: <java-patches-return-469-listarch-java-patches=sourceware.cygnus.com@sourceware.cygnus.com>
Delivered-To: listarch-java-patches@sourceware.cygnus.com
Received: (qmail 9200 invoked by alias); 15 Feb 2000 06:51:30 -0000
Mailing-List: contact java-patches-help@sourceware.cygnus.com; run by ezmlm
Precedence: bulk
List-Subscribe: <mailto:java-patches-subscribe@sourceware.cygnus.com>
List-Archive: <http://sourceware.cygnus.com/ml/java-patches/>
List-Post: <mailto:java-patches@sourceware.cygnus.com>
List-Help: <mailto:java-patches-help@sourceware.cygnus.com>, <http://sourceware.cygnus.com/ml/#faqs>
Sender: java-patches-owner@sourceware.cygnus.com
Delivered-To: mailing list java-patches@sourceware.cygnus.com
Received: (qmail 9181 invoked from network); 15 Feb 2000 06:51:28 -0000
Message-ID: <38A8F80B.339637BC@albatross.co.nz>
Date: Tue, 15 Feb 2000 19:54:03 +1300
From: Bryce McKinlay <bryce@albatross.co.nz>
X-Mailer: Mozilla 4.7 [en] (X11; U; Linux 2.3.25 i686)
X-Accept-Language: en
MIME-Version: 1.0
To: java-patches@sourceware.cygnus.com
Subject: Patch: java.lang.classpath property
Content-Type: multipart/mixed;
 boundary="------------57A32EC9F9D9DC98CD719487"

This is a multi-part message in MIME format.
--------------57A32EC9F9D9DC98CD719487
Content-Type: text/plain; charset=us-ascii
Content-Transfer-Encoding: 7bit

The java.lang.classpath property isn't being set. This means that the
interpreter is not searching the CLASSPATH for class files.

        * java/lang/natSystem.cc (init_properties): set java.lang.classpath
        property.

  [ bryce ]


--------------57A32EC9F9D9DC98CD719487
Content-Type: text/plain; charset=us-ascii;
 name="classpath.patch"
Content-Transfer-Encoding: 7bit
Content-Disposition: inline;
 filename="classpath.patch"

Index: libjava/java/lang/natSystem.cc
===================================================================
RCS file: /cvs/java/libgcj/libjava/java/lang/natSystem.cc,v
retrieving revision 1.18
diff -u -r1.18 natSystem.cc
--- natSystem.cc	2000/02/11 17:32:52	1.18
+++ natSystem.cc	2000/02/15 06:32:43
@@ -261,9 +261,9 @@
   SET ("java.specification.name", "Java(tm) Language Specification");
   SET ("java.specification.vendor", "Sun Microsystems Inc.");
 
-  // FIXME: how to set these given location-independence?
+  // FIXME: how to set this given location-independence?
   // SET ("java.home", "FIXME");
-  // SET ("java.class.path", "FIXME");
+  
   SET ("file.encoding", default_file_encoding);
 
 #ifdef WIN32
@@ -295,6 +295,13 @@
       SET ("os.version", "unknown");
     }
 #endif /* HAVE_UNAME */
+
+  char *classpath = ::getenv("CLASSPATH");
+  // FIXME: find libgcj.zip and append its path?
+  if (classpath != NULL)
+    SET ("java.class.path", classpath);
+  else
+    SET ("java.class.path", ".");
 
 #ifndef NO_GETUID
 #ifdef HAVE_PWD_H

--------------57A32EC9F9D9DC98CD719487--

From java-patches-return-470-listarch-java-patches=sourceware.cygnus.com@sourceware.cygnus.com Tue Feb 15 06:53:46 2000
Return-Path: <java-patches-return-470-listarch-java-patches=sourceware.cygnus.com@sourceware.cygnus.com>
Delivered-To: listarch-java-patches@sourceware.cygnus.com
Received: (qmail 9366 invoked by alias); 15 Feb 2000 06:53:45 -0000
Mailing-List: contact java-patches-help@sourceware.cygnus.com; run by ezmlm
Precedence: bulk
List-Subscribe: <mailto:java-patches-subscribe@sourceware.cygnus.com>
List-Archive: <http://sourceware.cygnus.com/ml/java-patches/>
List-Post: <mailto:java-patches@sourceware.cygnus.com>
List-Help: <mailto:java-patches-help@sourceware.cygnus.com>, <http://sourceware.cygnus.com/ml/#faqs>
Sender: java-patches-owner@sourceware.cygnus.com
Delivered-To: mailing list java-patches@sourceware.cygnus.com
Received: (qmail 9347 invoked from network); 15 Feb 2000 06:53:44 -0000
Message-ID: <38A8F894.1A8390F3@albatross.co.nz>
Date: Tue, 15 Feb 2000 19:56:20 +1300
From: Bryce McKinlay <bryce@albatross.co.nz>
X-Mailer: Mozilla 4.7 [en] (X11; U; Linux 2.3.25 i686)
X-Accept-Language: en
MIME-Version: 1.0
To: java-patches@sourceware.cygnus.com
Subject: Patch: NEWS file
Content-Type: multipart/mixed;
 boundary="------------5AFE0329D114B20AE8A4BE71"

This is a multi-part message in MIME format.
--------------5AFE0329D114B20AE8A4BE71
Content-Type: text/plain; charset=us-ascii
Content-Transfer-Encoding: 7bit

I thought it would be nice to include some brief documentation on new libgcj
features in the NEWS file. This is what I came up with.

  [ bryce ]


--------------5AFE0329D114B20AE8A4BE71
Content-Type: text/plain; charset=us-ascii;
 name="NEWS.patch"
Content-Transfer-Encoding: 7bit
Content-Disposition: inline;
 filename="NEWS.patch"

Index: NEWS
===================================================================
RCS file: /cvs/java/libgcj/libjava/NEWS,v
retrieving revision 1.4
diff -u -r1.4 NEWS
--- NEWS	2000/01/19 23:08:05	1.4
+++ NEWS	2000/02/15 06:52:53
@@ -1,19 +1,31 @@
 New in libgcj X.XX:
 
-* libgcj now includes a bytecode interpreter.
+* libgcj now includes a bytecode interpreter. If a compiled version of a class 
+is not found in the application binary or linked shared libraries, the
+class loader will search for a bytecode version in the CLASSPATH and execute
+it using the interpreter. A new front end that behaves like the traditional
+`java' command is provided: `gij'.
 
-* Support for specifying java system properties, both compiled in to the
-application and at runtime via an environment variable.
+* Support for specifying java system properties. Properties can either be set 
+at runtime via the GCJ_PROPERTIES environment variable in the format 
+"<name>=<value> ..."'; or can be compiled into an application binary using 
+-D<name>=<value>.
 
-* Complete JDK 1.1 reflection support, including invocation.
-
 * Support for setjmp/longjmp (sjlj) exception handling has been added, as an
-alternative to the existing range-table based mechanism.
+alternative to the existing range-table based mechanism. sljl is the default
+on non-sparc, non-x86 targets, or can be specified with the 
+`--enable-sjlj-exceptions' configure parameter.
 
+* Complete JDK 1.1 reflection support, including invocation.
+
 * Throwable.printStackTrace() has been implemented.
+
+* Runtime.loadLibrary() has been implemented. In addition, Class.forName() 
+will try to load a series of shared objects in order to find the requested 
+class.  If a class `gnu.quux.whatever' is requested, libgcj will first look 
+for `gnu-quux-whatever.so', then `gnu-quux.so', and finally `gnu.so'.
 
-* Runtime.loadLibrary() has been implemented, and Class.forName() can now
-dynamically load shared objects in order to find a requested class.
+* A pure-java implementation of java.math.BigInteger.
 
 New in libgcj 2.95:
 

--------------5AFE0329D114B20AE8A4BE71--

From java-patches-return-471-listarch-java-patches=sourceware.cygnus.com@sourceware.cygnus.com Tue Feb 15 06:54:50 2000
Return-Path: <java-patches-return-471-listarch-java-patches=sourceware.cygnus.com@sourceware.cygnus.com>
Delivered-To: listarch-java-patches@sourceware.cygnus.com
Received: (qmail 9494 invoked by alias); 15 Feb 2000 06:54:50 -0000
Mailing-List: contact java-patches-help@sourceware.cygnus.com; run by ezmlm
Precedence: bulk
List-Subscribe: <mailto:java-patches-subscribe@sourceware.cygnus.com>
List-Archive: <http://sourceware.cygnus.com/ml/java-patches/>
List-Post: <mailto:java-patches@sourceware.cygnus.com>
List-Help: <mailto:java-patches-help@sourceware.cygnus.com>, <http://sourceware.cygnus.com/ml/#faqs>
Sender: java-patches-owner@sourceware.cygnus.com
Delivered-To: mailing list java-patches@sourceware.cygnus.com
Received: (qmail 9474 invoked from network); 15 Feb 2000 06:54:49 -0000
Message-ID: <38A8F8D5.46C06F68@albatross.co.nz>
Date: Tue, 15 Feb 2000 19:57:25 +1300
From: Bryce McKinlay <bryce@albatross.co.nz>
X-Mailer: Mozilla 4.7 [en] (X11; U; Linux 2.3.25 i686)
X-Accept-Language: en
MIME-Version: 1.0
To: java-patches@sourceware.cygnus.com
Subject: Patch: Include filename with exception message on 
 Runtime.load()/loadLibrary() failure
Content-Type: multipart/mixed;
 boundary="------------74865560D5CCC51C774AC48D"

This is a multi-part message in MIME format.
--------------74865560D5CCC51C774AC48D
Content-Type: text/plain; charset=us-ascii
Content-Transfer-Encoding: 7bit

        * java/lang/natRuntime.cc (_load): Include library path with
        exception message.

  [ bryce ]


--------------74865560D5CCC51C774AC48D
Content-Type: text/plain; charset=us-ascii;
 name="loadlibrary-exception.patch"
Content-Transfer-Encoding: 7bit
Content-Disposition: inline;
 filename="loadlibrary-exception.patch"

Index: libjava/java/lang/natRuntime.cc
===================================================================
RCS file: /cvs/java/libgcj/libjava/java/lang/natRuntime.cc,v
retrieving revision 1.8
diff -u -r1.8 natRuntime.cc
--- natRuntime.cc	2000/02/10 00:17:10	1.8
+++ natRuntime.cc	2000/02/15 06:33:07
@@ -116,7 +116,9 @@
   if (h == NULL)
     {
       const char *msg = lt_dlerror ();
-      _Jv_Throw (new UnsatisfiedLinkError (JvNewStringLatin1 (msg)));
+      jstring str = path->concat (JvNewStringLatin1 (": "));
+      str = str->concat (JvNewStringLatin1 (msg));
+      _Jv_Throw (new UnsatisfiedLinkError (str));
     }
 
   add_library (h);

--------------74865560D5CCC51C774AC48D--

From java-patches-return-472-listarch-java-patches=sourceware.cygnus.com@sourceware.cygnus.com Tue Feb 15 07:12:10 2000
Return-Path: <java-patches-return-472-listarch-java-patches=sourceware.cygnus.com@sourceware.cygnus.com>
Delivered-To: listarch-java-patches@sourceware.cygnus.com
Received: (qmail 10772 invoked by alias); 15 Feb 2000 07:12:10 -0000
Mailing-List: contact java-patches-help@sourceware.cygnus.com; run by ezmlm
Precedence: bulk
List-Subscribe: <mailto:java-patches-subscribe@sourceware.cygnus.com>
List-Archive: <http://sourceware.cygnus.com/ml/java-patches/>
List-Post: <mailto:java-patches@sourceware.cygnus.com>
List-Help: <mailto:java-patches-help@sourceware.cygnus.com>, <http://sourceware.cygnus.com/ml/#faqs>
Sender: java-patches-owner@sourceware.cygnus.com
Delivered-To: mailing list java-patches@sourceware.cygnus.com
Received: (qmail 10747 invoked from network); 15 Feb 2000 07:12:10 -0000
Date: Mon, 14 Feb 2000 23:12:06 -0800 (PST)
Message-Id: <200002150712.XAA12122@ferrule.cygnus.com>
From: Tom Tromey <tromey@cygnus.com>
To: Bryce McKinlay <bryce@albatross.co.nz>
Cc: java-patches@sourceware.cygnus.com
Subject: Re: Patch: Thread.dumpStack()
In-Reply-To: <38A8F7BB.304334C7@albatross.co.nz>
References: <38A8F7BB.304334C7@albatross.co.nz>
X-Zippy:  I used to be a FUNDAMENTALIST, but then I heard about the
 HIGH RADIATION LEVELS and bought an ENCYCLOPEDIA!!
X-Attribution:  Tom

Bryce> Now that we have Throwable.printStackTrace() we can implement
Bryce> Thread.dumpStack() too.

Good catch!  Please check this in.

Tom

From java-patches-return-473-listarch-java-patches=sourceware.cygnus.com@sourceware.cygnus.com Tue Feb 15 07:14:50 2000
Return-Path: <java-patches-return-473-listarch-java-patches=sourceware.cygnus.com@sourceware.cygnus.com>
Delivered-To: listarch-java-patches@sourceware.cygnus.com
Received: (qmail 10948 invoked by alias); 15 Feb 2000 07:14:49 -0000
Mailing-List: contact java-patches-help@sourceware.cygnus.com; run by ezmlm
Precedence: bulk
List-Subscribe: <mailto:java-patches-subscribe@sourceware.cygnus.com>
List-Archive: <http://sourceware.cygnus.com/ml/java-patches/>
List-Post: <mailto:java-patches@sourceware.cygnus.com>
List-Help: <mailto:java-patches-help@sourceware.cygnus.com>, <http://sourceware.cygnus.com/ml/#faqs>
Sender: java-patches-owner@sourceware.cygnus.com
Delivered-To: mailing list java-patches@sourceware.cygnus.com
Received: (qmail 10923 invoked from network); 15 Feb 2000 07:14:49 -0000
Date: Mon, 14 Feb 2000 23:14:45 -0800 (PST)
Message-Id: <200002150714.XAA12130@ferrule.cygnus.com>
From: Tom Tromey <tromey@cygnus.com>
To: Bryce McKinlay <bryce@albatross.co.nz>
Cc: java-patches@sourceware.cygnus.com
Subject: Re: Patch: java.lang.classpath property
In-Reply-To: <38A8F80B.339637BC@albatross.co.nz>
References: <38A8F80B.339637BC@albatross.co.nz>
X-Zippy:  HAIR TONICS, please!!
X-Attribution:  Tom

Bryce> The java.lang.classpath property isn't being set. This means
Bryce> that the interpreter is not searching the CLASSPATH for class
Bryce> files.

This is fine.

Bryce> +  // FIXME: find libgcj.zip and append its path?

I guess we don't need to do this because the classes in libgcj.zip
have also been compiled.

There might be cases, like static linking, where this isn't really
true.  We could compile in the path to libgcj.zip easily enough.
Thoughts?

Tom

From java-patches-return-474-listarch-java-patches=sourceware.cygnus.com@sourceware.cygnus.com Tue Feb 15 07:16:10 2000
Return-Path: <java-patches-return-474-listarch-java-patches=sourceware.cygnus.com@sourceware.cygnus.com>
Delivered-To: listarch-java-patches@sourceware.cygnus.com
Received: (qmail 11208 invoked by alias); 15 Feb 2000 07:16:10 -0000
Mailing-List: contact java-patches-help@sourceware.cygnus.com; run by ezmlm
Precedence: bulk
List-Subscribe: <mailto:java-patches-subscribe@sourceware.cygnus.com>
List-Archive: <http://sourceware.cygnus.com/ml/java-patches/>
List-Post: <mailto:java-patches@sourceware.cygnus.com>
List-Help: <mailto:java-patches-help@sourceware.cygnus.com>, <http://sourceware.cygnus.com/ml/#faqs>
Sender: java-patches-owner@sourceware.cygnus.com
Delivered-To: mailing list java-patches@sourceware.cygnus.com
Received: (qmail 11183 invoked from network); 15 Feb 2000 07:16:10 -0000
Date: Mon, 14 Feb 2000 23:16:06 -0800 (PST)
Message-Id: <200002150716.XAA12135@ferrule.cygnus.com>
From: Tom Tromey <tromey@cygnus.com>
To: Bryce McKinlay <bryce@albatross.co.nz>
Cc: java-patches@sourceware.cygnus.com
Subject: Re: Patch: NEWS file
In-Reply-To: <38A8F894.1A8390F3@albatross.co.nz>
References: <38A8F894.1A8390F3@albatross.co.nz>
X-Zippy:  I'm having a MID-WEEK CRISIS!
X-Attribution:  Tom

Bryce> I thought it would be nice to include some brief documentation
Bryce> on new libgcj features in the NEWS file. This is what I came up
Bryce> with.

Definitely check this in.

We've been really lame about posting news like this to the web site.
We've also been pretty lame about documenting things specific to our
implementation.  I've added a note to my to-do list to think about
this at least...

Tom

From java-patches-return-475-listarch-java-patches=sourceware.cygnus.com@sourceware.cygnus.com Tue Feb 15 07:17:11 2000
Return-Path: <java-patches-return-475-listarch-java-patches=sourceware.cygnus.com@sourceware.cygnus.com>
Delivered-To: listarch-java-patches@sourceware.cygnus.com
Received: (qmail 11351 invoked by alias); 15 Feb 2000 07:17:11 -0000
Mailing-List: contact java-patches-help@sourceware.cygnus.com; run by ezmlm
Precedence: bulk
List-Subscribe: <mailto:java-patches-subscribe@sourceware.cygnus.com>
List-Archive: <http://sourceware.cygnus.com/ml/java-patches/>
List-Post: <mailto:java-patches@sourceware.cygnus.com>
List-Help: <mailto:java-patches-help@sourceware.cygnus.com>, <http://sourceware.cygnus.com/ml/#faqs>
Sender: java-patches-owner@sourceware.cygnus.com
Delivered-To: mailing list java-patches@sourceware.cygnus.com
Received: (qmail 11326 invoked from network); 15 Feb 2000 07:17:11 -0000
Date: Mon, 14 Feb 2000 23:17:07 -0800 (PST)
Message-Id: <200002150717.XAA12138@ferrule.cygnus.com>
From: Tom Tromey <tromey@cygnus.com>
To: Bryce McKinlay <bryce@albatross.co.nz>
Cc: java-patches@sourceware.cygnus.com
Subject: Re: Patch: Include filename with exception message on 
 Runtime.load()/loadLibrary() failure
In-Reply-To: <38A8F8D5.46C06F68@albatross.co.nz>
References: <38A8F8D5.46C06F68@albatross.co.nz>
X-Zippy:  PIZZA!!
X-Attribution:  Tom

Bryce>         * java/lang/natRuntime.cc (_load): Include library path with
Bryce>         exception message.

This is good.  Please check it in.

Tom

From java-patches-return-476-listarch-java-patches=sourceware.cygnus.com@sourceware.cygnus.com Tue Feb 15 07:44:03 2000
Return-Path: <java-patches-return-476-listarch-java-patches=sourceware.cygnus.com@sourceware.cygnus.com>
Delivered-To: listarch-java-patches@sourceware.cygnus.com
Received: (qmail 17940 invoked by alias); 15 Feb 2000 07:44:03 -0000
Mailing-List: contact java-patches-help@sourceware.cygnus.com; run by ezmlm
Precedence: bulk
List-Subscribe: <mailto:java-patches-subscribe@sourceware.cygnus.com>
List-Archive: <http://sourceware.cygnus.com/ml/java-patches/>
List-Post: <mailto:java-patches@sourceware.cygnus.com>
List-Help: <mailto:java-patches-help@sourceware.cygnus.com>, <http://sourceware.cygnus.com/ml/#faqs>
Sender: java-patches-owner@sourceware.cygnus.com
Delivered-To: mailing list java-patches@sourceware.cygnus.com
Received: (qmail 17874 invoked from network); 15 Feb 2000 07:43:58 -0000
To: Java Patch List <java-patches@sourceware.cygnus.com> 
Subject: Patch: fix for PR gcj/150
X-Zippy:  Hand me a pair of leather pants and a CASIO keyboard
 -- I'm living for today!
X-Attribution:  Tom
Bcc:
Reply-To:  tromey@cygnus.com
From:  Tom Tromey <tromey@cygnus.com>
Date: 15 Feb 2000 00:45:34 -0700
Message-ID: <87d7py29k1.fsf@cygnus.com>
Lines: 38
X-Mailer: Gnus v5.5/Emacs 20.3

I'm checking in the appended patch, which fixes PR gcj/150

2000-02-15  Tom Tromey  <tromey@cygnus.com>

	* java/lang/natRuntime.cc (_load): On Unix, prefix library name
	with `lib' for loadLibrary.  Fixes PR gcj/150.

Tom

Index: java/lang/natRuntime.cc
===================================================================
RCS file: /cvs/java/libgcj/libjava/java/lang/natRuntime.cc,v
retrieving revision 1.8
diff -u -r1.8 natRuntime.cc
--- natRuntime.cc	2000/02/10 00:17:10	1.8
+++ natRuntime.cc	2000/02/15 07:39:02
@@ -108,9 +108,18 @@
   using namespace java::lang;
 #ifdef USE_LTDL
   jint len = _Jv_GetStringUTFLength (path);
-  char buf[len + 1];
-  jsize total = JvGetStringUTFRegion (path, 0, path->length(), buf);
-  buf[total] = '\0';
+  char buf[len + 1 + 3];
+  int offset = 0;
+#ifndef WIN32
+  // On Unix boxes, prefix library name with `lib', for loadLibrary.
+  if (do_search)
+    {
+      strcpy (buf, "lib");
+      offset = 3;
+    }
+#endif
+  jsize total = JvGetStringUTFRegion (path, 0, path->length(), &buf[offset]);
+  buf[offset + total] = '\0';
   // FIXME: make sure path is absolute.
   lt_dlhandle h = do_search ? lt_dlopenext (buf) : lt_dlopen (buf);
   if (h == NULL)

From java-patches-return-477-listarch-java-patches=sourceware.cygnus.com@sourceware.cygnus.com Tue Feb 15 20:31:47 2000
Return-Path: <java-patches-return-477-listarch-java-patches=sourceware.cygnus.com@sourceware.cygnus.com>
Delivered-To: listarch-java-patches@sourceware.cygnus.com
Received: (qmail 3716 invoked by alias); 15 Feb 2000 20:31:46 -0000
Mailing-List: contact java-patches-help@sourceware.cygnus.com; run by ezmlm
Precedence: bulk
List-Subscribe: <mailto:java-patches-subscribe@sourceware.cygnus.com>
List-Archive: <http://sourceware.cygnus.com/ml/java-patches/>
List-Post: <mailto:java-patches@sourceware.cygnus.com>
List-Help: <mailto:java-patches-help@sourceware.cygnus.com>, <http://sourceware.cygnus.com/ml/#faqs>
Sender: java-patches-owner@sourceware.cygnus.com
Delivered-To: mailing list java-patches@sourceware.cygnus.com
Received: (qmail 3628 invoked from network); 15 Feb 2000 20:31:41 -0000
To: Java Patch List <java-patches@sourceware.cygnus.com> 
Subject: Patch: JNI fixlet
X-Zippy:  Did YOU find a DIGITAL WATCH in YOUR box of VELVEETA?
X-Attribution:  Tom
Bcc:
Reply-To:  tromey@cygnus.com
From:  Tom Tromey <tromey@cygnus.com>
Date: 15 Feb 2000 13:33:28 -0700
Message-ID: <871z6e1a07.fsf@cygnus.com>
Lines: 40
X-Mailer: Gnus v5.5/Emacs 20.3

I'm checking in the appended patch, which fixes a small bug in jni.cc.

2000-02-15  Tom Tromey  <tromey@cygnus.com>

	* jni.cc (_Jv_JNI_AttachCurrentThread): Return error if malloc
	fails.

Tom

Index: jni.cc
===================================================================
RCS file: /cvs/java/libgcj/libjava/jni.cc,v
retrieving revision 1.13
diff -u -r1.13 jni.cc
--- jni.cc	2000/02/10 20:31:47	1.13
+++ jni.cc	2000/02/15 19:57:52
@@ -1415,16 +1415,21 @@
   if (_Jv_ThreadCurrent () != NULL)
     return 0;
 
-  // FIXME: NULL return?
   JNIEnv *env = (JNIEnv *) _Jv_MallocUnchecked (sizeof (JNIEnv));
+  if (env == NULL)
+    return JNI_ERR;
   env->p = &_Jv_JNIFunctions;
   env->ex = NULL;
   env->klass = NULL;
-  // FIXME: NULL return?
   env->locals
     = (_Jv_JNI_LocalFrame *) _Jv_MallocUnchecked (sizeof (_Jv_JNI_LocalFrame)
 						  + (FRAME_SIZE
 						     * sizeof (jobject)));
+  if (env->locals == NULL)
+    {
+      _Jv_Free (env);
+      return JNI_ERR;
+    }
   *penv = reinterpret_cast<void *> (env);
 
   java::lang::Thread *t = new gnu::gcj::jni::NativeThread (group, name);

From java-patches-return-478-listarch-java-patches=sourceware.cygnus.com@sourceware.cygnus.com Tue Feb 15 22:39:44 2000
Return-Path: <java-patches-return-478-listarch-java-patches=sourceware.cygnus.com@sourceware.cygnus.com>
Delivered-To: listarch-java-patches@sourceware.cygnus.com
Received: (qmail 31082 invoked by alias); 15 Feb 2000 22:39:44 -0000
Mailing-List: contact java-patches-help@sourceware.cygnus.com; run by ezmlm
Precedence: bulk
List-Subscribe: <mailto:java-patches-subscribe@sourceware.cygnus.com>
List-Archive: <http://sourceware.cygnus.com/ml/java-patches/>
List-Post: <mailto:java-patches@sourceware.cygnus.com>
List-Help: <mailto:java-patches-help@sourceware.cygnus.com>, <http://sourceware.cygnus.com/ml/#faqs>
Sender: java-patches-owner@sourceware.cygnus.com
Delivered-To: mailing list java-patches@sourceware.cygnus.com
Received: (qmail 31057 invoked from network); 15 Feb 2000 22:39:40 -0000
To: Java Patch List <java-patches@sourceware.cygnus.com> 
Subject: Patch: bug fix in JNI name mangling
X-Zippy:  ...PENGUINS are floating by...
X-Attribution:  Tom
Bcc:
Reply-To:  tromey@cygnus.com
From:  Tom Tromey <tromey@cygnus.com>
Date: 15 Feb 2000 15:41:28 -0700
Message-ID: <87ya8mytpj.fsf@cygnus.com>
Lines: 25
X-Mailer: Gnus v5.5/Emacs 20.3

I'm checking in the appended patch.
It fixes a simple bug in the JNI name mangling code.

2000-02-15  Tom Tromey  <tromey@cygnus.com>

	* jni.cc (add_char): Added missing `else'.

Tom

Index: jni.cc
===================================================================
RCS file: /cvs/java/libgcj/libjava/jni.cc,v
retrieving revision 1.14
diff -u -r1.14 jni.cc
--- jni.cc	2000/02/15 20:39:36	1.14
+++ jni.cc	2000/02/15 22:36:55
@@ -1251,7 +1251,7 @@
     }
   else if (c == '/')
     buf[(*here)++] = '_';
-  if ((c >= '0' && c <= '9')
+  else if ((c >= '0' && c <= '9')
       || (c >= 'a' && c <= 'z')
       || (c >= 'A' && c <= 'Z'))
     buf[(*here)++] = (char) c;

From java-patches-return-479-listarch-java-patches=sourceware.cygnus.com@sourceware.cygnus.com Tue Feb 15 22:58:32 2000
Return-Path: <java-patches-return-479-listarch-java-patches=sourceware.cygnus.com@sourceware.cygnus.com>
Delivered-To: listarch-java-patches@sourceware.cygnus.com
Received: (qmail 2614 invoked by alias); 15 Feb 2000 22:58:32 -0000
Mailing-List: contact java-patches-help@sourceware.cygnus.com; run by ezmlm
Precedence: bulk
List-Subscribe: <mailto:java-patches-subscribe@sourceware.cygnus.com>
List-Archive: <http://sourceware.cygnus.com/ml/java-patches/>
List-Post: <mailto:java-patches@sourceware.cygnus.com>
List-Help: <mailto:java-patches-help@sourceware.cygnus.com>, <http://sourceware.cygnus.com/ml/#faqs>
Sender: java-patches-owner@sourceware.cygnus.com
Delivered-To: mailing list java-patches@sourceware.cygnus.com
Received: (qmail 2593 invoked from network); 15 Feb 2000 22:58:28 -0000
To: Java Patch List <java-patches@sourceware.cygnus.com> 
Subject: Patch: another JNI mangling patch
X-Zippy:  These PRESERVES should be FORCE-FED to PENTAGON OFFICIALS!!
X-Attribution:  Tom
Bcc:
Reply-To:  tromey@cygnus.com
From:  Tom Tromey <tromey@cygnus.com>
Date: 15 Feb 2000 15:59:31 -0700
Message-ID: <87wvo6ysvg.fsf@cygnus.com>
Lines: 28
X-Mailer: Gnus v5.5/Emacs 20.3

I'm committing the appended patch.
It fixes another bug in JNI name mangling.
The bug is that we want to skip the leading `(' in a signature, but we
failed to actually do so.

2000-02-15  Tom Tromey  <tromey@cygnus.com>

	* jni.cc (mangled_name): Skip leading `(' in signature.

Tom

Index: jni.cc
===================================================================
RCS file: /cvs/java/libgcj/libjava/jni.cc,v
retrieving revision 1.15
diff -u -r1.15 jni.cc
--- jni.cc	2000/02/15 22:42:10	1.15
+++ jni.cc	2000/02/15 22:56:35
@@ -1308,7 +1308,8 @@
   const unsigned char *sig = (const unsigned char *) signature->data;
   limit = sig + signature->length;
   JvAssert (signature[0] == '(');
-  for (int i = 1; ; ++i)
+  ++sig;
+  while (1)
     {
       int ch = UTF8_GET (sig, limit);
       if (ch == ')' || ch < 0)

From java-patches-return-480-listarch-java-patches=sourceware.cygnus.com@sourceware.cygnus.com Wed Feb 16 00:06:19 2000
Return-Path: <java-patches-return-480-listarch-java-patches=sourceware.cygnus.com@sourceware.cygnus.com>
Delivered-To: listarch-java-patches@sourceware.cygnus.com
Received: (qmail 20419 invoked by alias); 16 Feb 2000 00:06:19 -0000
Mailing-List: contact java-patches-help@sourceware.cygnus.com; run by ezmlm
Precedence: bulk
List-Subscribe: <mailto:java-patches-subscribe@sourceware.cygnus.com>
List-Archive: <http://sourceware.cygnus.com/ml/java-patches/>
List-Post: <mailto:java-patches@sourceware.cygnus.com>
List-Help: <mailto:java-patches-help@sourceware.cygnus.com>, <http://sourceware.cygnus.com/ml/#faqs>
Sender: java-patches-owner@sourceware.cygnus.com
Delivered-To: mailing list java-patches@sourceware.cygnus.com
Received: (qmail 20395 invoked from network); 16 Feb 2000 00:06:09 -0000
To: Java Patch List <java-patches@sourceware.cygnus.com> 
Subject: Patch: missing arguments to JNI calls
X-Zippy:  Now I need a suntan, a tennis lesson, Annette Funicello and two dozen
 Day-Glo orange paper jumpsuits!!
X-Attribution:  Tom
Bcc:
Reply-To:  tromey@cygnus.com
From:  Tom Tromey <tromey@cygnus.com>
Date: 15 Feb 2000 17:07:01 -0700
Message-ID: <87r9eeypqy.fsf@cygnus.com>
Lines: 196
X-Mailer: Gnus v5.5/Emacs 20.3

This patch changes the JNI implementation to pass required (but
previously missing) arguments to JNI functions.  With this change, JNI
native functions with arguments work correctly.

I'm checking this in.

2000-02-15  Tom Tromey  <tromey@cygnus.com>

	* resolve.cc (ncode): Set args_raw_size.  Compute jni_cif and
	jni_arg_types.
	(init_cif): Added `rtype_p' argument.
	* include/java-interp.h (class _Jv_MethodBase): Added
	args_raw_size.
	(class _Jv_InterpMethod): Removed args_raw_size.
	(class _Jv_JNIMethod): Added jni_cif and jni_arg_types fields.
	* jni.cc (call): Pass JNIEnv and (for static methods only) the
	class pointer as well as the ordinary arguments.

Tom

Index: jni.cc
===================================================================
RCS file: /cvs/java/libgcj/libjava/jni.cc,v
retrieving revision 1.16
diff -u -r1.16 jni.cc
--- jni.cc	2000/02/15 22:59:23	1.16
+++ jni.cc	2000/02/16 00:03:43
@@ -1323,7 +1323,7 @@
 // This function is the stub which is used to turn an ordinary (CNI)
 // method call into a JNI call.
 void
-_Jv_JNIMethod::call (ffi_cif *cif, void *ret, ffi_raw *args, void *__this)
+_Jv_JNIMethod::call (ffi_cif *, void *ret, ffi_raw *args, void *__this)
 {
   _Jv_JNIMethod* _this = (_Jv_JNIMethod *) __this;
 
@@ -1372,9 +1372,24 @@
 	}
     }
 
+  JvAssert (_this->args_raw_size % sizeof (ffi_raw) == 0);
+  ffi_raw real_args[2 + _this->args_raw_size / sizeof (ffi_raw)];
+  int offset = 0;
+
+  // First argument is always the environment pointer.
+  real_args[offset++].ptr = &env;
+
+  // For a static method, we pass in the Class.  For non-static
+  // methods, the `this' argument is already handled.
+  if ((_this->self->accflags & java::lang::reflect::Modifier::STATIC))
+    real_args[offset++].ptr = _this->defining_class;
+
+  // Copy over passed-in arguments.
+  memcpy (&real_args[offset], args, _this->args_raw_size);
+
   // The actual call to the JNI function.
-  // FIXME: if this is a static function we must include the class!
-  ffi_raw_call (cif, (void (*) (...)) _this->function, ret, args);
+  ffi_raw_call (&_this->jni_cif, (void (*) (...)) _this->function,
+		ret, real_args);
 
   do
     {
Index: resolve.cc
===================================================================
RCS file: /cvs/java/libgcj/libjava/resolve.cc,v
retrieving revision 1.13
diff -u -r1.13 resolve.cc
--- resolve.cc	2000/02/10 17:15:22	1.13
+++ resolve.cc	2000/02/16 00:04:00
@@ -941,7 +941,8 @@
 	  int arg_count,
 	  jboolean staticp,
 	  ffi_cif *cif,
-	  ffi_type **arg_types)
+	  ffi_type **arg_types,
+	  ffi_type **rtype_p)
 {
   unsigned char *ptr = (unsigned char*) signature->data;
 
@@ -983,6 +984,9 @@
 		    arg_count, rtype, arg_types) != FFI_OK)
     throw_internal_error ("ffi_prep_cif failed");
 
+  if (rtype_p != NULL)
+    *rtype_p = rtype;
+
   return item_count;
 }
 
@@ -1019,7 +1023,8 @@
 	    arg_count,
 	    staticp,
 	    &closure->cif,
-	    &closure->arg_types[0]);
+	    &closure->arg_types[0],
+	    NULL);
 
   ffi_closure_fun fun;
 
@@ -1064,14 +1069,37 @@
     (ncode_closure*)_Jv_AllocBytesChecked (sizeof (ncode_closure)
 					+ arg_count * sizeof (ffi_type*));
 
+  ffi_type *rtype;
   init_cif (self->signature,
 	    arg_count,
 	    staticp,
 	    &closure->cif,
-	    &closure->arg_types[0]);
+	    &closure->arg_types[0],
+	    &rtype);
 
   ffi_closure_fun fun;
 
+  args_raw_size = ffi_raw_size (&closure->cif);
+
+  // Initialize the argument types and CIF that represent the actual
+  // underlying JNI function.
+  int extra_args = 1;
+  if ((self->accflags & Modifier::STATIC))
+    ++extra_args;
+  jni_arg_types = (ffi_type **) _Jv_Malloc ((extra_args + arg_count)
+					    * sizeof (ffi_type *));
+  int offset = 0;
+  jni_arg_types[offset++] = &ffi_type_pointer;
+  if ((self->accflags & Modifier::STATIC))
+    jni_arg_types[offset++] = &ffi_type_pointer;
+  memcpy (&jni_arg_types[offset], &closure->arg_types[0],
+	  arg_count * sizeof (ffi_type *));
+
+  if (ffi_prep_cif (&jni_cif, FFI_DEFAULT_ABI,
+		    extra_args + arg_count, rtype,
+		    jni_arg_types) != FFI_OK)
+    throw_internal_error ("ffi_prep_cif failed for JNI function");
+
   JvAssert ((self->accflags & Modifier::NATIVE) != 0);
 
   // FIXME: for now we assume that all native methods for
@@ -1083,7 +1111,7 @@
 			fun,
 			(void*) this);
 
-  self->ncode = (void*)closure;
+  self->ncode = (void *) closure;
   return self->ncode;
 }
 
@@ -1107,7 +1135,8 @@
 		arg_count,
 		staticp,
 		&result->cif,
-		&result->arg_types[0]);
+		&result->arg_types[0],
+		NULL);
 
   result->vtable_index        = vtable_index;
   result->method              = method;
Index: include/java-interp.h
===================================================================
RCS file: /cvs/java/libgcj/libjava/include/java-interp.h,v
retrieving revision 1.7
diff -u -r1.7 java-interp.h
--- java-interp.h	2000/02/07 21:17:30	1.7
+++ java-interp.h	2000/02/16 00:04:00
@@ -76,6 +76,9 @@
 
   // The method description.
   _Jv_Method *self;
+
+  // Size of raw arguments.
+  _Jv_ushort args_raw_size;
 };
 
 class _Jv_InterpMethod : public _Jv_MethodBase
@@ -85,7 +88,6 @@
   int              code_length;
 
   _Jv_ushort       exc_count;
-  _Jv_ushort       args_raw_size;
 
   unsigned char* bytecode () 
   {
@@ -174,6 +176,12 @@
   // The underlying function.  If NULL we have to look for the
   // function.
   void *function;
+
+  // This is the CIF used by the JNI function.
+  ffi_cif jni_cif;
+
+  // These are the argument types used by the JNI function.
+  ffi_type **jni_arg_types;
 
   // This function is used when making a JNI call from the interpreter.
   static void call (ffi_cif *, void *, ffi_raw *, void *);

From java-patches-return-481-listarch-java-patches=sourceware.cygnus.com@sourceware.cygnus.com Wed Feb 16 00:19:40 2000
Return-Path: <java-patches-return-481-listarch-java-patches=sourceware.cygnus.com@sourceware.cygnus.com>
Delivered-To: listarch-java-patches@sourceware.cygnus.com
Received: (qmail 22674 invoked by alias); 16 Feb 2000 00:19:39 -0000
Mailing-List: contact java-patches-help@sourceware.cygnus.com; run by ezmlm
Precedence: bulk
List-Subscribe: <mailto:java-patches-subscribe@sourceware.cygnus.com>
List-Archive: <http://sourceware.cygnus.com/ml/java-patches/>
List-Post: <mailto:java-patches@sourceware.cygnus.com>
List-Help: <mailto:java-patches-help@sourceware.cygnus.com>, <http://sourceware.cygnus.com/ml/#faqs>
Sender: java-patches-owner@sourceware.cygnus.com
Delivered-To: mailing list java-patches@sourceware.cygnus.com
Received: (qmail 22647 invoked from network); 16 Feb 2000 00:19:22 -0000
To: Java Patch List <java-patches@sourceware.cygnus.com> 
Subject: Patch: JNI tests
X-Zippy:  It's a lot of fun being alive...  I wonder if my bed is made?!?
X-Attribution:  Tom
Bcc:
Reply-To:  tromey@cygnus.com
From:  Tom Tromey <tromey@cygnus.com>
Date: 15 Feb 2000 17:21:08 -0700
Message-ID: <87putyyp3f.fsf@cygnus.com>
Lines: 267
X-Mailer: Gnus v5.5/Emacs 20.3

I'm checking in the appended patch, which some JNI tests.
All these currently pass.
I haven't yet written the JNI test harness.

2000-02-15  Tom Tromey  <tromey@cygnus.com>

	* libjava.jni/virtual.java: New file.
	* libjava.jni/virtual.c: New file.
	* libjava.jni/virtual.out: New file.
	* libjava.jni/final_method.java: New file.
	* libjava.jni/final_method.c: New file.
	* libjava.jni/final_method.out: New file.
	* libjava.jni/overload.java: New file.
	* libjava.jni/overload.c: New file.
	* libjava.jni/overload.out: New file.
	* libjava.jni/simple_int.java: New file.
	* libjava.jni/simple_int.c: New file.
	* libjava.jni/simple_int.out: New file.
	* libjava.jni/invoke.out: New file.
	* libjava.jni/invoke.c: New file.
	* libjava.jni/invoke.java: New file.

Tom

Index: libjava.jni/final_method.c
===================================================================
RCS file: final_method.c
diff -N final_method.c
--- /dev/null	Tue May  5 13:32:27 1998
+++ final_method.c	Tue Feb 15 16:18:14 2000
@@ -0,0 +1,7 @@
+#include <final_method.h>
+
+jstring
+Java_final_1method_meth (JNIEnv *env, jobject thisv)
+{
+  return (*env)->NewStringUTF (env, "zardoz has spoken");
+}
Index: libjava.jni/final_method.java
===================================================================
RCS file: final_method.java
diff -N final_method.java
--- /dev/null	Tue May  5 13:32:27 1998
+++ final_method.java	Tue Feb 15 16:18:14 2000
@@ -0,0 +1,17 @@
+// Minimal test a non-static final method.
+
+public class final_method
+{
+  static
+  {
+    System.loadLibrary ("final_method");
+  }
+
+  public final native String meth ();
+
+  public static void main (String[] args)
+  {
+    final_method fm = new final_method ();
+    System.out.println (fm.meth ());
+  }
+}
Index: libjava.jni/final_method.out
===================================================================
RCS file: final_method.out
diff -N final_method.out
--- /dev/null	Tue May  5 13:32:27 1998
+++ final_method.out	Tue Feb 15 16:18:14 2000
@@ -0,0 +1 @@
+zardoz has spoken
Index: libjava.jni/invoke.c
===================================================================
RCS file: invoke.c
diff -N invoke.c
--- /dev/null	Tue May  5 13:32:27 1998
+++ invoke.c	Tue Feb 15 16:18:14 2000
@@ -0,0 +1,7 @@
+#include <invoke.h>
+
+jint
+Java_invoke_val (JNIEnv *env, jclass klass)
+{
+  return 23;
+}
Index: libjava.jni/invoke.java
===================================================================
RCS file: invoke.java
diff -N invoke.java
--- /dev/null	Tue May  5 13:32:27 1998
+++ invoke.java	Tue Feb 15 16:18:14 2000
@@ -0,0 +1,18 @@
+// Test to make sure the minimal invocation works.
+
+public class invoke
+{
+  public static native int val ();
+
+  static
+  {
+    System.out.println ("trying...");
+    System.loadLibrary ("invoke");
+    System.out.println ("loaded");
+  }
+
+  public static void main (String[] args)
+  {
+    System.out.println (val ());
+  }
+}
Index: libjava.jni/invoke.out
===================================================================
RCS file: invoke.out
diff -N invoke.out
--- /dev/null	Tue May  5 13:32:27 1998
+++ invoke.out	Tue Feb 15 16:18:14 2000
@@ -0,0 +1,3 @@
+trying...
+loaded
+23
Index: libjava.jni/overload.c
===================================================================
RCS file: overload.c
diff -N overload.c
--- /dev/null	Tue May  5 13:32:27 1998
+++ overload.c	Tue Feb 15 16:18:14 2000
@@ -0,0 +1,16 @@
+#include <overload.h>
+
+jint
+Java_overload_over__I (JNIEnv *env, jclass klass, jint val)
+{
+  return val;
+}
+
+
+jint
+Java_overload_over__II (JNIEnv *env, jclass klass, jint one, jint two)
+{
+  return one + two;
+}
+
+
Index: libjava.jni/overload.java
===================================================================
RCS file: overload.java
diff -N overload.java
--- /dev/null	Tue May  5 13:32:27 1998
+++ overload.java	Tue Feb 15 16:18:14 2000
@@ -0,0 +1,18 @@
+// Test to make sure overloaded functions with long names work.
+
+public class overload
+{
+  static
+  {
+    System.loadLibrary ("overload");
+  }
+
+  public static native int over (int one);
+  public static native int over (int one, int two);
+
+  public static void main (String[] args)
+  {
+    System.out.println (over (1));
+    System.out.println (over (1, 2));
+  }
+}
Index: libjava.jni/overload.out
===================================================================
RCS file: overload.out
diff -N overload.out
--- /dev/null	Tue May  5 13:32:27 1998
+++ overload.out	Tue Feb 15 16:18:14 2000
@@ -0,0 +1,2 @@
+1
+3
Index: libjava.jni/simple_int.c
===================================================================
RCS file: simple_int.c
diff -N simple_int.c
--- /dev/null	Tue May  5 13:32:27 1998
+++ simple_int.c	Tue Feb 15 16:18:14 2000
@@ -0,0 +1,7 @@
+#include <simple_int.h>
+
+jint
+Java_simple_1int_nat (JNIEnv *env, jclass klass, jint val)
+{
+  return 2 * val;
+}
Index: libjava.jni/simple_int.java
===================================================================
RCS file: simple_int.java
diff -N simple_int.java
--- /dev/null	Tue May  5 13:32:27 1998
+++ simple_int.java	Tue Feb 15 16:18:14 2000
@@ -0,0 +1,16 @@
+// Test a simple static function with an `int' argument.
+
+public class simple_int
+{
+  public static native int nat (int z);
+
+  static
+  {
+    System.loadLibrary ("simple_int");
+  }
+
+  public static void main (String[] args)
+  {
+    System.out.println (nat (23));
+  }
+}
Index: libjava.jni/simple_int.out
===================================================================
RCS file: simple_int.out
diff -N simple_int.out
--- /dev/null	Tue May  5 13:32:27 1998
+++ simple_int.out	Tue Feb 15 16:18:14 2000
@@ -0,0 +1 @@
+46
Index: libjava.jni/virtual.c
===================================================================
RCS file: virtual.c
diff -N virtual.c
--- /dev/null	Tue May  5 13:32:27 1998
+++ virtual.c	Tue Feb 15 16:18:14 2000
@@ -0,0 +1,7 @@
+#include <virtual.h>
+
+jboolean
+Java_virtual_equals (JNIEnv *env, jobject thisv, jobject other)
+{
+  return JNI_FALSE;
+}
Index: libjava.jni/virtual.java
===================================================================
RCS file: virtual.java
diff -N virtual.java
--- /dev/null	Tue May  5 13:32:27 1998
+++ virtual.java	Tue Feb 15 16:18:14 2000
@@ -0,0 +1,17 @@
+// Minimal test of a virtual method.
+
+public class virtual
+{
+  static
+  {
+    System.loadLibrary ("virtual");
+  }
+
+  public native boolean equals (Object obj);
+
+  public static void main (String[] args)
+  {
+    Object v = new virtual ();
+    System.out.println (v.equals (v));
+  }
+}
Index: libjava.jni/virtual.out
===================================================================
RCS file: virtual.out
diff -N virtual.out
--- /dev/null	Tue May  5 13:32:27 1998
+++ virtual.out	Tue Feb 15 16:18:14 2000
@@ -0,0 +1 @@
+false

From java-patches-return-482-listarch-java-patches=sourceware.cygnus.com@sourceware.cygnus.com Wed Feb 16 03:56:13 2000
Return-Path: <java-patches-return-482-listarch-java-patches=sourceware.cygnus.com@sourceware.cygnus.com>
Delivered-To: listarch-java-patches@sourceware.cygnus.com
Received: (qmail 9202 invoked by alias); 16 Feb 2000 03:56:13 -0000
Mailing-List: contact java-patches-help@sourceware.cygnus.com; run by ezmlm
Precedence: bulk
List-Subscribe: <mailto:java-patches-subscribe@sourceware.cygnus.com>
List-Archive: <http://sourceware.cygnus.com/ml/java-patches/>
List-Post: <mailto:java-patches@sourceware.cygnus.com>
List-Help: <mailto:java-patches-help@sourceware.cygnus.com>, <http://sourceware.cygnus.com/ml/#faqs>
Sender: java-patches-owner@sourceware.cygnus.com
Delivered-To: mailing list java-patches@sourceware.cygnus.com
Received: (qmail 9155 invoked from network); 16 Feb 2000 03:56:08 -0000
Message-ID: <38AA2075.85A1DFA1@albatross.co.nz>
Date: Wed, 16 Feb 2000 16:58:45 +1300
From: Bryce McKinlay <bryce@albatross.co.nz>
X-Mailer: Mozilla 4.7 [en] (X11; U; Linux 2.3.25 i686)
X-Accept-Language: en
MIME-Version: 1.0
To: java-patches@sourceware.cygnus.com
Subject: Patch: New interface lookup, and inlining, Take 2
Content-Type: multipart/mixed;
 boundary="------------36A75D6AA0BEA0D67653EC92"

This is a multi-part message in MIME format.
--------------36A75D6AA0BEA0D67653EC92
Content-Type: text/plain; charset=us-ascii
Content-Transfer-Encoding: 7bit

This is a new version of the interface dispatch patch I posted last December.
Because non-trivial changes would be required to the interpreter in order to
make it work with index based lookup, the major change in this version is that
it retains the existing interface lookup code in parallel, so that the
interpreter continues to work. An added benefit is backwards compatibility with
the current compiler - patched and unpatched compilers should continue to work
with this code.

I'm still waiting for the FSF to process my copyright assignment form for the
compiler patches, but I think that this stuff can be committed now?

2000-02-16  Bryce McKinlay  <bryce@albatross.co.nz>

        * java/lang/Class.h (union _Jv_IDispatchTable): New declaration.
        (struct _Jv_ifaces): New declaration.
        JV_CLASS: New macro definition.
        (getComponentType): Relocate below isArray() for inlining.
        (getModifiers): Declare `inline'.
        (getSuperclass): Ditto.
        (isArray): Ditto.
        (isPrimitive): Ditto.
        (_Jv_IsAssignableFrom): New prototype.
        (_Jv_LookupInterfaceMethodIdx): New prototype. Predeclare with "C"
        linkage.
        (_Jv_InitClass): Move from natClass.cc. Declare `inline'.
        Check for JV_STATE_DONE before invoking initializeClass().
        (_Jv_PrepareConstantTimeTables): New prototype.
        (_Jv_GetInterfaces): Ditto.
        (_Jv_GenerateITable): Ditto.
        (_Jv_GetMethodString): Ditto.
        (_Jv_AppendPartialITable): Ditto.
        (_Jv_FindIIndex): Ditto.
        depth, ancestors, idt: New fields.

        * java/lang/natClass.cc (isAssignableFrom): Move functionality to
        inline function `_Jv_IsAssignableFrom'. Use that function.
        (isInstance): Declare `inline'.
        (initializeClass): Get lock on class before checking `state'. Unlock
        before calling resolveClass0. Call _Jv_PrepareConstantTimeTables with
        the lock held.
        (_Jv_LookupInterfaceMethod): Use _Jv_GetMessageString.
        (_Jv_IsAssignableFrom): New inline function. Test assignability using
        class->depth and ancestor table.
        (_Jv_IsInstanceOf): Use _Jv_IsAssignableFrom.
        (_Jv_CheckCast): Move from prims.cc. Use JV_CLASS and
        _Jv_IsAssignableFrom.
        (_Jv_CheckArrayStore): Ditto.
        (_Jv_LookupInterfaceMethodIdx): New function.
        INITIAL_IOFFSETS_LEN, INITIAL_IFACES_LEN: New #defines.
        (_Jv_PrepareConstantTimeTables): New function.
        (_Jv_IndexOf): Ditto.
        (_Jv_GetInterfaces): Ditto.
        (_Jv_GenerateITable): Ditto.
        (_Jv_GetMethodString): Ditto.
        (_Jv_AppendPartialITable): Ditto.
        iindex_mutex, iindex_mutex_initialized: New static fields.
        (_Jv_FindIIndex): New function.

        * java/lang/natClassLoader.cc (_Jv_NewClass): Set new jclass fields.

        * prims.cc (_Jv_CheckCast): Moved to natClass.cc.
        (_Jv_CheckArrayStore): Ditto.
        (JvNewCharArray, JvNewBooleanArray, JvNewByteArray, JvNewShortArray,
        JvNewIntArray, JvNewLongArray, JvNewFloatArray, JvNewDoubleArray):
        Moved to gcj/array.h.
        (_Jv_Realloc): New function.

        * gcj/cni.h: Move _Jv_PrimClass definitions to gcj/array.h.

        * gcj/array.h: _Jv_PrimClass definitions moved from gcj/cni.h.
        (JvNewCharArray, JvNewBooleanArray, JvNewByteArray,
        JvNewShortArray, JvNewIntArray, JvNewLongArray, JvNewFloatArray,
        JvNewDoubleArray): Implementations moved from prims.cc and
        declared `inline'.

        * gcj/javaprims.h (_Jv_Realloc): Prototype.

        * include/jvm.h (_Jv_LookupInterfaceMethodIdx): Prototype.


--------------36A75D6AA0BEA0D67653EC92
Content-Type: text/plain; charset=us-ascii;
 name="libgcj-interface-dispatch-2.patch"
Content-Transfer-Encoding: 7bit
Content-Disposition: inline;
 filename="libgcj-interface-dispatch-2.patch"

Index: java/lang/natClass.cc
===================================================================
RCS file: /cvs/java/libgcj/libjava/java/lang/natClass.cc,v
retrieving revision 1.16
diff -u -r1.16 natClass.cc
--- natClass.cc	2000/01/19 18:39:26	1.16
+++ natClass.cc	2000/02/16 03:38:37
@@ -10,13 +10,15 @@
 
 #include <config.h>
 
-#include <stdlib.h>
+#include <limits.h>
 #include <string.h>
 
 #pragma implementation "Class.h"
 
 #include <gcj/cni.h>
 #include <jvm.h>
+#include <java-threads.h>
+
 #include <java/lang/Class.h>
 #include <java/lang/ClassLoader.h>
 #include <java/lang/String.h>
@@ -26,6 +28,8 @@
 #include <java/lang/reflect/Field.h>
 #include <java/lang/reflect/Constructor.h>
 #include <java/lang/AbstractMethodError.h>
+#include <java/lang/ArrayStoreException.h>
+#include <java/lang/ClassCastException.h>
 #include <java/lang/ClassNotFoundException.h>
 #include <java/lang/IllegalAccessException.h>
 #include <java/lang/IllegalAccessError.h>
@@ -33,6 +37,7 @@
 #include <java/lang/InstantiationException.h>
 #include <java/lang/NoClassDefFoundError.h>
 #include <java/lang/NoSuchFieldException.h>
+#include <java/lang/NoSuchMethodError.h>
 #include <java/lang/NoSuchMethodException.h>
 #include <java/lang/Thread.h>
 #include <java/lang/NullPointerException.h>
@@ -607,40 +612,10 @@
 jboolean
 java::lang::Class::isAssignableFrom (jclass klass)
 {
-  if (this == klass)
-    return true;
-  // Primitive types must be equal, which we just tested for.
-  if (isPrimitive () || ! klass || klass->isPrimitive())
-    return false;
-
-  // If target is array, so must source be.
-  if (isArray ())
-    {
-      if (! klass->isArray())
-	return false;
-      return getComponentType()->isAssignableFrom(klass->getComponentType());
-    }
-
-  if (isAssignableFrom (klass->getSuperclass()))
-    return true;
-
-  if (isInterface())
-    {
-      // See if source implements this interface.
-      for (int i = 0; i < klass->interface_count; ++i)
-	{
-	  jclass interface = klass->interfaces[i];
-	  // FIXME: ensure that class is prepared here.
-	  // See Spec 12.3.2.
-	  if (isAssignableFrom (interface))
-	    return true;
-	}
-    }
-
-  return false;
+  return _Jv_IsAssignableFrom (this, klass);
 }
 
-jboolean
+inline jboolean
 java::lang::Class::isInstance (jobject obj)
 {
   if (! obj || isPrimitive ())
@@ -648,7 +623,7 @@
   return isAssignableFrom (obj->getClass());
 }
 
-jboolean
+inline jboolean
 java::lang::Class::isInterface (void)
 {
   return (accflags & java::lang::reflect::Modifier::INTERFACE) != 0;
@@ -704,36 +679,32 @@
 void
 java::lang::Class::initializeClass (void)
 {
-  // Short-circuit to avoid needless locking.
+  // jshort-circuit to avoid needless locking.
   if (state == JV_STATE_DONE)
     return;
 
-  // do this before we enter the monitor below, since this can cause
-  // exceptions.  Here we assume, that reading "state" is an atomic
-  // operation, I pressume that is true? --Kresten
+  // Step 1.
+  _Jv_MonitorEnter (this);
+
   if (state < JV_STATE_LINKED)
-    {
+    {    
 #ifdef INTERPRETER
       if (_Jv_IsInterpretedClass (this))
 	{
+	  // this can throw exceptions, so exit the monitor as a precaution.
+	  _Jv_MonitorExit (this);
 	  java::lang::ClassLoader::resolveClass0 (this);
-
-	  // Step 1.
 	  _Jv_MonitorEnter (this);
 	}
       else
 #endif
         {
-          // Step 1.
-	  _Jv_MonitorEnter (this);
 	  _Jv_PrepareCompiledClass (this);
 	}
-    }
-  else
-    {
-      // Step 1.
-      _Jv_MonitorEnter (this);
     }
+  
+  if (state <= JV_STATE_LINKED)
+    _Jv_PrepareConstantTimeTables (this);
 
   // Step 2.
   java::lang::Thread *self = java::lang::Thread::currentThread();
@@ -829,14 +800,14 @@
 
 _Jv_Method *
 _Jv_LookupDeclaredMethod (jclass klass, _Jv_Utf8Const *name,
-			_Jv_Utf8Const *signature)
+                          _Jv_Utf8Const *signature)
 {
   for (; klass; klass = klass->getSuperclass())
     {
       _Jv_Method *meth = _Jv_GetMethodLocal (klass, name, signature);
 
       if (meth)
-	return meth;
+        return meth;
     }
 
   return NULL;
@@ -855,15 +826,15 @@
 
 static void *
 _Jv_FindMethodInCache (jclass klass,
-		       _Jv_Utf8Const *name,
-		       _Jv_Utf8Const *signature)
+                       _Jv_Utf8Const *name,
+                       _Jv_Utf8Const *signature)
 {
   int index = name->hash & MCACHE_SIZE;
   _Jv_mcache *mc = method_cache + index;
   _Jv_Method *m = mc->method;
 
   if (mc->klass == klass
-      && m != NULL		// thread safe check
+      && m != NULL             // thread safe check
       && _Jv_equalUtf8Consts (m->name, name)
       && _Jv_equalUtf8Consts (m->signature, signature))
     return mc->method->ncode;
@@ -872,7 +843,7 @@
 
 static void
 _Jv_AddMethodToCache (jclass klass,
-			_Jv_Method *method)
+                       _Jv_Method *method)
 {
   _Jv_MonitorEnter (&ClassClass); 
 
@@ -886,8 +857,10 @@
 
 void *
 _Jv_LookupInterfaceMethod (jclass klass, _Jv_Utf8Const *name,
-			   _Jv_Utf8Const *signature)
+                           _Jv_Utf8Const *signature)
 {
+  using namespace java::lang::reflect;
+
   void *ncode = _Jv_FindMethodInCache (klass, name, signature);
   if (ncode != 0)
     return ncode;
@@ -896,31 +869,432 @@
     {
       _Jv_Method *meth = _Jv_GetMethodLocal (klass, name, signature);
       if (! meth)
-	continue;
+        continue;
 
-      if (java::lang::reflect::Modifier::isStatic(meth->accflags))
-	JvThrow (new java::lang::IncompatibleClassChangeError);
-      if (java::lang::reflect::Modifier::isAbstract(meth->accflags))
-	JvThrow (new java::lang::AbstractMethodError);
-      if (! java::lang::reflect::Modifier::isPublic(meth->accflags))
-	JvThrow (new java::lang::IllegalAccessError);
+      if (Modifier::isStatic(meth->accflags))
+	JvThrow (new java::lang::IncompatibleClassChangeError
+	         (_Jv_GetMethodString (klass, meth->name)));
+      if (Modifier::isAbstract(meth->accflags))
+	JvThrow (new java::lang::AbstractMethodError
+	         (_Jv_GetMethodString (klass, meth->name)));
+      if (! Modifier::isPublic(meth->accflags))
+	JvThrow (new java::lang::IllegalAccessError
+	         (_Jv_GetMethodString (klass, meth->name)));
 
       _Jv_AddMethodToCache (klass, meth);
 
       return meth->ncode;
     }
   JvThrow (new java::lang::IncompatibleClassChangeError);
-  return NULL;			// Placate compiler.
+  return NULL;                 // Placate compiler.
 }
 
-void
-_Jv_InitClass (jclass klass)
+// Fast interface method lookup by index.
+void *
+_Jv_LookupInterfaceMethodIdx (jclass klass, jclass iface, int method_idx)
 {
-  klass->initializeClass();
+  _Jv_IDispatchTable *cldt = klass->idt;
+  int idx = iface->idt->iface.ioffsets[cldt->cls.iindex] + method_idx;
+  return cldt->cls.itable[idx];
+}
+
+inline jboolean
+_Jv_IsAssignableFrom (jclass target, jclass source)
+{
+  if (target == &ObjectClass 
+      || source == target 
+      || (source->ancestors != NULL 
+          && source->ancestors[source->depth - target->depth] == target))
+     return true;
+     
+  // If target is array, so must source be.  
+  if (target->isArray ())
+    {
+      if (! source->isArray())
+	return false;
+      return _Jv_IsAssignableFrom(target->getComponentType(), 
+                                  source->getComponentType());
+    }
+        
+  if (target->isInterface())
+    {
+      _Jv_IDispatchTable *cl_idt = source->idt;
+      _Jv_IDispatchTable *if_idt = target->idt;
+      jshort cl_iindex = cl_idt->cls.iindex;
+      if (cl_iindex <= if_idt->iface.ioffsets[0])
+        {
+	  jshort offset = if_idt->iface.ioffsets[cl_iindex];
+	  if (offset < cl_idt->cls.itable_length
+	      && cl_idt->cls.itable[offset] == target)
+	    return true;
+	}
+      return false;
+    }
+    
+  return false;
 }
 
 jboolean
 _Jv_IsInstanceOf(jobject obj, jclass cl)
+{
+  return (obj ? _Jv_IsAssignableFrom (cl, JV_CLASS (obj)) : false);
+}
+
+void *
+_Jv_CheckCast (jclass c, jobject obj)
+{
+  if (obj != NULL && ! _Jv_IsAssignableFrom(c, JV_CLASS (obj)))
+    JvThrow (new java::lang::ClassCastException);
+  return obj;
+}
+
+void
+_Jv_CheckArrayStore (jobject arr, jobject obj)
+{
+  if (obj)
+    {
+      JvAssert (arr != NULL);
+      jclass elt_class = (JV_CLASS (arr))->getComponentType();
+      jclass obj_class = JV_CLASS (obj);
+      if (! _Jv_IsAssignableFrom (elt_class, obj_class))
+	JvThrow (new java::lang::ArrayStoreException);
+    }
+}
+
+#define INITIAL_IOFFSETS_LEN 4
+#define INITIAL_IFACES_LEN 4
+
+// Generate tables for constant-time assignment testing and interface
+// method lookup. This implemenents the technique described by Per Bothner
+// <per@bothner.com> on the java-discuss mailing list on 1999-09-02:
+// http://sourceware.cygnus.com/ml/java-discuss/1999-q3/msg00377.html
+void 
+_Jv_PrepareConstantTimeTables (jclass klass)
+{  
+  if (klass->isPrimitive () || klass->isInterface ())
+    return;
+  
+  // jshort-circuit in case we've been called already.
+  if ((klass->idt != NULL) || klass->depth != 0)
+    return;
+
+  // Calculate the class depth and ancestor table. The depth of a class 
+  // is how many "extends" it is removed from Object. Thus the depth of 
+  // java.lang.Object is 0, but the depth of java.io.FilterOutputStream 
+  // is 2. Depth is defined for all regular and array classes, but not 
+  // interfaces or primitive types.
+   
+  jclass klass0 = klass;
+  while (klass0 != &ObjectClass)
+    {
+      klass0 = klass0->superclass;
+      klass->depth++;
+    }
+
+  // We do class member testing in constant time by using a small table 
+  // of all the ancestor classes within each class. The first element is 
+  // a pointer to the current class, and the rest are pointers to the 
+  // classes ancestors, ordered from the current class down by decreasing 
+  // depth. We do not include java.lang.Object in the table of ancestors, 
+  // since it is redundant.
+	
+  klass->ancestors = (jclass *) _Jv_Malloc (klass->depth * sizeof (jclass));
+  klass0 = klass;
+  for (int index = 0; index < klass->depth; index++)
+    {
+      klass->ancestors[index] = klass0;
+      klass0 = klass0->superclass;
+    }
+    
+  if (klass->isArray () 
+      || java::lang::reflect::Modifier::isAbstract (klass->accflags))
+    return;
+
+  klass->idt = 
+    (_Jv_IDispatchTable *) _Jv_Malloc (sizeof (_Jv_IDispatchTable));
+    
+  _Jv_ifaces ifaces;
+
+  ifaces.count = 0;
+  ifaces.len = INITIAL_IFACES_LEN;
+  ifaces.list = (jclass *) _Jv_Malloc (ifaces.len * sizeof (jclass *));
+
+  int itable_size = _Jv_GetInterfaces (klass, &ifaces);
+
+  if (ifaces.count > 0)
+    {
+      klass->idt->cls.itable = 
+	(void **) _Jv_Malloc (itable_size * sizeof (void *));
+      klass->idt->cls.itable_length = itable_size;
+          
+      jshort *itable_offsets = 
+	(jshort *) _Jv_Malloc (ifaces.count * sizeof (jshort));
+
+      _Jv_GenerateITable (klass, &ifaces, itable_offsets);
+
+      jshort cls_iindex = 
+	_Jv_FindIIndex (ifaces.list, itable_offsets, ifaces.count);
+
+      for (int i=0; i < ifaces.count; i++)
+	{
+	  ifaces.list[i]->idt->iface.ioffsets[cls_iindex] =
+	    itable_offsets[i];
+	}
+
+      klass->idt->cls.iindex = cls_iindex;	    
+
+      _Jv_Free (ifaces.list);
+      _Jv_Free (itable_offsets);
+    }
+  else 
+    {
+      klass->idt->cls.iindex = SHRT_MAX;
+    }
+}
+
+// Return index of item in list, or -1 if item is not present.
+jshort
+_Jv_IndexOf (void *item, void **list, jshort list_len)
 {
-  return cl->isInstance(obj);
+  for (int i=0; i < list_len; i++)
+    {
+      if (list[i] == item)
+        return i;
+    }
+  return -1;
+}
+
+// Find all unique interfaces directly or indirectly implemented by klass.
+// Returns the size of the interface dispatch table (itable) for klass, which 
+// is the number of unique interfaces plus the total number of methods that 
+// those interfaces declare. May extend ifaces if required.
+jshort
+_Jv_GetInterfaces (jclass klass, _Jv_ifaces *ifaces)
+{
+  jshort result = 0;
+  
+  for (int i=0; i < klass->interface_count; i++)
+    {
+      jclass iface = klass->interfaces[i];
+      if (_Jv_IndexOf (iface, (void **) ifaces->list, ifaces->count) == -1)
+        {
+	  if (ifaces->count + 1 >= ifaces->len)
+	    {
+	      /* Resize ifaces list */
+	      ifaces->len = ifaces->len * 2;
+	      ifaces->list = (jclass *) _Jv_Realloc (ifaces->list, 
+	                     ifaces->len * sizeof(jclass));
+	    }
+	  ifaces->list[ifaces->count] = iface;
+	  ifaces->count++;
+
+	  result += _Jv_GetInterfaces (klass->interfaces[i], ifaces);
+	}
+    }
+    
+  if (klass->isInterface())
+    {
+      result += klass->method_count + 1;
+    }
+  else
+    {
+      if (klass->superclass)
+        {
+	  result += _Jv_GetInterfaces (klass->superclass, ifaces);
+	}
+    }
+  return result;
+}
+
+// Fill out itable in klass, resolving method declarations in each ifaces.
+// itable_offsets is filled out with the position of each iface in itable,
+// such that itable[itable_offsets[n]] == ifaces.list[n].
+void
+_Jv_GenerateITable (jclass klass, _Jv_ifaces *ifaces, jshort *itable_offsets)
+{
+  void **itable = klass->idt->cls.itable;
+  jshort itable_pos = 0;
+
+  for (int i=0; i < ifaces->count; i++)
+    { 
+      jclass iface = ifaces->list[i];
+      itable_offsets[i] = itable_pos;
+      itable_pos = _Jv_AppendPartialITable (klass, iface, itable,
+                   itable_pos);
+      
+      /* Create interface dispatch table for iface */
+      if (iface->idt == NULL)
+	{
+	  iface->idt = 
+	    (_Jv_IDispatchTable *) _Jv_Malloc (sizeof (_Jv_IDispatchTable));
+
+	  // The first element of ioffsets is its length (itself included).
+	  jshort *ioffsets = 
+	    (jshort *) _Jv_Malloc (INITIAL_IOFFSETS_LEN * sizeof (jshort));
+	  ioffsets[0] = INITIAL_IOFFSETS_LEN;
+	  for (int i=1; i < INITIAL_IOFFSETS_LEN; i++)
+	    ioffsets[i] = -1;
+
+	  iface->idt->iface.ioffsets = ioffsets;	    
+	}
+    }
+}
+
+// Format method name for use in error messages.
+jstring
+_Jv_GetMethodString (jclass klass, _Jv_Utf8Const *name)
+{
+  jstring r = JvNewStringUTF (klass->name->data);
+  r = r->concat (JvNewStringUTF ("."));
+  r = r->concat (JvNewStringUTF (name->data));
+  return r;
+}
+
+void 
+_Jv_ThrowNoSuchMethodError ()
+{
+  JvThrow (new java::lang::NoSuchMethodError ());
+}
+
+// Each superinterface of a class (i.e. each interface that the class
+// directly or indirectly implements) has a corresponding "Partial
+// Interface Dispatch Table" whose size is (number of methods + 1) words.
+// The first word is a pointer to the interface (i.e. the java.lang.Class
+// instance for that interface).  The remaining words are pointers to the
+// actual methods that implement the methods declared in the interface,
+// in order of declaration.
+//
+// Append partial interface dispatch table for "iface" to "itable", at
+// position itable_pos.
+// Returns the offset at which the next partial ITable should be appended.
+jshort
+_Jv_AppendPartialITable (jclass klass, jclass iface, void **itable, 
+                         jshort pos)
+{
+  using namespace java::lang::reflect;
+
+  itable[pos++] = (void *) iface;
+  _Jv_Method *meth;
+  
+  for (int j=0; j < iface->method_count; j++)
+    {
+      meth = NULL;
+      for (jclass cl = klass; cl; cl = cl->getSuperclass())
+        {
+	  meth = _Jv_GetMethodLocal (cl, iface->methods[j].name,
+                 iface->methods[j].signature);
+		 
+	  if (meth)
+	    break;
+	}
+
+      if (meth && (meth->name->data[0] == '<'))
+	{
+	  // leave a placeholder in the itable for hidden init methods.
+          itable[pos] = NULL;	
+	}
+      else if (meth)
+        {
+	  if (Modifier::isStatic(meth->accflags))
+	    JvThrow (new java::lang::IncompatibleClassChangeError
+	             (_Jv_GetMethodString (klass, meth->name)));
+	  if (Modifier::isAbstract(meth->accflags))
+	    JvThrow (new java::lang::AbstractMethodError
+	             (_Jv_GetMethodString (klass, meth->name)));
+	  if (! Modifier::isPublic(meth->accflags))
+	    JvThrow (new java::lang::IllegalAccessError
+	             (_Jv_GetMethodString (klass, meth->name)));
+
+	  itable[pos] = meth->ncode;
+	}
+      else
+        {
+	  // The method doesn't exist in klass. Binary compatibility rules
+	  // permit this, so we delay the error until runtime using a pointer
+	  // to a method which throws an exception.
+	  itable[pos] = (void *) _Jv_ThrowNoSuchMethodError;
+	}
+      pos++;
+    }
+    
+  return pos;
+}
+
+static _Jv_Mutex_t iindex_mutex;
+bool iindex_mutex_initialized = false;
+
+// We need to find the correct offset in the Class Interface Dispatch 
+// Table for a given interface. Once we have that, invoking an interface 
+// method just requires combining the Method's index in the interface 
+// (known at compile time) to get the correct method.  Doing a type test 
+// (cast or instanceof) is the same problem: Once we have a possible Partial 
+// Interface Dispatch Table, we just compare the first element to see if it 
+// matches the desired interface. So how can we find the correct offset?  
+// Our solution is to keep a vector of candiate offsets in each interface 
+// (idt->iface.ioffsets), and in each class we have an index 
+// (idt->cls.iindex) used to select the correct offset from ioffsets.
+//
+// Calculate and return iindex for a new class. 
+// ifaces is a vector of num interfaces that the class implements.
+// offsets[j] is the offset in the interface dispatch table for the
+// interface corresponding to ifaces[j].
+// May extend the interface ioffsets if required.
+jshort
+_Jv_FindIIndex (jclass *ifaces, jshort *offsets, jshort num)
+{
+  int i;
+  int j;
+  
+  // Acquire a global lock to prevent itable corruption in case of multiple 
+  // classes that implement an intersecting set of interfaces being linked
+  // simultaneously. We can assume that the mutex will be initialized
+  // single-threaded.
+  if (! iindex_mutex_initialized)
+    {
+      _Jv_MutexInit (&iindex_mutex);
+      iindex_mutex_initialized = true;
+    }
+  
+  _Jv_MutexLock (&iindex_mutex);
+  
+  for (i=1;; i++)  /* each potential position in ioffsets */
+    {
+      for (j=0;; j++)  /* each iface */
+        {
+	  if (j >= num)
+	    goto found;
+	  if (i > ifaces[j]->idt->iface.ioffsets[0])
+	    continue;
+	  int ioffset = ifaces[j]->idt->iface.ioffsets[i];
+	  /* We can potentially share this position with another class. */
+	  if (ioffset >= 0 && ioffset != offsets[j])
+	    break; /* Nope. Try next i. */	  
+	}
+    }
+  found:
+  for (j = 0; j < num; j++)
+    {
+      int len = ifaces[j]->idt->iface.ioffsets[0];
+      if (i >= len) 
+	{
+	  /* Resize ioffsets. */
+	  int newlen = 2 * len;
+	  if (i >= newlen)
+	    newlen = i + 3;
+	  jshort *old_ioffsets = ifaces[j]->idt->iface.ioffsets;
+	  jshort *new_ioffsets = (jshort *) _Jv_Realloc (old_ioffsets, 
+	                                  newlen * sizeof(jshort));	  
+	  new_ioffsets[0] = newlen;
+
+	  while (len < newlen)
+	    new_ioffsets[len++] = -1;
+	  
+	  ifaces[j]->idt->iface.ioffsets = new_ioffsets;
+	}
+      ifaces[j]->idt->iface.ioffsets[i] = offsets[j];
+    }
+
+  _Jv_MutexUnlock (&iindex_mutex);
+
+  return i;
 }
Index: java/lang/Class.h
===================================================================
RCS file: /cvs/java/libgcj/libjava/java/lang/Class.h,v
retrieving revision 1.15
diff -u -r1.15 Class.h
--- Class.h	2000/01/26 23:56:36	1.15
+++ Class.h	2000/02/16 03:38:38
@@ -22,6 +22,10 @@
 extern "C" void _Jv_InitClass (jclass klass);
 extern "C" void _Jv_RegisterClasses (jclass *classes);
 
+// This must be predefined with "C" linkage.
+extern "C" void *_Jv_LookupInterfaceMethodIdx (jclass klass, jclass iface, 
+                                               int meth_idx);
+
 // These are the possible values for the `state' field of the class
 // structure.  Note that ordering is important here.  Whenever the
 // state changes, one should notify all waiters of this class.
@@ -60,13 +64,41 @@
   _Jv_Utf8Const *signature;
   _Jv_ushort accflags;
   void *ncode;
-
   _Jv_Method *getNextMethod ()
   { return this + 1; }
 };
 
+// Interface Dispatch Tables 
+union _Jv_IDispatchTable
+{
+  struct
+  {
+    // Index into interface's ioffsets.
+    jshort iindex;
+    jshort itable_length;
+    // Class Interface dispatch table.
+    void **itable;
+  } cls;
+
+  struct
+  {
+    // Offsets into implementation class itables.
+    jshort *ioffsets;
+  } iface;
+};
+
+// Used by _Jv_GetInterfaces ()
+struct _Jv_ifaces
+{
+  jclass *list;
+  jshort len;
+  jshort count;
+};
+
 #define JV_PRIMITIVE_VTABLE ((_Jv_VTable *) -1)
 
+#define JV_CLASS(Obj) ((jclass) (*(_Jv_VTable **) Obj)->clas)
+
 class java::lang::Class : public java::lang::Object
 {
 public:
@@ -78,11 +110,6 @@
       return loader;
     }
 
-  jclass getComponentType (void)
-    {
-      return isArray () ? (* (jclass *) &methods) : 0;
-    }
-
   java::lang::reflect::Constructor *getConstructor (JArray<jclass> *);
   JArray<java::lang::reflect::Constructor *> *getConstructors (void);
   java::lang::reflect::Constructor *getDeclaredConstructor (JArray<jclass> *);
@@ -112,7 +139,7 @@
   java::lang::reflect::Method *getMethod (jstring, JArray<jclass> *);
   JArray<java::lang::reflect::Method *> *getMethods (void);
 
-  jint getModifiers (void)
+  inline jint getModifiers (void)
     {
       return accflags;
     }
@@ -123,21 +150,26 @@
   java::io::InputStream *getResourceAsStream (jstring resourceName);
   JArray<jobject> *getSigners (void);
 
-  jclass getSuperclass (void)
+  inline jclass getSuperclass (void)
     {
       return superclass;
     }
 
-  jboolean isArray (void)
+  inline jboolean isArray (void)
     {
       return name->data[0] == '[';
     }
 
+  inline jclass getComponentType (void)
+    {
+      return isArray () ? (* (jclass *) &methods) : 0;
+    }
+
   jboolean isAssignableFrom (jclass cls);
   jboolean isInstance (jobject obj);
   jboolean isInterface (void);
-
-  jboolean isPrimitive (void)
+  
+  inline jboolean isPrimitive (void)
     {
       return vtable == JV_PRIMITIVE_VTABLE;
     }
@@ -150,11 +182,12 @@
     {
       return size_in_bytes;
     }
-
+    
   // finalization
   void finalize ();
 
-private:
+private:   
+
   void checkMemberAccess (jint flags);
 
   // Various functions to handle class initialization.
@@ -165,10 +198,19 @@
   // Friend functions implemented in natClass.cc.
   friend _Jv_Method *_Jv_GetMethodLocal (jclass klass, _Jv_Utf8Const *name,
 					 _Jv_Utf8Const *signature);
+  friend jboolean _Jv_IsAssignableFrom(jclass, jclass);
+  friend void *_Jv_LookupInterfaceMethodIdx (jclass klass, jclass iface, 
+					     int method_idx);
+
+  inline friend void 
+  _Jv_InitClass (jclass klass)
+  {
+    if (klass->state != JV_STATE_DONE)
+      klass->initializeClass ();
+  }
+
   friend _Jv_Method* _Jv_LookupDeclaredMethod (jclass, _Jv_Utf8Const *, 
 					       _Jv_Utf8Const*);
-  friend void _Jv_InitClass (jclass klass);
-
   friend jfieldID JvGetFirstInstanceField (jclass);
   friend jint JvNumInstanceFields (jclass);
   friend jfieldID JvGetFirstStaticField (jclass);
@@ -208,6 +250,12 @@
 			      java::lang::ClassLoader *loader);
 
   friend void _Jv_PrepareCompiledClass (jclass);
+  friend void _Jv_PrepareConstantTimeTables (jclass);
+  friend jshort _Jv_GetInterfaces (jclass, _Jv_ifaces *);
+  friend void _Jv_GenerateITable (jclass, _Jv_ifaces *, jshort *);
+  friend jstring _Jv_GetMethodString(jclass, _Jv_Utf8Const *);
+  friend jshort _Jv_AppendPartialITable (jclass, jclass, void **, jshort);
+  friend jshort _Jv_FindIIndex (jclass *, jshort *, jshort);
 
 #ifdef INTERPRETER
   friend jboolean _Jv_IsInterpretedClass (jclass);
@@ -216,6 +264,10 @@
 				       _Jv_Utf8Const*);
   friend void _Jv_InitField (jobject, jclass, int);
   friend _Jv_word _Jv_ResolvePoolEntry (jclass, int);
+  friend _Jv_Method *_Jv_SearchMethodInClass (jclass cls, jclass klass, 
+                        		      _Jv_Utf8Const *method_name, 
+					      _Jv_Utf8Const *method_signature);
+
   friend void _Jv_PrepareClass (jclass);
 
   friend class _Jv_ClassReader;	
@@ -268,6 +320,12 @@
   // The thread which has locked this class.  Used during class
   // initialization.
   java::lang::Thread *thread;
+  // How many levels of "extends" this class is removed from Object.
+  jshort depth;
+  // Vector of this class's superclasses, ordered by decreasing depth.
+  jclass *ancestors;
+  // Interface Dispatch Table.
+  _Jv_IDispatchTable *idt;
 };
 
 #endif /* __JAVA_LANG_CLASS_H__ */
Index: java/lang/natClassLoader.cc
===================================================================
RCS file: /cvs/java/libgcj/libjava/java/lang/natClassLoader.cc,v
retrieving revision 1.17
diff -u -r1.17 natClassLoader.cc
--- natClassLoader.cc	2000/02/10 17:15:22	1.17
+++ natClassLoader.cc	2000/02/16 03:38:39
@@ -512,6 +512,9 @@
   ret->interface_count = 0;
   ret->state = JV_STATE_NOTHING;
   ret->thread = NULL;
+  ret->depth = 0;
+  ret->ancestors = NULL;
+  ret->idt = NULL;
 
   _Jv_RegisterClass (ret);
 
Index: prims.cc
===================================================================
RCS file: /cvs/java/libgcj/libjava/prims.cc,v
retrieving revision 1.20
diff -u -r1.20 prims.cc
--- prims.cc	2000/02/01 06:14:25	1.20
+++ prims.cc	2000/02/16 03:38:40
@@ -42,11 +42,9 @@
 #include <java/lang/ArrayIndexOutOfBoundsException.h>
 #include <java/lang/ArithmeticException.h>
 #include <java/lang/ClassFormatError.h>
-#include <java/lang/ClassCastException.h>
 #include <java/lang/NegativeArraySizeException.h>
 #include <java/lang/NullPointerException.h>
 #include <java/lang/OutOfMemoryError.h>
-#include <java/lang/ArrayStoreException.h>
 #include <java/lang/System.h>
 #include <java/lang/reflect/Modifier.h>
 #include <java/io/PrintStream.h>
@@ -286,31 +284,6 @@
 	   (java::lang::String::valueOf(bad_index)));
 }
 
-void*
-_Jv_CheckCast (jclass c, jobject obj)
-{
-  if (obj != NULL && ! c->isAssignableFrom(obj->getClass()))
-    JvThrow (new java::lang::ClassCastException);
-  return obj;
-}
-
-void
-_Jv_CheckArrayStore (jobject arr, jobject obj)
-{
-  if (obj)
-    {
-      JvAssert (arr != NULL);
-      jclass arr_class = arr->getClass();
-      JvAssert (arr_class->isArray());
-      jclass elt_class = arr_class->getComponentType();
-      jclass obj_class = obj->getClass();
-      if (! elt_class->isAssignableFrom(obj_class))
-	JvThrow (new java::lang::ArrayStoreException);
-    }
-}
-
-
-
 // Allocate some unscanned memory and throw an exception if no memory.
 void *
 _Jv_AllocBytesChecked (jsize size)
@@ -421,54 +394,6 @@
   return arr;
 }
 
-jcharArray
-JvNewCharArray (jint length)
-{
-  return (jcharArray) _Jv_NewPrimArray (JvPrimClass (char), length);
-}
-
-jbooleanArray
-JvNewBooleanArray (jint length)
-{
-  return (jbooleanArray) _Jv_NewPrimArray (JvPrimClass (boolean), length);
-}
-
-jbyteArray
-JvNewByteArray (jint length)
-{
-  return (jbyteArray) _Jv_NewPrimArray (JvPrimClass (byte), length);
-}
-
-jshortArray
-JvNewShortArray (jint length)
-{
-  return (jshortArray) _Jv_NewPrimArray (JvPrimClass (short), length);
-}
-
-jintArray
-JvNewIntArray (jint length)
-{
-  return (jintArray) _Jv_NewPrimArray (JvPrimClass (int), length);
-}
-
-jlongArray
-JvNewLongArray (jint length)
-{
-  return (jlongArray) _Jv_NewPrimArray (JvPrimClass (long), length);
-}
-
-jfloatArray
-JvNewFloatArray (jint length)
-{
-  return (jfloatArray) _Jv_NewPrimArray (JvPrimClass (float), length);
-}
-
-jdoubleArray
-JvNewDoubleArray (jint length)
-{
-  return (jdoubleArray) _Jv_NewPrimArray (JvPrimClass (double), length);
-}
-
 jobject
 _Jv_NewArray (jint type, jint size)
 {
@@ -918,22 +843,33 @@
 
 
 void *
-_Jv_MallocUnchecked (jsize size)
+_Jv_Malloc (jsize size)
 {
   if (size == 0)
     size = 1;
-  return malloc ((size_t) size);
+  void *ptr = malloc ((size_t) size);
+  if (ptr == NULL)
+    JvThrow (no_memory);
+  return ptr;
 }
 
 void *
-_Jv_Malloc (jsize size)
+_Jv_Realloc (void *ptr, jsize size)
 {
   if (size == 0)
     size = 1;
-  void *ptr = malloc ((size_t) size);
+  ptr = realloc (ptr, (size_t) size);
   if (ptr == NULL)
     JvThrow (no_memory);
   return ptr;
+}
+
+void *
+_Jv_MallocUnchecked (jsize size)
+{
+  if (size == 0)
+    size = 1;
+  return malloc ((size_t) size);
 }
 
 void
Index: gcj/cni.h
===================================================================
RCS file: /cvs/java/libgcj/libjava/gcj/cni.h,v
retrieving revision 1.3
diff -u -r1.3 cni.h
--- cni.h	2000/01/19 18:39:23	1.3
+++ cni.h	2000/02/16 03:38:40
@@ -93,11 +93,6 @@
   return _Jv_NewStringUTF (bytes);
 }
 
-extern class _Jv_PrimClass _Jv_byteClass, _Jv_shortClass, _Jv_intClass,
-  _Jv_longClass, _Jv_booleanClass, _Jv_charClass, _Jv_floatClass,
-  _Jv_doubleClass, _Jv_voidClass;
-#define JvPrimClass(TYPE) ((jclass) & _Jv_##TYPE##Class)
-
 class JvSynchronize
 {
 private:
Index: gcj/array.h
===================================================================
RCS file: /cvs/java/libgcj/libjava/gcj/array.h,v
retrieving revision 1.5
diff -u -r1.5 array.h
--- array.h	2000/01/26 00:55:49	1.5
+++ array.h	2000/02/16 03:38:40
@@ -55,18 +55,68 @@
 typedef JArray<jdouble> *jdoubleArray;
 typedef JArray<jstring> *jstringArray;
 
-extern "C" jbooleanArray JvNewBooleanArray (jint length);
-extern "C" jbyteArray JvNewByteArray (jint length);
-extern "C" jcharArray JvNewCharArray (jint length);
-extern "C" jshortArray JvNewShortArray (jint length);
-extern "C" jintArray JvNewIntArray (jint length);
-extern "C" jlongArray JvNewLongArray (jint length);
-extern "C" jfloatArray JvNewFloatArray (jint length);
-extern "C" jdoubleArray JvNewDoubleArray (jint length);
+extern class _Jv_PrimClass _Jv_byteClass, _Jv_shortClass, _Jv_intClass,
+  _Jv_longClass, _Jv_booleanClass, _Jv_charClass, _Jv_floatClass,
+  _Jv_doubleClass, _Jv_voidClass;
+#define JvPrimClass(TYPE) ((jclass) & _Jv_##TYPE##Class)
+
 extern "C" jobjectArray _Jv_NewObjectArray(jsize length, jclass, jobject init);
+extern "C" jobject _Jv_NewPrimArray (jclass eltype, jint count);
+
+extern inline jobjectArray 
+JvNewObjectArray (jsize length, jclass cls, jobject init)
+{ 
+  return _Jv_NewObjectArray (length, cls, init); 
+}
+
+extern inline jcharArray 
+JvNewCharArray (jint length)
+{
+  return (jcharArray) _Jv_NewPrimArray (JvPrimClass (char), length);
+}
+
+extern inline jbooleanArray 
+JvNewBooleanArray (jint length)
+{
+  return (jbooleanArray) _Jv_NewPrimArray (JvPrimClass (boolean), length);
+}
+
+extern inline jbyteArray 
+JvNewByteArray (jint length)
+{
+  return (jbyteArray) _Jv_NewPrimArray (JvPrimClass (byte), length);
+}
+
+extern inline jshortArray 
+JvNewShortArray (jint length)
+{
+  return (jshortArray) _Jv_NewPrimArray (JvPrimClass (short), length);
+}
+
+extern inline jintArray 
+JvNewIntArray (jint length)
+{
+  return (jintArray) _Jv_NewPrimArray (JvPrimClass (int), length);
+}
+
+extern inline jlongArray 
+JvNewLongArray (jint length)
+{
+  return (jlongArray) _Jv_NewPrimArray (JvPrimClass (long), length);
+}
+
+extern inline jfloatArray 
+JvNewFloatArray (jint length)
+{
+  return (jfloatArray) _Jv_NewPrimArray (JvPrimClass (float), length);
+}
+
+extern inline jdoubleArray 
+JvNewDoubleArray (jint length)
+{
+  return (jdoubleArray) _Jv_NewPrimArray (JvPrimClass (double), length);
+}
 
-inline jobjectArray JvNewObjectArray (jsize length, jclass cls, jobject init)
-{ return _Jv_NewObjectArray (length, cls, init); }
 
 extern "C" jstringArray JvConvertArgv(int argc, const char **argv);
 
Index: gcj/javaprims.h
===================================================================
RCS file: /cvs/java/libgcj/libjava/gcj/javaprims.h,v
retrieving revision 1.4
diff -u -r1.4 javaprims.h
--- javaprims.h	2000/01/19 18:39:24	1.4
+++ javaprims.h	2000/02/16 03:38:41
@@ -273,6 +273,7 @@
 extern "C" void _Jv_Throw (void *) __attribute__ ((__noreturn__));
 extern "C" void _Jv_Sjlj_Throw (void *) __attribute__ ((__noreturn__));
 extern "C" void* _Jv_Malloc (jsize) __attribute__((__malloc__));
+extern "C" void* _Jv_Realloc (void *, jsize);
 extern "C" void _Jv_Free (void*);
 
 typedef unsigned short _Jv_ushort __attribute__((__mode__(__HI__)));
Index: include/jvm.h
===================================================================
RCS file: /cvs/java/libgcj/libjava/include/jvm.h,v
retrieving revision 1.16
diff -u -r1.16 jvm.h
--- jvm.h	2000/02/10 20:31:48	1.16
+++ jvm.h	2000/02/16 03:38:42
@@ -156,7 +156,9 @@
   __attribute__((__malloc__));
 extern "C" void *_Jv_CheckCast (jclass klass, jobject obj);
 extern "C" void *_Jv_LookupInterfaceMethod (jclass klass, Utf8Const *name,
-					    Utf8Const *signature);
+                                           Utf8Const *signature);
+extern "C" void *_Jv_LookupInterfaceMethodIdx (jclass klass, jclass iface, 
+                                               int meth_idx);
 extern "C" void _Jv_CheckArrayStore (jobject array, jobject obj);
 extern "C" void _Jv_RegisterClass (jclass klass);
 extern "C" void _Jv_RegisterClasses (jclass *classes);

--------------36A75D6AA0BEA0D67653EC92--

From java-patches-return-483-listarch-java-patches=sourceware.cygnus.com@sourceware.cygnus.com Wed Feb 16 04:04:47 2000
Return-Path: <java-patches-return-483-listarch-java-patches=sourceware.cygnus.com@sourceware.cygnus.com>
Delivered-To: listarch-java-patches@sourceware.cygnus.com
Received: (qmail 14702 invoked by alias); 16 Feb 2000 04:04:40 -0000
Mailing-List: contact java-patches-help@sourceware.cygnus.com; run by ezmlm
Precedence: bulk
List-Subscribe: <mailto:java-patches-subscribe@sourceware.cygnus.com>
List-Archive: <http://sourceware.cygnus.com/ml/java-patches/>
List-Post: <mailto:java-patches@sourceware.cygnus.com>
List-Help: <mailto:java-patches-help@sourceware.cygnus.com>, <http://sourceware.cygnus.com/ml/#faqs>
Sender: java-patches-owner@sourceware.cygnus.com
Delivered-To: mailing list java-patches@sourceware.cygnus.com
Received: (qmail 14513 invoked from network); 16 Feb 2000 04:04:15 -0000
Message-ID: <38AA225B.BD52EDEE@albatross.co.nz>
Date: Wed, 16 Feb 2000 17:06:51 +1300
From: Bryce McKinlay <bryce@albatross.co.nz>
X-Mailer: Mozilla 4.7 [en] (X11; U; Linux 2.3.25 i686)
X-Accept-Language: en
MIME-Version: 1.0
To: java-patches@sourceware.cygnus.com
Subject: Patch: Interpreter and InvokeInterface
Content-Type: multipart/mixed;
 boundary="------------81199E3A3BC6BC715DDC1B02"

This is a multi-part message in MIME format.
--------------81199E3A3BC6BC715DDC1B02
Content-Type: text/plain; charset=us-ascii
Content-Transfer-Encoding: 7bit

2000-02-16  Bryce McKinlay  <bryce@albatross.co.nz>

        * resolve.cc (_Jv_SearchMethodInClass): New function.
        (_Jv_ResolvePoolEntry): Search superinterfaces for interface methods.
        * java/lang/Class.h (_Jv_SearchMethodInClass): New prototype.


This fixes a bug in the interpreter that can occur when running bytecode from
Jikes and "new" Javac. It fails to search for interface method definitions in
superinterfaces of the interface containing the invoked method. (This is the
same problem as gcj/72). I fixed this by reusing code (_Jv_GetInterfaces) from
the interface lookup patch, which returns a list of all unique superinterfaces
of a given interface.

  [ bryce ]



--------------81199E3A3BC6BC715DDC1B02
Content-Type: text/plain; charset=us-ascii;
 name="interpreter-interface.patch"
Content-Transfer-Encoding: 7bit
Content-Disposition: inline;
 filename="interpreter-interface.patch"

Index: resolve.cc
===================================================================
RCS file: /cvs/java/libgcj/libjava/resolve.cc,v
retrieving revision 1.14
diff -u -r1.14 resolve.cc
--- resolve.cc	2000/02/16 00:07:33	1.14
+++ resolve.cc	2000/02/16 04:03:16
@@ -24,6 +24,7 @@
 #include <java/lang/InternalError.h>
 #include <java/lang/VirtualMachineError.h>
 #include <java/lang/NoSuchFieldError.h>
+#include <java/lang/NoSuchMethodError.h>
 #include <java/lang/ClassFormatError.h>
 #include <java/lang/IllegalAccessError.h>
 #include <java/lang/AbstractMethodError.h>
@@ -230,59 +231,78 @@
       _Jv_Method *the_method = 0;
       jclass found_class = 0;
 
-      // we make a loop here, because methods are allowed to be moved to
-      // a super class, and still be visible.. (binary compatibility).
+      // First search the class itself.
+      the_method = _Jv_SearchMethodInClass (owner, klass, 
+	           method_name, method_signature);
+
+      if (the_method != 0)
+        {
+	  found_class = owner;
+          goto end_of_method_search;
+	}
 
-      for (jclass cls = owner; cls != 0; cls = cls->getSuperclass ())
-	{
-	  for (int i = 0;  i < cls->method_count;  i++)
+      // If we are resolving an interface method, search the interface's 
+      // superinterfaces (A superinterface is not an interface's superclass - 
+      // a superinterface is implemented by the interface).
+      if (pool->tags[index] == JV_CONSTANT_InterfaceMethodref)
+        {
+	  _Jv_ifaces ifaces;
+	  ifaces.count = 0;
+	  ifaces.len = 4;
+	  ifaces.list = (jclass *) _Jv_Malloc (ifaces.len * sizeof (jclass *));
+
+	  _Jv_GetInterfaces (owner, &ifaces);	  
+          
+	  for (int i=0; i < ifaces.count; i++)
 	    {
-	      _Jv_Method *method = &cls->methods[i];
-	      if (   (!_Jv_equalUtf8Consts (method->name,
-					    method_name))
-		  || (!_Jv_equalUtf8Consts (method->signature,
-					    method_signature)))
-		continue;
-
-	      if (cls == klass 
-		  || ((method->accflags & Modifier::PUBLIC) != 0)
-		  || (((method->accflags & Modifier::PROTECTED) != 0)
-		      && cls->isAssignableFrom (klass))
-		  || (((method->accflags & Modifier::PRIVATE) == 0)
-		      && _Jv_ClassNameSamePackage (cls->name,
-						   klass->name)))
-		{
-		  // FIXME: if (cls->loader != klass->loader), then we
-		  // must actually check that the types of arguments
-		  // correspond.  That is, for each argument type, and
-		  // the return type, doing _Jv_FindClassFromSignature
-		  // with either loader should produce the same result,
-		  // i.e., exactly the same jclass object. JVMS 5.4.3.3
-
-		  the_method = method;
+	      jclass cls = ifaces.list[i];
+	      the_method = _Jv_SearchMethodInClass (cls, klass, method_name, 
+	                                            method_signature);
+	      if (the_method != 0)
+	        {
 		  found_class = cls;
-
-		  
-		  if (pool->tags[index] == JV_CONSTANT_InterfaceMethodref)
-		    vtable_index = -1;
-		  else
-		    vtable_index = _Jv_DetermineVTableIndex
-		      (cls, method_name, method_signature);
-
-		  if (vtable_index == 0)
-		    throw_incompatible_class_change_error
-		      (JvNewStringLatin1 ("method not found"));
-
-		  goto end_of_method_search;
+                  break;
 		}
-	      else
-		{
-		  JvThrow (new java::lang::IllegalAccessError);
-		}
 	    }
+	  
+	  _Jv_Free (ifaces.list);
+	  
+	  if (the_method != 0)
+	    goto end_of_method_search;
 	}
 
+      // Finally, search superclasses. 
+      for (jclass cls = owner->getSuperclass (); cls != 0; 
+           cls = cls->getSuperclass ())
+	{
+	  the_method = _Jv_SearchMethodInClass (cls, klass, 
+	               method_name, method_signature);
+          if (the_method != 0)
+	    {
+	      found_class = cls;
+	      break;
+	    }
+	}
+
     end_of_method_search:
+    
+      // FIXME: if (cls->loader != klass->loader), then we
+      // must actually check that the types of arguments
+      // correspond.  That is, for each argument type, and
+      // the return type, doing _Jv_FindClassFromSignature
+      // with either loader should produce the same result,
+      // i.e., exactly the same jclass object. JVMS 5.4.3.3    
+    
+      if (pool->tags[index] == JV_CONSTANT_InterfaceMethodref)
+	vtable_index = -1;
+      else
+	vtable_index = _Jv_DetermineVTableIndex
+	  (found_class, method_name, method_signature);
+
+      if (vtable_index == 0)
+	throw_incompatible_class_change_error
+	  (JvNewStringLatin1 ("method not found"));
+
       if (the_method == 0)
 	{
 	  jstring msg = JvNewStringLatin1 ("method ");
@@ -290,7 +310,7 @@
 	  msg = msg->concat (JvNewStringLatin1("."));
 	  msg = msg->concat (_Jv_NewStringUTF (method_name->data));
 	  msg = msg->concat (JvNewStringLatin1(" was not found."));
-	  JvThrow(new java::lang::NoSuchFieldError (msg));
+	  JvThrow(new java::lang::NoSuchMethodError (msg));
 	}
       
       pool->data[index].rmethod = 
@@ -307,6 +327,41 @@
   return pool->data[index];
 }
 
+// Find a method declared in the cls that is referenced from klass and
+// perform access checks.
+_Jv_Method *
+_Jv_SearchMethodInClass (jclass cls, jclass klass, 
+                         _Jv_Utf8Const *method_name, 
+			 _Jv_Utf8Const *method_signature)
+{
+  using namespace java::lang::reflect;
+
+  for (int i = 0;  i < cls->method_count;  i++)
+    {
+      _Jv_Method *method = &cls->methods[i];
+      if (   (!_Jv_equalUtf8Consts (method->name,
+				    method_name))
+	  || (!_Jv_equalUtf8Consts (method->signature,
+				    method_signature)))
+	continue;
+
+      if (cls == klass 
+	  || ((method->accflags & Modifier::PUBLIC) != 0)
+	  || (((method->accflags & Modifier::PROTECTED) != 0)
+	      && cls->isAssignableFrom (klass))
+	  || (((method->accflags & Modifier::PRIVATE) == 0)
+	      && _Jv_ClassNameSamePackage (cls->name,
+					   klass->name)))
+	{
+	  return method;
+	}
+      else
+	{
+	  JvThrow (new java::lang::IllegalAccessError);
+	}
+    }
+  return 0;
+}
 
 void
 _Jv_ResolveField (_Jv_Field *field, java::lang::ClassLoader *loader)

--------------81199E3A3BC6BC715DDC1B02--

From java-patches-return-484-listarch-java-patches=sourceware.cygnus.com@sourceware.cygnus.com Wed Feb 16 04:13:44 2000
Return-Path: <java-patches-return-484-listarch-java-patches=sourceware.cygnus.com@sourceware.cygnus.com>
Delivered-To: listarch-java-patches@sourceware.cygnus.com
Received: (qmail 19560 invoked by alias); 16 Feb 2000 04:13:42 -0000
Mailing-List: contact java-patches-help@sourceware.cygnus.com; run by ezmlm
Precedence: bulk
List-Subscribe: <mailto:java-patches-subscribe@sourceware.cygnus.com>
List-Archive: <http://sourceware.cygnus.com/ml/java-patches/>
List-Post: <mailto:java-patches@sourceware.cygnus.com>
List-Help: <mailto:java-patches-help@sourceware.cygnus.com>, <http://sourceware.cygnus.com/ml/#faqs>
Sender: java-patches-owner@sourceware.cygnus.com
Delivered-To: mailing list java-patches@sourceware.cygnus.com
Received: (qmail 19462 invoked from network); 16 Feb 2000 04:13:35 -0000
Message-ID: <38AA248D.B12C1609@albatross.co.nz>
Date: Wed, 16 Feb 2000 17:16:13 +1300
From: Bryce McKinlay <bryce@albatross.co.nz>
X-Mailer: Mozilla 4.7 [en] (X11; U; Linux 2.3.25 i686)
X-Accept-Language: en
MIME-Version: 1.0
To: java-patches@sourceware.cygnus.com
Subject: Interface method regression test
Content-Type: multipart/mixed;
 boundary="------------A72332BA1912754F5C78AF9C"

This is a multi-part message in MIME format.
--------------A72332BA1912754F5C78AF9C
Content-Type: text/plain; charset=us-ascii
Content-Transfer-Encoding: 7bit

This is a regression test I wrote to check the new interface method lookup code.
It might be nice to add it to the test suite, but I'm not sure exactly where/how
it should go in. Its an output based test but its complicated because it
consists of multiple .java files.

  [ bryce ]


--------------A72332BA1912754F5C78AF9C
Content-Type: text/plain; charset=us-ascii;
 name="CA.java"
Content-Transfer-Encoding: 7bit
Content-Disposition: inline;
 filename="CA.java"

public class CA
{
  String a()
  {
    return "CA a()";
  }
}

--------------A72332BA1912754F5C78AF9C
Content-Type: text/plain; charset=us-ascii;
 name="CB.java"
Content-Transfer-Encoding: 7bit
Content-Disposition: inline;
 filename="CB.java"

public class CB implements IB
{
  public String a()
  {
    return "CB a()";
  }
  
  public String b()
  {
    return "CB b()";  
  }
}

--------------A72332BA1912754F5C78AF9C
Content-Type: text/plain; charset=us-ascii;
 name="CC.java"
Content-Transfer-Encoding: 7bit
Content-Disposition: inline;
 filename="CC.java"

public class CC extends CB
{
  public int d()
  {
    return 99;
  }
}

--------------A72332BA1912754F5C78AF9C
Content-Type: text/plain; charset=us-ascii;
 name="CD.java"
Content-Transfer-Encoding: 7bit
Content-Disposition: inline;
 filename="CD.java"

public class CD extends CC implements IC
{
  public String a()
  {
    return "CD a()";
  }
  
  public void c()
  {
    System.out.println("CD c()");
  }
  
  public int d()
  {
    return 6;
  }
  
  public IB e(int i)
  {
    if (i == 1)
      return new CB();
    else
      return new CD();
  }
}

--------------A72332BA1912754F5C78AF9C
Content-Type: text/plain; charset=us-ascii;
 name="CE.java"
Content-Transfer-Encoding: 7bit
Content-Disposition: inline;
 filename="CE.java"

public class CE extends CB implements IB, ID
{
  public String a()
  {
    return ("CE a()");
  }
  
  public String b()
  {
    return ("CE b()");
  }
    
  public String z()
  {
    return("CE z()");  
  }
}

--------------A72332BA1912754F5C78AF9C
Content-Type: text/plain; charset=us-ascii;
 name="IA.java"
Content-Transfer-Encoding: 7bit
Content-Disposition: inline;
 filename="IA.java"

public interface IA
{
  String a();
}

--------------A72332BA1912754F5C78AF9C
Content-Type: text/plain; charset=us-ascii;
 name="IB.java"
Content-Transfer-Encoding: 7bit
Content-Disposition: inline;
 filename="IB.java"

public interface IB extends IA
{
  String b();
}

--------------A72332BA1912754F5C78AF9C
Content-Type: text/plain; charset=us-ascii;
 name="IC.java"
Content-Transfer-Encoding: 7bit
Content-Disposition: inline;
 filename="IC.java"

public interface IC extends IB
{
  void c();
  int d();
  IB e(int i);
}

--------------A72332BA1912754F5C78AF9C
Content-Type: text/plain; charset=us-ascii;
 name="ID.java"
Content-Transfer-Encoding: 7bit
Content-Disposition: inline;
 filename="ID.java"

public interface ID
{
  String z();
  String a();  
}

--------------A72332BA1912754F5C78AF9C
Content-Type: text/plain; charset=us-ascii;
 name="Test.java"
Content-Transfer-Encoding: 7bit
Content-Disposition: inline;
 filename="Test.java"

public class Test
{
  public static void main(String args[])
  {
    new Test();
  }
  
  public Test()
  {
    /* _Jv_InstanceOf */
    
    /* Object instanceof CLASS */
    Object obj = new CA();
    
    if (obj instanceof CA)
      {
        System.out.println ("ok 1");
      }
    else
      {
        System.out.println ("FAIL 1");
      }

    obj = new CD();
    
    if (!(obj instanceof CA))
      {
        System.out.println ("ok 2a");
      }
    else
      {
        System.out.println ("FAIL 2a");
      }

    if (obj instanceof CB)
      {
        System.out.println ("ok 2b");
      }
    else
      {
        System.out.println ("FAIL 2b");
      }

    
    /* Object instanceof INTERFACE */
    obj = new CB();
    
    if (!(obj instanceof IC))
      {
        System.out.println("ok 3");
      }
    else
      {
        System.out.println ("FAIL 3");
      }
    
    if (obj instanceof IB)
      {
        System.out.println("ok 4");
      }
    else
      {
        System.out.println ("FAIL 4");
      }
    
    /* InterfaceRef instanceof INTERFACE */
    
    IA ia = new CB();
    
    if (ia instanceof IB)
      {
        System.out.println("ok 5");
      }
    else
      {
        System.out.println ("FAIL 5");
      }
    
    
    if (!(ia instanceof IC))
      {
        System.out.println("ok 6");
      }
    else
      {
        System.out.println ("FAIL 6");
      }
      
    /* InterfaceRef instanceof CLASS */
    
    if (ia instanceof CB)
      {
        System.out.println("ok 7");
      }
    else
      {
        System.out.println ("FAIL 7");
      }
      
    
    if (!(ia instanceof CD))
      {
        System.out.println("ok 8");
      }
    else
      {
        System.out.println ("FAIL 8");
      }    
    
    
    /* _Jv_CheckCast */
    Object obj_ca = new CA();
    Object obj_cc = new CC();    
    
    IA ia2;
    
    try
      {
        ia2 = (IA) obj_cc;
	System.out.println("ok 9");
      }
    catch (ClassCastException x)
      {
        System.out.println("FAIL 9");
      }
    
    CD cd;
    
    try
      {
	cd = (CD) obj_ca;
	System.out.println("FAIL 10");
      }
    catch (ClassCastException x)
      {
        System.out.println("ok 10");
      }
    
    IA ia3;
    
    try
      {
	ia3 = (IB) obj_ca;
	System.out.println("FAIL 11");
      }
    catch (ClassCastException x)
      {
        System.out.println("ok 11");
      }
      
    /* _Jv_LookupInterfaceMethod */
    Object obj_cb = new CB();
    
    IB ib = (IB) obj_cb;
    ib.b();
    if (ib.a().equalsIgnoreCase("CB a()"))
      System.out.println("ok 12");
    else
      System.out.println("FAIL 12");
      
    IC ic = new CD();
    if (ic.a().equalsIgnoreCase("CD a()"))
      System.out.println("ok 13");
    else
      System.out.println("FAIL 13");
          
    if (ic.d() == 6)
      System.out.println("ok 14");
    else
      System.out.println("FAIL 14");
      
    Object ce = new CE();
    
    ib = (IB) ce;
    ID id = (ID) ce;
    
    if (ib.b().equals("CE b()") && id.a().equals("CE a()"))
      System.out.println("ok 15");
    else
      System.out.println("FAIL 15");
    
    String t = ((ID)ce).z();
    
    if (t.equalsIgnoreCase("CE z()"))
      System.out.println("ok 16");
    else
      System.out.println("FAIL 16");
      
    /* Array types */
    
    Object[] obj_a = new CC[10];
    try
      {
	CB[] ca_a = (CB[]) obj_a;
	System.out.println("ok 17");
      }
    catch (ClassCastException x)
      {
        System.out.println("FAIL 17");
      }
    
    if (obj_a instanceof IB[])
      {
	System.out.println("ok 18");      
      }
    else
      {
        System.out.println("FAIL 18");      
      }
    
    IB[] ib_a = new CD[5];
    try 
      {
	CD[] cd_a = (CD[]) ib_a;
        System.out.println("ok 19");
      }
    catch (ClassCastException x)
      {
        System.out.println("FAIL 19");
      }
      
    CA[] ca_a;

    try 
      {
	ca_a = (CA[]) ib_a;
        System.out.println("FAIL 20");
      }
    catch (ClassCastException x)
      {
        System.out.println("ok 20");
      }

    
    /* Primitive types */
    
    short[] short_a = new short[100];
    
    try
      {
        obj = short_a;
        System.out.println("ok 21");
      }
    catch (ClassCastException x)
      {
        System.out.println("FAIL 21");      
      }

    try
      {
        short[] short_b = (short[]) obj;
        System.out.println("ok 22");
      }
    catch (ClassCastException x)
      {
        System.out.println("FAIL 22");      
      }

    int[] short_b;

    try
      {
        short_b = (int[]) obj;
        System.out.println("FAIL 23");
      }
    catch (ClassCastException x)
      {
        System.out.println("ok 23");      
      }

    Object obj1 = new int[25];
    
    if (obj1 instanceof short[])
      {
        System.out.println("FAIL 24");      
      }
    else
      {
        System.out.println("ok 24");
      }
    
    if (obj1 instanceof int[])
      {
        System.out.println("ok 25");
      }
    else
      {
        System.out.println("FAIL 25");
      }
      
    /* null assignment */
    
    CA obj_ca2 = null;
    
    if (obj_ca2 instanceof CA)
      {
        System.out.println("FAIL 26");        
      }
    else
      {
        System.out.println("ok 26");
      }
  }  
}

--------------A72332BA1912754F5C78AF9C--

From java-patches-return-485-listarch-java-patches=sourceware.cygnus.com@sourceware.cygnus.com Wed Feb 16 04:20:53 2000
Return-Path: <java-patches-return-485-listarch-java-patches=sourceware.cygnus.com@sourceware.cygnus.com>
Delivered-To: listarch-java-patches@sourceware.cygnus.com
Received: (qmail 24642 invoked by alias); 16 Feb 2000 04:20:53 -0000
Mailing-List: contact java-patches-help@sourceware.cygnus.com; run by ezmlm
Precedence: bulk
List-Subscribe: <mailto:java-patches-subscribe@sourceware.cygnus.com>
List-Archive: <http://sourceware.cygnus.com/ml/java-patches/>
List-Post: <mailto:java-patches@sourceware.cygnus.com>
List-Help: <mailto:java-patches-help@sourceware.cygnus.com>, <http://sourceware.cygnus.com/ml/#faqs>
Sender: java-patches-owner@sourceware.cygnus.com
Delivered-To: mailing list java-patches@sourceware.cygnus.com
Received: (qmail 24589 invoked from network); 16 Feb 2000 04:20:52 -0000
Date: Tue, 15 Feb 2000 20:20:47 -0800 (PST)
Message-Id: <200002160420.UAA16890@ferrule.cygnus.com>
From: Tom Tromey <tromey@cygnus.com>
To: Bryce McKinlay <bryce@albatross.co.nz>
Cc: java-patches@sourceware.cygnus.com
Subject: Re: Interface method regression test
In-Reply-To: <38AA248D.B12C1609@albatross.co.nz>
References: <38AA248D.B12C1609@albatross.co.nz>
X-Zippy:  Yow!  I'm having a quadraphonic sensation of two winos
 alone in a steel mill!
X-Attribution:  Tom

Bryce> This is a regression test I wrote to check the new interface
Bryce> method lookup code.  It might be nice to add it to the test
Bryce> suite, but I'm not sure exactly where/how it should go in. Its
Bryce> an output based test but its complicated because it consists of
Bryce> multiple .java files.

I'd definitely like to get it into the test suite.

Could we change it so that all the classes are in a single file?
IE by making most of them not be public?

That would let us drop it in relatively easily.

Tom

From java-patches-return-486-listarch-java-patches=sourceware.cygnus.com@sourceware.cygnus.com Wed Feb 16 04:45:58 2000
Return-Path: <java-patches-return-486-listarch-java-patches=sourceware.cygnus.com@sourceware.cygnus.com>
Delivered-To: listarch-java-patches@sourceware.cygnus.com
Received: (qmail 29546 invoked by alias); 16 Feb 2000 04:45:58 -0000
Mailing-List: contact java-patches-help@sourceware.cygnus.com; run by ezmlm
Precedence: bulk
List-Subscribe: <mailto:java-patches-subscribe@sourceware.cygnus.com>
List-Archive: <http://sourceware.cygnus.com/ml/java-patches/>
List-Post: <mailto:java-patches@sourceware.cygnus.com>
List-Help: <mailto:java-patches-help@sourceware.cygnus.com>, <http://sourceware.cygnus.com/ml/#faqs>
Sender: java-patches-owner@sourceware.cygnus.com
Delivered-To: mailing list java-patches@sourceware.cygnus.com
Received: (qmail 29521 invoked from network); 16 Feb 2000 04:45:57 -0000
Date: Tue, 15 Feb 2000 20:45:52 -0800 (PST)
Message-Id: <200002160445.UAA16913@ferrule.cygnus.com>
From: Tom Tromey <tromey@cygnus.com>
To: Bryce McKinlay <bryce@albatross.co.nz>
Cc: java-patches@sourceware.cygnus.com
Subject: Re: Patch: New interface lookup, and inlining, Take 2
In-Reply-To: <38AA2075.85A1DFA1@albatross.co.nz>
References: <38AA2075.85A1DFA1@albatross.co.nz>
X-Zippy:  I hope the ``Eurythmics'' practice birth control...
X-Attribution:  Tom

Bryce> An added benefit is backwards compatibility with the current
Bryce> compiler - patched and unpatched compilers should continue to
Bryce> work with this code.

Bryce> I'm still waiting for the FSF to process my copyright
Bryce> assignment form for the compiler patches, but I think that this
Bryce> stuff can be committed now?

I'd really like to get this code in.
But doesn't changing the size of Class in libgcj but not in gcj cause
problems?  It seems to me that the new code could overwrite whatever
happens to be just after gcj-generated Class objects.

Tom

From java-patches-return-487-listarch-java-patches=sourceware.cygnus.com@sourceware.cygnus.com Wed Feb 16 04:49:10 2000
Return-Path: <java-patches-return-487-listarch-java-patches=sourceware.cygnus.com@sourceware.cygnus.com>
Delivered-To: listarch-java-patches@sourceware.cygnus.com
Received: (qmail 9894 invoked by alias); 16 Feb 2000 04:49:10 -0000
Mailing-List: contact java-patches-help@sourceware.cygnus.com; run by ezmlm
Precedence: bulk
List-Subscribe: <mailto:java-patches-subscribe@sourceware.cygnus.com>
List-Archive: <http://sourceware.cygnus.com/ml/java-patches/>
List-Post: <mailto:java-patches@sourceware.cygnus.com>
List-Help: <mailto:java-patches-help@sourceware.cygnus.com>, <http://sourceware.cygnus.com/ml/#faqs>
Sender: java-patches-owner@sourceware.cygnus.com
Delivered-To: mailing list java-patches@sourceware.cygnus.com
Received: (qmail 9875 invoked from network); 16 Feb 2000 04:49:09 -0000
Message-ID: <38AA2CE2.BF384BB7@albatross.co.nz>
Date: Wed, 16 Feb 2000 17:51:46 +1300
From: Bryce McKinlay <bryce@albatross.co.nz>
X-Mailer: Mozilla 4.7 [en] (X11; U; Linux 2.3.25 i686)
X-Accept-Language: en
MIME-Version: 1.0
To: Tom Tromey <tromey@cygnus.com>
CC: java-patches@sourceware.cygnus.com
Subject: Re: Patch: New interface lookup, and inlining, Take 2
References: <38AA2075.85A1DFA1@albatross.co.nz> <200002160445.UAA16913@ferrule.cygnus.com>
Content-Type: text/plain; charset=us-ascii
Content-Transfer-Encoding: 7bit

Tom Tromey wrote:

> I'd really like to get this code in.
> But doesn't changing the size of Class in libgcj but not in gcj cause
> problems?  It seems to me that the new code could overwrite whatever
> happens to be just after gcj-generated Class objects.

Good point. I must admit I didn't actually try it ;-)

regards

  [ bryce ]


From java-patches-return-488-listarch-java-patches=sourceware.cygnus.com@sourceware.cygnus.com Wed Feb 16 05:15:07 2000
Return-Path: <java-patches-return-488-listarch-java-patches=sourceware.cygnus.com@sourceware.cygnus.com>
Delivered-To: listarch-java-patches@sourceware.cygnus.com
Received: (qmail 13773 invoked by alias); 16 Feb 2000 05:15:06 -0000
Mailing-List: contact java-patches-help@sourceware.cygnus.com; run by ezmlm
Precedence: bulk
List-Subscribe: <mailto:java-patches-subscribe@sourceware.cygnus.com>
List-Archive: <http://sourceware.cygnus.com/ml/java-patches/>
List-Post: <mailto:java-patches@sourceware.cygnus.com>
List-Help: <mailto:java-patches-help@sourceware.cygnus.com>, <http://sourceware.cygnus.com/ml/#faqs>
Sender: java-patches-owner@sourceware.cygnus.com
Delivered-To: mailing list java-patches@sourceware.cygnus.com
Received: (qmail 13753 invoked from network); 16 Feb 2000 05:15:04 -0000
Message-ID: <38AA32F6.5F61389@albatross.co.nz>
Date: Wed, 16 Feb 2000 18:17:42 +1300
From: Bryce McKinlay <bryce@albatross.co.nz>
X-Mailer: Mozilla 4.7 [en] (X11; U; Linux 2.3.25 i686)
X-Accept-Language: en
MIME-Version: 1.0
To: Tom Tromey <tromey@cygnus.com>
CC: java-patches@sourceware.cygnus.com
Subject: Re: Interface method regression test
References: <38AA248D.B12C1609@albatross.co.nz> <200002160420.UAA16890@ferrule.cygnus.com>
Content-Type: text/plain; charset=us-ascii
Content-Transfer-Encoding: 7bit

Tom Tromey wrote:

> I'd definitely like to get it into the test suite.
>
> Could we change it so that all the classes are in a single file?
> IE by making most of them not be public?
>
> That would let us drop it in relatively easily.

Good idea. I checked it in this way.

2000-02-16  Bryce McKinlay  <bryce@albatross.co.nz>

        * libjava.lang/InterfaceDispatch.java: New file.
        * libjava.lang/InterfaceDispatch.out: New file.

  [ bryce ]


From java-patches-return-489-listarch-java-patches=sourceware.cygnus.com@sourceware.cygnus.com Wed Feb 16 05:23:20 2000
Return-Path: <java-patches-return-489-listarch-java-patches=sourceware.cygnus.com@sourceware.cygnus.com>
Delivered-To: listarch-java-patches@sourceware.cygnus.com
Received: (qmail 25535 invoked by alias); 16 Feb 2000 05:23:20 -0000
Mailing-List: contact java-patches-help@sourceware.cygnus.com; run by ezmlm
Precedence: bulk
List-Subscribe: <mailto:java-patches-subscribe@sourceware.cygnus.com>
List-Archive: <http://sourceware.cygnus.com/ml/java-patches/>
List-Post: <mailto:java-patches@sourceware.cygnus.com>
List-Help: <mailto:java-patches-help@sourceware.cygnus.com>, <http://sourceware.cygnus.com/ml/#faqs>
Sender: java-patches-owner@sourceware.cygnus.com
Delivered-To: mailing list java-patches@sourceware.cygnus.com
Received: (qmail 25509 invoked from network); 16 Feb 2000 05:23:18 -0000
Date: Tue, 15 Feb 2000 21:23:14 -0800 (PST)
Message-Id: <200002160523.VAA16933@ferrule.cygnus.com>
From: Tom Tromey <tromey@cygnus.com>
To: Bryce McKinlay <bryce@albatross.co.nz>
Cc: Tom Tromey <tromey@cygnus.com>, java-patches@sourceware.cygnus.com
Subject: Re: Interface method regression test
In-Reply-To: <38AA32F6.5F61389@albatross.co.nz>
References: <38AA248D.B12C1609@albatross.co.nz>
	<200002160420.UAA16890@ferrule.cygnus.com>
	<38AA32F6.5F61389@albatross.co.nz>
X-Zippy:  Yow!  Is this sexual intercourse yet??  Is it, huh, is it??
X-Attribution:  Tom

Bryce> Good idea. I checked it in this way.

Excellent, thanks.

Tom

From java-patches-return-490-listarch-java-patches=sourceware.cygnus.com@sourceware.cygnus.com Wed Feb 16 06:19:40 2000
Return-Path: <java-patches-return-490-listarch-java-patches=sourceware.cygnus.com@sourceware.cygnus.com>
Delivered-To: listarch-java-patches@sourceware.cygnus.com
Received: (qmail 30299 invoked by alias); 16 Feb 2000 06:19:39 -0000
Mailing-List: contact java-patches-help@sourceware.cygnus.com; run by ezmlm
Precedence: bulk
List-Subscribe: <mailto:java-patches-subscribe@sourceware.cygnus.com>
List-Archive: <http://sourceware.cygnus.com/ml/java-patches/>
List-Post: <mailto:java-patches@sourceware.cygnus.com>
List-Help: <mailto:java-patches-help@sourceware.cygnus.com>, <http://sourceware.cygnus.com/ml/#faqs>
Sender: java-patches-owner@sourceware.cygnus.com
Delivered-To: mailing list java-patches@sourceware.cygnus.com
Received: (qmail 30274 invoked from network); 16 Feb 2000 06:19:38 -0000
From: Alexandre Petit-Bianco <apbianco@cygnus.com>
MIME-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Content-Transfer-Encoding: 7bit
Message-ID: <14506.16758.878015.797794@deliverance.cygnus.com>
Date: Tue, 15 Feb 2000 22:19:34 -0800 (PST)
To: java-patches@sourceware.cygnus.com
Subject: Re: Patch: New interface lookup, and inlining, Take 2
In-Reply-To: <38AA2CE2.BF384BB7@albatross.co.nz>
References: <38AA2075.85A1DFA1@albatross.co.nz>
	<200002160445.UAA16913@ferrule.cygnus.com>
	<38AA2CE2.BF384BB7@albatross.co.nz>
X-Mailer: VM 6.62 under Emacs 19.34.1
Reply-To: apbianco@redhat.com
X-Organization: Red Hat, Sunnyvale CA, USA.
X-URL: http://www.serialhacker.org


Bryce McKinlay writes:
> Tom Tromey wrote:
> 
> > I'd really like to get this code in.
> > But doesn't changing the size of Class in libgcj but not in gcj cause
> > problems?  It seems to me that the new code could overwrite whatever
> > happens to be just after gcj-generated Class objects.
> 
> Good point. I must admit I didn't actually try it ;-)
> 
> regards
> 
>   [ bryce ]

Yes. I don't think gcj needs to be aware of the internal structure of
the _Jv_IDispatchTable union, something like that should be enough...

./A

Index: decl.c
===================================================================
RCS file: /cvs/gcc/egcs/gcc/java/decl.c,v
retrieving revision 1.46
diff -u -p -r1.46 decl.c
--- decl.c      2000/02/09 20:38:02     1.46
+++ decl.c      2000/02/16 06:17:08
@@ -660,6 +660,9 @@ init_decl_processing ()
   PUSH_FIELD (class_type_node, field, "interface_count", short_type_node);
   PUSH_FIELD (class_type_node, field, "state", byte_type_node);
   PUSH_FIELD (class_type_node, field, "thread", ptr_type_node);
+  PUSH_FIELD (class_type_node, field, "depth", short_type_node);
+  PUSH_FIELD (class_type_node, field, "ancestors", class_ptr_type);
+  PUSH_FIELD (class_type_node, field, "idt", ptr_type_node);
   for (t = TYPE_FIELDS (class_type_node);  t != NULL_TREE;  t = TREE_CHAIN (t))
     FIELD_PRIVATE (t) = 1;
   push_super_field (class_type_node, object_type_node);

From java-patches-return-491-listarch-java-patches=sourceware.cygnus.com@sourceware.cygnus.com Wed Feb 16 07:28:40 2000
Return-Path: <java-patches-return-491-listarch-java-patches=sourceware.cygnus.com@sourceware.cygnus.com>
Delivered-To: listarch-java-patches@sourceware.cygnus.com
Received: (qmail 9894 invoked by alias); 16 Feb 2000 07:28:40 -0000
Mailing-List: contact java-patches-help@sourceware.cygnus.com; run by ezmlm
Precedence: bulk
List-Subscribe: <mailto:java-patches-subscribe@sourceware.cygnus.com>
List-Archive: <http://sourceware.cygnus.com/ml/java-patches/>
List-Post: <mailto:java-patches@sourceware.cygnus.com>
List-Help: <mailto:java-patches-help@sourceware.cygnus.com>, <http://sourceware.cygnus.com/ml/#faqs>
Sender: java-patches-owner@sourceware.cygnus.com
Delivered-To: mailing list java-patches@sourceware.cygnus.com
Received: (qmail 9869 invoked from network); 16 Feb 2000 07:28:39 -0000
Date: Tue, 15 Feb 2000 23:28:35 -0800 (PST)
Message-Id: <200002160728.XAA17005@ferrule.cygnus.com>
From: Tom Tromey <tromey@cygnus.com>
To: apbianco@redhat.com
Cc: java-patches@sourceware.cygnus.com
Subject: Re: Patch: New interface lookup, and inlining, Take 2
In-Reply-To: <14506.16758.878015.797794@deliverance.cygnus.com>
References: <38AA2075.85A1DFA1@albatross.co.nz>
	<200002160445.UAA16913@ferrule.cygnus.com>
	<38AA2CE2.BF384BB7@albatross.co.nz>
	<14506.16758.878015.797794@deliverance.cygnus.com>
X-Zippy:  ..  someone in DAYTON, Ohio is selling USED CARPETS to a SERBO-CROATIAN
X-Attribution:  Tom

Alex> Yes. I don't think gcj needs to be aware of the internal
Alex> structure of the _Jv_IDispatchTable union, something like that
Alex> should be enough...

Don't we also have to set these values somewhere?

Anyway, if we can check this in, that would be great.  That would
clear a really major patch off Bryce's pending list.

Tom

From java-patches-return-492-listarch-java-patches=sourceware.cygnus.com@sourceware.cygnus.com Wed Feb 16 18:07:08 2000
Return-Path: <java-patches-return-492-listarch-java-patches=sourceware.cygnus.com@sourceware.cygnus.com>
Delivered-To: listarch-java-patches@sourceware.cygnus.com
Received: (qmail 29633 invoked by alias); 16 Feb 2000 18:07:08 -0000
Mailing-List: contact java-patches-help@sourceware.cygnus.com; run by ezmlm
Precedence: bulk
List-Subscribe: <mailto:java-patches-subscribe@sourceware.cygnus.com>
List-Archive: <http://sourceware.cygnus.com/ml/java-patches/>
List-Post: <mailto:java-patches@sourceware.cygnus.com>
List-Help: <mailto:java-patches-help@sourceware.cygnus.com>, <http://sourceware.cygnus.com/ml/#faqs>
Sender: java-patches-owner@sourceware.cygnus.com
Delivered-To: mailing list java-patches@sourceware.cygnus.com
Received: (qmail 29601 invoked from network); 16 Feb 2000 18:07:06 -0000
To: Java Patch List <java-patches@sourceware.cygnus.com> 
Subject: ChangeLog rollover
X-Zippy:  PARDON me, am I speaking ENGLISH?
X-Attribution:  Tom
Bcc:
Reply-To:  tromey@cygnus.com
From:  Tom Tromey <tromey@cygnus.com>
Date: 16 Feb 2000 11:09:04 -0700
Message-ID: <87g0utyq7z.fsf@cygnus.com>
Lines: 5
X-Mailer: Gnus v5.5/Emacs 20.3

I'd like to rename ChangeLog as ChangeLog-1999 and move all the
entries from this year into a new ChangeLog.  I hate it when they get
too big.  Any objections?

Tom

From java-patches-return-493-listarch-java-patches=sourceware.cygnus.com@sourceware.cygnus.com Wed Feb 16 18:35:28 2000
Return-Path: <java-patches-return-493-listarch-java-patches=sourceware.cygnus.com@sourceware.cygnus.com>
Delivered-To: listarch-java-patches@sourceware.cygnus.com
Received: (qmail 8542 invoked by alias); 16 Feb 2000 18:35:27 -0000
Mailing-List: contact java-patches-help@sourceware.cygnus.com; run by ezmlm
Precedence: bulk
List-Subscribe: <mailto:java-patches-subscribe@sourceware.cygnus.com>
List-Archive: <http://sourceware.cygnus.com/ml/java-patches/>
List-Post: <mailto:java-patches@sourceware.cygnus.com>
List-Help: <mailto:java-patches-help@sourceware.cygnus.com>, <http://sourceware.cygnus.com/ml/#faqs>
Sender: java-patches-owner@sourceware.cygnus.com
Delivered-To: mailing list java-patches@sourceware.cygnus.com
Received: (qmail 8286 invoked from network); 16 Feb 2000 18:35:13 -0000
To: Java Patch List <java-patches@sourceware.cygnus.com> 
Subject: Patch: another JNI test
X-Zippy:  Uh-oh!!  I'm having TOO MUCH FUN!!
X-Attribution:  Tom
Bcc:
Reply-To:  tromey@cygnus.com
From:  Tom Tromey <tromey@cygnus.com>
Date: 16 Feb 2000 11:36:51 -0700
Message-ID: <87emadyoxo.fsf@cygnus.com>
Lines: 60
X-Mailer: Gnus v5.5/Emacs 20.3

I'm checking in this new JNI test.

2000-02-15  Tom Tromey  <tromey@cygnus.com>

	* libjava.jni/findclass.java: New file
	* libjava.jni/findclass.c: New file
	* libjava.jni/findclass.out: New file

Tom

Index: libjava.jni/findclass.out
===================================================================
RCS file: findclass.out
diff -N findclass.out
--- /dev/null	Tue May  5 13:32:27 1998
+++ findclass.out	Wed Feb 16 10:34:10 2000
@@ -0,0 +1 @@
+class java.lang.String
Index: libjava.jni/findclass.c
===================================================================
RCS file: findclass.c
diff -N findclass.c
--- /dev/null	Tue May  5 13:32:27 1998
+++ findclass.c	Wed Feb 16 10:34:10 2000
@@ -0,0 +1,12 @@
+#include <stdlib.h>
+
+#include <findclass.h>
+
+jclass
+Java_findclass_doit (JNIEnv *env, jclass klass, jstring name)
+{
+  const char *buf = (*env)->GetStringUTFChars (env, name, NULL);
+  jclass k = (*env)->FindClass (env, buf);
+  (*env)->ReleaseStringUTFChars (env, name, buf);
+  return k;
+}
Index: libjava.jni/findclass.java
===================================================================
RCS file: findclass.java
diff -N findclass.java
--- /dev/null	Tue May  5 13:32:27 1998
+++ findclass.java	Wed Feb 16 10:34:10 2000
@@ -0,0 +1,16 @@
+// Test FindClass part of JNI.
+
+public class findclass
+{
+  static
+  {
+    System.loadLibrary ("findclass");
+  }
+
+  public static native Class doit (String name);
+
+  public static void main (String[] args)
+  {
+    System.out.println ("" + doit ("java/lang/String"));
+  }
+}

From java-patches-return-494-listarch-java-patches=sourceware.cygnus.com@sourceware.cygnus.com Wed Feb 16 18:37:26 2000
Return-Path: <java-patches-return-494-listarch-java-patches=sourceware.cygnus.com@sourceware.cygnus.com>
Delivered-To: listarch-java-patches@sourceware.cygnus.com
Received: (qmail 9811 invoked by alias); 16 Feb 2000 18:37:26 -0000
Mailing-List: contact java-patches-help@sourceware.cygnus.com; run by ezmlm
Precedence: bulk
List-Subscribe: <mailto:java-patches-subscribe@sourceware.cygnus.com>
List-Archive: <http://sourceware.cygnus.com/ml/java-patches/>
List-Post: <mailto:java-patches@sourceware.cygnus.com>
List-Help: <mailto:java-patches-help@sourceware.cygnus.com>, <http://sourceware.cygnus.com/ml/#faqs>
Sender: java-patches-owner@sourceware.cygnus.com
Delivered-To: mailing list java-patches@sourceware.cygnus.com
Received: (qmail 9791 invoked from network); 16 Feb 2000 18:37:16 -0000
To: Java Patch List <java-patches@sourceware.cygnus.com> 
Subject: Patch: JNI bug fix
X-Zippy:  My BIOLOGICAL ALARM CLOCK just went off..  It has noiseless
 DOZE FUNCTION and full kitchen!!
X-Attribution:  Tom
Bcc:
Reply-To:  tromey@cygnus.com
From:  Tom Tromey <tromey@cygnus.com>
Date: 16 Feb 2000 11:39:11 -0700
Message-ID: <87d7pxyots.fsf@cygnus.com>
Lines: 26
X-Mailer: Gnus v5.5/Emacs 20.3

I'm committing this patch, which fixes a bug in the JNI FindClass
function.

2000-02-16  Tom Tromey  <tromey@cygnus.com>

	* jni.cc (_Jv_JNI_FindClass): Use ClassLoader.loadClass, not
	findClass.

Tom

Index: jni.cc
===================================================================
RCS file: /cvs/java/libgcj/libjava/jni.cc,v
retrieving revision 1.17
diff -u -r1.17 jni.cc
--- jni.cc	2000/02/16 00:07:33	1.17
+++ jni.cc	2000/02/16 18:35:33
@@ -337,7 +337,7 @@
     loader = env->klass->getClassLoader ();
 
   // FIXME: exception processing.
-  jclass r = loader->findClass (n);
+  jclass r = loader->loadClass (n);
 
   return (jclass) wrap_value (env, r);
 }

From java-patches-return-495-listarch-java-patches=sourceware.cygnus.com@sourceware.cygnus.com Wed Feb 16 22:40:17 2000
Return-Path: <java-patches-return-495-listarch-java-patches=sourceware.cygnus.com@sourceware.cygnus.com>
Delivered-To: listarch-java-patches@sourceware.cygnus.com
Received: (qmail 26083 invoked by alias); 16 Feb 2000 22:40:17 -0000
Mailing-List: contact java-patches-help@sourceware.cygnus.com; run by ezmlm
Precedence: bulk
List-Subscribe: <mailto:java-patches-subscribe@sourceware.cygnus.com>
List-Archive: <http://sourceware.cygnus.com/ml/java-patches/>
List-Post: <mailto:java-patches@sourceware.cygnus.com>
List-Help: <mailto:java-patches-help@sourceware.cygnus.com>, <http://sourceware.cygnus.com/ml/#faqs>
Sender: java-patches-owner@sourceware.cygnus.com
Delivered-To: mailing list java-patches@sourceware.cygnus.com
Received: (qmail 26036 invoked from network); 16 Feb 2000 22:39:46 -0000
To: Java Patch List <java-patches@sourceware.cygnus.com> 
Subject: Patch: another JNI test
X-Zippy:  Yow!  Now we can become alcoholics!
X-Attribution:  Tom
Bcc:
Reply-To:  tromey@cygnus.com
From:  Tom Tromey <tromey@cygnus.com>
Date: 16 Feb 2000 15:40:42 -0700
Message-ID: <874sb8zs7p.fsf@cygnus.com>
Lines: 93
X-Mailer: Gnus v5.5/Emacs 20.3

I'm committing another JNI test.

2000-02-16  Tom Tromey  <tromey@cygnus.com>

	* libjava.jni/throwit.java: New file.
	* libjava.jni/throwit.c: New file.
	* libjava.jni/throwit.out: New file.

Tom

Index: libjava.jni/throwit.c
===================================================================
RCS file: throwit.c
diff -N throwit.c
--- /dev/null	Tue May  5 13:32:27 1998
+++ throwit.c	Wed Feb 16 14:35:52 2000
@@ -0,0 +1,25 @@
+#include <stdlib.h>
+#include <throwit.h>
+
+void
+Java_throwit_throwit (JNIEnv *env, jclass klass, jstring name,
+		      jboolean is_new)
+{
+  const char *buf = (*env)->GetStringUTFChars (env, name, NULL);
+  jclass k = (*env)->FindClass (env, buf);
+  (*env)->ReleaseStringUTFChars (env, name, buf);
+
+  if (k == NULL || (*env)->ExceptionCheck (env))
+    return;
+
+  if (is_new)
+    (*env)->ThrowNew (env, k, "the word is zardoz");
+  else
+    {
+      jmethodID id = (*env)->GetMethodID (env, k, "<init>",
+					  "(Ljava.lang.String;)V");
+      jstring z = (*env)->NewStringUTF (env, "zardoz is the word");
+      jobject obj = (*env)->NewObject (env, k, id, z);
+      (*env)->Throw (env, obj);
+    }
+}
Index: libjava.jni/throwit.out
===================================================================
RCS file: throwit.out
diff -N throwit.out
--- /dev/null	Tue May  5 13:32:27 1998
+++ throwit.out	Wed Feb 16 14:35:52 2000
@@ -0,0 +1,4 @@
+class java.lang.UnknownError
+the word is zardoz
+class java.lang.Throwable
+zardoz is the word
Index: libjava.jni/throwit.java
===================================================================
RCS file: throwit.java
diff -N throwit.java
--- /dev/null	Tue May  5 13:32:27 1998
+++ throwit.java	Wed Feb 16 14:35:52 2000
@@ -0,0 +1,33 @@
+// Test to see if throw works.
+
+public class throwit
+{
+  static
+  {
+    System.loadLibrary ("throwit");
+  }
+
+  public static native void throwit (String name, boolean is_new);
+
+  public static void main (String[] args)
+  {
+    try
+      {
+	throwit ("java/lang/UnknownError", false);
+      }
+    catch (Throwable x)
+      {
+	System.out.println (x.getClass ());
+	System.out.println (x.getMessage ());
+      }
+    try
+      {
+	throwit ("java/lang/Throwable", true);
+      }
+    catch (Throwable x)
+      {
+	System.out.println (x.getClass ());
+	System.out.println (x.getMessage ());
+      }
+  }
+}

From java-patches-return-496-listarch-java-patches=sourceware.cygnus.com@sourceware.cygnus.com Wed Feb 16 22:41:58 2000
Return-Path: <java-patches-return-496-listarch-java-patches=sourceware.cygnus.com@sourceware.cygnus.com>
Delivered-To: listarch-java-patches@sourceware.cygnus.com
Received: (qmail 26242 invoked by alias); 16 Feb 2000 22:41:58 -0000
Mailing-List: contact java-patches-help@sourceware.cygnus.com; run by ezmlm
Precedence: bulk
List-Subscribe: <mailto:java-patches-subscribe@sourceware.cygnus.com>
List-Archive: <http://sourceware.cygnus.com/ml/java-patches/>
List-Post: <mailto:java-patches@sourceware.cygnus.com>
List-Help: <mailto:java-patches-help@sourceware.cygnus.com>, <http://sourceware.cygnus.com/ml/#faqs>
Sender: java-patches-owner@sourceware.cygnus.com
Delivered-To: mailing list java-patches@sourceware.cygnus.com
Received: (qmail 26213 invoked from network); 16 Feb 2000 22:41:37 -0000
To: Java Patch List <java-patches@sourceware.cygnus.com> 
Subject: Patch: JNI fix for NewObject
X-Zippy:  AIEEEEE!  I am having an UNDULATING EXPERIENCE!
X-Attribution:  Tom
Bcc:
Reply-To:  tromey@cygnus.com
From:  Tom Tromey <tromey@cygnus.com>
Date: 16 Feb 2000 15:42:34 -0700
Message-ID: <873dqszs4l.fsf@cygnus.com>
Lines: 93
X-Mailer: Gnus v5.5/Emacs 20.3

I'm committing this patch.  It fixes a few bad assertions, and it
fixes an actual bug in the JNI NewObject function.

2000-02-16  Tom Tromey  <tromey@cygnus.com>

	* jni.cc (_Jv_JNI_NewObjectV): Corrected assertion.
	(_Jv_JNI_NewObject): Likewise.
	(_Jv_JNI_NewObjectA): Likewise.
	(_Jv_JNI_CallAnyMethodV): In constructor case, pass correct value
	as "return" type to _Jv_CallAnyMethodA.
	(_Jv_JNI_CallAnyMethodA): Likewise.
	(_Jv_JNI_CallAnyVoidMethodV): Likewise.

Tom

Index: jni.cc
===================================================================
RCS file: /cvs/java/libgcj/libjava/jni.cc,v
retrieving revision 1.18
diff -u -r1.18 jni.cc
--- jni.cc	2000/02/16 18:42:48	1.18
+++ jni.cc	2000/02/16 22:36:39
@@ -560,6 +560,10 @@
   jvalue args[arg_types->length];
   array_from_valist (args, arg_types, vargs);
 
+  // For constructors we need to pass the Class we are instantiating.
+  if (style == constructor)
+    return_type = klass;
+
   jvalue result;
   jthrowable ex = _Jv_CallAnyMethodA (obj, return_type, id,
 				      style == constructor,
@@ -604,6 +608,10 @@
   _Jv_GetTypesFromSignature (id, decl_class,
 			     &arg_types, &return_type);
 
+  // For constructors we need to pass the Class we are instantiating.
+  if (style == constructor)
+    return_type = klass;
+
   jvalue result;
   jthrowable ex = _Jv_CallAnyMethodA (obj, return_type, id,
 				      style == constructor,
@@ -636,6 +644,10 @@
   jvalue args[arg_types->length];
   array_from_valist (args, arg_types, vargs);
 
+  // For constructors we need to pass the Class we are instantiating.
+  if (style == constructor)
+    return_type = klass;
+
   jthrowable ex = _Jv_CallAnyMethodA (obj, return_type, id,
 				      style == constructor,
 				      arg_types, args, NULL);
@@ -804,7 +816,11 @@
 {
   JvAssert (klass && ! klass->isArray ());
   JvAssert (! strcmp (id->name->data, "<init>")
-	    && ! strcmp (id->signature->data, "()V"));
+	    && id->signature->length > 2
+	    && id->signature->data[0] == '('
+	    && ! strcmp (&id->signature->data[id->signature->length - 2],
+			 ")V"));
+
   return _Jv_JNI_CallAnyMethodV<jobject, constructor> (env, NULL, klass,
 						       id, args);
 }
@@ -814,7 +830,10 @@
 {
   JvAssert (klass && ! klass->isArray ());
   JvAssert (! strcmp (id->name->data, "<init>")
-	    && ! strcmp (id->signature->data, "()V"));
+	    && id->signature->length > 2
+	    && id->signature->data[0] == '('
+	    && ! strcmp (&id->signature->data[id->signature->length - 2],
+			 ")V"));
 
   va_list args;
   jobject result;
@@ -833,7 +852,11 @@
 {
   JvAssert (klass && ! klass->isArray ());
   JvAssert (! strcmp (id->name->data, "<init>")
-	    && ! strcmp (id->signature->data, "()V"));
+	    && id->signature->length > 2
+	    && id->signature->data[0] == '('
+	    && ! strcmp (&id->signature->data[id->signature->length - 2],
+			 ")V"));
+
   return _Jv_JNI_CallAnyMethodA<jobject, constructor> (env, NULL, klass,
 						       id, args);
 }

From java-patches-return-497-listarch-java-patches=sourceware.cygnus.com@sourceware.cygnus.com Thu Feb 17 00:49:12 2000
Return-Path: <java-patches-return-497-listarch-java-patches=sourceware.cygnus.com@sourceware.cygnus.com>
Delivered-To: listarch-java-patches@sourceware.cygnus.com
Received: (qmail 15536 invoked by alias); 17 Feb 2000 00:49:12 -0000
Mailing-List: contact java-patches-help@sourceware.cygnus.com; run by ezmlm
Precedence: bulk
List-Subscribe: <mailto:java-patches-subscribe@sourceware.cygnus.com>
List-Archive: <http://sourceware.cygnus.com/ml/java-patches/>
List-Post: <mailto:java-patches@sourceware.cygnus.com>
List-Help: <mailto:java-patches-help@sourceware.cygnus.com>, <http://sourceware.cygnus.com/ml/#faqs>
Sender: java-patches-owner@sourceware.cygnus.com
Delivered-To: mailing list java-patches@sourceware.cygnus.com
Received: (qmail 15403 invoked from network); 17 Feb 2000 00:48:59 -0000
To: Java Patch List <java-patches@sourceware.cygnus.com> 
Subject: Patch: yet another JNI test
X-Zippy:  YOW!  I can see 1987!!  PRESIDENT FORD is doing the REMAKE of "PAGAN
 LOVE SONG"...he's playing ESTHER WILLIAMS!!
X-Attribution:  Tom
Bcc:
Reply-To:  tromey@cygnus.com
From:  Tom Tromey <tromey@cygnus.com>
Date: 16 Feb 2000 17:51:06 -0700
Message-ID: <87r9ecy7lx.fsf@cygnus.com>
Lines: 169
X-Mailer: Gnus v5.5/Emacs 20.3

Yet another JNI test case.
With this one I discovered that writing code to use JNI is far more
painful than actually implementing JNI.

2000-02-16  Tom Tromey  <tromey@cygnus.com>

	* libjava.jni/calls.c: New file.
	* libjava.jni/calls.out: New file.
	* libjava.jni/calls.java: New file.

Tom

Index: libjava.jni/calls.out
===================================================================
RCS file: calls.out
diff -N calls.out
--- /dev/null	Tue May  5 13:32:27 1998
+++ calls.out	Wed Feb 16 16:48:10 2000
@@ -0,0 +1 @@
+void
Index: libjava.jni/calls.c
===================================================================
RCS file: calls.c
diff -N calls.c
--- /dev/null	Tue May  5 13:32:27 1998
+++ calls.c	Wed Feb 16 16:48:10 2000
@@ -0,0 +1,69 @@
+#include <stdio.h>
+#include <calls.h>
+
+jint
+Java_calls_docall (JNIEnv *env, jobject _this)
+{
+  jmethodID method;
+  jclass klass, super;
+
+  jbyte b;
+  jshort s;
+  jchar c;
+  jint i;
+  jlong l;
+  jfloat f;
+  jdouble d;
+
+  jvalue val;
+
+  jint fails = 0;
+
+  klass = (*env)->GetObjectClass (env, _this);
+  super = (*env)->GetSuperclass (env, klass);
+
+  method = (*env)->GetMethodID (env, klass, "byte_f", "()B");
+  b = (*env)->CallByteMethod (env, _this, method);
+  if (b != 23)
+    ++fails;
+
+  method = (*env)->GetMethodID (env, klass, "char_f", "(I)C");
+  val.i = 10;
+  c = (*env)->CallCharMethodV (env, _this, method, &val);
+  if (c != ('a' + 10))
+    ++fails;
+
+  method = (*env)->GetMethodID (env, super, "int_f", "()I");
+  i = (*env)->CallNonvirtualIntMethod (env, _this, super, method);
+  if (i != 27)
+    ++fails;
+
+  i = (*env)->CallIntMethod (env, _this, method);
+  if (i != 1023)
+    ++fails;
+
+  method = (*env)->GetStaticMethodID (env, klass, "long_f", "(J)J");
+  l = (*env)->CallStaticLongMethod (env, klass, method, (jlong) 10);
+  if (l != 2033)
+    ++fails;
+
+  method = (*env)->GetMethodID (env, klass, "void_f", "()V");
+  (*env)->CallVoidMethod (env, _this, method);
+
+  method = (*env)->GetStaticMethodID (env, klass, "short_f", "()S");
+  s = (*env)->CallStaticShortMethod (env, klass, method);
+  if (s != 2)
+    ++fails;
+
+  method = (*env)->GetMethodID (env, klass, "double_f", "()D");
+  d = (*env)->CallDoubleMethod (env, _this, method);
+  if (d != -1.0)
+    ++fails;
+
+  method = (*env)->GetMethodID (env, klass, "float_f", "()F");
+  f = (*env)->CallFloatMethod (env, _this, method);
+  if (f != 1.0)
+    ++fails;
+
+  return fails;
+}
Index: libjava.jni/calls.java
===================================================================
RCS file: calls.java
diff -N calls.java
--- /dev/null	Tue May  5 13:32:27 1998
+++ calls.java	Wed Feb 16 16:48:10 2000
@@ -0,0 +1,66 @@
+// Test a bunch of different calls.
+
+class base
+{
+  public int int_f ()
+  {
+    return 27;
+  }
+}
+
+public class calls extends base
+{
+  static
+  {
+    System.loadLibrary ("calls");
+  }
+
+  public native int docall ();
+
+  public byte byte_f ()
+  {
+    return 23;
+  }
+
+  public char char_f (int z)
+  {
+    return (char) ('a' + z);
+  }
+
+  public int int_f ()
+  {
+    return 1023;
+  }
+
+  public static long long_f (long q)
+  {
+    return q + 2023;
+  }
+
+  public void void_f ()
+  {
+    System.out.println ("void");
+  }
+
+  public static short short_f ()
+  {
+    return 2;
+  }
+
+  public double double_f ()
+  {
+    return -1.0;
+  }
+
+  public float float_f ()
+  {
+    return (float) 1.0;
+  }
+
+  public static void main (String[] args)
+  {
+    calls c = new calls ();
+    if (c.docall () != 0)
+      System.out.println ("fail");
+  }
+}

From java-patches-return-498-listarch-java-patches=sourceware.cygnus.com@sourceware.cygnus.com Thu Feb 17 00:52:40 2000
Return-Path: <java-patches-return-498-listarch-java-patches=sourceware.cygnus.com@sourceware.cygnus.com>
Delivered-To: listarch-java-patches@sourceware.cygnus.com
Received: (qmail 16313 invoked by alias); 17 Feb 2000 00:52:40 -0000
Mailing-List: contact java-patches-help@sourceware.cygnus.com; run by ezmlm
Precedence: bulk
List-Subscribe: <mailto:java-patches-subscribe@sourceware.cygnus.com>
List-Archive: <http://sourceware.cygnus.com/ml/java-patches/>
List-Post: <mailto:java-patches@sourceware.cygnus.com>
List-Help: <mailto:java-patches-help@sourceware.cygnus.com>, <http://sourceware.cygnus.com/ml/#faqs>
Sender: java-patches-owner@sourceware.cygnus.com
Delivered-To: mailing list java-patches@sourceware.cygnus.com
Received: (qmail 16293 invoked from network); 17 Feb 2000 00:52:36 -0000
To: Java Patch List <java-patches@sourceware.cygnus.com> 
Subject: Patch: more assertions for JNI
X-Zippy:  With YOU, I can be MYSELF..  We don't NEED Dan Rather..
X-Attribution:  Tom
Bcc:
Reply-To:  tromey@cygnus.com
From:  Tom Tromey <tromey@cygnus.com>
Date: 16 Feb 2000 17:54:45 -0700
Message-ID: <87putwy7fu.fsf@cygnus.com>
Lines: 47
X-Mailer: Gnus v5.5/Emacs 20.3

I'm checking this in.  It adds a couple more assertions to JNI.
There are a lot more we could add, and it might even be good to do so,
but I probably won't be doing it any time soon.

2000-02-16  Tom Tromey  <tromey@cygnus.com>

	* jni.cc (_Jv_JNI_CallStaticMethodV): Added some assertions.

Tom

Index: jni.cc
===================================================================
RCS file: /cvs/java/libgcj/libjava/jni.cc,v
retrieving revision 1.19
diff -u -r1.19 jni.cc
--- jni.cc	2000/02/16 22:42:41	1.19
+++ jni.cc	2000/02/17 00:51:20
@@ -756,6 +756,9 @@
 _Jv_JNI_CallStaticMethodV (JNIEnv *env, jclass klass,
 			   jmethodID id, va_list args)
 {
+  JvAssert (((id->accflags) & java::lang::reflect::Modifier::STATIC));
+  JvAssert ((&ClassClass)->isInstance (klass));
+
   return _Jv_JNI_CallAnyMethodV<T, static_type> (env, NULL, klass, id, args);
 }
 
@@ -768,6 +771,9 @@
   va_list args;
   T result;
 
+  JvAssert (((id->accflags) & java::lang::reflect::Modifier::STATIC));
+  JvAssert ((&ClassClass)->isInstance (klass));
+
   va_start (args, id);
   result = _Jv_JNI_CallAnyMethodV<T, static_type> (env, NULL, klass,
 						   id, args);
@@ -783,6 +789,9 @@
 _Jv_JNI_CallStaticMethodA (JNIEnv *env, jclass klass, jmethodID id,
 			   jvalue *args)
 {
+  JvAssert (((id->accflags) & java::lang::reflect::Modifier::STATIC));
+  JvAssert ((&ClassClass)->isInstance (klass));
+
   return _Jv_JNI_CallAnyMethodA<T, static_type> (env, NULL, klass, id, args);
 }
 

From java-patches-return-499-listarch-java-patches=sourceware.cygnus.com@sourceware.cygnus.com Thu Feb 17 18:32:56 2000
Return-Path: <java-patches-return-499-listarch-java-patches=sourceware.cygnus.com@sourceware.cygnus.com>
Delivered-To: listarch-java-patches@sourceware.cygnus.com
Received: (qmail 4755 invoked by alias); 17 Feb 2000 18:32:56 -0000
Mailing-List: contact java-patches-help@sourceware.cygnus.com; run by ezmlm
Precedence: bulk
List-Subscribe: <mailto:java-patches-subscribe@sourceware.cygnus.com>
List-Archive: <http://sourceware.cygnus.com/ml/java-patches/>
List-Post: <mailto:java-patches@sourceware.cygnus.com>
List-Help: <mailto:java-patches-help@sourceware.cygnus.com>, <http://sourceware.cygnus.com/ml/#faqs>
Sender: java-patches-owner@sourceware.cygnus.com
Delivered-To: mailing list java-patches@sourceware.cygnus.com
Received: (qmail 4733 invoked from network); 17 Feb 2000 18:32:50 -0000
To: Java Patch List <java-patches@sourceware.cygnus.com> 
Subject: Patch: PR 152
X-Zippy:  Now I can join WEIGHT WATCHERS!
X-Attribution:  Tom
Bcc:
Reply-To:  tromey@cygnus.com
From:  Tom Tromey <tromey@cygnus.com>
Date: 17 Feb 2000 11:35:11 -0700
Message-ID: <87emaby8ww.fsf@cygnus.com>
Lines: 27
X-Mailer: Gnus v5.5/Emacs 20.3

This patch fixes PR 152.

2000-02-17  Tom Tromey  <tromey@cygnus.com>

	* gcj/field.h (_Jv_Field::getClass): Don't use JvAssert.
	Fixes PR gcj/152.

Tom

Index: gcj/field.h
===================================================================
RCS file: /cvs/java/libgcj/libjava/gcj/field.h,v
retrieving revision 1.4
diff -u -r1.4 field.h
--- field.h	2000/01/26 00:55:49	1.4
+++ field.h	2000/02/17 18:18:39
@@ -68,7 +68,9 @@
 
   jclass getClass ()
   {
-    JvAssert (isResolved ());
+    // We can't use JvAssert here because it is not in a public
+    // header.
+    // JvAssert (isResolved ());
     return type;
   }
 

From java-patches-return-500-listarch-java-patches=sourceware.cygnus.com@sourceware.cygnus.com Thu Feb 17 22:57:36 2000
Return-Path: <java-patches-return-500-listarch-java-patches=sourceware.cygnus.com@sourceware.cygnus.com>
Delivered-To: listarch-java-patches@sourceware.cygnus.com
Received: (qmail 14436 invoked by alias); 17 Feb 2000 22:57:35 -0000
Mailing-List: contact java-patches-help@sourceware.cygnus.com; run by ezmlm
Precedence: bulk
List-Subscribe: <mailto:java-patches-subscribe@sourceware.cygnus.com>
List-Archive: <http://sourceware.cygnus.com/ml/java-patches/>
List-Post: <mailto:java-patches@sourceware.cygnus.com>
List-Help: <mailto:java-patches-help@sourceware.cygnus.com>, <http://sourceware.cygnus.com/ml/#faqs>
Sender: java-patches-owner@sourceware.cygnus.com
Delivered-To: mailing list java-patches@sourceware.cygnus.com
Received: (qmail 14415 invoked from network); 17 Feb 2000 22:57:33 -0000
To: Java Patch List <java-patches@sourceware.cygnus.com> 
Subject: ChangeLog rotation
X-Zippy:  My TOYOTA is built like a ... BAGEL with CREAM CHEESE!!
X-Attribution:  Tom
Bcc:
Reply-To:  tromey@cygnus.com
From:  Tom Tromey <tromey@cygnus.com>
Date: 17 Feb 2000 15:59:20 -0700
Message-ID: <87900jxwon.fsf@cygnus.com>
Lines: 4
X-Mailer: Gnus v5.5/Emacs 20.3

I'm putting the pre-2000 ChangeLog entries into ChangeLog-1999.
I'm not sending a patch since there's no real point.

Tom

From java-patches-return-501-listarch-java-patches=sourceware.cygnus.com@sourceware.cygnus.com Fri Feb 18 21:15:26 2000
Return-Path: <java-patches-return-501-listarch-java-patches=sourceware.cygnus.com@sourceware.cygnus.com>
Delivered-To: listarch-java-patches@sourceware.cygnus.com
Received: (qmail 5945 invoked by alias); 18 Feb 2000 21:15:26 -0000
Mailing-List: contact java-patches-help@sourceware.cygnus.com; run by ezmlm
Precedence: bulk
List-Subscribe: <mailto:java-patches-subscribe@sourceware.cygnus.com>
List-Archive: <http://sourceware.cygnus.com/ml/java-patches/>
List-Post: <mailto:java-patches@sourceware.cygnus.com>
List-Help: <mailto:java-patches-help@sourceware.cygnus.com>, <http://sourceware.cygnus.com/ml/#faqs>
Sender: java-patches-owner@sourceware.cygnus.com
Delivered-To: mailing list java-patches@sourceware.cygnus.com
Received: (qmail 5907 invoked from network); 18 Feb 2000 21:15:13 -0000
To: Java Patch List <java-patches@sourceware.cygnus.com> 
Subject: Patch: JNI test of RegisterNatives
X-Zippy:  I want EARS!  I want two ROUND BLACK EARS to make me feel warm 'n secure!!
X-Attribution:  Tom
Bcc:
Reply-To:  tromey@cygnus.com
From:  Tom Tromey <tromey@cygnus.com>
Date: 18 Feb 2000 14:17:49 -0700
Message-ID: <87wvo2w6pu.fsf@cygnus.com>
Lines: 80
X-Mailer: Gnus v5.5/Emacs 20.3

I'm checking in this patch, which adds a test for RegisterNatives.

2000-02-18  Tom Tromey  <tromey@cygnus.com>

	* libjava.jni/register.java: New file.
	* libjava.jni/register.c: New file.
	* libjava.jni/register.out: New file.

Tom

Index: libjava.jni/register.c
===================================================================
RCS file: register.c
diff -N register.c
--- /dev/null	Tue May  5 13:32:27 1998
+++ register.c	Fri Feb 18 13:13:36 2000
@@ -0,0 +1,32 @@
+#include <stdlib.h>
+#include <assert.h>
+#include <register.h>
+
+static jint
+some_random_name (JNIEnv *env, jclass k, jint v)
+{
+  return v - 1;
+}
+
+jint
+JNI_OnLoad (JavaVM *vm, void *nothing)
+{
+  JNIEnv *env;
+  JNINativeMethod meth;
+  jclass k;
+  jint r;
+
+  r = (*vm)->GetEnv (vm, (void **) &env, JNI_VERSION_1_2);
+  assert (r == JNI_OK);
+  k = (*env)->FindClass (env, "register");
+  assert (k != NULL);
+
+  meth.name = "doit";
+  meth.signature = "(I)I";
+  meth.fnPtr = some_random_name;
+
+  r = (*env)->RegisterNatives (env, k, &meth, 1);
+  assert (r == JNI_OK);
+
+  return JNI_VERSION_1_2;
+}
Index: libjava.jni/register.java
===================================================================
RCS file: register.java
diff -N register.java
--- /dev/null	Tue May  5 13:32:27 1998
+++ register.java	Fri Feb 18 13:13:36 2000
@@ -0,0 +1,16 @@
+// register.java - Test RegisterNatives.
+
+public class register
+{
+  static
+  {
+    System.loadLibrary ("register");
+  }
+
+  public static native int doit (int z);
+
+  public static void main (String[] args)
+  {
+    System.out.println (doit (24));
+  }
+}
Index: libjava.jni/register.out
===================================================================
RCS file: register.out
diff -N register.out
--- /dev/null	Tue May  5 13:32:27 1998
+++ register.out	Fri Feb 18 13:13:36 2000
@@ -0,0 +1 @@
+23

From java-patches-return-502-listarch-java-patches=sourceware.cygnus.com@sourceware.cygnus.com Fri Feb 18 21:21:28 2000
Return-Path: <java-patches-return-502-listarch-java-patches=sourceware.cygnus.com@sourceware.cygnus.com>
Delivered-To: listarch-java-patches@sourceware.cygnus.com
Received: (qmail 6617 invoked by alias); 18 Feb 2000 21:21:28 -0000
Mailing-List: contact java-patches-help@sourceware.cygnus.com; run by ezmlm
Precedence: bulk
List-Subscribe: <mailto:java-patches-subscribe@sourceware.cygnus.com>
List-Archive: <http://sourceware.cygnus.com/ml/java-patches/>
List-Post: <mailto:java-patches@sourceware.cygnus.com>
List-Help: <mailto:java-patches-help@sourceware.cygnus.com>, <http://sourceware.cygnus.com/ml/#faqs>
Sender: java-patches-owner@sourceware.cygnus.com
Delivered-To: mailing list java-patches@sourceware.cygnus.com
Received: (qmail 6574 invoked from network); 18 Feb 2000 21:21:13 -0000
To: Java Patch List <java-patches@sourceware.cygnus.com> 
Subject: Patch: RegisterNatives & associated bugs
X-Zippy:  My ELBOW is a remote FRENCH OUTPOST!!
X-Attribution:  Tom
Bcc:
Reply-To:  tromey@cygnus.com
From:  Tom Tromey <tromey@cygnus.com>
Date: 18 Feb 2000 14:23:44 -0700
Message-ID: <87vh3mw6fz.fsf@cygnus.com>
Lines: 260
X-Mailer: Gnus v5.5/Emacs 20.3

I'm checking in this patch.  It implements the RegisterNatives JNI
call, and fixes some associated bugs.

2000-02-18  Tom Tromey  <tromey@cygnus.com>

	* include/jvm.h (_Jv_GetJavaVM): Declare.
	* include/java-interp.h (_Jv_GetFirstMethod): New function.
	(_Jv_MethodBase::get_method): New method.
	(_Jv_JNIMethod::set_function): New method.
	* jni.cc (_Jv_JNI_UnregisterNatives): New function.
	(_Jv_JNI_RegisterNatives): New function.
	(_Jv_JNIFunctions): Updated for new functions.
	(_Jv_GetJavaVM): New function.
	(_Jv_JNI_GetJavaVM): Use it.  Now static.
	(_Jv_JNI_AttachCurrentThread): Create a new JNIEnv if this thread
	is already a Java thread but does not have a JNIEnv yet.

	* java/lang/natRuntime.cc (_load): Pass the JavaVM to the onload
	function.

Tom

Index: jni.cc
===================================================================
RCS file: /cvs/java/libgcj/libjava/jni.cc,v
retrieving revision 1.20
diff -u -r1.20 jni.cc
--- jni.cc	2000/02/17 00:54:34	1.20
+++ jni.cc	2000/02/18 21:19:12
@@ -1258,6 +1258,63 @@
     _Jv_FromReflectedConstructor (reinterpret_cast<Constructor *> (method));
 }
 
+static jint
+_Jv_JNI_RegisterNatives (JNIEnv *env, jclass k,
+			 const JNINativeMethod *methods,
+			 jint nMethods)
+{
+  // For now, this only matters for interpreted methods.  FIXME.
+  if (! _Jv_IsInterpretedClass (k))
+    {
+      // FIXME: throw exception.
+      return JNI_ERR;
+    }
+  _Jv_InterpClass *klass = reinterpret_cast<_Jv_InterpClass *> (k);
+
+  // Look at each descriptor given us, and find the corresponding
+  // method in the class.
+  for (int j = 0; j < nMethods; ++j)
+    {
+      bool found = false;
+
+      _Jv_MethodBase **imeths = _Jv_GetFirstMethod (klass);
+      for (int i = 0; i < JvNumMethods (klass); ++i)
+	{
+	  _Jv_MethodBase *meth = imeths[i];
+	  _Jv_Method *self = meth->get_method ();
+
+	  if (! strcmp (self->name->data, methods[j].name)
+	      && ! strcmp (self->signature->data, methods[j].signature))
+	    {
+	      if (! (self->accflags
+		     & java::lang::reflect::Modifier::NATIVE))
+		break;
+
+	      // Found a match that is native.
+	      _Jv_JNIMethod *jmeth = reinterpret_cast<_Jv_JNIMethod *> (meth);
+	      jmeth->set_function (methods[i].fnPtr);
+	      found = true;
+	      break;
+	    }
+	}
+
+      if (! found)
+	{
+	  jstring m = JvNewStringUTF (methods[j].name);
+	  _Jv_JNI_Throw (env, new java::lang::NoSuchMethodError (m));
+	  return JNI_ERR;
+	}
+    }
+
+  return JNI_OK;
+}
+
+static jint
+_Jv_JNI_UnregisterNatives (JNIEnv *, jclass)
+{
+  return JNI_ERR;
+}
+
 
 
 #ifdef INTERPRETER
@@ -1460,7 +1517,7 @@
     }
 
   // Attaching an already-attached thread is a no-op.
-  if (_Jv_ThreadCurrent () != NULL)
+  if (_Jv_GetCurrentJNIEnv () != NULL)
     return 0;
 
   JNIEnv *env = (JNIEnv *) _Jv_MallocUnchecked (sizeof (JNIEnv));
@@ -1480,8 +1537,13 @@
     }
   *penv = reinterpret_cast<void *> (env);
 
-  java::lang::Thread *t = new gnu::gcj::jni::NativeThread (group, name);
-  t = t;			// Avoid compiler warning.  Eww.
+  // This thread might already be a Java thread -- this function might
+  // have been called simply to set the new JNIEnv.
+  if (_Jv_ThreadCurrent () == NULL)
+    {
+      java::lang::Thread *t = new gnu::gcj::jni::NativeThread (group, name);
+      t = t;			// Avoid compiler warning.  Eww.
+    }
   _Jv_SetCurrentJNIEnv (env);
 
   return 0;
@@ -1655,21 +1717,34 @@
   return 0;
 }
 
-jint
-_Jv_JNI_GetJavaVM (JNIEnv *, JavaVM **vm)
+JavaVM *
+_Jv_GetJavaVM ()
 {
   // FIXME: synchronize
   if (! the_vm)
     {
       JavaVM *nvm = (JavaVM *) _Jv_MallocUnchecked (sizeof (JavaVM));
-      if (nvm == NULL)
-	return JNI_ERR;
-      nvm->functions = &_Jv_JNI_InvokeFunctions;
+      if (nvm != NULL)
+	nvm->functions = &_Jv_JNI_InvokeFunctions;
       the_vm = nvm;
     }
 
-  *vm = the_vm;
-  return 0;
+  // If this is a Java thread, we want to make sure it has an
+  // associated JNIEnv.
+  if (_Jv_ThreadCurrent () != NULL)
+    {
+      void *ignore;
+      _Jv_JNI_AttachCurrentThread (the_vm, &ignore, NULL);
+    }
+
+  return the_vm;
+}
+
+static jint
+_Jv_JNI_GetJavaVM (JNIEnv *, JavaVM **vm)
+{
+  *vm = _Jv_GetJavaVM ();
+  return *vm == NULL ? JNI_ERR : JNI_OK;
 }
 
 
@@ -1904,8 +1979,8 @@
   _Jv_JNI_SetPrimitiveArrayRegion,
   _Jv_JNI_SetPrimitiveArrayRegion,
   _Jv_JNI_SetPrimitiveArrayRegion,
-  NOT_IMPL /* RegisterNatives */,
-  NOT_IMPL /* UnregisterNatives */,
+  _Jv_JNI_RegisterNatives,
+  _Jv_JNI_UnregisterNatives,
   _Jv_JNI_MonitorEnter,
   _Jv_JNI_MonitorExit,
   _Jv_JNI_GetJavaVM,
Index: java/lang/natRuntime.cc
===================================================================
RCS file: /cvs/java/libgcj/libjava/java/lang/natRuntime.cc,v
retrieving revision 1.10
diff -u -r1.10 natRuntime.cc
--- natRuntime.cc	2000/02/15 08:51:04	1.10
+++ natRuntime.cc	2000/02/18 21:19:17
@@ -135,8 +135,13 @@
   void *onload = lt_dlsym (h, "JNI_OnLoad");
   if (onload != NULL)
     {
-      // FIXME: need invocation API to get JavaVM.
-      jint vers = ((jint (*) (...)) onload) (NULL, NULL);
+      JavaVM *vm = _Jv_GetJavaVM ();
+      if (vm == NULL)
+	{
+	  // FIXME: what?
+	  return;
+	}
+      jint vers = ((jint (*) (JavaVM *, void *)) onload) (vm, NULL);
       if (vers != JNI_VERSION_1_1 && vers != JNI_VERSION_1_2)
 	{
 	  // FIXME: unload the library.
Index: include/java-interp.h
===================================================================
RCS file: /cvs/java/libgcj/libjava/include/java-interp.h,v
retrieving revision 1.8
diff -u -r1.8 java-interp.h
--- java-interp.h	2000/02/16 00:07:34	1.8
+++ java-interp.h	2000/02/18 21:19:17
@@ -79,6 +79,12 @@
 
   // Size of raw arguments.
   _Jv_ushort args_raw_size;
+
+public:
+  _Jv_Method *get_method ()
+  {
+    return self;
+  }
 };
 
 class _Jv_InterpMethod : public _Jv_MethodBase
@@ -156,8 +162,16 @@
   friend void  _Jv_PrepareClass(jclass);
   friend void  _Jv_InitField (jobject, jclass, int);
   friend void* _Jv_MarkObj (void *, void *, void *, void *);
+
+  friend _Jv_MethodBase ** _Jv_GetFirstMethod (_Jv_InterpClass *klass);
 };
 
+extern inline _Jv_MethodBase **
+_Jv_GetFirstMethod (_Jv_InterpClass *klass)
+{
+  return klass->interpreted_methods;
+}
+
 struct _Jv_ResolvedMethod {
   jint            stack_item_count;	
   jint            vtable_index;	
@@ -190,6 +204,13 @@
 
   friend class _Jv_ClassReader;
   friend void _Jv_PrepareClass(jclass);
+
+public:
+  // FIXME: this is ugly.
+  void set_function (void *f)
+  {
+    function = f;
+  }
 };
 
 #endif /* INTERPRETER */
Index: include/jvm.h
===================================================================
RCS file: /cvs/java/libgcj/libjava/include/jvm.h,v
retrieving revision 1.16
diff -u -r1.16 jvm.h
--- jvm.h	2000/02/10 20:31:48	1.16
+++ jvm.h	2000/02/18 21:19:17
@@ -211,4 +211,7 @@
 _Jv_JNIEnv *_Jv_GetCurrentJNIEnv ();
 void _Jv_SetCurrentJNIEnv (_Jv_JNIEnv *);
 
+struct _Jv_JavaVM;
+_Jv_JavaVM *_Jv_GetJavaVM ();
+
 #endif /* __JAVA_JVM_H__ */

From java-patches-return-503-listarch-java-patches=sourceware.cygnus.com@sourceware.cygnus.com Sat Feb 19 02:57:53 2000
Return-Path: <java-patches-return-503-listarch-java-patches=sourceware.cygnus.com@sourceware.cygnus.com>
Delivered-To: listarch-java-patches@sourceware.cygnus.com
Received: (qmail 24083 invoked by alias); 19 Feb 2000 02:57:53 -0000
Mailing-List: contact java-patches-help@sourceware.cygnus.com; run by ezmlm
Precedence: bulk
List-Subscribe: <mailto:java-patches-subscribe@sourceware.cygnus.com>
List-Archive: <http://sourceware.cygnus.com/ml/java-patches/>
List-Post: <mailto:java-patches@sourceware.cygnus.com>
List-Help: <mailto:java-patches-help@sourceware.cygnus.com>, <http://sourceware.cygnus.com/ml/#faqs>
Sender: java-patches-owner@sourceware.cygnus.com
Delivered-To: mailing list java-patches@sourceware.cygnus.com
Received: (qmail 24064 invoked from network); 19 Feb 2000 02:57:51 -0000
Message-ID: <38AE0766.5BF7EC85@albatross.co.nz>
Date: Sat, 19 Feb 2000 16:00:54 +1300
From: Bryce McKinlay <bryce@albatross.co.nz>
X-Mailer: Mozilla 4.7 [en] (X11; U; Linux 2.3.25 i686)
X-Accept-Language: en
MIME-Version: 1.0
To: java-patches@sourceware.cygnus.com
Subject: Patch: `long' Overflows in java/util/zip/ZipEntry.java
Content-Type: text/plain; charset=us-ascii
Content-Transfer-Encoding: 7bit

(oops. clicked on wrong address and sent this to java-discuss by mistake)

I checked in this trivial patch to fix a couple of long->int overflows.

2000-02-19  Bryce McKinlay  <bryce@albatross.co.nz>

        * java/util/zip/ZipEntry.java (setCrc): Fix overflow.
        (setSize): ditto.

Index: ZipEntry.java
===================================================================
RCS file: /cvs/java/libgcj/libjava/java/util/zip/ZipEntry.java,v
retrieving revision 1.6
diff -u -r1.6 ZipEntry.java
--- ZipEntry.java       2000/01/19 18:39:27     1.6
+++ ZipEntry.java       2000/02/19 02:49:15
@@ -94,7 +94,7 @@

   public void setCrc (long crc)
   {
-    if (crc < 0 || crc > 0xffffffff)
+    if (crc < 0 || crc > 0xffffffffL)
       throw new IllegalArgumentException ();
     this.crc = crc;
   }
@@ -115,7 +115,7 @@

   public void setSize (long size)
   {
-    if (size < 0 || size > 0xffffffff)
+    if (size < 0 || size > 0xffffffffL)
       throw new IllegalArgumentException ();
     this.size = size;
   }

From java-patches-return-504-listarch-java-patches=sourceware.cygnus.com@sourceware.cygnus.com Mon Feb 21 05:10:08 2000
Return-Path: <java-patches-return-504-listarch-java-patches=sourceware.cygnus.com@sourceware.cygnus.com>
Delivered-To: listarch-java-patches@sourceware.cygnus.com
Received: (qmail 29048 invoked by alias); 21 Feb 2000 05:10:07 -0000
Mailing-List: contact java-patches-help@sourceware.cygnus.com; run by ezmlm
Precedence: bulk
List-Subscribe: <mailto:java-patches-subscribe@sourceware.cygnus.com>
List-Archive: <http://sourceware.cygnus.com/ml/java-patches/>
List-Post: <mailto:java-patches@sourceware.cygnus.com>
List-Help: <mailto:java-patches-help@sourceware.cygnus.com>, <http://sourceware.cygnus.com/ml/#faqs>
Sender: java-patches-owner@sourceware.cygnus.com
Delivered-To: mailing list java-patches@sourceware.cygnus.com
Received: (qmail 29022 invoked from network); 21 Feb 2000 05:10:02 -0000
To: Java Patch List <java-patches@sourceware.cygnus.com> 
Subject: Patch: zero allocated memory
X-Zippy:  Did I SELL OUT yet??
X-Attribution:  Tom
Bcc:
Reply-To:  tromey@cygnus.com
From:  Tom Tromey <tromey@cygnus.com>
Date: 20 Feb 2000 22:13:22 -0700
Message-ID: <87og9bw32l.fsf@cygnus.com>
Lines: 32
X-Mailer: Gnus v5.5/Emacs 20.3

I'm committing this patch.  We've defined our memory allocation
interfaces to return cleared memory.  This fixes one we missed.

2000-02-20  Tom Tromey  <tromey@cygnus.com>

	* boehm.cc (_Jv_AllocBytes): Clear returned memory.

Tom

Index: boehm.cc
===================================================================
RCS file: /cvs/java/libgcj/libjava/boehm.cc,v
retrieving revision 1.13
diff -u -r1.13 boehm.cc
--- boehm.cc	2000/01/21 23:50:30	1.13
+++ boehm.cc	2000/02/21 02:51:54
@@ -321,7 +321,14 @@
 void *
 _Jv_AllocBytes (jsize size)
 {
-  return GC_GENERIC_MALLOC (size, PTRFREE);
+  void *r = GC_GENERIC_MALLOC (size, PTRFREE);
+  // We have to explicitly zero memory here, as the GC doesn't
+  // guarantee that PTRFREE allocations are zeroed.  Note that we
+  // don't have to do this for other allocation types because we set
+  // the `ok_init' flag in the type descriptor.
+  if (r != NULL)
+    memset (r, 0, size);
+  return r;
 }
 
 static void

From java-patches-return-505-listarch-java-patches=sourceware.cygnus.com@sourceware.cygnus.com Mon Feb 21 05:54:38 2000
Return-Path: <java-patches-return-505-listarch-java-patches=sourceware.cygnus.com@sourceware.cygnus.com>
Delivered-To: listarch-java-patches@sourceware.cygnus.com
Received: (qmail 1711 invoked by alias); 21 Feb 2000 05:54:38 -0000
Mailing-List: contact java-patches-help@sourceware.cygnus.com; run by ezmlm
Precedence: bulk
List-Subscribe: <mailto:java-patches-subscribe@sourceware.cygnus.com>
List-Archive: <http://sourceware.cygnus.com/ml/java-patches/>
List-Post: <mailto:java-patches@sourceware.cygnus.com>
List-Help: <mailto:java-patches-help@sourceware.cygnus.com>, <http://sourceware.cygnus.com/ml/#faqs>
Sender: java-patches-owner@sourceware.cygnus.com
Delivered-To: mailing list java-patches@sourceware.cygnus.com
Received: (qmail 1681 invoked from network); 21 Feb 2000 05:54:34 -0000
Date: Sun, 20 Feb 2000 21:54:29 -0800
Message-Id: <200002210554.VAA18544@hoser.cygnus.com>
X-Authentication-Warning: hoser.cygnus.com: green set sender to green@cygnus.com using -f
From: Anthony Green <green@cygnus.com>
To: java-patches@sourceware.cygnus.com
Subject: patch: mime types
X-Organization: Red Hat, Sunnyvale, California
X-URL: http://www.cygnus.com/~green
Reply-to: green@redhat.com


This patch, which I am committing, does a few things...

    - it contains an implementation of
      URLConnection.guessContentTypeFromName.

    - it contains the source for a program, MakeDefaultMimeType, which
      reads a mime.types files and outputs source for
      gnu.gcj.io.DefaultMimeTypes.

    - it moves classes.pl into a new `scripts' directory (along with
      MakeDefaultMimeType.java.

    - it includes a mime.types file which I copied from my Linux box.

URLConnection.guessContentTypeFromName will look at your /etc/mime.types
first, and then default to the built in mime types (from the generated
file, gnu.gcj.io.DefaultMimeTypes).

Ideally it would look at the user's ~/.mime.types file, but I'm not
sure if that file is supposed to be in a standard format or not.
Netscape created one for me, which looks like...

#--Netscape Communications Corporation MIME Information
#Do not delete the above line. It is used to identify the file type.
#
#mime types added by Netscape Helper
type=audio/x-scpls 
#mime types added by Netscape Helper
type=audio/x-mpegurl  \
exts="m3u" 
#mime types added by Netscape Helper
type=application/x-ns-proxy-autoconfig  \
desc="Proxy Auto-Config"  \
exts="pac" 

If this is standard, then gnu.gcj.io.MimeTypes.java should be updated
to parse it correctly.

AG

-- 
Anthony Green                                                        Red Hat
                                                       Sunnyvale, California


2000-02-20  Anthony Green  <green@cygnus.com>

	* Makefile.in: Rebuilt.
	* Makefile.am (ordinary_java_source_files): Add
	gnu/gcj/io/DefaultMimeTypes.java and gnu/gcj/io/MimeTypes.java

	* scripts/MakeDefaultMimeTypes.java: New file.
	* scripts/mime.types: New file.
	* scripts/classes.pl: Moved from top level.
	* classes.pl: Moved to scripts directory.

	* java/net/URLConnection.java: Implement guessContentTypeFromName.

	* gnu/gcj/io/MimeTypes.java: New file.
	* gnu/gcj/io/DefaultMimeTypes.java: New file.

Index: gnu/gcj/io/DefaultMimeTypes.java
===================================================================
RCS file: DefaultMimeTypes.java
diff -N DefaultMimeTypes.java
--- /dev/null	Tue May  5 13:32:27 1998
+++ DefaultMimeTypes.java	Sun Feb 20 20:49:35 2000
@@ -0,0 +1,139 @@
+// Do not edit this file!  Create a new version with MakeDefaultMimeTypes.
+
+/* Copyright (C) 2000  Red Hat, Inc.
+
+   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.io;
+
+public class DefaultMimeTypes
+{
+  public static final String[] types = {
+      "midi",	"audio/midi"
+    , "sit",	"application/x-stuffit"
+    , "ram",	"audio/x-pn-realaudio"
+    , "ez",	"application/andrew-inset"
+    , "jpeg",	"image/jpeg"
+    , "sv4crc",	"application/x-sv4crc"
+    , "sv4cpio",	"application/x-sv4cpio"
+    , "txt",	"text/plain"
+    , "spl",	"application/x-futuresplash"
+    , "ras",	"image/x-cmu-raster"
+    , "sh",	"application/x-sh"
+    , "dcr",	"application/x-director"
+    , "msh",	"model/mesh"
+    , "swf",	"application/x-shockwave-flash"
+    , "hdf",	"application/x-hdf"
+    , "bcpio",	"application/x-bcpio"
+    , "zip",	"application/zip"
+    , "gif",	"image/gif"
+    , "me",	"application/x-troff-me"
+    , "gtar",	"application/x-gtar"
+    , "tex",	"application/x-tex"
+    , "xyz",	"chemical/x-pdb"
+    , "hqx",	"application/mac-binhex40"
+    , "ms",	"application/x-troff-ms"
+    , "oda",	"application/oda"
+    , "vcd",	"application/x-cdlink"
+    , "aifc",	"audio/x-aiff"
+    , "skd",	"application/x-koan"
+    , "smil",	"application/smil"
+    , "asc",	"text/plain"
+    , "aiff",	"audio/x-aiff"
+    , "xml",	"text/xml"
+    , "tr",	"application/x-troff"
+    , "nc",	"application/x-netcdf"
+    , "dxr",	"application/x-director"
+    , "skm",	"application/x-koan"
+    , "wrl",	"model/vrml"
+    , "tsv",	"text/tab-separated-values"
+    , "mpeg",	"video/mpeg"
+    , "skp",	"application/x-koan"
+    , "src",	"application/x-wais-source"
+    , "rpm",	"application/x-rpm"
+    , "skt",	"application/x-koan"
+    , "ai",	"application/postscript"
+    , "cpt",	"application/mac-compactpro"
+    , "mp2",	"audio/mpeg"
+    , "man",	"application/x-troff-man"
+    , "mp3",	"audio/mpeg"
+    , "mesh",	"model/mesh"
+    , "igs",	"model/iges"
+    , "shar",	"application/x-shar"
+    , "au",	"audio/basic"
+    , "texi",	"application/x-texinfo"
+    , "cpio",	"application/x-cpio"
+    , "jpe",	"image/jpeg"
+    , "lzh",	"application/octet-stream"
+    , "jpg",	"image/jpeg"
+    , "cdf",	"application/x-netcdf"
+    , "etx",	"text/x-setext"
+    , "texinfo",	"application/x-texinfo"
+    , "sgml",	"text/sgml"
+    , "roff",	"application/x-troff"
+    , "pgm",	"image/x-portable-graymap"
+    , "pgn",	"application/x-chess-pgn"
+    , "bin",	"application/octet-stream"
+    , "png",	"image/png"
+    , "tar",	"application/x-tar"
+    , "mid",	"audio/midi"
+    , "mov",	"video/quicktime"
+    , "movie",	"video/x-sgi-movie"
+    , "mif",	"application/vnd.mif"
+    , "pnm",	"image/x-portable-anymap"
+    , "mpga",	"audio/mpeg"
+    , "smi",	"application/smil"
+    , "t",	"application/x-troff"
+    , "tiff",	"image/tiff"
+    , "xbm",	"image/x-xbitmap"
+    , "htm",	"text/html"
+    , "mpe",	"video/mpeg"
+    , "dms",	"application/octet-stream"
+    , "mpg",	"video/mpeg"
+    , "lha",	"application/octet-stream"
+    , "latex",	"application/x-latex"
+    , "ps",	"application/postscript"
+    , "sgm",	"text/sgml"
+    , "tif",	"image/tiff"
+    , "ice",	"x-conference/x-cooltalk"
+    , "snd",	"audio/basic"
+    , "html",	"text/html"
+    , "pbm",	"image/x-portable-bitmap"
+    , "xpm",	"image/x-xpixmap"
+    , "iges",	"model/iges"
+    , "aif",	"audio/x-aiff"
+    , "avi",	"video/x-msvideo"
+    , "csh",	"application/x-csh"
+    , "wav",	"audio/x-wav"
+    , "xwd",	"image/x-xwindowdump"
+    , "js",	"application/x-javascript"
+    , "silo",	"model/mesh"
+    , "vrml",	"model/vrml"
+    , "tcl",	"application/x-tcl"
+    , "css",	"text/css"
+    , "eps",	"application/postscript"
+    , "class",	"application/octet-stream"
+    , "qt",	"video/quicktime"
+    , "doc",	"application/msword"
+    , "ustar",	"application/x-ustar"
+    , "ppm",	"image/x-portable-pixmap"
+    , "ppt",	"application/vnd.ms-powerpoint"
+    , "ra",	"audio/x-realaudio"
+    , "rgb",	"image/x-rgb"
+    , "rtf",	"text/rtf"
+    , "kar",	"audio/midi"
+    , "dvi",	"application/x-dvi"
+    , "rm",	"audio/x-pn-realaudio"
+    , "exe",	"application/octet-stream"
+    , "pdb",	"chemical/x-pdb"
+    , "pdf",	"application/pdf"
+    , "rtx",	"text/richtext"
+    , "dir",	"application/x-director"
+    , "ief",	"image/ief"
+  };
+}
+
Index: gnu/gcj/io/MimeTypes.java
===================================================================
RCS file: MimeTypes.java
diff -N MimeTypes.java
--- /dev/null	Tue May  5 13:32:27 1998
+++ MimeTypes.java	Sun Feb 20 20:49:35 2000
@@ -0,0 +1,86 @@
+/* Copyright (C) 2000  Red Hat, Inc.
+
+   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.io;
+
+import java.util.*;
+import java.io.*;
+
+public class MimeTypes
+{
+  private static Hashtable mime_types;
+  
+  public static void fillFromFile (Hashtable table, String fname) 
+    throws IOException
+  {
+    LineNumberReader reader = 
+      new LineNumberReader (new FileReader (fname));
+    
+    while (reader.ready ())
+      {
+	StringTokenizer tokenizer = 
+	  new StringTokenizer (reader.readLine ());
+	
+	try 
+	  {
+	    String t = tokenizer.nextToken ();
+	    
+	    if (! t.startsWith ("#"))
+	      {
+		while (true)
+		  {
+		    // Read the next extension
+		    String e = tokenizer.nextToken ();
+		    if (! e.startsWith ("#"))
+		      table.put (e, t);
+		    else
+		      break;
+		  }
+	      }
+	  } catch (NoSuchElementException ex) {
+	    // Do nothing.
+	  }
+      }
+  }
+
+  // This is the primary interface to this class.
+  public static String getMimeTypeFromExtension (String extension)
+  {
+    if (mime_types == null)
+      {
+	mime_types = new Hashtable ();
+	
+	// First populate the hash table with the default mime type
+	// mappings.
+	int i = DefaultMimeTypes.types.length;
+	while (i > 1)
+	  {
+	    mime_types.put (DefaultMimeTypes.types[i - 2],
+			    DefaultMimeTypes.types[i - 1]);
+	    i = i - 2;
+	  }
+	
+	// Now read mime types from /etc/mime.types if it exists.
+	// This should override the default values.
+	try {
+	  fillFromFile (mime_types, "/etc/mime.types");
+	} catch (IOException ex) {
+	  // Do nothing.
+	}
+	
+	// Now read mime types from ~/.mime.types.  
+	// FIXME: We can't currently parse this file.
+      }
+
+    String type = (String) mime_types.get (extension);
+    if (type == null)
+      return ("application/octet-stream");
+    else
+      return (type);
+  }
+}
Index: include/Makefile.in
===================================================================
RCS file: /cvs/java/libgcj/libjava/include/Makefile.in,v
retrieving revision 1.4
diff -u -r1.4 Makefile.in
--- Makefile.in	2000/01/17 19:22:20	1.4
+++ Makefile.in	2000/02/21 04:49:35
@@ -120,7 +120,7 @@
 
 DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST)
 
-TAR = tar
+TAR = gtar
 GZIP_ENV = --best
 all: all-redirect
 .SUFFIXES:
@@ -176,7 +176,7 @@
 	@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 \
Index: java/net/URLConnection.java
===================================================================
RCS file: /cvs/java/libgcj/libjava/java/net/URLConnection.java,v
retrieving revision 1.2
diff -u -r1.2 URLConnection.java
--- URLConnection.java	2000/01/19 18:39:26	1.2
+++ URLConnection.java	2000/02/21 04:49:35
@@ -18,6 +18,7 @@
 import java.util.Locale;
 import java.util.Hashtable;
 import java.util.StringTokenizer;
+import gnu.gcj.io.MimeTypes;
 
 /**
  * @author Warren Levy <warrenl@cygnus.com>
@@ -27,7 +28,7 @@
 /**
  * Written using on-line Java Platform 1.2 API Specification, as well
  * as "The Java Class Libraries", 2nd edition (Addison-Wesley, 1998).
- * Status:  Two guessContentTypeFrom... methods not implemented.
+ * Status:  One guessContentTypeFrom... methods not implemented.
  *	getContent method assumes content type from response; see comment there.
  */
 
@@ -312,9 +313,25 @@
     factory = fac;
   }
 
-// TODO:  protected static String guessContentTypeFromName(String fname)
-//   {
-//   }
+  protected static String guessContentTypeFromName(String fname)
+  {
+    int dot = fname.lastIndexOf (".");
+    
+    if (dot != -1)
+      {
+	if (dot == fname.length())
+	  return ("application/octet-stream");
+	else
+	  fname = fname.substring (dot + 1);
+      }
+    
+    String type = MimeTypes.getMimeTypeFromExtension (fname);
+    
+    if (type == null)
+      return("application/octet-stream");
+
+    return(type);
+  }
 
 // TODO:  public static String guessContentTypeFromStream(InputStream is)
 //          throws IOException
Index: scripts/MakeDefaultMimeTypes.java
===================================================================
RCS file: MakeDefaultMimeTypes.java
diff -N MakeDefaultMimeTypes.java
--- /dev/null	Tue May  5 13:32:27 1998
+++ MakeDefaultMimeTypes.java	Sun Feb 20 21:51:17 2000
@@ -0,0 +1,93 @@
+/* Copyright (C) 2000  Red Hat, Inc.
+
+   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.  */
+
+import gnu.gcj.io.MimeTypes;
+import java.io.IOException;
+import java.io.FileNotFoundException;
+import java.util.Hashtable;
+import java.util.Enumeration;
+import java.util.NoSuchElementException;
+
+public class MakeDefaultMimeTypes
+{
+  private static void fatal (String message)
+  {
+    System.err.println ("MakeDefaultMimeTypes Error: " + message);
+    System.exit (-1);
+  }
+  
+  public static void main (String[] args)
+  {
+    Hashtable mime_table = new Hashtable ();
+    
+    if (args.length != 1)
+      fatal ("missing mime type filename");
+
+    try {
+      MimeTypes.fillFromFile (mime_table, args[0]);
+    } catch (FileNotFoundException ex) {
+      fatal ("can't open " + args[0]);
+    } catch (IOException ex) {
+      fatal ("error reading " + args[0]);
+    }
+
+    System.out.println ("// Do not edit this file!  Create a new version with MakeDefaultMimeTypes.\
+\
+/* Copyright (C) 2000  Red Hat, Inc.\
+\
+   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.io; \
+\
+public class DefaultMimeTypes\
+{\
+  public static final String[] types = {");
+
+    Enumeration keys = mime_table.keys();
+    Enumeration values = mime_table.elements();
+    
+    // Prepend first element with open bracket
+    StringBuffer result = new StringBuffer("");
+    
+    try
+      {
+	result.append("      \"" 
+		      + keys.nextElement().toString() 
+		      + "\",\t\"" 
+		      + values.nextElement().toString()
+		      + "\"\n");
+      }
+    catch (NoSuchElementException ex)
+      {
+      }
+    
+    // Prepend subsequent elements with ", "
+    try
+      {
+	while (true)
+	  result.append("    , \"" 
+			+ keys.nextElement().toString() 
+			+ "\",\t\"" 
+			+ values.nextElement().toString()
+			+ "\"\n");
+      }
+    catch (NoSuchElementException ex)
+      {
+      }
+    
+    // Append last element with closing bracket
+    result.append("  };\
+}\
+");
+    System.out.println(result);
+  }
+}
Index: scripts/classes.pl
===================================================================
RCS file: classes.pl
diff -N classes.pl
--- /dev/null	Tue May  5 13:32:27 1998
+++ classes.pl	Sun Feb 20 20:49:35 2000
@@ -0,0 +1,104 @@
+# classes.pl - A perl program to generate most of the contents of
+# javaprims.h automatically.
+
+# Copyright (C) 1998, 1999  Red Hat, Inc.
+#
+# This file is part of libjava.
+#
+# This software is copyrighted work licensed under the terms of the
+# Libjava License.  Please consult the file "LIBJAVA_LICENSE" for
+# details.
+
+# Usage: cd <top-srcdir> ; perl classes.pl.
+# Can also be run from the `gcj' directory; this lets us
+# more easily insert the output into javaprims.h (which is where it goes).
+
+use DirHandle;
+
+if (-d 'java')
+{
+    # Ok here.
+}
+elsif (-d '../java')
+{
+    chdir ('..');
+}
+else
+{
+    die "couldn't find java directory\n";
+}
+
+&scan ('java', 2);
+
+exit 0;
+
+sub scan
+{
+    local ($dir, $indent) = @_;
+    local (@subdirs) = ();
+    local (%classes) = ();
+
+    local ($d) = new DirHandle $dir;
+    local (*JFILE);
+    local ($name);
+    if (defined $d)
+    {
+	while (defined ($name = $d->read))
+	{
+	    next if $name eq 'CVS';
+	    next if $name eq '.';
+	    next if $name eq '..';
+	    if ($dir eq 'java'
+		&& $name ne 'lang'
+		&& $name ne 'util'
+		&& $name ne 'io')
+	    {
+		# We only generate decls for java.lang, java.io, and
+		# java.util.
+		next;
+	    }
+	    if (-d ($dir . '/' . $name))
+	    {
+		push (@subdirs, $name);
+		next;
+	    }
+	    next unless $name =~ /\.java$/;
+
+	    open (FILE, "< $dir/$name");
+	    while (<FILE>)
+	    {
+		# NOTE: we don't skip `/*' comments.
+		s,//.*$,,;
+		# For now assume that class names start with upper
+		# case letter.
+		next unless /(class|interface) ([A-Z][A-Za-z0-9]+)/;
+		$classes{$2} = 1;
+	    }
+	    close (FILE);
+	}
+
+	undef $d;
+    }
+
+    local ($spaces) = ' ' x $indent;
+    local ($classname);
+    ($classname = $dir) =~ s/^.*\///;
+    print $spaces, "namespace ", $classname, "\n";
+    print $spaces, "{\n";
+
+    foreach (sort keys %classes)
+    {
+	print $spaces, "  class ", $_, ";\n";
+    }
+    print "\n" if scalar @classes > 0 && scalar @subdirs > 0;
+
+    local ($first) = 1;
+    foreach (sort @subdirs)
+    {
+	print "\n" unless $first;
+	$first = 0;
+	&scan ("$dir/$_", $indent + 2);
+    }
+
+    print $spaces, "}\n";
+}
Index: scripts/mime.types
===================================================================
RCS file: mime.types
diff -N mime.types
--- /dev/null	Tue May  5 13:32:27 1998
+++ mime.types	Sun Feb 20 20:49:35 2000
@@ -0,0 +1,276 @@
+# This is the default mime.types file from the Apache web server distribution
+
+# This file controls what Internet media types are sent to the client for
+# given file extension(s).  Sending the correct media type to the client
+# is important so they know how to handle the content of the file.
+# Extra types can either be added here or by using an AddType directive
+# in your config files. For more information about Internet media types,
+# please read RFC 2045, 2046, 2047, 2048, and 2077.  The Internet media type
+# registry is at <ftp://ftp.iana.org/in-notes/iana/assignments/media-types/>.
+
+# MIME type			Extension
+application/EDI-Consent
+application/EDI-X12
+application/EDIFACT
+application/activemessage
+application/andrew-inset	ez
+application/applefile
+application/atomicmail
+application/cals-1840
+application/commonground
+application/cybercash
+application/dca-rft
+application/dec-dx
+application/eshop
+application/hyperstudio
+application/iges
+application/mac-binhex40	hqx
+application/mac-compactpro	cpt
+application/macwriteii
+application/marc
+application/mathematica
+application/msword		doc
+application/news-message-id
+application/news-transmission
+application/octet-stream	bin dms lha lzh exe class
+application/oda			oda
+application/pdf			pdf
+application/pgp-encrypted
+application/pgp-keys
+application/pgp-signature
+application/pkcs10
+application/pkcs7-mime
+application/pkcs7-signature
+application/postscript		ai eps ps
+application/prs.alvestrand.titrax-sheet
+application/prs.cww
+application/prs.nprend
+application/remote-printing
+application/riscos
+application/rtf			rtf
+application/set-payment
+application/set-payment-initiation
+application/set-registration
+application/set-registration-initiation
+application/sgml
+application/sgml-open-catalog
+application/slate
+application/smil		smi smil
+application/vemmi
+application/vnd.3M.Post-it-Notes
+application/vnd.FloGraphIt
+application/vnd.acucobol
+application/vnd.anser-web-certificate-issue-initiation
+application/vnd.anser-web-funds-transfer-initiation
+application/vnd.audiograph
+application/vnd.businessobjects
+application/vnd.claymore
+application/vnd.comsocaller
+application/vnd.dna
+application/vnd.dxr
+application/vnd.ecdis-update
+application/vnd.ecowin.chart
+application/vnd.ecowin.filerequest
+application/vnd.ecowin.fileupdate
+application/vnd.ecowin.series
+application/vnd.ecowin.seriesrequest
+application/vnd.ecowin.seriesupdate
+application/vnd.enliven
+application/vnd.epson.salt
+application/vnd.fdf
+application/vnd.ffsns
+application/vnd.framemaker
+application/vnd.fujitsu.oasys
+application/vnd.fujitsu.oasys2
+application/vnd.fujitsu.oasys3
+application/vnd.fujitsu.oasysgp
+application/vnd.fujitsu.oasysprs
+application/vnd.fujixerox.docuworks
+application/vnd.hp-HPGL
+application/vnd.hp-PCL
+application/vnd.hp-PCLXL
+application/vnd.hp-hps
+application/vnd.ibm.MiniPay
+application/vnd.ibm.modcap
+application/vnd.intercon.formnet
+application/vnd.intertrust.digibox
+application/vnd.intertrust.nncp
+application/vnd.is-xpr
+application/vnd.japannet-directory-service
+application/vnd.japannet-jpnstore-wakeup
+application/vnd.japannet-payment-wakeup
+application/vnd.japannet-registration
+application/vnd.japannet-registration-wakeup
+application/vnd.japannet-setstore-wakeup
+application/vnd.japannet-verification
+application/vnd.japannet-verification-wakeup
+application/vnd.koan
+application/vnd.lotus-1-2-3
+application/vnd.lotus-approach
+application/vnd.lotus-freelance
+application/vnd.lotus-organizer
+application/vnd.lotus-screencam
+application/vnd.lotus-wordpro
+application/vnd.meridian-slingshot
+application/vnd.mif		mif
+application/vnd.minisoft-hp3000-save
+application/vnd.mitsubishi.misty-guard.trustweb
+application/vnd.ms-artgalry
+application/vnd.ms-asf
+application/vnd.ms-excel
+application/vnd.ms-powerpoint	ppt
+application/vnd.ms-project
+application/vnd.ms-tnef
+application/vnd.ms-works
+application/vnd.music-niff
+application/vnd.musician
+application/vnd.netfpx
+application/vnd.noblenet-directory
+application/vnd.noblenet-sealer
+application/vnd.noblenet-web
+application/vnd.novadigm.EDM
+application/vnd.novadigm.EDX
+application/vnd.novadigm.EXT
+application/vnd.osa.netdeploy
+application/vnd.powerbuilder6
+application/vnd.powerbuilder6-s
+application/vnd.rapid
+application/vnd.seemail
+application/vnd.shana.informed.formtemplate
+application/vnd.shana.informed.interchange
+application/vnd.shana.informed.package
+application/vnd.street-stream
+application/vnd.svd
+application/vnd.swiftview-ics
+application/vnd.truedoc
+application/vnd.visio
+application/vnd.webturbo
+application/vnd.wrq-hp3000-labelled
+application/vnd.wt.stf
+application/vnd.xara
+application/vnd.yellowriver-custom-menu
+application/wita
+application/wordperfect5.1
+application/x-bcpio		bcpio
+application/x-cdlink		vcd
+application/x-chess-pgn		pgn
+application/x-compress
+application/x-cpio		cpio
+application/x-csh		csh
+application/x-director		dcr dir dxr
+application/x-dvi		dvi
+application/x-futuresplash	spl
+application/x-gtar		gtar
+application/x-gzip
+application/x-hdf		hdf
+application/x-javascript	js
+application/x-koan		skp skd skt skm
+application/x-latex		latex
+application/x-netcdf		nc cdf
+# The standard is that rpm is audio/x-pn-realaudio-plugin... oh well...
+application/x-rpm		rpm
+application/x-sh		sh
+application/x-shar		shar
+application/x-shockwave-flash	swf
+application/x-stuffit		sit
+application/x-sv4cpio		sv4cpio
+application/x-sv4crc		sv4crc
+application/x-tar		tar
+application/x-tcl		tcl
+application/x-tex		tex
+application/x-texinfo		texinfo texi
+application/x-troff		t tr roff
+application/x-troff-man		man
+application/x-troff-me		me
+application/x-troff-ms		ms
+application/x-ustar		ustar
+application/x-wais-source	src
+application/x400-bp
+application/xml
+application/zip			zip
+audio/32kadpcm
+audio/basic			au snd
+audio/midi			mid midi kar
+audio/mpeg			mpga mp2 mp3
+audio/vnd.qcelp
+audio/x-aiff			aif aiff aifc
+audio/x-pn-realaudio		ram rm
+audio/x-realaudio		ra
+audio/x-wav			wav
+chemical/x-pdb			pdb xyz
+image/cgm
+image/g3fax
+image/gif			gif
+image/ief			ief
+image/jpeg			jpeg jpg jpe
+image/naplps
+image/png			png
+image/prs.btif
+image/tiff			tiff tif
+image/vnd.dwg
+image/vnd.dxf
+image/vnd.fpx
+image/vnd.net-fpx
+image/vnd.svf
+image/vnd.xiff
+image/x-cmu-raster		ras
+image/x-portable-anymap		pnm
+image/x-portable-bitmap		pbm
+image/x-portable-graymap	pgm
+image/x-portable-pixmap		ppm
+image/x-rgb			rgb
+image/x-xbitmap			xbm
+image/x-xpixmap			xpm
+image/x-xwindowdump		xwd
+message/delivery-status
+message/disposition-notification
+message/external-body
+message/http
+message/news
+message/partial
+message/rfc822
+model/iges			igs iges
+model/mesh			msh mesh silo
+model/vnd.dwf
+model/vrml			wrl vrml
+multipart/alternative
+multipart/appledouble
+multipart/byteranges
+multipart/digest
+multipart/encrypted
+multipart/form-data
+multipart/header-set
+multipart/mixed
+multipart/parallel
+multipart/related
+multipart/report
+multipart/signed
+multipart/voice-message
+text/css			css
+text/directory
+text/enriched
+text/html			html htm
+text/plain			asc txt
+text/prs.lines.tag
+text/rfc822-headers
+text/richtext			rtx
+text/rtf			rtf
+text/sgml			sgml sgm
+text/tab-separated-values	tsv
+text/uri-list
+text/vnd.abc
+text/vnd.flatland.3dml
+text/vnd.fmi.flexstor
+text/vnd.in3d.3dml
+text/vnd.in3d.spot
+text/vnd.latex-z
+text/x-setext			etx
+text/xml			xml
+video/mpeg			mpeg mpg mpe
+video/quicktime			qt mov
+video/vnd.motorola.video
+video/vnd.motorola.videop
+video/vnd.vivo
+video/x-msvideo			avi
+video/x-sgi-movie		movie
+x-conference/x-cooltalk		ice
Index: testsuite/Makefile.in
===================================================================
RCS file: /cvs/java/libgcj/libjava/testsuite/Makefile.in,v
retrieving revision 1.16
diff -u -r1.16 Makefile.in
--- Makefile.in	2000/01/17 19:22:20	1.16
+++ Makefile.in	2000/02/21 04:49:36
@@ -133,7 +133,7 @@
 
 DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST)
 
-TAR = tar
+TAR = gtar
 GZIP_ENV = --best
 all: all-redirect
 .SUFFIXES:
@@ -161,7 +161,7 @@
 	@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 \
Index: Makefile.am
===================================================================
RCS file: /cvs/java/libgcj/libjava/Makefile.am,v
retrieving revision 1.47
diff -u -r1.47 Makefile.am
--- Makefile.am	2000/02/10 20:31:47	1.47
+++ Makefile.am	2000/02/21 04:49:32
@@ -522,6 +522,8 @@
 ## convert_source_files.  If the .java file has a hand-maintained
 ## header, please list it in special_java_source_files.
 ordinary_java_source_files =  $(convert_source_files) \
+gnu/gcj/io/DefaultMimeTypes.java \
+gnu/gcj/io/MimeTypes.java \
 gnu/gcj/jni/NativeThread.java \
 gnu/gcj/runtime/MethodInvocation.java \
 gnu/gcj/runtime/VMClassLoader.java \
Index: Makefile.in
===================================================================
RCS file: /cvs/java/libgcj/libjava/Makefile.in,v
retrieving revision 1.51
diff -u -r1.51 Makefile.in
--- Makefile.in	2000/02/10 20:31:47	1.51
+++ Makefile.in	2000/02/21 04:49:33
@@ -326,6 +326,8 @@
 built_java_source_files = java/lang/ConcreteProcess.java
 
 ordinary_java_source_files = $(convert_source_files) \
+gnu/gcj/io/DefaultMimeTypes.java \
+gnu/gcj/io/MimeTypes.java \
 gnu/gcj/jni/NativeThread.java \
 gnu/gcj/runtime/MethodInvocation.java \
 gnu/gcj/runtime/VMClassLoader.java \
@@ -732,13 +734,12 @@
 DATA =  $(data_DATA) $(toolexeclib_DATA)
 
 DIST_COMMON =  README COPYING.LIB ChangeLog Makefile.am Makefile.in NEWS \
-THANKS acconfig.h acinclude.m4 aclocal.m4 configure configure.in \
-include/config.h.in include/stamp-h.in libgcj.spec.in
+THANKS acinclude.m4 aclocal.m4 configure configure.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 \
@@ -755,8 +756,10 @@
 .deps/gnu/gcj/convert/Output_JavaSrc.P \
 .deps/gnu/gcj/convert/Output_SJIS.P .deps/gnu/gcj/convert/Output_UTF8.P \
 .deps/gnu/gcj/convert/Output_iconv.P \
-.deps/gnu/gcj/convert/UnicodeToBytes.P .deps/gnu/gcj/jni/NativeThread.P \
-.deps/gnu/gcj/math/MPN.P .deps/gnu/gcj/protocol/file/Connection.P \
+.deps/gnu/gcj/convert/UnicodeToBytes.P \
+.deps/gnu/gcj/io/DefaultMimeTypes.P .deps/gnu/gcj/io/MimeTypes.P \
+.deps/gnu/gcj/jni/NativeThread.P .deps/gnu/gcj/math/MPN.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 \
@@ -958,34 +961,6 @@
 	$(SHELL) ./config.status --recheck
 $(srcdir)/configure: @MAINTAINER_MODE_TRUE@$(srcdir)/configure.in $(ACLOCAL_M4) $(CONFIGURE_DEPENDENCIES)
 	cd $(srcdir) && $(AUTOCONF)
-
-include/config.h: include/stamp-h
-	@if test ! -f $@; then \
-		rm -f include/stamp-h; \
-		$(MAKE) include/stamp-h; \
-	else :; fi
-include/stamp-h: $(srcdir)/include/config.h.in $(top_builddir)/config.status
-	cd $(top_builddir) \
-	  && CONFIG_FILES= CONFIG_HEADERS=include/config.h \
-	     $(SHELL) ./config.status
-	@echo timestamp > include/stamp-h 2> /dev/null
-$(srcdir)/include/config.h.in: @MAINTAINER_MODE_TRUE@$(srcdir)/include/stamp-h.in
-	@if test ! -f $@; then \
-		rm -f $(srcdir)/include/stamp-h.in; \
-		$(MAKE) $(srcdir)/include/stamp-h.in; \
-	else :; fi
-$(srcdir)/include/stamp-h.in: $(top_srcdir)/configure.in $(ACLOCAL_M4) acconfig.h
-	cd $(top_srcdir) && $(AUTOHEADER)
-	@echo timestamp > $(srcdir)/include/stamp-h.in 2> /dev/null
-
-mostlyclean-hdr:
-
-clean-hdr:
-
-distclean-hdr:
-	-rm -f include/config.h
-
-maintainer-clean-hdr:
 libgcj.spec: $(top_builddir)/config.status libgcj.spec.in
 	cd $(top_builddir) && CONFIG_FILES=$@ CONFIG_HEADERS= $(SHELL) ./config.status
 
@@ -1309,7 +1284,7 @@
 	@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 \
@@ -1424,33 +1399,31 @@
 	-rm -f config.cache config.log stamp-h stamp-h[0-9]*
 
 maintainer-clean-generic:
-mostlyclean-am:  mostlyclean-hdr mostlyclean-toolexeclibLIBRARIES \
-		mostlyclean-compile mostlyclean-libtool \
-		mostlyclean-toolexeclibLTLIBRARIES \
+mostlyclean-am:  mostlyclean-toolexeclibLIBRARIES mostlyclean-compile \
+		mostlyclean-libtool mostlyclean-toolexeclibLTLIBRARIES \
 		mostlyclean-binPROGRAMS mostlyclean-noinstPROGRAMS \
 		mostlyclean-tags mostlyclean-depend mostlyclean-generic
 
 mostlyclean: mostlyclean-recursive
 
-clean-am:  clean-hdr clean-toolexeclibLIBRARIES clean-compile \
-		clean-libtool clean-toolexeclibLTLIBRARIES \
-		clean-binPROGRAMS clean-noinstPROGRAMS clean-tags \
-		clean-depend clean-generic mostlyclean-am clean-local
+clean-am:  clean-toolexeclibLIBRARIES clean-compile clean-libtool \
+		clean-toolexeclibLTLIBRARIES clean-binPROGRAMS \
+		clean-noinstPROGRAMS clean-tags clean-depend \
+		clean-generic mostlyclean-am clean-local
 
 clean: clean-recursive
 
-distclean-am:  distclean-hdr distclean-toolexeclibLIBRARIES \
-		distclean-compile distclean-libtool \
-		distclean-toolexeclibLTLIBRARIES distclean-binPROGRAMS \
-		distclean-noinstPROGRAMS distclean-tags \
-		distclean-depend distclean-generic clean-am
+distclean-am:  distclean-toolexeclibLIBRARIES distclean-compile \
+		distclean-libtool distclean-toolexeclibLTLIBRARIES \
+		distclean-binPROGRAMS distclean-noinstPROGRAMS \
+		distclean-tags distclean-depend distclean-generic \
+		clean-am
 	-rm -f libtool
 
 distclean: distclean-recursive
 	-rm -f config.status
 
-maintainer-clean-am:  maintainer-clean-hdr \
-		maintainer-clean-toolexeclibLIBRARIES \
+maintainer-clean-am:  maintainer-clean-toolexeclibLIBRARIES \
 		maintainer-clean-compile maintainer-clean-libtool \
 		maintainer-clean-toolexeclibLTLIBRARIES \
 		maintainer-clean-binPROGRAMS \
@@ -1463,8 +1436,7 @@
 maintainer-clean: maintainer-clean-recursive
 	-rm -f config.status
 
-.PHONY: mostlyclean-hdr distclean-hdr clean-hdr maintainer-clean-hdr \
-mostlyclean-toolexeclibLIBRARIES distclean-toolexeclibLIBRARIES \
+.PHONY: mostlyclean-toolexeclibLIBRARIES distclean-toolexeclibLIBRARIES \
 clean-toolexeclibLIBRARIES maintainer-clean-toolexeclibLIBRARIES \
 uninstall-toolexeclibLIBRARIES install-toolexeclibLIBRARIES \
 mostlyclean-compile distclean-compile clean-compile \
Index: classes.pl
===================================================================
RCS file: classes.pl
diff -N classes.pl
--- /sourceware/cvs-tmp/cvsQHCJW1	Sun Feb 20 20:49:36 2000
+++ /dev/null	Tue May  5 13:32:27 1998
@@ -1,104 +0,0 @@
-# classes.pl - A perl program to generate most of the contents of
-# javaprims.h automatically.
-
-# Copyright (C) 1998, 1999  Red Hat, Inc.
-#
-# This file is part of libjava.
-#
-# This software is copyrighted work licensed under the terms of the
-# Libjava License.  Please consult the file "LIBJAVA_LICENSE" for
-# details.
-
-# Usage: cd <top-srcdir> ; perl classes.pl.
-# Can also be run from the `gcj' directory; this lets us
-# more easily insert the output into javaprims.h (which is where it goes).
-
-use DirHandle;
-
-if (-d 'java')
-{
-    # Ok here.
-}
-elsif (-d '../java')
-{
-    chdir ('..');
-}
-else
-{
-    die "couldn't find java directory\n";
-}
-
-&scan ('java', 2);
-
-exit 0;
-
-sub scan
-{
-    local ($dir, $indent) = @_;
-    local (@subdirs) = ();
-    local (%classes) = ();
-
-    local ($d) = new DirHandle $dir;
-    local (*JFILE);
-    local ($name);
-    if (defined $d)
-    {
-	while (defined ($name = $d->read))
-	{
-	    next if $name eq 'CVS';
-	    next if $name eq '.';
-	    next if $name eq '..';
-	    if ($dir eq 'java'
-		&& $name ne 'lang'
-		&& $name ne 'util'
-		&& $name ne 'io')
-	    {
-		# We only generate decls for java.lang, java.io, and
-		# java.util.
-		next;
-	    }
-	    if (-d ($dir . '/' . $name))
-	    {
-		push (@subdirs, $name);
-		next;
-	    }
-	    next unless $name =~ /\.java$/;
-
-	    open (FILE, "< $dir/$name");
-	    while (<FILE>)
-	    {
-		# NOTE: we don't skip `/*' comments.
-		s,//.*$,,;
-		# For now assume that class names start with upper
-		# case letter.
-		next unless /(class|interface) ([A-Z][A-Za-z0-9]+)/;
-		$classes{$2} = 1;
-	    }
-	    close (FILE);
-	}
-
-	undef $d;
-    }
-
-    local ($spaces) = ' ' x $indent;
-    local ($classname);
-    ($classname = $dir) =~ s/^.*\///;
-    print $spaces, "namespace ", $classname, "\n";
-    print $spaces, "{\n";
-
-    foreach (sort keys %classes)
-    {
-	print $spaces, "  class ", $_, ";\n";
-    }
-    print "\n" if scalar @classes > 0 && scalar @subdirs > 0;
-
-    local ($first) = 1;
-    foreach (sort @subdirs)
-    {
-	print "\n" unless $first;
-	$first = 0;
-	&scan ("$dir/$_", $indent + 2);
-    }
-
-    print $spaces, "}\n";
-}
Index: gcj/Makefile.in
===================================================================
RCS file: /cvs/java/libgcj/libjava/gcj/Makefile.in,v
retrieving revision 1.4
diff -u -r1.4 Makefile.in
--- Makefile.in	2000/01/17 19:22:20	1.4
+++ Makefile.in	2000/02/21 04:49:34
@@ -125,7 +125,7 @@
 
 DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST)
 
-TAR = tar
+TAR = gtar
 GZIP_ENV = --best
 all: all-redirect
 .SUFFIXES:
@@ -194,7 +194,7 @@
 	@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 \

From java-patches-return-506-listarch-java-patches=sourceware.cygnus.com@sourceware.cygnus.com Mon Feb 21 09:26:19 2000
Return-Path: <java-patches-return-506-listarch-java-patches=sourceware.cygnus.com@sourceware.cygnus.com>
Delivered-To: listarch-java-patches@sourceware.cygnus.com
Received: (qmail 29964 invoked by alias); 21 Feb 2000 09:26:19 -0000
Mailing-List: contact java-patches-help@sourceware.cygnus.com; run by ezmlm
Precedence: bulk
List-Subscribe: <mailto:java-patches-subscribe@sourceware.cygnus.com>
List-Archive: <http://sourceware.cygnus.com/ml/java-patches/>
List-Post: <mailto:java-patches@sourceware.cygnus.com>
List-Help: <mailto:java-patches-help@sourceware.cygnus.com>, <http://sourceware.cygnus.com/ml/#faqs>
Sender: java-patches-owner@sourceware.cygnus.com
Delivered-To: mailing list java-patches@sourceware.cygnus.com
Received: (qmail 29944 invoked from network); 21 Feb 2000 09:26:16 -0000
Message-ID: <38B1046F.4115@fernuni-hagen.de>
Date: Mon, 21 Feb 2000 10:25:03 +0100
From: Joerg Brunsmann <joerg.brunsmann@FernUni-Hagen.de>
Organization: Fernuniversitaet Hagen - Software Engineering 
              (Praktische Informatik III)
X-Mailer: Mozilla 3.04 (X11; I; SunOS 5.7 sun4u)
MIME-Version: 1.0
To: java-patches@sourceware.cygnus.com
Subject: [PATCH] jcf-dump 
Content-Type: text/plain; charset=us-ascii
Content-Transfer-Encoding: 7bit

Hi,

this patch fixes an obious bug in jcf-dump.c

Mon Jan 18 14:30:09 2000  Joerg Brunsmann  <joerg.brunsmann@fernuni-hagen.de>

        * jcf-dump.c (main): Test for correct condition after
	output file creation.


Index: egcs/gcc/java/jcf-dump.c
===================================================================
RCS file: /cvs/gcc/egcs/gcc/java/jcf-dump.c,v
retrieving revision 1.28
diff -c -3 -p -r1.28 jcf-dump.c
*** jcf-dump.c  2000/02/18 12:26:50     1.28
--- jcf-dump.c  2000/02/21 09:14:30
*************** DEFUN(main, (argc, argv),
*** 880,886 ****
    if (output_file)
      {
        out = fopen (output_file, "w");
!       if (out)
        {
          fprintf (stderr, "Cannot open '%s' for output.\n", output_file);
          return FATAL_EXIT_CODE;
--- 880,886 ----
    if (output_file)
      {
        out = fopen (output_file, "w");
!       if (! out)
        {
          fprintf (stderr, "Cannot open '%s' for output.\n", output_file);
          return FATAL_EXIT_CODE;

From java-patches-return-507-listarch-java-patches=sourceware.cygnus.com@sourceware.cygnus.com Mon Feb 21 15:36:08 2000
Return-Path: <java-patches-return-507-listarch-java-patches=sourceware.cygnus.com@sourceware.cygnus.com>
Delivered-To: listarch-java-patches@sourceware.cygnus.com
Received: (qmail 22304 invoked by alias); 21 Feb 2000 15:36:08 -0000
Mailing-List: contact java-patches-help@sourceware.cygnus.com; run by ezmlm
Precedence: bulk
List-Subscribe: <mailto:java-patches-subscribe@sourceware.cygnus.com>
List-Archive: <http://sourceware.cygnus.com/ml/java-patches/>
List-Post: <mailto:java-patches@sourceware.cygnus.com>
List-Help: <mailto:java-patches-help@sourceware.cygnus.com>, <http://sourceware.cygnus.com/ml/#faqs>
Sender: java-patches-owner@sourceware.cygnus.com
Delivered-To: mailing list java-patches@sourceware.cygnus.com
Received: (qmail 22279 invoked from network); 21 Feb 2000 15:36:07 -0000
Date: Mon, 21 Feb 2000 07:36:02 -0800 (PST)
Message-Id: <200002211536.HAA23819@ferrule.cygnus.com>
From: Tom Tromey <tromey@cygnus.com>
To: Joerg Brunsmann <joerg.brunsmann@FernUni-Hagen.de>
Cc: java-patches@sourceware.cygnus.com
Subject: Re: [PATCH] jcf-dump 
In-Reply-To: <38B1046F.4115@fernuni-hagen.de>
References: <38B1046F.4115@fernuni-hagen.de>
X-Zippy:  ..  does your DRESSING ROOM have enough ASPARAGUS?
X-Attribution:  Tom

>>>>> "Joerg" == Joerg Brunsmann <joerg.brunsmann@FernUni-Hagen.de> writes:


Joerg> this patch fixes an obious bug in jcf-dump.c

Thanks.  I'm going to check this in.
Note that patches for things in gcc/java should go to
gcc-patches@sourceware.cygnus.com, not java-patches.

Tom

From java-patches-return-508-listarch-java-patches=sourceware.cygnus.com@sourceware.cygnus.com Thu Feb 24 00:32:24 2000
Return-Path: <java-patches-return-508-listarch-java-patches=sourceware.cygnus.com@sourceware.cygnus.com>
Delivered-To: listarch-java-patches@sourceware.cygnus.com
Received: (qmail 6363 invoked by alias); 24 Feb 2000 00:32:24 -0000
Mailing-List: contact java-patches-help@sourceware.cygnus.com; run by ezmlm
Precedence: bulk
List-Subscribe: <mailto:java-patches-subscribe@sourceware.cygnus.com>
List-Archive: <http://sourceware.cygnus.com/ml/java-patches/>
List-Post: <mailto:java-patches@sourceware.cygnus.com>
List-Help: <mailto:java-patches-help@sourceware.cygnus.com>, <http://sourceware.cygnus.com/ml/#faqs>
Sender: java-patches-owner@sourceware.cygnus.com
Delivered-To: mailing list java-patches@sourceware.cygnus.com
Received: (qmail 6258 invoked from network); 24 Feb 2000 00:31:52 -0000
To: Java Patch List <java-patches@sourceware.cygnus.com> 
Subject: Patch: config.guess and config.sub
X-Zippy:  TAPPING?  You POLITICIANS!  Don't you realize that the END of the
 ``Wash Cycle'' is a TREASURED MOMENT for most people?!
X-Attribution:  Tom
Bcc:
Reply-To:  tromey@cygnus.com
From:  Tom Tromey <tromey@cygnus.com>
Date: 23 Feb 2000 17:35:43 -0700
Message-ID: <874sazfnds.fsf@cygnus.com>
Lines: 1125
X-Mailer: Gnus v5.5/Emacs 20.3

I'm checking in this patch, which syncs config.guess and config.sub
with the latest versions.

2000-02-23  Tom Tromey  <tromey@cygnus.com>

        * config.sub, config.guess: Updated to latest versions.

Tom

Index: config.guess
===================================================================
RCS file: /cvs/java/libgcj/config.guess,v
retrieving revision 1.3
diff -u -r1.3 config.guess
--- config.guess	1999/10/02 16:06:47	1.3
+++ config.guess	2000/02/24 00:29:11
@@ -1,6 +1,7 @@
 #! /bin/sh
 # Attempt to guess a canonical system name.
-#   Copyright (C) 1992, 93, 94, 95, 96, 97, 1998, 1999 Free Software Foundation, Inc.
+#   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000
+#   Free Software Foundation, Inc.
 #
 # This file is free software; you can redistribute it and/or modify it
 # under the terms of the GNU General Public License as published by
@@ -22,7 +23,7 @@
 # the same distribution terms that you use for the rest of that program.
 
 # Written by Per Bothner <bothner@cygnus.com>.
-# The master version of this file is at the FSF in /home/gd/gnu/lib.
+# Please send patches to <config-patches@gnu.org>.
 #
 # This script attempts to guess a canonical system name similar to
 # config.sub.  If it succeeds, it prints the system name on stdout, and
@@ -35,6 +36,20 @@
 # (but try to keep the structure clean).
 #
 
+# Use $HOST_CC if defined. $CC may point to a cross-compiler
+if test x"$CC_FOR_BUILD" = x; then
+  if test x"$HOST_CC" != x; then
+    CC_FOR_BUILD="$HOST_CC"
+  else
+    if test x"$CC" != x; then
+      CC_FOR_BUILD="$CC"
+    else
+      CC_FOR_BUILD=cc
+    fi
+  fi
+fi
+
+
 # This is needed to find uname on a Pyramid OSx when run in the BSD universe.
 # (ghazi@noc.rutgers.edu 8/24/94.)
 if (test -f /.attbin/uname) >/dev/null 2>&1 ; then
@@ -46,11 +61,49 @@
 UNAME_SYSTEM=`(uname -s) 2>/dev/null` || UNAME_SYSTEM=unknown
 UNAME_VERSION=`(uname -v) 2>/dev/null` || UNAME_VERSION=unknown
 
-trap 'rm -f dummy.c dummy.o dummy; exit 1' 1 2 15
+dummy=dummy-$$
+trap 'rm -f $dummy.c $dummy.o $dummy; exit 1' 1 2 15
 
 # Note: order is significant - the case branches are not exclusive.
 
 case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
+    *:NetBSD:*:*)
+	# Netbsd (nbsd) targets should (where applicable) match one or
+	# more of the tupples: *-*-netbsdelf*, *-*-netbsdaout*,
+	# *-*-netbsdecoff* and *-*-netbsd*.  For targets that recently
+	# switched to ELF, *-*-netbsd* would select the old
+	# object file format.  This provides both forward
+	# compatibility and a consistent mechanism for selecting the
+	# object file format.
+	# Determine the machine/vendor (is the vendor relevant).
+	case "${UNAME_MACHINE}" in
+	    amiga) machine=m68k-cbm ;;
+	    arm32) machine=arm-unknown ;;
+	    atari*) machine=m68k-atari ;;
+	    sun3*) machine=m68k-sun ;;
+	    mac68k) machine=m68k-apple ;;
+	    macppc) machine=powerpc-apple ;;
+	    hp3[0-9][05]) machine=m68k-hp ;;
+	    ibmrt|romp-ibm) machine=romp-ibm ;;
+	    *) machine=${UNAME_MACHINE}-unknown ;;
+	esac
+	# The Operating System including object format.
+	if echo __ELF__ | $CC_FOR_BUILD -E - 2>/dev/null \
+		| grep __ELF__ >/dev/null
+	then
+	    # Once all utilities can be ECOFF (netbsdecoff) or a.out (netbsdaout).
+	    # Return netbsd for either.  FIX?
+	    os=netbsd
+	else
+	    os=netbsdelf
+	fi
+	# The OS release
+	release=`echo ${UNAME_RELEASE}|sed -e 's/[-_].*/\./'`
+	# Since CPU_TYPE-MANUFACTURER-KERNEL-OPERATING_SYSTEM:
+	# contains redundant information, the shorter form:
+	# CPU_TYPE-MANUFACTURER-OPERATING_SYSTEM is used.
+	echo "${machine}-${os}${release}"
+	exit 0 ;;
     alpha:OSF1:*:*)
 	if test $UNAME_RELEASE = "V4.0"; then
 		UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $3}'`
@@ -59,56 +112,69 @@
 	# A Tn.n version is a released field test version.
 	# A Xn.n version is an unreleased experimental baselevel.
 	# 1.2 uses "1.2" for uname -r.
-	cat <<EOF >dummy.s
+	cat <<EOF >$dummy.s
+	.data
+\$Lformat:
+	.byte 37,100,45,37,120,10,0	# "%d-%x\n"
+
+	.text
 	.globl main
+	.align 4
 	.ent main
 main:
-	.frame \$30,0,\$26,0
-	.prologue 0
-	.long 0x47e03d80 # implver $0
-	lda \$2,259
-	.long 0x47e20c21 # amask $2,$1
-	srl \$1,8,\$2
-	sll \$2,2,\$2
-	sll \$0,3,\$0
-	addl \$1,\$0,\$0
-	addl \$2,\$0,\$0
-	ret \$31,(\$26),1
+	.frame \$30,16,\$26,0
+	ldgp \$29,0(\$27)
+	.prologue 1
+	.long 0x47e03d80 # implver \$0
+	lda \$2,-1
+	.long 0x47e20c21 # amask \$2,\$1
+	lda \$16,\$Lformat
+	mov \$0,\$17
+	not \$1,\$18
+	jsr \$26,printf
+	ldgp \$29,0(\$26)
+	mov 0,\$16
+	jsr \$26,exit
 	.end main
 EOF
-	${CC-cc} dummy.s -o dummy 2>/dev/null
+	$CC_FOR_BUILD $dummy.s -o $dummy 2>/dev/null
 	if test "$?" = 0 ; then
-		./dummy
-		case "$?" in
-			7)
+		case `./$dummy` in
+			0-0)
 				UNAME_MACHINE="alpha"
 				;;
-			15)
+			1-0)
 				UNAME_MACHINE="alphaev5"
 				;;
-			14)
+			1-1)
 				UNAME_MACHINE="alphaev56"
 				;;
-			10)
+			1-101)
 				UNAME_MACHINE="alphapca56"
 				;;
-			16)
+			2-303)
 				UNAME_MACHINE="alphaev6"
 				;;
+			2-307)
+				UNAME_MACHINE="alphaev67"
+				;;
 		esac
 	fi
-	rm -f dummy.s dummy
+	rm -f $dummy.s $dummy
 	echo ${UNAME_MACHINE}-dec-osf`echo ${UNAME_RELEASE} | sed -e 's/^[VTX]//' | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
 	exit 0 ;;
+    Alpha\ *:Windows_NT*:*)
+	# How do we know it's Interix rather than the generic POSIX subsystem?
+	# Should we change UNAME_MACHINE based on the output of uname instead
+	# of the specific Alpha model?
+	echo alpha-pc-interix
+	exit 0 ;;
     21064:Windows_NT:50:3)
 	echo alpha-dec-winnt3.5
 	exit 0 ;;
     Amiga*:UNIX_System_V:4.0:*)
 	echo m68k-cbm-sysv4
 	exit 0;;
-    amiga:NetBSD:*:*)
-      echo m68k-cbm-netbsd${UNAME_RELEASE}
-      exit 0 ;;
     amiga:OpenBSD:*:*)
 	echo m68k-unknown-openbsd${UNAME_RELEASE}
 	exit 0 ;;
@@ -133,16 +199,16 @@
     wgrisc:OpenBSD:*:*)
 	echo mipsel-unknown-openbsd${UNAME_RELEASE}
 	exit 0 ;;
+    *:OS/390:*:*)
+	echo i370-ibm-openedition
+	exit 0 ;;
     arm:RISC*:1.[012]*:*|arm:riscix:1.[012]*:*)
 	echo arm-acorn-riscix${UNAME_RELEASE}
 	exit 0;;
-    arm32:NetBSD:*:*)
-	echo arm-unknown-netbsd`echo ${UNAME_RELEASE}|sed -e 's/[-_].*/\./'`
-	exit 0 ;;
     SR2?01:HI-UX/MPP:*:*)
 	echo hppa1.1-hitachi-hiuxmpp
 	exit 0;;
-    Pyramid*:OSx*:*:*|MIS*:OSx*:*:*)
+    Pyramid*:OSx*:*:* | MIS*:OSx*:*:* | MIS*:SMP_DC-OSx*:*:*)
 	# akee@wpdis03.wpafb.af.mil (Earle F. Ake) contributed MIS and NILE.
 	if test "`(/bin/universe) 2>/dev/null`" = att ; then
 		echo pyramid-pyramid-sysv3
@@ -150,7 +216,7 @@
 		echo pyramid-pyramid-bsd
 	fi
 	exit 0 ;;
-    NILE:*:*:dcosx)
+    NILE*:*:*:dcosx)
 	echo pyramid-pyramid-svr4
 	exit 0 ;;
     sun4H:SunOS:5.*:*)
@@ -195,21 +261,38 @@
     aushp:SunOS:*:*)
 	echo sparc-auspex-sunos${UNAME_RELEASE}
 	exit 0 ;;
-    atari*:NetBSD:*:*)
-	echo m68k-atari-netbsd${UNAME_RELEASE}
-	exit 0 ;;
     atari*:OpenBSD:*:*)
 	echo m68k-unknown-openbsd${UNAME_RELEASE}
 	exit 0 ;;
-    sun3*:NetBSD:*:*)
-	echo m68k-sun-netbsd${UNAME_RELEASE}
+    # The situation for MiNT is a little confusing.  The machine name
+    # can be virtually everything (everything which is not
+    # "atarist" or "atariste" at least should have a processor 
+    # > m68000).  The system name ranges from "MiNT" over "FreeMiNT"
+    # to the lowercase version "mint" (or "freemint").  Finally
+    # the system name "TOS" denotes a system which is actually not
+    # MiNT.  But MiNT is downward compatible to TOS, so this should
+    # be no problem.
+    atarist[e]:*MiNT:*:* | atarist[e]:*mint:*:* | atarist[e]:*TOS:*:*)
+        echo m68k-atari-mint${UNAME_RELEASE}
 	exit 0 ;;
+    atari*:*MiNT:*:* | atari*:*mint:*:* | atarist[e]:*TOS:*:*)
+	echo m68k-atari-mint${UNAME_RELEASE}
+        exit 0 ;;
+    *falcon*:*MiNT:*:* | *falcon*:*mint:*:* | *falcon*:*TOS:*:*)
+        echo m68k-atari-mint${UNAME_RELEASE}
+	exit 0 ;;
+    milan*:*MiNT:*:* | milan*:*mint:*:* | *milan*:*TOS:*:*)
+        echo m68k-milan-mint${UNAME_RELEASE}
+        exit 0 ;;
+    hades*:*MiNT:*:* | hades*:*mint:*:* | *hades*:*TOS:*:*)
+        echo m68k-hades-mint${UNAME_RELEASE}
+        exit 0 ;;
+    *:*MiNT:*:* | *:*mint:*:* | *:*TOS:*:*)
+        echo m68k-unknown-mint${UNAME_RELEASE}
+        exit 0 ;;
     sun3*:OpenBSD:*:*)
 	echo m68k-unknown-openbsd${UNAME_RELEASE}
 	exit 0 ;;
-    mac68k:NetBSD:*:*)
-	echo m68k-apple-netbsd${UNAME_RELEASE}
-	exit 0 ;;
     mac68k:OpenBSD:*:*)
 	echo m68k-unknown-openbsd${UNAME_RELEASE}
 	exit 0 ;;
@@ -231,12 +314,17 @@
     VAX*:ULTRIX*:*:*)
 	echo vax-dec-ultrix${UNAME_RELEASE}
 	exit 0 ;;
-    2020:CLIX:*:*)
+    2020:CLIX:*:* | 2430:CLIX:*:*)
 	echo clipper-intergraph-clix${UNAME_RELEASE}
 	exit 0 ;;
     mips:*:*:UMIPS | mips:*:*:RISCos)
-	sed 's/^	//' << EOF >dummy.c
-	int main (argc, argv) int argc; char **argv; {
+	sed 's/^	//' << EOF >$dummy.c
+#ifdef __cplusplus
+#include <stdio.h>  /* for printf() prototype */
+	int main (int argc, char *argv[]) {
+#else
+	int main (argc, argv) int argc; char *argv[]; {
+#endif
 	#if defined (host_mips) && defined (MIPSEB)
 	#if defined (SYSTYPE_SYSV)
 	  printf ("mips-mips-riscos%ssysv\n", argv[1]); exit (0);
@@ -251,10 +339,10 @@
 	  exit (-1);
 	}
 EOF
-	${CC-cc} dummy.c -o dummy \
-	  && ./dummy `echo "${UNAME_RELEASE}" | sed -n 's/\([0-9]*\).*/\1/p'` \
-	  && rm dummy.c dummy && exit 0
-	rm -f dummy.c dummy
+	$CC_FOR_BUILD $dummy.c -o $dummy \
+	  && ./$dummy `echo "${UNAME_RELEASE}" | sed -n 's/\([0-9]*\).*/\1/p'` \
+	  && rm $dummy.c $dummy && exit 0
+	rm -f $dummy.c $dummy
 	echo mips-mips-riscos${UNAME_RELEASE}
 	exit 0 ;;
     Night_Hawk:Power_UNIX:*:*)
@@ -272,15 +360,18 @@
     AViiON:dgux:*:*)
         # DG/UX returns AViiON for all architectures
         UNAME_PROCESSOR=`/usr/bin/uname -p`
-        if [ $UNAME_PROCESSOR = mc88100 -o $UNAME_PROCESSOR = mc88110 ] ; then
-	if [ ${TARGET_BINARY_INTERFACE}x = m88kdguxelfx \
-	     -o ${TARGET_BINARY_INTERFACE}x = x ] ; then
+	if [ $UNAME_PROCESSOR = mc88100 ] || [ $UNAME_PROCESSOR = mc88110]
+	then
+	    if [ ${TARGET_BINARY_INTERFACE}x = m88kdguxelfx ] || \
+	       [ ${TARGET_BINARY_INTERFACE}x = x ]
+	    then
 		echo m88k-dg-dgux${UNAME_RELEASE}
-	else
+	    else
 		echo m88k-dg-dguxbcs${UNAME_RELEASE}
+	    fi
+	else
+	    echo i586-dg-dgux${UNAME_RELEASE}
 	fi
-        else echo i586-dg-dgux${UNAME_RELEASE}
-        fi
  	exit 0 ;;
     M88*:DolphinOS:*:*)	# DolphinOS (SVR3)
 	echo m88k-dolphin-sysv3
@@ -306,7 +397,7 @@
 	exit 0 ;;
     *:AIX:2:3)
 	if grep bos325 /usr/include/stdio.h >/dev/null 2>&1; then
-		sed 's/^		//' << EOF >dummy.c
+		sed 's/^		//' << EOF >$dummy.c
 		#include <sys/systemcfg.h>
 
 		main()
@@ -317,8 +408,8 @@
 			exit(0);
 			}
 EOF
-		${CC-cc} dummy.c -o dummy && ./dummy && rm dummy.c dummy && exit 0
-		rm -f dummy.c dummy
+		$CC_FOR_BUILD $dummy.c -o $dummy && ./$dummy && rm $dummy.c $dummy && exit 0
+		rm -f $dummy.c $dummy
 		echo rs6000-ibm-aix3.2.5
 	elif grep bos324 /usr/include/stdio.h >/dev/null 2>&1; then
 		echo rs6000-ibm-aix3.2.4
@@ -327,7 +418,8 @@
 	fi
 	exit 0 ;;
     *:AIX:*:4)
-	if /usr/sbin/lsattr -EHl proc0 | grep POWER >/dev/null 2>&1; then
+	IBM_CPU_ID=`/usr/sbin/lsdev -C -c processor -S available | head -1 | awk '{ print $1 }'`
+	if /usr/sbin/lsattr -EHl ${IBM_CPU_ID} | grep POWER >/dev/null 2>&1; then
 		IBM_ARCH=rs6000
 	else
 		IBM_ARCH=powerpc
@@ -345,7 +437,7 @@
     ibmrt:4.4BSD:*|romp-ibm:BSD:*)
 	echo romp-ibm-bsd4.4
 	exit 0 ;;
-    ibmrt:*BSD:*|romp-ibm:BSD:*)            # covers RT/PC NetBSD and
+    ibmrt:*BSD:*|romp-ibm:BSD:*)            # covers RT/PC BSD and
 	echo romp-ibm-bsd${UNAME_RELEASE}   # 4.3 with uname added to
 	exit 0 ;;                           # report: romp-ibm BSD 4.3
     *:BOSX:*:*)
@@ -360,33 +452,29 @@
     hp300:4.4BSD:*:* | 9000/[34]??:4.3bsd:2.*:*)
 	echo m68k-hp-bsd4.4
 	exit 0 ;;
-    *9??*:MPE/iX:*:*)
-	echo hppa1.0-hp-mpeix
-	exit 0 ;;
     9000/[34678]??:HP-UX:*:*)
 	case "${UNAME_MACHINE}" in
 	    9000/31? )            HP_ARCH=m68000 ;;
 	    9000/[34]?? )         HP_ARCH=m68k ;;
-	    9000/[678][0-9][0-9] )
-
-              sed 's/^              //' << EOF >dummy.c
+	    9000/[678][0-9][0-9])
+              sed 's/^              //' << EOF >$dummy.c
               #include <stdlib.h>
               #include <unistd.h>
-              
+
               int main ()
               {
               #if defined(_SC_KERNEL_BITS)
                   long bits = sysconf(_SC_KERNEL_BITS);
-              #endif 
+              #endif
                   long cpu  = sysconf (_SC_CPU_VERSION);
-              
-                  switch (cpu) 
+
+                  switch (cpu)
               	{
               	case CPU_PA_RISC1_0: puts ("hppa1.0"); break;
               	case CPU_PA_RISC1_1: puts ("hppa1.1"); break;
-              	case CPU_PA_RISC2_0: 
+              	case CPU_PA_RISC2_0:
               #if defined(_SC_KERNEL_BITS)
-              	    switch (bits) 
+              	    switch (bits)
               		{
               		case 64: puts ("hppa2.0w"); break;
               		case 32: puts ("hppa2.0n"); break;
@@ -394,20 +482,20 @@
               		} break;
               #else  /* !defined(_SC_KERNEL_BITS) */
               	    puts ("hppa2.0"); break;
-              #endif 
+              #endif
               	default: puts ("hppa1.0"); break;
               	}
                   exit (0);
               }
 EOF
-	(${CC-cc} dummy.c -o dummy 2>/dev/null ) && HP_ARCH=`./dummy`
-	rm -f dummy.c dummy
+	(CCOPTS= $CC_FOR_BUILD $dummy.c -o $dummy 2>/dev/null ) && HP_ARCH=`./$dummy`
+	rm -f $dummy.c $dummy
 	esac
 	HPUX_REV=`echo ${UNAME_RELEASE}|sed -e 's/[^.]*.[0B]*//'`
 	echo ${HP_ARCH}-hp-hpux${HPUX_REV}
 	exit 0 ;;
     3050*:HI-UX:*:*)
-	sed 's/^	//' << EOF >dummy.c
+	sed 's/^	//' << EOF >$dummy.c
 	#include <unistd.h>
 	int
 	main ()
@@ -432,8 +520,8 @@
 	  exit (0);
 	}
 EOF
-	${CC-cc} dummy.c -o dummy && ./dummy && rm dummy.c dummy && exit 0
-	rm -f dummy.c dummy
+	$CC_FOR_BUILD $dummy.c -o $dummy && ./$dummy && rm $dummy.c $dummy && exit 0
+	rm -f $dummy.c $dummy
 	echo unknown-hitachi-hiuxwe2
 	exit 0 ;;
     9000/7??:4.3bsd:*:* | 9000/8?[79]:4.3bsd:*:* )
@@ -442,6 +530,9 @@
     9000/8??:4.3bsd:*:*)
 	echo hppa1.0-hp-bsd
 	exit 0 ;;
+    *9??*:MPE/iX:*:*)
+	echo hppa1.0-hp-mpeix
+	exit 0 ;;
     hp7??:OSF1:*:* | hp8?[79]:OSF1:*:* )
 	echo hppa1.1-hp-osf
 	exit 0 ;;
@@ -491,7 +582,13 @@
 	      -e y/ABCDEFGHIJKLMNOPQRSTUVWXYZ/abcdefghijklmnopqrstuvwxyz/
 	exit 0 ;;
     CRAY*TS:*:*:*)
-	echo t90-cray-unicos${UNAME_RELEASE}
+	echo t90-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
+	exit 0 ;;
+    CRAY*T3E:*:*:*)
+	echo alpha-cray-unicosmk${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
+	exit 0 ;;
+    CRAY*SV1:*:*:*)
+	echo sv1-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'    
 	exit 0 ;;
     CRAY-2:*:*:*)
 	echo cray2-cray-unicos
@@ -504,15 +601,18 @@
     F301:UNIX_System_V:*:*)
        echo f301-fujitsu-uxpv`echo $UNAME_RELEASE | sed 's/ .*//'`
        exit 0 ;;
-    hp3[0-9][05]:NetBSD:*:*)
-	echo m68k-hp-netbsd${UNAME_RELEASE}
-	exit 0 ;;
     hp300:OpenBSD:*:*)
 	echo m68k-unknown-openbsd${UNAME_RELEASE}
 	exit 0 ;;
-    i?86:BSD/386:*:* | *:BSD/OS:*:*)
+    i?86:BSD/386:*:* | i?86:BSD/OS:*:*)
 	echo ${UNAME_MACHINE}-pc-bsdi${UNAME_RELEASE}
 	exit 0 ;;
+    sparc*:BSD/OS:*:*)
+	echo sparc-unknown-bsdi${UNAME_RELEASE}
+	exit 0 ;;
+    *:BSD/OS:*:*)
+	echo ${UNAME_MACHINE}-unknown-bsdi${UNAME_RELEASE}
+	exit 0 ;;
     *:FreeBSD:*:*)
 	if test -x /usr/bin/objformat; then
 	    if test "elf" = "`/usr/bin/objformat`"; then
@@ -520,32 +620,28 @@
 		exit 0
 	    fi
 	fi
-  	echo ${UNAME_MACHINE}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`
+	echo ${UNAME_MACHINE}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`
 	exit 0 ;;
-    *:NetBSD:*:*)
-	echo ${UNAME_MACHINE}-unknown-netbsd`echo ${UNAME_RELEASE}|sed -e 's/[-_].*/\./'`
-	exit 0 ;;
     *:OpenBSD:*:*)
 	echo ${UNAME_MACHINE}-unknown-openbsd`echo ${UNAME_RELEASE}|sed -e 's/[-_].*/\./'`
 	exit 0 ;;
-    i*:[Cc][Yy][Gg][Ww][Ii][Nn]*:*)
-	echo ${UNAME_MACHINE}-pc-cygwin32
+    i*:CYGWIN*:*)
+	echo ${UNAME_MACHINE}-pc-cygwin
 	exit 0 ;;
     i*:MINGW*:*)
 	echo ${UNAME_MACHINE}-pc-mingw32
 	exit 0 ;;
     i*:Windows_NT*:* | Pentium*:Windows_NT*:*)
-        # How do we know it's Interix rather than generic posix subsystem?
+	# How do we know it's Interix rather than the generic POSIX subsystem?
 	# It also conflicts with pre-2.0 versions of AT&T UWIN. Should we
-	# change UNAME_MACHINE based on the output of uname instead of
-	# i386?
+	# UNAME_MACHINE based on the output of uname instead of i386?
 	echo i386-pc-interix
 	exit 0 ;;
     i*:UWIN*:*)
 	echo ${UNAME_MACHINE}-pc-uwin
 	exit 0 ;;
     p*:CYGWIN*:*)
-	echo powerpcle-unknown-cygwin32
+	echo powerpcle-unknown-cygwin
 	exit 0 ;;
     prep*:SunOS:5.*:*)
 	echo powerpcle-unknown-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
@@ -554,16 +650,11 @@
 	echo `echo ${UNAME_MACHINE}|sed -e 's,[-/].*$,,'`-unknown-gnu`echo ${UNAME_RELEASE}|sed -e 's,/.*$,,'`
 	exit 0 ;;
     *:Linux:*:*)
-	# uname on the ARM produces all sorts of strangeness, and we need to
-	# filter it out.
-	case "$UNAME_MACHINE" in
-	  armv*)		      UNAME_MACHINE=$UNAME_MACHINE ;;
-	  arm* | sa110*)	      UNAME_MACHINE="arm" ;;
-	esac
 
 	# The BFD linker knows what the default object file format is, so
-	# first see if it will tell us.
-	ld_help_string=`ld --help 2>&1`
+	# first see if it will tell us. cd to the root directory to prevent
+	# problems with other programs or directories called `ld' in the path.
+	ld_help_string=`cd /; ld --help 2>&1`
 	ld_supported_emulations=`echo $ld_help_string \
 			 | sed -ne '/supported emulations:/!d
 				    s/[ 	][ 	]*/ /g
@@ -571,14 +662,41 @@
 				    s/ .*//
 				    p'`
         case "$ld_supported_emulations" in
-	  i?86linux)  echo "${UNAME_MACHINE}-pc-linux-gnuaout"      ; exit 0 ;;
-	  i?86coff)   echo "${UNAME_MACHINE}-pc-linux-gnucoff"      ; exit 0 ;;
-	  sparclinux) echo "${UNAME_MACHINE}-unknown-linux-gnuaout" ; exit 0 ;;
-	  armlinux)   echo "${UNAME_MACHINE}-unknown-linux-gnuaout" ; exit 0 ;;
-	  m68klinux)  echo "${UNAME_MACHINE}-unknown-linux-gnuaout" ; exit 0 ;;
+	  *ia64)
+		echo "${UNAME_MACHINE}-unknown-linux"
+		exit 0
+		;;
+	  i?86linux)
+		echo "${UNAME_MACHINE}-pc-linux-gnuaout"
+		exit 0
+		;;
+	  i?86coff)
+		echo "${UNAME_MACHINE}-pc-linux-gnucoff"
+		exit 0
+		;;
+	  sparclinux)
+		echo "${UNAME_MACHINE}-unknown-linux-gnuaout"
+		exit 0
+		;;
+	  armlinux)
+		echo "${UNAME_MACHINE}-unknown-linux-gnuaout"
+		exit 0
+		;;
+	  elf32arm*)
+		echo "${UNAME_MACHINE}-unknown-linux-gnuoldld"
+		exit 0
+		;;
+	  armelf_linux*)
+		echo "${UNAME_MACHINE}-unknown-linux-gnu"
+		exit 0
+		;;
+	  m68klinux)
+		echo "${UNAME_MACHINE}-unknown-linux-gnuaout"
+		exit 0
+		;;
 	  elf32ppc | elf32ppclinux)
 		# Determine Lib Version
-		cat >dummy.c <<EOF
+		cat >$dummy.c <<EOF
 #include <features.h>
 #if defined(__GLIBC__)
 extern char __libc_version[];
@@ -597,71 +715,85 @@
 }
 EOF
 		LIBC=""
-		${CC-cc} dummy.c -o dummy 2>/dev/null
+		$CC_FOR_BUILD $dummy.c -o $dummy 2>/dev/null
 		if test "$?" = 0 ; then
-			./dummy | grep 1\.99 > /dev/null
+			./$dummy | grep 1\.99 > /dev/null
 			if test "$?" = 0 ; then
 				LIBC="libc1"
 			fi
 		fi	
-		rm -f dummy.c dummy
-		echo powerpc-unknown-linux-gnu${LIBC} ; exit 0 ;;
+		rm -f $dummy.c $dummy
+		echo powerpc-unknown-linux-gnu${LIBC}
+		exit 0
+		;;
 	esac
 
 	if test "${UNAME_MACHINE}" = "alpha" ; then
-		sed 's/^	//'  <<EOF >dummy.s
-		.globl main
-		.ent main
-	main:
-		.frame \$30,0,\$26,0
-		.prologue 0
-		.long 0x47e03d80 # implver $0
-		lda \$2,259
-		.long 0x47e20c21 # amask $2,$1
-		srl \$1,8,\$2
-		sll \$2,2,\$2
-		sll \$0,3,\$0
-		addl \$1,\$0,\$0
-		addl \$2,\$0,\$0
-		ret \$31,(\$26),1
-		.end main
+		cat <<EOF >$dummy.s
+			.data
+		\$Lformat:
+			.byte 37,100,45,37,120,10,0	# "%d-%x\n"
+
+			.text
+			.globl main
+			.align 4
+			.ent main
+		main:
+			.frame \$30,16,\$26,0
+			ldgp \$29,0(\$27)
+			.prologue 1
+			.long 0x47e03d80 # implver \$0
+			lda \$2,-1
+			.long 0x47e20c21 # amask \$2,\$1
+			lda \$16,\$Lformat
+			mov \$0,\$17
+			not \$1,\$18
+			jsr \$26,printf
+			ldgp \$29,0(\$26)
+			mov 0,\$16
+			jsr \$26,exit
+			.end main
 EOF
 		LIBC=""
-		${CC-cc} dummy.s -o dummy 2>/dev/null
+		$CC_FOR_BUILD $dummy.s -o $dummy 2>/dev/null
 		if test "$?" = 0 ; then
-			./dummy
-			case "$?" in
-			7)
+			case `./$dummy` in
+			0-0)
 				UNAME_MACHINE="alpha"
 				;;
-			15)
+			1-0)
 				UNAME_MACHINE="alphaev5"
 				;;
-			14)
+			1-1)
 				UNAME_MACHINE="alphaev56"
 				;;
-			10)
+			1-101)
 				UNAME_MACHINE="alphapca56"
 				;;
-			16)
+			2-303)
 				UNAME_MACHINE="alphaev6"
+				;;
+			2-307)
+				UNAME_MACHINE="alphaev67"
 				;;
-			esac	
+			esac
 
-			objdump --private-headers dummy | \
+			objdump --private-headers $dummy | \
 			  grep ld.so.1 > /dev/null
 			if test "$?" = 0 ; then
 				LIBC="libc1"
 			fi
-		fi	
-		rm -f dummy.s dummy
+		fi
+		rm -f $dummy.s $dummy
 		echo ${UNAME_MACHINE}-unknown-linux-gnu${LIBC} ; exit 0
 	elif test "${UNAME_MACHINE}" = "mips" ; then
-	  cat >dummy.c <<EOF
-main(argc, argv)
-     int argc;
-     char *argv[];
-{
+	  cat >$dummy.c <<EOF
+#ifdef __cplusplus
+#include <stdio.h>  /* for printf() prototype */
+	int main (int argc, char *argv[]) {
+#else
+	int main (argc, argv) int argc; char *argv[]; {
+#endif
 #ifdef __MIPSEB__
   printf ("%s-unknown-linux-gnu\n", argv[1]);
 #endif
@@ -671,8 +803,10 @@
   return 0;
 }
 EOF
-	  ${CC-cc} dummy.c -o dummy 2>/dev/null && ./dummy "${UNAME_MACHINE}" && rm dummy.c dummy && exit 0
-	  rm -f dummy.c dummy
+	  $CC_FOR_BUILD $dummy.c -o $dummy 2>/dev/null && ./$dummy "${UNAME_MACHINE}" && rm $dummy.c $dummy && exit 0
+	  rm -f $dummy.c $dummy
+	elif test "${UNAME_MACHINE}" = "s390"; then
+	  echo s390-ibm-linux && exit 0
 	else
 	  # Either a pre-BFD a.out linker (linux-gnuoldld)
 	  # or one that does not give us useful --help.
@@ -691,12 +825,14 @@
 	    ;;
 	  esac
 	  # Determine whether the default compiler is a.out or elf
-	  cat >dummy.c <<EOF
+	  cat >$dummy.c <<EOF
 #include <features.h>
-main(argc, argv)
-     int argc;
-     char *argv[];
-{
+#ifdef __cplusplus
+#include <stdio.h>  /* for printf() prototype */
+	int main (int argc, char *argv[]) {
+#else
+	int main (argc, argv) int argc; char *argv[]; {
+#endif
 #ifdef __ELF__
 # ifdef __GLIBC__
 #  if __GLIBC__ >= 2
@@ -713,8 +849,8 @@
   return 0;
 }
 EOF
-	  ${CC-cc} dummy.c -o dummy 2>/dev/null && ./dummy "${UNAME_MACHINE}" && rm dummy.c dummy && exit 0
-	  rm -f dummy.c dummy
+	  $CC_FOR_BUILD $dummy.c -o $dummy 2>/dev/null && ./$dummy "${UNAME_MACHINE}" && rm $dummy.c $dummy && exit 0
+	  rm -f $dummy.c $dummy
 	fi ;;
 # ptx 4.0 does uname -s correctly, with DYNIX/ptx in there.  earlier versions
 # are messed up and put the nodename in both sysname and nodename.
@@ -730,24 +866,22 @@
 	echo ${UNAME_MACHINE}-pc-sysv4.2uw${UNAME_VERSION}
 	exit 0 ;;
     i?86:*:4.*:* | i?86:SYSTEM_V:4.*:*)
+	UNAME_REL=`echo ${UNAME_RELEASE} | sed 's/\/MP$//'`
 	if grep Novell /usr/include/link.h >/dev/null 2>/dev/null; then
-		echo ${UNAME_MACHINE}-univel-sysv${UNAME_RELEASE}
+		echo ${UNAME_MACHINE}-univel-sysv${UNAME_REL}
 	else
-		echo ${UNAME_MACHINE}-pc-sysv${UNAME_RELEASE}
+		echo ${UNAME_MACHINE}-pc-sysv${UNAME_REL}
 	fi
 	exit 0 ;;
-    i?86:*:5:7)
-       UNAME_REL=`(/bin/uname -X|egrep Release|sed -e 's/.*= //')`
-       (/bin/uname -X|egrep i80486 >/dev/null) && UNAME_MACHINE=i486
-       (/bin/uname -X|egrep '^Machine.*Pentium' >/dev/null) \
-               && UNAME_MACHINE=i586
-# 5.0.4c returns "Pent II".  5.0.5 returns PentII
-       (/bin/uname -X|egrep '^Machine.*Pent.*II' >/dev/null) \
-               && UNAME_MACHINE=i686
-       (/bin/uname -X|egrep '^Machine.*Pentium Pro' >/dev/null) \
-               && UNAME_MACHINE=i686
-       echo ${UNAME_MACHINE}-${UNAME_SYSTEM}${UNAME_VERSION}-sysv${UNAME_RELEASE}
-       exit 0 ;;
+    i?86:*:5:7*)
+        # Fixed at (any) Pentium or better
+        UNAME_MACHINE=i586
+        if [ ${UNAME_SYSTEM} = "UnixWare" ] ; then
+	    echo ${UNAME_MACHINE}-sco-sysv${UNAME_RELEASE}uw${UNAME_VERSION}
+	else
+	    echo ${UNAME_MACHINE}-pc-sysv${UNAME_RELEASE}
+	fi
+	exit 0 ;;
     i?86:*:3.2:*)
 	if test -f /usr/options/cb.name; then
 		UNAME_REL=`sed -n 's/.*Version //p' </usr/options/cb.name`
@@ -757,18 +891,20 @@
 		(/bin/uname -X|egrep i80486 >/dev/null) && UNAME_MACHINE=i486
 		(/bin/uname -X|egrep '^Machine.*Pentium' >/dev/null) \
 			&& UNAME_MACHINE=i586
-		(/bin/uname -X|egrep '^Machine.*PentII' >/dev/null) \
+		(/bin/uname -X|egrep '^Machine.*Pent ?II' >/dev/null) \
 			&& UNAME_MACHINE=i686
-		(/bin/uname -X|egrep '^Machine.*Pent II' >/dev/null) \
+		(/bin/uname -X|egrep '^Machine.*Pentium Pro' >/dev/null) \
 			&& UNAME_MACHINE=i686
-                (/bin/uname -X|egrep '^Machine.*Pentium Pro' >/dev/null) \
-                        && UNAME_MACHINE=i686
 		echo ${UNAME_MACHINE}-pc-sco$UNAME_REL
 	else
 		echo ${UNAME_MACHINE}-pc-sysv32
 	fi
 	exit 0 ;;
+    i?86:*DOS:*:*)
+	echo ${UNAME_MACHINE}-pc-msdosdjgpp
+	exit 0 ;;
     pc:*:*:*)
+	# Left here for compatibility:
         # uname -m prints for DJGPP always 'pc', but it prints nothing about
         # the processor, so we play safe by assuming i386.
 	echo i386-pc-msdosdjgpp
@@ -809,7 +945,7 @@
     mc68030:UNIX_System_V:4.*:*)
 	echo m68k-atari-sysv4
 	exit 0 ;;
-    i?86:LynxOS:2.*:*)
+    i?86:LynxOS:2.*:* | i?86:LynxOS:3.[01]*:*)
 	echo i386-unknown-lynxos${UNAME_RELEASE}
 	exit 0 ;;
     TSUNAMI:LynxOS:2.*:*)
@@ -821,6 +957,9 @@
     SM[BE]S:UNIX_SV:*:*)
 	echo mips-dde-sysv${UNAME_RELEASE}
 	exit 0 ;;
+    RM*:ReliantUNIX-*:*:*)
+	echo mips-sni-sysv4
+	exit 0 ;;
     RM*:SINIX-*:*:*)
 	echo mips-sni-sysv4
 	exit 0 ;;
@@ -851,7 +990,7 @@
     news*:NEWS-OS:*:6*)
 	echo mips-sony-newsos6
 	exit 0 ;;
-    R3000:*System_V*:*:* | R4000:UNIX_SYSV:*:* | R4000:UNIX_SV:*:*)
+    R[34]000:*System_V*:*:* | R4000:UNIX_SYSV:*:* | R*000:UNIX_SV:*:*)
 	if [ -d /usr/nec ]; then
 	        echo mips-nec-sysv${UNAME_RELEASE}
 	else
@@ -867,12 +1006,33 @@
     BePC:BeOS:*:*)	# BeOS running on Intel PC compatible.
 	echo i586-pc-beos
 	exit 0 ;;
+    SX-4:SUPER-UX:*:*)
+	echo sx4-nec-superux${UNAME_RELEASE}
+	exit 0 ;;
+    SX-5:SUPER-UX:*:*)
+	echo sx5-nec-superux${UNAME_RELEASE}
+	exit 0 ;;
+    Power*:Rhapsody:*:*)
+	echo powerpc-apple-rhapsody${UNAME_RELEASE}
+	exit 0 ;;
+    *:Rhapsody:*:*)
+	echo ${UNAME_MACHINE}-apple-rhapsody${UNAME_RELEASE}
+	exit 0 ;;
+    Power*:Mac*OS:*:*)
+	echo powerpc-apple-macos${UNAME_RELEASE}
+	exit 0 ;;
+    *:Mac*OS:*:*)
+	echo ${UNAME_MACHINE}-apple-macos${UNAME_RELEASE}
+	exit 0 ;;
+    *:QNX:*:4*)
+	echo i386-qnx-qnx${UNAME_VERSION}
+	exit 0 ;;
 esac
 
 #echo '(No uname command or uname output not recognized.)' 1>&2
 #echo "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" 1>&2
 
-cat >dummy.c <<EOF
+cat >$dummy.c <<EOF
 #ifdef _SEQUENT_
 # include <sys/types.h>
 # include <sys/utsname.h>
@@ -910,7 +1070,10 @@
 #endif
   int version;
   version=`(hostinfo | sed -n 's/.*NeXT Mach \([0-9]*\).*/\1/p') 2>/dev/null`;
-  printf ("%s-next-nextstep%d\n", __ARCHITECTURE__, version);
+  if (version < 4)
+    printf ("%s-next-nextstep%d\n", __ARCHITECTURE__, version);
+  else
+    printf ("%s-next-openstep%d\n", __ARCHITECTURE__, version);
   exit (0);
 #endif
 
@@ -970,8 +1133,8 @@
 }
 EOF
 
-${CC-cc} dummy.c -o dummy 2>/dev/null && ./dummy && rm dummy.c dummy && exit 0
-rm -f dummy.c dummy
+$CC_FOR_BUILD $dummy.c -o $dummy 2>/dev/null && ./$dummy && rm $dummy.c $dummy && exit 0
+rm -f $dummy.c $dummy
 
 # Apollos put the system type in the environment.
 
Index: config.sub
===================================================================
RCS file: /cvs/java/libgcj/config.sub,v
retrieving revision 1.4
diff -u -r1.4 config.sub
--- config.sub	1999/10/02 16:06:47	1.4
+++ config.sub	2000/02/24 00:29:14
@@ -1,6 +1,8 @@
 #! /bin/sh
 # Configuration validation subroutine script, version 1.1.
-#   Copyright (C) 1991, 92-97, 1998, 1999 Free Software Foundation, Inc.
+#   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000
+#   Free Software Foundation, Inc.
+#
 # This file is (in principle) common to ALL GNU software.
 # The presence of a machine in this file suggests that SOME GNU software
 # can handle that machine.  It does not imply ALL GNU software can.
@@ -25,6 +27,9 @@
 # configuration script generated by Autoconf, you may include it under
 # the same distribution terms that you use for the rest of that program.
 
+# Written by Per Bothner <bothner@cygnus.com>.
+# Please send patches to <config-patches@gnu.org>.
+#
 # Configuration subroutine to validate and canonicalize a configuration type.
 # Supply the specified configuration type as an argument.
 # If it is invalid, we print an error message on stderr and exit with code 1.
@@ -156,27 +161,34 @@
 	-psos*)
 		os=-psos
 		;;
+	-mint | -mint[0-9]*)
+		basic_machine=m68k-atari
+		os=-mint
+		;;
 esac
 
 # Decode aliases for certain CPU-COMPANY combinations.
 case $basic_machine in
 	# Recognize the basic CPU types without company name.
 	# Some are omitted here because they have special meanings below.
-	tahoe | i860 | m32r | m68k | m68000 | m88k | ns32k | arc | arm \
+	tahoe | i860 | ia64 | m32r | m68k | m68000 | m88k | ns32k | arc | arm \
 		| arme[lb] | pyramid | mn10200 | mn10300 | tron | a29k \
 		| 580 | i960 | h8300 \
 		| hppa | hppa1.0 | hppa1.1 | hppa2.0 | hppa2.0w | hppa2.0n \
 		| alpha | alphaev[4-8] | alphaev56 | alphapca5[67] \
+		| alphaev6[78] \
 		| we32k | ns16k | clipper | i370 | sh | powerpc | powerpcle \
 		| 1750a | dsp16xx | pdp11 | mips16 | mips64 | mipsel | mips64el \
 		| mips64orion | mips64orionel | mipstx39 | mipstx39el \
 		| mips64vr4300 | mips64vr4300el | mips64vr4100 | mips64vr4100el \
-		| mips64vr5000 | miprs64vr5000el \
-	        | m88110 | m680[012346]0 | m683?2 | m68360 | m5200 | z8k | v70 \
-		| sparc | sparclet | sparclite | sparc64 | sparc86x | sparcv9 \
-		| thumb | v850 | c4x | d10v | h8500 | w65 | fr30 | pj | pjl)
+		| mips64vr5000 | miprs64vr5000el | mcore \
+		| sparc | sparclet | sparclite | sparc64 | sparcv9 | v850 | c4x \
+		| thumb | d10v | fr30 | avr)
 		basic_machine=$basic_machine-unknown
 		;;
+	m88110 | m680[12346]0 | m683?2 | m68360 | m5200 | z8k | v70 | h8500 | w65 | pj | pjl)
+		;;
+
 	# We use `pc' rather than `unknown'
 	# because (1) that's what they normally are, and
 	# (2) the word "unknown" tends to confuse beginning users.
@@ -189,21 +201,23 @@
 		exit 1
 		;;
 	# Recognize the basic CPU types with company name.
-	vax-* | tahoe-* | i[34567]86-* | i860-* | m32r-* | m68k-* | m68000-* \
+	# FIXME: clean up the formatting here.
+	vax-* | tahoe-* | i[34567]86-* | i860-* | ia64-* | m32r-* | m68k-* | m68000-* \
 	      | m88k-* | sparc-* | ns32k-* | fx80-* | arc-* | arm-* | c[123]* \
 	      | mips-* | pyramid-* | tron-* | a29k-* | romp-* | rs6000-* \
 	      | power-* | none-* | 580-* | cray2-* | h8300-* | h8500-* | i960-* \
 	      | xmp-* | ymp-* \
 	      | hppa-* | hppa1.0-* | hppa1.1-* | hppa2.0-* | hppa2.0w-* | hppa2.0n-* \
 	      | alpha-* | alphaev[4-8]-* | alphaev56-* | alphapca5[67]-* \
+	      | alphaev6[78]-* \
 	      | we32k-* | cydra-* | ns16k-* | pn-* | np1-* | xps100-* \
 	      | clipper-* | orion-* \
 	      | sparclite-* | pdp11-* | sh-* | powerpc-* | powerpcle-* \
 	      | sparc64-* | sparcv9-* | sparc86x-* | mips16-* | mips64-* | mipsel-* \
 	      | mips64el-* | mips64orion-* | mips64orionel-* \
 	      | mips64vr4100-* | mips64vr4100el-* | mips64vr4300-* | mips64vr4300el-* \
-	      | mipstx39-* | mipstx39el-* \
-	      | f301-* | arm*-* | t3e-* \
+	      | mipstx39-* | mipstx39el-* | mcore-* \
+	      | f301-* | armv*-* | s390-* | sv1-* | t3e-* \
 	      | m88110-* | m680[01234]0-* | m683?2-* | m68360-* | z8k-* | d10v-* \
 	      | thumb-* | v850-* | d30v-* | tic30-* | c30-* | fr30-* )
 		;;
@@ -457,6 +471,9 @@
 		basic_machine=i386-unknown
 		os=-mingw32
 		;;
+	i386-qnx | qnx)
+		basic_machine=i386-qnx
+		;;
 	iris | iris4d)
 		basic_machine=mips-sgi
 		case $os in
@@ -485,7 +502,7 @@
 	miniframe)
 		basic_machine=m68000-convergent
 		;;
-	*mint | *MiNT)
+	*mint | -mint[0-9]* | *MiNT | *MiNT[0-9]*)
 		basic_machine=m68k-atari
 		os=-mint
 		;;
@@ -503,6 +520,10 @@
 	mips3*)
 		basic_machine=`echo $basic_machine | sed -e 's/mips3/mips64/'`-unknown
 		;;
+	mmix*)
+		basic_machine=mmix-knuth
+		os=-mmixware
+		;;
 	monitor)
 		basic_machine=m68k-rom68k
 		os=-coff
@@ -524,7 +545,7 @@
 		os=-netbsd
 		;;
 	netwinder)
-		basic_machine=armv4l-corel
+		basic_machine=armv4l-rebel
 		os=-linux
 		;;
 	news | news700 | news800 | news900)
@@ -622,12 +643,6 @@
 	pentiumii-* | pentium2-*)
 		basic_machine=i786-`echo $basic_machine | sed 's/^[^-]*-//'`
 		;;
-	pj-*)	 
-		basic_machine=pj-unknown
-		;;
-	pjl-*)	  
-		basic_machine=pjl-unknown
-		;;
 	pn)
 		basic_machine=pn-gould
 		;;
@@ -725,6 +740,10 @@
 	sun386 | sun386i | roadrunner)
 		basic_machine=i386-sun
 		;;
+	sv1)
+		basic_machine=sv1-cray
+		os=-unicos
+		;;
 	symmetry)
 		basic_machine=i386-sequent
 		os=-dynix
@@ -905,7 +924,7 @@
 	      | -*vms* | -sco* | -esix* | -isc* | -aix* | -sunos | -sunos[34]*\
 	      | -hpux* | -unos* | -osf* | -luna* | -dgux* | -solaris* | -sym* \
 	      | -amigaos* | -amigados* | -msdos* | -newsos* | -unicos* | -aof* \
-	      | -aos* | -opened* \
+	      | -aos* \
 	      | -nindy* | -vxsim* | -vxworks* | -ebmon* | -hms* | -mvs* \
 	      | -clix* | -riscos* | -uniplus* | -iris* | -rtu* | -xenix* \
 	      | -hiux* | -386bsd* | -netbsd* | -openbsd* | -freebsd* | -riscix* \
@@ -914,12 +933,12 @@
 	      | -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \
 	      | -cygwin* | -pe* | -psos* | -moss* | -proelf* | -rtems* \
 	      | -mingw32* | -linux-gnu* | -uxpv* | -beos* | -mpeix* | -udk* \
-	      | -interix* | -uwin* | -rhapsody* | -openstep* | -oskit*)
+	      | -interix* | -uwin* | -rhapsody* | -opened* | -openstep* | -oskit*)
 	# Remember, each alternative MUST END IN *, to match a version number.
 		;;
 	-sim | -es1800* | -hms* | -xray | -os68k* | -none* | -v88r* \
 	      | -windows* | -osx | -abug | -netware* | -os9* | -beos* \
-	      | -macos* | -mpw* | -magic* | -mon960* | -lnews*)
+	      | -macos* | -mpw* | -magic* | -mmixware* | -mon960* | -lnews*)
 		;;
 	-mac*)
 		os=`echo $os | sed -e 's|mac|macos|'`
@@ -973,6 +992,9 @@
 	-oss*)
 		os=-sysv3
 		;;
+        -qnx)
+		os=-qnx4
+		;;
 	-svr4)
 		os=-sysv4
 		;;
@@ -1022,7 +1044,7 @@
 	*-acorn)
 		os=-riscix1.2
 		;;
-	arm*-corel)
+	arm*-rebel)
 		os=-linux
 		;;
 	arm*-semi)

From java-patches-return-509-listarch-java-patches=sourceware.cygnus.com@sourceware.cygnus.com Fri Feb 25 04:00:35 2000
Return-Path: <java-patches-return-509-listarch-java-patches=sourceware.cygnus.com@sourceware.cygnus.com>
Delivered-To: listarch-java-patches@sourceware.cygnus.com
Received: (qmail 12629 invoked by alias); 25 Feb 2000 04:00:34 -0000
Mailing-List: contact java-patches-help@sourceware.cygnus.com; run by ezmlm
Precedence: bulk
List-Subscribe: <mailto:java-patches-subscribe@sourceware.cygnus.com>
List-Archive: <http://sourceware.cygnus.com/ml/java-patches/>
List-Post: <mailto:java-patches@sourceware.cygnus.com>
List-Help: <mailto:java-patches-help@sourceware.cygnus.com>, <http://sourceware.cygnus.com/ml/#faqs>
Sender: java-patches-owner@sourceware.cygnus.com
Delivered-To: mailing list java-patches@sourceware.cygnus.com
Received: (qmail 12601 invoked from network); 25 Feb 2000 04:00:34 -0000
Date: Thu, 24 Feb 2000 20:00:32 -0800 (PST)
From: Warren Levy <warrenl@cygnus.com>
To: java-patches@sourceware.cygnus.com
Subject: Patch: BigInteger private method/fields
Message-ID: <Pine.SOL.3.91.1000224195339.10338G-100000@fencer.cygnus.com>
MIME-Version: 1.0
Content-Type: TEXT/PLAIN; charset=US-ASCII

Folks,
I've committed the following minor mod to correct the private/public 
nature of a couple fields and a method in java.math.BigInteger.
--warrenl


2000-02-24  Warren Levy  <warrenl@cygnus.com>

	* java/math/BigInteger.java(ival): Made private.
	(words): Ditto.
	(neg): Ditto.


Index: java/math/BigInteger.java
===================================================================
RCS file: /cvs/java/libgcj/libjava/java/math/BigInteger.java,v
retrieving revision 1.3
diff -u -p -r1.3 BigInteger.java
--- BigInteger.java	2000/02/14 10:23:29	1.3
+++ BigInteger.java	2000/02/25 03:57:04
@@ -35,8 +35,8 @@ public class BigInteger extends Number i
    * If words == null, the ival is the value of this BigInteger.
    * Otherwise, the first ival elements of words make the value
    * of this BigInteger, stored in little-endian order, 2's-complement form. */
-  public int ival;
-  public int[] words;
+  private int ival;
+  private int[] words;
 
 
   /** We pre-allocate integers in the range minFixNum..maxFixNum. */
@@ -1779,7 +1779,7 @@ public class BigInteger extends Number i
     return abs(this);
   }
 
-  public static BigInteger neg(BigInteger x)
+  private static BigInteger neg(BigInteger x)
   {
     if (x.words == null && x.ival != Integer.MIN_VALUE)
       return make(- x.ival);





From java-patches-return-510-listarch-java-patches=sourceware.cygnus.com@sourceware.cygnus.com Fri Feb 25 05:33:32 2000
Return-Path: <java-patches-return-510-listarch-java-patches=sourceware.cygnus.com@sourceware.cygnus.com>
Delivered-To: listarch-java-patches@sourceware.cygnus.com
Received: (qmail 23035 invoked by alias); 25 Feb 2000 05:33:32 -0000
Mailing-List: contact java-patches-help@sourceware.cygnus.com; run by ezmlm
Precedence: bulk
List-Subscribe: <mailto:java-patches-subscribe@sourceware.cygnus.com>
List-Archive: <http://sourceware.cygnus.com/ml/java-patches/>
List-Post: <mailto:java-patches@sourceware.cygnus.com>
List-Help: <mailto:java-patches-help@sourceware.cygnus.com>, <http://sourceware.cygnus.com/ml/#faqs>
Sender: java-patches-owner@sourceware.cygnus.com
Delivered-To: mailing list java-patches@sourceware.cygnus.com
Received: (qmail 23012 invoked from network); 25 Feb 2000 05:33:23 -0000
Message-ID: <38B614FE.4572CBF1@albatross.co.nz>
Date: Fri, 25 Feb 2000 18:37:02 +1300
From: Bryce McKinlay <bryce@albatross.co.nz>
X-Mailer: Mozilla 4.7 [en] (X11; U; Linux 2.3.25 i686)
X-Accept-Language: en
MIME-Version: 1.0
To: java-patches@sourceware.cygnus.com
Subject: Patch: PR libgcj/32
Content-Type: multipart/mixed;
 boundary="------------F4906731F6749969C3645970"

This is a multi-part message in MIME format.
--------------F4906731F6749969C3645970
Content-Type: text/plain; charset=us-ascii
Content-Transfer-Encoding: 7bit

This is a new fix for an old bug. The problem is that certain classes in
java.text need to load resources via the URL class loading mechanism.
This mechanism itself uses those java.text classes, and in some cases we
get an ExceptionInInitializerError due to intializer co-dependency. This
patch removes the DateFormat initializers from URLConnection (and
lazy-initializing them instead), which is a simpler and hopefully more
robust fix than hacking the java.text classes themselves.

  [ bryce ]

2000-02-25  Bryce McKinlay  <bryce@albatross.co.nz>

        * java/net/URLConnection.java (initializeDateFormats): New
private
        method.
        (getHeaderFieldDate): Call initializeDateFormats if required.
        locale, dateFormat1, dateFormat2, dateFormat3: Don't initialize
        these.
        Fix for PR libgcj/32.


--------------F4906731F6749969C3645970
Content-Type: text/plain; charset=us-ascii;
 name="URLConnection.diff"
Content-Transfer-Encoding: 7bit
Content-Disposition: inline;
 filename="URLConnection.diff"

Index: java/net/URLConnection.java
===================================================================
RCS file: /cvs/java/libgcj/libjava/java/net/URLConnection.java,v
retrieving revision 1.3
diff -u -r1.3 URLConnection.java
--- URLConnection.java	2000/02/21 05:54:29	1.3
+++ URLConnection.java	2000/02/25 05:24:05
@@ -47,13 +47,10 @@
   private static ContentHandlerFactory factory;
   private static ContentHandler contentHandler;
   private static Hashtable handlers = new Hashtable();
-  private static Locale locale = new Locale("En", "Us", "Unix");
-  private static SimpleDateFormat dateFormat1 =
-	  new SimpleDateFormat("EEE, dd MMM yyyy hh:mm:ss 'GMT'", locale);
-  private static SimpleDateFormat dateFormat2 =
-	  new SimpleDateFormat("EEEE, dd-MMM-yy hh:mm:ss 'GMT'", locale);
-  private static SimpleDateFormat dateFormat3 =
-	  new SimpleDateFormat("EEE MMM d hh:mm:ss yyyy", locale);
+  private static Locale locale = null; 
+  private static SimpleDateFormat dateFormat1 = null,
+                                  dateFormat2 = null,
+				  dateFormat3 = null;
 
   protected URLConnection(URL url)
   {
@@ -128,6 +125,8 @@
 
   public long getHeaderFieldDate(String name, long val)
   {
+    if (locale == null)
+      initializeDateFormats();
     String str = getHeaderField(name);
     if (str != null)
       {
@@ -436,5 +435,18 @@
     // table for content types that don't have a non-default ContentHandler.
     handlers.put(contentType, contentType);
     return null;
+  }
+  
+  // We don't put these in a static initializer, because it creates problems
+  // with initializer co-dependency: SimpleDateFormat's constructors eventually 
+  // depend on URLConnection (via the java.text.*Symbols classes).
+  private void initializeDateFormats()
+  {
+    locale = new Locale("En", "Us", "Unix");
+    dateFormat1 = new SimpleDateFormat("EEE, dd MMM yyyy hh:mm:ss 'GMT'", 
+                                       locale);
+    dateFormat2 = new SimpleDateFormat("EEEE, dd-MMM-yy hh:mm:ss 'GMT'", 
+                                       locale);
+    dateFormat3 = new SimpleDateFormat("EEE MMM d hh:mm:ss yyyy", locale);
   }
 }

--------------F4906731F6749969C3645970--

From java-patches-return-511-listarch-java-patches=sourceware.cygnus.com@sourceware.cygnus.com Fri Feb 25 08:19:04 2000
Return-Path: <java-patches-return-511-listarch-java-patches=sourceware.cygnus.com@sourceware.cygnus.com>
Delivered-To: listarch-java-patches@sourceware.cygnus.com
Received: (qmail 18851 invoked by alias); 25 Feb 2000 08:19:02 -0000
Mailing-List: contact java-patches-help@sourceware.cygnus.com; run by ezmlm
Precedence: bulk
List-Subscribe: <mailto:java-patches-subscribe@sourceware.cygnus.com>
List-Archive: <http://sourceware.cygnus.com/ml/java-patches/>
List-Post: <mailto:java-patches@sourceware.cygnus.com>
List-Help: <mailto:java-patches-help@sourceware.cygnus.com>, <http://sourceware.cygnus.com/ml/#faqs>
Sender: java-patches-owner@sourceware.cygnus.com
Delivered-To: mailing list java-patches@sourceware.cygnus.com
Received: (qmail 18804 invoked from network); 25 Feb 2000 08:19:01 -0000
Date: Fri, 25 Feb 2000 00:19:00 -0800 (PST)
Message-Id: <200002250819.AAA27274@ferrule.cygnus.com>
From: Tom Tromey <tromey@cygnus.com>
To: Bryce McKinlay <bryce@albatross.co.nz>
Cc: java-patches@sourceware.cygnus.com,
        Java Gnats Server <java-gnats@sourceware.cygnus.com>
Subject: Re: libgcj/38
In-Reply-To: <38B614FE.4572CBF1@albatross.co.nz>
References: <38B614FE.4572CBF1@albatross.co.nz>
X-Zippy:  I am deeply CONCERNED and I want something GOOD for BREAKFAST!
X-Attribution:  Tom

>>>>> "Bryce" == Bryce McKinlay <bryce@albatross.co.nz> writes:

Bryce> This is a new fix for an old bug. The problem is that certain
Bryce> classes in java.text need to load resources via the URL class
Bryce> loading mechanism.  This mechanism itself uses those java.text
Bryce> classes, and in some cases we get an
Bryce> ExceptionInInitializerError due to intializer co-dependency.

Bryce> +  private void initializeDateFormats()

Shouldn't this be synchronized?
And shouldn't the body then check again for "locale == null"?

BTW this isn't for PR 32.  It is for PR 38.

Tom

From java-patches-return-512-listarch-java-patches=sourceware.cygnus.com@sourceware.cygnus.com Fri Feb 25 08:46:00 2000
Return-Path: <java-patches-return-512-listarch-java-patches=sourceware.cygnus.com@sourceware.cygnus.com>
Delivered-To: listarch-java-patches@sourceware.cygnus.com
Received: (qmail 24406 invoked by alias); 25 Feb 2000 08:46:00 -0000
Mailing-List: contact java-patches-help@sourceware.cygnus.com; run by ezmlm
Precedence: bulk
List-Subscribe: <mailto:java-patches-subscribe@sourceware.cygnus.com>
List-Archive: <http://sourceware.cygnus.com/ml/java-patches/>
List-Post: <mailto:java-patches@sourceware.cygnus.com>
List-Help: <mailto:java-patches-help@sourceware.cygnus.com>, <http://sourceware.cygnus.com/ml/#faqs>
Sender: java-patches-owner@sourceware.cygnus.com
Delivered-To: mailing list java-patches@sourceware.cygnus.com
Received: (qmail 24363 invoked from network); 25 Feb 2000 08:45:57 -0000
Message-ID: <38B64024.3A1C9532@albatross.co.nz>
Date: Fri, 25 Feb 2000 21:41:08 +1300
From: Bryce McKinlay <bryce@albatross.co.nz>
X-Mailer: Mozilla 4.7 [en] (X11; I; Linux 2.2.14 i686)
X-Accept-Language: en
MIME-Version: 1.0
To: Tom Tromey <tromey@cygnus.com>
CC: java-patches@sourceware.cygnus.com,
        Java Gnats Server <java-gnats@sourceware.cygnus.com>
Subject: Re: libgcj/38
References: <38B614FE.4572CBF1@albatross.co.nz> <200002250819.AAA27274@ferrule.cygnus.com>
Content-Type: text/plain; charset=us-ascii
Content-Transfer-Encoding: 7bit

Tom Tromey wrote:

> >>>>> "Bryce" == Bryce McKinlay <bryce@albatross.co.nz> writes:
>
> Bryce> This is a new fix for an old bug. The problem is that certain
> Bryce> classes in java.text need to load resources via the URL class
> Bryce> loading mechanism.  This mechanism itself uses those java.text
> Bryce> classes, and in some cases we get an
> Bryce> ExceptionInInitializerError due to intializer co-dependency.
>
> Bryce> +  private void initializeDateFormats()
>
> Shouldn't this be synchronized?
> And shouldn't the body then check again for "locale == null"?

Well now that you point this out, it will have to synchronize around the
"locale == null" check in getHeaderDateField() too. Bummer.

regards

  [ bryce ]


From java-patches-return-513-listarch-java-patches=sourceware.cygnus.com@sourceware.cygnus.com Fri Feb 25 08:55:58 2000
Return-Path: <java-patches-return-513-listarch-java-patches=sourceware.cygnus.com@sourceware.cygnus.com>
Delivered-To: listarch-java-patches@sourceware.cygnus.com
Received: (qmail 30910 invoked by alias); 25 Feb 2000 08:55:58 -0000
Mailing-List: contact java-patches-help@sourceware.cygnus.com; run by ezmlm
Precedence: bulk
List-Subscribe: <mailto:java-patches-subscribe@sourceware.cygnus.com>
List-Archive: <http://sourceware.cygnus.com/ml/java-patches/>
List-Post: <mailto:java-patches@sourceware.cygnus.com>
List-Help: <mailto:java-patches-help@sourceware.cygnus.com>, <http://sourceware.cygnus.com/ml/#faqs>
Sender: java-patches-owner@sourceware.cygnus.com
Delivered-To: mailing list java-patches@sourceware.cygnus.com
Received: (qmail 30845 invoked from network); 25 Feb 2000 08:55:56 -0000
Date: Fri, 25 Feb 2000 00:55:55 -0800 (PST)
Message-Id: <200002250855.AAA27307@ferrule.cygnus.com>
From: Tom Tromey <tromey@cygnus.com>
To: Bryce McKinlay <bryce@albatross.co.nz>
Cc: tromey@cygnus.com, java-gnats@sourceware.cygnus.com,
        Java Patch List <java-patches@sourceware.cygnus.com>
Subject: Re: libgcj/38
In-Reply-To: <20000225085000.28264.qmail@sourceware.cygnus.com>
References: <20000225085000.28264.qmail@sourceware.cygnus.com>
X-Zippy:  MY income is ALL disposable!
X-Attribution:  Tom

Bryce>  Well now that you point this out, it will have to synchronize
Bryce>  around the "locale == null" check in getHeaderDateField()
Bryce>  too. Bummer.

Actually, you don't.  Just have redundant checks.  The outer check (in
getHeaderDateField) doesn't have to be synchronized, because we do a
properly synchronized in the init function.

We use this same idiom elsewhere in libgcj.  This gives good
performance in the common case (no sync needed), but is also
guaranteed to be correct.

Tom

From java-patches-return-514-listarch-java-patches=sourceware.cygnus.com@sourceware.cygnus.com Fri Feb 25 09:22:59 2000
Return-Path: <java-patches-return-514-listarch-java-patches=sourceware.cygnus.com@sourceware.cygnus.com>
Delivered-To: listarch-java-patches@sourceware.cygnus.com
Received: (qmail 3174 invoked by alias); 25 Feb 2000 09:22:58 -0000
Mailing-List: contact java-patches-help@sourceware.cygnus.com; run by ezmlm
Precedence: bulk
List-Subscribe: <mailto:java-patches-subscribe@sourceware.cygnus.com>
List-Archive: <http://sourceware.cygnus.com/ml/java-patches/>
List-Post: <mailto:java-patches@sourceware.cygnus.com>
List-Help: <mailto:java-patches-help@sourceware.cygnus.com>, <http://sourceware.cygnus.com/ml/#faqs>
Sender: java-patches-owner@sourceware.cygnus.com
Delivered-To: mailing list java-patches@sourceware.cygnus.com
Received: (qmail 3099 invoked from network); 25 Feb 2000 09:22:55 -0000
Message-ID: <38B648D1.85306B0C@albatross.co.nz>
Date: Fri, 25 Feb 2000 22:18:09 +1300
From: Bryce McKinlay <bryce@albatross.co.nz>
X-Mailer: Mozilla 4.7 [en] (X11; I; Linux 2.2.14 i686)
X-Accept-Language: en
MIME-Version: 1.0
To: Tom Tromey <tromey@cygnus.com>
CC: java-gnats@sourceware.cygnus.com,
        Java Patch List <java-patches@sourceware.cygnus.com>
Subject: Re: libgcj/38
References: <20000225085000.28264.qmail@sourceware.cygnus.com> <200002250855.AAA27307@ferrule.cygnus.com>
Content-Type: text/plain; charset=us-ascii
Content-Transfer-Encoding: 7bit

Tom Tromey wrote:

> Bryce>  Well now that you point this out, it will have to synchronize
> Bryce>  around the "locale == null" check in getHeaderDateField()
> Bryce>  too. Bummer.
>
> Actually, you don't.  Just have redundant checks.  The outer check (in
> getHeaderDateField) doesn't have to be synchronized, because we do a
> properly synchronized in the init function.
>
> We use this same idiom elsewhere in libgcj.  This gives good
> performance in the common case (no sync needed), but is also
> guaranteed to be correct.

Hmm... I don't think that is 100% safe in this case. ie:

Thread A reaches the null locale check in getHeaderDateField(), and calls
initializeDateFields() which is synchronized. It finishes initializing
the 'locale' field before the kernel switches context to Thread B, which
is sitting just before the null locale check. Thread B sees that locale
is not null, and so tries, unsynchronized, to access 'dateFormat1'.
NullPointerException.

But I understand what your getting at. The right solution is to use a
boolean instead, which gets set after the dateFormal fields have all been
set. Right?

regards

  [ bryce ]



From java-patches-return-515-listarch-java-patches=sourceware.cygnus.com@sourceware.cygnus.com Fri Feb 25 18:14:06 2000
Return-Path: <java-patches-return-515-listarch-java-patches=sourceware.cygnus.com@sourceware.cygnus.com>
Delivered-To: listarch-java-patches@sourceware.cygnus.com
Received: (qmail 22447 invoked by alias); 25 Feb 2000 18:14:06 -0000
Mailing-List: contact java-patches-help@sourceware.cygnus.com; run by ezmlm
Precedence: bulk
List-Subscribe: <mailto:java-patches-subscribe@sourceware.cygnus.com>
List-Archive: <http://sourceware.cygnus.com/ml/java-patches/>
List-Post: <mailto:java-patches@sourceware.cygnus.com>
List-Help: <mailto:java-patches-help@sourceware.cygnus.com>, <http://sourceware.cygnus.com/ml/#faqs>
Sender: java-patches-owner@sourceware.cygnus.com
Delivered-To: mailing list java-patches@sourceware.cygnus.com
Received: (qmail 22393 invoked from network); 25 Feb 2000 18:14:04 -0000
Date: Fri, 25 Feb 2000 10:14:03 -0800 (PST)
Message-Id: <200002251814.KAA27604@ferrule.cygnus.com>
From: Tom Tromey <tromey@cygnus.com>
To: Bryce McKinlay <bryce@albatross.co.nz>
Cc: Tom Tromey <tromey@cygnus.com>, java-gnats@sourceware.cygnus.com,
        Java Patch List <java-patches@sourceware.cygnus.com>
Subject: Re: libgcj/38
In-Reply-To: <38B648D1.85306B0C@albatross.co.nz>
References: <20000225085000.28264.qmail@sourceware.cygnus.com>
	<200002250855.AAA27307@ferrule.cygnus.com>
	<38B648D1.85306B0C@albatross.co.nz>
X-Zippy:  ..  are the STEWED PRUNES still in the HAIR DRYER?
X-Attribution:  Tom

Bryce> Hmm... I don't think that is 100% safe in this case. ie:

You're right.

Bryce> But I understand what your getting at. The right solution is to
Bryce> use a boolean instead, which gets set after the dateFormal
Bryce> fields have all been set. Right?

Or set the locale field last in initializeDateFormats().  If you go
this route, be sure to comment it, as it is obscure.  Which one you
choose is up to you, though...

Tom

From java-patches-return-516-listarch-java-patches=sourceware.cygnus.com@sourceware.cygnus.com Fri Feb 25 19:14:00 2000
Return-Path: <java-patches-return-516-listarch-java-patches=sourceware.cygnus.com@sourceware.cygnus.com>
Delivered-To: listarch-java-patches@sourceware.cygnus.com
Received: (qmail 7713 invoked by alias); 25 Feb 2000 19:14:00 -0000
Mailing-List: contact java-patches-help@sourceware.cygnus.com; run by ezmlm
Precedence: bulk
List-Subscribe: <mailto:java-patches-subscribe@sourceware.cygnus.com>
List-Archive: <http://sourceware.cygnus.com/ml/java-patches/>
List-Post: <mailto:java-patches@sourceware.cygnus.com>
List-Help: <mailto:java-patches-help@sourceware.cygnus.com>, <http://sourceware.cygnus.com/ml/#faqs>
Sender: java-patches-owner@sourceware.cygnus.com
Delivered-To: mailing list java-patches@sourceware.cygnus.com
Received: (qmail 7637 invoked from network); 25 Feb 2000 19:13:40 -0000
To: Java Patch List <java-patches@sourceware.cygnus.com> 
Subject: Patch: IA-64 support for libffi
X-Zippy:  I always wanted a NOSE JOB!!
X-Attribution:  Tom
Bcc:
Reply-To:  tromey@cygnus.com
From:  Tom Tromey <tromey@cygnus.com>
Date: 25 Feb 2000 12:17:52 -0700
Message-ID: <879009drbz.fsf@cygnus.com>
Lines: 1642
X-Mailer: Gnus v5.5/Emacs 20.3

I'm checking in the appended patch.  This adds IA-64 support to
libffi.  This is the first step in porting libgcj to the IA-64.  Many
thanks to Hans Boehm for this work.

2000-02-25  Hans Boehm <boehm@acm.org>

	* src/ia64/ffi.c, src/ia64/ia64_flags.h, src/ia64/unix.S: New
	files.
	* src/raw_api.c (ffi_translate_args): Fixed typo in argument
	list.
	(ffi_prep_raw_closure): Use ffi_translate_args, not
	ffi_closure_translate.
	* src/java_raw_api.c: New file.
	* src/ffitest.c (closure_test_fn): New function.
	(main): Define `rint' as long long on IA64.  Added new test when
	FFI_CLOSURES is defined.
	* include/ffi.h.in (ALIGN): Use size_t, not unsigned.
	(ffi_abi): Recognize IA64.
	(ffi_raw): Added `flt' field.
	Added "Java raw API" code.
	* configure.in: Recognize ia64.
	* Makefile.am (TARGET_SRC_IA64): New macro.
	(libffi_la_common_SOURCES): Added java_raw_api.c.
	(libffi_la_SOURCES): Define in IA64 case.

Tom

Index: Makefile.am
===================================================================
RCS file: /cvs/java/libgcj/libffi/Makefile.am,v
retrieving revision 1.4
diff -u -r1.4 Makefile.am
--- Makefile.am	1999/12/31 22:44:09	1.4
+++ Makefile.am	2000/02/25 19:02:23
@@ -42,13 +42,15 @@
 TARGET_SRC_X86 = src/x86/ffi.c src/x86/sysv.S
 TARGET_SRC_SPARC = src/sparc/ffi.c src/sparc/v8.S
 TARGET_SRC_ALPHA = src/alpha/ffi.c src/alpha/osf.S
+TARGET_SRC_IA64 = src/alpha/ffi.c src/alpha/unix.S
 TARGET_SRC_M68K = src/m68k/ffi.c src/m68k/sysv.S
 TARGET_SRC_POWERPC = src/powerpc/ffi.c src/powerpc/sysv.S
 TARGET_SRC_ARM =  src/arm/sysv.S src/arm/ffi.c
 
 ##libffi_la_SOURCES = src/debug.c src/prep_cif.c src/types.c $(TARGET_SRC_@TARGET@)
 ## Work around automake deficiency
-libffi_la_common_SOURCES = src/debug.c src/prep_cif.c src/types.c src/raw_api.c 
+libffi_la_common_SOURCES = src/debug.c src/prep_cif.c src/types.c \
+		src/raw_api.c src/java_raw_api.c
 if MIPS_GCC
 libffi_la_SOURCES = $(libffi_la_common_SOURCES) $(TARGET_SRC_MIPS_GCC)
 endif
@@ -63,6 +65,9 @@
 endif
 if ALPHA
 libffi_la_SOURCES = $(libffi_la_common_SOURCES) $(TARGET_SRC_ALPHA)
+endif
+if IA64
+libffi_la_SOURCES = $(libffi_la_common_SOURCES) $(TARGET_SRC_IA64)
 endif
 if M68K
 libffi_la_SOURCES = $(libffi_la_common_SOURCES) $(TARGET_SRC_M68K)
Index: configure.in
===================================================================
RCS file: /cvs/java/libgcj/libffi/configure.in,v
retrieving revision 1.3
diff -u -r1.3 configure.in
--- configure.in	1999/09/01 23:16:34	1.3
+++ configure.in	2000/02/25 19:02:23
@@ -27,6 +27,7 @@
 sparc-sun-4*) TARGET=SPARC; TARGETDIR=sparc;;
 sparc-sun-*) TARGET=SPARC; TARGETDIR=sparc;;
 alpha*-*-linux* | alpha*-*-osf*) TARGET=ALPHA; TARGETDIR=alpha;;
+ia64*-*-*) TARGET=IA64; TARGETDIR=ia64;;
 m68k-*-linux*) TARGET=M68K; TARGETDIR=m68k;;
 powerpc-*-linux* | powerpc-*-sysv*) TARGET=POWERPC; TARGETDIR=powerpc;;
 powerpc-*-beos*) TARGET=POWERPC; TARGETDIR=powerpc;;
@@ -42,6 +43,7 @@
 AM_CONDITIONAL(SPARC, test x$TARGET = xSPARC)
 AM_CONDITIONAL(X86, test x$TARGET = xX86)
 AM_CONDITIONAL(ALPHA, test x$TARGET = xALPHA)
+AM_CONDITIONAL(IA64, test x$TARGET = xIA64)
 AM_CONDITIONAL(M68K, test x$TARGET = xM68K)
 AM_CONDITIONAL(POWERPC, test x$TARGET = xPOWERPC)
 AM_CONDITIONAL(ARM, test x$TARGET = xARM)
Index: include/ffi.h.in
===================================================================
RCS file: /cvs/java/libgcj/libffi/include/ffi.h.in,v
retrieving revision 1.3
diff -u -r1.3 ffi.h.in
--- ffi.h.in	1999/09/01 23:16:34	1.3
+++ ffi.h.in	2000/02/25 19:02:24
@@ -24,6 +24,32 @@
 
    ----------------------------------------------------------------------- */
 
+/* -------------------------------------------------------------------
+   The basic API is described in the README file.
+
+   The raw API is designed to bypass some of the argument packing
+   and unpacking on architectures for which it can be avoided.
+
+   The closure API allows interpreted functions to be packaged up
+   inside a C function pointer, so that they can be called as C functions,
+   with no understanding on the client side that they are interpreted.
+   It can also be used in other cases in which it is necessary to package
+   up a user specified parameter and a function pointer as a single
+   function pointer.
+
+   The closure API must be implemented in order to get its functionality,
+   e.g. for use by gij.  Routines are provided to emulate the raw API
+   if the underlying platform doesn't allow faster implementation.
+
+   More details on the raw and cloure API can be found in:
+
+   http://sourceware.cygnus.com/ml/java-discuss/1999-q3/msg00138.html
+
+   and
+
+   http://sourceware.cygnus.com/ml/java-discuss/1999-q3/msg00174.html
+   -------------------------------------------------------------------- */
+
 #ifndef LIBFFI_H
 #define LIBFFI_H
 
@@ -138,7 +164,9 @@
 
 /* ---- Generic type definitions ----------------------------------------- */
 
-#define ALIGN(v, a)  (((((unsigned) (v))-1) | ((a)-1))+1)
+#define ALIGN(v, a)  (((((size_t) (v))-1) | ((a)-1))+1)
+/* The closure code assumes that this works on pointers, i.e. a size_t	*/
+/* can hold a pointer.							*/
 
 typedef enum ffi_abi {
 
@@ -159,6 +187,12 @@
   FFI_DEFAULT_ABI = FFI_SYSV,
 #endif
 
+  /* ---- Intel ia64 ---------------- */
+#ifdef IA64
+  FFI_UNIX,   	/* Linux and all Unix variants use the same conventions	*/
+  FFI_DEFAULT_ABI = FFI_UNIX,
+#endif
+
   /* ---- Mips --------------------- */
 #ifdef MIPS
   FFI_O32,
@@ -268,6 +302,7 @@
 typedef union {
   SINT_ARG sint;
   UINT_ARG uint;
+  float	   flt;
   char     data[SIZEOF_ARG];
   void*    ptr;
 } ffi_raw;
@@ -281,8 +316,22 @@
 void ffi_raw_to_ptrarray (ffi_cif *cif, ffi_raw *raw, void **args);
 size_t ffi_raw_size (ffi_cif *cif);
 
+#if !NO_JAVA_RAW_API
 
+/* This is analogous to the raw API, except it uses Java parameter	*/
+/* packing, even on 64-bit machines.  I.e. on 64-bit machines		*/
+/* longs and doubles are followed by an empty 64-bit word.		*/
+
+void ffi_java_raw_call (/*@dependent@*/ ffi_cif *cif, 
+		        void (*fn)(), 
+		        /*@out@*/ void *rvalue, 
+		        /*@dependent@*/ ffi_raw *avalue);
+
+void ffi_java_ptrarray_to_raw (ffi_cif *cif, void **args, ffi_raw *raw);
+void ffi_java_raw_to_ptrarray (ffi_cif *cif, ffi_raw *raw, void **args);
+size_t ffi_java_raw_size (ffi_cif *cif);
 
+#endif /* !NO_JAVA_RAW_API */
 
 #endif /* !FFI_NO_RAW_API */
 
@@ -294,6 +343,21 @@
 #define FFI_TRAMPOLINE_SIZE 10
 #define FFI_NATIVE_RAW_API 1	/* and has native raw api support */
 
+#elif defined(IA64)
+
+#define FFI_CLOSURES 1
+#define FFI_TRAMPOLINE_SIZE 24  /* Really the following struct, which 	*/
+				/* can be interpreted as a C function	*/
+				/* decriptor:				*/
+
+struct ffi_ia64_trampoline_struct {
+    void * code_pointer;	/* Pointer to ffi_closure_UNIX	*/
+    void * fake_gp;		/* Pointer to closure, installed as gp	*/
+    void * real_gp;		/* Real gp value, reinstalled by 	*/
+				/* ffi_closure_UNIX.			*/
+};
+#define FFI_NATIVE_RAW_API 0
+
 #else 
 
 #define FFI_CLOSURES 0
@@ -346,6 +410,14 @@
 		      ffi_cif *cif,
 		      void (*fun)(ffi_cif*,void*,ffi_raw*,void*),
 		      void *user_data);
+
+#ifndef NO_JAVA_RAW_API
+ffi_status
+ffi_prep_java_raw_closure (ffi_raw_closure*,
+		           ffi_cif *cif,
+		           void (*fun)(ffi_cif*,void*,ffi_raw*,void*),
+		           void *user_data);
+#endif
 
 #endif /* !FFI_NO_RAW_API */
 #endif /* FFI_CLOSURES */
Index: src/ffitest.c
===================================================================
RCS file: /cvs/java/libgcj/libffi/src/ffitest.c,v
retrieving revision 1.1.1.1
diff -u -r1.1.1.1 ffitest.c
--- ffitest.c	1999/08/08 13:27:19	1.1.1.1
+++ ffitest.c	2000/02/25 19:02:25
@@ -196,6 +196,16 @@
   return ts1;
 }
 
+/* Take an int and a float argument, together with int userdata, and 	*/
+/* return the sum.							*/
+static void closure_test_fn(ffi_cif* cif,void* resp,void** args, void* userdata)
+{
+    *(int*)resp =
+	 *(int *)args[0] + (int)(*(float *)args[1]) + (int)(long)userdata;
+}
+
+typedef int (*closure_test_type)(int, float);
+
 int main(/*@unused@*/ int argc, /*@unused@*/ char *argv[])
 {
   ffi_cif cif;
@@ -214,7 +224,7 @@
   signed int si1;
   signed int si2;
 
-#if defined(ALPHA) || (defined(MIPS) && (_MIPS_SIM == _ABIN32))
+#if defined(ALPHA) || defined(IA64) || (defined(MIPS) && (_MIPS_SIM == _ABIN32))
   long long rint;
 #else
   int rint;
@@ -690,6 +700,27 @@
 
     free (ts5_result);
   }
+
+# if FFI_CLOSURES
+  /* A simple closure test */
+    {
+      ffi_closure cl;
+      ffi_type * cl_arg_types[3];
+
+      cl_arg_types[0] = &ffi_type_sint;
+      cl_arg_types[1] = &ffi_type_float;
+      cl_arg_types[2] = NULL;
+      
+      /* Initialize the cif */
+      CHECK(ffi_prep_cif(&cif, FFI_DEFAULT_ABI, 2, 
+	    	         &ffi_type_sint, cl_arg_types) == FFI_OK);
+
+      CHECK(ffi_prep_closure(&cl, &cif, closure_test_fn,
+			     (void *) 3 /* userdata */)
+	    == FFI_OK);
+      CHECK((*((closure_test_type)(&cl)))(1, 2.0) == 6);
+    }
+# endif
 
   /* If we arrived here, all is good */
   (void) puts("\nLooks good. No surprises.\n");
Index: src/java_raw_api.c
===================================================================
RCS file: java_raw_api.c
diff -N java_raw_api.c
--- /dev/null	Tue May  5 13:32:27 1998
+++ java_raw_api.c	Fri Feb 25 11:02:26 2000
@@ -0,0 +1,271 @@
+/* -----------------------------------------------------------------------
+   java_raw_api.c - Copyright (c) 1999  Cygnus Solutions
+
+   Cloned from raw_api.c
+
+   Raw_api.c author: Kresten Krab Thorup <krab@gnu.org>
+   Java_raw_api.c author: Hans-J. Boehm <hboehm@hpl.hp.com>
+
+   $Id $
+
+   Permission is hereby granted, free of charge, to any person obtaining
+   a copy of this software and associated documentation files (the
+   ``Software''), to deal in the Software without restriction, including
+   without limitation the rights to use, copy, modify, merge, publish,
+   distribute, sublicense, and/or sell copies of the Software, and to
+   permit persons to whom the Software is furnished to do so, subject to
+   the following conditions:
+
+   The above copyright notice and this permission notice shall be included
+   in all copies or substantial portions of the Software.
+
+   THE SOFTWARE IS PROVIDED ``AS IS'', WITHOUT WARRANTY OF ANY KIND, EXPRESS
+   OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+   MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+   IN NO EVENT SHALL CYGNUS SOLUTIONS BE LIABLE FOR ANY CLAIM, DAMAGES OR
+   OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
+   ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
+   OTHER DEALINGS IN THE SOFTWARE.
+   ----------------------------------------------------------------------- */
+
+/* This defines a Java- and 64-bit specific variant of the raw API.	*/
+/* It assumes that "raw" argument blocks look like Java stacks on a 	*/
+/* 64-bit machine.  Arguments that can be stored in a single stack	*/
+/* stack slots (longs, doubles) occupy 128 bits, but only the first	*/
+/* 64 bits are actually used.  						*/
+
+#include <ffi.h>
+#include <ffi_common.h>
+
+#if !defined(NO_JAVA_RAW_API) && !defined(FFI_NO_RAW_API)
+
+size_t
+ffi_java_raw_size (ffi_cif *cif)
+{
+  size_t result = 0;
+  int i;
+
+  ffi_type **at = cif->arg_types;
+
+  for (i = cif->nargs-1; i >= 0; i--, at++)
+    {
+      switch((*at) -> type) {
+	case FFI_TYPE_UINT64:
+	case FFI_TYPE_SINT64:
+	  result += 2 * SIZEOF_ARG;
+	  break;
+	case FFI_TYPE_STRUCT:
+	  /* No structure parameters in Java.	*/
+	  abort();
+	default:
+	  result += SIZEOF_ARG;
+      }
+    }
+
+  return result;
+}
+
+
+void
+ffi_java_raw_to_ptrarray (ffi_cif *cif, ffi_raw *raw, void **args)
+{
+  unsigned i;
+  ffi_type **tp = cif->arg_types;
+
+#if WORDS_BIGENDIAN
+
+  for (i = 0; i < cif->nargs; i++, tp++, args++)
+    {	  
+      switch ((*tp)->type)
+	{
+	case FFI_TYPE_UINT8:
+	case FFI_TYPE_SINT8:
+	  *args = (void*) ((char*)(raw++) + SIZEOF_ARG - 1);
+	  break;
+	  
+	case FFI_TYPE_UINT16:
+	case FFI_TYPE_SINT16:
+	  *args = (void*) ((char*)(raw++) + SIZEOF_ARG - 2);
+	  break;
+
+#if SIZEOF_ARG >= 4	  
+	case FFI_TYPE_UINT32:
+	case FFI_TYPE_SINT32:
+	  *args = (void*) ((char*)(raw++) + SIZEOF_ARG - 4);
+	  break;
+#endif
+	
+#if SIZEOF_ARG == 8	  
+	case FFI_TYPE_UINT64:
+	case FFI_TYPE_SINT64:
+	case FFI_TYPE_DOUBLE:
+	  *args = (void *)raw;
+	  raw += 2;
+	  break;
+#endif
+
+	case FFI_TYPE_POINTER:
+	  *args = (void*) &(raw++)->ptr;
+	  break;
+	  
+	default:
+	  *args = raw;
+	  raw += ALIGN ((*tp)->size, SIZEOF_ARG) / SIZEOF_ARG;
+	}
+    }
+
+#else /* WORDS_BIGENDIAN */
+
+#if !PDP
+
+  /* then assume little endian */
+  for (i = 0; i < cif->nargs; i++, tp++, args++)
+    {
+#if SIZEOF_ARG == 8
+      switch((*tp)->type) {
+	case FFI_TYPE_UINT64:
+	case FFI_TYPE_SINT64:
+	case FFI_TYPE_DOUBLE:
+	  *args = (void*) raw;
+	  raw += 2;
+	  break;
+	default:
+	  *args = (void*) raw++;
+      }
+#else /* SIZEOF_ARG != 8 */
+	*args = (void*) raw;
+	raw += ALIGN ((*tp)->size, sizeof (void*)) / sizeof (void*);
+#endif /* SIZEOF_ARG == 8 */
+    }
+
+#else
+#error "pdp endian not supported"
+#endif /* ! PDP */
+
+#endif /* WORDS_BIGENDIAN */
+}
+
+void
+ffi_java_ptrarray_to_raw (ffi_cif *cif, void **args, ffi_raw *raw)
+{
+  unsigned i;
+  ffi_type **tp = cif->arg_types;
+
+  for (i = 0; i < cif->nargs; i++, tp++, args++)
+    {	  
+      switch ((*tp)->type)
+	{
+	case FFI_TYPE_UINT8:
+	  (raw++)->uint = *(UINT8*) (*args);
+	  break;
+
+	case FFI_TYPE_SINT8:
+	  (raw++)->sint = *(SINT8*) (*args);
+	  break;
+
+	case FFI_TYPE_UINT16:
+	  (raw++)->uint = *(UINT16*) (*args);
+	  break;
+
+	case FFI_TYPE_SINT16:
+	  (raw++)->sint = *(SINT16*) (*args);
+	  break;
+
+#if SIZEOF_ARG >= 4
+	case FFI_TYPE_UINT32:
+	  (raw++)->uint = *(UINT32*) (*args);
+	  break;
+
+	case FFI_TYPE_SINT32:
+	  (raw++)->sint = *(SINT32*) (*args);
+	  break;
+#endif
+        case FFI_TYPE_FLOAT:
+	  (raw++)->flt = *(FLOAT32*) (*args);
+	  break;
+
+#if SIZEOF_ARG == 8
+	case FFI_TYPE_UINT64:
+	case FFI_TYPE_SINT64:
+	case FFI_TYPE_DOUBLE:
+	  raw->uint = *(UINT64*) (*args);
+	  raw += 2;
+	  break;
+#endif
+
+	case FFI_TYPE_POINTER:
+	  (raw++)->ptr = **(void***) args;
+	  break;
+
+	default:
+#if SIZEOF_ARG == 8
+	  FFI_ASSERT(FALSE);	/* Should have covered all cases */
+#else	
+	  memcpy ((void*) raw->data, (void*)*args, (*tp)->size);
+	  raw += ALIGN ((*tp)->size, SIZEOF_ARG) / SIZEOF_ARG;
+#endif
+	}
+    }
+}
+
+#if !FFI_NATIVE_RAW_API
+
+
+/* This is a generic definition of ffi_raw_call, to be used if the
+ * native system does not provide a machine-specific implementation.
+ * Having this, allows code to be written for the raw API, without
+ * the need for system-specific code to handle input in that format;
+ * these following couple of functions will handle the translation forth
+ * and back automatically. */
+
+void ffi_java_raw_call (/*@dependent@*/ ffi_cif *cif, 
+		   void (*fn)(), 
+		   /*@out@*/ void *rvalue, 
+		   /*@dependent@*/ ffi_raw *raw)
+{
+  void **avalue = (void**) alloca (cif->nargs * sizeof (void*));
+  ffi_java_raw_to_ptrarray (cif, raw, avalue);
+  ffi_call (cif, fn, rvalue, avalue);
+}
+
+#if FFI_CLOSURES		/* base system provides closures */
+
+static void 
+ffi_java_translate_args (ffi_cif *cif, void *rvalue,
+		    void **avalue, void *user_data)
+{
+  ffi_raw *raw = (ffi_raw*)alloca (ffi_java_raw_size (cif));
+  ffi_raw_closure *cl = (ffi_raw_closure*)user_data;
+
+  ffi_java_ptrarray_to_raw (cif, avalue, raw);
+  (*cl->fun) (cif, rvalue, raw, cl->user_data);
+}
+
+/* Again, here is the generic version of ffi_prep_raw_closure, which
+ * will install an intermediate "hub" for translation of arguments from
+ * the pointer-array format, to the raw format */
+
+ffi_status
+ffi_prep_java_raw_closure (ffi_raw_closure* cl,
+		      ffi_cif *cif,
+		      void (*fun)(ffi_cif*,void*,ffi_raw*,void*),
+		      void *user_data)
+{
+  ffi_status status;
+
+  status = ffi_prep_closure ((ffi_closure*) cl, 
+			     cif,
+			     &ffi_java_translate_args,
+			     (void*)cl);
+  if (status == FFI_OK)
+    {
+      cl->fun       = fun;
+      cl->user_data = user_data;
+    }
+
+  return status;
+}
+
+#endif /* FFI_CLOSURES */
+#endif /* !FFI_NATIVE_RAW_API */
+#endif /* !FFI_NO_RAW_API */
Index: src/raw_api.c
===================================================================
RCS file: /cvs/java/libgcj/libffi/src/raw_api.c,v
retrieving revision 1.1.1.1
diff -u -r1.1.1.1 raw_api.c
--- raw_api.c	1999/08/08 13:27:19	1.1.1.1
+++ raw_api.c	2000/02/25 19:02:26
@@ -202,13 +202,13 @@
 #if FFI_CLOSURES		/* base system provides closures */
 
 static void 
-ffi_translate_args (ffi_cif *cif, void *ravlue,
+ffi_translate_args (ffi_cif *cif, void *rvalue,
 		    void **avalue, void *user_data)
 {
   ffi_raw *raw = (ffi_raw*)alloca (ffi_raw_size (cif));
-  ffi_ptrarray_to_raw (cif, avalue, raw);
-
   ffi_raw_closure *cl = (ffi_raw_closure*)user_data;
+
+  ffi_ptrarray_to_raw (cif, avalue, raw);
   (*cl->fun) (cif, rvalue, raw, cl->user_data);
 }
 
@@ -226,7 +226,7 @@
 
   status = ffi_prep_closure ((ffi_closure*) cl, 
 			     cif,
-			     &ffi_closure_translate,
+			     &ffi_translate_args,
 			     (void*)cl);
   if (status == FFI_OK)
     {
Index: src/ia64/ffi.c
===================================================================
RCS file: ffi.c
diff -N ffi.c
--- /dev/null	Tue May  5 13:32:27 1998
+++ ffi.c	Fri Feb 25 11:02:28 2000
@@ -0,0 +1,670 @@
+/* -----------------------------------------------------------------------
+   ffi.c - Copyright (c) 1998 Cygnus Solutions
+	   Copyright (c) 2000 Hewlett Packard Company
+   
+   IA64 Foreign Function Interface 
+
+   Permission is hereby granted, free of charge, to any person obtaining
+   a copy of this software and associated documentation files (the
+   ``Software''), to deal in the Software without restriction, including
+   without limitation the rights to use, copy, modify, merge, publish,
+   distribute, sublicense, and/or sell copies of the Software, and to
+   permit persons to whom the Software is furnished to do so, subject to
+   the following conditions:
+
+   The above copyright notice and this permission notice shall be included
+   in all copies or substantial portions of the Software.
+
+   THE SOFTWARE IS PROVIDED ``AS IS'', WITHOUT WARRANTY OF ANY KIND, EXPRESS
+   OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+   MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+   IN NO EVENT SHALL CYGNUS SOLUTIONS BE LIABLE FOR ANY CLAIM, DAMAGES OR
+   OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
+   ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
+   OTHER DEALINGS IN THE SOFTWARE.
+   ----------------------------------------------------------------------- */
+
+#include <ffi.h>
+#include <ffi_common.h>
+
+#include <stdlib.h>
+
+#include "ia64_flags.h"
+
+/* Memory image of fp register contents.  Should eventually be an fp 	*/
+/* type long enough to hold an entire register.  For now we use double.	*/
+typedef double float80;
+
+/* The stack layout at call to ffi_prep_regs.  Other_args will remain	*/
+/* on the stack for the actual call.  Everything else we be transferred	*/
+/* to registers and popped by the assembly code.			*/
+
+struct ia64_args {
+    long scratch[2];	/* Two scratch words at top of stack.		*/
+			/* Allows sp to passed as arg pointer.		*/
+    void * r8_contents;	/* Value to be passed in r8			*/
+    long spare;		/* Not used.					*/
+    float80 fp_regs[8]; /* Contents of 8 floating point argument 	*/
+			/* registers.					*/
+    long out_regs[8];	/* Contents of the 8 out registers used 	*/
+			/* for integer parameters.			*/
+    long other_args[0]; /* Arguments passed on stack, variable size	*/
+			/* Treated as continuation of out_regs.		*/
+};
+
+static size_t float_type_size(unsigned short tp)
+{
+  switch(tp) {
+    case FFI_TYPE_FLOAT:
+      return sizeof(float);
+    case FFI_TYPE_DOUBLE:
+      return sizeof(double);
+#if FFI_TYPE_LONGDOUBLE != FFI_TYPE_DOUBLE
+    case FFI_TYPE_LONGDOUBLE:
+      return sizeof(long double);
+#endif
+    default:
+      FFI_ASSERT(0);
+  }
+}
+
+/*
+ * Is type a struct containing at most n floats, doubles, or extended
+ * doubles, all of the same fp type?
+ * If so, set *element_type to the fp type.
+ */
+static bool is_homogeneous_fp_aggregate(ffi_type * type, int n,
+				        unsigned short * element_type)
+{
+  ffi_type **ptr; 
+  unsigned short element, struct_element;
+
+  int type_set = 0;
+
+  FFI_ASSERT(type != NULL);
+
+  FFI_ASSERT(type->elements != NULL);
+
+  ptr = &(type->elements[0]);
+
+  while ((*ptr) != NULL)
+    {
+      switch((*ptr) -> type) {
+	case FFI_TYPE_FLOAT:
+	  if (type_set && element != FFI_TYPE_FLOAT) return 0;
+	  if (--n < 0) return FALSE;
+	  type_set = 1;
+	  element = FFI_TYPE_FLOAT;
+	  break;
+	case FFI_TYPE_DOUBLE:
+	  if (type_set && element != FFI_TYPE_DOUBLE) return 0;
+	  if (--n < 0) return FALSE;
+	  type_set = 1;
+	  element = FFI_TYPE_DOUBLE;
+	  break;
+	case FFI_TYPE_STRUCT:
+	  if (!is_homogeneous_fp_aggregate(type, n, &struct_element))
+	      return FALSE;
+	  if (type_set && struct_element != element) return FALSE;
+	  n -= (type -> size)/float_type_size(element);
+	  element = struct_element;
+	  if (n < 0) return FALSE;
+	  break;
+	/* case FFI_TYPE_LONGDOUBLE:
+	  Not yet implemented.	*/
+	default:
+	  return FALSE;
+      }
+      ptr++;
+    }
+  *element_type = element;
+  return TRUE;
+   
+} 
+
+/* ffi_prep_args is called by the assembly routine once stack space
+   has been allocated for the function's arguments.  Returns nonzero
+   if fp registers are used for arguments. */
+
+static bool
+ffi_prep_args(struct ia64_args *stack, extended_cif *ecif, int bytes)
+{
+  register long i, avn;
+  register void **p_argv;
+  register long *argp = stack -> out_regs;
+  register float80 *fp_argp = stack -> fp_regs;
+  register ffi_type **p_arg;
+
+  /* For big return structs, r8 needs to contain the target address.	*/
+  /* Since r8 is otherwise dead, we set it unconditionally.		*/
+  stack -> r8_contents = ecif -> rvalue;
+  i = 0;
+  avn = ecif->cif->nargs;
+  p_arg = ecif->cif->arg_types;
+  p_argv = ecif->avalue;
+  while (i < avn)
+    {
+      size_t z; /* z is in units of arg slots or words, not bytes.	*/
+
+      switch ((*p_arg)->type)
+	{
+	case FFI_TYPE_SINT8:
+	  z = 1;
+	  *(SINT64 *) argp = *(SINT8 *)(* p_argv);
+	  break;
+		  
+	case FFI_TYPE_UINT8:
+	  z = 1;
+	  *(UINT64 *) argp = *(UINT8 *)(* p_argv);
+	  break;
+		  
+	case FFI_TYPE_SINT16:
+	  z = 1;
+	  *(SINT64 *) argp = *(SINT16 *)(* p_argv);
+	  break;
+		  
+	case FFI_TYPE_UINT16:
+	  z = 1;
+	  *(UINT64 *) argp = *(UINT16 *)(* p_argv);
+	  break;
+		  
+	case FFI_TYPE_SINT32:
+	  z = 1;
+	  *(SINT64 *) argp = *(SINT32 *)(* p_argv);
+	  break;
+		  
+	case FFI_TYPE_UINT32:
+	  z = 1;
+	  *(UINT64 *) argp = *(UINT32 *)(* p_argv);
+	  break;
+
+	case FFI_TYPE_SINT64:
+	case FFI_TYPE_UINT64:
+	case FFI_TYPE_POINTER:
+	  z = 1;
+	  *(UINT64 *) argp = *(UINT64 *)(* p_argv);
+	  break;
+
+	case FFI_TYPE_FLOAT:
+	  z = 1;
+	  if (fp_argp - stack->fp_regs < 8)
+	    {
+	      /* Note the conversion -- all the fp regs are loaded as
+		 doubles.  */
+	      *fp_argp++ = *(float *)(* p_argv);
+	    }
+	  /* Also put it into the integer registers or memory: */
+	    *(UINT64 *) argp = *(UINT32 *)(* p_argv);
+	  break;
+
+	case FFI_TYPE_DOUBLE:
+	  z = 1;
+	  if (fp_argp - stack->fp_regs < 8)
+	    *fp_argp++ = *(double *)(* p_argv);
+	  /* Also put it into the integer registers or memory: */
+	    *(double *) argp = *(double *)(* p_argv);
+	  break;
+
+	case FFI_TYPE_STRUCT:
+	  {
+	      size_t sz = (*p_arg)->size;
+	      unsigned short element_type;
+              z = ((*p_arg)->size + SIZEOF_ARG - 1)/SIZEOF_ARG;
+	      if (is_homogeneous_fp_aggregate(*p_arg, 8, &element_type)) {
+		int i;
+		int nelements = sz/float_type_size(element_type);
+		for (i = 0; i < nelements; ++i) {
+		  switch (element_type) {
+		    case FFI_TYPE_FLOAT:
+		      if (fp_argp - stack->fp_regs < 8)
+			*fp_argp++ = ((float *)(* p_argv))[i];
+		      break;
+		    case FFI_TYPE_DOUBLE:
+		      if (fp_argp - stack->fp_regs < 8)
+			*fp_argp++ = ((double *)(* p_argv))[i];
+		      break;
+		    default:
+			/* Extended precision not yet implemented. */
+			abort();
+		  }
+		}
+	      }
+	      /* And pass it in integer registers as a struct, with	*/
+	      /* its actual field sizes packed into registers.		*/
+	      memcpy(argp, *p_argv, (*p_arg)->size);
+	  }
+	  break;
+
+	default:
+	  FFI_ASSERT(0);
+	}
+
+      argp += z;
+      i++, p_arg++, p_argv++;
+    }
+  return (fp_argp != stack -> fp_regs);
+}
+
+/* Perform machine dependent cif processing */
+ffi_status
+ffi_prep_cif_machdep(ffi_cif *cif)
+{
+  long i, avn;
+  bool is_simple = TRUE;
+  long simple_flag = FFI_SIMPLE_V;
+  /* Adjust cif->bytes to include space for the 2 scratch words,
+     r8 register contents, spare word,
+     the 8 fp register contents, and all 8 integer register contents.
+     This will be removed before the call, though 2 scratch words must
+     remain.  */
+
+  cif->bytes += 4*sizeof(long) + 8 *sizeof(float80);
+  if (cif->bytes < sizeof(struct ia64_args))
+    cif->bytes = sizeof(struct ia64_args);
+
+  /* The stack must be double word aligned, so round bytes up
+     appropriately. */
+
+  cif->bytes = ALIGN(cif->bytes, 2*sizeof(void*));
+
+  avn = cif->nargs;
+  if (avn <= 2) {
+    for (i = 0; i < avn; ++i) {
+      switch(cif -> arg_types[i] -> type) {
+	case FFI_TYPE_SINT32:
+	  simple_flag = FFI_ADD_INT_ARG(simple_flag);
+	  break;
+	case FFI_TYPE_SINT64:
+	case FFI_TYPE_UINT64:
+	case FFI_TYPE_POINTER:
+	  simple_flag = FFI_ADD_LONG_ARG(simple_flag);
+	  break;
+	default:
+	  is_simple = FALSE;
+      }
+    }
+  } else {
+    is_simple = FALSE;
+  }
+
+  /* Set the return type flag */
+  switch (cif->rtype->type)
+    {
+    case FFI_TYPE_VOID:
+      cif->flags = FFI_TYPE_VOID;
+      break;
+
+    case FFI_TYPE_STRUCT:
+      {
+        size_t sz = cif -> rtype -> size;
+  	unsigned short element_type;
+
+	is_simple = FALSE;
+  	if (is_homogeneous_fp_aggregate(cif -> rtype, 8, &element_type)) {
+	  int nelements = sz/float_type_size(element_type);
+	  if (nelements <= 1) {
+	    if (0 == nelements) {
+	      cif -> flags = FFI_TYPE_VOID;
+	    } else {
+	      cif -> flags = element_type;
+	    }
+	  } else {
+	    switch(element_type) {
+	      case FFI_TYPE_FLOAT:
+	        cif -> flags = FFI_IS_FLOAT_FP_AGGREGATE | nelements;
+		break;
+	      case FFI_TYPE_DOUBLE:
+	        cif -> flags = FFI_IS_DOUBLE_FP_AGGREGATE | nelements;
+		break;
+	      default:
+		/* long double NYI */
+		abort();
+	    }
+	  }
+	  break;
+        }
+        if (sz <= 32) {
+	  if (sz <= 8) {
+              cif->flags = FFI_TYPE_INT;
+  	  } else if (sz <= 16) {
+              cif->flags = FFI_IS_SMALL_STRUCT2;
+  	  } else if (sz <= 24) {
+              cif->flags = FFI_IS_SMALL_STRUCT3;
+	  } else {
+              cif->flags = FFI_IS_SMALL_STRUCT4;
+	  }
+        } else {
+          cif->flags = FFI_TYPE_STRUCT;
+	}
+      }
+      break;
+
+    case FFI_TYPE_FLOAT:
+      is_simple = FALSE;
+      cif->flags = FFI_TYPE_FLOAT;
+      break;
+
+    case FFI_TYPE_DOUBLE:
+      is_simple = FALSE;
+      cif->flags = FFI_TYPE_DOUBLE;
+      break;
+
+    default:
+      cif->flags = FFI_TYPE_INT;
+      /* This seems to depend on little endian mode, and the fact that	*/
+      /* the return pointer always points to at least 8 bytes.  But 	*/
+      /* that also seems to be true for other platforms.		*/
+      break;
+    }
+  
+  if (is_simple) cif -> flags |= simple_flag;
+  return FFI_OK;
+}
+
+extern int ffi_call_unix(bool (*)(struct ia64_args *, extended_cif *, int), 
+			 extended_cif *, unsigned, 
+			 unsigned, unsigned *, void (*)());
+
+void
+ffi_call(ffi_cif *cif, void (*fn)(), void *rvalue, void **avalue)
+{
+  extended_cif ecif;
+  long simple = cif -> flags & FFI_SIMPLE;
+
+  /* Should this also check for Unix ABI? */
+  /* This is almost, but not quite, machine independent.  Note that	*/
+  /* we can get away with not caring about length of the result because	*/
+  /* we assume we are little endian, and the result buffer is large 	*/
+  /* enough.								*/
+  /* This needs work for HP/UX.						*/
+  if (simple) {
+    long (*lfn)() = (long (*)())fn;
+    long result;
+    switch(simple) {
+      case FFI_SIMPLE_V:
+	result = lfn();
+	break;
+      case FFI_SIMPLE_I:
+	result = lfn(*(int *)avalue[0]);
+	break;
+      case FFI_SIMPLE_L:
+	result = lfn(*(long *)avalue[0]);
+	break;
+      case FFI_SIMPLE_II:
+	result = lfn(*(int *)avalue[0], *(int *)avalue[1]);
+	break;
+      case FFI_SIMPLE_IL:
+	result = lfn(*(int *)avalue[0], *(long *)avalue[1]);
+	break;
+      case FFI_SIMPLE_LI:
+	result = lfn(*(long *)avalue[0], *(int *)avalue[1]);
+	break;
+      case FFI_SIMPLE_LL:
+	result = lfn(*(long *)avalue[0], *(long *)avalue[1]);
+	break;
+    }
+    if ((cif->flags & ~FFI_SIMPLE) != FFI_TYPE_VOID && 0 != rvalue) {
+      * (long *)rvalue = result;
+    }
+    return;
+  }
+  ecif.cif = cif;
+  ecif.avalue = avalue;
+  
+  /* If the return value is a struct and we don't have a return
+     value address then we need to make one.  */
+  
+  if (rvalue == NULL && cif->rtype->type == FFI_TYPE_STRUCT)
+    ecif.rvalue = alloca(cif->rtype->size);
+  else
+    ecif.rvalue = rvalue;
+    
+  switch (cif->abi) 
+    {
+    case FFI_UNIX:
+      ffi_call_unix(ffi_prep_args, &ecif, cif->bytes,
+		    cif->flags, rvalue, fn);
+      break;
+
+    default:
+      FFI_ASSERT(0);
+      break;
+    }
+}
+
+/*
+ * Closures represent a pair consisting of a function pointer, and
+ * some user data.  A closure is invoked by reinterpreting the closure
+ * as a function pointer, and branching to it.  Thus we can make an
+ * interpreted function callable as a C function:  We turn the interpreter
+ * itself, together with a pointer specifying the interpreted procedure,
+ * into a closure.
+ * On X86, the first few words of the closure structure actually contain code,
+ * which will do the right thing.  On most other architectures, this
+ * would raise some Icache/Dcache coherence issues (which can be solved, but
+ * often not cheaply).
+ * For IA64, function pointer are already pairs consisting of a code
+ * pointer, and a gp pointer.  The latter is needed to access global variables.
+ * Here we set up such a pair as the first two words of the closure (in
+ * the "trampoline" area), but we replace the gp pointer with a pointer
+ * to the closure itself.  We also add the real gp pointer to the
+ * closure.  This allows the function entry code to both retrieve the
+ * user data, and to restire the correct gp pointer.
+ */
+
+static void 
+ffi_prep_incoming_args_UNIX(struct ia64_args *args, void **rvalue,
+			    void **avalue, ffi_cif *cif);
+
+/* This function is entered with the doctored gp (r1) value.
+ * This code is extremely gcc specific.  There is some argument that
+ * it should really be written in assembly code, since it depends on
+ * gcc properties that might change over time.
+ */
+
+/* ffi_closure_UNIX is an assembly routine, which copies the register 	*/
+/* state into s struct ia64_args, and the invokes			*/
+/* ffi_closure_UNIX_inner.  It also recovers the closure pointer	*/
+/* from its fake gp pointer.						*/
+void ffi_closure_UNIX();
+
+#ifndef __GNUC__
+#   error This requires gcc
+#endif
+void
+ffi_closure_UNIX_inner (ffi_closure *closure, struct ia64_args * args)
+/* Hopefully declarint this as a varargs function will force all args	*/
+/* to memory.								*/
+{
+  // this is our return value storage
+  long double    res;
+
+  // our various things...
+  ffi_cif       *cif;
+  unsigned short rtype;
+  void          *resp;
+  void		**arg_area;
+
+  resp = (void*)&res;
+  cif         = closure->cif;
+  arg_area    = (void**) alloca (cif->nargs * sizeof (void*));  
+
+  /* this call will initialize ARG_AREA, such that each
+   * element in that array points to the corresponding 
+   * value on the stack; and if the function returns
+   * a structure, it will re-set RESP to point to the
+   * structure return address.  */
+
+  ffi_prep_incoming_args_UNIX(args, (void**)&resp, arg_area, cif);
+  
+  (closure->fun) (cif, resp, arg_area, closure->user_data);
+
+  rtype = cif->flags;
+
+  /* now, do a generic return based on the value of rtype */
+  if (rtype == FFI_TYPE_INT)
+    {
+      asm volatile ("ld8 r8=[%0]" : : "r" (resp) : "r8");
+    }
+  else if (rtype == FFI_TYPE_FLOAT)
+    {
+      asm volatile ("ldfs f8=[%0]" : : "r" (resp) : "f8");
+    }
+  else if (rtype == FFI_TYPE_DOUBLE)
+    {
+      asm volatile ("ldfd f8=[%0]" : : "r" (resp) : "f8");
+    }
+  else if (rtype == FFI_IS_SMALL_STRUCT2)
+    {
+      asm volatile ("ld8 r8=[%0]; ld8 r9=[%1]"
+		    : : "r" (resp), "r" (resp+8) : "r8","r9");
+    }
+  else if (rtype == FFI_IS_SMALL_STRUCT3)
+    {
+      asm volatile ("ld8 r8=[%0]; ld8 r9=[%1]; ld8 r10=[%2]"
+		    : : "r" (resp), "r" (resp+8), "r" (resp+16)
+		    : "r8","r9","r10");
+    }
+  else if (rtype == FFI_IS_SMALL_STRUCT4)
+    {
+      asm volatile ("ld8 r8=[%0]; ld8 r9=[%1]; ld8 r10=[%2]; ld8 r11=[%3]"
+		    : : "r" (resp), "r" (resp+8), "r" (resp+16), "r" (resp+24)
+		    : "r8","r9","r10","r11");
+    }
+  else if (rtype != FFI_TYPE_VOID && rtype != FFI_TYPE_STRUCT)
+    {
+      /* Can only happen for homogeneous FP aggregates?	*/
+      abort();
+    }
+}
+
+static void 
+ffi_prep_incoming_args_UNIX(struct ia64_args *args, void **rvalue,
+			    void **avalue, ffi_cif *cif)
+{
+  register unsigned int i;
+  register unsigned int avn;
+  register void **p_argv;
+  register unsigned long *argp = args -> out_regs;
+  unsigned fp_reg_num = 0;
+  register ffi_type **p_arg;
+
+  avn = cif->nargs;
+  p_argv = avalue;
+
+  for (i = cif->nargs, p_arg = cif->arg_types; i != 0; i--, p_arg++)
+    {
+      size_t z; /* In units of words or argument slots.	*/
+
+      switch ((*p_arg)->type)
+	{
+	case FFI_TYPE_SINT8:
+	case FFI_TYPE_UINT8:
+	case FFI_TYPE_SINT16:
+	case FFI_TYPE_UINT16:
+	case FFI_TYPE_SINT32:
+	case FFI_TYPE_UINT32:
+	case FFI_TYPE_SINT64:
+	case FFI_TYPE_UINT64:
+	case FFI_TYPE_POINTER:
+	  z = 1;
+	  *p_argv = (void *)argp;
+	  break;
+		  
+	case FFI_TYPE_FLOAT:
+	  z = 1;
+	  /* Convert argument back to float in place from the saved value */
+	  if (fp_reg_num < 8) {
+	      *(float *)argp = args -> fp_regs[fp_reg_num++];
+	  } else {
+	      *(float *)argp = *(double *)argp;
+	  }
+	  *p_argv = (void *)argp;
+	  break;
+
+	case FFI_TYPE_DOUBLE:
+	  z = 1;
+	  if (fp_reg_num < 8) {
+	      *p_argv = args -> fp_regs + fp_reg_num++;
+	  } else {
+	      *p_argv = (void *)argp;
+	  }
+	  break;
+
+	case FFI_TYPE_STRUCT:
+	  {
+	      size_t sz = (*p_arg)->size;
+	      unsigned short element_type;
+              z = ((*p_arg)->size + SIZEOF_ARG - 1)/SIZEOF_ARG;
+	      if (is_homogeneous_fp_aggregate(*p_arg, 8, &element_type)) {
+		int nelements = sz/float_type_size(element_type);
+		if (nelements + fp_reg_num >= 8) {
+		  /* hard case NYI.	*/
+		  abort();
+		}
+		if (element_type == FFI_TYPE_DOUBLE) {
+	          *p_argv = args -> fp_regs + fp_reg_num;
+		  fp_reg_num += nelements;
+		  break;
+		}
+		if (element_type == FFI_TYPE_FLOAT) {
+		  int j;
+		  for (j = 0; j < nelements; ++ j) {
+		     ((float *)argp)[j] = args -> fp_regs[fp_reg_num + j];
+		  }
+	          *p_argv = (void *)argp;
+		  fp_reg_num += nelements;
+		  break;
+		}
+		abort();  /* Other fp types NYI */
+	      }
+	  }
+	  break;
+
+	default:
+	  FFI_ASSERT(0);
+	}
+
+      argp += z;
+      p_argv++;
+
+    }
+  
+  return;
+}
+
+
+/* Fill in a closure to refer to the specified fun and user_data.	*/
+/* cif specifies the argument and result types for fun.			*/
+/* the cif must already be prep'ed */
+
+/* The layout of a function descriptor.  A C function pointer really 	*/
+/* points to one of these.						*/
+typedef struct ia64_fd_struct {
+    void *code_pointer;
+    void *gp;
+} ia64_fd;
+
+ffi_status
+ffi_prep_closure (ffi_closure* closure,
+		  ffi_cif* cif,
+		  void (*fun)(ffi_cif*,void*,void**,void*),
+		  void *user_data)
+{
+  struct ffi_ia64_trampoline_struct *tramp =
+    (struct ffi_ia64_trampoline_struct *) (closure -> tramp);
+  ia64_fd *fd = (ia64_fd *)(void *)ffi_closure_UNIX;
+
+  FFI_ASSERT (cif->abi == FFI_UNIX);
+
+  tramp -> code_pointer = fd -> code_pointer;
+  tramp -> real_gp = fd -> gp;
+  tramp -> fake_gp = closure;
+  closure->cif  = cif;
+  closure->user_data = user_data;
+  closure->fun  = fun;
+
+  return FFI_OK;
+}
+
+
Index: src/ia64/ia64_flags.h
===================================================================
RCS file: ia64_flags.h
diff -N ia64_flags.h
--- /dev/null	Tue May  5 13:32:27 1998
+++ ia64_flags.h	Fri Feb 25 11:02:28 2000
@@ -0,0 +1,62 @@
+/* -----------------------------------------------------------------------
+   ia64_flags.h - Copyright (c) 2000 Hewlett Packard Company
+   
+   IA64/unix Foreign Function Interface 
+
+   Original author: Hans Boehm, HP Labs
+
+   Permission is hereby granted, free of charge, to any person obtaining
+   a copy of this software and associated documentation files (the
+   ``Software''), to deal in the Software without restriction, including
+   without limitation the rights to use, copy, modify, merge, publish,
+   distribute, sublicense, and/or sell copies of the Software, and to
+   permit persons to whom the Software is furnished to do so, subject to
+   the following conditions:
+
+   The above copyright notice and this permission notice shall be included
+   in all copies or substantial portions of the Software.
+
+   THE SOFTWARE IS PROVIDED ``AS IS'', WITHOUT WARRANTY OF ANY KIND, EXPRESS
+   OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+   MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+   IN NO EVENT SHALL CYGNUS SOLUTIONS BE LIABLE FOR ANY CLAIM, DAMAGES OR
+   OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
+   ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
+   OTHER DEALINGS IN THE SOFTWARE.
+   ----------------------------------------------------------------------- */
+
+
+/* Homogeneous Floating Point Aggregates (HFAs) which are returned	*/
+/* in FP registers.  The least significant bits specify the size in 	*/
+/* words.								*/
+#define FFI_IS_FLOAT_FP_AGGREGATE 0x1000
+#define FFI_IS_DOUBLE_FP_AGGREGATE 0x0800
+#define FLOAT_FP_AGGREGATE_BIT 12
+#define DOUBLE_FP_AGGREGATE_BIT 11
+
+/* Small structures containing N words.  If N=1, they are returned	*/
+/* as though they were integers.					*/
+#define FFI_IS_SMALL_STRUCT2	0x40 /* Struct > 8, <=16 bytes	*/
+#define FFI_IS_SMALL_STRUCT3	0x41 /* Struct > 16 <= 24 bytes	*/
+#define FFI_IS_SMALL_STRUCT4	0x42 /* Struct > 24, <=32 bytes	*/
+
+/* Flag values identifying particularly simple cases, which are 	*/
+/* handled specially.  We treat functions as simple if they take all	*/
+/* arguments can be passed as 32 or 64 bit integer quantities, there is	*/
+/* either no return value or it can be treated as a 64bit integer, and	*/
+/* if there are at most 2 arguments.					*/
+/* This is OR'ed with the normal flag values.				*/
+#define FFI_SIMPLE_V 0x10000	/* () -> X	*/
+#define FFI_SIMPLE_I 0x20000	/* (int) -> X	*/
+#define FFI_SIMPLE_L 0x30000	/* (long) -> X	*/
+#define FFI_SIMPLE_II 0x40000	/* (int,int) -> X	*/
+#define FFI_SIMPLE_IL 0x50000	/* (int,long) -> X	*/
+#define FFI_SIMPLE_LI 0x60000	/* (long,int) -> X	*/
+#define FFI_SIMPLE_LL 0x70000	/* (long,long) -> X	*/
+
+/* Mask for all of the FFI_SIMPLE bits:	*/
+#define FFI_SIMPLE 0xf0000
+
+/* An easy way to build FFI_SIMPLE flags from FFI_SIMPLE_V:	*/
+#define FFI_ADD_LONG_ARG(flag) (((flag) << 1) | 0x10000)
+#define FFI_ADD_INT_ARG(flag) ((flag) << 1)
Index: src/ia64/unix.S
===================================================================
RCS file: unix.S
diff -N unix.S
--- /dev/null	Tue May  5 13:32:27 1998
+++ unix.S	Fri Feb 25 11:02:28 2000
@@ -0,0 +1,301 @@
+/* -----------------------------------------------------------------------
+   unix.S - Copyright (c) 1998 Cygnus Solutions
+            Copyright (c) 2000 Hewlett Packard Company
+   
+   IA64/unix Foreign Function Interface 
+
+   Primary author: Hans Boehm, HP Labs
+
+   Loosely modeled on Cygnus code for other platforms.
+
+   Permission is hereby granted, free of charge, to any person obtaining
+   a copy of this software and associated documentation files (the
+   ``Software''), to deal in the Software without restriction, including
+   without limitation the rights to use, copy, modify, merge, publish,
+   distribute, sublicense, and/or sell copies of the Software, and to
+   permit persons to whom the Software is furnished to do so, subject to
+   the following conditions:
+
+   The above copyright notice and this permission notice shall be included
+   in all copies or substantial portions of the Software.
+
+   THE SOFTWARE IS PROVIDED ``AS IS'', WITHOUT WARRANTY OF ANY KIND, EXPRESS
+   OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+   MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+   IN NO EVENT SHALL CYGNUS SOLUTIONS BE LIABLE FOR ANY CLAIM, DAMAGES OR
+   OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
+   ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
+   OTHER DEALINGS IN THE SOFTWARE.
+   ----------------------------------------------------------------------- */
+
+#define LIBFFI_ASM	
+#include <ffi.h>
+#include "ia64_flags.h"
+
+/* parameters:	*/
+#define callback	in0
+#define ecifp		in1
+#define bytes		in2
+#define flags		in3
+#define raddr		in4
+#define fn		in5
+
+#define FLOAT_SZ	8 /* in-memory size of fp operands	*/
+
+.text
+        .align 16
+        .global ffi_call_unix#
+        .proc ffi_call_unix#
+ffi_call_unix:
+	alloc   loc0=ar.pfs,6,5,8,0
+	mov 	loc1=b0;
+	sub	sp=sp,bytes
+	mov	loc4=r1		/* Save gp 	*/
+	ld8	r8=[callback],8	/* code address of callback	*/
+	;;
+	mov 	out0=sp
+	mov	out1=ecifp
+	mov	out2=bytes
+	ld8	r1=[callback]	/* Set up gp for callback.  Unnecessary? */
+	mov	b6=r8
+	;;
+	br.call.sptk.many b0 = b6	/* call ffi_prep_args		*/
+	cmp.eq	p6,p0=0,r8		/* r8 nonzero ==> need fp regs	*/
+ 	;;
+(p6)	add	loc2=32+8*FLOAT_SZ,sp
+(p6)	br.cond.dptk.many	fp_done
+	;;	/* Quiets warning; needed?	*/
+	add	loc2=32,sp
+	add	loc3=32+FLOAT_SZ,sp
+	;;
+	ldfd	f8=[loc2],2*FLOAT_SZ
+	ldfd	f9=[loc3],2*FLOAT_SZ
+	;;
+	ldfd	f10=[loc2],2*FLOAT_SZ
+	ldfd	f11=[loc3],2*FLOAT_SZ
+	;;
+	ldfd	f12=[loc2],2*FLOAT_SZ
+	ldfd	f13=[loc3],2*FLOAT_SZ
+	;;
+	ldfd	f14=[loc2],2*FLOAT_SZ
+	ldfd	f15=[loc3]
+fp_done:
+	add	r9=16,sp	/* Pointer to r8_contents	*/
+	/* loc2 points at first integer register value.  */
+	add	loc3=8,loc2
+	;;
+	ld8	r8=[r9]		/* Just in case we return large struct */
+	ld8	out0=[loc2],16
+	ld8	out1=[loc3],16
+	;;
+	ld8	out2=[loc2],16
+	ld8	out3=[loc3],16
+	;;
+	ld8	out4=[loc2],16
+	ld8	out5=[loc3],16
+	;;
+	ld8	out6=[loc2],16
+	ld8	out7=[loc3]
+	/* loc2 points at first stack parameter.  Set sp to 16 bytes	*/
+	/* below that.							*/
+	add	sp=-16,loc2
+	
+	ld8 	r8=[fn],8
+	;;
+	ld8	r1=[fn]		/* Set up gp */
+	mov	b6=r8;;
+	br.call.sptk.many b0 = b6	/* call ffi_prep_args	*/
+	
+	/* Handle return value. */
+	cmp.eq	p6,p0=0,raddr
+	cmp.eq	p7,p0=FFI_TYPE_INT,flags
+	cmp.eq	p10,p0=FFI_IS_SMALL_STRUCT2,flags
+	cmp.eq	p11,p0=FFI_IS_SMALL_STRUCT3,flags
+	cmp.eq	p12,p0=FFI_IS_SMALL_STRUCT4,flags
+	;;
+(p6) 	br.cond.dpnt.few done		/* Dont copy ret values if raddr = 0 */
+(p7)	br.cond.dptk.few copy1
+(p10)	br.cond.dpnt.few copy2
+(p11)	br.cond.dpnt.few copy3
+(p12)	br.cond.dpnt.few copy4
+	cmp.eq	p8,p0=FFI_TYPE_FLOAT,flags
+	cmp.eq	p9,p0=FFI_TYPE_DOUBLE,flags
+	tbit.nz	p6,p0=flags,FLOAT_FP_AGGREGATE_BIT
+	tbit.nz	p7,p0=flags,DOUBLE_FP_AGGREGATE_BIT
+	;;
+(p8)	stfs	[raddr]=f8
+(p9)	stfd	[raddr]=f8
+	;;
+(p6)	br.cond.dpnt.few handle_float_hfa
+(p7)	br.cond.dpnt.few handle_double_hfa
+	br done
+
+copy4:
+	add	loc3=24,raddr
+	;;
+	st8	[loc3]=r11
+copy3:
+	add	loc3=16,raddr
+	;;
+	st8	[loc3]=r10
+copy2:
+	add	loc3=8,raddr
+	;;
+	st8	[loc3]=r9
+copy1:
+	st8	[raddr]=r8
+	/* In the big struct case, raddr was passed as an argument.	*/
+	/* In the void case there was nothing to do.			*/
+
+done:
+	mov	r1=loc4		/* Restore gp	*/
+	mov	ar.pfs = loc0
+	mov	b0 = loc1
+	br.ret.sptk.many b0
+
+handle_double_hfa:
+	/* Homogeneous floating point array of doubles is returned in	*/
+	/* registers f8-f15.  Save one at a time to return area.	*/
+	and	flags=0xf,flags	/* Retrieve size	*/
+	;;
+	cmp.eq	p6,p0=2,flags
+	cmp.eq	p7,p0=3,flags
+	cmp.eq	p8,p0=4,flags
+	cmp.eq	p9,p0=5,flags
+	cmp.eq	p10,p0=6,flags
+	cmp.eq	p11,p0=7,flags
+	cmp.eq	p12,p0=8,flags
+	;;
+(p6)	br.cond.dptk.few	dhfa2
+(p7)	br.cond.dptk.few	dhfa3
+(p8)	br.cond.dptk.few	dhfa4
+(p9)	br.cond.dptk.few	dhfa5
+(p10)	br.cond.dptk.few	dhfa6
+(p11)	br.cond.dptk.few	dhfa7
+dhfa8:	add 	loc3=7*8,raddr
+	;;
+	stfd	[loc3]=f15
+dhfa7:	add 	loc3=6*8,raddr
+	;;
+	stfd	[loc3]=f14
+dhfa6:	add 	loc3=5*8,raddr
+	;;
+	stfd	[loc3]=f13
+dhfa5:	add 	loc3=4*8,raddr
+	;;
+	stfd	[loc3]=f12
+dhfa4:	add 	loc3=3*8,raddr
+	;;
+	stfd	[loc3]=f11
+dhfa3:	add 	loc3=2*8,raddr
+	;;
+	stfd	[loc3]=f10
+dhfa2:	add 	loc3=1*8,raddr
+	;;
+	stfd	[loc3]=f9
+	stfd	[raddr]=f8
+	br	done
+
+handle_float_hfa:
+	/* Homogeneous floating point array of floats is returned in	*/
+	/* registers f8-f15.  Save one at a time to return area.	*/
+	and	flags=0xf,flags	/* Retrieve size	*/
+	;;
+	cmp.eq	p6,p0=2,flags
+	cmp.eq	p7,p0=3,flags
+	cmp.eq	p8,p0=4,flags
+	cmp.eq	p9,p0=5,flags
+	cmp.eq	p10,p0=6,flags
+	cmp.eq	p11,p0=7,flags
+	cmp.eq	p12,p0=8,flags
+	;;
+(p6)	br.cond.dptk.few	shfa2
+(p7)	br.cond.dptk.few	shfa3
+(p8)	br.cond.dptk.few	shfa4
+(p9)	br.cond.dptk.few	shfa5
+(p10)	br.cond.dptk.few	shfa6
+(p11)	br.cond.dptk.few	shfa7
+shfa8:	add 	loc3=7*4,raddr
+	;;
+	stfd	[loc3]=f15
+shfa7:	add 	loc3=6*4,raddr
+	;;
+	stfd	[loc3]=f14
+shfa6:	add 	loc3=5*4,raddr
+	;;
+	stfd	[loc3]=f13
+shfa5:	add 	loc3=4*4,raddr
+	;;
+	stfd	[loc3]=f12
+shfa4:	add 	loc3=3*4,raddr
+	;;
+	stfd	[loc3]=f11
+shfa3:	add 	loc3=2*4,raddr
+	;;
+	stfd	[loc3]=f10
+shfa2:	add 	loc3=1*4,raddr
+	;;
+	stfd	[loc3]=f9
+	stfd	[raddr]=f8
+	br	done
+
+        .endp ffi_call_unix
+
+
+.text
+        .align 16
+        .global ffi_closure_UNIX
+        .proc ffi_closure_UNIX
+ffi_closure_UNIX:
+	alloc   loc0=ar.pfs,8,2,2,0
+	mov	loc1=b0
+	/* Retrieve closure pointer and real gp.	*/
+	mov	out0=gp
+	add	gp=16,gp
+	;;
+	ld8	gp=[gp]
+	/* Reserve a structia64_args on the stack such that arguments	*/
+	/* past the first 8 are automatically placed in the right	*/
+	/* slot.  Note that when we start the sp points at 2 8-byte	*/
+	/* scratch words, followed by the extra arguments.		*/
+#	define BASIC_ARGS_SZ (8*FLOAT_SZ+8*8+2*8)
+#	define FIRST_FP_OFFSET (4*8)
+	add	r14=-(BASIC_ARGS_SZ-FIRST_FP_OFFSET),sp
+	add	r15=-(BASIC_ARGS_SZ-FIRST_FP_OFFSET-FLOAT_SZ),sp
+	add	sp=-BASIC_ARGS_SZ,sp
+	/* r14 points to fp_regs[0], r15 points to fp_regs[1]	*/
+	;;
+	stfd	[r14]=f8,2*FLOAT_SZ
+	stfd	[r15]=f9,2*FLOAT_SZ
+	;;
+	stfd	[r14]=f10,2*FLOAT_SZ
+	stfd	[r15]=f11,2*FLOAT_SZ
+	;;
+	stfd	[r14]=f12,2*FLOAT_SZ
+	stfd	[r15]=f13,2*FLOAT_SZ
+	;;
+	stfd	[r14]=f14,FLOAT_SZ+8
+	stfd	[r15]=f15,2*8
+	;;
+	/* r14 points to first parameter register area, r15 to second. */
+	st8	[r14]=in0,2*8
+	st8	[r15]=in1,2*8
+	;;
+	st8	[r14]=in2,2*8
+	st8	[r15]=in3,2*8
+	;;
+	st8	[r14]=in4,2*8
+	st8	[r15]=in5,2*8
+	;;
+	st8	[r14]=in6,2*8
+	st8	[r15]=in7,2*8
+	/* Call ffi_closure_UNIX_inner */
+	mov	out1=sp
+	br.call.sptk.many b0=ffi_closure_UNIX_inner
+	;;
+	mov	b0=loc1
+	mov 	ar.pfs=loc0
+	br.ret.sptk.many b0
+	.endp ffi_closure_UNIX
+	
+

From java-patches-return-517-listarch-java-patches=sourceware.cygnus.com@sourceware.cygnus.com Fri Feb 25 23:44:27 2000
Return-Path: <java-patches-return-517-listarch-java-patches=sourceware.cygnus.com@sourceware.cygnus.com>
Delivered-To: listarch-java-patches@sourceware.cygnus.com
Received: (qmail 647 invoked by alias); 25 Feb 2000 23:44:27 -0000
Mailing-List: contact java-patches-help@sourceware.cygnus.com; run by ezmlm
Precedence: bulk
List-Subscribe: <mailto:java-patches-subscribe@sourceware.cygnus.com>
List-Archive: <http://sourceware.cygnus.com/ml/java-patches/>
List-Post: <mailto:java-patches@sourceware.cygnus.com>
List-Help: <mailto:java-patches-help@sourceware.cygnus.com>, <http://sourceware.cygnus.com/ml/#faqs>
Sender: java-patches-owner@sourceware.cygnus.com
Delivered-To: mailing list java-patches@sourceware.cygnus.com
Received: (qmail 627 invoked from network); 25 Feb 2000 23:44:22 -0000
To: Java Patch List <java-patches@sourceware.cygnus.com> 
Subject: Patch: jni.cc -vs- the interpreter
X-Zippy:  Half a mind is a terrible thing to waste!
X-Attribution:  Tom
Bcc:
Reply-To:  tromey@cygnus.com
From:  Tom Tromey <tromey@cygnus.com>
Date: 25 Feb 2000 16:48:57 -0700
Message-ID: <873dqgetcm.fsf@cygnus.com>
Lines: 35
X-Mailer: Gnus v5.5/Emacs 20.3

This fixes a bug in jni.cc which caused it not to compile if the
interpreter was disabled.

2000-02-25  Tom Tromey  <tromey@cygnus.com>

	* jni.cc (_Jv_JNI_RegisterNatives): Conditionalize body on
	`INTERPRETER'.

Tom

Index: jni.cc
===================================================================
RCS file: /cvs/java/libgcj/libjava/jni.cc,v
retrieving revision 1.21
diff -u -r1.21 jni.cc
--- jni.cc	2000/02/18 21:22:05	1.21
+++ jni.cc	2000/02/25 23:43:11
@@ -1263,6 +1263,7 @@
 			 const JNINativeMethod *methods,
 			 jint nMethods)
 {
+#ifdef INTERPRETER
   // For now, this only matters for interpreted methods.  FIXME.
   if (! _Jv_IsInterpretedClass (k))
     {
@@ -1307,6 +1308,9 @@
     }
 
   return JNI_OK;
+#else /* INTERPRETER */
+  return JNI_ERR;
+#endif /* INTERPRETER */
 }
 
 static jint

From java-patches-return-518-listarch-java-patches=sourceware.cygnus.com@sourceware.cygnus.com Sat Feb 26 20:52:31 2000
Return-Path: <java-patches-return-518-listarch-java-patches=sourceware.cygnus.com@sourceware.cygnus.com>
Delivered-To: listarch-java-patches@sourceware.cygnus.com
Received: (qmail 22547 invoked by alias); 26 Feb 2000 20:52:31 -0000
Mailing-List: contact java-patches-help@sourceware.cygnus.com; run by ezmlm
Precedence: bulk
List-Subscribe: <mailto:java-patches-subscribe@sourceware.cygnus.com>
List-Archive: <http://sourceware.cygnus.com/ml/java-patches/>
List-Post: <mailto:java-patches@sourceware.cygnus.com>
List-Help: <mailto:java-patches-help@sourceware.cygnus.com>, <http://sourceware.cygnus.com/ml/#faqs>
Sender: java-patches-owner@sourceware.cygnus.com
Delivered-To: mailing list java-patches@sourceware.cygnus.com
Received: (qmail 22524 invoked from network); 26 Feb 2000 20:52:29 -0000
Message-ID: <005a01bf809b$999331b0$010010ac@brookfield.net>
From: "Jon Beniston" <jb7216@bristol.ac.uk>
To: <java-patches@sourceware.cygnus.com>
Subject: Win32 bits and bobs
Date: Sat, 26 Feb 2000 20:53:56 -0000
MIME-Version: 1.0
Content-Type: multipart/mixed;
	boundary="----=_NextPart_000_0057_01BF809B.98CAFFB0"
X-Priority: 3
X-MSMail-Priority: Normal
X-Mailer: Microsoft Outlook Express 5.00.2314.1300
X-MimeOLE: Produced By Microsoft MimeOLE V5.00.2314.1300

This is a multi-part message in MIME format.

------=_NextPart_000_0057_01BF809B.98CAFFB0
Content-Type: text/plain;
	charset="iso-8859-1"
Content-Transfer-Encoding: 7bit

Howdy,

Here's most of the code required for Win32 compatibility. Two #defines are
used: USE_WINSOCK which enables networking and USE_WIN32_SIGNALLING which
enables run-time exception handling. There's one major problem and that is
to do with the std io streams. This will require some changes to
FileDescriptor.java as discussed a while ago, but I haven't got around to
implementing.

Good luck,
Jon.


------=_NextPart_000_0057_01BF809B.98CAFFB0
Content-Type: application/octet-stream;
	name="exception.cc"
Content-Transfer-Encoding: quoted-printable
Content-Disposition: attachment;
	filename="exception.cc"

// Functions for Exception Support for Java.=0A=
=0A=
/* Copyright (C) 1998, 1999  Red Hat, Inc.=0A=
=0A=
   This file is part of libgcj.=0A=
=0A=
This software is copyrighted work licensed under the terms of the=0A=
Libgcj License.  Please consult the file "LIBGCJ_LICENSE" for=0A=
details.  */=0A=
=0A=
#include <config.h>=0A=
=0A=
#include "exception"=0A=
#include <stddef.h>=0A=
#include <stdlib.h>=0A=
=0A=
#include <java/lang/Class.h>=0A=
#include <java/lang/NullPointerException.h>=0A=
#include <gcj/cni.h>=0A=
#include <jvm.h>=0A=
=0A=
// eh-common.h needs gansidecl.h.=0A=
#include "gansidecl.h"=0A=
#include "eh-common.h"=0A=
=0A=
typedef struct {=0A=
  __eh_info eh_info;=0A=
  void *value;=0A=
} java_eh_info;=0A=
=0A=
=0A=
/* Language-specific EH info pointer, throw routine, and language/version=0A=
   info routines. All defined in libgcc2. */=0A=
=0A=
extern "C" java_eh_info **__get_eh_info (); =0A=
extern "C" void __throw () __attribute__ ((__noreturn__));=0A=
extern "C" void __sjthrow () __attribute__ ((__noreturn__));=0A=
extern "C" short __get_eh_table_version (void *table);=0A=
extern "C" short __get_eh_table_language (void *table);=0A=
extern "C" void *__get_eh_context ();
=0A=
extern "C" void *=0A=
_Jv_type_matcher (java_eh_info *info, void* match_info, =0A=
		  void *exception_table)=0A=
{=0A=
#ifndef SJLJ_EXCEPTIONS=0A=
  /* No exception table implies the old style mechanism, so don't check. =
*/=0A=
  if (exception_table !=3D NULL=0A=
      && __get_eh_table_language (exception_table) !=3D EH_LANG_Java)=0A=
    return NULL;=0A=
#endif=0A=
=0A=
  /* we don't worry about version info yet, there is only one version! */=0A=
  =0A=
  if (match_info !=3D NULL)=0A=
    {=0A=
      // The match_info is either a (java::lang::Class*) or=0A=
      // match_info is one more than a (Utf8Const*).=0A=
      if (sizeof(void*) !=3D sizeof(size_t))=0A=
	abort();=0A=
      size_t mi =3D (size_t) match_info;=0A=
      if ((mi & 1) !=3D 0)=0A=
	match_info =3D _Jv_FindClass ((Utf8Const*) (mi - 1), NULL);=0A=
      if (! _Jv_IsInstanceOf ((jobject) info->value, (jclass) =
match_info))=0A=
	return NULL;=0A=
    }=0A=
=0A=
  return info->value;=0A=
}=0A=
=0A=
/* Compiler hook to return a pointer to java exception object. The value=0A=
   is cleared, so if the exception needs to be rethrown, it should be =
set =0A=
   again */=0A=
=0A=
extern "C" void *=0A=
_Jv_exception_info (void)=0A=
{=0A=
  java_eh_info *info =3D *(__get_eh_info ());=0A=
  void *ptr;=0A=
=0A=
  if (info =3D=3D NULL)=0A=
    abort ();=0A=
=0A=
  ptr =3D info->value;=0A=
=0A=
  /* clear the value so another throw is an error */=0A=
  info->value =3D NULL;=0A=
=0A=
  return ptr;=0A=
}=0A=
=0A=
=0A=
=0A=
/* Allocate an exception info structure for java. Called the first time=0A=
   an exception is thrown. */=0A=
=0A=
extern "C" void=0A=
_Jv_eh_alloc ()=0A=
{=0A=
  /* FIXME: we should use _Jv_AllocBytes here.  However, libgcc2=0A=
     apparently can sometimes free() this value itself.  */=0A=
  java_eh_info *p =3D (java_eh_info *) malloc (sizeof (java_eh_info));=0A=
  if (p =3D=3D 0)=0A=
    terminate ();=0A=
=0A=
  p->value =3D 0;=0A=
  java_eh_info ** info_ptr =3D __get_eh_info ();=0A=
=0A=
  /* There should NOT be an exception info pointer already. */=0A=
  if (*info_ptr !=3D NULL)=0A=
    abort ();=0A=
=0A=
  *info_ptr =3D p;=0A=
}=0A=
=0A=
/* Deallocate the current exception info structure. Called at shutdown =
time. */=0A=
=0A=
extern "C" void=0A=
_Jv_eh_free ()=0A=
{=0A=
  java_eh_info ** info_ptr =3D __get_eh_info ();=0A=
  if (*info_ptr =3D=3D NULL)=0A=
    abort ();=0A=
  =0A=
  /* FIXME: ideally we should just let the GC handle this.  */=0A=
  free (*info_ptr);=0A=
  *info_ptr =3D NULL;=0A=
}=0A=
=0A=
/* Initialize an __eh_info structure with this libraries matching info. =
*/=0A=
=0A=
extern "C" void=0A=
_Jv_setup_eh_info (__eh_info *)=0A=
{=0A=
}=0A=
=0A=
/* Perform a throw, Java style. Throw will unwind through this call,=0A=
   so there better not be any handlers or exception thrown here. */=0A=
=0A=
extern "C" void=0A=
_Jv_Throw (void *value)=0A=
{=0A=
  if (value =3D=3D NULL)=0A=
    value =3D (void *) new java::lang::NullPointerException ();=0A=
  java_eh_info *ehinfo =3D *(__get_eh_info ());=0A=
  if (ehinfo =3D=3D NULL)=0A=
    {=0A=
      _Jv_eh_alloc ();=0A=
      ehinfo =3D *(__get_eh_info ());=0A=
    }=0A=
  ehinfo->eh_info.match_function =3D (__eh_matcher) _Jv_type_matcher;=0A=
  ehinfo->eh_info.language =3D EH_LANG_Java;=0A=
  ehinfo->eh_info.version =3D 1;=0A=
  ehinfo->value =3D value;=0A=
=0A=
/* We're happy with setjmp/longjmp exceptions or region-based=0A=
   exception handlers: entry points are provided here for both.  */=0A=
#ifdef SJLJ_EXCEPTIONS=0A=
  __sjthrow ();=0A=
#else=0A=
  __throw ();=0A=
#endif=0A=
}=0A=

#ifdef USE_WIN32_SIGNALLING

// This is a mangled version of _Jv_Throw and __sjthrow except
// rather than calling longjmp, it returns a pointer to the jmp buffer

extern "C" int *
win32_get_restart_frame (void *value)
{
  struct eh_context *eh =3D (struct eh_context *)__get_eh_context ();
  void ***dhc =3D &eh->dynamic_handler_chain;
=20
  java_eh_info *ehinfo =3D *(__get_eh_info ());
  if (ehinfo =3D=3D NULL)
    {
      _Jv_eh_alloc ();
      ehinfo =3D *(__get_eh_info ());
    }
  ehinfo->eh_info.match_function =3D (__eh_matcher) _Jv_type_matcher;
  ehinfo->eh_info.language =3D EH_LANG_Java;
  ehinfo->eh_info.version =3D 1;
  ehinfo->value =3D value;

  // FIXME: Run clean ups?

  int *jmpbuf =3D (int*)&(*dhc)[2];

  *dhc =3D (void**)(*dhc)[0];

  return  jmpbuf;
}

#endif /* USE_WIN32_SIGNALLING */

------=_NextPart_000_0057_01BF809B.98CAFFB0
Content-Type: application/octet-stream;
	name="natFileDescriptorWin32.cc"
Content-Transfer-Encoding: quoted-printable
Content-Disposition: attachment;
	filename="natFileDescriptorWin32.cc"

// natFileDescriptorWin32.cc - Native part of FileDescriptor class.=0A=
=0A=
/* Copyright (C) 1998, 1999, 2000  Red Hat, Inc.
=0A=
   This file is part of libgcj.=0A=
=0A=
This software is copyrighted work licensed under the terms of the=0A=
Libgcj License.  Please consult the file "LIBGCJ_LICENSE" for=0A=
details.  */=0A=

// FIXME: In order to support interrupting of IO operations, we
// need to change to use the windows asynchronous IO functions
=0A=
#include <config.h>=0A=
=0A=
#include <stdio.h>=0A=
#include <string.h>=0A=

#include <windows.h>
=0A=
#include <gcj/cni.h>=0A=
#include <jvm.h>=0A=
#include <java/io/FileDescriptor.h>=0A=
#include <java/io/SyncFailedException.h>=0A=
#include <java/io/IOException.h>=0A=
#include <java/io/InterruptedIOException.h>=0A=
#include <java/io/EOFException.h>=0A=
#include <java/lang/ArrayIndexOutOfBoundsException.h>=0A=
#include <java/lang/NullPointerException.h>=0A=
#include <java/lang/String.h>=0A=
#include <java/lang/Thread.h>=0A=
#include <java/io/FileNotFoundException.h>=0A=

char *
winerr (void)=20
{
  static LPVOID last =3D NULL;
  LPVOID old =3D NULL;

  if (last)=20
    old =3D last;   =20

  FormatMessage (FORMAT_MESSAGE_ALLOCATE_BUFFER |=20
    FORMAT_MESSAGE_FROM_SYSTEM |=20
    FORMAT_MESSAGE_IGNORE_INSERTS,
    NULL,
    GetLastError(),
    MAKELANGID(LANG_NEUTRAL, SUBLANG_DEFAULT),=20
    (LPTSTR) &last,
    0,
    NULL);

  if (old)
    LocalFree (old);

  return (char *)last;
}
=0A=
jboolean=20
java::io::FileDescriptor::valid (void) {
  BY_HANDLE_FILE_INFORMATION info;
  return GetFileInformationByHandle ((HANDLE)fd, &info) !=3D 0;=0A=
}=0A=
=0A=
void=20
java::io::FileDescriptor::sync (void) {
  if (! FlushFileBuffers ((HANDLE)fd))=20
    JvThrow (new SyncFailedException (JvNewStringLatin1 (winerr ())));
}=0A=

jint=20
java::io::FileDescriptor::open (jstring path, jint jflags) {=0A=
   =20
  HANDLE handle =3D NULL;
  DWORD access =3D 0;
  DWORD share =3D FILE_SHARE_READ;
  DWORD create =3D OPEN_EXISTING;
  char buf[MAX_PATH] =3D "";

  jsize total =3D JvGetStringUTFRegion(path, 0, path->length(), buf);
  buf[total] =3D '\0';

  JvAssert((jflags & READ) || (jflags & WRITE));

  if ((jflags & READ) && (jflags & WRITE))=20
    {
      access =3D GENERIC_READ | GENERIC_WRITE;
      share =3D 0;
      if (jflags & APPEND)=20
	create =3D OPEN_ALWAYS;
      else=20
	create =3D CREATE_ALWAYS;      =20
    }=20
  else if(jflags & READ)=20
    access =3D GENERIC_READ;
  else=20
    {
      access =3D GENERIC_WRITE;
      share =3D 0;
      if (jflags & APPEND)=20
	create =3D OPEN_ALWAYS;	  =20
      else=20
        create =3D CREATE_ALWAYS;     =09
    }

  handle =3D CreateFile(buf, access, share, NULL, create, 0, NULL);

  if (handle =3D=3D INVALID_HANDLE_VALUE)=20
    {
      char msg[MAX_PATH + 1000];
      sprintf (msg, "%s: %s", buf, winerr ());
      JvThrow (new FileNotFoundException (JvNewStringLatin1 (msg)));
    }

  return (jint)handle;
}=0A=
=0A=
void=20
java::io::FileDescriptor::write (jint b)=20
{=0A=
  DWORD bytesWritten;
  jbyte buf =3D (jbyte)b;

  if (WriteFile ((HANDLE)fd, &buf, 1, &bytesWritten, NULL))=20
    {
      if (java::lang::Thread::interrupted())
        {
          InterruptedIOException *iioe =3D new InterruptedIOException =
(JvNewStringLatin1 ("write interrupted"));
          iioe->bytesTransferred =3D bytesWritten;
          JvThrow (iioe);
        }
      if (bytesWritten !=3D 1)=20
        JvThrow (new IOException (JvNewStringLatin1 (winerr ())));
    }=20
  else=20
    JvThrow (new IOException (JvNewStringLatin1 (winerr ())));
  // FIXME: loop until bytesWritten =3D=3D 1
}=0A=
=0A=
void=20
java::io::FileDescriptor::write(jbyteArray b, jint offset, jint len)=20
{=0A=
  if (! b)
    JvThrow (new java::lang::NullPointerException);
  if(offset < 0 || len < 0 || offset + len > JvGetArrayLength (b))=20
    JvThrow (new java::lang::ArrayIndexOutOfBoundsException);

  jbyte *buf =3D elements (b) + offset;
  DWORD bytesWritten;
  if (WriteFile ((HANDLE)fd, buf, len, &bytesWritten, NULL))=20
    {
      if (java::lang::Thread::interrupted())
        {
          InterruptedIOException *iioe =3D new InterruptedIOException =
(JvNewStringLatin1 ("write interrupted"));
          iioe->bytesTransferred =3D bytesWritten;
          JvThrow (iioe);
        }
    }=20
  else=20
    JvThrow(new IOException (JvNewStringLatin1 (winerr ())));
  // FIXME: loop until bytesWritten =3D=3D len
}=0A=
=0A=
void=20
java::io::FileDescriptor::close (void)=20
{
  HANDLE save =3D (HANDLE)fd;
  fd =3D (jint)INVALID_HANDLE_VALUE;
  if (! CloseHandle (save))=20
    JvThrow (new IOException (JvNewStringLatin1 (winerr ())));
}=0A=
=0A=
jint=20
java::io::FileDescriptor::seek (jlong pos, jint whence)=20
{
  JvAssert (whence =3D=3D SET || whence =3D=3D CUR);

  jlong len =3D length();
  jlong here =3D getFilePointer();

  if ((whence =3D=3D SET && pos > len) || (whence =3D=3D CUR && here + =
pos > len))=20
    JvThrow (new EOFException);

  LONG high =3D pos >> 32;
  DWORD low =3D SetFilePointer ((HANDLE)fd, (DWORD)(0xffffffff & pos), =
&high, whence =3D=3D SET ? FILE_BEGIN : FILE_CURRENT);
  if ((low =3D=3D 0xffffffff) && (GetLastError () !=3D NO_ERROR))=20
    JvThrow (new IOException (JvNewStringLatin1 (winerr ())));
  return low;
}=0A=
=0A=
jlong=20
java::io::FileDescriptor::getFilePointer(void)=20
{
  LONG high =3D 0;
  DWORD low =3D SetFilePointer ((HANDLE)fd, 0, &high, FILE_CURRENT);
  if ((low =3D=3D 0xffffffff) && (GetLastError() !=3D NO_ERROR))
    JvThrow(new IOException (JvNewStringLatin1 (winerr ())));
  return (((jlong)high) << 32L) | (jlong)low;
}

jlong=20
java::io::FileDescriptor::length(void)=20
{
  DWORD high;
  DWORD low;
=09
  low =3D GetFileSize ((HANDLE)fd, &high);
  // FIXME: Error checking=0A=
  return (((jlong)high) << 32L) | (jlong)low;
}=0A=
=0A=
jint=20
java::io::FileDescriptor::read(void)=20
{
  CHAR buf;
  DWORD read;

  if (! ReadFile ((HANDLE)fd, &buf, 1, &read, NULL))=20
    JvThrow (new IOException (JvNewStringLatin1 (winerr ())));
  if (! read)=20
    return -1;
  else =0A=
    return (jint)(buf & 0xff);
}=0A=
=0A=
jint=20
java::io::FileDescriptor::read(jbyteArray buffer, jint offset, jint =
count)=20
{
  if (! buffer)=20
    JvThrow(new java::lang::NullPointerException);

  jsize bsize =3D JvGetArrayLength (buffer);
  if (offset < 0 || count < 0 || offset + count > bsize)=20
    JvThrow (new java::lang::ArrayIndexOutOfBoundsException);

  jbyte *bytes =3D elements (buffer) + offset;

  DWORD read;
  if (! ReadFile((HANDLE)fd, bytes, count, &read, NULL))=20
    JvThrow (new IOException (JvNewStringLatin1 (winerr ())));

  return (jint)read;
}=0A=
=0A=
jint=20
java::io::FileDescriptor::available(void)=20
{
  // FIXME:=20
  return length() - getFilePointer();
}=0A=

------=_NextPart_000_0057_01BF809B.98CAFFB0
Content-Type: application/octet-stream;
	name="natFileWin32.cc"
Content-Transfer-Encoding: quoted-printable
Content-Disposition: attachment;
	filename="natFileWin32.cc"

// natFileWin32.cc - Native part of File class.=0A=
=0A=
/* Copyright (C) 1998, 1999  Red Hat, Inc.

   This file is part of libgcj.=0A=
=0A=
This software is copyrighted work licensed under the terms of the=0A=
Libgcj License.  Please consult the file "LIBGCJ_LICENSE" for=0A=
details.  */=0A=

#include <config.h>=0A=
=0A=
#include <stdio.h>=0A=
#include <string.h>=0A=

#include <windows.h>
=0A=
#include <gcj/cni.h>=0A=
#include <jvm.h>=0A=
#include <java/io/File.h>=0A=
#include <java/io/IOException.h>=0A=
#include <java/util/Vector.h>=0A=
#include <java/lang/String.h>=0A=
#include <java/io/FilenameFilter.h>=0A=
#include <java/lang/System.h>=0A=
=0A=
jboolean=20
java::io::File::access (jstring canon, jint query)=20
{
  if (! canon)=20
    return false;
  char buf[MAX_PATH];
  jsize total =3D JvGetStringUTFRegion (canon, 0, canon->length(), buf);
  // FIXME?
  buf[total] =3D '\0';

  JvAssert (query =3D=3D READ || query =3D=3D WRITE || query =3D=3D =
EXISTS);

  // FIXME: Is it possible to differentiate between existing and =
reading?
  // If the file exists but cannot be read because of the secuirty =
attributes=20
  // on an NTFS disk this wont work (it reports it can be read but cant)
  // Could we use something from the security API?
  DWORD attributes =3D GetFileAttributes (buf);
  if ((query =3D=3D EXISTS) || (query =3D=3D READ))
    return (attributes =3D=3D 0xffffffff) ? false : true;
  else
    return ((attributes !=3D 0xffffffff) && ((attributes & =
FILE_ATTRIBUTE_READONLY) =3D=3D 0)) ? true : false;
}=0A=
=0A=
jboolean=20
java::io::File::stat (jstring canon, jint query)=20
{
  if (! canon)
    return false;
  char buf[MAX_PATH];
  jsize total =3D JvGetStringUTFRegion (canon, 0, canon->length(), buf);
  // FIXME?
  buf[total] =3D '\0';
=09
  JvAssert (query =3D=3D DIRECTORY || query =3D=3D ISFILE);

  DWORD attributes =3D GetFileAttributes (buf);
  if (attributes =3D=3D 0xffffffff)=20
    return false;

  if (query =3D=3D DIRECTORY)=20
    return attributes & FILE_ATTRIBUTE_DIRECTORY ? true : false;
  else=20
    return attributes & FILE_ATTRIBUTE_DIRECTORY ? false : true;
}=0A=
=0A=
jlong=20
java::io::File::attr (jstring canon, jint query)=20
{
  if (! canon)
    return false;
  char buf[MAX_PATH];
  jsize total =3D JvGetStringUTFRegion (canon, 0, canon->length(), buf);
  // FIXME?
  buf[total] =3D '\0';

  JvAssert (query =3D=3D MODIFIED || query =3D=3D LENGTH);

  WIN32_FILE_ATTRIBUTE_DATA info;
  if (! GetFileAttributesEx(buf, GetFileExInfoStandard, &info))=20
    return 0;

  if (query =3D=3D LENGTH)=20
    return ((long long)info.nFileSizeHigh) << 32 | (unsigned long =
long)info.nFileSizeLow;
  else {
    // FIXME? This is somewhat compiler dependant (the LL constant =
suffix)
    // The file time as return by windows is the number of =
100-nanosecond intervals since January 1, 1601
    return (((((long long)info.ftLastWriteTime.dwHighDateTime) << 32) | =
((unsigned long long)info.ftLastWriteTime.dwLowDateTime)) - =
116444736000000000LL) / 10000LL;
  }=0A=
}=0A=
=0A=
jstring=20
java::io::File::getCanonicalPath (void)=20
{=0A=
  char buf[MAX_PATH], buf2[MAX_PATH];
  jsize total =3D JvGetStringUTFRegion (path, 0, path->length(), buf);
  // FIXME?
  buf[total] =3D '\0';

  LPTSTR unused;
  if(!GetFullPathName(buf, MAX_PATH, buf2, &unused))=20
    _Jv_Throw (new IOException (JvNewStringLatin1 ("GetFullPathName =
failed")));
 =20
  // FIXME: what encoding to assume for file names?  This affects many
  // calls.
  return JvNewStringUTF(buf2);
}=0A=
=0A=
jboolean=20
java::io::File::isAbsolute (void)=20
{=0A=
  if (path->charAt(0) =3D=3D '/' || path->charAt(0) =3D=3D '\\')
    return true;
  if (path->length() < 3)
    return false;
  // Hard-code A-Za-z because Windows (I think) can't use non-ASCII
  // letters as drive names.
  if ((path->charAt(0) < 'a' || path->charAt(0) > 'z')
      && (path->charAt(0) < 'A' || path->charAt(0) > 'Z'))
    return false;
  return (path->charAt(1) =3D=3D ':'
	  && (path->charAt(2) =3D=3D '/' || path->charAt(2) =3D=3D '\\'));
}=0A=
=0A=
jstringArray=20
java::io::File::performList (jstring canon, FilenameFilter *filter)=20
{=0A=
  if (! canon)
    return NULL;
  char buf[MAX_PATH];
  jsize total =3D JvGetStringUTFRegion (canon, 0, canon->length(), buf);
  // FIXME?
  strcpy(&buf[total], "\\*.*");

  WIN32_FIND_DATA data;
  HANDLE handle =3D FindFirstFile (buf, &data);
  if (handle =3D=3D INVALID_HANDLE_VALUE)
    return NULL;

  java::util::Vector *vec =3D new java::util::Vector ();

  do=20
    {
      if (strcmp (data.cFileName, ".") && strcmp (data.cFileName, ".."))
        {
          jstring name =3D JvNewStringUTF (data.cFileName);
          if (! filter || (filter && filter->accept(this, name)))=20
            vec->addElement (name);
        }
    }
  while (FindNextFile (handle, &data));
 =20
  if (GetLastError () !=3D ERROR_NO_MORE_FILES)
    return NULL;

  FindClose (handle);

  jobjectArray ret =3D JvNewObjectArray (vec->size(), canon->getClass(), =
NULL);
  vec->copyInto (ret);
  return reinterpret_cast<jstringArray> (ret);
}=0A=
=0A=
jboolean=20
java::io::File::performMkdir (void)=20
{
  char buf[MAX_PATH];
  jsize total =3D JvGetStringUTFRegion(path, 0, path->length(), buf);
  // FIXME?
  buf[total] =3D '\0';

  return (CreateDirectory(buf, NULL)) ? true : false;
}=0A=
=0A=
jboolean=20
java::io::File::performRenameTo (File *dest)=20
{=0A=
  char buf[MAX_PATH];
  jsize total =3D JvGetStringUTFRegion(path, 0, path->length(), buf);
  // FIXME?
  buf[total] =3D '\0';
  char buf2[MAX_PATH];
  total =3D JvGetStringUTFRegion(dest->path, 0, dest->path->length(), =
buf2);
  // FIXME?
  buf2[total] =3D '\0';

  return (MoveFile(buf, buf2)) ? true : false;
}=0A=
=0A=
jboolean=20
java::io::File::performDelete (jstring canon)=20
{
  char buf[MAX_PATH];
  jsize total =3D JvGetStringUTFRegion(canon, 0, canon->length(), buf);
  // FIXME?
  buf[total] =3D '\0';

  DWORD attributes =3D GetFileAttributes (buf);
  if (attributes =3D=3D 0xffffffff)=20
    return false;

  if (attributes & FILE_ATTRIBUTE_DIRECTORY)=20
    return (RemoveDirectory (buf)) ? true : false;
  else
    return (DeleteFile (buf)) ? true : false;
}=0A=

------=_NextPart_000_0057_01BF809B.98CAFFB0
Content-Type: application/octet-stream;
	name="natInetAddress.cc"
Content-Transfer-Encoding: quoted-printable
Content-Disposition: attachment;
	filename="natInetAddress.cc"

// natInetAddress.cc=0A=
=0A=
/* Copyright (C) 1998, 1999  Red Hat, Inc.=0A=
=0A=
   This file is part of libgcj.=0A=
=0A=
This software is copyrighted work licensed under the terms of the=0A=
Libgcj License.  Please consult the file "LIBGCJ_LICENSE" for=0A=
details.  */=0A=
=0A=
#include <config.h>=0A=
=0A=
#if GETHOSTBYNAME_R_NEEDS_REENTRANT && !defined(_REENTRANT)=0A=
# define _REENTRANT 1=0A=
#endif=0A=

#ifdef USE_WINSOCK

#include <windows.h>
#include <winsock.h>

#ifndef MAXHOSTNAMELEN
#define MAXHOSTNAMELEN	64
#endif /* MAXHOSTNAMELEN */

#else
=0A=
#ifdef HAVE_UNISTD_H=0A=
#include <unistd.h>=0A=
#endif=0A=
#include <string.h>=0A=
#include <errno.h>=0A=
=0A=
#include <sys/param.h>=0A=
#include <sys/types.h>=0A=
#ifdef HAVE_SYS_SOCKET_H=0A=
#include <sys/socket.h>=0A=
#endif=0A=
#ifdef HAVE_NETINET_IN_H=0A=
#include <netinet/in.h>=0A=
#endif=0A=
#ifdef HAVE_ARPA_INET_H=0A=
#include <arpa/inet.h>=0A=
#endif=0A=
#ifdef HAVE_NETDB_H=0A=
#include <netdb.h>=0A=
#endif=0A=

#endif /* USE_WINSOCK */
=0A=
#include <gcj/cni.h>=0A=
#include <jvm.h>=0A=
#include <java/net/InetAddress.h>=0A=
#include <java/net/UnknownHostException.h>=0A=
#include <java/lang/SecurityException.h>=0A=
=0A=
#if defined(HAVE_UNAME) && ! defined(HAVE_GETHOSTNAME)=0A=
#include <sys/utsname.h>=0A=
#endif=0A=
=0A=
#ifndef HAVE_GETHOSTNAME_DECL=0A=
extern "C" int gethostname (char *name, int namelen);=0A=
#endif=0A=
=0A=
#ifdef DISABLE_JAVA_NET=0A=
=0A=
jbyteArray=0A=
java::net::InetAddress::aton (jstring)=0A=
{=0A=
  return NULL;=0A=
}=0A=
=0A=
JArray<java::net::InetAddress*> *=0A=
java::net::InetAddress::lookup (jstring, java::net::InetAddress *, =
jboolean)=0A=
{=0A=
  return NULL;=0A=
}=0A=
=0A=
jstring=0A=
java::net::InetAddress::getLocalHostname ()=0A=
{=0A=
  return NULL;=0A=
}=0A=
=0A=
#else /* DISABLE_JAVA_NET */=0A=
=0A=
jbyteArray=0A=
java::net::InetAddress::aton (jstring host)=0A=
{=0A=
  char *hostname;=0A=
  char buf[100];=0A=
  int len =3D JvGetStringUTFLength(host);=0A=
  if (len < 100)=0A=
    hostname =3D buf;=0A=
  else=0A=
    hostname =3D (char*) _Jv_AllocBytesChecked (len+1);=0A=
  JvGetStringUTFRegion (host, 0, host->length(), hostname);=0A=
  buf[len] =3D '\0';=0A=
  char* bytes =3D NULL;=0A=
  int blen =3D 0;=0A=
#ifdef HAVE_INET_ATON=0A=
  struct in_addr laddr;=0A=
  if (inet_aton (hostname, &laddr))=0A=
    {=0A=
      bytes =3D (char*) &laddr;=0A=
      blen =3D 4;=0A=
    }=0A=
#elif defined(HAVE_INET_ADDR)=0A=
#if ! HAVE_IN_ADDR_T=0A=
  typedef jint in_addr_t;=0A=
#endif=0A=
  in_addr_t laddr =3D inet_addr (hostname);=0A=
  if (laddr !=3D (in_addr_t)(-1))=0A=
    {=0A=
      bytes =3D (char*) &laddr;=0A=
      blen =3D 4;=0A=
    }=0A=
#endif=0A=
#ifdef HAVE_INET_PTON=0A=
  char inet6_addr[16];=0A=
  if (len =3D=3D 0 && inet_pton (AF_INET6, hostname, inet6_addr) > 0)=0A=
    {=0A=
      bytes =3D inet6_addr;=0A=
      blen =3D 16;=0A=
    }=0A=
#endif=0A=
  if (blen =3D=3D 0)=0A=
    return NULL;=0A=
  jbyteArray result =3D JvNewByteArray (blen);=0A=
  memcpy (elements (result), bytes, blen);=0A=
  return result;=0A=
}=0A=
=0A=
=0A=
JArray<java::net::InetAddress*> *=0A=
java::net::InetAddress::lookup (jstring host, java::net::InetAddress* =
iaddr,=0A=
				jboolean all)=0A=
{=0A=
  struct hostent *hptr =3D NULL;=0A=
#if defined (HAVE_GETHOSTBYNAME_R) || defined (HAVE_GETHOSTBYADDR_R)=0A=
  struct hostent hent_r;=0A=
#if HAVE_STRUCT_HOSTENT_DATA=0A=
  struct hostent_data fixed_buffer, *buffer_r =3D &fixed_buffer;=0A=
#else=0A=
#if defined (__GLIBC__) =0A=
  // FIXME: in glibc, gethostbyname_r returns NETDB_INTERNAL to herr and=0A=
  // ERANGE to errno if the buffer size is too small, rather than what =
is =0A=
  // expected here. We work around this by setting a bigger buffer size =
and =0A=
  // hoping that it is big enough.=0A=
  char fixed_buffer[1024];=0A=
#else=0A=
  char fixed_buffer[200];=0A=
#endif=0A=
  char *buffer_r =3D fixed_buffer;=0A=
  int size_r =3D sizeof (fixed_buffer);=0A=
#endif=0A=
#endif=0A=
=0A=
  if (host !=3D NULL)=0A=
    {=0A=
      char *hostname;=0A=
      char buf[100];=0A=
      int len =3D JvGetStringUTFLength(host);=0A=
      if (len < 100)=0A=
	hostname =3D buf;=0A=
      else=0A=
	hostname =3D (char*) _Jv_AllocBytesChecked (len+1);=0A=
      JvGetStringUTFRegion (host, 0, host->length(), hostname);=0A=
      buf[len] =3D '\0';=0A=
#ifdef HAVE_GETHOSTBYNAME_R=0A=
      while (true)=0A=
	{=0A=
	  int ok;=0A=
#if HAVE_STRUCT_HOSTENT_DATA=0A=
	  ok =3D ! gethostbyname_r (hostname, &hent_r, buffer_r);=0A=
#else=0A=
	  int herr =3D 0;=0A=
#ifdef GETHOSTBYNAME_R_RETURNS_INT=0A=
	  ok =3D ! gethostbyname_r (hostname, &hent_r, buffer_r, size_r,=0A=
				  &hptr, &herr);=0A=
#else=0A=
	  hptr =3D gethostbyname_r (hostname, &hent_r, buffer_r, size_r, &herr);=0A=
	  ok =3D hptr !=3D NULL;=0A=
#endif /* GETHOSTNAME_R_RETURNS_INT */=0A=
	  if (! ok && herr =3D=3D ERANGE)=0A=
	    {=0A=
	      size_r *=3D 2;=0A=
	      buffer_r =3D (char *) _Jv_AllocBytesChecked (size_r);=0A=
	    }=0A=
	  else=0A=
#endif /* HAVE_STRUCT_HOSTENT_DATA */=0A=
	    break;=0A=
	}=0A=
#else=0A=
      // FIXME: this is insufficient if some other piece of code calls=0A=
      // this gethostbyname.=0A=
      JvSynchronize sync (java::net::InetAddress::localhostAddress);=0A=
      hptr =3D gethostbyname (hostname);=0A=
#endif /* HAVE_GETHOSTBYNAME_R */=0A=
    }=0A=
  else=0A=
    {=0A=
      jbyteArray bytes =3D iaddr->address;=0A=
      char *chars =3D (char*) elements (bytes);=0A=
      int len =3D bytes->length;=0A=
      int type;=0A=
      char *val;=0A=
      if (len =3D=3D 4)=0A=
	{=0A=
	  val =3D chars;=0A=
	  type =3D AF_INET;=0A=
	}=0A=
#ifdef HAVE_INET6=0A=
      else if (len =3D=3D 16)=0A=
	{=0A=
	  val =3D (char *) &chars;=0A=
	  type =3D AF_INET6;=0A=
	}=0A=
#endif /* HAVE_INET6 */=0A=
      else=0A=
	JvFail ("unrecognized size");=0A=
=0A=
#ifdef HAVE_GETHOSTBYADDR_R=0A=
      while (true)=0A=
	{=0A=
	  int ok;=0A=
#if HAVE_STRUCT_HOSTENT_DATA=0A=
	  ok =3D ! gethostbyaddr_r (val, len, type, &hent_r, buffer_r);=0A=
#else=0A=
	  int herr =3D 0;=0A=
#ifdef GETHOSTBYADDR_R_RETURNS_INT=0A=
	  ok =3D ! gethostbyaddr_r (val, len, type, &hent_r,=0A=
				  buffer_r, size_r, &hptr, &herr);=0A=
#else=0A=
	  hptr =3D gethostbyaddr_r (val, len, type, &hent_r,=0A=
				  buffer_r, size_r, &herr);=0A=
	  ok =3D hptr !=3D NULL;=0A=
#endif /* GETHOSTBYADDR_R_RETURNS_INT */=0A=
	  if (! ok && herr =3D=3D ERANGE)=0A=
	    {=0A=
	      size_r *=3D 2;=0A=
	      buffer_r =3D (char *) _Jv_AllocBytesChecked (size_r);=0A=
	    }=0A=
	  else =0A=
#endif /* HAVE_STRUCT_HOSTENT_DATA */=0A=
	    break;=0A=
	}=0A=
#else /* HAVE_GETHOSTBYADDR_R */=0A=
      // FIXME: this is insufficient if some other piece of code calls=0A=
      // this gethostbyaddr.=0A=
      JvSynchronize sync (java::net::InetAddress::localhostAddress);=0A=
      hptr =3D gethostbyaddr (val, len, type);=0A=
#endif /* HAVE_GETHOSTBYADDR_R */=0A=
    }=0A=
  if (hptr !=3D NULL)=0A=
    {=0A=
      if (!all)=0A=
        host =3D JvNewStringUTF (hptr->h_name);=0A=
      java::lang::SecurityException *ex =3D checkConnect (host);=0A=
      if (ex !=3D NULL)=0A=
	{=0A=
	  if (iaddr =3D=3D NULL || iaddr->address =3D=3D NULL)=0A=
	    JvThrow (ex);=0A=
	  hptr =3D NULL;=0A=
	}=0A=
    }=0A=
  if (hptr =3D=3D NULL)=0A=
    {=0A=
      if (iaddr !=3D NULL && iaddr->address !=3D NULL)=0A=
	{=0A=
	  iaddr->hostname =3D iaddr->getHostAddress();=0A=
	  return NULL;=0A=
	}=0A=
      else=0A=
	JvThrow (new java::net::UnknownHostException(host));=0A=
    }=0A=
  int count;=0A=
  if (all)=0A=
    {=0A=
      char** ptr =3D hptr->h_addr_list;=0A=
      count =3D 0;=0A=
      while (*ptr++)  count++;=0A=
    }=0A=
  else=0A=
    count =3D 1;=0A=
  JArray<java::net::InetAddress*> *result;=0A=
  java::net::InetAddress** iaddrs;=0A=
  if (all)=0A=
    {=0A=
      result =3D java::net::InetAddress::allocArray (count);=0A=
      iaddrs =3D elements (result);=0A=
    }=0A=
  else=0A=
    {=0A=
      result =3D NULL;=0A=
      iaddrs =3D &iaddr;=0A=
    }=0A=
=0A=
  for (int i =3D 0;  i < count;  i++)=0A=
    {=0A=
      if (iaddrs[i] =3D=3D NULL)=0A=
	iaddrs[i] =3D new java::net::InetAddress (NULL, NULL);=0A=
      if (iaddrs[i]->hostname =3D=3D NULL)=0A=
        iaddrs[i]->hostname =3D host;=0A=
      if (iaddrs[i]->address =3D=3D NULL)=0A=
	{=0A=
	  char *bytes =3D hptr->h_addr_list[i];=0A=
	  iaddrs[i]->address =3D JvNewByteArray (hptr->h_length);=0A=
	  memcpy (elements (iaddrs[i]->address), bytes, hptr->h_length);=0A=
	}=0A=
    }=0A=
  return result;=0A=
}=0A=
=0A=
jstring=0A=
java::net::InetAddress::getLocalHostname ()=0A=
{=0A=
  char *chars;=0A=
#ifdef HAVE_GETHOSTNAME=0A=
  char buffer[MAXHOSTNAMELEN];=0A=
  if (gethostname (buffer, MAXHOSTNAMELEN))=0A=
    return NULL;=0A=
  chars =3D buffer;=0A=
#elif HAVE_UNAME=0A=
  struct utsname stuff;=0A=
  if (uname (&stuff) !=3D 0)=0A=
    return NULL;=0A=
  chars =3D stuff.nodename;=0A=
#else=0A=
  return NULL;=0A=
#endif=0A=
  // It is admittedly non-optimal to convert the hostname to Unicode=0A=
  // only to convert it back in getByName, but simplicity wins.  Note=0A=
  // that unless there is a SecurityManager, we only get called once=0A=
  // anyway, thanks to the InetAddress.localhost cache.=0A=
  return JvNewStringUTF (chars);=0A=
}=0A=
=0A=
#endif /* DISABLE_JAVA_NET */=0A=

------=_NextPart_000_0057_01BF809B.98CAFFB0
Content-Type: application/octet-stream;
	name="natPlainDatagramSocketImpl.cc"
Content-Transfer-Encoding: quoted-printable
Content-Disposition: attachment;
	filename="natPlainDatagramSocketImpl.cc"

/* Copyright (C) 1999, 2000  Red Hat, Inc.=0A=
=0A=
   This file is part of libgcj.=0A=
=0A=
This software is copyrighted work licensed under the terms of the=0A=
Libgcj License.  Please consult the file "LIBGCJ_LICENSE" for=0A=
details.  */=0A=
=0A=
#include <config.h>=0A=

#ifdef USE_WINSOCK
#include <windows.h>
#include <winsock.h>
#include <errno.h>
#include <string.h>
#ifndef ENOPROTOOPT
#define ENOPROTOOPT 109
#endif
#else /* USE_WINSOCK */=0A=
#ifdef HAVE_SYS_TYPES_H=0A=
#include <sys/types.h>=0A=
#endif=0A=
#ifdef HAVE_SYS_SOCKET_H=0A=
#include <sys/socket.h>=0A=
#endif=0A=
#include <sys/time.h>=0A=
#ifdef HAVE_SYS_SELECT_H=0A=
#include <sys/select.h>=0A=
#endif=0A=
#ifdef HAVE_NETINET_IN_H=0A=
#include <netinet/in.h>=0A=
#endif=0A=
#ifdef HAVE_ARPA_INET_H=0A=
#include <arpa/inet.h>=0A=
#endif=0A=
#include <errno.h>=0A=
#include <string.h>=0A=
#endif /* USE_WINSOCK */
=0A=
#if HAVE_BSTRING_H=0A=
// Needed for bzero, implicitly used by FD_ZERO on IRIX 5.2 =0A=
#include <bstring.h>=0A=
#endif=0A=
=0A=
#include <gcj/cni.h>=0A=
#include <java/io/IOException.h>=0A=
#include <java/io/FileDescriptor.h>=0A=
#include <java/io/InterruptedIOException.h>=0A=
#include <java/net/BindException.h>=0A=
#include <java/net/SocketException.h>=0A=
#include <java/net/PlainDatagramSocketImpl.h>=0A=
#include <java/net/InetAddress.h>=0A=
#include <java/net/DatagramPacket.h>=0A=
#include <java/lang/InternalError.h>=0A=
#include <java/lang/Object.h>=0A=
#include <java/lang/Boolean.h>=0A=
#include <java/lang/Integer.h>=0A=
=0A=
#define BooleanClass _CL_Q34java4lang7Boolean=0A=
extern java::lang::Class BooleanClass;=0A=
#define IntegerClass _CL_Q34java4lang7Integer=0A=
extern java::lang::Class IntegerClass;=0A=
=0A=
#ifdef DISABLE_JAVA_NET=0A=
=0A=
void=0A=
java::net::PlainDatagramSocketImpl::create ()=0A=
{=0A=
  JvThrow (new SocketException (JvNewStringLatin1 =
("DatagramSocketImpl.create: unimplemented")));=0A=
}=0A=
=0A=
void=0A=
java::net::PlainDatagramSocketImpl::bind (jint, java::net::InetAddress *)=0A=
{=0A=
  JvThrow (new BindException (JvNewStringLatin1 =
("DatagramSocketImpl.bind: unimplemented")));=0A=
}=0A=
=0A=
jint=0A=
java::net::PlainDatagramSocketImpl::peek (java::net::InetAddress *)=0A=
{=0A=
  JvThrow (new java::io::IOException (JvNewStringLatin1 =
("DatagramSocketImpl.peek: unimplemented")));=0A=
}=0A=
=0A=
void=0A=
java::net::PlainDatagramSocketImpl::send (java::net::DatagramPacket *)=0A=
{=0A=
  JvThrow (new java::io::IOException (JvNewStringLatin1 =
("DatagramSocketImpl.send: unimplemented")));=0A=
}=0A=
=0A=
void=0A=
java::net::PlainDatagramSocketImpl::receive (java::net::DatagramPacket *)=0A=
{=0A=
  JvThrow (new java::io::IOException (JvNewStringLatin1 =
("DatagramSocketImpl.receive: unimplemented")));=0A=
}=0A=
=0A=
void=0A=
java::net::PlainDatagramSocketImpl::setTimeToLive (jint)=0A=
{=0A=
  JvThrow (new java::io::IOException (JvNewStringLatin1 =
("DatagramSocketImpl.setTimeToLive: unimplemented")));=0A=
}=0A=
=0A=
jint=0A=
java::net::PlainDatagramSocketImpl::getTimeToLive ()=0A=
{=0A=
  JvThrow (new java::io::IOException (JvNewStringLatin1 =
("DatagramSocketImpl.getTimeToLive: unimplemented")));=0A=
}=0A=
=0A=
void=0A=
java::net::PlainDatagramSocketImpl::mcastGrp (java::net::InetAddress *,=0A=
					      jboolean)=0A=
{=0A=
  JvThrow (new java::io::IOException (JvNewStringLatin1 =
("DatagramSocketImpl.mcastGrp: unimplemented")));=0A=
}=0A=
=0A=
void=0A=
java::net::PlainDatagramSocketImpl::setOption (jint, java::lang::Object =
*)=0A=
{=0A=
  JvThrow (new SocketException (JvNewStringLatin1 =
("DatagramSocketImpl.setOption: unimplemented")));=0A=
}=0A=
=0A=
java::lang::Object *=0A=
java::net::PlainDatagramSocketImpl::getOption (jint)=0A=
{=0A=
  JvThrow (new SocketException (JvNewStringLatin1 =
("DatagramSocketImpl.getOption: unimplemented")));=0A=
}=0A=
=0A=
#else /* DISABLE_JAVA_NET */=0A=
=0A=
#ifndef HAVE_SOCKLEN_T=0A=
typedef int socklen_t;=0A=
#endif=0A=
=0A=
union SockAddr=0A=
{=0A=
  struct sockaddr_in address;=0A=
#ifdef HAVE_INET6=0A=
  struct sockaddr_in6 address6;=0A=
#endif=0A=
};=0A=
=0A=
union McastReq=0A=
{=0A=
#if HAVE_STRUCT_IP_MREQ=0A=
  struct ip_mreq mreq;=0A=
#endif=0A=
#ifdef HAVE_INET6=0A=
  struct ipv6_mreq mreq6;=0A=
#endif=0A=
};=0A=
=0A=
union InAddr=0A=
{=0A=
  struct in_addr addr;=0A=
#ifdef HAVE_INET6=0A=
  struct in6_addr addr6;=0A=
#endif=0A=
};=0A=
=0A=
=0A=
// FIXME: routines here and/or in natPlainSocketImpl.cc could throw=0A=
// NoRouteToHostException; also consider UnknownHostException, =
ConnectException.=0A=
=0A=
void=0A=
java::net::PlainDatagramSocketImpl::create ()=0A=
{=0A=
  int sock =3D ::socket (AF_INET, SOCK_DGRAM, 0);=0A=
  if (sock < 0)=0A=
    {=0A=
      char* strerr =3D strerror (errno);=0A=
      JvThrow (new java::net::SocketException (JvNewStringUTF (strerr)));=0A=
    }=0A=
  fnum =3D sock;=0A=
  fd =3D new java::io::FileDescriptor (sock);=0A=
}=0A=
=0A=
void=0A=
java::net::PlainDatagramSocketImpl::bind (jint lport,=0A=
					  java::net::InetAddress *host)=0A=
{=0A=
  // FIXME: prob. need to do a setsockopt with SO_BROADCAST to allow =
multicast.=0A=
  union SockAddr u;=0A=
  struct sockaddr *ptr =3D (struct sockaddr *) &u.address;=0A=
  // FIXME: Use getaddrinfo() to get actual protocol instead of assuming =
ipv4.=0A=
  jbyteArray haddress =3D host->address;=0A=
  jbyte *bytes =3D elements (haddress);=0A=
  int len =3D haddress->length;=0A=
=0A=
  if (len =3D=3D 4)=0A=
    {=0A=
      u.address.sin_family =3D AF_INET;=0A=
      if (host !=3D NULL)=0A=
	memcpy (&u.address.sin_addr, bytes, len);=0A=
      else=0A=
	u.address.sin_addr.s_addr =3D htonl (INADDR_ANY);=0A=
      len =3D sizeof (struct sockaddr_in);=0A=
      u.address.sin_port =3D htons (lport);=0A=
    }=0A=
#ifdef HAVE_INET6=0A=
  else if (len =3D=3D 16)=0A=
    {=0A=
      u.address6.sin6_family =3D AF_INET6;=0A=
      memcpy (&u.address6.sin6_addr, bytes, len);=0A=
      len =3D sizeof (struct sockaddr_in6);=0A=
      u.address6.sin6_port =3D htons (lport);=0A=
    }=0A=
#endif=0A=
  else=0A=
    goto error;=0A=
  if (::bind (fnum, ptr, len) =3D=3D 0)=0A=
    {=0A=
      socklen_t addrlen =3D sizeof(u);=0A=
      if (lport !=3D 0)=0A=
        localPort =3D lport;=0A=
      else if (::getsockname (fnum, (sockaddr*) &u, &addrlen) =3D=3D 0)=0A=
        localPort =3D ntohs (u.address.sin_port);=0A=
      else=0A=
        goto error;=0A=
      return;=0A=
    }=0A=
 error:=0A=
  char* strerr =3D strerror (errno);=0A=
  JvThrow (new java::net::BindException (JvNewStringUTF (strerr)));=0A=
}=0A=
=0A=
jint=0A=
java::net::PlainDatagramSocketImpl::peek (java::net::InetAddress *i)=0A=
{=0A=
  // FIXME: Deal with Multicast and if the socket is connected.=0A=
  union SockAddr u;=0A=
  socklen_t addrlen =3D sizeof(u);=0A=
  ssize_t retlen =3D=0A=
    ::recvfrom (fnum, (char *) NULL, 0, MSG_PEEK, (sockaddr*) &u,=0A=
      &addrlen);=0A=
  if (retlen < 0)=0A=
    goto error;=0A=
  // FIXME: Deal with Multicast addressing and if the socket is =
connected.=0A=
  jbyteArray raddr;=0A=
  jint rport;=0A=
  if (u.address.sin_family =3D=3D AF_INET)=0A=
    {=0A=
      raddr =3D JvNewByteArray (4);=0A=
      memcpy (elements (raddr), &u.address.sin_addr, 4);=0A=
      rport =3D ntohs (u.address.sin_port);=0A=
    }=0A=
#ifdef HAVE_INET6=0A=
  else if (u.address.sin_family =3D=3D AF_INET6)=0A=
    {=0A=
      raddr =3D JvNewByteArray (16);=0A=
      memcpy (elements (raddr), &u.address6.sin6_addr, 16);=0A=
      rport =3D ntohs (u.address6.sin6_port);=0A=
    }=0A=
#endif=0A=
  else=0A=
    goto error;=0A=
  i->address =3D raddr;=0A=
  return rport;=0A=
 error:=0A=
  char* strerr =3D strerror (errno);=0A=
  JvThrow (new java::io::IOException (JvNewStringUTF (strerr)));=0A=
}=0A=
=0A=
void=0A=
java::net::PlainDatagramSocketImpl::send (java::net::DatagramPacket *p)=0A=
{=0A=
  // FIXME: Deal with Multicast and if the socket is connected.=0A=
  jint rport =3D p->getPort();=0A=
  union SockAddr u;=0A=
  jbyteArray haddress =3D p->getAddress()->address;=0A=
  jbyte *bytes =3D elements (haddress);=0A=
  int len =3D haddress->length;=0A=
  struct sockaddr *ptr =3D (struct sockaddr *) &u.address;=0A=
  jbyte *dbytes =3D elements (p->getData());=0A=
  if (len =3D=3D 4)=0A=
    {=0A=
      u.address.sin_family =3D AF_INET;=0A=
      memcpy (&u.address.sin_addr, bytes, len);=0A=
      len =3D sizeof (struct sockaddr_in);=0A=
      u.address.sin_port =3D htons (rport);=0A=
    }=0A=
#ifdef HAVE_INET6=0A=
  else if (len =3D=3D 16)=0A=
    {=0A=
      u.address6.sin6_family =3D AF_INET6;=0A=
      memcpy (&u.address6.sin6_addr, bytes, len);=0A=
      len =3D sizeof (struct sockaddr_in6);=0A=
      u.address6.sin6_port =3D htons (rport);=0A=
    }=0A=
#endif=0A=
  else=0A=
    goto error;=0A=
  if (::sendto (fnum, (char *) dbytes, p->getLength(), 0, ptr, len) >=3D =
0)=0A=
    return;=0A=
 error:=0A=
  char* strerr =3D strerror (errno);=0A=
  JvThrow (new java::io::IOException (JvNewStringUTF (strerr)));=0A=
}=0A=
=0A=
void=0A=
java::net::PlainDatagramSocketImpl::receive (java::net::DatagramPacket =
*p)=0A=
{=0A=
  // FIXME: Deal with Multicast and if the socket is connected.=0A=
  union SockAddr u;=0A=
  socklen_t addrlen =3D sizeof(u);=0A=
  jbyte *dbytes =3D elements (p->getData());=0A=
  ssize_t retlen =3D 0;=0A=
=0A=
  // Do timeouts via select since SO_RCVTIMEO is not always available.=0A=
  if (timeout > 0)=0A=
    {=0A=
      fd_set rset;=0A=
      struct timeval tv;=0A=
      FD_ZERO(&rset);=0A=
      FD_SET(fnum, &rset);=0A=
      tv.tv_sec =3D timeout / 1000;=0A=
      tv.tv_usec =3D (timeout % 1000) * 1000;=0A=
      int retval;=0A=
      if ((retval =3D select (fnum + 1, &rset, NULL, NULL, &tv)) < 0)=0A=
	goto error;=0A=
      else if (retval =3D=3D 0)=0A=
	JvThrow (new java::io::InterruptedIOException ());=0A=
    }=0A=
=0A=
  retlen =3D=0A=
    ::recvfrom (fnum, (char *) dbytes, p->getLength(), 0, (sockaddr*) &u,=0A=
      &addrlen);=0A=
  if (retlen < 0)=0A=
    goto error;=0A=
  // FIXME: Deal with Multicast addressing and if the socket is =
connected.=0A=
  jbyteArray raddr;=0A=
  jint rport;=0A=
  if (u.address.sin_family =3D=3D AF_INET)=0A=
    {=0A=
      raddr =3D JvNewByteArray (4);=0A=
      memcpy (elements (raddr), &u.address.sin_addr, 4);=0A=
      rport =3D ntohs (u.address.sin_port);=0A=
    }=0A=
#ifdef HAVE_INET6=0A=
  else if (u.address.sin_family =3D=3D AF_INET6)=0A=
    {=0A=
      raddr =3D JvNewByteArray (16);=0A=
      memcpy (elements (raddr), &u.address6.sin6_addr, 16);=0A=
      rport =3D ntohs (u.address6.sin6_port);=0A=
    }=0A=
#endif=0A=
  else=0A=
    goto error;=0A=
  p->setAddress (new InetAddress (raddr, NULL));=0A=
  p->setPort (rport);=0A=
  p->setLength ((jint) retlen);=0A=
  return;=0A=
 error:=0A=
  char* strerr =3D strerror (errno);=0A=
  JvThrow (new java::io::IOException (JvNewStringUTF (strerr)));=0A=
}=0A=
=0A=
void=0A=
java::net::PlainDatagramSocketImpl::setTimeToLive (jint ttl)=0A=
{=0A=
  // Assumes IPPROTO_IP rather than IPPROTO_IPV6 since socket created is =
IPv4.=0A=
  char val =3D (char) ttl;=0A=
  socklen_t val_len =3D sizeof(val);=0A=
  if (::setsockopt (fnum, IPPROTO_IP, IP_MULTICAST_TTL, &val, val_len) =
=3D=3D 0)=0A=
    return;=0A=
=0A=
  char* strerr =3D strerror (errno);=0A=
  JvThrow (new java::io::IOException (JvNewStringUTF (strerr)));=0A=
}=0A=
=0A=
jint=0A=
java::net::PlainDatagramSocketImpl::getTimeToLive ()=0A=
{=0A=
  // Assumes IPPROTO_IP rather than IPPROTO_IPV6 since socket created is =
IPv4.=0A=
  char val;=0A=
  socklen_t val_len =3D sizeof(val);=0A=
  if (::getsockopt (fnum, IPPROTO_IP, IP_MULTICAST_TTL, &val, &val_len) =
=3D=3D 0)=0A=
    return ((int) val) & 0xFF;=0A=
=0A=
  char* strerr =3D strerror (errno);=0A=
  JvThrow (new java::io::IOException (JvNewStringUTF (strerr)));=0A=
}=0A=
=0A=
void=0A=
java::net::PlainDatagramSocketImpl::mcastGrp (java::net::InetAddress =
*inetaddr,=0A=
					      jboolean join)=0A=
{=0A=
  union McastReq u;=0A=
  jbyteArray haddress =3D inetaddr->address;=0A=
  jbyte *bytes =3D elements (haddress);=0A=
  int len =3D haddress->length;=0A=
  int level, opname;=0A=
  const char *ptr;=0A=
  if (0)=0A=
    ;=0A=
#if HAVE_STRUCT_IP_MREQ=0A=
  else if (len =3D=3D 4)=0A=
    {=0A=
      level =3D IPPROTO_IP;=0A=
      opname =3D join ? IP_ADD_MEMBERSHIP : IP_DROP_MEMBERSHIP;=0A=
      memcpy (&u.mreq.imr_multiaddr, bytes, len);=0A=
      // FIXME:  If a non-default interface is set, use it; see Stevens =
p. 501.=0A=
      // Maybe not, see note in last paragraph at bottom of Stevens p. =
497.=0A=
      u.mreq.imr_interface.s_addr =3D htonl (INADDR_ANY); =0A=
      len =3D sizeof (struct ip_mreq);=0A=
      ptr =3D (const char *) &u.mreq;=0A=
    }=0A=
#endif=0A=
#ifdef HAVE_INET6=0A=
  else if (len =3D=3D 16)=0A=
    {=0A=
      level =3D IPPROTO_IPV6;=0A=
      opname =3D join ? IPV6_ADD_MEMBERSHIP : IPV6_DROP_MEMBERSHIP;=0A=
      memcpy (&u.mreq6.ipv6mr_multiaddr, bytes, len);=0A=
      // FIXME:  If a non-default interface is set, use it; see Stevens =
p. 501.=0A=
      // Maybe not, see note in last paragraph at bottom of Stevens p. =
497.=0A=
      u.mreq6.ipv6mr_interface =3D 0;=0A=
      len =3D sizeof (struct ipv6_mreq);=0A=
      ptr =3D (const char *) &u.mreq6;=0A=
    }=0A=
#endif=0A=
  else=0A=
    goto error;=0A=
  if (::setsockopt (fnum, level, opname, ptr, len) =3D=3D 0)=0A=
    return;=0A=
 error:=0A=
  char* strerr =3D strerror (errno);=0A=
  JvThrow (new java::io::IOException (JvNewStringUTF (strerr)));=0A=
}=0A=
=0A=
void=0A=
java::net::PlainDatagramSocketImpl::setOption (jint optID,=0A=
					       java::lang::Object *value)=0A=
{=0A=
  int val;=0A=
  socklen_t val_len =3D sizeof (val);=0A=
=0A=
  if (_Jv_IsInstanceOf (value, &BooleanClass))=0A=
    {=0A=
      java::lang::Boolean *boolobj =3D =0A=
        static_cast<java::lang::Boolean *> (value);=0A=
      val =3D boolobj->booleanValue() ? 1 : 0;=0A=
    }=0A=
  else if (_Jv_IsInstanceOf (value, &IntegerClass))=0A=
    {=0A=
      java::lang::Integer *intobj =3D =0A=
        static_cast<java::lang::Integer *> (value);          =0A=
      val =3D (int) intobj->intValue();=0A=
    }=0A=
  // Else assume value to be an InetAddress for use with IP_MULTICAST_IF.=0A=
=0A=
  switch (optID) =0A=
    {=0A=
      case _Jv_TCP_NODELAY_ :=0A=
        JvThrow (new java::net::SocketException (=0A=
          JvNewStringUTF ("TCP_NODELAY not valid for UDP")));      =0A=
        return;=0A=
      case _Jv_SO_LINGER_ :=0A=
        JvThrow (new java::net::SocketException (=0A=
          JvNewStringUTF ("SO_LINGER not valid for UDP")));      =0A=
        return;=0A=
      case _Jv_SO_SNDBUF_ :=0A=
      case _Jv_SO_RCVBUF_ :=0A=
#if defined(SO_SNDBUF) && defined(SO_RCVBUF)=0A=
        int opt;=0A=
        optID =3D=3D _Jv_SO_SNDBUF_ ? opt =3D SO_SNDBUF : opt =3D =
SO_RCVBUF;=0A=
        if (::setsockopt (fnum, SOL_SOCKET, opt, (char *) &val, val_len) =
!=3D 0)=0A=
	  goto error;    =0A=
#else=0A=
        JvThrow (new java::lang::InternalError (=0A=
          JvNewStringUTF ("SO_RCVBUF/SO_SNDBUF not supported")));=0A=
#endif =0A=
        return;=0A=
      case _Jv_SO_REUSEADDR_ :=0A=
#if defined(SO_REUSEADDR)=0A=
	if (::setsockopt (fnum, SOL_SOCKET, SO_REUSEADDR, (char *) &val,=0A=
	    val_len) !=3D 0)=0A=
	  goto error;=0A=
#else=0A=
        JvThrow (new java::lang::InternalError (=0A=
          JvNewStringUTF ("SO_REUSEADDR not supported")));=0A=
#endif =0A=
	return;=0A=
      case _Jv_SO_BINDADDR_ :=0A=
        JvThrow (new java::net::SocketException (=0A=
          JvNewStringUTF ("SO_BINDADDR: read only option")));=0A=
        return;=0A=
      case _Jv_IP_MULTICAST_IF_ :=0A=
	union InAddr u;=0A=
        jbyteArray haddress;=0A=
	jbyte *bytes;=0A=
	int len;=0A=
	int level, opname;=0A=
	const char *ptr;=0A=
=0A=
	haddress =3D ((java::net::InetAddress *) value)->address;=0A=
	bytes =3D elements (haddress);=0A=
	len =3D haddress->length;=0A=
	if (len =3D=3D 4)=0A=
	  {=0A=
	    level =3D IPPROTO_IP;=0A=
	    opname =3D IP_MULTICAST_IF;=0A=
	    memcpy (&u.addr, bytes, len);=0A=
	    len =3D sizeof (struct in_addr);=0A=
	    ptr =3D (const char *) &u.addr;=0A=
	  }=0A=
#ifdef HAVE_INET6=0A=
	else if (len =3D=3D 16)=0A=
	  {=0A=
	    level =3D IPPROTO_IPV6;=0A=
	    opname =3D IPV6_MULTICAST_IF;=0A=
	    memcpy (&u.addr6, bytes, len);=0A=
	    len =3D sizeof (struct in6_addr);=0A=
	    ptr =3D (const char *) &u.addr6;=0A=
	  }=0A=
#endif=0A=
	else=0A=
	  goto error;=0A=
	if (::setsockopt (fnum, level, opname, ptr, len) !=3D 0)=0A=
	  goto error;=0A=
        return;=0A=
      case _Jv_SO_TIMEOUT_ :=0A=
	timeout =3D val;=0A=
        return;=0A=
      default :=0A=
        errno =3D ENOPROTOOPT;=0A=
    }=0A=
=0A=
 error:=0A=
  char* strerr =3D strerror (errno);=0A=
  JvThrow (new java::net::SocketException (JvNewStringUTF (strerr)));=0A=
}=0A=
=0A=
java::lang::Object *=0A=
java::net::PlainDatagramSocketImpl::getOption (jint optID)=0A=
{=0A=
  int val;=0A=
  socklen_t val_len =3D sizeof(val);=0A=
  union SockAddr u;=0A=
  socklen_t addrlen =3D sizeof(u);=0A=
=0A=
  switch (optID)=0A=
    {=0A=
      case _Jv_TCP_NODELAY_ :=0A=
        JvThrow (new java::net::SocketException (=0A=
          JvNewStringUTF ("TCP_NODELAY not valid for UDP")));      =0A=
        break;=0A=
=0A=
      case _Jv_SO_LINGER_ :=0A=
        JvThrow (new java::net::SocketException (=0A=
          JvNewStringUTF ("SO_LINGER not valid for UDP")));      =0A=
        break;    =0A=
      case _Jv_SO_RCVBUF_ :=0A=
      case _Jv_SO_SNDBUF_ :=0A=
#if defined(SO_SNDBUF) && defined(SO_RCVBUF)=0A=
        int opt;=0A=
        optID =3D=3D _Jv_SO_SNDBUF_ ? opt =3D SO_SNDBUF : opt =3D =
SO_RCVBUF;=0A=
        if (::getsockopt (fnum, SOL_SOCKET, opt, (char *) &val, =
&val_len) !=3D 0)=0A=
	  goto error;    =0A=
        else=0A=
	  return new java::lang::Integer (val);=0A=
#else=0A=
        JvThrow (new java::lang::InternalError (=0A=
          JvNewStringUTF ("SO_RCVBUF/SO_SNDBUF not supported")));=0A=
#endif    =0A=
	break;=0A=
      case _Jv_SO_BINDADDR_:=0A=
	// cache the local address=0A=
	if (localAddress =3D=3D NULL)=0A=
	  {	=0A=
	    jbyteArray laddr;=0A=
	    if (::getsockname (fnum, (sockaddr*) &u, &addrlen) !=3D 0)=0A=
	      goto error;=0A=
	    if (u.address.sin_family =3D=3D AF_INET)=0A=
	      {=0A=
		laddr =3D JvNewByteArray (4);=0A=
		memcpy (elements (laddr), &u.address.sin_addr, 4);=0A=
	      }=0A=
#ifdef HAVE_INET6=0A=
            else if (u.address.sin_family =3D=3D AF_INET6)=0A=
	      {=0A=
		laddr =3D JvNewByteArray (16);=0A=
		memcpy (elements (laddr), &u.address6.sin6_addr, 16);=0A=
	      }=0A=
#endif=0A=
	    else=0A=
	      goto error;=0A=
	    localAddress =3D new java::net::InetAddress (laddr, NULL);=0A=
	  }=0A=
	return localAddress;  =0A=
	break;=0A=
      case _Jv_SO_REUSEADDR_ :=0A=
#if defined(SO_REUSEADDR)=0A=
	if (::getsockopt (fnum, SOL_SOCKET, SO_REUSEADDR, (char *) &val,=0A=
	    &val_len) !=3D 0)=0A=
	  goto error;=0A=
	return new java::lang::Boolean (val !=3D 0);=0A=
#else=0A=
        JvThrow (new java::lang::InternalError (=0A=
          JvNewStringUTF ("SO_REUSEADDR not supported")));=0A=
#endif =0A=
	break;=0A=
      case _Jv_IP_MULTICAST_IF_ :=0A=
#ifdef HAVE_INET_NTOA=0A=
	struct in_addr inaddr;=0A=
  	socklen_t inaddr_len;=0A=
	char *bytes;=0A=
=0A=
  	inaddr_len =3D sizeof(inaddr);=0A=
	if (::getsockopt (fnum, IPPROTO_IP, IP_MULTICAST_IF, (char *) &inaddr,=0A=
	    &inaddr_len) !=3D 0)=0A=
	  goto error;=0A=
=0A=
	bytes =3D inet_ntoa (inaddr);=0A=
=0A=
	return java::net::InetAddress::getByName (JvNewStringLatin1 (bytes));=0A=
#else=0A=
	JvThrow (new java::net::SocketException (=0A=
	  JvNewStringUTF ("IP_MULTICAST_IF: not available - no inet_ntoa()")));=0A=
#endif=0A=
	break;=0A=
      case _Jv_SO_TIMEOUT_ :=0A=
	return new java::lang::Integer (timeout);=0A=
	break;=0A=
      default :=0A=
	errno =3D ENOPROTOOPT;=0A=
    }=0A=
=0A=
 error:=0A=
  char* strerr =3D strerror (errno);=0A=
  JvThrow (new java::net::SocketException (JvNewStringUTF (strerr)));=0A=
}=0A=
=0A=
#endif /* DISABLE_JAVA_NET */=0A=

------=_NextPart_000_0057_01BF809B.98CAFFB0
Content-Type: application/octet-stream;
	name="natPlainSocketImpl.cc"
Content-Transfer-Encoding: quoted-printable
Content-Disposition: attachment;
	filename="natPlainSocketImpl.cc"

/* Copyright (C) 1998, 1999  Red Hat, Inc.=0A=
=0A=
   This file is part of libgcj.=0A=
=0A=
This software is copyrighted work licensed under the terms of the=0A=
Libgcj License.  Please consult the file "LIBGCJ_LICENSE" for=0A=
details.  */=0A=
=0A=
#include <config.h>=0A=

=0A=
#ifndef DISABLE_JAVA_NET
#ifdef USE_WINSOCK
#include <windows.h>
#include <winsock.h>
#include <errno.h>
#include <string.h>
#ifndef ENOPROTOOPT
#define ENOPROTOOPT 109
#endif
#else /* USE_WINSOCK */
#include <sys/types.h>=0A=
#include <sys/socket.h>=0A=
#include <sys/time.h>=0A=
#ifdef HAVE_SYS_SELECT_H=0A=
#include <sys/select.h>=0A=
#endif=0A=
#include <netinet/in.h>=0A=
#include <netinet/tcp.h>=0A=
#include <errno.h>=0A=
#include <string.h>=0A=
#endif /* USE_WINSOCK */
#endif /* DISABLE_JAVA_NET */=0A=
=0A=
#if HAVE_BSTRING_H=0A=
// Needed for bzero, implicitly used by FD_ZERO on IRIX 5.2 =0A=
#include <bstring.h>=0A=
#endif=0A=
=0A=
#include <gcj/cni.h>=0A=
#include <gcj/javaprims.h>=0A=
#include <java/io/IOException.h>=0A=
#include <java/io/FileDescriptor.h>=0A=
#include <java/io/InterruptedIOException.h>=0A=
#include <java/net/BindException.h>=0A=
#include <java/net/ConnectException.h>=0A=
#include <java/net/PlainSocketImpl.h>=0A=
#include <java/net/InetAddress.h>=0A=
#include <java/net/SocketException.h>=0A=
#include <java/lang/InternalError.h>=0A=
#include <java/lang/Object.h>=0A=
#include <java/lang/Boolean.h>=0A=
#include <java/lang/Class.h>=0A=
#include <java/lang/Integer.h>=0A=
=0A=
#define BooleanClass _CL_Q34java4lang7Boolean=0A=
extern java::lang::Class BooleanClass;=0A=
=0A=
#ifdef DISABLE_JAVA_NET=0A=
=0A=
void=0A=
java::net::PlainSocketImpl::create (jboolean)=0A=
{=0A=
  JvThrow (new java::io::IOException (JvNewStringLatin1 =
("SocketImpl.create: unimplemented")));=0A=
}=0A=
=0A=
void=0A=
java::net::PlainSocketImpl::bind (java::net::InetAddress *, jint)=0A=
{=0A=
  JvThrow (new BindException (JvNewStringLatin1 ("SocketImpl.bind: =
unimplemented")));=0A=
}=0A=
=0A=
void=0A=
java::net::PlainSocketImpl::connect (java::net::InetAddress *, jint)=0A=
{=0A=
  JvThrow (new ConnectException (JvNewStringLatin1 ("SocketImpl.connect: =
unimplemented")));=0A=
}=0A=
=0A=
void=0A=
java::net::PlainSocketImpl::listen (jint)=0A=
{=0A=
  JvThrow (new java::io::IOException (JvNewStringLatin1 =
("SocketImpl.listen: unimplemented")));=0A=
}=0A=
=0A=
void=0A=
java::net::PlainSocketImpl::accept (java::net::PlainSocketImpl *)=0A=
{=0A=
  JvThrow (new java::io::IOException (JvNewStringLatin1 =
("SocketImpl.accept: unimplemented")));=0A=
}=0A=
=0A=
void=0A=
java::net::PlainSocketImpl::setOption (jint, java::lang::Object *)=0A=
{=0A=
  JvThrow (new SocketException (JvNewStringLatin1 =
("SocketImpl.setOption: unimplemented")));=0A=
}=0A=
=0A=
java::lang::Object *=0A=
java::net::PlainSocketImpl::getOption (jint)=0A=
{=0A=
  JvThrow (new SocketException (JvNewStringLatin1 =
("SocketImpl.getOption: unimplemented")));=0A=
}=0A=
=0A=
#else /* DISABLE_JAVA_NET */=0A=
=0A=
#ifndef HAVE_SOCKLEN_T=0A=
typedef int socklen_t;=0A=
#endif=0A=
=0A=
union SockAddr=0A=
{=0A=
  struct sockaddr_in address;=0A=
#ifdef HAVE_INET6=0A=
  struct sockaddr_in6 address6;=0A=
#endif=0A=
};=0A=
=0A=
void=0A=
java::net::PlainSocketImpl::create (jboolean stream)=0A=
{=0A=
  int sock =3D ::socket (AF_INET, stream ? SOCK_STREAM : SOCK_DGRAM, 0);=0A=
  if (sock < 0)=0A=
    {=0A=
      char* strerr =3D strerror (errno);=0A=
      JvThrow (new java::io::IOException (JvNewStringUTF (strerr)));=0A=
    }=0A=
  fnum =3D sock;=0A=
  fd =3D new java::io::FileDescriptor (sock);=0A=
}=0A=
=0A=
void=0A=
java::net::PlainSocketImpl::bind (java::net::InetAddress *host, jint =
lport)=0A=
{=0A=
  union SockAddr u;=0A=
  struct sockaddr *ptr =3D (struct sockaddr *) &u.address;=0A=
  jbyteArray haddress =3D host->address;=0A=
  jbyte *bytes =3D elements (haddress);=0A=
  int len =3D haddress->length;=0A=
  int i =3D 1;=0A=
=0A=
  if (len =3D=3D 4)=0A=
    {=0A=
      u.address.sin_family =3D AF_INET;=0A=
      if (host !=3D NULL)=0A=
        memcpy (&u.address.sin_addr, bytes, len);=0A=
      else=0A=
	u.address.sin_addr.s_addr =3D htonl (INADDR_ANY);        =0A=
      len =3D sizeof (struct sockaddr_in);=0A=
      u.address.sin_port =3D htons (lport);=0A=
    }=0A=
#ifdef HAVE_INET6=0A=
  else if (len =3D=3D 16)=0A=
    {=0A=
      u.address6.sin6_family =3D AF_INET6;=0A=
      memcpy (&u.address6.sin6_addr, bytes, len);=0A=
      len =3D sizeof (struct sockaddr_in6);=0A=
      u.address6.sin6_port =3D htons (lport);=0A=
    }=0A=
#endif=0A=
  else=0A=
    goto error;=0A=
=0A=
  // Enable SO_REUSEADDR, so that servers can reuse ports left in =
TIME_WAIT.=0A=
  ::setsockopt(fnum, SOL_SOCKET, SO_REUSEADDR, (char *) &i, sizeof(i));=0A=
  =0A=
  if (::bind (fnum, ptr, len) =3D=3D 0)=0A=
    {=0A=
      address =3D host;=0A=
      socklen_t addrlen =3D sizeof(u);=0A=
      if (lport !=3D 0)=0A=
        localport =3D lport;=0A=
      else if (::getsockname (fnum, (sockaddr*) &u, &addrlen) =3D=3D 0)=0A=
        localport =3D ntohs (u.address.sin_port);=0A=
      else=0A=
        goto error;=0A=
      return;=0A=
    }=0A=
 error:=0A=
  char* strerr =3D strerror (errno);=0A=
  JvThrow (new java::net::BindException (JvNewStringUTF (strerr)));=0A=
}=0A=
=0A=
void=0A=
java::net::PlainSocketImpl::connect (java::net::InetAddress *host, jint =
rport)=0A=
{=0A=
  union SockAddr u;=0A=
  socklen_t addrlen =3D sizeof(u);=0A=
  jbyteArray haddress =3D host->address;=0A=
  jbyte *bytes =3D elements (haddress);=0A=
  int len =3D haddress->length;=0A=
  struct sockaddr *ptr =3D (struct sockaddr *) &u.address;=0A=
  if (len =3D=3D 4)=0A=
    {=0A=
      u.address.sin_family =3D AF_INET;=0A=
      memcpy (&u.address.sin_addr, bytes, len);=0A=
      len =3D sizeof (struct sockaddr_in);=0A=
      u.address.sin_port =3D htons (rport);=0A=
    }=0A=
#ifdef HAVE_INET6=0A=
  else if (len =3D=3D 16)=0A=
    {=0A=
      u.address6.sin6_family =3D AF_INET6;=0A=
      memcpy (&u.address6.sin6_addr, bytes, len);=0A=
      len =3D sizeof (struct sockaddr_in6);=0A=
      u.address6.sin6_port =3D htons (rport);=0A=
    }=0A=
#endif=0A=
  else=0A=
    goto error;=0A=
  if (::connect (fnum, ptr, len) !=3D 0)=0A=
    goto error;=0A=
  address =3D host;=0A=
  port =3D rport;=0A=
  // A bind may not have been done on this socket; if so, set localport =
now.=0A=
  if (localport =3D=3D 0)=0A=
    if (::getsockname (fnum, (sockaddr*) &u, &addrlen) =3D=3D 0)=0A=
      localport =3D ntohs (u.address.sin_port);=0A=
    else=0A=
      goto error;=0A=
  return;  =0A=
 error:=0A=
  char* strerr =3D strerror (errno);=0A=
  JvThrow (new java::net::ConnectException (JvNewStringUTF (strerr)));=0A=
}=0A=
=0A=
void=0A=
java::net::PlainSocketImpl::listen (jint backlog)=0A=
{=0A=
  if (::listen (fnum, backlog) !=3D 0)=0A=
    {=0A=
      char* strerr =3D strerror (errno);=0A=
      JvThrow (new java::io::IOException (JvNewStringUTF (strerr)));=0A=
    }=0A=
}=0A=
=0A=
void=0A=
java::net::PlainSocketImpl::accept (java::net::PlainSocketImpl *s)=0A=
{=0A=
  union SockAddr u;=0A=
  socklen_t addrlen =3D sizeof(u);=0A=
  int new_socket =3D 0; =0A=
=0A=
  // Do timeouts via select since SO_RCVTIMEO is not always available.=0A=
  if (timeout > 0)=0A=
    {=0A=
      fd_set rset;=0A=
      struct timeval tv;=0A=
      FD_ZERO(&rset);=0A=
      FD_SET(fnum, &rset);=0A=
      tv.tv_sec =3D timeout / 1000;=0A=
      tv.tv_usec =3D (timeout % 1000) * 1000;=0A=
      int retval;=0A=
      if ((retval =3D select (fnum + 1, &rset, NULL, NULL, &tv)) < 0)=0A=
	goto error;=0A=
      else if (retval =3D=3D 0)=0A=
	JvThrow (new java::io::InterruptedIOException (=0A=
	         JvNewStringUTF("Accept timed out")));=0A=
    }=0A=
=0A=
  new_socket =3D ::accept (fnum, (sockaddr*) &u, &addrlen);=0A=
  if (new_socket < 0)=0A=
    goto error;=0A=
  jbyteArray raddr;=0A=
  jint rport;=0A=
  if (u.address.sin_family =3D=3D AF_INET)=0A=
    {=0A=
      raddr =3D JvNewByteArray (4);=0A=
      memcpy (elements (raddr), &u.address.sin_addr, 4);=0A=
      rport =3D ntohs (u.address.sin_port);=0A=
    }=0A=
#ifdef HAVE_INET6=0A=
  else if (u.address.sin_family =3D=3D AF_INET6)=0A=
    {=0A=
      raddr =3D JvNewByteArray (16);=0A=
      memcpy (elements (raddr), &u.address6.sin6_addr, 16);=0A=
      rport =3D ntohs (u.address6.sin6_port);=0A=
    }=0A=
#endif=0A=
  else=0A=
    goto error;=0A=
  s->fnum =3D new_socket;=0A=
  s->localport =3D localport;=0A=
  s->address =3D new InetAddress (raddr, NULL);=0A=
  s->port =3D rport;=0A=
  s->fd =3D new java::io::FileDescriptor (new_socket);=0A=
  return;=0A=
 error:=0A=
  char* strerr =3D strerror (errno);=0A=
  JvThrow (new java::io::IOException (JvNewStringUTF (strerr)));=0A=
}=0A=
=0A=
void=0A=
java::net::PlainSocketImpl::setOption (jint optID, java::lang::Object =
*value)=0A=
{=0A=
  int val;=0A=
  socklen_t val_len =3D sizeof (val);=0A=
=0A=
  if (_Jv_IsInstanceOf (value, &BooleanClass))=0A=
    {=0A=
      java::lang::Boolean *boolobj =3D =0A=
        static_cast<java::lang::Boolean *> (value);=0A=
      if (boolobj->booleanValue())=0A=
        val =3D 1; =0A=
      else =0A=
        {=0A=
	  if (optID =3D=3D _Jv_SO_LINGER_)=0A=
	    val =3D -1;=0A=
	  else=0A=
	    val =3D 0;=0A=
        }=0A=
    }=0A=
  else  // assume value is an Integer=0A=
    {=0A=
      java::lang::Integer *intobj =3D =0A=
        static_cast<java::lang::Integer *> (value);          =0A=
      val =3D (int) intobj->intValue();=0A=
    }=0A=
=0A=
  switch (optID) =0A=
    {=0A=
      case _Jv_TCP_NODELAY_ :=0A=
#ifdef TCP_NODELAY=0A=
        if (::setsockopt (fnum, IPPROTO_TCP, TCP_NODELAY, (char *) &val,=0A=
	    val_len) !=3D 0)=0A=
	  goto error;    =0A=
#else=0A=
        JvThrow (new java::lang::InternalError (=0A=
          JvNewStringUTF ("TCP_NODELAY not supported")));      =0A=
#endif /* TCP_NODELAY */=0A=
        return;=0A=
      case _Jv_SO_LINGER_ :=0A=
#ifdef SO_LINGER=0A=
        struct linger l_val;=0A=
        l_val.l_onoff =3D (val !=3D -1);=0A=
        l_val.l_linger =3D val;=0A=
        if (::setsockopt (fnum, SOL_SOCKET, SO_LINGER, (char *) &l_val,=0A=
	    sizeof(l_val)) !=3D 0)=0A=
	  goto error;    =0A=
#else=0A=
        JvThrow (new java::lang::InternalError (=0A=
          JvNewStringUTF ("SO_LINGER not supported")));      =0A=
#endif /* SO_LINGER */=0A=
        return;=0A=
      case _Jv_SO_SNDBUF_ :=0A=
      case _Jv_SO_RCVBUF_ :=0A=
#if defined(SO_SNDBUF) && defined(SO_RCVBUF)=0A=
        int opt;=0A=
        optID =3D=3D _Jv_SO_SNDBUF_ ? opt =3D SO_SNDBUF : opt =3D =
SO_RCVBUF;=0A=
        if (::setsockopt (fnum, SOL_SOCKET, opt, (char *) &val, val_len) =
!=3D 0)=0A=
	  goto error;    =0A=
#else=0A=
        JvThrow (new java::lang::InternalError (=0A=
          JvNewStringUTF ("SO_RCVBUF/SO_SNDBUF not supported")));=0A=
#endif =0A=
        return;=0A=
      case _Jv_SO_BINDADDR_ :=0A=
        JvThrow (new java::net::SocketException (=0A=
          JvNewStringUTF ("SO_BINDADDR: read only option")));=0A=
        return;=0A=
      case _Jv_IP_MULTICAST_IF_ :=0A=
        JvThrow (new java::net::SocketException (=0A=
          JvNewStringUTF ("IP_MULTICAST_IF: not valid for TCP")));=0A=
        return;=0A=
      case _Jv_SO_REUSEADDR_ :=0A=
        JvThrow (new java::net::SocketException (=0A=
          JvNewStringUTF ("SO_REUSEADDR: not valid for TCP")));=0A=
        return;=0A=
      case _Jv_SO_TIMEOUT_ :=0A=
	timeout =3D val;=0A=
        return;=0A=
      default :=0A=
        errno =3D ENOPROTOOPT;=0A=
    }=0A=
=0A=
 error:=0A=
  char* strerr =3D strerror (errno);=0A=
  JvThrow (new java::net::SocketException (JvNewStringUTF (strerr)));=0A=
}=0A=
=0A=
java::lang::Object *=0A=
java::net::PlainSocketImpl::getOption (jint optID)=0A=
{=0A=
  int val;=0A=
  socklen_t val_len =3D sizeof(val);=0A=
  union SockAddr u;=0A=
  socklen_t addrlen =3D sizeof(u);=0A=
  struct linger l_val;=0A=
  socklen_t l_val_len =3D sizeof(l_val);=0A=
=0A=
  switch (optID)=0A=
    {=0A=
#ifdef TCP_NODELAY=0A=
      case _Jv_TCP_NODELAY_ :=0A=
        if (::getsockopt (fnum, IPPROTO_TCP, TCP_NODELAY, (char *) &val,=0A=
	    &val_len) !=3D 0)=0A=
          goto error;=0A=
        else=0A=
	  return new java::lang::Boolean (val !=3D 0);=0A=
#else=0A=
        JvThrow (new java::lang::InternalError (=0A=
          JvNewStringUTF ("TCP_NODELAY not supported")));      =0A=
#endif       =0A=
        break;=0A=
=0A=
      case _Jv_SO_LINGER_ :=0A=
#ifdef SO_LINGER=0A=
        if (::getsockopt (fnum, SOL_SOCKET, SO_LINGER, (char *) &l_val,=0A=
	    &l_val_len) !=3D 0)=0A=
	  goto error;    =0A=
        if (l_val.l_onoff)=0A=
          return new java::lang::Integer (l_val.l_linger);=0A=
        else=0A=
	  return new java::lang::Boolean ((__java_boolean)false);=0A=
#else=0A=
        JvThrow (new java::lang::InternalError (=0A=
          JvNewStringUTF ("SO_LINGER not supported")));      =0A=
#endif=0A=
        break;    =0A=
      case _Jv_SO_RCVBUF_ :=0A=
      case _Jv_SO_SNDBUF_ :=0A=
#if defined(SO_SNDBUF) && defined(SO_RCVBUF)=0A=
        int opt;=0A=
        optID =3D=3D _Jv_SO_SNDBUF_ ? opt =3D SO_SNDBUF : opt =3D =
SO_RCVBUF;=0A=
        if (::getsockopt (fnum, SOL_SOCKET, opt, (char *) &val, =
&val_len) !=3D 0)=0A=
	  goto error;    =0A=
        else=0A=
	  return new java::lang::Integer (val);=0A=
#else=0A=
        JvThrow (new java::lang::InternalError (=0A=
          JvNewStringUTF ("SO_RCVBUF/SO_SNDBUF not supported")));=0A=
#endif    =0A=
	break;=0A=
      case _Jv_SO_BINDADDR_:=0A=
	// cache the local address =0A=
	if (localAddress =3D=3D NULL)=0A=
	  {=0A=
	    jbyteArray laddr;=0A=
	    if (::getsockname (fnum, (sockaddr*) &u, &addrlen) !=3D 0)=0A=
	      goto error;=0A=
	    if (u.address.sin_family =3D=3D AF_INET)=0A=
	      {=0A=
		laddr =3D JvNewByteArray (4);=0A=
		memcpy (elements (laddr), &u.address.sin_addr, 4);=0A=
	      }=0A=
#ifdef HAVE_INET6=0A=
            else if (u.address.sin_family =3D=3D AF_INET6)=0A=
	      {=0A=
		laddr =3D JvNewByteArray (16);=0A=
		memcpy (elements (laddr), &u.address6.sin6_addr, 16);=0A=
	      }=0A=
#endif=0A=
	    else=0A=
	      goto error;=0A=
	    localAddress =3D new java::net::InetAddress (laddr, NULL);=0A=
	  }=0A=
	return localAddress;=0A=
	break;=0A=
      case _Jv_IP_MULTICAST_IF_ :=0A=
	JvThrow (new java::net::SocketException (=0A=
	  JvNewStringUTF ("IP_MULTICAST_IF: not valid for TCP")));=0A=
	break;=0A=
      case _Jv_SO_REUSEADDR_ :=0A=
	JvThrow (new java::net::SocketException (=0A=
	  JvNewStringUTF ("SO_REUSEADDR: not valid for TCP")));=0A=
	break;=0A=
      case _Jv_SO_TIMEOUT_ :=0A=
	return new java::lang::Integer (timeout);=0A=
	break;=0A=
      default :=0A=
	errno =3D ENOPROTOOPT;=0A=
    }=0A=
=0A=
 error:=0A=
  char* strerr =3D strerror (errno);=0A=
  JvThrow (new java::net::SocketException (JvNewStringUTF (strerr)));=0A=
}=0A=
=0A=
#endif /* DISABLE_JAVA_NET */=0A=

------=_NextPart_000_0057_01BF809B.98CAFFB0
Content-Type: application/octet-stream;
	name="prims.cc"
Content-Transfer-Encoding: quoted-printable
Content-Disposition: attachment;
	filename="prims.cc"

// prims.cc - Code for core of runtime environment.=0A=
=0A=
/* Copyright (C) 1998, 1999, 2000  Red Hat, Inc.=0A=
=0A=
   This file is part of libgcj.=0A=
=0A=
This software is copyrighted work licensed under the terms of the=0A=
Libgcj License.  Please consult the file "LIBGCJ_LICENSE" for=0A=
details.  */=0A=
=0A=
#include <config.h>=0A=

#ifdef USE_WIN32_SIGNALLING
#include <windows.h>
#endif /* USE_WIN32_SIGNALLING */

#ifdef USE_WINSOCK
#undef __INSIDE_CYGWIN__
#include <winsock.h>
#endif /* USE_WINSOCK */
=0A=
#include <stdlib.h>=0A=
#include <stdarg.h>=0A=
#include <stdio.h>=0A=
#include <string.h>=0A=
#include <signal.h>=0A=
=0A=
#ifdef HAVE_UNISTD_H=0A=
#include <unistd.h>=0A=
#endif=0A=
=0A=
#include <gcj/cni.h>=0A=
#include <jvm.h>=0A=
#include <java-signal.h>=0A=
#include <java-threads.h>=0A=
=0A=
#ifndef DISABLE_GETENV_PROPERTIES=0A=
#include <ctype.h>=0A=
#include <java-props.h>=0A=
#define PROCESS_GCJ_PROPERTIES process_gcj_properties()=0A=
#else=0A=
#define PROCESS_GCJ_PROPERTIES=0A=
#endif // DISABLE_GETENV_PROPERTIES=0A=
=0A=
#include <java/lang/Class.h>=0A=
#include <java/lang/Runtime.h>=0A=
#include <java/lang/String.h>=0A=
#include <java/lang/Thread.h>=0A=
#include <java/lang/ThreadGroup.h>=0A=
#include <java/lang/FirstThread.h>=0A=
#include <java/lang/ArrayIndexOutOfBoundsException.h>=0A=
#include <java/lang/ArithmeticException.h>=0A=
#include <java/lang/ClassFormatError.h>=0A=
#include <java/lang/ClassCastException.h>=0A=
#include <java/lang/NegativeArraySizeException.h>=0A=
#include <java/lang/NullPointerException.h>=0A=
#include <java/lang/OutOfMemoryError.h>=0A=
#include <java/lang/ArrayStoreException.h>=0A=
#include <java/lang/System.h>=0A=
#include <java/lang/reflect/Modifier.h>=0A=
#include <java/io/PrintStream.h>=0A=
=0A=
#ifdef USE_LTDL=0A=
#include <ltdl.h>=0A=
#endif=0A=
=0A=
#define ObjectClass _CL_Q34java4lang6Object=0A=
extern java::lang::Class ObjectClass;=0A=
=0A=
// We allocate a single OutOfMemoryError exception which we keep=0A=
// around for use if we run out of memory.=0A=
static java::lang::OutOfMemoryError *no_memory;=0A=
=0A=
// Largest representable size_t.=0A=
#define SIZE_T_MAX ((size_t) (~ (size_t) 0))=0A=
=0A=
// Properties set at compile time.=0A=
const char **_Jv_Compiler_Properties;=0A=
=0A=
#ifndef DISABLE_GETENV_PROPERTIES=0A=
// Property key/value pairs.=0A=
property_pair *_Jv_Environment_Properties;=0A=
#endif=0A=
=0A=
// The name of this executable.=0A=
static char * _Jv_execName;=0A=
=0A=
=0C=0A=
=0A=
#ifdef HANDLE_SEGV=0A=
static java::lang::NullPointerException *nullp;=0A=
SIGNAL_HANDLER (catch_segv)=0A=
{=0A=
  MAKE_THROW_FRAME;=0A=
  nullp->fillInStackTrace ();=0A=
  _Jv_Throw (nullp);=0A=
}=0A=
#endif=0A=
=0A=
static java::lang::ArithmeticException *arithexception;=0A=
=0A=
#ifdef HANDLE_FPE=0A=
SIGNAL_HANDLER (catch_fpe)=0A=
{=0A=
#ifdef HANDLE_DIVIDE_OVERFLOW=0A=
  HANDLE_DIVIDE_OVERFLOW;=0A=
#else=0A=
  MAKE_THROW_FRAME;=0A=
#endif=0A=
  arithexception->fillInStackTrace ();=0A=
  _Jv_Throw (arithexception);=0A=
}=0A=
#endif=0A=
=0A=
=0C=0A=
=0A=
jboolean=0A=
_Jv_equalUtf8Consts (Utf8Const* a, Utf8Const *b)=0A=
{=0A=
  register int len;=0A=
  register _Jv_ushort *aptr, *bptr;=0A=
  if (a =3D=3D b)=0A=
    return true;=0A=
  if (a->hash !=3D b->hash)=0A=
    return false;=0A=
  len =3D a->length;=0A=
  if (b->length !=3D len)=0A=
    return false;=0A=
  aptr =3D (_Jv_ushort *)a->data;=0A=
  bptr =3D (_Jv_ushort *)b->data;=0A=
  len =3D (len + 1) >> 1;=0A=
  while (--len >=3D 0)=0A=
    if (*aptr++ !=3D *bptr++)=0A=
      return false;=0A=
  return true;=0A=
}=0A=
=0A=
/* True iff A is equal to STR.=0A=
   HASH is STR->hashCode().  =0A=
*/=0A=
=0A=
jboolean=0A=
_Jv_equal (Utf8Const* a, jstring str, jint hash)=0A=
{=0A=
  if (a->hash !=3D (_Jv_ushort) hash)=0A=
    return false;=0A=
  jint len =3D str->length();=0A=
  jint i =3D 0;=0A=
  jchar *sptr =3D _Jv_GetStringChars (str);=0A=
  register unsigned char* ptr =3D (unsigned char*) a->data;=0A=
  register unsigned char* limit =3D ptr + a->length;=0A=
  for (;; i++, sptr++)=0A=
    {=0A=
      int ch =3D UTF8_GET (ptr, limit);=0A=
      if (i =3D=3D len)=0A=
	return ch < 0;=0A=
      if (ch !=3D *sptr)=0A=
	return false;=0A=
    }=0A=
  return true;=0A=
}=0A=
=0A=
/* Like _Jv_equal, but stop after N characters.  */=0A=
jboolean=0A=
_Jv_equaln (Utf8Const *a, jstring str, jint n)=0A=
{=0A=
  jint len =3D str->length();=0A=
  jint i =3D 0;=0A=
  jchar *sptr =3D _Jv_GetStringChars (str);=0A=
  register unsigned char* ptr =3D (unsigned char*) a->data;=0A=
  register unsigned char* limit =3D ptr + a->length;=0A=
  for (; n-- > 0; i++, sptr++)=0A=
    {=0A=
      int ch =3D UTF8_GET (ptr, limit);=0A=
      if (i =3D=3D len)=0A=
	return ch < 0;=0A=
      if (ch !=3D *sptr)=0A=
	return false;=0A=
    }=0A=
  return true;=0A=
}=0A=
=0A=
/* Count the number of Unicode chars encoded in a given Ut8 string. */=0A=
int=0A=
_Jv_strLengthUtf8(char* str, int len)=0A=
{=0A=
  register unsigned char* ptr;=0A=
  register unsigned char* limit;=0A=
  int str_length;=0A=
=0A=
  ptr =3D (unsigned char*) str;=0A=
  limit =3D ptr + len;=0A=
  str_length =3D 0;=0A=
  for (; ptr < limit; str_length++) {=0A=
    if (UTF8_GET (ptr, limit) < 0) {=0A=
      return (-1);=0A=
    }=0A=
  }=0A=
  return (str_length);=0A=
}=0A=
=0A=
/* Calculate a hash value for a string encoded in Utf8 format.=0A=
 * This returns the same hash value as specified or =
java.lang.String.hashCode.=0A=
 */=0A=
static jint=0A=
hashUtf8String (char* str, int len)=0A=
{=0A=
  register unsigned char* ptr =3D (unsigned char*) str;=0A=
  register unsigned char* limit =3D ptr + len;=0A=
  jint hash =3D 0;=0A=
=0A=
  for (; ptr < limit;)=0A=
    {=0A=
      int ch =3D UTF8_GET (ptr, limit);=0A=
      /* Updated specification from=0A=
	 http://www.javasoft.com/docs/books/jls/clarify.html. */=0A=
      hash =3D (31 * hash) + ch;=0A=
    }=0A=
  return hash;=0A=
}=0A=
=0A=
_Jv_Utf8Const *=0A=
_Jv_makeUtf8Const (char* s, int len)=0A=
{=0A=
  if (len < 0)=0A=
    len =3D strlen (s);=0A=
  Utf8Const* m =3D (Utf8Const*) _Jv_AllocBytes (sizeof(Utf8Const) + len =
+ 1);=0A=
  if (! m)=0A=
    JvThrow (no_memory);=0A=
  memcpy (m->data, s, len);=0A=
  m->data[len] =3D 0;=0A=
  m->length =3D len;=0A=
  m->hash =3D hashUtf8String (s, len) & 0xFFFF;=0A=
  return (m);=0A=
}=0A=
=0A=
_Jv_Utf8Const *=0A=
_Jv_makeUtf8Const (jstring string)=0A=
{=0A=
  jint hash =3D string->hashCode ();=0A=
  jint len =3D _Jv_GetStringUTFLength (string);=0A=
=0A=
  Utf8Const* m =3D (Utf8Const*)=0A=
    _Jv_AllocBytesChecked (sizeof(Utf8Const) + len + 1);=0A=
=0A=
  m->hash =3D hash;=0A=
  m->length =3D len;=0A=
=0A=
  _Jv_GetStringUTFRegion (string, 0, string->length (), m->data);=0A=
  m->data[len] =3D 0;=0A=
  =0A=
  return m;=0A=
}=0A=
=0A=
=0C=0A=
=0A=
#ifdef DEBUG=0A=
void=0A=
_Jv_Abort (const char *function, const char *file, int line,=0A=
	   const char *message)=0A=
#else=0A=
void=0A=
_Jv_Abort (const char *, const char *, int, const char *message)=0A=
#endif=0A=
{=0A=
#ifdef DEBUG=0A=
  fprintf (stderr,=0A=
	   "libgcj failure: %s\n   in function %s, file %s, line %d\n",=0A=
	   message, function, file, line);=0A=
#else=0A=
  java::io::PrintStream *err =3D java::lang::System::err;=0A=
  err->print(JvNewStringLatin1 ("libgcj failure: "));=0A=
  err->println(JvNewStringLatin1 (message));=0A=
  err->flush();=0A=
#endif=0A=
  abort ();=0A=
}=0A=
=0A=
static void=0A=
fail_on_finalization (jobject)=0A=
{=0A=
  JvFail ("object was finalized");=0A=
}=0A=
=0A=
void=0A=
_Jv_GCWatch (jobject obj)=0A=
{=0A=
  _Jv_RegisterFinalizer (obj, fail_on_finalization);=0A=
}=0A=
=0A=
void=0A=
_Jv_ThrowBadArrayIndex(jint bad_index)=0A=
{=0A=
  JvThrow (new java::lang::ArrayIndexOutOfBoundsException=0A=
	   (java::lang::String::valueOf(bad_index)));=0A=
}=0A=
=0A=
void*=0A=
_Jv_CheckCast (jclass c, jobject obj)=0A=
{=0A=
  if (obj !=3D NULL && ! c->isAssignableFrom(obj->getClass()))=0A=
    JvThrow (new java::lang::ClassCastException);=0A=
  return obj;=0A=
}=0A=
=0A=
void=0A=
_Jv_CheckArrayStore (jobject arr, jobject obj)=0A=
{=0A=
  if (obj)=0A=
    {=0A=
      JvAssert (arr !=3D NULL);=0A=
      jclass arr_class =3D arr->getClass();=0A=
      JvAssert (arr_class->isArray());=0A=
      jclass elt_class =3D arr_class->getComponentType();=0A=
      jclass obj_class =3D obj->getClass();=0A=
      if (! elt_class->isAssignableFrom(obj_class))=0A=
	JvThrow (new java::lang::ArrayStoreException);=0A=
    }=0A=
}=0A=
=0A=
=0C=0A=
=0A=
// Allocate some unscanned memory and throw an exception if no memory.=0A=
void *=0A=
_Jv_AllocBytesChecked (jsize size)=0A=
{=0A=
  void *r =3D _Jv_AllocBytes (size);=0A=
  if (! r)=0A=
    _Jv_Throw (no_memory);=0A=
  return r;=0A=
}=0A=
=0A=
// Allocate a new object of class C.  SIZE is the size of the object=0A=
// to allocate.  You might think this is redundant, but it isn't; some=0A=
// classes, such as String, aren't of fixed size.=0A=
jobject=0A=
_Jv_AllocObject (jclass c, jint size)=0A=
{=0A=
  _Jv_InitClass (c);=0A=
=0A=
  jobject obj =3D (jobject) _Jv_AllocObj (size);=0A=
  if (! obj)=0A=
    JvThrow (no_memory);=0A=
  *((_Jv_VTable **) obj) =3D c->vtable;=0A=
=0A=
  // If this class has inherited finalize from Object, then don't=0A=
  // bother registering a finalizer.  We know that finalize() is the=0A=
  // very first method after the dummy entry.  If this turns out to be=0A=
  // unreliable, a more robust implementation can be written.  Such an=0A=
  // implementation would look for Object.finalize in Object's method=0A=
  // table at startup, and then use that information to find the=0A=
  // appropriate index in the method vector.=0A=
  if (c->vtable->method[1] !=3D ObjectClass.vtable->method[1])=0A=
    _Jv_RegisterFinalizer (obj, _Jv_FinalizeObject);=0A=
=0A=
  return obj;=0A=
}=0A=
=0A=
// Allocate a new array of Java objects.  Each object is of type=0A=
// `elementClass'.  `init' is used to initialize each slot in the=0A=
// array.=0A=
jobjectArray=0A=
_Jv_NewObjectArray (jsize count, jclass elementClass, jobject init)=0A=
{=0A=
  if (count < 0)=0A=
    JvThrow (new java::lang::NegativeArraySizeException);=0A=
=0A=
  JvAssert (! elementClass->isPrimitive ());=0A=
=0A=
  jobjectArray obj =3D NULL;=0A=
  size_t size =3D (size_t) _Jv_GetArrayElementFromElementType (obj,=0A=
							     elementClass);=0A=
=0A=
  // Check for overflow.=0A=
  if ((size_t) count > (SIZE_T_MAX - size) / sizeof (jobject))=0A=
    JvThrow (no_memory);=0A=
=0A=
  size +=3D count * sizeof (jobject);=0A=
=0A=
  // FIXME: second argument should be "current loader" //=0A=
  jclass clas =3D _Jv_FindArrayClass (elementClass, 0);=0A=
=0A=
  obj =3D (jobjectArray) _Jv_AllocArray (size);=0A=
  if (! obj)=0A=
    JvThrow (no_memory);=0A=
  obj->length =3D count;=0A=
  jobject* ptr =3D elements(obj);=0A=
  // We know the allocator returns zeroed memory.  So don't bother=0A=
  // zeroing it again.=0A=
  if (init)=0A=
    {=0A=
      while (--count >=3D 0)=0A=
	*ptr++ =3D init;=0A=
    }=0A=
  // Set the vtbl last to avoid problems if the GC happens during the=0A=
  // window in this function between the allocation and this=0A=
  // assignment.=0A=
  *((_Jv_VTable **) obj) =3D clas->vtable;=0A=
  return obj;=0A=
}=0A=
=0A=
// Allocate a new array of primitives.  ELTYPE is the type of the=0A=
// element, COUNT is the size of the array.=0A=
jobject=0A=
_Jv_NewPrimArray (jclass eltype, jint count)=0A=
{=0A=
  int elsize =3D eltype->size();=0A=
  if (count < 0)=0A=
    JvThrow (new java::lang::NegativeArraySizeException ());=0A=
=0A=
  JvAssert (eltype->isPrimitive ());=0A=
  jobject dummy =3D NULL;=0A=
  size_t size =3D (size_t) _Jv_GetArrayElementFromElementType (dummy, =
eltype);=0A=
=0A=
  // Check for overflow.=0A=
  if ((size_t) count > (SIZE_T_MAX - size) / elsize)=0A=
    JvThrow (no_memory);=0A=
=0A=
  __JArray *arr =3D (__JArray*) _Jv_AllocObj (size + elsize * count);=0A=
  if (! arr)=0A=
    JvThrow (no_memory);=0A=
  arr->length =3D count;=0A=
  // Note that we assume we are given zeroed memory by the allocator.=0A=
=0A=
  jclass klass =3D _Jv_FindArrayClass (eltype, 0);=0A=
  // Set the vtbl last to avoid problems if the GC happens during the=0A=
  // window in this function between the allocation and this=0A=
  // assignment.=0A=
  *((_Jv_VTable **) arr) =3D klass->vtable;=0A=
  return arr;=0A=
}=0A=
=0A=
jcharArray=0A=
JvNewCharArray (jint length)=0A=
{=0A=
  return (jcharArray) _Jv_NewPrimArray (JvPrimClass (char), length);=0A=
}=0A=
=0A=
jbooleanArray=0A=
JvNewBooleanArray (jint length)=0A=
{=0A=
  return (jbooleanArray) _Jv_NewPrimArray (JvPrimClass (boolean), =
length);=0A=
}=0A=
=0A=
jbyteArray=0A=
JvNewByteArray (jint length)=0A=
{=0A=
  return (jbyteArray) _Jv_NewPrimArray (JvPrimClass (byte), length);=0A=
}=0A=
=0A=
jshortArray=0A=
JvNewShortArray (jint length)=0A=
{=0A=
  return (jshortArray) _Jv_NewPrimArray (JvPrimClass (short), length);=0A=
}=0A=
=0A=
jintArray=0A=
JvNewIntArray (jint length)=0A=
{=0A=
  return (jintArray) _Jv_NewPrimArray (JvPrimClass (int), length);=0A=
}=0A=
=0A=
jlongArray=0A=
JvNewLongArray (jint length)=0A=
{=0A=
  return (jlongArray) _Jv_NewPrimArray (JvPrimClass (long), length);=0A=
}=0A=
=0A=
jfloatArray=0A=
JvNewFloatArray (jint length)=0A=
{=0A=
  return (jfloatArray) _Jv_NewPrimArray (JvPrimClass (float), length);=0A=
}=0A=
=0A=
jdoubleArray=0A=
JvNewDoubleArray (jint length)=0A=
{=0A=
  return (jdoubleArray) _Jv_NewPrimArray (JvPrimClass (double), length);=0A=
}=0A=
=0A=
jobject=0A=
_Jv_NewArray (jint type, jint size)=0A=
{=0A=
  switch (type)=0A=
    {=0A=
      case  4:  return JvNewBooleanArray (size);=0A=
      case  5:  return JvNewCharArray (size);=0A=
      case  6:  return JvNewFloatArray (size);=0A=
      case  7:  return JvNewDoubleArray (size);=0A=
      case  8:  return JvNewByteArray (size);=0A=
      case  9:  return JvNewShortArray (size);=0A=
      case 10:  return JvNewIntArray (size);=0A=
      case 11:  return JvNewLongArray (size);=0A=
    }=0A=
  JvFail ("newarray - bad type code");=0A=
  return NULL;			// Placate compiler.=0A=
}=0A=
=0A=
jobject=0A=
_Jv_NewMultiArray (jclass type, jint dimensions, jint *sizes)=0A=
{=0A=
  JvAssert (type->isArray());=0A=
  jclass element_type =3D type->getComponentType();=0A=
  jobject result;=0A=
  if (element_type->isPrimitive())=0A=
    result =3D _Jv_NewPrimArray (element_type, sizes[0]);=0A=
  else=0A=
    result =3D _Jv_NewObjectArray (sizes[0], element_type, NULL);=0A=
=0A=
  if (dimensions > 1)=0A=
    {=0A=
      JvAssert (! element_type->isPrimitive());=0A=
      JvAssert (element_type->isArray());=0A=
      jobject *contents =3D elements ((jobjectArray) result);=0A=
      for (int i =3D 0; i < sizes[0]; ++i)=0A=
	contents[i] =3D _Jv_NewMultiArray (element_type, dimensions - 1,=0A=
					 sizes + 1);=0A=
    }=0A=
=0A=
  return result;=0A=
}=0A=
=0A=
jobject=0A=
_Jv_NewMultiArray (jclass array_type, jint dimensions, ...)=0A=
{=0A=
  va_list args;=0A=
  jint sizes[dimensions];=0A=
  va_start (args, dimensions);=0A=
  for (int i =3D 0; i < dimensions; ++i)=0A=
    {=0A=
      jint size =3D va_arg (args, jint);=0A=
      sizes[i] =3D size;=0A=
    }=0A=
  va_end (args);=0A=
=0A=
  return _Jv_NewMultiArray (array_type, dimensions, sizes);=0A=
}=0A=
=0A=
=0C=0A=
=0A=
class _Jv_PrimClass : public java::lang::Class=0A=
{=0A=
public:=0A=
  // FIXME: calling convention is weird.  If we use the natural types=0A=
  // then the compiler will complain because they aren't Java types.=0A=
  _Jv_PrimClass (jobject cname, jbyte sig, jint len)=0A=
    {=0A=
      using namespace java::lang::reflect;=0A=
=0A=
      // We must initialize every field of the class.  We do this in=0A=
      // the same order they are declared in Class.h.=0A=
      next =3D NULL;=0A=
      name =3D _Jv_makeUtf8Const ((char *) cname, -1);=0A=
      accflags =3D Modifier::PUBLIC | Modifier::FINAL;=0A=
      superclass =3D NULL;=0A=
      constants.size =3D 0;=0A=
      constants.tags =3D NULL;=0A=
      constants.data =3D NULL;=0A=
      methods =3D NULL;=0A=
      method_count =3D sig;=0A=
      vtable_method_count =3D 0;=0A=
      fields =3D NULL;=0A=
      size_in_bytes =3D len;=0A=
      field_count =3D 0;=0A=
      static_field_count =3D 0;=0A=
      vtable =3D JV_PRIMITIVE_VTABLE;=0A=
      interfaces =3D NULL;=0A=
      loader =3D NULL;=0A=
      interface_count =3D 0;=0A=
      state =3D JV_STATE_NOTHING;=0A=
      thread =3D NULL;=0A=
    }=0A=
};=0A=
=0A=
#define DECLARE_PRIM_TYPE(NAME, SIG, LEN) \=0A=
  _Jv_PrimClass _Jv_##NAME##Class((jobject) #NAME, (jbyte) SIG, (jint) =
LEN)=0A=
=0A=
DECLARE_PRIM_TYPE(byte, 'B', 1);=0A=
DECLARE_PRIM_TYPE(short, 'S', 2);=0A=
DECLARE_PRIM_TYPE(int, 'I', 4);=0A=
DECLARE_PRIM_TYPE(long, 'J', 8);=0A=
DECLARE_PRIM_TYPE(boolean, 'Z', 1);=0A=
DECLARE_PRIM_TYPE(char, 'C', 2);=0A=
DECLARE_PRIM_TYPE(float, 'F', 4);=0A=
DECLARE_PRIM_TYPE(double, 'D', 8);=0A=
DECLARE_PRIM_TYPE(void, 'V', 0);=0A=
=0A=
jclass=0A=
_Jv_FindClassFromSignature (char *sig, java::lang::ClassLoader *loader)=0A=
{=0A=
  switch (*sig)=0A=
    {=0A=
    case 'B':=0A=
      return JvPrimClass (byte);=0A=
    case 'S':=0A=
      return JvPrimClass (short);=0A=
    case 'I':=0A=
      return JvPrimClass (int);=0A=
    case 'J':=0A=
      return JvPrimClass (long);=0A=
    case 'Z':=0A=
      return JvPrimClass (boolean);=0A=
    case 'C':=0A=
      return JvPrimClass (char);=0A=
    case 'F':=0A=
      return JvPrimClass (float);=0A=
    case 'D':=0A=
      return JvPrimClass (double);=0A=
    case 'V':=0A=
      return JvPrimClass (void);=0A=
    case 'L':=0A=
      {=0A=
	int i;=0A=
	for (i =3D 1; sig[i] && sig[i] !=3D ';'; ++i)=0A=
	  ;=0A=
	_Jv_Utf8Const *name =3D _Jv_makeUtf8Const (&sig[1], i - 1);=0A=
	return _Jv_FindClass (name, loader);=0A=
=0A=
      }=0A=
    case '[':=0A=
      return _Jv_FindArrayClass (_Jv_FindClassFromSignature (&sig[1], =
loader),=0A=
				 loader);=0A=
    }=0A=
  JvFail ("couldn't understand class signature");=0A=
  return NULL;			// Placate compiler.=0A=
}=0A=
=0A=
=0C=0A=
=0A=
JArray<jstring> *=0A=
JvConvertArgv (int argc, const char **argv)=0A=
{=0A=
  if (argc < 0)=0A=
    argc =3D 0;=0A=
  jobjectArray ar =3D JvNewObjectArray(argc, &StringClass, NULL);=0A=
  jobject* ptr =3D elements(ar);=0A=
  for (int i =3D 0;  i < argc;  i++)=0A=
    {=0A=
      const char *arg =3D argv[i];=0A=
      // FIXME - should probably use JvNewStringUTF.=0A=
      *ptr++ =3D JvNewStringLatin1(arg, strlen(arg));=0A=
    }=0A=
  return (JArray<jstring>*) ar;=0A=
}=0A=
=0A=
// FIXME: These variables are static so that they will be=0A=
// automatically scanned by the Boehm collector.  This is needed=0A=
// because with qthreads the collector won't scan the initial stack --=0A=
// it will only scan the qthreads stacks.=0A=
=0A=
// Command line arguments.=0A=
static jobject arg_vec;=0A=
=0A=
// The primary threadgroup.=0A=
static java::lang::ThreadGroup *main_group;=0A=
=0A=
// The primary thread.=0A=
static java::lang::Thread *main_thread;=0A=
=0A=
char *=0A=
_Jv_ThisExecutable (void)=0A=
{=0A=
  return _Jv_execName;=0A=
}=0A=
=0A=
void=0A=
_Jv_ThisExecutable (const char *name)=0A=
{=0A=
  if (name)=0A=
    {=0A=
      _Jv_execName =3D new char[strlen (name) + 1];=0A=
      strcpy (_Jv_execName, name);=0A=
    }=0A=
}=0A=

#ifdef USE_WIN32_SIGNALLING

extern "C" int* win32_get_restart_frame (void *);

LONG CALLBACK win32_exception_handler (LPEXCEPTION_POINTERS e) {
  int* setjmp_buf;
  if (e->ExceptionRecord->ExceptionCode =3D=3D =
EXCEPTION_ACCESS_VIOLATION)  =20
    setjmp_buf =3D win32_get_restart_frame (nullp);
  else if (e->ExceptionRecord->ExceptionCode =3D=3D =
EXCEPTION_INT_DIVIDE_BY_ZERO)
    setjmp_buf =3D win32_get_restart_frame (arithexception);
  else
    return EXCEPTION_CONTINUE_SEARCH;

  e->ContextRecord->Ebp =3D setjmp_buf[0];
  // FIXME: Why does i386-signal.h increment the PC here, do we need to =
do it?
  e->ContextRecord->Eip =3D setjmp_buf[1];
  // FIXME: Is this the stack pointer? Do we need it?
  e->ContextRecord->Esp =3D setjmp_buf[2];

  return EXCEPTION_CONTINUE_EXECUTION;
}

#endif
=0A=
static void=0A=
main_init ()=0A=
{=0A=
  INIT_SEGV;=0A=
#ifdef HANDLE_FPE=0A=
  INIT_FPE;=0A=
#else=0A=
  arithexception =3D new java::lang::ArithmeticException=0A=
    (JvNewStringLatin1 ("/ by zero"));=0A=
#endif=0A=
=0A=
  no_memory =3D new java::lang::OutOfMemoryError;=0A=
=0A=
#ifdef USE_LTDL=0A=
  LTDL_SET_PRELOADED_SYMBOLS ();=0A=
#endif=0A=

#ifdef USE_WINSOCK
  // Initialise winsock for networking
  WSADATA data;
  if (WSAStartup (MAKEWORD (1, 1), &data))
      MessageBox (NULL, "Error initialising winsock library.", "Error", =
MB_OK | MB_ICONEXCLAMATION);
#endif /* USE_WINSOCK */
=0A=
#ifdef USE_WIN32_SIGNALLING
  // Install exception handler
  SetUnhandledExceptionFilter (win32_exception_handler);
#else
  // FIXME: we only want this on POSIX systems.
  struct sigaction act;
  act.sa_handler =3D SIG_IGN;
  sigemptyset (&act.sa_mask);
  act.sa_flags =3D 0;
  sigaction (SIGPIPE, &act, NULL);
#endif /* USE_WIN32_SIGNALLING */
=0A=
  _Jv_JNI_Init ();=0A=
}=0A=
=0A=
#ifndef DISABLE_GETENV_PROPERTIES=0A=
=0A=
static char *=0A=
next_property_key (char *s, size_t *length)=0A=
{=0A=
  size_t l =3D 0;=0A=
=0A=
  JvAssert (s);=0A=
=0A=
  // Skip over whitespace=0A=
  while (isspace (*s))=0A=
    s++;=0A=
=0A=
  // If we've reached the end, return NULL.  Also return NULL if for=0A=
  // some reason we've come across a malformed property string.=0A=
  if (*s =3D=3D 0=0A=
      || *s =3D=3D ':'=0A=
      || *s =3D=3D '=3D')=0A=
    return NULL;=0A=
=0A=
  // Determine the length of the property key.=0A=
  while (s[l] !=3D 0=0A=
	 && ! isspace (s[l])=0A=
	 && s[l] !=3D ':'=0A=
	 && s[l] !=3D '=3D')=0A=
    {=0A=
      if (s[l] =3D=3D '\\'=0A=
	  && s[l+1] !=3D 0)=0A=
	l++;=0A=
      l++;=0A=
    }=0A=
=0A=
  *length =3D l;=0A=
=0A=
  return s;=0A=
}=0A=
=0A=
static char *=0A=
next_property_value (char *s, size_t *length)=0A=
{=0A=
  size_t l =3D 0;=0A=
=0A=
  JvAssert (s);=0A=
=0A=
  while (isspace (*s))=0A=
    s++;=0A=
=0A=
  if (*s =3D=3D ':'=0A=
      || *s =3D=3D '=3D')=0A=
    s++;=0A=
=0A=
  while (isspace (*s))=0A=
    s++;=0A=
=0A=
  // If we've reached the end, return NULL.=0A=
  if (*s =3D=3D 0)=0A=
    return NULL;=0A=
=0A=
  // Determine the length of the property value.=0A=
  while (s[l] !=3D 0=0A=
	 && ! isspace (s[l])=0A=
	 && s[l] !=3D ':'=0A=
	 && s[l] !=3D '=3D')=0A=
    {=0A=
      if (s[l] =3D=3D '\\'=0A=
	  && s[l+1] !=3D 0)=0A=
	l +=3D 2;=0A=
      else=0A=
	l++;=0A=
    }=0A=
=0A=
  *length =3D l;=0A=
=0A=
  return s;=0A=
}=0A=
=0A=
static void=0A=
process_gcj_properties ()=0A=
{=0A=
  char *props =3D getenv("GCJ_PROPERTIES");=0A=
  char *p =3D props;=0A=
  size_t length;=0A=
  size_t property_count =3D 0;=0A=
=0A=
  if (NULL =3D=3D props)=0A=
    return;=0A=
=0A=
  // Whip through props quickly in order to count the number of=0A=
  // property values.=0A=
  while (p && (p =3D next_property_key (p, &length)))=0A=
    {=0A=
      // Skip to the end of the key=0A=
      p +=3D length;=0A=
=0A=
      p =3D next_property_value (p, &length);=0A=
      if (p)=0A=
	p +=3D length;=0A=
      =0A=
      property_count++;=0A=
    }=0A=
=0A=
  // Allocate an array of property value/key pairs.=0A=
  _Jv_Environment_Properties =3D =0A=
    (property_pair *) malloc (sizeof(property_pair) =0A=
			      * (property_count + 1));=0A=
=0A=
  // Go through the properties again, initializing _Jv_Properties=0A=
  // along the way.=0A=
  p =3D props;=0A=
  property_count =3D 0;=0A=
  while (p && (p =3D next_property_key (p, &length)))=0A=
    {=0A=
      _Jv_Environment_Properties[property_count].key =3D p;=0A=
      _Jv_Environment_Properties[property_count].key_length =3D length;=0A=
=0A=
      // Skip to the end of the key=0A=
      p +=3D length;=0A=
=0A=
      p =3D next_property_value (p, &length);=0A=
      =0A=
      _Jv_Environment_Properties[property_count].value =3D p;=0A=
      _Jv_Environment_Properties[property_count].value_length =3D length;=0A=
=0A=
      if (p)=0A=
	p +=3D length;=0A=
=0A=
      property_count++;=0A=
    }=0A=
  memset ((void *) &_Jv_Environment_Properties[property_count], =0A=
	  0, sizeof (property_pair));=0A=
  {=0A=
    size_t i =3D 0;=0A=
=0A=
    // Null terminate the strings.=0A=
    while (_Jv_Environment_Properties[i].key)=0A=
      {=0A=
	=
_Jv_Environment_Properties[i].key[_Jv_Environment_Properties[i].key_lengt=
h] =3D 0;=0A=
	=
_Jv_Environment_Properties[i++].value[_Jv_Environment_Properties[i].value=
_length] =3D 0;=0A=
      }=0A=
  }=0A=
}=0A=
#endif // DISABLE_GETENV_PROPERTIES=0A=
=0A=
void=0A=
JvRunMain (jclass klass, int argc, const char **argv)=0A=
{=0A=
  PROCESS_GCJ_PROPERTIES;=0A=
=0A=
  main_init ();=0A=
#ifdef HAVE_PROC_SELF_EXE=0A=
  char exec_name[20];=0A=
  sprintf (exec_name, "/proc/%d/exe", getpid ());=0A=
  _Jv_ThisExecutable (exec_name);=0A=
#else=0A=
  _Jv_ThisExecutable (argv[0]);=0A=
#endif=0A=
=0A=
  arg_vec =3D JvConvertArgv (argc - 1, argv + 1);=0A=
  main_group =3D new java::lang::ThreadGroup (23);=0A=
  main_thread =3D new java::lang::FirstThread (main_group, klass, =
arg_vec);=0A=
=0A=
  main_thread->start();=0A=
  _Jv_ThreadWait ();=0A=
=0A=
  java::lang::Runtime::getRuntime ()->exit (0);=0A=
}=0A=
=0A=
void=0A=
_Jv_RunMain (const char *class_name, int argc, const char **argv)=0A=
{=0A=
  PROCESS_GCJ_PROPERTIES;=0A=
=0A=
  main_init ();=0A=
=0A=
#ifdef HAVE_PROC_SELF_EXE=0A=
  char exec_name[20];=0A=
  sprintf (exec_name, "/proc/%d/exe", getpid ());=0A=
  _Jv_ThisExecutable (exec_name);=0A=
#endif=0A=
=0A=
  arg_vec =3D JvConvertArgv (argc - 1, argv + 1);=0A=
  main_group =3D new java::lang::ThreadGroup (23);=0A=
  main_thread =3D new java::lang::FirstThread (main_group,=0A=
					     JvNewStringLatin1 (class_name),=0A=
					     arg_vec);=0A=
  main_thread->start();=0A=
  _Jv_ThreadWait ();=0A=
=0A=
  java::lang::Runtime::getRuntime ()->exit (0);=0A=
}=0A=
=0A=
=0C=0A=
=0A=
// Parse a string and return a heap size.=0A=
static size_t=0A=
parse_heap_size (const char *spec)=0A=
{=0A=
  char *end;=0A=
  unsigned long val =3D strtoul (spec, &end, 10);=0A=
  if (*end =3D=3D 'k' || *end =3D=3D 'K')=0A=
    val *=3D 1024;=0A=
  else if (*end =3D=3D 'm' || *end =3D=3D 'M')=0A=
    val *=3D 1048576;=0A=
  return (size_t) val;=0A=
}=0A=
=0A=
// Set the initial heap size.  This might be ignored by the GC layer.=0A=
// This must be called before _Jv_RunMain.=0A=
void=0A=
_Jv_SetInitialHeapSize (const char *arg)=0A=
{=0A=
  size_t size =3D parse_heap_size (arg);=0A=
  _Jv_GCSetInitialHeapSize (size);=0A=
}=0A=
=0A=
// Set the maximum heap size.  This might be ignored by the GC layer.=0A=
// This must be called before _Jv_RunMain.=0A=
void=0A=
_Jv_SetMaximumHeapSize (const char *arg)=0A=
{=0A=
  size_t size =3D parse_heap_size (arg);=0A=
  _Jv_GCSetMaximumHeapSize (size);=0A=
}=0A=
=0A=
=0C=0A=
=0A=
void *=0A=
_Jv_MallocUnchecked (jsize size)=0A=
{=0A=
  if (size =3D=3D 0)=0A=
    size =3D 1;=0A=
  return malloc ((size_t) size);=0A=
}=0A=
=0A=
void *=0A=
_Jv_Malloc (jsize size)=0A=
{=0A=
  if (size =3D=3D 0)=0A=
    size =3D 1;=0A=
  void *ptr =3D malloc ((size_t) size);=0A=
  if (ptr =3D=3D NULL)=0A=
    JvThrow (no_memory);=0A=
  return ptr;=0A=
}=0A=
=0A=
void=0A=
_Jv_Free (void* ptr)=0A=
{=0A=
  return free (ptr);=0A=
}=0A=
=0A=
=0C=0A=
=0A=
// In theory, these routines can be #ifdef'd away on machines which=0A=
// support divide overflow signals.  However, we never know if some=0A=
// code might have been compiled with "-fuse-divide-subroutine", so we=0A=
// always include them in libgcj.=0A=
=0A=
jint=0A=
_Jv_divI (jint dividend, jint divisor)=0A=
{=0A=
  if (divisor =3D=3D 0)=0A=
    _Jv_Throw (arithexception);=0A=
  =0A=
  if (dividend =3D=3D (jint) 0x80000000L && divisor =3D=3D -1)=0A=
    return dividend;=0A=
=0A=
  return dividend / divisor;=0A=
}=0A=
=0A=
jint=0A=
_Jv_remI (jint dividend, jint divisor)=0A=
{=0A=
  if (divisor =3D=3D 0)=0A=
    _Jv_Throw (arithexception);=0A=
  =0A=
  if (dividend =3D=3D (jint) 0x80000000L && divisor =3D=3D -1)=0A=
    return 0;=0A=
=0A=
  return dividend % divisor;=0A=
}=0A=
=0A=
jlong=0A=
_Jv_divJ (jlong dividend, jlong divisor)=0A=
{=0A=
  if (divisor =3D=3D 0)=0A=
    _Jv_Throw (arithexception);=0A=
  =0A=
  if (dividend =3D=3D (jlong) 0x8000000000000000LL && divisor =3D=3D -1)=0A=
    return dividend;=0A=
=0A=
  return dividend / divisor;=0A=
}=0A=
=0A=
jlong=0A=
_Jv_remJ (jlong dividend, jlong divisor)=0A=
{=0A=
  if (divisor =3D=3D 0)=0A=
    _Jv_Throw (arithexception);=0A=
  =0A=
  if (dividend =3D=3D (jlong) 0x8000000000000000LL && divisor =3D=3D -1)=0A=
    return 0;=0A=
=0A=
  return dividend % divisor;=0A=
}=0A=

------=_NextPart_000_0057_01BF809B.98CAFFB0
Content-Type: application/octet-stream;
	name="win32-signal.h"
Content-Transfer-Encoding: quoted-printable
Content-Disposition: attachment;
	filename="win32-signal.h"

// win32-signal.h - Catch runtime signals and turn them into exceptions.=0A=
=0A=
/* Copyright (C) 1998, 1999  Red Hat, Inc.
=0A=
   This file is part of libgcj.=0A=
=0A=
This software is copyrighted work licensed under the terms of the=0A=
Libgcj License.  Please consult the file "LIBGCJ_LICENSE" for=0A=
details.  */=0A=

// Exception handling is done totally differently on Win32 this stuff
// just keeps it compatible=20
=0A=
#ifndef JAVA_SIGNAL_H=0A=
#define JAVA_SIGNAL_H 1=0A=
=0A=
#define HANDLE_SEGV 1=0A=
#define HANDLE_FPE 1=0A=
=0A=
#define SIGNAL_HANDLER(_name)	\=0A=
static void _name (int _dummy)
=0A=
#define MAKE_THROW_FRAME    do {} while (0)=0A=
#define HANDLE_DIVIDE_OVERFLOW	do {} while (0)=0A=

#define INIT_SEGV						\
do								\
  {								\
    nullp =3D new java::lang::NullPointerException ();		\
  }								\
while (0)						=09
							=09

#define INIT_FPE						\
do								\
  {								\
    arithexception =3D new java::lang::ArithmeticException 	\
      (JvNewStringLatin1 ("/ by zero"));			\
  }								\
while (0)

=0A=
#endif /* JAVA_SIGNAL_H */=0A=
  =0A=

------=_NextPart_000_0057_01BF809B.98CAFFB0
Content-Type: application/octet-stream;
	name="win32-threads.cc"
Content-Transfer-Encoding: quoted-printable
Content-Disposition: attachment;
	filename="win32-threads.cc"

// win32-threads.cc - interface between libjava and Win32 threads.=0A=
=0A=
/* Copyright (C) 1998, 1999  Red Hat, Inc.
=0A=
   This file is part of libgcj.=0A=
=0A=
This software is copyrighted work licensed under the terms of the=0A=
Libgcj License.  Please consult the file "LIBGCJ_LICENSE" for=0A=
details.  */=0A=

#include <config.h>=0A=
=0A=
// If we're using the Boehm GC, then we need to override some of the=0A=
// thread primitives.  This is fairly gross.=0A=
#ifdef HAVE_BOEHM_GC=0A=
extern "C"=0A=
{=0A=
#include <boehm-config.h>=0A=
#include <gc.h>=0A=
};=0A=
#endif /* HAVE_BOEHM_GC */=0A=

#include <gcj/cni.h>=0A=
#include <jvm.h>=0A=
#include <java/lang/Thread.h>=0A=
#include <java/lang/System.h>=0A=

#include <errno.h>

#ifndef ETIMEDOUT
#define ETIMEDOUT 116
#endif

// This is used to implement thread startup.
struct starter
{
  _Jv_ThreadStartFunc *method;
  java::lang::Thread *object;
  _Jv_Thread_t *data;
};

// Controls access to the variable below
static HANDLE daemon_mutex;
static HANDLE daemon_cond;
// Number of non-daemon threads - _Jv_ThreadWait returns when this is 0
static int non_daemon_count;

// TLS key get Java object representing the thread
DWORD _Jv_ThreadKey;
// TLS key to get _Jv_Thread_t* representing the thread
DWORD _Jv_ThreadDataKey;

//
// These are the flags that can appear in _Jv_Thread_t.
//

// Thread started.
#define FLAG_START   0x01
// Thread is daemon.
#define FLAG_DAEMON  0x02

//
// Condition variables.
//

int=20
_Jv_CondWait (_Jv_ConditionVariable_t *cv, _Jv_Mutex_t *mu, jlong =
millis, jint nanos)
{
  DWORD time;
  DWORD rval;

  _Jv_MutexUnlock (mu);

  if((millis =3D=3D 0) && (nanos > 0))=20
    time =3D 1;   =20
  else if(millis =3D=3D 0)
    time =3D INFINITE;
  else
    time =3D millis;

  rval =3D WaitForSingleObject (*cv, time);
  _Jv_MutexLock (mu);

  if (rval =3D=3D WAIT_FAILED)=20
    return GetLastError ();       // FIXME: Map to errno?
  else if (rval =3D=3D WAIT_TIMEOUT)=20
    return ETIMEDOUT;
  else
    return 0;
}

//
// Mutexes.
//
=0A=
int=0A=
_Jv_MutexLock (_Jv_Mutex_t *mu)=0A=
{
  DWORD rval;=20

  // FIXME: Are Win32 mutexs recursive? Should we use critical section =
objects
  rval =3D WaitForSingleObject (*mu, INFINITE);=0A=

  if (rval =3D=3D WAIT_FAILED)=20
    return GetLastError ();       // FIXME: Map to errno?
  else if (rval =3D=3D WAIT_TIMEOUT)=20
    return ETIMEDOUT;
  else
    return 0;
}=0A=
=0A=
//
// Threads.
//
=0A=
void=0A=
_Jv_InitThreads (void)=0A=
{=0A=
  _Jv_ThreadKey =3D TlsAlloc(); =20
  _Jv_ThreadDataKey =3D TlsAlloc();
  daemon_mutex =3D CreateMutex(NULL, 0, NULL);
  daemon_cond =3D CreateEvent(NULL, 0, 0, NULL);=0A=
  non_daemon_count =3D 0;
}=0A=
=0A=
void=0A=
_Jv_ThreadInitData (_Jv_Thread_t **data, java::lang::Thread *)=0A=
{
  _Jv_Thread_t *info =3D new _Jv_Thread_t;
  info->flags =3D 0;

  // FIXME register a finalizer for INFO here.
  // FIXME also must mark INFO somehow.

  *data =3D info;=0A=
}=0A=
=0A=
void=0A=
_Jv_ThreadSetPriority (_Jv_Thread_t *data, jint prio)=0A=
{
  int actual =3D THREAD_PRIORITY_NORMAL;
=0A=
  if (data->flags & FLAG_START)
    {
      switch (prio)
        {
          case 10:
            actual =3D THREAD_PRIORITY_TIME_CRITICAL;
            break;
          case 9:
            actual =3D THREAD_PRIORITY_HIGHEST;
            break;
          case 8:
          case 7:
            actual =3D THREAD_PRIORITY_ABOVE_NORMAL;
            break;
          case 6:
          case 5:
            actual =3D THREAD_PRIORITY_NORMAL;
            break;
          case 4:
          case 3:
            actual =3D THREAD_PRIORITY_BELOW_NORMAL;
            break;
          case 2:
            actual =3D THREAD_PRIORITY_LOWEST;
            break;
          case 1:
            actual =3D THREAD_PRIORITY_IDLE;
            break;
        }
      SetThreadPriority(data->handle, actual);
    }
}=0A=

// This function is called when a thread is started.  We don't arrange
// to call the `run' method directly, because this function must
// return a value.
static DWORD __stdcall
really_start (void* x)
{
  struct starter *info =3D (struct starter *) x;

  TlsSetValue (_Jv_ThreadKey, info->object);
  TlsSetValue (_Jv_ThreadDataKey, info->data);
  info->method (info->object);

  if (! (info->data->flags & FLAG_DAEMON))
    {
      WaitForSingleObject (daemon_mutex, INFINITE);
      non_daemon_count--;
      if (! non_daemon_count)=20
          PulseEvent (daemon_cond);
      ReleaseMutex (daemon_mutex);
    }

  return 0;
}
=0A=
void=0A=
_Jv_ThreadStart (java::lang::Thread *thread, _Jv_Thread_t *data, =
_Jv_ThreadStartFunc *meth)=0A=
{
  DWORD id;
  struct starter *info;

  // Do nothing if thread has already started
  if (data->flags & FLAG_START)
    return;
  data->flags |=3D FLAG_START;
=20
  // FIXME: handle marking the info object for GC.
  info =3D (struct starter *) _Jv_AllocBytes (sizeof (struct starter));
  info->method =3D meth;
  info->object =3D thread;
  info->data =3D data;

  if (! thread->isDaemon ())
    {
      WaitForSingleObject (daemon_mutex, INFINITE);
      non_daemon_count++;
      ReleaseMutex (daemon_mutex);
    }
  else
    data->flags |=3D FLAG_DAEMON;

  HANDLE h =3D CreateThread(NULL, 0, really_start, info, 0, &id);
  _Jv_ThreadSetPriority(data, thread->getPriority());

  //if (!h)=20
    //JvThrow ();
}=0A=
=0A=
void=0A=
_Jv_ThreadWait (void)=0A=
{=0A=
  WaitForSingleObject(daemon_mutex, INFINITE);
  if(non_daemon_count)=20
      SignalObjectAndWait(daemon_mutex, daemon_cond, INFINITE, 0);
  ReleaseMutex(daemon_mutex);
}=0A=
=0A=
void=0A=
_Jv_ThreadInterrupt (_Jv_Thread_t *data)=0A=
{=0A=
  MessageBox(NULL, "Unimplemented", =
"win32-threads.cc:_Jv_ThreadInterrupt", MB_OK);
  // FIXME:
}=0A=

------=_NextPart_000_0057_01BF809B.98CAFFB0
Content-Type: application/octet-stream;
	name="win32-threads.h"
Content-Transfer-Encoding: quoted-printable
Content-Disposition: attachment;
	filename="win32-threads.h"

// -*- c++ -*-=0A=
// win32-threads.h - Defines for using Win32 threads.=0A=
=0A=
/* Copyright (C) 1998, 1999  Red Hat, Inc.
=0A=
   This file is part of libgcj.=0A=
=0A=
This software is copyrighted work licensed under the terms of the=0A=
Libgcj License.  Please consult the file "LIBGCJ_LICENSE" for=0A=
details.  */=0A=
=0A=
#ifndef __JV_WIN32_THREADS__=0A=
#define __JV_WIN32_THREADS__=0A=

#include <windows.h>

//
// Typedefs.
//

typedef HANDLE _Jv_ConditionVariable_t;
typedef HANDLE _Jv_Mutex_t;=0A=
=0A=
typedef struct=20
{
  int flags;            // Flags are defined in implementation.
  HANDLE handle;        // Actual handle to the thread=0A=
} _Jv_Thread_t;
=0A=
typedef void _Jv_ThreadStartFunc (java::lang::Thread *);=0A=

//
// Condition variables.
//
=0A=
inline void=0A=
_Jv_CondInit (_Jv_ConditionVariable_t *cv)=0A=
{
  *cv =3D CreateEvent (NULL, 0, 0, NULL);=0A=
}=0A=

inline void
_Jv_CondDestroy (_Jv_ConditionVariable_t *cv)
{
  CloseHandle (*cv);
  cv =3D NULL;
}
=0A=
int _Jv_CondWait (_Jv_ConditionVariable_t *cv, _Jv_Mutex_t *mu, jlong =
millis, jint nanos);
=0A=
inline int=0A=
_Jv_CondNotify (_Jv_ConditionVariable_t *cv, _Jv_Mutex_t *)=0A=
{
  return PulseEvent (*cv) ? 0 : GetLastError ();        // FIXME: Map =
error code?
}=0A=
=0A=
inline int=0A=
_Jv_CondNotifyAll (_Jv_ConditionVariable_t *cv, _Jv_Mutex_t *)=0A=
{
  return PulseEvent (*cv) ? 0 : GetLastError ();        // FIXME: Map =
error code?=0A=
}=0A=
=0A=
//=0A=
// Mutexes.=0A=
//=0A=

inline void=20
_Jv_MutexInit (_Jv_Mutex_t *mu)
{
  *mu =3D CreateMutex (NULL, 0, NULL);
}

inline void
_Jv_MutexDestroy (_Jv_Mutex_t *mu)
{
  CloseHandle (*mu);
  mu =3D NULL;
}
=0A=
int _Jv_MutexLock (_Jv_Mutex_t *mu);=0A=

inline int
_Jv_MutexUnlock (_Jv_Mutex_t *mu)
{
  return ReleaseMutex(*mu) ? 0 : GetLastError();        // FIXME: Map =
error code?
}
=0A=
//=0A=
// Thread creation and manipulation.=0A=
//=0A=
=0A=
void _Jv_InitThreads (void);=0A=
void _Jv_ThreadInitData (_Jv_Thread_t **data, java::lang::Thread =
*thread);=0A=
=0A=
inline java::lang::Thread *=0A=
_Jv_ThreadCurrent (void)=0A=
{
  extern DWORD _Jv_ThreadKey;
  return (java::lang::Thread *) TlsGetValue(_Jv_ThreadKey);
}=0A=

inline _Jv_Thread_t *
_Jv_ThreadCurrentData (void)
{
  extern DWORD _Jv_ThreadDataKey;
  return (_Jv_Thread_t *) TlsGetValue(_Jv_ThreadDataKey);
}
=0A=
inline void=0A=
_Jv_ThreadYield (void)=0A=
{
  Sleep (0);=0A=
}=0A=
=0A=
void _Jv_ThreadSetPriority (_Jv_Thread_t *data, jint prio);=0A=
void _Jv_ThreadStart (java::lang::Thread *thread, _Jv_Thread_t *data, =
_Jv_ThreadStartFunc *meth);=0A=
void _Jv_ThreadWait (void);=0A=
void _Jv_ThreadInterrupt (_Jv_Thread_t *data);=0A=

// Remove defines from <windows.h> that conflict with various things in =
libgcj code

#undef TRUE
#undef FALSE
#undef MAX_PRIORITY
#undef MIN_PRIORITY
#undef min
#undef max
#undef interface
#undef STRICT
#undef VOID
=0A=
#endif /* __JV_WIN32_THREADS__ */=0A=

------=_NextPart_000_0057_01BF809B.98CAFFB0--

From java-patches-return-519-listarch-java-patches=sourceware.cygnus.com@sourceware.cygnus.com Sat Feb 26 21:13:03 2000
Return-Path: <java-patches-return-519-listarch-java-patches=sourceware.cygnus.com@sourceware.cygnus.com>
Delivered-To: listarch-java-patches@sourceware.cygnus.com
Received: (qmail 25547 invoked by alias); 26 Feb 2000 21:13:03 -0000
Mailing-List: contact java-patches-help@sourceware.cygnus.com; run by ezmlm
Precedence: bulk
List-Subscribe: <mailto:java-patches-subscribe@sourceware.cygnus.com>
List-Archive: <http://sourceware.cygnus.com/ml/java-patches/>
List-Post: <mailto:java-patches@sourceware.cygnus.com>
List-Help: <mailto:java-patches-help@sourceware.cygnus.com>, <http://sourceware.cygnus.com/ml/#faqs>
Sender: java-patches-owner@sourceware.cygnus.com
Delivered-To: mailing list java-patches@sourceware.cygnus.com
Received: (qmail 25522 invoked from network); 26 Feb 2000 21:13:02 -0000
Date: Sat, 26 Feb 2000 13:13:01 -0800
Message-Id: <200002262113.NAA29362@hoser.cygnus.com>
X-Authentication-Warning: hoser.cygnus.com: green set sender to green@cygnus.com using -f
From: Anthony Green <green@cygnus.com>
To: java-patches@sourceware.cygnus.com
Subject: Cleanup patches
X-Organization: Red Hat, Sunnyvale, California
X-URL: http://www.cygnus.com/~green
Reply-to: green@redhat.com


I'm committing the following little cleanups and minor bug fix...

2000-02-26  Anthony Green  <green@cygnus.com>

	* gnu/gcj/io/MimeTypes.java: Test for null.

	* jni.cc (_Jv_JNI_AttachCurrentThread): Minor cleanup.
	(JNI_GetCreatedJavaVMs): Remove compiler warning.

	* java/net/URLConnection.java: Update copyright notice.

Index: jni.cc
===================================================================
RCS file: /cvs/java/libgcj/libjava/jni.cc,v
retrieving revision 1.22
diff -2 -u -r1.22 jni.cc
--- jni.cc	2000/02/25 23:49:34	1.22
+++ jni.cc	2000/02/26 21:09:08
@@ -1546,6 +1546,5 @@
   if (_Jv_ThreadCurrent () == NULL)
     {
-      java::lang::Thread *t = new gnu::gcj::jni::NativeThread (group, name);
-      t = t;			// Avoid compiler warning.  Eww.
+      (void) new gnu::gcj::jni::NativeThread (group, name);
     }
   _Jv_SetCurrentJNIEnv (env);
@@ -1708,5 +1707,5 @@
 
 jint
-JNI_GetCreatedJavaVMs (JavaVM **vm_buffer, jsize buf_len, jsize *n_vms)
+JNI_GetCreatedJavaVMs (JavaVM **vm_buffer, jsize /* buf_len */, jsize *n_vms)
 {
   JvAssert (buf_len > 0);
Index: gnu/gcj/io/MimeTypes.java
===================================================================
RCS file: /cvs/java/libgcj/libjava/gnu/gcj/io/MimeTypes.java,v
retrieving revision 1.1
diff -2 -u -r1.1 MimeTypes.java
--- MimeTypes.java	2000/02/21 05:54:29	1.1
+++ MimeTypes.java	2000/02/26 21:09:09
@@ -37,5 +37,5 @@
 		    // Read the next extension
 		    String e = tokenizer.nextToken ();
-		    if (! e.startsWith ("#"))
+		    if ((e != null) && (! e.startsWith ("#")))
 		      table.put (e, t);
 		    else
Index: java/net/URLConnection.java
===================================================================
RCS file: /cvs/java/libgcj/libjava/java/net/URLConnection.java,v
retrieving revision 1.4
diff -2 -u -r1.4 URLConnection.java
--- URLConnection.java	2000/02/25 22:38:33	1.4
+++ URLConnection.java	2000/02/26 21:09:12
@@ -2,5 +2,5 @@
 //			an application and a URL.
 
-/* Copyright (C) 1999  Red Hat, Inc.
+/* Copyright (C) 1999, 2000  Red Hat, Inc.
 
    This file is part of libgcj.

AG

-- 
Anthony Green                                                        Red Hat
                                                       Sunnyvale, California

From java-patches-return-520-listarch-java-patches=sourceware.cygnus.com@sourceware.cygnus.com Sat Feb 26 22:19:49 2000
Return-Path: <java-patches-return-520-listarch-java-patches=sourceware.cygnus.com@sourceware.cygnus.com>
Delivered-To: listarch-java-patches@sourceware.cygnus.com
Received: (qmail 1225 invoked by alias); 26 Feb 2000 22:19:49 -0000
Mailing-List: contact java-patches-help@sourceware.cygnus.com; run by ezmlm
Precedence: bulk
List-Subscribe: <mailto:java-patches-subscribe@sourceware.cygnus.com>
List-Archive: <http://sourceware.cygnus.com/ml/java-patches/>
List-Post: <mailto:java-patches@sourceware.cygnus.com>
List-Help: <mailto:java-patches-help@sourceware.cygnus.com>, <http://sourceware.cygnus.com/ml/#faqs>
Sender: java-patches-owner@sourceware.cygnus.com
Delivered-To: mailing list java-patches@sourceware.cygnus.com
Received: (qmail 1200 invoked from network); 26 Feb 2000 22:19:48 -0000
Date: Sat, 26 Feb 2000 14:19:48 -0800 (PST)
Message-Id: <200002262219.OAA28319@ferrule.cygnus.com>
From: Tom Tromey <tromey@cygnus.com>
To: "Jon Beniston" <jb7216@bristol.ac.uk>
Cc: <java-patches@sourceware.cygnus.com>
Subject: Re: Win32 bits and bobs
In-Reply-To: <005a01bf809b$999331b0$010010ac@brookfield.net>
References: <005a01bf809b$999331b0$010010ac@brookfield.net>
X-Zippy:  Place me on a BUFFER counter while you BELITTLE several BELLHOPS
 in the Trianon Room!!  Let me one of your SUBSIDIARIES!
X-Attribution:  Tom

>>>>> "Jon" == Jon Beniston <jb7216@bristol.ac.uk> writes:

Jon> Here's most of the code required for Win32 compatibility.

This is really great.
I'll look at these patches early next week.

Tom

From java-patches-return-521-listarch-java-patches=sourceware.cygnus.com@sourceware.cygnus.com Sat Feb 26 22:22:07 2000
Return-Path: <java-patches-return-521-listarch-java-patches=sourceware.cygnus.com@sourceware.cygnus.com>
Delivered-To: listarch-java-patches@sourceware.cygnus.com
Received: (qmail 1857 invoked by alias); 26 Feb 2000 22:22:06 -0000
Mailing-List: contact java-patches-help@sourceware.cygnus.com; run by ezmlm
Precedence: bulk
List-Subscribe: <mailto:java-patches-subscribe@sourceware.cygnus.com>
List-Archive: <http://sourceware.cygnus.com/ml/java-patches/>
List-Post: <mailto:java-patches@sourceware.cygnus.com>
List-Help: <mailto:java-patches-help@sourceware.cygnus.com>, <http://sourceware.cygnus.com/ml/#faqs>
Sender: java-patches-owner@sourceware.cygnus.com
Delivered-To: mailing list java-patches@sourceware.cygnus.com
Received: (qmail 1832 invoked from network); 26 Feb 2000 22:22:06 -0000
Date: Sat, 26 Feb 2000 14:22:06 -0800 (PST)
Message-Id: <200002262222.OAA28325@ferrule.cygnus.com>
From: Tom Tromey <tromey@cygnus.com>
To: green@redhat.com
Cc: java-patches@sourceware.cygnus.com
Subject: Re: Cleanup patches
In-Reply-To: <200002262113.NAA29362@hoser.cygnus.com>
References: <200002262113.NAA29362@hoser.cygnus.com>
X-Zippy:  I'm having BEAUTIFUL THOUGHTS about the INSIPID WIVES
 of smug and wealthy CORPORATE LAWYERS..
X-Attribution:  Tom

Anthony> 	* jni.cc (_Jv_JNI_AttachCurrentThread): Minor cleanup.

Thanks.  I don't know why I didn't think of that...

Anthony> 	(JNI_GetCreatedJavaVMs): Remove compiler warning.

This one is wrong if assertions are enabled.
Maybe we could just use __attribute__((unused))

Tom

From java-patches-return-522-listarch-java-patches=sourceware.cygnus.com@sourceware.cygnus.com Sat Feb 26 22:28:30 2000
Return-Path: <java-patches-return-522-listarch-java-patches=sourceware.cygnus.com@sourceware.cygnus.com>
Delivered-To: listarch-java-patches@sourceware.cygnus.com
Received: (qmail 3553 invoked by alias); 26 Feb 2000 22:28:30 -0000
Mailing-List: contact java-patches-help@sourceware.cygnus.com; run by ezmlm
Precedence: bulk
List-Subscribe: <mailto:java-patches-subscribe@sourceware.cygnus.com>
List-Archive: <http://sourceware.cygnus.com/ml/java-patches/>
List-Post: <mailto:java-patches@sourceware.cygnus.com>
List-Help: <mailto:java-patches-help@sourceware.cygnus.com>, <http://sourceware.cygnus.com/ml/#faqs>
Sender: java-patches-owner@sourceware.cygnus.com
Delivered-To: mailing list java-patches@sourceware.cygnus.com
Received: (qmail 3528 invoked from network); 26 Feb 2000 22:28:29 -0000
Date: Sat, 26 Feb 2000 14:28:28 -0800 (PST)
Message-Id: <200002262228.OAA28343@ferrule.cygnus.com>
From: Tom Tromey <tromey@cygnus.com>
To: "Jon Beniston" <jb7216@bristol.ac.uk>
Cc: <java-patches@sourceware.cygnus.com>
Subject: Re: Win32 bits and bobs
In-Reply-To: <005a01bf809b$999331b0$010010ac@brookfield.net>
References: <005a01bf809b$999331b0$010010ac@brookfield.net>
X-Zippy:  Gee, I feel kind of LIGHT in the head now, knowing I can't make
 my satellite dish PAYMENTS!
X-Attribution:  Tom

Jon --

Could you write a ChangeLog entry describing your changes?  That would
be really helpful (it is a pain to write ChangeLog entries for changes
I didn't write myself, since I don't always know the clearest thing to
write).  I can point you at docs describing how ChangeLog entries
should be written if you want.

Tom

From java-patches-return-523-listarch-java-patches=sourceware.cygnus.com@sourceware.cygnus.com Sun Feb 27 10:40:52 2000
Return-Path: <java-patches-return-523-listarch-java-patches=sourceware.cygnus.com@sourceware.cygnus.com>
Delivered-To: listarch-java-patches@sourceware.cygnus.com
Received: (qmail 23975 invoked by alias); 27 Feb 2000 10:40:50 -0000
Mailing-List: contact java-patches-help@sourceware.cygnus.com; run by ezmlm
Precedence: bulk
List-Subscribe: <mailto:java-patches-subscribe@sourceware.cygnus.com>
List-Archive: <http://sourceware.cygnus.com/ml/java-patches/>
List-Post: <mailto:java-patches@sourceware.cygnus.com>
List-Help: <mailto:java-patches-help@sourceware.cygnus.com>, <http://sourceware.cygnus.com/ml/#faqs>
Sender: java-patches-owner@sourceware.cygnus.com
Delivered-To: mailing list java-patches@sourceware.cygnus.com
Received: (qmail 23954 invoked from network); 27 Feb 2000 10:40:45 -0000
Message-ID: <38B8FF46.B91B550F@albatross.co.nz>
Date: Sun, 27 Feb 2000 23:41:10 +1300
From: Bryce McKinlay <bryce@albatross.co.nz>
X-Mailer: Mozilla 4.7 [en] (X11; I; Linux 2.2.14 i686)
X-Accept-Language: en
MIME-Version: 1.0
To: java-patches@sourceware.cygnus.com
Subject: Patch: java.io.File StringOutOfBoundsException
Content-Type: multipart/mixed;
 boundary="------------23BEB947367962A70869C424"

This is a multi-part message in MIME format.
--------------23BEB947367962A70869C424
Content-Type: text/plain; charset=us-ascii
Content-Transfer-Encoding: 7bit

The (String, String) constructor to java.io.File would throw a
StringIndexOutOfBoundsException if the empty string was passed as the
first argument.

I'm commiting this trivial patch.

  [ bryce ]

2000-02-27  Bryce McKinlay  <bryce@albatross.co.nz>

       * java/io/File.java (File(String, String)): For dirPath, treat an

       empty String the same as `null'.



--------------23BEB947367962A70869C424
Content-Type: text/plain; charset=us-ascii;
 name="File.patch"
Content-Transfer-Encoding: 7bit
Content-Disposition: inline;
 filename="File.patch"

Index: java/io/File.java
===================================================================
RCS file: /cvs/java/libgcj/libjava/java/io/File.java,v
retrieving revision 1.7
diff -u -r1.7 File.java
--- File.java	2000/02/12 20:13:42	1.7
+++ File.java	2000/02/27 10:40:08
@@ -79,7 +79,7 @@
   {
     if (name == null)
       throw new NullPointerException ();
-    if (dirPath != null)
+    if (dirPath != null && dirPath.length() > 0)
       {
 	// Try to be smart about the number of separator characters.
 	if (dirPath.charAt(dirPath.length() - 1) == separatorChar)

--------------23BEB947367962A70869C424--

From java-patches-return-524-listarch-java-patches=sourceware.cygnus.com@sourceware.cygnus.com Sun Feb 27 17:51:52 2000
Return-Path: <java-patches-return-524-listarch-java-patches=sourceware.cygnus.com@sourceware.cygnus.com>
Delivered-To: listarch-java-patches@sourceware.cygnus.com
Received: (qmail 10954 invoked by alias); 27 Feb 2000 17:51:52 -0000
Mailing-List: contact java-patches-help@sourceware.cygnus.com; run by ezmlm
Precedence: bulk
List-Subscribe: <mailto:java-patches-subscribe@sourceware.cygnus.com>
List-Archive: <http://sourceware.cygnus.com/ml/java-patches/>
List-Post: <mailto:java-patches@sourceware.cygnus.com>
List-Help: <mailto:java-patches-help@sourceware.cygnus.com>, <http://sourceware.cygnus.com/ml/#faqs>
Sender: java-patches-owner@sourceware.cygnus.com
Delivered-To: mailing list java-patches@sourceware.cygnus.com
Received: (qmail 10932 invoked from network); 27 Feb 2000 17:51:50 -0000
Message-ID: <38B96571.CC5927D3@sigma6.com>
Date: Sun, 27 Feb 2000 12:57:05 -0500
From: Jeff Sturm <jsturm@sigma6.com>
Organization: AppNet Inc.
X-Mailer: Mozilla 4.7 [en] (X11; I; Linux 2.2.14 alpha)
X-Accept-Language: en
MIME-Version: 1.0
To: Jon Beniston <jb7216@bristol.ac.uk>
CC: java-patches@sourceware.cygnus.com
Subject: Re: Win32 bits and bobs
References: <005a01bf809b$999331b0$010010ac@brookfield.net>
Content-Type: multipart/mixed;
 boundary="------------D5522ABE42206134BC6882A4"

This is a multi-part message in MIME format.
--------------D5522ABE42206134BC6882A4
Content-Type: text/plain; charset=us-ascii
Content-Transfer-Encoding: 7bit

Jon Beniston wrote:
> Here's most of the code required for Win32 compatibility. Two #defines are
> used: USE_WINSOCK which enables networking and USE_WIN32_SIGNALLING which
> enables run-time exception handling. There's one major problem and that is
> to do with the std io streams. This will require some changes to
> FileDescriptor.java as discussed a while ago, but I haven't got around to
> implementing.

Great!  I'll try to build this Monday and see what happens.

I merged your files into my workspace (stripping CR's) and generated
unified diffs suitable for patching (attached to this message).

(I don't see anything for java.lang.Process; I assume this isn't yet
working?)

--
Jeff Sturm
jsturm@sigma6.com
--------------D5522ABE42206134BC6882A4
Content-Type: text/plain; charset=us-ascii;
 name="jon.patch"
Content-Transfer-Encoding: 7bit
Content-Disposition: inline;
 filename="jon.patch"

diff -urN libjava/exception.cc libjava.win32/exception.cc
--- libjava/exception.cc	Sun Feb 27 12:30:49 2000
+++ libjava.win32/exception.cc	Sun Feb 27 12:07:51 2000
@@ -37,7 +37,7 @@
 extern "C" void __sjthrow () __attribute__ ((__noreturn__));
 extern "C" short __get_eh_table_version (void *table);
 extern "C" short __get_eh_table_language (void *table);
-
+extern "C" void *__get_eh_context ();
 
 extern "C" void *
 _Jv_type_matcher (java_eh_info *info, void* match_info, 
@@ -161,3 +161,36 @@
   __throw ();
 #endif
 }
+
+#ifdef USE_WIN32_SIGNALLING
+
+// This is a mangled version of _Jv_Throw and __sjthrow except
+// rather than calling longjmp, it returns a pointer to the jmp buffer
+
+extern "C" int *
+win32_get_restart_frame (void *value)
+{
+  struct eh_context *eh = (struct eh_context *)__get_eh_context ();
+  void ***dhc = &eh->dynamic_handler_chain;
+ 
+  java_eh_info *ehinfo = *(__get_eh_info ());
+  if (ehinfo == NULL)
+    {
+      _Jv_eh_alloc ();
+      ehinfo = *(__get_eh_info ());
+    }
+  ehinfo->eh_info.match_function = (__eh_matcher) _Jv_type_matcher;
+  ehinfo->eh_info.language = EH_LANG_Java;
+  ehinfo->eh_info.version = 1;
+  ehinfo->value = value;
+
+  // FIXME: Run clean ups?
+
+  int *jmpbuf = (int*)&(*dhc)[2];
+
+  *dhc = (void**)(*dhc)[0];
+
+  return  jmpbuf;
+}
+
+#endif /* USE_WIN32_SIGNALLING */
diff -urN libjava/include/win32-signal.h libjava.win32/include/win32-signal.h
--- libjava/include/win32-signal.h	Wed Dec 31 19:00:00 1969
+++ libjava.win32/include/win32-signal.h	Sun Feb 27 12:21:07 2000
@@ -0,0 +1,43 @@
+// win32-signal.h - Catch runtime signals and turn them into exceptions.
+
+/* Copyright (C) 1998, 1999  Red Hat, Inc.
+
+   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.  */
+
+// Exception handling is done totally differently on Win32 this stuff
+// just keeps it compatible
+
+#ifndef JAVA_SIGNAL_H
+#define JAVA_SIGNAL_H 1
+
+#define HANDLE_SEGV 1
+#define HANDLE_FPE 1
+
+#define SIGNAL_HANDLER(_name)	\
+static void _name (int _dummy)
+
+#define MAKE_THROW_FRAME    do {} while (0)
+#define HANDLE_DIVIDE_OVERFLOW	do {} while (0)
+
+#define INIT_SEGV						\
+do								\
+  {								\
+    nullp = new java::lang::NullPointerException ();		\
+  }								\
+while (0)
+
+
+#define INIT_FPE						\
+do								\
+  {								\
+    arithexception = new java::lang::ArithmeticException 	\
+      (JvNewStringLatin1 ("/ by zero"));			\
+  }								\
+while (0)
+
+
+#endif /* JAVA_SIGNAL_H */
diff -urN libjava/include/win32-threads.h libjava.win32/include/win32-threads.h
--- libjava/include/win32-threads.h	Wed Dec 31 19:00:00 1969
+++ libjava.win32/include/win32-threads.h	Sun Feb 27 12:21:19 2000
@@ -0,0 +1,132 @@
+// -*- c++ -*-
+// win32-threads.h - Defines for using Win32 threads.
+
+/* Copyright (C) 1998, 1999  Red Hat, Inc.
+
+   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.  */
+
+#ifndef __JV_WIN32_THREADS__
+#define __JV_WIN32_THREADS__
+
+#include <windows.h>
+
+//
+// Typedefs.
+//
+
+typedef HANDLE _Jv_ConditionVariable_t;
+typedef HANDLE _Jv_Mutex_t;
+
+typedef struct
+{
+  int flags;            // Flags are defined in implementation.
+  HANDLE handle;        // Actual handle to the thread
+} _Jv_Thread_t;
+
+typedef void _Jv_ThreadStartFunc (java::lang::Thread *);
+
+//
+// Condition variables.
+//
+
+inline void
+_Jv_CondInit (_Jv_ConditionVariable_t *cv)
+{
+  *cv = CreateEvent (NULL, 0, 0, NULL);
+}
+
+inline void
+_Jv_CondDestroy (_Jv_ConditionVariable_t *cv)
+{
+  CloseHandle (*cv);
+  cv = NULL;
+}
+
+int _Jv_CondWait (_Jv_ConditionVariable_t *cv, _Jv_Mutex_t *mu, jlong millis, jint nanos);
+
+inline int
+_Jv_CondNotify (_Jv_ConditionVariable_t *cv, _Jv_Mutex_t *)
+{
+  return PulseEvent (*cv) ? 0 : GetLastError ();        // FIXME: Map error code?
+}
+
+inline int
+_Jv_CondNotifyAll (_Jv_ConditionVariable_t *cv, _Jv_Mutex_t *)
+{
+  return PulseEvent (*cv) ? 0 : GetLastError ();        // FIXME: Map error code?
+}
+
+//
+// Mutexes.
+//
+
+inline void
+_Jv_MutexInit (_Jv_Mutex_t *mu)
+{
+  *mu = CreateMutex (NULL, 0, NULL);
+}
+
+inline void
+_Jv_MutexDestroy (_Jv_Mutex_t *mu)
+{
+  CloseHandle (*mu);
+  mu = NULL;
+}
+
+int _Jv_MutexLock (_Jv_Mutex_t *mu);
+
+inline int
+_Jv_MutexUnlock (_Jv_Mutex_t *mu)
+{
+  return ReleaseMutex(*mu) ? 0 : GetLastError();        // FIXME: Map error code?
+}
+
+//
+// Thread creation and manipulation.
+//
+
+void _Jv_InitThreads (void);
+void _Jv_ThreadInitData (_Jv_Thread_t **data, java::lang::Thread *thread);
+
+inline java::lang::Thread *
+_Jv_ThreadCurrent (void)
+{
+  extern DWORD _Jv_ThreadKey;
+  return (java::lang::Thread *) TlsGetValue(_Jv_ThreadKey);
+}
+
+inline _Jv_Thread_t *
+_Jv_ThreadCurrentData (void)
+{
+  extern DWORD _Jv_ThreadDataKey;
+  return (_Jv_Thread_t *) TlsGetValue(_Jv_ThreadDataKey);
+}
+
+inline void
+_Jv_ThreadYield (void)
+{
+  Sleep (0);
+}
+
+void _Jv_ThreadSetPriority (_Jv_Thread_t *data, jint prio);
+void _Jv_ThreadStart (java::lang::Thread *thread, _Jv_Thread_t *data, _Jv_ThreadStartFunc *meth);
+void _Jv_ThreadWait (void);
+void _Jv_ThreadInterrupt (_Jv_Thread_t *data);
+
+// Remove defines from <windows.h> that conflict with various things in libgcj code
+
+#undef TRUE
+#undef FALSE
+#undef MAX_PRIORITY
+#undef MIN_PRIORITY
+#undef min
+#undef max
+#undef interface
+#undef STRICT
+#undef VOID
+
+#endif /* __JV_WIN32_THREADS__ */
diff -urN libjava/java/io/natFileDescriptorWin32.cc libjava.win32/java/io/natFileDescriptorWin32.cc
--- libjava/java/io/natFileDescriptorWin32.cc	Wed Dec 31 19:00:00 1969
+++ libjava.win32/java/io/natFileDescriptorWin32.cc	Sun Feb 27 12:23:56 2000
@@ -0,0 +1,250 @@
+// natFileDescriptorWin32.cc - Native part of FileDescriptor class.
+
+/* Copyright (C) 1998, 1999, 2000  Red Hat, Inc.
+
+   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.  */
+
+// FIXME: In order to support interrupting of IO operations, we
+// need to change to use the windows asynchronous IO functions
+
+#include <config.h>
+
+#include <stdio.h>
+#include <string.h>
+
+#include <windows.h>
+
+#include <gcj/cni.h>
+#include <jvm.h>
+#include <java/io/FileDescriptor.h>
+#include <java/io/SyncFailedException.h>
+#include <java/io/IOException.h>
+#include <java/io/InterruptedIOException.h>
+#include <java/io/EOFException.h>
+#include <java/lang/ArrayIndexOutOfBoundsException.h>
+#include <java/lang/NullPointerException.h>
+#include <java/lang/String.h>
+#include <java/lang/Thread.h>
+#include <java/io/FileNotFoundException.h>
+
+char *
+winerr (void)
+{
+  static LPVOID last = NULL;
+  LPVOID old = NULL;
+
+  if (last)
+    old = last;
+
+  FormatMessage (FORMAT_MESSAGE_ALLOCATE_BUFFER |
+    FORMAT_MESSAGE_FROM_SYSTEM |
+    FORMAT_MESSAGE_IGNORE_INSERTS,
+    NULL,
+    GetLastError(),
+    MAKELANGID(LANG_NEUTRAL, SUBLANG_DEFAULT),
+    (LPTSTR) &last,
+    0,
+    NULL);
+
+  if (old)
+    LocalFree (old);
+
+  return (char *)last;
+}
+
+jboolean
+java::io::FileDescriptor::valid (void) {
+  BY_HANDLE_FILE_INFORMATION info;
+  return GetFileInformationByHandle ((HANDLE)fd, &info) != 0;
+}
+
+void
+java::io::FileDescriptor::sync (void) {
+  if (! FlushFileBuffers ((HANDLE)fd))
+    JvThrow (new SyncFailedException (JvNewStringLatin1 (winerr ())));
+}
+
+jint
+java::io::FileDescriptor::open (jstring path, jint jflags) {
+
+  HANDLE handle = NULL;
+  DWORD access = 0;
+  DWORD share = FILE_SHARE_READ;
+  DWORD create = OPEN_EXISTING;
+  char buf[MAX_PATH] = "";
+
+  jsize total = JvGetStringUTFRegion(path, 0, path->length(), buf);
+  buf[total] = '\0';
+
+  JvAssert((jflags & READ) || (jflags & WRITE));
+
+  if ((jflags & READ) && (jflags & WRITE))
+    {
+      access = GENERIC_READ | GENERIC_WRITE;
+      share = 0;
+      if (jflags & APPEND)
+	create = OPEN_ALWAYS;
+      else
+	create = CREATE_ALWAYS;
+    }
+  else if(jflags & READ)
+    access = GENERIC_READ;
+  else
+    {
+      access = GENERIC_WRITE;
+      share = 0;
+      if (jflags & APPEND)
+	create = OPEN_ALWAYS;
+      else
+        create = CREATE_ALWAYS;
+    }
+
+  handle = CreateFile(buf, access, share, NULL, create, 0, NULL);
+
+  if (handle == INVALID_HANDLE_VALUE)
+    {
+      char msg[MAX_PATH + 1000];
+      sprintf (msg, "%s: %s", buf, winerr ());
+      JvThrow (new FileNotFoundException (JvNewStringLatin1 (msg)));
+    }
+
+  return (jint)handle;
+}
+
+void
+java::io::FileDescriptor::write (jint b)
+{
+  DWORD bytesWritten;
+  jbyte buf = (jbyte)b;
+
+  if (WriteFile ((HANDLE)fd, &buf, 1, &bytesWritten, NULL))
+    {
+      if (java::lang::Thread::interrupted())
+        {
+          InterruptedIOException *iioe = new InterruptedIOException (JvNewStringLatin1 ("write interrupted"));
+          iioe->bytesTransferred = bytesWritten;
+          JvThrow (iioe);
+        }
+      if (bytesWritten != 1)
+        JvThrow (new IOException (JvNewStringLatin1 (winerr ())));
+    }
+  else
+    JvThrow (new IOException (JvNewStringLatin1 (winerr ())));
+  // FIXME: loop until bytesWritten == 1
+}
+
+void
+java::io::FileDescriptor::write(jbyteArray b, jint offset, jint len)
+{
+  if (! b)
+    JvThrow (new java::lang::NullPointerException);
+  if(offset < 0 || len < 0 || offset + len > JvGetArrayLength (b))
+    JvThrow (new java::lang::ArrayIndexOutOfBoundsException);
+
+  jbyte *buf = elements (b) + offset;
+  DWORD bytesWritten;
+  if (WriteFile ((HANDLE)fd, buf, len, &bytesWritten, NULL))
+    {
+      if (java::lang::Thread::interrupted())
+        {
+          InterruptedIOException *iioe = new InterruptedIOException (JvNewStringLatin1 ("write interrupted"));
+          iioe->bytesTransferred = bytesWritten;
+          JvThrow (iioe);
+        }
+    }
+  else
+    JvThrow(new IOException (JvNewStringLatin1 (winerr ())));
+  // FIXME: loop until bytesWritten == len
+}
+
+void
+java::io::FileDescriptor::close (void)
+{
+  HANDLE save = (HANDLE)fd;
+  fd = (jint)INVALID_HANDLE_VALUE;
+  if (! CloseHandle (save))
+    JvThrow (new IOException (JvNewStringLatin1 (winerr ())));
+}
+
+jint
+java::io::FileDescriptor::seek (jlong pos, jint whence)
+{
+  JvAssert (whence == SET || whence == CUR);
+
+  jlong len = length();
+  jlong here = getFilePointer();
+
+  if ((whence == SET && pos > len) || (whence == CUR && here + pos > len))
+    JvThrow (new EOFException);
+
+  LONG high = pos >> 32;
+  DWORD low = SetFilePointer ((HANDLE)fd, (DWORD)(0xffffffff & pos), &high, whence == SET ? FILE_BEGIN : FILE_CURRENT);
+  if ((low == 0xffffffff) && (GetLastError () != NO_ERROR))
+    JvThrow (new IOException (JvNewStringLatin1 (winerr ())));
+  return low;
+}
+
+jlong
+java::io::FileDescriptor::getFilePointer(void)
+{
+  LONG high = 0;
+  DWORD low = SetFilePointer ((HANDLE)fd, 0, &high, FILE_CURRENT);
+  if ((low == 0xffffffff) && (GetLastError() != NO_ERROR))
+    JvThrow(new IOException (JvNewStringLatin1 (winerr ())));
+  return (((jlong)high) << 32L) | (jlong)low;
+}
+
+jlong
+java::io::FileDescriptor::length(void)
+{
+  DWORD high;
+  DWORD low;
+
+  low = GetFileSize ((HANDLE)fd, &high);
+  // FIXME: Error checking
+  return (((jlong)high) << 32L) | (jlong)low;
+}
+
+jint
+java::io::FileDescriptor::read(void)
+{
+  CHAR buf;
+  DWORD read;
+
+  if (! ReadFile ((HANDLE)fd, &buf, 1, &read, NULL))
+    JvThrow (new IOException (JvNewStringLatin1 (winerr ())));
+  if (! read)
+    return -1;
+  else
+    return (jint)(buf & 0xff);
+}
+
+jint
+java::io::FileDescriptor::read(jbyteArray buffer, jint offset, jint count)
+{
+  if (! buffer)
+    JvThrow(new java::lang::NullPointerException);
+
+  jsize bsize = JvGetArrayLength (buffer);
+  if (offset < 0 || count < 0 || offset + count > bsize)
+    JvThrow (new java::lang::ArrayIndexOutOfBoundsException);
+
+  jbyte *bytes = elements (buffer) + offset;
+
+  DWORD read;
+  if (! ReadFile((HANDLE)fd, bytes, count, &read, NULL))
+    JvThrow (new IOException (JvNewStringLatin1 (winerr ())));
+
+  return (jint)read;
+}
+
+jint
+java::io::FileDescriptor::available(void)
+{
+  // FIXME:
+  return length() - getFilePointer();
+}
diff -urN libjava/java/io/natFileWin32.cc libjava.win32/java/io/natFileWin32.cc
--- libjava/java/io/natFileWin32.cc	Wed Dec 31 19:00:00 1969
+++ libjava.win32/java/io/natFileWin32.cc	Sun Feb 27 12:24:38 2000
@@ -0,0 +1,210 @@
+// natFileWin32.cc - Native part of File class.
+
+/* Copyright (C) 1998, 1999  Red Hat, Inc.
+
+   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 <config.h>
+
+#include <stdio.h>
+#include <string.h>
+
+#include <windows.h>
+
+#include <gcj/cni.h>
+#include <jvm.h>
+#include <java/io/File.h>
+#include <java/io/IOException.h>
+#include <java/util/Vector.h>
+#include <java/lang/String.h>
+#include <java/io/FilenameFilter.h>
+#include <java/lang/System.h>
+
+jboolean
+java::io::File::access (jstring canon, jint query)
+{
+  if (! canon)
+    return false;
+  char buf[MAX_PATH];
+  jsize total = JvGetStringUTFRegion (canon, 0, canon->length(), buf);
+  // FIXME?
+  buf[total] = '\0';
+
+  JvAssert (query == READ || query == WRITE || query == EXISTS);
+
+  // FIXME: Is it possible to differentiate between existing and reading?
+  // If the file exists but cannot be read because of the secuirty attributes
+  // on an NTFS disk this wont work (it reports it can be read but cant)
+  // Could we use something from the security API?
+  DWORD attributes = GetFileAttributes (buf);
+  if ((query == EXISTS) || (query == READ))
+    return (attributes == 0xffffffff) ? false : true;
+  else
+    return ((attributes != 0xffffffff) && ((attributes & FILE_ATTRIBUTE_READONLY) == 0)) ? true : false;
+}
+
+jboolean
+java::io::File::stat (jstring canon, jint query)
+{
+  if (! canon)
+    return false;
+  char buf[MAX_PATH];
+  jsize total = JvGetStringUTFRegion (canon, 0, canon->length(), buf);
+  // FIXME?
+  buf[total] = '\0';
+
+  JvAssert (query == DIRECTORY || query == ISFILE);
+
+  DWORD attributes = GetFileAttributes (buf);
+  if (attributes == 0xffffffff)
+    return false;
+
+  if (query == DIRECTORY)
+    return attributes & FILE_ATTRIBUTE_DIRECTORY ? true : false;
+  else
+    return attributes & FILE_ATTRIBUTE_DIRECTORY ? false : true;
+}
+
+jlong
+java::io::File::attr (jstring canon, jint query)
+{
+  if (! canon)
+    return false;
+  char buf[MAX_PATH];
+  jsize total = JvGetStringUTFRegion (canon, 0, canon->length(), buf);
+  // FIXME?
+  buf[total] = '\0';
+
+  JvAssert (query == MODIFIED || query == LENGTH);
+
+  WIN32_FILE_ATTRIBUTE_DATA info;
+  if (! GetFileAttributesEx(buf, GetFileExInfoStandard, &info))
+    return 0;
+
+  if (query == LENGTH)
+    return ((long long)info.nFileSizeHigh) << 32 | (unsigned long long)info.nFileSizeLow;
+  else {
+    // FIXME? This is somewhat compiler dependant (the LL constant suffix)
+    // The file time as return by windows is the number of 100-nanosecond intervals since January 1, 1601
+    return (((((long long)info.ftLastWriteTime.dwHighDateTime) << 32) | ((unsigned long long)info.ftLastWriteTime.dwLowDateTime)) - 116444736000000000LL) / 10000LL;
+  }
+}
+
+jstring
+java::io::File::getCanonicalPath (void)
+{
+  char buf[MAX_PATH], buf2[MAX_PATH];
+  jsize total = JvGetStringUTFRegion (path, 0, path->length(), buf);
+  // FIXME?
+  buf[total] = '\0';
+
+  LPTSTR unused;
+  if(!GetFullPathName(buf, MAX_PATH, buf2, &unused))
+    _Jv_Throw (new IOException (JvNewStringLatin1 ("GetFullPathName failed")));
+
+  // FIXME: what encoding to assume for file names?  This affects many
+  // calls.
+  return JvNewStringUTF(buf2);
+}
+
+jboolean
+java::io::File::isAbsolute (void)
+{
+  if (path->charAt(0) == '/' || path->charAt(0) == '\\')
+    return true;
+  if (path->length() < 3)
+    return false;
+  // Hard-code A-Za-z because Windows (I think) can't use non-ASCII
+  // letters as drive names.
+  if ((path->charAt(0) < 'a' || path->charAt(0) > 'z')
+      && (path->charAt(0) < 'A' || path->charAt(0) > 'Z'))
+    return false;
+  return (path->charAt(1) == ':'
+	  && (path->charAt(2) == '/' || path->charAt(2) == '\\'));
+}
+
+jstringArray
+java::io::File::performList (jstring canon, FilenameFilter *filter)
+{
+  if (! canon)
+    return NULL;
+  char buf[MAX_PATH];
+  jsize total = JvGetStringUTFRegion (canon, 0, canon->length(), buf);
+  // FIXME?
+  strcpy(&buf[total], "\\*.*");
+
+  WIN32_FIND_DATA data;
+  HANDLE handle = FindFirstFile (buf, &data);
+  if (handle == INVALID_HANDLE_VALUE)
+    return NULL;
+
+  java::util::Vector *vec = new java::util::Vector ();
+
+  do
+    {
+      if (strcmp (data.cFileName, ".") && strcmp (data.cFileName, ".."))
+        {
+          jstring name = JvNewStringUTF (data.cFileName);
+          if (! filter || (filter && filter->accept(this, name)))
+            vec->addElement (name);
+        }
+    }
+  while (FindNextFile (handle, &data));
+
+  if (GetLastError () != ERROR_NO_MORE_FILES)
+    return NULL;
+
+  FindClose (handle);
+
+  jobjectArray ret = JvNewObjectArray (vec->size(), canon->getClass(), NULL);
+  vec->copyInto (ret);
+  return reinterpret_cast<jstringArray> (ret);
+}
+
+jboolean
+java::io::File::performMkdir (void)
+{
+  char buf[MAX_PATH];
+  jsize total = JvGetStringUTFRegion(path, 0, path->length(), buf);
+  // FIXME?
+  buf[total] = '\0';
+
+  return (CreateDirectory(buf, NULL)) ? true : false;
+}
+
+jboolean
+java::io::File::performRenameTo (File *dest)
+{
+  char buf[MAX_PATH];
+  jsize total = JvGetStringUTFRegion(path, 0, path->length(), buf);
+  // FIXME?
+  buf[total] = '\0';
+  char buf2[MAX_PATH];
+  total = JvGetStringUTFRegion(dest->path, 0, dest->path->length(), buf2);
+  // FIXME?
+  buf2[total] = '\0';
+
+  return (MoveFile(buf, buf2)) ? true : false;
+}
+
+jboolean
+java::io::File::performDelete (jstring canon)
+{
+  char buf[MAX_PATH];
+  jsize total = JvGetStringUTFRegion(canon, 0, canon->length(), buf);
+  // FIXME?
+  buf[total] = '\0';
+
+  DWORD attributes = GetFileAttributes (buf);
+  if (attributes == 0xffffffff)
+    return false;
+
+  if (attributes & FILE_ATTRIBUTE_DIRECTORY)
+    return (RemoveDirectory (buf)) ? true : false;
+  else
+    return (DeleteFile (buf)) ? true : false;
+}
diff -urN libjava/java/net/natInetAddress.cc libjava.win32/java/net/natInetAddress.cc
--- libjava/java/net/natInetAddress.cc	Sun Feb 27 12:30:50 2000
+++ libjava.win32/java/net/natInetAddress.cc	Sun Feb 27 12:11:40 2000
@@ -14,6 +14,17 @@
 # define _REENTRANT 1
 #endif
 
+#ifdef USE_WINSOCK
+
+#include <windows.h>
+#include <winsock.h>
+
+#ifndef MAXHOSTNAMELEN
+#define MAXHOSTNAMELEN	64
+#endif /* MAXHOSTNAMELEN */
+
+#else
+
 #ifdef HAVE_UNISTD_H
 #include <unistd.h>
 #endif
@@ -34,6 +45,8 @@
 #ifdef HAVE_NETDB_H
 #include <netdb.h>
 #endif
+
+#endif /* USE_WINSOCK */
 
 #include <gcj/cni.h>
 #include <jvm.h>
diff -urN libjava/java/net/natPlainDatagramSocketImpl.cc libjava.win32/java/net/natPlainDatagramSocketImpl.cc
--- libjava/java/net/natPlainDatagramSocketImpl.cc	Sun Feb 27 12:30:50 2000
+++ libjava.win32/java/net/natPlainDatagramSocketImpl.cc	Sun Feb 27 12:12:34 2000
@@ -8,6 +8,15 @@
 
 #include <config.h>
 
+#ifdef USE_WINSOCK
+#include <windows.h>
+#include <winsock.h>
+#include <errno.h>
+#include <string.h>
+#ifndef ENOPROTOOPT
+#define ENOPROTOOPT 109
+#endif
+#else /* USE_WINSOCK */
 #ifdef HAVE_SYS_TYPES_H
 #include <sys/types.h>
 #endif
@@ -26,6 +35,7 @@
 #endif
 #include <errno.h>
 #include <string.h>
+#endif /* USE_WINSOCK */
 
 #if HAVE_BSTRING_H
 // Needed for bzero, implicitly used by FD_ZERO on IRIX 5.2 
diff -urN libjava/java/net/natPlainSocketImpl.cc libjava.win32/java/net/natPlainSocketImpl.cc
--- libjava/java/net/natPlainSocketImpl.cc	Sun Feb 27 12:30:50 2000
+++ libjava.win32/java/net/natPlainSocketImpl.cc	Sun Feb 27 12:12:59 2000
@@ -8,7 +8,17 @@
 
 #include <config.h>
 
+
 #ifndef DISABLE_JAVA_NET
+#ifdef USE_WINSOCK
+#include <windows.h>
+#include <winsock.h>
+#include <errno.h>
+#include <string.h>
+#ifndef ENOPROTOOPT
+#define ENOPROTOOPT 109
+#endif
+#else /* USE_WINSOCK */
 #include <sys/types.h>
 #include <sys/socket.h>
 #include <sys/time.h>
@@ -19,6 +29,7 @@
 #include <netinet/tcp.h>
 #include <errno.h>
 #include <string.h>
+#endif /* USE_WINSOCK */
 #endif /* DISABLE_JAVA_NET */
 
 #if HAVE_BSTRING_H
diff -urN libjava/prims.cc libjava.win32/prims.cc
--- libjava/prims.cc	Sun Feb 27 12:30:49 2000
+++ libjava.win32/prims.cc	Sun Feb 27 12:16:26 2000
@@ -10,6 +10,15 @@
 
 #include <config.h>
 
+#ifdef USE_WIN32_SIGNALLING
+#include <windows.h>
+#endif /* USE_WIN32_SIGNALLING */
+
+#ifdef USE_WINSOCK
+#undef __INSIDE_CYGWIN__
+#include <winsock.h>
+#endif /* USE_WINSOCK */
+
 #include <stdlib.h>
 #include <stdarg.h>
 #include <stdio.h>
@@ -664,6 +673,30 @@
     }
 }
 
+#ifdef USE_WIN32_SIGNALLING
+
+extern "C" int* win32_get_restart_frame (void *);
+
+LONG CALLBACK win32_exception_handler (LPEXCEPTION_POINTERS e) {
+  int* setjmp_buf;
+  if (e->ExceptionRecord->ExceptionCode == EXCEPTION_ACCESS_VIOLATION)   
+    setjmp_buf = win32_get_restart_frame (nullp);
+  else if (e->ExceptionRecord->ExceptionCode == EXCEPTION_INT_DIVIDE_BY_ZERO)
+    setjmp_buf = win32_get_restart_frame (arithexception);
+  else
+    return EXCEPTION_CONTINUE_SEARCH;
+
+  e->ContextRecord->Ebp = setjmp_buf[0];
+  // FIXME: Why does i386-signal.h increment the PC here, do we need to do it?
+  e->ContextRecord->Eip = setjmp_buf[1];
+  // FIXME: Is this the stack pointer? Do we need it?
+  e->ContextRecord->Esp = setjmp_buf[2];
+
+  return EXCEPTION_CONTINUE_EXECUTION;
+}
+
+#endif
+
 static void
 main_init ()
 {
@@ -681,12 +714,24 @@
   LTDL_SET_PRELOADED_SYMBOLS ();
 #endif
 
+#ifdef USE_WINSOCK
+  // Initialise winsock for networking
+  WSADATA data;
+  if (WSAStartup (MAKEWORD (1, 1), &data))
+      MessageBox (NULL, "Error initialising winsock library.", "Error", MB_OK | MB_ICONEXCLAMATION);
+#endif /* USE_WINSOCK */
+
+#ifdef USE_WIN32_SIGNALLING
+  // Install exception handler
+  SetUnhandledExceptionFilter (win32_exception_handler);
+#else
   // FIXME: we only want this on POSIX systems.
   struct sigaction act;
   act.sa_handler = SIG_IGN;
   sigemptyset (&act.sa_mask);
   act.sa_flags = 0;
   sigaction (SIGPIPE, &act, NULL);
+#endif /* USE_WIN32_SIGNALLING */
 
   _Jv_JNI_Init ();
 }
diff -urN libjava/win32-threads.cc libjava.win32/win32-threads.cc
--- libjava/win32-threads.cc	Wed Dec 31 19:00:00 1969
+++ libjava.win32/win32-threads.cc	Sun Feb 27 12:22:27 2000
@@ -0,0 +1,247 @@
+// win32-threads.cc - interface between libjava and Win32 threads.
+
+/* Copyright (C) 1998, 1999  Red Hat, Inc.
+
+   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 <config.h>
+
+// If we're using the Boehm GC, then we need to override some of the
+// thread primitives.  This is fairly gross.
+#ifdef HAVE_BOEHM_GC
+extern "C"
+{
+#include <boehm-config.h>
+#include <gc.h>
+};
+#endif /* HAVE_BOEHM_GC */
+
+#include <gcj/cni.h>
+#include <jvm.h>
+#include <java/lang/Thread.h>
+#include <java/lang/System.h>
+
+#include <errno.h>
+
+#ifndef ETIMEDOUT
+#define ETIMEDOUT 116
+#endif
+
+// This is used to implement thread startup.
+struct starter
+{
+  _Jv_ThreadStartFunc *method;
+  java::lang::Thread *object;
+  _Jv_Thread_t *data;
+};
+
+// Controls access to the variable below
+static HANDLE daemon_mutex;
+static HANDLE daemon_cond;
+// Number of non-daemon threads - _Jv_ThreadWait returns when this is 0
+static int non_daemon_count;
+
+// TLS key get Java object representing the thread
+DWORD _Jv_ThreadKey;
+// TLS key to get _Jv_Thread_t* representing the thread
+DWORD _Jv_ThreadDataKey;
+
+//
+// These are the flags that can appear in _Jv_Thread_t.
+//
+
+// Thread started.
+#define FLAG_START   0x01
+// Thread is daemon.
+#define FLAG_DAEMON  0x02
+
+//
+// Condition variables.
+//
+
+int
+_Jv_CondWait (_Jv_ConditionVariable_t *cv, _Jv_Mutex_t *mu, jlong millis, jint nanos)
+{
+  DWORD time;
+  DWORD rval;
+
+  _Jv_MutexUnlock (mu);
+
+  if((millis == 0) && (nanos > 0))
+    time = 1;
+  else if(millis == 0)
+    time = INFINITE;
+  else
+    time = millis;
+
+  rval = WaitForSingleObject (*cv, time);
+  _Jv_MutexLock (mu);
+
+  if (rval == WAIT_FAILED)
+    return GetLastError ();       // FIXME: Map to errno?
+  else if (rval == WAIT_TIMEOUT)
+    return ETIMEDOUT;
+  else
+    return 0;
+}
+
+//
+// Mutexes.
+//
+
+int
+_Jv_MutexLock (_Jv_Mutex_t *mu)
+{
+  DWORD rval;
+
+  // FIXME: Are Win32 mutexs recursive? Should we use critical section objects
+  rval = WaitForSingleObject (*mu, INFINITE);
+
+  if (rval == WAIT_FAILED)
+    return GetLastError ();       // FIXME: Map to errno?
+  else if (rval == WAIT_TIMEOUT)
+    return ETIMEDOUT;
+  else
+    return 0;
+}
+
+//
+// Threads.
+//
+
+void
+_Jv_InitThreads (void)
+{
+  _Jv_ThreadKey = TlsAlloc();
+  _Jv_ThreadDataKey = TlsAlloc();
+  daemon_mutex = CreateMutex(NULL, 0, NULL);
+  daemon_cond = CreateEvent(NULL, 0, 0, NULL);
+  non_daemon_count = 0;
+}
+
+void
+_Jv_ThreadInitData (_Jv_Thread_t **data, java::lang::Thread *)
+{
+  _Jv_Thread_t *info = new _Jv_Thread_t;
+  info->flags = 0;
+
+  // FIXME register a finalizer for INFO here.
+  // FIXME also must mark INFO somehow.
+
+  *data = info;
+}
+
+void
+_Jv_ThreadSetPriority (_Jv_Thread_t *data, jint prio)
+{
+  int actual = THREAD_PRIORITY_NORMAL;
+
+  if (data->flags & FLAG_START)
+    {
+      switch (prio)
+        {
+          case 10:
+            actual = THREAD_PRIORITY_TIME_CRITICAL;
+            break;
+          case 9:
+            actual = THREAD_PRIORITY_HIGHEST;
+            break;
+          case 8:
+          case 7:
+            actual = THREAD_PRIORITY_ABOVE_NORMAL;
+            break;
+          case 6:
+          case 5:
+            actual = THREAD_PRIORITY_NORMAL;
+            break;
+          case 4:
+          case 3:
+            actual = THREAD_PRIORITY_BELOW_NORMAL;
+            break;
+          case 2:
+            actual = THREAD_PRIORITY_LOWEST;
+            break;
+          case 1:
+            actual = THREAD_PRIORITY_IDLE;
+            break;
+        }
+      SetThreadPriority(data->handle, actual);
+    }
+}
+
+// This function is called when a thread is started.  We don't arrange
+// to call the `run' method directly, because this function must
+// return a value.
+static DWORD __stdcall
+really_start (void* x)
+{
+  struct starter *info = (struct starter *) x;
+
+  TlsSetValue (_Jv_ThreadKey, info->object);
+  TlsSetValue (_Jv_ThreadDataKey, info->data);
+  info->method (info->object);
+
+  if (! (info->data->flags & FLAG_DAEMON))
+    {
+      WaitForSingleObject (daemon_mutex, INFINITE);
+      non_daemon_count--;
+      if (! non_daemon_count)
+          PulseEvent (daemon_cond);
+      ReleaseMutex (daemon_mutex);
+    }
+
+  return 0;
+}
+
+void
+_Jv_ThreadStart (java::lang::Thread *thread, _Jv_Thread_t *data, _Jv_ThreadStartFunc *meth)
+{
+  DWORD id;
+  struct starter *info;
+
+  // Do nothing if thread has already started
+  if (data->flags & FLAG_START)
+    return;
+  data->flags |= FLAG_START;
+
+  // FIXME: handle marking the info object for GC.
+  info = (struct starter *) _Jv_AllocBytes (sizeof (struct starter));
+  info->method = meth;
+  info->object = thread;
+  info->data = data;
+
+  if (! thread->isDaemon ())
+    {
+      WaitForSingleObject (daemon_mutex, INFINITE);
+      non_daemon_count++;
+      ReleaseMutex (daemon_mutex);
+    }
+  else
+    data->flags |= FLAG_DAEMON;
+
+  HANDLE h = CreateThread(NULL, 0, really_start, info, 0, &id);
+  _Jv_ThreadSetPriority(data, thread->getPriority());
+
+  //if (!h)
+    //JvThrow ();
+}
+
+void
+_Jv_ThreadWait (void)
+{
+  WaitForSingleObject(daemon_mutex, INFINITE);
+  if(non_daemon_count)
+      SignalObjectAndWait(daemon_mutex, daemon_cond, INFINITE, 0);
+  ReleaseMutex(daemon_mutex);
+}
+
+void
+_Jv_ThreadInterrupt (_Jv_Thread_t *data)
+{
+  MessageBox(NULL, "Unimplemented", "win32-threads.cc:_Jv_ThreadInterrupt", MB_OK);
+  // FIXME:
+}

--------------D5522ABE42206134BC6882A4--

From java-patches-return-525-listarch-java-patches=sourceware.cygnus.com@sourceware.cygnus.com Sun Feb 27 20:27:07 2000
Return-Path: <java-patches-return-525-listarch-java-patches=sourceware.cygnus.com@sourceware.cygnus.com>
Delivered-To: listarch-java-patches@sourceware.cygnus.com
Received: (qmail 26396 invoked by alias); 27 Feb 2000 20:27:07 -0000
Mailing-List: contact java-patches-help@sourceware.cygnus.com; run by ezmlm
Precedence: bulk
List-Subscribe: <mailto:java-patches-subscribe@sourceware.cygnus.com>
List-Archive: <http://sourceware.cygnus.com/ml/java-patches/>
List-Post: <mailto:java-patches@sourceware.cygnus.com>
List-Help: <mailto:java-patches-help@sourceware.cygnus.com>, <http://sourceware.cygnus.com/ml/#faqs>
Sender: java-patches-owner@sourceware.cygnus.com
Delivered-To: mailing list java-patches@sourceware.cygnus.com
Received: (qmail 26377 invoked from network); 27 Feb 2000 20:27:03 -0000
Message-ID: <006301bf8161$3cc75350$010010ac@brookfield.net>
From: "Jon Beniston" <jb7216@bristol.ac.uk>
To: "Jeff Sturm" <jsturm@sigma6.com>
Cc: <java-patches@sourceware.cygnus.com>
References: <005a01bf809b$999331b0$010010ac@brookfield.net> <38B96571.CC5927D3@sigma6.com>
Subject: Re: Win32 bits and bobs
Date: Sun, 27 Feb 2000 20:28:38 -0000
MIME-Version: 1.0
Content-Type: text/plain;
	charset="iso-8859-1"
Content-Transfer-Encoding: 7bit
X-Priority: 3
X-MSMail-Priority: Normal
X-Mailer: Microsoft Outlook Express 5.00.2314.1300
X-MimeOLE: Produced By Microsoft MimeOLE V5.00.2314.1300


----- Original Message -----
From: Jeff Sturm <jsturm@sigma6.com>
To: Jon Beniston <jb7216@bristol.ac.uk>
Cc: <java-patches@sourceware.cygnus.com>
Sent: 27 February 2000 17:57
Subject: Re: Win32 bits and bobs


> Jon Beniston wrote:
> > Here's most of the code required for Win32 compatibility. Two #defines
are
> > used: USE_WINSOCK which enables networking and USE_WIN32_SIGNALLING
which
> > enables run-time exception handling. There's one major problem and that
is
> > to do with the std io streams. This will require some changes to
> > FileDescriptor.java as discussed a while ago, but I haven't got around
to
> > implementing.
>
> Great!  I'll try to build this Monday and see what happens.
>
> I merged your files into my workspace (stripping CR's) and generated
> unified diffs suitable for patching (attached to this message).
>
> (I don't see anything for java.lang.Process; I assume this isn't yet
> working?)

Yeah, there are several bits missing and it possibly wont build. There is a
need for a natProcessWin32.cc and natSystemWin32.cc, so the config gurus
might want to set that up. I really only have place holders for these at the
moment.

Jon.

>
> --
> Jeff Sturm
> jsturm@sigma6.com


----------------------------------------------------------------------------
----


> diff -urN libjava/exception.cc libjava.win32/exception.cc
> --- libjava/exception.cc Sun Feb 27 12:30:49 2000
> +++ libjava.win32/exception.cc Sun Feb 27 12:07:51 2000
> @@ -37,7 +37,7 @@
>  extern "C" void __sjthrow () __attribute__ ((__noreturn__));
>  extern "C" short __get_eh_table_version (void *table);
>  extern "C" short __get_eh_table_language (void *table);
> -
> +extern "C" void *__get_eh_context ();
>
>  extern "C" void *
>  _Jv_type_matcher (java_eh_info *info, void* match_info,
> @@ -161,3 +161,36 @@
>    __throw ();
>  #endif
>  }
> +
> +#ifdef USE_WIN32_SIGNALLING
> +
> +// This is a mangled version of _Jv_Throw and __sjthrow except
> +// rather than calling longjmp, it returns a pointer to the jmp buffer
> +
> +extern "C" int *
> +win32_get_restart_frame (void *value)
> +{
> +  struct eh_context *eh = (struct eh_context *)__get_eh_context ();
> +  void ***dhc = &eh->dynamic_handler_chain;
> +
> +  java_eh_info *ehinfo = *(__get_eh_info ());
> +  if (ehinfo == NULL)
> +    {
> +      _Jv_eh_alloc ();
> +      ehinfo = *(__get_eh_info ());
> +    }
> +  ehinfo->eh_info.match_function = (__eh_matcher) _Jv_type_matcher;
> +  ehinfo->eh_info.language = EH_LANG_Java;
> +  ehinfo->eh_info.version = 1;
> +  ehinfo->value = value;
> +
> +  // FIXME: Run clean ups?
> +
> +  int *jmpbuf = (int*)&(*dhc)[2];
> +
> +  *dhc = (void**)(*dhc)[0];
> +
> +  return  jmpbuf;
> +}
> +
> +#endif /* USE_WIN32_SIGNALLING */
> diff -urN libjava/include/win32-signal.h
libjava.win32/include/win32-signal.h
> --- libjava/include/win32-signal.h Wed Dec 31 19:00:00 1969
> +++ libjava.win32/include/win32-signal.h Sun Feb 27 12:21:07 2000
> @@ -0,0 +1,43 @@
> +// win32-signal.h - Catch runtime signals and turn them into exceptions.
> +
> +/* Copyright (C) 1998, 1999  Red Hat, Inc.
> +
> +   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.  */
> +
> +// Exception handling is done totally differently on Win32 this stuff
> +// just keeps it compatible
> +
> +#ifndef JAVA_SIGNAL_H
> +#define JAVA_SIGNAL_H 1
> +
> +#define HANDLE_SEGV 1
> +#define HANDLE_FPE 1
> +
> +#define SIGNAL_HANDLER(_name) \
> +static void _name (int _dummy)
> +
> +#define MAKE_THROW_FRAME    do {} while (0)
> +#define HANDLE_DIVIDE_OVERFLOW do {} while (0)
> +
> +#define INIT_SEGV \
> +do \
> +  { \
> +    nullp = new java::lang::NullPointerException (); \
> +  } \
> +while (0)
> +
> +
> +#define INIT_FPE \
> +do \
> +  { \
> +    arithexception = new java::lang::ArithmeticException \
> +      (JvNewStringLatin1 ("/ by zero")); \
> +  } \
> +while (0)
> +
> +
> +#endif /* JAVA_SIGNAL_H */
> diff -urN libjava/include/win32-threads.h
libjava.win32/include/win32-threads.h
> --- libjava/include/win32-threads.h Wed Dec 31 19:00:00 1969
> +++ libjava.win32/include/win32-threads.h Sun Feb 27 12:21:19 2000
> @@ -0,0 +1,132 @@
> +// -*- c++ -*-
> +// win32-threads.h - Defines for using Win32 threads.
> +
> +/* Copyright (C) 1998, 1999  Red Hat, Inc.
> +
> +   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.  */
> +
> +#ifndef __JV_WIN32_THREADS__
> +#define __JV_WIN32_THREADS__
> +
> +#include <windows.h>
> +
> +//
> +// Typedefs.
> +//
> +
> +typedef HANDLE _Jv_ConditionVariable_t;
> +typedef HANDLE _Jv_Mutex_t;
> +
> +typedef struct
> +{
> +  int flags;            // Flags are defined in implementation.
> +  HANDLE handle;        // Actual handle to the thread
> +} _Jv_Thread_t;
> +
> +typedef void _Jv_ThreadStartFunc (java::lang::Thread *);
> +
> +//
> +// Condition variables.
> +//
> +
> +inline void
> +_Jv_CondInit (_Jv_ConditionVariable_t *cv)
> +{
> +  *cv = CreateEvent (NULL, 0, 0, NULL);
> +}
> +
> +inline void
> +_Jv_CondDestroy (_Jv_ConditionVariable_t *cv)
> +{
> +  CloseHandle (*cv);
> +  cv = NULL;
> +}
> +
> +int _Jv_CondWait (_Jv_ConditionVariable_t *cv, _Jv_Mutex_t *mu, jlong
millis, jint nanos);
> +
> +inline int
> +_Jv_CondNotify (_Jv_ConditionVariable_t *cv, _Jv_Mutex_t *)
> +{
> +  return PulseEvent (*cv) ? 0 : GetLastError ();        // FIXME: Map
error code?
> +}
> +
> +inline int
> +_Jv_CondNotifyAll (_Jv_ConditionVariable_t *cv, _Jv_Mutex_t *)
> +{
> +  return PulseEvent (*cv) ? 0 : GetLastError ();        // FIXME: Map
error code?
> +}
> +
> +//
> +// Mutexes.
> +//
> +
> +inline void
> +_Jv_MutexInit (_Jv_Mutex_t *mu)
> +{
> +  *mu = CreateMutex (NULL, 0, NULL);
> +}
> +
> +inline void
> +_Jv_MutexDestroy (_Jv_Mutex_t *mu)
> +{
> +  CloseHandle (*mu);
> +  mu = NULL;
> +}
> +
> +int _Jv_MutexLock (_Jv_Mutex_t *mu);
> +
> +inline int
> +_Jv_MutexUnlock (_Jv_Mutex_t *mu)
> +{
> +  return ReleaseMutex(*mu) ? 0 : GetLastError();        // FIXME: Map
error code?
> +}
> +
> +//
> +// Thread creation and manipulation.
> +//
> +
> +void _Jv_InitThreads (void);
> +void _Jv_ThreadInitData (_Jv_Thread_t **data, java::lang::Thread
*thread);
> +
> +inline java::lang::Thread *
> +_Jv_ThreadCurrent (void)
> +{
> +  extern DWORD _Jv_ThreadKey;
> +  return (java::lang::Thread *) TlsGetValue(_Jv_ThreadKey);
> +}
> +
> +inline _Jv_Thread_t *
> +_Jv_ThreadCurrentData (void)
> +{
> +  extern DWORD _Jv_ThreadDataKey;
> +  return (_Jv_Thread_t *) TlsGetValue(_Jv_ThreadDataKey);
> +}
> +
> +inline void
> +_Jv_ThreadYield (void)
> +{
> +  Sleep (0);
> +}
> +
> +void _Jv_ThreadSetPriority (_Jv_Thread_t *data, jint prio);
> +void _Jv_ThreadStart (java::lang::Thread *thread, _Jv_Thread_t *data,
_Jv_ThreadStartFunc *meth);
> +void _Jv_ThreadWait (void);
> +void _Jv_ThreadInterrupt (_Jv_Thread_t *data);
> +
> +// Remove defines from <windows.h> that conflict with various things in
libgcj code
> +
> +#undef TRUE
> +#undef FALSE
> +#undef MAX_PRIORITY
> +#undef MIN_PRIORITY
> +#undef min
> +#undef max
> +#undef interface
> +#undef STRICT
> +#undef VOID
> +
> +#endif /* __JV_WIN32_THREADS__ */
> diff -urN libjava/java/io/natFileDescriptorWin32.cc
libjava.win32/java/io/natFileDescriptorWin32.cc
> --- libjava/java/io/natFileDescriptorWin32.cc Wed Dec 31 19:00:00 1969
> +++ libjava.win32/java/io/natFileDescriptorWin32.cc Sun Feb 27 12:23:56
2000
> @@ -0,0 +1,250 @@
> +// natFileDescriptorWin32.cc - Native part of FileDescriptor class.
> +
> +/* Copyright (C) 1998, 1999, 2000  Red Hat, Inc.
> +
> +   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.  */
> +
> +// FIXME: In order to support interrupting of IO operations, we
> +// need to change to use the windows asynchronous IO functions
> +
> +#include <config.h>
> +
> +#include <stdio.h>
> +#include <string.h>
> +
> +#include <windows.h>
> +
> +#include <gcj/cni.h>
> +#include <jvm.h>
> +#include <java/io/FileDescriptor.h>
> +#include <java/io/SyncFailedException.h>
> +#include <java/io/IOException.h>
> +#include <java/io/InterruptedIOException.h>
> +#include <java/io/EOFException.h>
> +#include <java/lang/ArrayIndexOutOfBoundsException.h>
> +#include <java/lang/NullPointerException.h>
> +#include <java/lang/String.h>
> +#include <java/lang/Thread.h>
> +#include <java/io/FileNotFoundException.h>
> +
> +char *
> +winerr (void)
> +{
> +  static LPVOID last = NULL;
> +  LPVOID old = NULL;
> +
> +  if (last)
> +    old = last;
> +
> +  FormatMessage (FORMAT_MESSAGE_ALLOCATE_BUFFER |
> +    FORMAT_MESSAGE_FROM_SYSTEM |
> +    FORMAT_MESSAGE_IGNORE_INSERTS,
> +    NULL,
> +    GetLastError(),
> +    MAKELANGID(LANG_NEUTRAL, SUBLANG_DEFAULT),
> +    (LPTSTR) &last,
> +    0,
> +    NULL);
> +
> +  if (old)
> +    LocalFree (old);
> +
> +  return (char *)last;
> +}
> +
> +jboolean
> +java::io::FileDescriptor::valid (void) {
> +  BY_HANDLE_FILE_INFORMATION info;
> +  return GetFileInformationByHandle ((HANDLE)fd, &info) != 0;
> +}
> +
> +void
> +java::io::FileDescriptor::sync (void) {
> +  if (! FlushFileBuffers ((HANDLE)fd))
> +    JvThrow (new SyncFailedException (JvNewStringLatin1 (winerr ())));
> +}
> +
> +jint
> +java::io::FileDescriptor::open (jstring path, jint jflags) {
> +
> +  HANDLE handle = NULL;
> +  DWORD access = 0;
> +  DWORD share = FILE_SHARE_READ;
> +  DWORD create = OPEN_EXISTING;
> +  char buf[MAX_PATH] = "";
> +
> +  jsize total = JvGetStringUTFRegion(path, 0, path->length(), buf);
> +  buf[total] = '\0';
> +
> +  JvAssert((jflags & READ) || (jflags & WRITE));
> +
> +  if ((jflags & READ) && (jflags & WRITE))
> +    {
> +      access = GENERIC_READ | GENERIC_WRITE;
> +      share = 0;
> +      if (jflags & APPEND)
> + create = OPEN_ALWAYS;
> +      else
> + create = CREATE_ALWAYS;
> +    }
> +  else if(jflags & READ)
> +    access = GENERIC_READ;
> +  else
> +    {
> +      access = GENERIC_WRITE;
> +      share = 0;
> +      if (jflags & APPEND)
> + create = OPEN_ALWAYS;
> +      else
> +        create = CREATE_ALWAYS;
> +    }
> +
> +  handle = CreateFile(buf, access, share, NULL, create, 0, NULL);
> +
> +  if (handle == INVALID_HANDLE_VALUE)
> +    {
> +      char msg[MAX_PATH + 1000];
> +      sprintf (msg, "%s: %s", buf, winerr ());
> +      JvThrow (new FileNotFoundException (JvNewStringLatin1 (msg)));
> +    }
> +
> +  return (jint)handle;
> +}
> +
> +void
> +java::io::FileDescriptor::write (jint b)
> +{
> +  DWORD bytesWritten;
> +  jbyte buf = (jbyte)b;
> +
> +  if (WriteFile ((HANDLE)fd, &buf, 1, &bytesWritten, NULL))
> +    {
> +      if (java::lang::Thread::interrupted())
> +        {
> +          InterruptedIOException *iioe = new InterruptedIOException
(JvNewStringLatin1 ("write interrupted"));
> +          iioe->bytesTransferred = bytesWritten;
> +          JvThrow (iioe);
> +        }
> +      if (bytesWritten != 1)
> +        JvThrow (new IOException (JvNewStringLatin1 (winerr ())));
> +    }
> +  else
> +    JvThrow (new IOException (JvNewStringLatin1 (winerr ())));
> +  // FIXME: loop until bytesWritten == 1
> +}
> +
> +void
> +java::io::FileDescriptor::write(jbyteArray b, jint offset, jint len)
> +{
> +  if (! b)
> +    JvThrow (new java::lang::NullPointerException);
> +  if(offset < 0 || len < 0 || offset + len > JvGetArrayLength (b))
> +    JvThrow (new java::lang::ArrayIndexOutOfBoundsException);
> +
> +  jbyte *buf = elements (b) + offset;
> +  DWORD bytesWritten;
> +  if (WriteFile ((HANDLE)fd, buf, len, &bytesWritten, NULL))
> +    {
> +      if (java::lang::Thread::interrupted())
> +        {
> +          InterruptedIOException *iioe = new InterruptedIOException
(JvNewStringLatin1 ("write interrupted"));
> +          iioe->bytesTransferred = bytesWritten;
> +          JvThrow (iioe);
> +        }
> +    }
> +  else
> +    JvThrow(new IOException (JvNewStringLatin1 (winerr ())));
> +  // FIXME: loop until bytesWritten == len
> +}
> +
> +void
> +java::io::FileDescriptor::close (void)
> +{
> +  HANDLE save = (HANDLE)fd;
> +  fd = (jint)INVALID_HANDLE_VALUE;
> +  if (! CloseHandle (save))
> +    JvThrow (new IOException (JvNewStringLatin1 (winerr ())));
> +}
> +
> +jint
> +java::io::FileDescriptor::seek (jlong pos, jint whence)
> +{
> +  JvAssert (whence == SET || whence == CUR);
> +
> +  jlong len = length();
> +  jlong here = getFilePointer();
> +
> +  if ((whence == SET && pos > len) || (whence == CUR && here + pos >
len))
> +    JvThrow (new EOFException);
> +
> +  LONG high = pos >> 32;
> +  DWORD low = SetFilePointer ((HANDLE)fd, (DWORD)(0xffffffff & pos),
&high, whence == SET ? FILE_BEGIN : FILE_CURRENT);
> +  if ((low == 0xffffffff) && (GetLastError () != NO_ERROR))
> +    JvThrow (new IOException (JvNewStringLatin1 (winerr ())));
> +  return low;
> +}
> +
> +jlong
> +java::io::FileDescriptor::getFilePointer(void)
> +{
> +  LONG high = 0;
> +  DWORD low = SetFilePointer ((HANDLE)fd, 0, &high, FILE_CURRENT);
> +  if ((low == 0xffffffff) && (GetLastError() != NO_ERROR))
> +    JvThrow(new IOException (JvNewStringLatin1 (winerr ())));
> +  return (((jlong)high) << 32L) | (jlong)low;
> +}
> +
> +jlong
> +java::io::FileDescriptor::length(void)
> +{
> +  DWORD high;
> +  DWORD low;
> +
> +  low = GetFileSize ((HANDLE)fd, &high);
> +  // FIXME: Error checking
> +  return (((jlong)high) << 32L) | (jlong)low;
> +}
> +
> +jint
> +java::io::FileDescriptor::read(void)
> +{
> +  CHAR buf;
> +  DWORD read;
> +
> +  if (! ReadFile ((HANDLE)fd, &buf, 1, &read, NULL))
> +    JvThrow (new IOException (JvNewStringLatin1 (winerr ())));
> +  if (! read)
> +    return -1;
> +  else
> +    return (jint)(buf & 0xff);
> +}
> +
> +jint
> +java::io::FileDescriptor::read(jbyteArray buffer, jint offset, jint
count)
> +{
> +  if (! buffer)
> +    JvThrow(new java::lang::NullPointerException);
> +
> +  jsize bsize = JvGetArrayLength (buffer);
> +  if (offset < 0 || count < 0 || offset + count > bsize)
> +    JvThrow (new java::lang::ArrayIndexOutOfBoundsException);
> +
> +  jbyte *bytes = elements (buffer) + offset;
> +
> +  DWORD read;
> +  if (! ReadFile((HANDLE)fd, bytes, count, &read, NULL))
> +    JvThrow (new IOException (JvNewStringLatin1 (winerr ())));
> +
> +  return (jint)read;
> +}
> +
> +jint
> +java::io::FileDescriptor::available(void)
> +{
> +  // FIXME:
> +  return length() - getFilePointer();
> +}
> diff -urN libjava/java/io/natFileWin32.cc
libjava.win32/java/io/natFileWin32.cc
> --- libjava/java/io/natFileWin32.cc Wed Dec 31 19:00:00 1969
> +++ libjava.win32/java/io/natFileWin32.cc Sun Feb 27 12:24:38 2000
> @@ -0,0 +1,210 @@
> +// natFileWin32.cc - Native part of File class.
> +
> +/* Copyright (C) 1998, 1999  Red Hat, Inc.
> +
> +   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 <config.h>
> +
> +#include <stdio.h>
> +#include <string.h>
> +
> +#include <windows.h>
> +
> +#include <gcj/cni.h>
> +#include <jvm.h>
> +#include <java/io/File.h>
> +#include <java/io/IOException.h>
> +#include <java/util/Vector.h>
> +#include <java/lang/String.h>
> +#include <java/io/FilenameFilter.h>
> +#include <java/lang/System.h>
> +
> +jboolean
> +java::io::File::access (jstring canon, jint query)
> +{
> +  if (! canon)
> +    return false;
> +  char buf[MAX_PATH];
> +  jsize total = JvGetStringUTFRegion (canon, 0, canon->length(), buf);
> +  // FIXME?
> +  buf[total] = '\0';
> +
> +  JvAssert (query == READ || query == WRITE || query == EXISTS);
> +
> +  // FIXME: Is it possible to differentiate between existing and reading?
> +  // If the file exists but cannot be read because of the secuirty
attributes
> +  // on an NTFS disk this wont work (it reports it can be read but cant)
> +  // Could we use something from the security API?
> +  DWORD attributes = GetFileAttributes (buf);
> +  if ((query == EXISTS) || (query == READ))
> +    return (attributes == 0xffffffff) ? false : true;
> +  else
> +    return ((attributes != 0xffffffff) && ((attributes &
FILE_ATTRIBUTE_READONLY) == 0)) ? true : false;
> +}
> +
> +jboolean
> +java::io::File::stat (jstring canon, jint query)
> +{
> +  if (! canon)
> +    return false;
> +  char buf[MAX_PATH];
> +  jsize total = JvGetStringUTFRegion (canon, 0, canon->length(), buf);
> +  // FIXME?
> +  buf[total] = '\0';
> +
> +  JvAssert (query == DIRECTORY || query == ISFILE);
> +
> +  DWORD attributes = GetFileAttributes (buf);
> +  if (attributes == 0xffffffff)
> +    return false;
> +
> +  if (query == DIRECTORY)
> +    return attributes & FILE_ATTRIBUTE_DIRECTORY ? true : false;
> +  else
> +    return attributes & FILE_ATTRIBUTE_DIRECTORY ? false : true;
> +}
> +
> +jlong
> +java::io::File::attr (jstring canon, jint query)
> +{
> +  if (! canon)
> +    return false;
> +  char buf[MAX_PATH];
> +  jsize total = JvGetStringUTFRegion (canon, 0, canon->length(), buf);
> +  // FIXME?
> +  buf[total] = '\0';
> +
> +  JvAssert (query == MODIFIED || query == LENGTH);
> +
> +  WIN32_FILE_ATTRIBUTE_DATA info;
> +  if (! GetFileAttributesEx(buf, GetFileExInfoStandard, &info))
> +    return 0;
> +
> +  if (query == LENGTH)
> +    return ((long long)info.nFileSizeHigh) << 32 | (unsigned long
long)info.nFileSizeLow;
> +  else {
> +    // FIXME? This is somewhat compiler dependant (the LL constant
suffix)
> +    // The file time as return by windows is the number of 100-nanosecond
intervals since January 1, 1601
> +    return (((((long long)info.ftLastWriteTime.dwHighDateTime) << 32) |
((unsigned long long)info.ftLastWriteTime.dwLowDateTime)) -
116444736000000000LL) / 10000LL;
> +  }
> +}
> +
> +jstring
> +java::io::File::getCanonicalPath (void)
> +{
> +  char buf[MAX_PATH], buf2[MAX_PATH];
> +  jsize total = JvGetStringUTFRegion (path, 0, path->length(), buf);
> +  // FIXME?
> +  buf[total] = '\0';
> +
> +  LPTSTR unused;
> +  if(!GetFullPathName(buf, MAX_PATH, buf2, &unused))
> +    _Jv_Throw (new IOException (JvNewStringLatin1 ("GetFullPathName
failed")));
> +
> +  // FIXME: what encoding to assume for file names?  This affects many
> +  // calls.
> +  return JvNewStringUTF(buf2);
> +}
> +
> +jboolean
> +java::io::File::isAbsolute (void)
> +{
> +  if (path->charAt(0) == '/' || path->charAt(0) == '\\')
> +    return true;
> +  if (path->length() < 3)
> +    return false;
> +  // Hard-code A-Za-z because Windows (I think) can't use non-ASCII
> +  // letters as drive names.
> +  if ((path->charAt(0) < 'a' || path->charAt(0) > 'z')
> +      && (path->charAt(0) < 'A' || path->charAt(0) > 'Z'))
> +    return false;
> +  return (path->charAt(1) == ':'
> +   && (path->charAt(2) == '/' || path->charAt(2) == '\\'));
> +}
> +
> +jstringArray
> +java::io::File::performList (jstring canon, FilenameFilter *filter)
> +{
> +  if (! canon)
> +    return NULL;
> +  char buf[MAX_PATH];
> +  jsize total = JvGetStringUTFRegion (canon, 0, canon->length(), buf);
> +  // FIXME?
> +  strcpy(&buf[total], "\\*.*");
> +
> +  WIN32_FIND_DATA data;
> +  HANDLE handle = FindFirstFile (buf, &data);
> +  if (handle == INVALID_HANDLE_VALUE)
> +    return NULL;
> +
> +  java::util::Vector *vec = new java::util::Vector ();
> +
> +  do
> +    {
> +      if (strcmp (data.cFileName, ".") && strcmp (data.cFileName, ".."))
> +        {
> +          jstring name = JvNewStringUTF (data.cFileName);
> +          if (! filter || (filter && filter->accept(this, name)))
> +            vec->addElement (name);
> +        }
> +    }
> +  while (FindNextFile (handle, &data));
> +
> +  if (GetLastError () != ERROR_NO_MORE_FILES)
> +    return NULL;
> +
> +  FindClose (handle);
> +
> +  jobjectArray ret = JvNewObjectArray (vec->size(), canon->getClass(),
NULL);
> +  vec->copyInto (ret);
> +  return reinterpret_cast<jstringArray> (ret);
> +}
> +
> +jboolean
> +java::io::File::performMkdir (void)
> +{
> +  char buf[MAX_PATH];
> +  jsize total = JvGetStringUTFRegion(path, 0, path->length(), buf);
> +  // FIXME?
> +  buf[total] = '\0';
> +
> +  return (CreateDirectory(buf, NULL)) ? true : false;
> +}
> +
> +jboolean
> +java::io::File::performRenameTo (File *dest)
> +{
> +  char buf[MAX_PATH];
> +  jsize total = JvGetStringUTFRegion(path, 0, path->length(), buf);
> +  // FIXME?
> +  buf[total] = '\0';
> +  char buf2[MAX_PATH];
> +  total = JvGetStringUTFRegion(dest->path, 0, dest->path->length(),
buf2);
> +  // FIXME?
> +  buf2[total] = '\0';
> +
> +  return (MoveFile(buf, buf2)) ? true : false;
> +}
> +
> +jboolean
> +java::io::File::performDelete (jstring canon)
> +{
> +  char buf[MAX_PATH];
> +  jsize total = JvGetStringUTFRegion(canon, 0, canon->length(), buf);
> +  // FIXME?
> +  buf[total] = '\0';
> +
> +  DWORD attributes = GetFileAttributes (buf);
> +  if (attributes == 0xffffffff)
> +    return false;
> +
> +  if (attributes & FILE_ATTRIBUTE_DIRECTORY)
> +    return (RemoveDirectory (buf)) ? true : false;
> +  else
> +    return (DeleteFile (buf)) ? true : false;
> +}
> diff -urN libjava/java/net/natInetAddress.cc
libjava.win32/java/net/natInetAddress.cc
> --- libjava/java/net/natInetAddress.cc Sun Feb 27 12:30:50 2000
> +++ libjava.win32/java/net/natInetAddress.cc Sun Feb 27 12:11:40 2000
> @@ -14,6 +14,17 @@
>  # define _REENTRANT 1
>  #endif
>
> +#ifdef USE_WINSOCK
> +
> +#include <windows.h>
> +#include <winsock.h>
> +
> +#ifndef MAXHOSTNAMELEN
> +#define MAXHOSTNAMELEN 64
> +#endif /* MAXHOSTNAMELEN */
> +
> +#else
> +
>  #ifdef HAVE_UNISTD_H
>  #include <unistd.h>
>  #endif
> @@ -34,6 +45,8 @@
>  #ifdef HAVE_NETDB_H
>  #include <netdb.h>
>  #endif
> +
> +#endif /* USE_WINSOCK */
>
>  #include <gcj/cni.h>
>  #include <jvm.h>
> diff -urN libjava/java/net/natPlainDatagramSocketImpl.cc
libjava.win32/java/net/natPlainDatagramSocketImpl.cc
> --- libjava/java/net/natPlainDatagramSocketImpl.cc Sun Feb 27 12:30:50
2000
> +++ libjava.win32/java/net/natPlainDatagramSocketImpl.cc Sun Feb 27
12:12:34 2000
> @@ -8,6 +8,15 @@
>
>  #include <config.h>
>
> +#ifdef USE_WINSOCK
> +#include <windows.h>
> +#include <winsock.h>
> +#include <errno.h>
> +#include <string.h>
> +#ifndef ENOPROTOOPT
> +#define ENOPROTOOPT 109
> +#endif
> +#else /* USE_WINSOCK */
>  #ifdef HAVE_SYS_TYPES_H
>  #include <sys/types.h>
>  #endif
> @@ -26,6 +35,7 @@
>  #endif
>  #include <errno.h>
>  #include <string.h>
> +#endif /* USE_WINSOCK */
>
>  #if HAVE_BSTRING_H
>  // Needed for bzero, implicitly used by FD_ZERO on IRIX 5.2
> diff -urN libjava/java/net/natPlainSocketImpl.cc
libjava.win32/java/net/natPlainSocketImpl.cc
> --- libjava/java/net/natPlainSocketImpl.cc Sun Feb 27 12:30:50 2000
> +++ libjava.win32/java/net/natPlainSocketImpl.cc Sun Feb 27 12:12:59 2000
> @@ -8,7 +8,17 @@
>
>  #include <config.h>
>
> +
>  #ifndef DISABLE_JAVA_NET
> +#ifdef USE_WINSOCK
> +#include <windows.h>
> +#include <winsock.h>
> +#include <errno.h>
> +#include <string.h>
> +#ifndef ENOPROTOOPT
> +#define ENOPROTOOPT 109
> +#endif
> +#else /* USE_WINSOCK */
>  #include <sys/types.h>
>  #include <sys/socket.h>
>  #include <sys/time.h>
> @@ -19,6 +29,7 @@
>  #include <netinet/tcp.h>
>  #include <errno.h>
>  #include <string.h>
> +#endif /* USE_WINSOCK */
>  #endif /* DISABLE_JAVA_NET */
>
>  #if HAVE_BSTRING_H
> diff -urN libjava/prims.cc libjava.win32/prims.cc
> --- libjava/prims.cc Sun Feb 27 12:30:49 2000
> +++ libjava.win32/prims.cc Sun Feb 27 12:16:26 2000
> @@ -10,6 +10,15 @@
>
>  #include <config.h>
>
> +#ifdef USE_WIN32_SIGNALLING
> +#include <windows.h>
> +#endif /* USE_WIN32_SIGNALLING */
> +
> +#ifdef USE_WINSOCK
> +#undef __INSIDE_CYGWIN__
> +#include <winsock.h>
> +#endif /* USE_WINSOCK */
> +
>  #include <stdlib.h>
>  #include <stdarg.h>
>  #include <stdio.h>
> @@ -664,6 +673,30 @@
>      }
>  }
>
> +#ifdef USE_WIN32_SIGNALLING
> +
> +extern "C" int* win32_get_restart_frame (void *);
> +
> +LONG CALLBACK win32_exception_handler (LPEXCEPTION_POINTERS e) {
> +  int* setjmp_buf;
> +  if (e->ExceptionRecord->ExceptionCode == EXCEPTION_ACCESS_VIOLATION)
> +    setjmp_buf = win32_get_restart_frame (nullp);
> +  else if (e->ExceptionRecord->ExceptionCode ==
EXCEPTION_INT_DIVIDE_BY_ZERO)
> +    setjmp_buf = win32_get_restart_frame (arithexception);
> +  else
> +    return EXCEPTION_CONTINUE_SEARCH;
> +
> +  e->ContextRecord->Ebp = setjmp_buf[0];
> +  // FIXME: Why does i386-signal.h increment the PC here, do we need to
do it?
> +  e->ContextRecord->Eip = setjmp_buf[1];
> +  // FIXME: Is this the stack pointer? Do we need it?
> +  e->ContextRecord->Esp = setjmp_buf[2];
> +
> +  return EXCEPTION_CONTINUE_EXECUTION;
> +}
> +
> +#endif
> +
>  static void
>  main_init ()
>  {
> @@ -681,12 +714,24 @@
>    LTDL_SET_PRELOADED_SYMBOLS ();
>  #endif
>
> +#ifdef USE_WINSOCK
> +  // Initialise winsock for networking
> +  WSADATA data;
> +  if (WSAStartup (MAKEWORD (1, 1), &data))
> +      MessageBox (NULL, "Error initialising winsock library.", "Error",
MB_OK | MB_ICONEXCLAMATION);
> +#endif /* USE_WINSOCK */
> +
> +#ifdef USE_WIN32_SIGNALLING
> +  // Install exception handler
> +  SetUnhandledExceptionFilter (win32_exception_handler);
> +#else
>    // FIXME: we only want this on POSIX systems.
>    struct sigaction act;
>    act.sa_handler = SIG_IGN;
>    sigemptyset (&act.sa_mask);
>    act.sa_flags = 0;
>    sigaction (SIGPIPE, &act, NULL);
> +#endif /* USE_WIN32_SIGNALLING */
>
>    _Jv_JNI_Init ();
>  }
> diff -urN libjava/win32-threads.cc libjava.win32/win32-threads.cc
> --- libjava/win32-threads.cc Wed Dec 31 19:00:00 1969
> +++ libjava.win32/win32-threads.cc Sun Feb 27 12:22:27 2000
> @@ -0,0 +1,247 @@
> +// win32-threads.cc - interface between libjava and Win32 threads.
> +
> +/* Copyright (C) 1998, 1999  Red Hat, Inc.
> +
> +   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 <config.h>
> +
> +// If we're using the Boehm GC, then we need to override some of the
> +// thread primitives.  This is fairly gross.
> +#ifdef HAVE_BOEHM_GC
> +extern "C"
> +{
> +#include <boehm-config.h>
> +#include <gc.h>
> +};
> +#endif /* HAVE_BOEHM_GC */
> +
> +#include <gcj/cni.h>
> +#include <jvm.h>
> +#include <java/lang/Thread.h>
> +#include <java/lang/System.h>
> +
> +#include <errno.h>
> +
> +#ifndef ETIMEDOUT
> +#define ETIMEDOUT 116
> +#endif
> +
> +// This is used to implement thread startup.
> +struct starter
> +{
> +  _Jv_ThreadStartFunc *method;
> +  java::lang::Thread *object;
> +  _Jv_Thread_t *data;
> +};
> +
> +// Controls access to the variable below
> +static HANDLE daemon_mutex;
> +static HANDLE daemon_cond;
> +// Number of non-daemon threads - _Jv_ThreadWait returns when this is 0
> +static int non_daemon_count;
> +
> +// TLS key get Java object representing the thread
> +DWORD _Jv_ThreadKey;
> +// TLS key to get _Jv_Thread_t* representing the thread
> +DWORD _Jv_ThreadDataKey;
> +
> +//
> +// These are the flags that can appear in _Jv_Thread_t.
> +//
> +
> +// Thread started.
> +#define FLAG_START   0x01
> +// Thread is daemon.
> +#define FLAG_DAEMON  0x02
> +
> +//
> +// Condition variables.
> +//
> +
> +int
> +_Jv_CondWait (_Jv_ConditionVariable_t *cv, _Jv_Mutex_t *mu, jlong millis,
jint nanos)
> +{
> +  DWORD time;
> +  DWORD rval;
> +
> +  _Jv_MutexUnlock (mu);
> +
> +  if((millis == 0) && (nanos > 0))
> +    time = 1;
> +  else if(millis == 0)
> +    time = INFINITE;
> +  else
> +    time = millis;
> +
> +  rval = WaitForSingleObject (*cv, time);
> +  _Jv_MutexLock (mu);
> +
> +  if (rval == WAIT_FAILED)
> +    return GetLastError ();       // FIXME: Map to errno?
> +  else if (rval == WAIT_TIMEOUT)
> +    return ETIMEDOUT;
> +  else
> +    return 0;
> +}
> +
> +//
> +// Mutexes.
> +//
> +
> +int
> +_Jv_MutexLock (_Jv_Mutex_t *mu)
> +{
> +  DWORD rval;
> +
> +  // FIXME: Are Win32 mutexs recursive? Should we use critical section
objects
> +  rval = WaitForSingleObject (*mu, INFINITE);
> +
> +  if (rval == WAIT_FAILED)
> +    return GetLastError ();       // FIXME: Map to errno?
> +  else if (rval == WAIT_TIMEOUT)
> +    return ETIMEDOUT;
> +  else
> +    return 0;
> +}
> +
> +//
> +// Threads.
> +//
> +
> +void
> +_Jv_InitThreads (void)
> +{
> +  _Jv_ThreadKey = TlsAlloc();
> +  _Jv_ThreadDataKey = TlsAlloc();
> +  daemon_mutex = CreateMutex(NULL, 0, NULL);
> +  daemon_cond = CreateEvent(NULL, 0, 0, NULL);
> +  non_daemon_count = 0;
> +}
> +
> +void
> +_Jv_ThreadInitData (_Jv_Thread_t **data, java::lang::Thread *)
> +{
> +  _Jv_Thread_t *info = new _Jv_Thread_t;
> +  info->flags = 0;
> +
> +  // FIXME register a finalizer for INFO here.
> +  // FIXME also must mark INFO somehow.
> +
> +  *data = info;
> +}
> +
> +void
> +_Jv_ThreadSetPriority (_Jv_Thread_t *data, jint prio)
> +{
> +  int actual = THREAD_PRIORITY_NORMAL;
> +
> +  if (data->flags & FLAG_START)
> +    {
> +      switch (prio)
> +        {
> +          case 10:
> +            actual = THREAD_PRIORITY_TIME_CRITICAL;
> +            break;
> +          case 9:
> +            actual = THREAD_PRIORITY_HIGHEST;
> +            break;
> +          case 8:
> +          case 7:
> +            actual = THREAD_PRIORITY_ABOVE_NORMAL;
> +            break;
> +          case 6:
> +          case 5:
> +            actual = THREAD_PRIORITY_NORMAL;
> +            break;
> +          case 4:
> +          case 3:
> +            actual = THREAD_PRIORITY_BELOW_NORMAL;
> +            break;
> +          case 2:
> +            actual = THREAD_PRIORITY_LOWEST;
> +            break;
> +          case 1:
> +            actual = THREAD_PRIORITY_IDLE;
> +            break;
> +        }
> +      SetThreadPriority(data->handle, actual);
> +    }
> +}
> +
> +// This function is called when a thread is started.  We don't arrange
> +// to call the `run' method directly, because this function must
> +// return a value.
> +static DWORD __stdcall
> +really_start (void* x)
> +{
> +  struct starter *info = (struct starter *) x;
> +
> +  TlsSetValue (_Jv_ThreadKey, info->object);
> +  TlsSetValue (_Jv_ThreadDataKey, info->data);
> +  info->method (info->object);
> +
> +  if (! (info->data->flags & FLAG_DAEMON))
> +    {
> +      WaitForSingleObject (daemon_mutex, INFINITE);
> +      non_daemon_count--;
> +      if (! non_daemon_count)
> +          PulseEvent (daemon_cond);
> +      ReleaseMutex (daemon_mutex);
> +    }
> +
> +  return 0;
> +}
> +
> +void
> +_Jv_ThreadStart (java::lang::Thread *thread, _Jv_Thread_t *data,
_Jv_ThreadStartFunc *meth)
> +{
> +  DWORD id;
> +  struct starter *info;
> +
> +  // Do nothing if thread has already started
> +  if (data->flags & FLAG_START)
> +    return;
> +  data->flags |= FLAG_START;
> +
> +  // FIXME: handle marking the info object for GC.
> +  info = (struct starter *) _Jv_AllocBytes (sizeof (struct starter));
> +  info->method = meth;
> +  info->object = thread;
> +  info->data = data;
> +
> +  if (! thread->isDaemon ())
> +    {
> +      WaitForSingleObject (daemon_mutex, INFINITE);
> +      non_daemon_count++;
> +      ReleaseMutex (daemon_mutex);
> +    }
> +  else
> +    data->flags |= FLAG_DAEMON;
> +
> +  HANDLE h = CreateThread(NULL, 0, really_start, info, 0, &id);
> +  _Jv_ThreadSetPriority(data, thread->getPriority());
> +
> +  file://if (!h)
> +    file://JvThrow ();
> +}
> +
> +void
> +_Jv_ThreadWait (void)
> +{
> +  WaitForSingleObject(daemon_mutex, INFINITE);
> +  if(non_daemon_count)
> +      SignalObjectAndWait(daemon_mutex, daemon_cond, INFINITE, 0);
> +  ReleaseMutex(daemon_mutex);
> +}
> +
> +void
> +_Jv_ThreadInterrupt (_Jv_Thread_t *data)
> +{
> +  MessageBox(NULL, "Unimplemented",
"win32-threads.cc:_Jv_ThreadInterrupt", MB_OK);
> +  // FIXME:
> +}
>

From java-patches-return-526-listarch-java-patches=sourceware.cygnus.com@sourceware.cygnus.com Sun Feb 27 21:42:29 2000
Return-Path: <java-patches-return-526-listarch-java-patches=sourceware.cygnus.com@sourceware.cygnus.com>
Delivered-To: listarch-java-patches@sourceware.cygnus.com
Received: (qmail 7702 invoked by alias); 27 Feb 2000 21:42:28 -0000
Mailing-List: contact java-patches-help@sourceware.cygnus.com; run by ezmlm
Precedence: bulk
List-Subscribe: <mailto:java-patches-subscribe@sourceware.cygnus.com>
List-Archive: <http://sourceware.cygnus.com/ml/java-patches/>
List-Post: <mailto:java-patches@sourceware.cygnus.com>
List-Help: <mailto:java-patches-help@sourceware.cygnus.com>, <http://sourceware.cygnus.com/ml/#faqs>
Sender: java-patches-owner@sourceware.cygnus.com
Delivered-To: mailing list java-patches@sourceware.cygnus.com
Received: (qmail 7683 invoked from network); 27 Feb 2000 21:42:26 -0000
To: Java Patch List <java-patches@sourceware.cygnus.com> 
Subject: Patch: another JNI test
X-Zippy:  Did I SELL OUT yet??
X-Attribution:  Tom
Bcc:
Reply-To:  tromey@cygnus.com
From:  Tom Tromey <tromey@cygnus.com>
Date: 27 Feb 2000 14:42:17 -0700
Message-ID: <87n1omcog6.fsf@cygnus.com>
Lines: 61
X-Mailer: Gnus v5.5/Emacs 20.3

I'm checking in this patch.  It adds a test which checks to make sure
that our JNI functions are properly handling exceptions.  (This test
fails with the current g++ / gcj / libgcj.)

2000-02-23  Tom Tromey  <tromey@cygnus.com>

	* libjava.jni/noclass.c: New file.
	* libjava.jni/noclass.out: New file.
	* libjava.jni/noclass.java: New file.

Tom

Index: libjava.jni/noclass.c
===================================================================
RCS file: noclass.c
diff -N noclass.c
--- /dev/null	Tue May  5 13:32:27 1998
+++ noclass.c	Sun Feb 27 13:40:59 2000
@@ -0,0 +1,9 @@
+#include <noclass.h>
+
+void
+Java_noclass_find_1it (JNIEnv *env, jclass k)
+{
+  /* We cause an exception by asking for a class we know does not
+     exist.  */
+  k = (*env)->FindClass (env, "java/lang/Sarcophagus");
+}
Index: libjava.jni/noclass.java
===================================================================
RCS file: noclass.java
diff -N noclass.java
--- /dev/null	Tue May  5 13:32:27 1998
+++ noclass.java	Sun Feb 27 13:40:59 2000
@@ -0,0 +1,18 @@
+// Test to make sure JNI implementation catches exceptions.
+
+public class noclass
+{
+  static
+  {
+    System.loadLibrary ("noclass");
+  }
+
+  public static native void find_it ();
+
+  public static void main (String[] args)
+  {
+    find_it ();
+    // If find_it() causes a crash, we won't be running this next line.
+    System.out.println ("Ok");
+  }
+}
Index: libjava.jni/noclass.out
===================================================================
RCS file: noclass.out
diff -N noclass.out
--- /dev/null	Tue May  5 13:32:27 1998
+++ noclass.out	Sun Feb 27 13:40:59 2000
@@ -0,0 +1 @@
+Ok

From java-patches-return-527-listarch-java-patches=sourceware.cygnus.com@sourceware.cygnus.com Tue Feb 29 04:18:29 2000
Return-Path: <java-patches-return-527-listarch-java-patches=sourceware.cygnus.com@sourceware.cygnus.com>
Delivered-To: listarch-java-patches@sourceware.cygnus.com
Received: (qmail 20865 invoked by alias); 29 Feb 2000 04:18:29 -0000
Mailing-List: contact java-patches-help@sourceware.cygnus.com; run by ezmlm
Precedence: bulk
List-Subscribe: <mailto:java-patches-subscribe@sourceware.cygnus.com>
List-Archive: <http://sourceware.cygnus.com/ml/java-patches/>
List-Post: <mailto:java-patches@sourceware.cygnus.com>
List-Help: <mailto:java-patches-help@sourceware.cygnus.com>, <http://sourceware.cygnus.com/ml/#faqs>
Sender: java-patches-owner@sourceware.cygnus.com
Delivered-To: mailing list java-patches@sourceware.cygnus.com
Received: (qmail 20846 invoked from network); 29 Feb 2000 04:18:26 -0000
To: Java Patch List <java-patches@sourceware.cygnus.com> 
Subject: Patch: another inner class test
X-Zippy:  Hmmm..  A hash-singer and a cross-eyed guy were SLEEPING on a deserted
 island, when...
X-Attribution:  Tom
Bcc:
Reply-To:  tromey@cygnus.com
From:  Tom Tromey <tromey@cygnus.com>
Date: 28 Feb 2000 21:18:46 -0700
Message-ID: <87zoskbpzt.fsf@cygnus.com>
Lines: 35
X-Mailer: Gnus v5.5/Emacs 20.3

I'm checking in this patch.
It is yet another inner class test case.

2000-02-28  Mo DeJong <mdejong@cygnus.com>

	* libjava.compile/static_inner.java: New file.

Tom

Index: libjava.compile//static_inner.java
===================================================================
RCS file: static_inner.java
diff -N static_inner.java
--- /dev/null	Tue May  5 13:32:27 1998
+++ static_inner.java	Mon Feb 28 20:16:51 2000
@@ -0,0 +1,19 @@
+// File Parent.java
+class Parent {
+  public static class Kid {
+    public Kid(int age) {
+      this.age = age;
+    }
+
+    int age;
+  }
+}
+
+// File NewParent.java
+public class static_inner extends Parent {
+
+  public static void main(String[] argv) {
+    Kid kid = new Kid(2);
+  }
+
+}

From java-patches-return-528-listarch-java-patches=sourceware.cygnus.com@sourceware.cygnus.com Tue Feb 29 17:04:23 2000
Return-Path: <java-patches-return-528-listarch-java-patches=sourceware.cygnus.com@sourceware.cygnus.com>
Delivered-To: listarch-java-patches@sourceware.cygnus.com
Received: (qmail 1462 invoked by alias); 29 Feb 2000 17:04:23 -0000
Mailing-List: contact java-patches-help@sourceware.cygnus.com; run by ezmlm
Precedence: bulk
List-Subscribe: <mailto:java-patches-subscribe@sourceware.cygnus.com>
List-Archive: <http://sourceware.cygnus.com/ml/java-patches/>
List-Post: <mailto:java-patches@sourceware.cygnus.com>
List-Help: <mailto:java-patches-help@sourceware.cygnus.com>, <http://sourceware.cygnus.com/ml/#faqs>
Sender: java-patches-owner@sourceware.cygnus.com
Delivered-To: mailing list java-patches@sourceware.cygnus.com
Received: (qmail 1437 invoked from network); 29 Feb 2000 17:04:19 -0000
To: Java Patch List <java-patches@sourceware.cygnus.com> 
Subject: Patch: bug fix in ZipOutputStream
X-Zippy:  DIDI...  is that a MARTIAN name, or, are we in ISRAEL?
X-Attribution:  Tom
Bcc:
Reply-To:  tromey@cygnus.com
From:  Tom Tromey <tromey@cygnus.com>
Date: 29 Feb 2000 10:04:50 -0700
Message-ID: <87vh38aqj1.fsf@cygnus.com>
Lines: 35
X-Mailer: Gnus v5.5/Emacs 20.3

I'm committing the appended patch.  It fixes a bug in ZipOutputStream.
In some situations, ZipOutputStream.write_entry could be called when
`current == null'.  Thanks to Mo for catching it.

2000-02-28  Mo DeJong  <mdejong@cygnus.com>

	* java/util/zip/ZipOutputStream.java(write_entry) : Fixed
	SIGSEV caused by use of the wrong instance variable.

Tom

Index: java/util/zip/ZipOutputStream.java
===================================================================
RCS file: /cvs/java/libgcj/libjava/java/util/zip/ZipOutputStream.java,v
retrieving revision 1.4
diff -u -r1.4 ZipOutputStream.java
--- ZipOutputStream.java	2000/01/19 18:39:27	1.4
+++ ZipOutputStream.java	2000/02/29 17:02:34
@@ -1,4 +1,4 @@
-/* Copyright (C) 1999  Red Hat, Inc.
+/* Copyright (C) 1999, 2000  Red Hat, Inc.
 
    This file is part of libgcj.
 
@@ -104,8 +104,8 @@
 
     boolean crc_after = false;
     if (is_local
-	&& (current.getCrc() == -1 || current.getCompressedSize() == -1
-	    || current.getSize() == -1))
+	&& (entry.getCrc() == -1 || entry.getCompressedSize() == -1
+	    || entry.getSize() == -1))
       crc_after = true;
     // For the bits field we always indicate `normal' compression,
     // even if that isn't true.

From java-patches-return-529-listarch-java-patches=sourceware.cygnus.com@sourceware.cygnus.com Tue Feb 29 17:07:57 2000
Return-Path: <java-patches-return-529-listarch-java-patches=sourceware.cygnus.com@sourceware.cygnus.com>
Delivered-To: listarch-java-patches@sourceware.cygnus.com
Received: (qmail 1911 invoked by alias); 29 Feb 2000 17:07:57 -0000
Mailing-List: contact java-patches-help@sourceware.cygnus.com; run by ezmlm
Precedence: bulk
List-Subscribe: <mailto:java-patches-subscribe@sourceware.cygnus.com>
List-Archive: <http://sourceware.cygnus.com/ml/java-patches/>
List-Post: <mailto:java-patches@sourceware.cygnus.com>
List-Help: <mailto:java-patches-help@sourceware.cygnus.com>, <http://sourceware.cygnus.com/ml/#faqs>
Sender: java-patches-owner@sourceware.cygnus.com
Delivered-To: mailing list java-patches@sourceware.cygnus.com
Received: (qmail 1889 invoked from network); 29 Feb 2000 17:07:54 -0000
To: Java Patch List <java-patches@sourceware.cygnus.com> 
Subject: Patch: another zip fix from Mo
X-Zippy:  I'm RELIGIOUS!!  I love a man with a HAIRPIECE!!
 Equip me with MISSILES!!
X-Attribution:  Tom
Bcc:
Reply-To:  tromey@cygnus.com
From:  Tom Tromey <tromey@cygnus.com>
Date: 29 Feb 2000 10:08:20 -0700
Message-ID: <87u2isaqd7.fsf@cygnus.com>
Lines: 26
X-Mailer: Gnus v5.5/Emacs 20.3

I'm checking in this patch.  It fixes another bug in ZipOutputStream
that was caught by Mo.

2000-02-28  Mo DeJong  <mdejong@cygnus.com>

	* java/util/zip/ZipOutputStream.java(closeEntry) : Fixed
	error caused by the incorrect casting of a long to an int.

Tom

Index: java/util/zip/ZipOutputStream.java
===================================================================
RCS file: /cvs/java/libgcj/libjava/java/util/zip/ZipOutputStream.java,v
retrieving revision 1.5
diff -u -r1.5 ZipOutputStream.java
--- ZipOutputStream.java	2000/02/29 17:04:35	1.5
+++ ZipOutputStream.java	2000/02/29 17:06:48
@@ -30,7 +30,7 @@
   {
     int uncompressed_size = def.getTotalIn();
     int compressed_size = def.getTotalOut();
-    int crc = (int) (filter.getChecksum().getValue());
+    long crc = filter.getChecksum().getValue();
 
     bytes_written += compressed_size;
 

From java-patches-return-530-listarch-java-patches=sourceware.cygnus.com@sourceware.cygnus.com Thu Mar 02 20:24:59 2000
Return-Path: <java-patches-return-530-listarch-java-patches=sourceware.cygnus.com@sourceware.cygnus.com>
Delivered-To: listarch-java-patches@sourceware.cygnus.com
Received: (qmail 31837 invoked by alias); 2 Mar 2000 20:24:59 -0000
Mailing-List: contact java-patches-help@sourceware.cygnus.com; run by ezmlm
Precedence: bulk
List-Subscribe: <mailto:java-patches-subscribe@sourceware.cygnus.com>
List-Archive: <http://sourceware.cygnus.com/ml/java-patches/>
List-Post: <mailto:java-patches@sourceware.cygnus.com>
List-Help: <mailto:java-patches-help@sourceware.cygnus.com>, <http://sourceware.cygnus.com/ml/#faqs>
Sender: java-patches-owner@sourceware.cygnus.com
Delivered-To: mailing list java-patches@sourceware.cygnus.com
Received: (qmail 31777 invoked from network); 2 Mar 2000 20:24:36 -0000
To: Java Patch List <java-patches@sourceware.cygnus.com> 
Subject: Patch: use try...catch in CNI code
X-Zippy:  LOU GRANT froze my ASSETS!!
X-Attribution:  Tom
Bcc:
Reply-To:  tromey@cygnus.com
From:  Tom Tromey <tromey@cygnus.com>
Date: 02 Mar 2000 13:25:28 -0700
Message-ID: <87ln419l1j.fsf@cygnus.com>
Lines: 1681
X-Mailer: Gnus v5.5/Emacs 20.3

I just checked in a patch to g++ which makes `try...catch' work even
when catching or throwing Java exceptions.  As a result I'm checking
in this patch to libgcj.  This patch removes all the ugly Java
trampolines we used to need to handle exceptions.  It also adds
correct exception handling to JNI.

I didn't change all the _Jv_Throw calls.  However I recommend that we
stop using _Jv_Throw and instead just use `throw'.  Perhaps I'll
change the _Jv_Throw calls at some point.

2000-03-02  Tom Tromey  <tromey@cygnus.com>

	* include/java-interp.h: Don't include MethodInvocation.h.
	(class _Jv_InterpMethod): Don't make MethodInvocation a friend.
	* Makefile.in: Rebuilt.
	* Makefile.am (gnu/gcj/runtime/MethodInvocation.h): Removed.
	(ordinary_java_source_files): Don't mention
	MethodInvocation.java.
	* gnu/gcj/runtime/MethodInvocation.java: Removed.
	* interpret.cc (MethodInvocation::continue1): Removed.
	(run): Handle exceptions here.
	* java/lang/ClassLoader.java (defineClass1, defineClass2):
	Removed.
	* java/lang/natClassLoader.cc (defineClass0): Catch exceptions
	here.
	(defineClass2): Removed.

	* java/lang/reflect/Method.java (hack_trampoline, hack_call):
	Removed.
	* java/lang/reflect/natMethod.cc (_Jv_CallAnyMethodA): Catch
	exceptions here.
	(hack_call): Removed.

	* java/lang/Class.h (Class): Removed hackRunInitializers,
	hackTrampoline.
	* java/lang/natClass.cc (hackRunInitializers): Removed.
	(initializeClass): Catch exceptions here.
	Include ExceptionInInitializerError.h.
	* java/lang/Class.java (hackTrampoline, hackRunInitializers):
	Removed.

	* java/lang/Object.h (Object): Don't mention hack12_6.
	* java/lang/natObject.cc (_Jv_FinalizeObject): Catch exceptions
	here.
	* java/lang/Object.java (hack12_6): Removed.

	* java/lang/natThread.cc (run_): Renamed.  Catch exceptions here.
	(start): Use run_, not run__.
	* java/lang/Thread.java (run_): Renamed from run__; old run_
	removed.

	* jni.cc (_Jv_JNI_FindClass): Handle exceptions.
	(_Jv_JNI_EnsureLocalCapacity): Likewise.
	(_Jv_JNI_DefineClass): Likewise.
	(_Jv_JNI_ThrowNew): Likewise.
	(_Jv_JNI_AllocObject): Likewise.
	(_Jv_JNI_GetAnyMethodID): Likewise.
	(_Jv_JNI_CallAnyMethodV): Likewise.
	(_Jv_JNI_CallAnyMethodA): Likewise.
	(_Jv_JNI_CallAnyVoidMethodV): Likewise.
	(_Jv_JNI_CallAnyVoidMethodA): Likewise.
	(_Jv_JNI_GetAnyFieldID): Likewise.
	(_Jv_JNI_NewString): Likewise.
	(_Jv_JNI_NewStringUTF): Likewise.
	(_Jv_JNI_GetStringUTFChars): Likewise.
	(_Jv_JNI_NewObjectArray): Likewise.
	(_Jv_JNI_NewPrimitiveArray): Likewise.
	(_Jv_JNI_GetPrimitiveArrayRegion): Likewise.
	(_Jv_JNI_GetStringRegion): Likewise.
	(_Jv_JNI_GetStringUTFRegion): Likewise.
	(_Jv_JNI_SetPrimitiveArrayRegion): Likewise.
	(_Jv_JNI_MonitorEnter): Likewise.
	(_Jv_JNI_MonitorExit): Likewise.
	(_Jv_JNI_ToReflectedField): Likewise.
	(_Jv_JNI_ToReflectedMethod): Likewise.
	(_Jv_JNI_RegisterNatives): Likewise.
	(_Jv_JNI_AttachCurrentThread): Likewise.
	(_Jv_JNI_DestroyJavaVM): Likewise.

Tom

Index: Makefile.am
===================================================================
RCS file: /cvs/java/libgcj/libjava/Makefile.am,v
retrieving revision 1.48
diff -u -r1.48 Makefile.am
--- Makefile.am	2000/02/21 05:54:28	1.48
+++ Makefile.am	2000/03/02 20:12:59
@@ -267,11 +267,6 @@
 	    -friend 'java::lang::ClassLoader;' \
 	    $(basename $<)
 
-gnu/gcj/runtime/MethodInvocation.h: gnu/gcj/runtime/MethodInvocation.class libgcj.zip
-	$(GCJH) -classpath $(top_builddir) \
-	    -friend 'class _Jv_InterpMethod;' \
-	    $(basename $<)
-
 ## Headers we maintain by hand and which we want to install.
 extra_headers = java/lang/Object.h java/lang/Class.h
 
@@ -525,7 +520,6 @@
 gnu/gcj/io/DefaultMimeTypes.java \
 gnu/gcj/io/MimeTypes.java \
 gnu/gcj/jni/NativeThread.java \
-gnu/gcj/runtime/MethodInvocation.java \
 gnu/gcj/runtime/VMClassLoader.java \
 gnu/gcj/text/BaseBreakIterator.java \
 gnu/gcj/text/CharacterBreakIterator.java \
Index: interpret.cc
===================================================================
RCS file: /cvs/java/libgcj/libjava/interpret.cc,v
retrieving revision 1.12
diff -u -r1.12 interpret.cc
--- interpret.cc	2000/02/11 23:24:28	1.12
+++ interpret.cc	2000/03/02 20:13:06
@@ -33,20 +33,8 @@
 #include <java-insns.h>
 #include <java-signal.h>
 
-#ifndef INTERPRETER
+#ifdef INTERPRETER
 
-#include <gnu/gcj/runtime/MethodInvocation.h>
-
-/* This should never happen. */
-void 
-gnu::gcj::runtime::MethodInvocation::continue1 (gnu::gcj::RawData *,
-						gnu::gcj::RawData *)
-{
-  JvFail ("no interpreter");
-}
-
-#else
-
 #define ClassError _CL_Q34java4lang5Error
 extern java::lang::Class ClassError;
 
@@ -216,10 +204,17 @@
   memcpy ((void*) locals, (void*) args, args_raw_size);
 
  next_segment:
-  /* this will call the method _Jv_InterpMethod::continue0, see below */
-  jobject ex = 
-    gnu::gcj::runtime::MethodInvocation::continue0
-    ((gnu::gcj::RawData *)this, (gnu::gcj::RawData *)inv);
+
+  jobject ex = NULL;
+
+  try
+    {
+      continue1 (inv);
+    }
+  catch (java::lang::Throwable *ex2)
+    {
+      ex = ex2;
+    }
 
   if (ex == 0)			// no exception...
     {
@@ -280,7 +275,6 @@
 	default:
 	  throw_internal_error ("unknown return type");
 	}
-
     }
 
   /** handle an exception */
@@ -377,16 +371,6 @@
   _Jv_MonitorExit (sync);
 
   if (ex != 0) _Jv_Throw (ex);
-}
-
-/* this is the exception handler hack, for the interpreter */
-void 
-gnu::gcj::runtime::MethodInvocation::continue1 (gnu::gcj::RawData *meth,
-						gnu::gcj::RawData *inv)
-{
-  _Jv_InterpMethod           *meth0 = (_Jv_InterpMethod*)meth;
-  _Jv_InterpMethodInvocation *inv0  = (_Jv_InterpMethodInvocation*)inv;
-  meth0->continue1 (inv0);
 }
 
 /*
Index: jni.cc
===================================================================
RCS file: /cvs/java/libgcj/libjava/jni.cc,v
retrieving revision 1.23
diff -u -r1.23 jni.cc
--- jni.cc	2000/02/26 21:12:54	1.23
+++ jni.cc	2000/03/02 20:13:09
@@ -115,6 +115,7 @@
   using namespace java::lang;
   Integer *refcount = (Integer *) ref_table->get (obj);
   jint val = (refcount == NULL) ? 0 : refcount->intValue ();
+  // FIXME: what about out of memory error?
   ref_table->put (obj, new Integer (val + 1));
 }
 
@@ -131,6 +132,7 @@
   if (val == 0)
     ref_table->remove (obj);
   else
+    // FIXME: what about out of memory error?
     ref_table->put (obj, new Integer (val));
 }
 
@@ -180,13 +182,15 @@
   // size.  This isn't the most efficient thing, but for now we don't
   // care.  Note that _Jv_JNI_PushLocalFrame relies on this right now.
 
-  _Jv_JNI_LocalFrame *frame
-    = (_Jv_JNI_LocalFrame *) _Jv_MallocUnchecked (sizeof (_Jv_JNI_LocalFrame)
-						  + size * sizeof (jobject));
-  if (frame == NULL)
+  _Jv_JNI_LocalFrame *frame;
+  try
     {
-      // FIXME: exception processing.
-      env->ex = new java::lang::OutOfMemoryError;
+      frame = (_Jv_JNI_LocalFrame *) _Jv_Malloc (sizeof (_Jv_JNI_LocalFrame)
+						 + size * sizeof (jobject));
+    }
+  catch (jthrowable t)
+    {
+      env->ex = t;
       return JNI_ERR;
     }
 
@@ -304,16 +308,24 @@
 _Jv_JNI_DefineClass (JNIEnv *env, jobject loader, 
 		     const jbyte *buf, jsize bufLen)
 {
-  jbyteArray bytes = JvNewByteArray (bufLen);
-  jbyte *elts = elements (bytes);
-  memcpy (elts, buf, bufLen * sizeof (jbyte));
-
-  java::lang::ClassLoader *l
-    = reinterpret_cast<java::lang::ClassLoader *> (loader);
-
-  // FIXME: exception processing.
-  jclass result = l->defineClass (bytes, 0, bufLen);
-  return (jclass) wrap_value (env, result);
+  try
+    {
+      jbyteArray bytes = JvNewByteArray (bufLen);
+
+      jbyte *elts = elements (bytes);
+      memcpy (elts, buf, bufLen * sizeof (jbyte));
+
+      java::lang::ClassLoader *l
+	= reinterpret_cast<java::lang::ClassLoader *> (loader);
+
+      jclass result = l->defineClass (bytes, 0, bufLen);
+      return (jclass) wrap_value (env, result);
+    }
+  catch (jthrowable t)
+    {
+      env->ex = t;
+      return NULL;
+    }
 }
 
 static jclass
@@ -324,21 +336,30 @@
   char s[len + 1];
   for (int i = 0; i <= len; ++i)
     s[i] = (name[i] == '/') ? '.' : name[i];
-  jstring n = JvNewStringUTF (s);
 
-  java::lang::ClassLoader *loader;
-  if (env->klass == NULL)
+  jclass r = NULL;
+  try
     {
-      // FIXME: should use getBaseClassLoader, but we don't have that
-      // yet.
-      loader = java::lang::ClassLoader::getSystemClassLoader ();
-    }
-  else
-    loader = env->klass->getClassLoader ();
+      // This might throw an out of memory exception.
+      jstring n = JvNewStringUTF (s);
 
-  // FIXME: exception processing.
-  jclass r = loader->loadClass (n);
+      java::lang::ClassLoader *loader;
+      if (env->klass == NULL)
+	{
+	  // FIXME: should use getBaseClassLoader, but we don't have that
+	  // yet.
+	  loader = java::lang::ClassLoader::getSystemClassLoader ();
+	}
+      else
+	loader = env->klass->getClassLoader ();
 
+      r = loader->loadClass (n);
+    }
+  catch (jthrowable t)
+    {
+      env->ex = t;
+    }
+
   return (jclass) wrap_value (env, r);
 }
 
@@ -369,25 +390,33 @@
   using namespace java::lang::reflect;
 
   JvAssert ((&ThrowableClass)->isAssignableFrom (clazz));
+
+  int r = JNI_OK;
+  try
+    {
+      JArray<jclass> *argtypes
+	= (JArray<jclass> *) JvNewObjectArray (1, &ClassClass, NULL);
 
-  JArray<jclass> *argtypes
-    = (JArray<jclass> *) JvNewObjectArray (1, &ClassClass, NULL);
+      jclass *elts = elements (argtypes);
+      elts[0] = &StringClass;
 
-  jclass *elts = elements (argtypes);
-  elts[0] = &StringClass;
+      Constructor *cons = clazz->getConstructor (argtypes);
 
-  // FIXME: exception processing.
-  Constructor *cons = clazz->getConstructor (argtypes);
+      jobjectArray values = JvNewObjectArray (1, &StringClass, NULL);
+      jobject *velts = elements (values);
+      velts[0] = JvNewStringUTF (message);
 
-  jobjectArray values = JvNewObjectArray (1, &StringClass, NULL);
-  jobject *velts = elements (values);
-  velts[0] = JvNewStringUTF (message);
+      jobject obj = cons->newInstance (values);
 
-  // FIXME: exception processing.
-  jobject obj = cons->newInstance (values);
+      env->ex = reinterpret_cast<jthrowable> (obj);
+    }
+  catch (jthrowable t)
+    {
+      env->ex = t;
+      r = JNI_ERR;
+    }
 
-  env->ex = reinterpret_cast<jthrowable> (obj);
-  return 0;
+  return r;
 }
 
 static jthrowable
@@ -435,14 +464,20 @@
   jobject obj = NULL;
   using namespace java::lang::reflect;
 
-  JvAssert (clazz && ! clazz->isArray ());
-  if (clazz->isInterface() || Modifier::isAbstract(clazz->getModifiers()))
-    env->ex = new java::lang::InstantiationException ();
-  else
+  try
+    {
+      JvAssert (clazz && ! clazz->isArray ());
+      if (clazz->isInterface() || Modifier::isAbstract(clazz->getModifiers()))
+	env->ex = new java::lang::InstantiationException ();
+      else
+	{
+	  // FIXME: will this work for String?
+	  obj = JvAllocObject (clazz);
+	}
+    }
+  catch (jthrowable t)
     {
-      // FIXME: exception processing.
-      // FIXME: will this work for String?
-      obj = JvAllocObject (clazz);
+      env->ex = t;
     }
 
   return wrap_value (env, obj);
@@ -472,36 +507,43 @@
 _Jv_JNI_GetAnyMethodID (JNIEnv *env, jclass clazz,
 			const char *name, const char *sig)
 {
-  // FIXME: exception processing.
-  _Jv_InitClass (clazz);
-
-  _Jv_Utf8Const *name_u = _Jv_makeUtf8Const ((char *) name, -1);
-  _Jv_Utf8Const *sig_u = _Jv_makeUtf8Const ((char *) sig, -1);
+  try
+    {
+      _Jv_InitClass (clazz);
 
-  JvAssert (! clazz->isPrimitive());
+      _Jv_Utf8Const *name_u = _Jv_makeUtf8Const ((char *) name, -1);
+      _Jv_Utf8Const *sig_u = _Jv_makeUtf8Const ((char *) sig, -1);
 
-  using namespace java::lang::reflect;
+      JvAssert (! clazz->isPrimitive());
 
-  while (clazz != NULL)
-    {
-      jint count = JvNumMethods (clazz);
-      jmethodID meth = JvGetFirstMethod (clazz);
+      using namespace java::lang::reflect;
 
-      for (jint i = 0; i < count; ++i)
+      while (clazz != NULL)
 	{
-	  if (((is_static && Modifier::isStatic (meth->accflags))
-	       || (! is_static && ! Modifier::isStatic (meth->accflags)))
-	      && _Jv_equalUtf8Consts (meth->name, name_u)
-	      && _Jv_equalUtf8Consts (meth->signature, sig_u))
-	    return meth;
+	  jint count = JvNumMethods (clazz);
+	  jmethodID meth = JvGetFirstMethod (clazz);
 
-	  meth = meth->getNextMethod();
+	  for (jint i = 0; i < count; ++i)
+	    {
+	      if (((is_static && Modifier::isStatic (meth->accflags))
+		   || (! is_static && ! Modifier::isStatic (meth->accflags)))
+		  && _Jv_equalUtf8Consts (meth->name, name_u)
+		  && _Jv_equalUtf8Consts (meth->signature, sig_u))
+		return meth;
+
+	      meth = meth->getNextMethod();
+	    }
+
+	  clazz = clazz->getSuperclass ();
 	}
 
-      clazz = clazz->getSuperclass ();
+      env->ex = new java::lang::NoSuchMethodError ();
     }
+  catch (jthrowable t)
+    {
+      env->ex = t;
+    }
 
-  env->ex = new java::lang::NoSuchMethodError ();
   return NULL;
 }
 
@@ -553,27 +595,36 @@
 
   jclass return_type;
   JArray<jclass> *arg_types;
-  // FIXME: exception processing.
-  _Jv_GetTypesFromSignature (id, decl_class,
-			     &arg_types, &return_type);
-
-  jvalue args[arg_types->length];
-  array_from_valist (args, arg_types, vargs);
-
-  // For constructors we need to pass the Class we are instantiating.
-  if (style == constructor)
-    return_type = klass;
-
-  jvalue result;
-  jthrowable ex = _Jv_CallAnyMethodA (obj, return_type, id,
-				      style == constructor,
-				      arg_types, args, &result);
+
+  try
+    {
+      _Jv_GetTypesFromSignature (id, decl_class,
+				 &arg_types, &return_type);
+
+      jvalue args[arg_types->length];
+      array_from_valist (args, arg_types, vargs);
+
+      // For constructors we need to pass the Class we are instantiating.
+      if (style == constructor)
+	return_type = klass;
+
+      jvalue result;
+      jthrowable ex = _Jv_CallAnyMethodA (obj, return_type, id,
+					  style == constructor,
+					  arg_types, args, &result);
 
-  if (ex != NULL)
-    env->ex = ex;
+      if (ex != NULL)
+	env->ex = ex;
 
-  // We cheat a little here.  FIXME.
-  return wrap_value (env, * (T *) &result);
+      // We cheat a little here.  FIXME.
+      return wrap_value (env, * (T *) &result);
+    }
+  catch (jthrowable t)
+    {
+      env->ex = t;
+    }
+
+  return wrap_value (env, (T) 0);
 }
 
 template<typename T, invocation_type style>
@@ -604,24 +655,32 @@
 
   jclass return_type;
   JArray<jclass> *arg_types;
-  // FIXME: exception processing.
-  _Jv_GetTypesFromSignature (id, decl_class,
-			     &arg_types, &return_type);
-
-  // For constructors we need to pass the Class we are instantiating.
-  if (style == constructor)
-    return_type = klass;
-
-  jvalue result;
-  jthrowable ex = _Jv_CallAnyMethodA (obj, return_type, id,
-				      style == constructor,
-				      arg_types, args, &result);
+  try
+    {
+      _Jv_GetTypesFromSignature (id, decl_class,
+				 &arg_types, &return_type);
 
-  if (ex != NULL)
-    env->ex = ex;
+      // For constructors we need to pass the Class we are instantiating.
+      if (style == constructor)
+	return_type = klass;
 
-  // We cheat a little here.  FIXME.
-  return wrap_value (env, * (T *) &result);
+      jvalue result;
+      jthrowable ex = _Jv_CallAnyMethodA (obj, return_type, id,
+					  style == constructor,
+					  arg_types, args, &result);
+
+      if (ex != NULL)
+	env->ex = ex;
+
+      // We cheat a little here.  FIXME.
+      return wrap_value (env, * (T *) &result);
+    }
+  catch (jthrowable t)
+    {
+      env->ex = t;
+    }
+
+  return wrap_value (env, (T) 0);
 }
 
 template<invocation_type style>
@@ -637,23 +696,29 @@
 
   jclass return_type;
   JArray<jclass> *arg_types;
-  // FIXME: exception processing.
-  _Jv_GetTypesFromSignature (id, decl_class,
-			     &arg_types, &return_type);
-
-  jvalue args[arg_types->length];
-  array_from_valist (args, arg_types, vargs);
-
-  // For constructors we need to pass the Class we are instantiating.
-  if (style == constructor)
-    return_type = klass;
-
-  jthrowable ex = _Jv_CallAnyMethodA (obj, return_type, id,
-				      style == constructor,
-				      arg_types, args, NULL);
+  try
+    {
+      _Jv_GetTypesFromSignature (id, decl_class,
+				 &arg_types, &return_type);
+
+      jvalue args[arg_types->length];
+      array_from_valist (args, arg_types, vargs);
+
+      // For constructors we need to pass the Class we are instantiating.
+      if (style == constructor)
+	return_type = klass;
 
-  if (ex != NULL)
-    env->ex = ex;
+      jthrowable ex = _Jv_CallAnyMethodA (obj, return_type, id,
+					  style == constructor,
+					  arg_types, args, NULL);
+
+      if (ex != NULL)
+	env->ex = ex;
+    }
+  catch (jthrowable t)
+    {
+      env->ex = t;
+    }
 }
 
 template<invocation_type style>
@@ -681,16 +746,22 @@
 
   jclass return_type;
   JArray<jclass> *arg_types;
-  // FIXME: exception processing.
-  _Jv_GetTypesFromSignature (id, decl_class,
-			     &arg_types, &return_type);
-
-  jthrowable ex = _Jv_CallAnyMethodA (obj, return_type, id,
-				      style == constructor,
-				      arg_types, args, NULL);
+  try
+    {
+      _Jv_GetTypesFromSignature (id, decl_class,
+				 &arg_types, &return_type);
 
-  if (ex != NULL)
-    env->ex = ex;
+      jthrowable ex = _Jv_CallAnyMethodA (obj, return_type, id,
+					  style == constructor,
+					  arg_types, args, NULL);
+
+      if (ex != NULL)
+	env->ex = ex;
+    }
+  catch (jthrowable t)
+    {
+      env->ex = t;
+    }
 }
 
 // Functions with this signature are used to implement functions in
@@ -895,49 +966,55 @@
 _Jv_JNI_GetAnyFieldID (JNIEnv *env, jclass clazz,
 		       const char *name, const char *sig)
 {
-  // FIXME: exception processing.
-  _Jv_InitClass (clazz);
+  try
+    {
+      _Jv_InitClass (clazz);
 
-  _Jv_Utf8Const *a_name = _Jv_makeUtf8Const ((char *) name, -1);
+      _Jv_Utf8Const *a_name = _Jv_makeUtf8Const ((char *) name, -1);
 
-  jclass field_class = NULL;
-  if (sig[0] == '[')
-    field_class = _Jv_FindClassFromSignature ((char *) sig, NULL);
-  else
-    {
-      _Jv_Utf8Const *sig_u = _Jv_makeUtf8Const ((char *) sig, -1);
-      field_class = _Jv_FindClass (sig_u, NULL);
-    }
+      jclass field_class = NULL;
+      if (sig[0] == '[')
+	field_class = _Jv_FindClassFromSignature ((char *) sig, NULL);
+      else
+	{
+	  _Jv_Utf8Const *sig_u = _Jv_makeUtf8Const ((char *) sig, -1);
+	  field_class = _Jv_FindClass (sig_u, NULL);
+	}
 
-  // FIXME: what if field_class == NULL?
+      // FIXME: what if field_class == NULL?
 
-  while (clazz != NULL)
-    {
-      jint count = (is_static
-		    ? JvNumStaticFields (clazz)
-		    : JvNumInstanceFields (clazz));
-      jfieldID field = (is_static
-			? JvGetFirstStaticField (clazz)
-			: JvGetFirstInstanceField (clazz));
-      for (jint i = 0; i < count; ++i)
+      while (clazz != NULL)
 	{
-	  // The field is resolved as a side effect of class
-	  // initialization.
-	  JvAssert (field->isResolved ());
+	  jint count = (is_static
+			? JvNumStaticFields (clazz)
+			: JvNumInstanceFields (clazz));
+	  jfieldID field = (is_static
+			    ? JvGetFirstStaticField (clazz)
+			    : JvGetFirstInstanceField (clazz));
+	  for (jint i = 0; i < count; ++i)
+	    {
+	      // The field is resolved as a side effect of class
+	      // initialization.
+	      JvAssert (field->isResolved ());
+
+	      _Jv_Utf8Const *f_name = field->getNameUtf8Const(clazz);
 
-	  _Jv_Utf8Const *f_name = field->getNameUtf8Const(clazz);
+	      if (_Jv_equalUtf8Consts (f_name, a_name)
+		  && field->getClass() == field_class)
+		return field;
 
-	  if (_Jv_equalUtf8Consts (f_name, a_name)
-	      && field->getClass() == field_class)
-	    return field;
+	      field = field->getNextField ();
+	    }
 
-	  field = field->getNextField ();
+	  clazz = clazz->getSuperclass ();
 	}
 
-      clazz = clazz->getSuperclass ();
+      env->ex = new java::lang::NoSuchFieldError ();
     }
-
-  env->ex = new java::lang::NoSuchFieldError ();
+  catch (jthrowable t)
+    {
+      env->ex = t;
+    }
   return NULL;
 }
 
@@ -960,9 +1037,16 @@
 static jstring
 _Jv_JNI_NewString (JNIEnv *env, const jchar *unichars, jsize len)
 {
-  // FIXME: exception processing.
-  jstring r = _Jv_NewString (unichars, len);
-  return (jstring) wrap_value (env, r);
+  try
+    {
+      jstring r = _Jv_NewString (unichars, len);
+      return (jstring) wrap_value (env, r);
+    }
+  catch (jthrowable t)
+    {
+      env->ex = t;
+      return NULL;
+    }
 }
 
 static jsize
@@ -990,9 +1074,16 @@
 static jstring
 _Jv_JNI_NewStringUTF (JNIEnv *env, const char *bytes)
 {
-  // FIXME: exception processing.
-  jstring result = JvNewStringUTF (bytes);
-  return (jstring) wrap_value (env, result);
+  try
+    {
+      jstring result = JvNewStringUTF (bytes);
+      return (jstring) wrap_value (env, result);
+    }
+  catch (jthrowable t)
+    {
+      env->ex = t;
+      return NULL;
+    }
 }
 
 static jsize
@@ -1002,18 +1093,25 @@
 }
 
 static const char *
-_Jv_JNI_GetStringUTFChars (JNIEnv *, jstring string, jboolean *isCopy)
+_Jv_JNI_GetStringUTFChars (JNIEnv *env, jstring string, jboolean *isCopy)
 {
   jsize len = JvGetStringUTFLength (string);
-  // FIXME: exception processing.
-  char *r = (char *) _Jv_Malloc (len + 1);
-  JvGetStringUTFRegion (string, 0, len, r);
-  r[len] = '\0';
+  try
+    {
+      char *r = (char *) _Jv_Malloc (len + 1);
+      JvGetStringUTFRegion (string, 0, len, r);
+      r[len] = '\0';
 
-  if (isCopy)
-    *isCopy = true;
+      if (isCopy)
+	*isCopy = true;
 
-  return (const char *) r;
+      return (const char *) r;
+    }
+  catch (jthrowable t)
+    {
+      env->ex = t;
+      return NULL;
+    }
 }
 
 static void
@@ -1029,7 +1127,16 @@
   jchar *result = _Jv_GetStringChars (string);
   if (start < 0 || start > string->length ()
       || len < 0 || start + len > string->length ())
-    env->ex = new java::lang::StringIndexOutOfBoundsException ();
+    {
+      try
+	{
+	  env->ex = new java::lang::StringIndexOutOfBoundsException ();
+	}
+      catch (jthrowable t)
+	{
+	  env->ex = t;
+	}
+    }
   else
     memcpy (buf, &result[start], len * sizeof (jchar));
 }
@@ -1040,7 +1147,16 @@
 {
   if (start < 0 || start > str->length ()
       || len < 0 || start + len > str->length ())
-    env->ex = new java::lang::StringIndexOutOfBoundsException ();
+    {
+      try
+	{
+	  env->ex = new java::lang::StringIndexOutOfBoundsException ();
+	}
+      catch (jthrowable t)
+	{
+	  env->ex = t;
+	}
+    }
   else
     _Jv_GetStringUTFRegion (str, start, len, buf);
 }
@@ -1070,9 +1186,16 @@
 _Jv_JNI_NewObjectArray (JNIEnv *env, jsize length, jclass elementClass,
 			jobject init)
 {
-  // FIXME: exception processing.
-  jarray result = JvNewObjectArray (length, elementClass, init);
-  return (jarray) wrap_value (env, result);
+  try
+    {
+      jarray result = JvNewObjectArray (length, elementClass, init);
+      return (jarray) wrap_value (env, result);
+    }
+  catch (jthrowable t)
+    {
+      env->ex = t;
+      return NULL;
+    }
 }
 
 static jobject
@@ -1083,21 +1206,34 @@
 }
 
 static void
-_Jv_JNI_SetObjectArrayElement (JNIEnv *, jobjectArray array, jsize index,
+_Jv_JNI_SetObjectArrayElement (JNIEnv *env, jobjectArray array, jsize index,
 			       jobject value)
 {
-  // FIXME: exception processing.
-  _Jv_CheckArrayStore (array, value);
-  jobject *elts = elements (array);
-  elts[index] = value;
+  try
+    {
+      _Jv_CheckArrayStore (array, value);
+      jobject *elts = elements (array);
+      elts[index] = value;
+    }
+  catch (jthrowable t)
+    {
+      env->ex = t;
+    }
 }
 
 template<typename T, jclass K>
 static JArray<T> *
 _Jv_JNI_NewPrimitiveArray (JNIEnv *env, jsize length)
 {
-  // FIXME: exception processing.
-  return (JArray<T> *) wrap_value (env, _Jv_NewPrimArray (K, length));
+  try
+    {
+      return (JArray<T> *) wrap_value (env, _Jv_NewPrimArray (K, length));
+    }
+  catch (jthrowable t)
+    {
+      env->ex = t;
+      return NULL;
+    }
 }
 
 template<typename T>
@@ -1134,8 +1270,16 @@
 {
   if (start < 0 || len >= array->length || start + len >= array->length)
     {
-      // FIXME: index.
-      env->ex = new java::lang::ArrayIndexOutOfBoundsException ();
+      try
+	{
+	  // FIXME: index.
+	  env->ex = new java::lang::ArrayIndexOutOfBoundsException ();
+	}
+      catch (jthrowable t)
+	{
+	  // Could have thown out of memory error.
+	  env->ex = t;
+	}
     }
   else
     {
@@ -1151,8 +1295,15 @@
 {
   if (start < 0 || len >= array->length || start + len >= array->length)
     {
-      // FIXME: index.
-      env->ex = new java::lang::ArrayIndexOutOfBoundsException ();
+      try
+	{
+	  // FIXME: index.
+	  env->ex = new java::lang::ArrayIndexOutOfBoundsException ();
+	}
+      catch (jthrowable t)
+	{
+	  env->ex = t;
+	}
     }
   else
     {
@@ -1181,19 +1332,31 @@
 }
 
 static jint
-_Jv_JNI_MonitorEnter (JNIEnv *, jobject obj)
+_Jv_JNI_MonitorEnter (JNIEnv *env, jobject obj)
 {
-  // FIXME: exception processing.
-  jint r = _Jv_MonitorEnter (obj);
-  return r;
+  try
+    {
+      return _Jv_MonitorEnter (obj);
+    }
+  catch (jthrowable t)
+    {
+      env->ex = t;
+    }
+  return JNI_ERR;
 }
 
 static jint
-_Jv_JNI_MonitorExit (JNIEnv *, jobject obj)
+_Jv_JNI_MonitorExit (JNIEnv *env, jobject obj)
 {
-  // FIXME: exception processing.
-  jint r = _Jv_MonitorExit (obj);
-  return r;
+  try
+    {
+      return _Jv_MonitorExit (obj);
+    }
+  catch (jthrowable t)
+    {
+      env->ex = t;
+    }
+  return JNI_ERR;
 }
 
 // JDK 1.2
@@ -1201,12 +1364,19 @@
 _Jv_JNI_ToReflectedField (JNIEnv *env, jclass cls, jfieldID fieldID,
 			  jboolean)
 {
-  // FIXME: exception processing.
-  java::lang::reflect::Field *field = new java::lang::reflect::Field();
-  field->declaringClass = cls;
-  field->offset = (char*) fieldID - (char *) cls->fields;
-  field->name = _Jv_NewStringUtf8Const (fieldID->getNameUtf8Const (cls));
-  return wrap_value (env, field);
+  try
+    {
+      java::lang::reflect::Field *field = new java::lang::reflect::Field();
+      field->declaringClass = cls;
+      field->offset = (char*) fieldID - (char *) cls->fields;
+      field->name = _Jv_NewStringUtf8Const (fieldID->getNameUtf8Const (cls));
+      return wrap_value (env, field);
+    }
+  catch (jthrowable t)
+    {
+      env->ex = t;
+    }
+  return NULL;
 }
 
 // JDK 1.2
@@ -1228,21 +1398,29 @@
   // FIXME.
   static _Jv_Utf8Const *init_name = _Jv_makeUtf8Const ("<init>", 6);
 
-  jobject result;
-  if (_Jv_equalUtf8Consts (id->name, init_name))
+  jobject result = NULL;
+
+  try
     {
-      // A constructor.
-      Constructor *cons = new Constructor ();
-      cons->offset = (char *) id - (char *) &klass->methods;
-      cons->declaringClass = klass;
-      result = cons;
+      if (_Jv_equalUtf8Consts (id->name, init_name))
+	{
+	  // A constructor.
+	  Constructor *cons = new Constructor ();
+	  cons->offset = (char *) id - (char *) &klass->methods;
+	  cons->declaringClass = klass;
+	  result = cons;
+	}
+      else
+	{
+	  Method *meth = new Method ();
+	  meth->offset = (char *) id - (char *) &klass->methods;
+	  meth->declaringClass = klass;
+	  result = meth;
+	}
     }
-  else
+  catch (jthrowable t)
     {
-      Method *meth = new Method ();
-      meth->offset = (char *) id - (char *) &klass->methods;
-      meth->declaringClass = klass;
-      result = meth;
+      env->ex = t;
     }
 
   return wrap_value (env, result);
@@ -1302,7 +1480,14 @@
       if (! found)
 	{
 	  jstring m = JvNewStringUTF (methods[j].name);
-	  _Jv_JNI_Throw (env, new java::lang::NoSuchMethodError (m));
+	  try
+	    {
+	      env->ex =new java::lang::NoSuchMethodError (m);
+	    }
+	  catch (jthrowable t)
+	    {
+	      env->ex = t;
+	    }
 	  return JNI_ERR;
 	}
     }
@@ -1545,7 +1730,14 @@
   // have been called simply to set the new JNIEnv.
   if (_Jv_ThreadCurrent () == NULL)
     {
-      (void) new gnu::gcj::jni::NativeThread (group, name);
+      try
+	{
+	  (void) new gnu::gcj::jni::NativeThread (group, name);
+	}
+      catch (jthrowable t)
+	{
+	  return JNI_ERR;
+	}
     }
   _Jv_SetCurrentJNIEnv (env);
 
@@ -1567,8 +1759,19 @@
   JNIEnv *env;
   if (_Jv_ThreadCurrent () != NULL)
     {
+      jstring main_name;
+      // This sucks.
+      try
+	{
+	  main_name = JvNewStringLatin1 ("main");
+	}
+      catch (jthrowable t)
+	{
+	  return JNI_ERR;
+	}
+
       jint r = _Jv_JNI_AttachCurrentThread (vm,
-					    JvNewStringLatin1 ("main"),
+					    main_name,
 					    reinterpret_cast<void **> (&env),
 					    NULL);
       if (r < 0)
Index: include/java-interp.h
===================================================================
RCS file: /cvs/java/libgcj/libjava/include/java-interp.h,v
retrieving revision 1.9
diff -u -r1.9 java-interp.h
--- java-interp.h	2000/02/18 21:22:06	1.9
+++ java-interp.h	2000/03/02 20:13:10
@@ -20,7 +20,6 @@
 
 #include <java/lang/Class.h>
 #include <java/lang/ClassLoader.h>
-#include <gnu/gcj/runtime/MethodInvocation.h>
 
 extern "C" {
 #include <ffi.h>
@@ -135,7 +134,6 @@
 
   friend class _Jv_ClassReader;
   friend class _Jv_InterpMethodInvocation;
-  friend class gnu::gcj::runtime::MethodInvocation;
 
   friend void _Jv_PrepareClass(jclass);
 };
Index: java/lang/Class.h
===================================================================
RCS file: /cvs/java/libgcj/libjava/java/lang/Class.h,v
retrieving revision 1.15
diff -u -r1.15 Class.h
--- Class.h	2000/01/26 23:56:36	1.15
+++ Class.h	2000/03/02 20:13:18
@@ -157,9 +157,6 @@
 private:
   void checkMemberAccess (jint flags);
 
-  // Various functions to handle class initialization.
-  java::lang::Throwable *hackTrampoline (jint, java::lang::Throwable *);
-  void hackRunInitializers (void);
   void initializeClass (void);
 
   // Friend functions implemented in natClass.cc.
Index: java/lang/Class.java
===================================================================
RCS file: /cvs/java/libgcj/libjava/java/lang/Class.java,v
retrieving revision 1.7
diff -u -r1.7 Class.java
--- Class.java	2000/01/19 18:39:25	1.7
+++ Class.java	2000/03/02 20:13:18
@@ -172,32 +172,6 @@
       sm.checkMemberAccess(this, flags);
   }
 
-  // FIXME: this method exists only because we cannot catch Java
-  // exceptions from C++ code.  This is a helper for initializeClass.
-  private Throwable hackTrampoline (int what, Throwable old_exception)
-    {
-      Throwable new_val = null;
-      try
-	{
-	  if (what == 0)
-	    initializeClass ();
-	  else if (what == 1)
-	    hackRunInitializers ();
-	  else if (what == 2)
-	    new_val = new ExceptionInInitializerError (old_exception);
-	}
-      catch (Throwable t)
-	{
-	  new_val = t;
-	}
-      return new_val;
-    }
-
-  // FIXME: this is a hack to let us run the class initializers.  We
-  // could do it inline in initializeClass() if we could catch Java
-  // exceptions from C++.
-  private native void hackRunInitializers ();
-
   // Initialize the class.
   private native void initializeClass ();
 
Index: java/lang/ClassLoader.java
===================================================================
RCS file: /cvs/java/libgcj/libjava/java/lang/ClassLoader.java,v
retrieving revision 1.7
diff -u -r1.7 ClassLoader.java
--- ClassLoader.java	2000/01/19 18:39:25	1.7
+++ ClassLoader.java	2000/03/02 20:13:19
@@ -1,6 +1,6 @@
 // ClassLoader.java - Define policies for loading Java classes.
 
-/* Copyright (C) 1998, 1999  Red Hat, Inc.
+/* Copyright (C) 1998, 1999, 2000  Red Hat, Inc.
 
    This file is part of libgcj.
 
@@ -233,28 +233,6 @@
 				     int len)
     throws java.lang.ClassNotFoundException, java.lang.LinkageError;
 
-
-  /** This is called by defineClass0, once the "raw" and uninitialized
-   * class object has been created, and handles exceptions generated
-   * while actually defining the class (_Jv_DefineClass).  defineClass0
-   * holds the lock on the new class object, so it needs to capture
-   * these exceptions.  */
-
-  private static Throwable defineClass1 (Class klass, byte[] data,
-					 int offset, int length)
-  {
-    try {
-      defineClass2 (klass, data, offset, length);
-    } catch (Throwable x) {
-      return x;
-    }
-    return null;
-  }
- 
-  /** This is just a wrapper for _Jv_DefineClass */
-  private static native void defineClass2 (Class klass, byte[] data, 
-				    int offset, int length)
-    throws Throwable;
 
   /** 
    * Link the given class.  This will bring the class to a state where
Index: java/lang/Object.h
===================================================================
RCS file: /cvs/java/libgcj/libjava/java/lang/Object.h,v
retrieving revision 1.3
diff -u -r1.3 Object.h
--- Object.h	2000/01/19 18:39:26	1.3
+++ Object.h	2000/03/02 20:13:19
@@ -1,6 +1,6 @@
 // Object.h - Header file for java.lang.Object.  -*- c++ -*-
 
-/* Copyright (C) 1998, 1999  Red Hat, Inc.
+/* Copyright (C) 1998, 1999, 2000  Red Hat, Inc.
 
    This file is part of libgcj.
 
@@ -69,8 +69,6 @@
 
   // Initialize the sync_info field.
   void sync_init (void);
-
-  static void hack12_6 (jobject f);
 };
 
 #endif /* __JAVA_LANG_OBJECT_H__ */
Index: java/lang/Object.java
===================================================================
RCS file: /cvs/java/libgcj/libjava/java/lang/Object.java,v
retrieving revision 1.2
diff -u -r1.2 Object.java
--- Object.java	2000/01/19 18:39:26	1.2
+++ Object.java	2000/03/02 20:13:19
@@ -1,6 +1,6 @@
 // Object.java - The root of all evil.
 
-/* Copyright (C) 1998, 1999  Red Hat, Inc.
+/* Copyright (C) 1998, 1999, 2000  Red Hat, Inc.
 
    This file is part of libgcj.
 
@@ -65,21 +65,6 @@
   // This initializes the sync_info member.  It is here for
   // completeness (some day we'll be able to auto-generate Object.h).
   private final native void sync_init ();
-
-  // This exists as a workaround for the fact that we can't catch a
-  // Java Exception from C++.  This is from section 12.6 of the Java
-  // Language Spec.  FIXME: remove this once exception processing
-  // works.
-  private static final void hack12_6 (Object f)
-  {
-    try
-      {
-	f.finalize();
-      }
-    catch (Throwable x)
-      {
-      }
-  }
 
   // Note that we don't mention the sync_info field here.  If we do,
   // jc1 will not work correctly.
Index: java/lang/Thread.java
===================================================================
RCS file: /cvs/java/libgcj/libjava/java/lang/Thread.java,v
retrieving revision 1.6
diff -u -r1.6 Thread.java
--- Thread.java	2000/02/15 08:47:16	1.6
+++ Thread.java	2000/03/02 20:13:19
@@ -116,8 +116,8 @@
   public final native void resume ();
 
   // This method exists only to avoid a warning from the C++ compiler.
-  private static final native void run__ (Object obj);
-  private native final void finish_ ();
+  private static final native void run_ (Object obj);
+  private final native void finish_ ();
 
   // Convenience method to check and clear the thread's interrupted status.  
   private boolean isInterrupted_ ()
@@ -127,28 +127,6 @@
     return r;
   }
   
-  private final void run_ ()
-  {
-    try
-      {
-	run ();
-      }
-    catch (Throwable e)
-      {
-	// Uncaught exceptions are forwarded to the ThreadGroup.  If
-	// this results in an uncaught exception, that is ignored.
-	try
-	  {
-	    group.uncaughtException(this, e);
-	  }
-	catch (Throwable f)
-	  {
-	    // Nothing.
-	  }
-      }
-    finish_ ();
-  }
-
   public void run ()
   {
     if (runnable != null)
Index: java/lang/natClass.cc
===================================================================
RCS file: /cvs/java/libgcj/libjava/java/lang/natClass.cc,v
retrieving revision 1.16
diff -u -r1.16 natClass.cc
--- natClass.cc	2000/01/19 18:39:26	1.16
+++ natClass.cc	2000/03/02 20:13:19
@@ -27,6 +27,7 @@
 #include <java/lang/reflect/Constructor.h>
 #include <java/lang/AbstractMethodError.h>
 #include <java/lang/ClassNotFoundException.h>
+#include <java/lang/ExceptionInInitializerError.h>
 #include <java/lang/IllegalAccessException.h>
 #include <java/lang/IllegalAccessError.h>
 #include <java/lang/IncompatibleClassChangeError.h>
@@ -690,15 +691,6 @@
 #endif
 }
 
-// FIXME.
-void
-java::lang::Class::hackRunInitializers (void)
-{
-  _Jv_Method *meth = _Jv_GetMethodLocal (this, clinit_name, void_signature);
-  if (meth)
-    ((void (*) (void)) meth->ncode) ();
-}
-
 // This implements the initialization process for a class.  From Spec
 // section 12.4.2.
 void
@@ -764,46 +756,53 @@
   // Step 7.
   if (! isInterface () && superclass)
     {
-      // FIXME: We can't currently catch a Java exception in C++ code.
-      // So instead we call a Java trampoline.  It returns an
-      // exception, or null.
-      jobject except = superclass->hackTrampoline(0, NULL);
-      if (except)
+      try
 	{
+	  superclass->initializeClass ();
+	}
+      catch (java::lang::Throwable *except)
+	{
 	  // Caught an exception.
 	  _Jv_MonitorEnter (this);
 	  state = JV_STATE_ERROR;
 	  notifyAll ();
 	  _Jv_MonitorExit (this);
-	  JvThrow (except);
+	  throw except;
 	}
     }
 
-  // Step 8.
-  // FIXME: once again we have to go through a trampoline.
-  java::lang::Throwable *except = hackTrampoline (1, NULL);
-
-  // Steps 9, 10, 11.
-  if (! except)
+  // Steps 8, 9, 10, 11.
+  try
     {
-      _Jv_MonitorEnter (this);
-      state = JV_STATE_DONE;
+      _Jv_Method *meth = _Jv_GetMethodLocal (this, clinit_name,
+					     void_signature);
+      if (meth)
+	((void (*) (void)) meth->ncode) ();
     }
-  else
+  catch (java::lang::Throwable *except)
     {
       if (! ErrorClass.isInstance(except))
 	{
-	  // Once again we must use the trampoline.  In this case we
-	  // have to detect an OutOfMemoryError.
-	  except = hackTrampoline(2, except);
+	  try
+	    {
+	      except = new ExceptionInInitializerError (except);
+	    }
+	  catch (java::lang::Throwable *t)
+	    {
+	      except = t;
+	    }
 	}
       _Jv_MonitorEnter (this);
       state = JV_STATE_ERROR;
+      notifyAll ();
+      _Jv_MonitorExit (this);
+      JvThrow (except);
     }
+
+  _Jv_MonitorEnter (this);
+  state = JV_STATE_DONE;
   notifyAll ();
   _Jv_MonitorExit (this);
-  if (except)
-    JvThrow (except);
 }
 
 
Index: java/lang/natClassLoader.cc
===================================================================
RCS file: /cvs/java/libgcj/libjava/java/lang/natClassLoader.cc,v
retrieving revision 1.17
diff -u -r1.17 natClassLoader.cc
--- natClassLoader.cc	2000/02/10 17:15:22	1.17
+++ natClassLoader.cc	2000/03/02 20:13:20
@@ -58,15 +58,6 @@
   return system;
 }
 
-void
-java::lang::ClassLoader::defineClass2 (jclass klass, jbyteArray data,
-				       jint offset, jint length)
-{
-#ifdef INTERPRETER
-  _Jv_DefineClass (klass, data, offset, length);
-#endif
-}
-
 java::lang::Class *
 java::lang::ClassLoader::defineClass0 (jstring name,
 				       jbyteArray data, 
@@ -94,11 +85,11 @@
       klass->name = name2;
     }
 
-  // this will do the magic.  loadInto also operates
-  // as an exception trampoline for now...
-  Throwable *ex = defineClass1 (klass, data, offset, length);
-    
-  if (ex)  // we failed to load it
+  try
+    {
+      _Jv_DefineClass (klass, data, offset, length);
+    }
+  catch (java::lang::Throwable *ex)
     {
       klass->state = JV_STATE_ERROR;
       klass->notifyAll ();
@@ -106,15 +97,15 @@
       _Jv_UnregisterClass (klass);
 
       _Jv_MonitorExit (klass);
-	  
+
       // FIXME: Here we may want to test that EX does
       // indeed represent a valid exception.  That is,
       // anything but ClassNotFoundException, 
       // or some kind of Error.
-	  
+
       JvThrow (ex);
     }
-    
+
   // if everything proceeded sucessfully, we're loaded.
   JvAssert (klass->state == JV_STATE_LOADED);
 
Index: java/lang/natObject.cc
===================================================================
RCS file: /cvs/java/libgcj/libjava/java/lang/natObject.cc,v
retrieving revision 1.6
diff -u -r1.6 natObject.cc
--- natObject.cc	2000/01/19 18:39:26	1.6
+++ natObject.cc	2000/03/02 20:13:20
@@ -1,6 +1,6 @@
 // natObject.cc - Implementation of the Object class.
 
-/* Copyright (C) 1998, 1999  Red Hat, Inc.
+/* Copyright (C) 1998, 1999, 2000  Red Hat, Inc.
 
    This file is part of libgcj.
 
@@ -242,5 +242,13 @@
 void
 _Jv_FinalizeObject (jobject obj)
 {
-  java::lang::Object::hack12_6(obj);
+  // Ignore exceptions.  From section 12.6 of the Java Language Spec.
+  try
+    {
+      obj->finalize ();
+    }
+  catch (java::lang::Throwable *t)
+    {
+      // Ignore.
+    }
 }
Index: java/lang/natThread.cc
===================================================================
RCS file: /cvs/java/libgcj/libjava/java/lang/natThread.cc,v
retrieving revision 1.13
diff -u -r1.13 natThread.cc
--- natThread.cc	2000/02/15 08:47:16	1.13
+++ natThread.cc	2000/03/02 20:13:21
@@ -263,9 +263,9 @@
 }
 
 void
-java::lang::Thread::finish_ (void)
+java::lang::Thread::finish_ ()
 {
-  // Notify all threads waiting to join this thread.
+  // Notify all threads waiting to join this this.
   _Jv_MonitorEnter (this);
   alive_flag = false;
 
@@ -285,10 +285,28 @@
 }
 
 void
-java::lang::Thread::run__ (jobject obj)
+java::lang::Thread::run_ (jobject obj)
 {
   java::lang::Thread *thread = (java::lang::Thread *) obj;
-  thread->run_ ();
+  try
+    {
+      thread->run ();
+    }
+  catch (java::lang::Throwable *t)
+    {
+      // Uncaught exceptions are forwarded to the ThreadGroup.  If
+      // this results in an uncaught exception, that is ignored.
+      try
+	{
+	  thread->group->uncaughtException (thread, t);
+	}
+      catch (java::lang::Throwable *f)
+	{
+	  // Nothing.
+	}
+    }
+
+  thread->finish_ ();
 }
 
 void
@@ -301,7 +319,7 @@
 
   alive_flag = true;
   natThread *nt = (natThread *) data;
-  _Jv_ThreadStart (this, nt->thread, (_Jv_ThreadStartFunc *) &run__);
+  _Jv_ThreadStart (this, nt->thread, (_Jv_ThreadStartFunc *) &run_);
 }
 
 void
Index: java/lang/reflect/Method.java
===================================================================
RCS file: /cvs/java/libgcj/libjava/java/lang/reflect/Method.java,v
retrieving revision 1.5
diff -u -r1.5 Method.java
--- Method.java	2000/01/19 18:39:26	1.5
+++ Method.java	2000/03/02 20:13:21
@@ -1,6 +1,6 @@
 // Method.java - Represent method of class or interface.
 
-/* Copyright (C) 1998, 1999  Red Hat, Inc.
+/* Copyright (C) 1998, 1999, 2000  Red Hat, Inc.
 
    This file is part of libgcj.
 
@@ -67,30 +67,6 @@
       // FIXME.
       return name.hashCode() + declaringClass.getName().hashCode();
     }
-
-  // This is used to perform an actual method call via ffi.
-  private static final native void hack_call (RawData cif,
-					      RawData method,
-					      RawData ret_value,
-					      RawData values);
-
-  // Perform an ffi call while capturing exceptions.  We have to do
-  // this because we can't catch Java exceptions from C++.
-  static final Throwable hack_trampoline (RawData cif,
-					  RawData method,
-					  RawData ret_value,
-					  RawData values)
-  {
-    try
-      {
-	hack_call (cif, method, ret_value, values);
-      }
-    catch (Throwable x)
-      {
-	return x;
-      }
-    return null;
-  }
 
   public native Object invoke (Object obj, Object[] args)
     throws IllegalAccessException, IllegalArgumentException,
Index: java/lang/reflect/natMethod.cc
===================================================================
RCS file: /cvs/java/libgcj/libjava/java/lang/reflect/natMethod.cc,v
retrieving revision 1.8
diff -u -r1.8 natMethod.cc
--- natMethod.cc	2000/01/21 23:50:31	1.8
+++ natMethod.cc	2000/03/02 20:13:23
@@ -152,21 +152,6 @@
   return r;
 }
 
-// Actually perform an FFI call.
-void
-java::lang::reflect::Method::hack_call (gnu::gcj::RawData *rcif,
-					gnu::gcj::RawData *rmethod,
-					gnu::gcj::RawData *rret_value,
-					gnu::gcj::RawData *rvalues)
-{
-  ffi_cif *cif = (ffi_cif *) rcif;
-  void (*method) (...) = (void (*) (...)) rmethod;
-  void *ret_value = (void *) rret_value;
-  void **values = (void **) rvalues;
-
-  ffi_call (cif, method, ret_value, values);
-}
-
 jobject
 java::lang::reflect::Method::invoke (jobject obj, jobjectArray args)
 {
@@ -419,19 +404,23 @@
 
   // FIXME: initialize class here.
 
-  java::lang::Throwable *ex;
   using namespace java::lang;
   using namespace java::lang::reflect;
-  ex = Method::hack_trampoline ((gnu::gcj::RawData *) &cif,
-				(gnu::gcj::RawData *) meth->ncode,
-				(gnu::gcj::RawData *) result,
-				(gnu::gcj::RawData *) values);
-
-  if (ex)
-    // FIXME: this is wrong for JNI.  But if we just return the
-    // exception, then the non-JNI cases won't be able to distinguish
-    // it from exceptions we might generate ourselves.  Sigh.
-    ex = new InvocationTargetException (ex);
+
+  Throwable *ex = NULL;
+
+  try
+    {
+      ffi_call (&cif, (void (*) (...)) meth->ncode, result, values);
+    }
+  catch (Throwable *ex2)
+    {
+      // FIXME: this is wrong for JNI.  But if we just return the
+      // exception, then the non-JNI cases won't be able to
+      // distinguish it from exceptions we might generate ourselves.
+      // Sigh.
+      ex = new InvocationTargetException (ex2);
+    }
 
   if (is_constructor)
     result->l = obj;

From java-patches-return-531-listarch-java-patches=sourceware.cygnus.com@sourceware.cygnus.com Fri Mar 03 01:19:21 2000
Return-Path: <java-patches-return-531-listarch-java-patches=sourceware.cygnus.com@sourceware.cygnus.com>
Delivered-To: listarch-java-patches@sourceware.cygnus.com
Received: (qmail 4706 invoked by alias); 3 Mar 2000 01:19:20 -0000
Mailing-List: contact java-patches-help@sourceware.cygnus.com; run by ezmlm
Precedence: bulk
List-Subscribe: <mailto:java-patches-subscribe@sourceware.cygnus.com>
List-Archive: <http://sourceware.cygnus.com/ml/java-patches/>
List-Post: <mailto:java-patches@sourceware.cygnus.com>
List-Help: <mailto:java-patches-help@sourceware.cygnus.com>, <http://sourceware.cygnus.com/ml/#faqs>
Sender: java-patches-owner@sourceware.cygnus.com
Delivered-To: mailing list java-patches@sourceware.cygnus.com
Received: (qmail 4671 invoked from network); 3 Mar 2000 01:19:17 -0000
To: Java Patch List <java-patches@sourceware.cygnus.com> 
Subject: Patch: patch for IA-64 libffi
X-Zippy:  My haircut is totally traditional!
X-Attribution:  Tom
Bcc:
Reply-To:  tromey@cygnus.com
From:  Tom Tromey <tromey@cygnus.com>
Date: 02 Mar 2000 18:20:26 -0700
Message-ID: <87bt4walyd.fsf@cygnus.com>
Lines: 27
X-Mailer: Gnus v5.5/Emacs 20.3

I'm checking in this patch, which fixes a bug in the build of the
IA-64 libffi code.

2000-03-02  Tom Tromey  <tromey@cygnus.com>

	* Makefile.in: Rebuilt.
	* Makefile.am (TARGET_SRC_IA64): Use `ia64', not `alpha', as
	directory name.

Tom

Index: Makefile.am
===================================================================
RCS file: /cvs/java/libgcj/libffi/Makefile.am,v
retrieving revision 1.5
diff -u -r1.5 Makefile.am
--- Makefile.am	2000/02/25 19:13:43	1.5
+++ Makefile.am	2000/03/03 01:18:19
@@ -42,7 +42,7 @@
 TARGET_SRC_X86 = src/x86/ffi.c src/x86/sysv.S
 TARGET_SRC_SPARC = src/sparc/ffi.c src/sparc/v8.S
 TARGET_SRC_ALPHA = src/alpha/ffi.c src/alpha/osf.S
-TARGET_SRC_IA64 = src/alpha/ffi.c src/alpha/unix.S
+TARGET_SRC_IA64 = src/ia64/ffi.c src/ia64/unix.S
 TARGET_SRC_M68K = src/m68k/ffi.c src/m68k/sysv.S
 TARGET_SRC_POWERPC = src/powerpc/ffi.c src/powerpc/sysv.S
 TARGET_SRC_ARM =  src/arm/sysv.S src/arm/ffi.c

From java-patches-return-532-listarch-java-patches=sourceware.cygnus.com@sourceware.cygnus.com Fri Mar 03 16:58:29 2000
Return-Path: <java-patches-return-532-listarch-java-patches=sourceware.cygnus.com@sourceware.cygnus.com>
Delivered-To: listarch-java-patches@sourceware.cygnus.com
Received: (qmail 3330 invoked by alias); 3 Mar 2000 16:58:28 -0000
Mailing-List: contact java-patches-help@sourceware.cygnus.com; run by ezmlm
Precedence: bulk
List-Subscribe: <mailto:java-patches-subscribe@sourceware.cygnus.com>
List-Archive: <http://sourceware.cygnus.com/ml/java-patches/>
List-Post: <mailto:java-patches@sourceware.cygnus.com>
List-Help: <mailto:java-patches-help@sourceware.cygnus.com>, <http://sourceware.cygnus.com/ml/#faqs>
Sender: java-patches-owner@sourceware.cygnus.com
Delivered-To: mailing list java-patches@sourceware.cygnus.com
Received: (qmail 3309 invoked from network); 3 Mar 2000 16:58:25 -0000
To: Java Patch List <java-patches@sourceware.cygnus.com> 
Cc: Andrew Haley <aph@cygnus.com> 
Subject: Patch: libffi multilibs
X-Zippy:  Are we THERE yet?
X-Attribution:  Tom
Bcc:
Reply-To:  tromey@cygnus.com
From:  Tom Tromey <tromey@cygnus.com>
Date: 03 Mar 2000 09:59:44 -0700
Message-ID: <8766v49egv.fsf@cygnus.com>
Lines: 79
X-Mailer: Gnus v5.5/Emacs 20.3

I'm committing this patch.
It adds multilib support to libffi's configure.in.
I can't conveniently test this patch :-(

2000-03-03  Tom Tromey  <tromey@cygnus.com>

	* configure: Rebuilt.
	* configure.in (--enable-multilib): New option.
	(libffi_basedir): New subst.
	(AC_OUTPUT): Added multilib code.

Tom

Index: configure.in
===================================================================
RCS file: /cvs/java/libgcj/libffi/configure.in,v
retrieving revision 1.4
diff -u -r1.4 configure.in
--- configure.in	2000/02/25 19:13:43	1.4
+++ configure.in	2000/03/03 16:56:24
@@ -9,6 +9,29 @@
 AC_MSG_WARN(***********************************************************)
 AC_MSG_WARN(***********************************************************)
 
+dnl Default to --enable-multilib
+AC_ARG_ENABLE(multilib,
+[  --enable-multilib       build many library versions (default)],
+[case "${enableval}" in
+  yes) multilib=yes ;;
+  no)  multilib=no ;;
+  *)   AC_MSG_ERROR(bad value ${enableval} for multilib option) ;;
+ esac], [multilib=yes])dnl
+
+dnl We may get other options which we don't document:
+dnl --with-target-subdir, --with-multisrctop, --with-multisubdir
+
+if test "${srcdir}" = "."; then
+  if test "${with_target_subdir}" != "."; then
+    libffi_basedir="${srcdir}/${with_multisrctop}.."
+  else
+    libffi_basedir="${srcdir}/${with_multisrctop}"
+  fi
+else
+  libffi_basedir="${srcdir}"
+fi
+AC_SUBST(libffi_basedir)
+
 AC_CANONICAL_HOST
 
 AM_INIT_AUTOMAKE(libffi,2.00-beta,no-define)
@@ -80,7 +103,27 @@
 
 AM_CONDITIONAL(USE_LIBDIR, test -z "$with_cross_host")
 
-AC_OUTPUT(include/Makefile include/ffi.h Makefile,, 
+if test "${multilib}" = "yes"; then
+  multilib_arg="--enable-multilib"
+else
+  multilib_arg=
+fi
+
+AC_OUTPUT(include/Makefile include/ffi.h Makefile,
+[
+if test -n "$CONFIG_FILES"; then
+   ac_file=Makefile . ${libffi_basedir}/../config-ml.in
+fi
+],
+srcdir=${srcdir}
+host=${host}
+target=${target}
+with_multisubdir=${with_multisubdir}
+ac_configure_args="${multilib_arg} ${ac_configure_args}"
+CONFIG_SHELL=${CONFIG_SHELL-/bin/sh}
+libffi_basedir=${libffi_basedir}
+CC="${CC}"
+DEFS="$DEFS"
 test ! -d include && mkdir include
 test ! -f include/fficonfig.h && cp fficonfig.h include/fficonfig.h
 if cmp -s fficonfig.h include/fficonfig.h 2>/dev/null; then 

From java-patches-return-533-listarch-java-patches=sourceware.cygnus.com@sourceware.cygnus.com Fri Mar 03 19:33:18 2000
Return-Path: <java-patches-return-533-listarch-java-patches=sourceware.cygnus.com@sourceware.cygnus.com>
Delivered-To: listarch-java-patches@sourceware.cygnus.com
Received: (qmail 4965 invoked by alias); 3 Mar 2000 19:33:18 -0000
Mailing-List: contact java-patches-help@sourceware.cygnus.com; run by ezmlm
Precedence: bulk
List-Subscribe: <mailto:java-patches-subscribe@sourceware.cygnus.com>
List-Archive: <http://sourceware.cygnus.com/ml/java-patches/>
List-Post: <mailto:java-patches@sourceware.cygnus.com>
List-Help: <mailto:java-patches-help@sourceware.cygnus.com>, <http://sourceware.cygnus.com/ml/#faqs>
Sender: java-patches-owner@sourceware.cygnus.com
Delivered-To: mailing list java-patches@sourceware.cygnus.com
Received: (qmail 4928 invoked from network); 3 Mar 2000 19:33:12 -0000
To: Java Patch List <java-patches@sourceware.cygnus.com> 
Subject: Patch: ia64 -vs- libffi
X-Zippy:  Do you need any MOUTH-TO-MOUTH resuscitation?
X-Attribution:  Tom
Bcc:
Reply-To:  tromey@cygnus.com
From:  Tom Tromey <tromey@cygnus.com>
Date: 03 Mar 2000 12:34:28 -0700
Message-ID: <874sanalvf.fsf@cygnus.com>
Lines: 29
X-Mailer: Gnus v5.5/Emacs 20.3

I'm committing this patch, which fixes a dumb problem I introduced.
libffi uses a version of automake which is unfindable (it was never
released and the current cvs automake is too different).  So while
editing Makefile.in hand (shame, shame) I screwed up.

2000-03-03  Tom Tromey  <tromey@cygnus.com>

	* Makefile.in: Fixed ia64 by hand.

Tom

Index: Makefile.in
===================================================================
RCS file: /cvs/java/libgcj/libffi/Makefile.in,v
retrieving revision 1.8
diff -u -r1.8 Makefile.in
--- Makefile.in	2000/03/03 01:19:22	1.8
+++ Makefile.in	2000/03/03 19:30:40
@@ -116,8 +116,8 @@
 TARGET_SRC_MIPS_SGI = src/mips/ffi.c src/mips/o32.s src/mips/n32.s
 TARGET_SRC_X86 = src/x86/ffi.c src/x86/sysv.S
 TARGET_SRC_SPARC = src/sparc/ffi.c src/sparc/v8.S
-TARGET_SRC_ALPHA = src/ia64/ffi.c src/ia64/osf.S
-TARGET_SRC_IA64 = src/alpha/ffi.c src/alpha/unix.S
+TARGET_SRC_ALPHA = src/alpha/ffi.c src/alpha/osf.S
+TARGET_SRC_IA64 = src/ia64/ffi.c src/ia64/unix.S
 TARGET_SRC_M68K = src/m68k/ffi.c src/m68k/sysv.S
 TARGET_SRC_POWERPC = src/powerpc/ffi.c src/powerpc/sysv.S
 TARGET_SRC_ARM = src/arm/sysv.S src/arm/ffi.c

From java-patches-return-534-listarch-java-patches=sourceware.cygnus.com@sourceware.cygnus.com Sat Mar 04 21:51:12 2000
Return-Path: <java-patches-return-534-listarch-java-patches=sourceware.cygnus.com@sourceware.cygnus.com>
Delivered-To: listarch-java-patches@sourceware.cygnus.com
Received: (qmail 29996 invoked by alias); 4 Mar 2000 21:51:11 -0000
Mailing-List: contact java-patches-help@sourceware.cygnus.com; run by ezmlm
Precedence: bulk
List-Subscribe: <mailto:java-patches-subscribe@sourceware.cygnus.com>
List-Archive: <http://sourceware.cygnus.com/ml/java-patches/>
List-Post: <mailto:java-patches@sourceware.cygnus.com>
List-Help: <mailto:java-patches-help@sourceware.cygnus.com>, <http://sourceware.cygnus.com/ml/#faqs>
Sender: java-patches-owner@sourceware.cygnus.com
Delivered-To: mailing list java-patches@sourceware.cygnus.com
Received: (qmail 29966 invoked from network); 4 Mar 2000 21:51:10 -0000
Date: Sat, 4 Mar 2000 13:51:09 -0800
Message-Id: <200003042151.NAA04490@hoser.cygnus.com>
X-Authentication-Warning: hoser.cygnus.com: green set sender to green@cygnus.com using -f
From: Anthony Green <green@cygnus.com>
To: java-patches@sourceware.cygnus.com
Subject: Patch: libgcj-test.spec
X-Organization: Red Hat, Sunnyvale, California
X-URL: http://www.cygnus.com/~green
Reply-to: green@redhat.com


I'm checking the following patch in...

This patch creates a new spec file called libgcj-test.spec.  This file
adds -L and -rpath flags pointing at the target library build
directories.

This should make adding proper java tests to gdb much easier.  We can
also use it to clean up the expect hacks in the libjava testing
framework.

Rather than write a bunch of tcl code to guess which libraries to
include and how - simply use this specs file.  It will set up the
library paths for linking _and_ running.

2000-03-04  Anthony Green  <green@redhat.com>

	* configure: Rebuilt.
	* configure.in (ZLIBTESTSPEC): New macro.
	(GCTESTSPEC): New macro.
	(LIBGCJTESTSPEC): New macro.
	* libgcj-test.spec.in: New file.

Index: libjava/libgcj-test.spec.in
===================================================================
RCS file: libgcj-test.spec.in
diff -N libgcj-test.spec.in
*** /dev/null	Tue May  5 13:32:27 1998
--- libgcj-test.spec.in	Sat Mar  4 13:40:14 2000
***************
*** 0 ****
--- 1,7 ----
+ #
+ # This spec file is read by gcj when linking.
+ # It is only used by the testing harnesses (in libjava and gdb).
+ #
+ %rename lib liborig2
+ *lib: @LIBGCJTESTSPEC@ @GCTESTSPEC@ @ZLIBTESTSPEC@ %(liborig2)
+ 
Index: libjava/configure.in
===================================================================
RCS file: /cvs/java/libgcj/libjava/configure.in,v
retrieving revision 1.52
diff -p -r1.52 configure.in
*** configure.in	2000/01/31 04:53:47	1.52
--- configure.in	2000/03/04 21:40:14
*************** AC_LINK_FILES(java/lang/nat${PROCESS}Pro
*** 174,183 ****
--- 174,188 ----
  SYSTEMSPEC=
  AC_SUBST(SYSTEMSPEC)
  
+ LIBGCJTESTSPEC="-L`pwd`/.libs -rpath `pwd`/.libs"
+ AC_SUBST(LIBGCJTESTSPEC)
+ 
  AC_ARG_WITH(system-zlib,
  [  --with-system-zlib      use installed libz])
  ZLIBSPEC=
  AC_SUBST(ZLIBSPEC)
+ ZLIBTESTSPEC=
+ AC_SUBST(ZLIBTESTSPEC)
  
  dnl FIXME: this should be _libs on some hosts.
  libsubdir=.libs
*************** GCINCS=
*** 195,200 ****
--- 200,206 ----
  GCDEPS=
  GCOBJS=
  GCSPEC=
+ GCTESTSPEC=
  case "$GC" in
   boehm)
      AC_MSG_RESULT(boehm)
*************** case "$GC" in
*** 204,209 ****
--- 210,216 ----
      GCLIBS="$GCDEPS -L\$(here)/../boehm-gc/$libsubdir"
      GCINCS='-I$(top_srcdir)/../boehm-gc -I$(top_builddir)/../boehm-gc'
      GCSPEC='-lgcjgc'
+     GCTESTSPEC="-L`pwd`/../boehm-gc/.libs -rpath `pwd`/../boehm-gc/.libs"
      dnl We also want to pick up some cpp flags required when including
      dnl boehm-config.h.  Yuck.
      GCINCS="$GCINCS `cat ../boehm-gc/boehm-cflags`"
*************** AC_SUBST(GCINCS)
*** 226,231 ****
--- 233,239 ----
  AC_SUBST(GCDEPS)
  AC_SUBST(GCOBJS)
  AC_SUBST(GCSPEC)
+ AC_SUBST(GCTESTSPEC)
  AC_LINK_FILES(include/$GCHDR, include/java-gc.h)
  
  
*************** if test -n "${with_cross_host}"; then
*** 358,363 ****
--- 366,372 ----
     AC_DEFINE(NO_GETUID)
  
     ZLIBSPEC=-lzgcj
+    ZLIBTESTSPEC="-L`pwd`/../zlib/.libs -rpath `pwd`/../zlib/.libs"
  
     # If Canadian cross, then don't pick up tools from the build
     # directory.
*************** else
*** 546,551 ****
--- 555,561 ----
        AC_CHECK_LIB(z, deflate, ZLIBSPEC=-lz, ZLIBSPEC=-lzgcj)
     else
        ZLIBSPEC=-lzgcj
+       ZLIBTESTSPEC="-L`pwd`/../zlib/.libs -rpath `pwd`/../zlib/.libs"
     fi
  
     # On Solaris, and maybe other architectures, the Boehm collector
*************** fi
*** 720,726 ****
  here=`pwd`
  AC_SUBST(here)
  
! AC_OUTPUT(Makefile libgcj.spec gcj/Makefile include/Makefile testsuite/Makefile,
  [if test -n "$CONFIG_FILES"; then
    ac_file=Makefile . ${libgcj_basedir}/../config-ml.in
  fi],
--- 730,736 ----
  here=`pwd`
  AC_SUBST(here)
  
! AC_OUTPUT(Makefile libgcj.spec libgcj-test.spec gcj/Makefile include/Makefile testsuite/Makefile,
  [if test -n "$CONFIG_FILES"; then
    ac_file=Makefile . ${libgcj_basedir}/../config-ml.in
  fi],
Index: libjava/configure
===================================================================
RCS file: /cvs/java/libgcj/libjava/configure,v
retrieving revision 1.54
diff -p -r1.54 configure
*** configure	2000/01/31 04:53:47	1.54
--- configure	2000/03/04 21:40:18
*************** test -d java/lang || mkdir java/lang
*** 2392,2397 ****
--- 2392,2400 ----
  SYSTEMSPEC=
  
  
+ LIBGCJTESTSPEC="-L`pwd`/.libs -rpath `pwd`/.libs"
+ 
+ 
  # Check whether --with-system-zlib or --without-system-zlib was given.
  if test "${with_system_zlib+set}" = set; then
    withval="$with_system_zlib"
*************** fi
*** 2400,2410 ****
  
  ZLIBSPEC=
  
  
  libsubdir=.libs
  
  echo $ac_n "checking for garbage collector to use""... $ac_c" 1>&6
! echo "configure:2408: checking for garbage collector to use" >&5
  # Check whether --enable-java-gc or --disable-java-gc was given.
  if test "${enable_java_gc+set}" = set; then
    enableval="$enable_java_gc"
--- 2403,2415 ----
  
  ZLIBSPEC=
  
+ ZLIBTESTSPEC=
  
+ 
  libsubdir=.libs
  
  echo $ac_n "checking for garbage collector to use""... $ac_c" 1>&6
! echo "configure:2413: checking for garbage collector to use" >&5
  # Check whether --enable-java-gc or --disable-java-gc was given.
  if test "${enable_java_gc+set}" = set; then
    enableval="$enable_java_gc"
*************** GCINCS=
*** 2419,2424 ****
--- 2424,2430 ----
  GCDEPS=
  GCOBJS=
  GCSPEC=
+ GCTESTSPEC=
  case "$GC" in
   boehm)
      echo "$ac_t""boehm" 1>&6
*************** case "$GC" in
*** 2428,2433 ****
--- 2434,2440 ----
      GCLIBS="$GCDEPS -L\$(here)/../boehm-gc/$libsubdir"
      GCINCS='-I$(top_srcdir)/../boehm-gc -I$(top_builddir)/../boehm-gc'
      GCSPEC='-lgcjgc'
+     GCTESTSPEC="-L`pwd`/../boehm-gc/.libs -rpath `pwd`/../boehm-gc/.libs"
              GCINCS="$GCINCS `cat ../boehm-gc/boehm-cflags`"
      GCOBJS=boehm.lo
      GCHDR=boehm-gc.h
*************** esac
*** 2453,2460 ****
  
  
  
  echo $ac_n "checking for threads package to use""... $ac_c" 1>&6
! echo "configure:2458: checking for threads package to use" >&5
  # Check whether --enable-threads or --disable-threads was given.
  if test "${enable_threads+set}" = set; then
    enableval="$enable_threads"
--- 2460,2468 ----
  
  
  
+ 
  echo $ac_n "checking for threads package to use""... $ac_c" 1>&6
! echo "configure:2466: checking for threads package to use" >&5
  # Check whether --enable-threads or --disable-threads was given.
  if test "${enable_threads+set}" = set; then
    enableval="$enable_threads"
*************** EOF
*** 2619,2624 ****
--- 2627,2633 ----
  
  
     ZLIBSPEC=-lzgcj
+    ZLIBTESTSPEC="-L`pwd`/../zlib/.libs -rpath `pwd`/../zlib/.libs"
  
     # If Canadian cross, then don't pick up tools from the build
     # directory.
*************** else
*** 2634,2645 ****
     for ac_func in strerror ioctl select fstat open fsync sleep
  do
  echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
! echo "configure:2638: checking for $ac_func" >&5
  if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
    cat > conftest.$ac_ext <<EOF
! #line 2643 "configure"
  #include "confdefs.h"
  /* System header to define __stub macros and hopefully few prototypes,
      which can conflict with char $ac_func(); below.  */
--- 2643,2654 ----
     for ac_func in strerror ioctl select fstat open fsync sleep
  do
  echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
! echo "configure:2647: checking for $ac_func" >&5
  if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
    cat > conftest.$ac_ext <<EOF
! #line 2652 "configure"
  #include "confdefs.h"
  /* System header to define __stub macros and hopefully few prototypes,
      which can conflict with char $ac_func(); below.  */
*************** $ac_func();
*** 2662,2668 ****
  
  ; return 0; }
  EOF
! if { (eval echo configure:2666: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
    rm -rf conftest*
    eval "ac_cv_func_$ac_func=yes"
  else
--- 2671,2677 ----
  
  ; return 0; }
  EOF
! if { (eval echo configure:2675: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
    rm -rf conftest*
    eval "ac_cv_func_$ac_func=yes"
  else
*************** done
*** 2689,2700 ****
     for ac_func in gmtime_r localtime_r readdir_r getpwuid_r getcwd
  do
  echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
! echo "configure:2693: checking for $ac_func" >&5
  if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
    cat > conftest.$ac_ext <<EOF
! #line 2698 "configure"
  #include "confdefs.h"
  /* System header to define __stub macros and hopefully few prototypes,
      which can conflict with char $ac_func(); below.  */
--- 2698,2709 ----
     for ac_func in gmtime_r localtime_r readdir_r getpwuid_r getcwd
  do
  echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
! echo "configure:2702: checking for $ac_func" >&5
  if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
    cat > conftest.$ac_ext <<EOF
! #line 2707 "configure"
  #include "confdefs.h"
  /* System header to define __stub macros and hopefully few prototypes,
      which can conflict with char $ac_func(); below.  */
*************** $ac_func();
*** 2717,2723 ****
  
  ; return 0; }
  EOF
! if { (eval echo configure:2721: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
    rm -rf conftest*
    eval "ac_cv_func_$ac_func=yes"
  else
--- 2726,2732 ----
  
  ; return 0; }
  EOF
! if { (eval echo configure:2730: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
    rm -rf conftest*
    eval "ac_cv_func_$ac_func=yes"
  else
*************** done
*** 2744,2755 ****
     for ac_func in access stat mkdir rename rmdir unlink realpath iconv
  do
  echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
! echo "configure:2748: checking for $ac_func" >&5
  if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
    cat > conftest.$ac_ext <<EOF
! #line 2753 "configure"
  #include "confdefs.h"
  /* System header to define __stub macros and hopefully few prototypes,
      which can conflict with char $ac_func(); below.  */
--- 2753,2764 ----
     for ac_func in access stat mkdir rename rmdir unlink realpath iconv
  do
  echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
! echo "configure:2757: checking for $ac_func" >&5
  if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
    cat > conftest.$ac_ext <<EOF
! #line 2762 "configure"
  #include "confdefs.h"
  /* System header to define __stub macros and hopefully few prototypes,
      which can conflict with char $ac_func(); below.  */
*************** $ac_func();
*** 2772,2778 ****
  
  ; return 0; }
  EOF
! if { (eval echo configure:2776: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
    rm -rf conftest*
    eval "ac_cv_func_$ac_func=yes"
  else
--- 2781,2787 ----
  
  ; return 0; }
  EOF
! if { (eval echo configure:2785: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
    rm -rf conftest*
    eval "ac_cv_func_$ac_func=yes"
  else
*************** done
*** 2799,2810 ****
     for ac_func in inet_aton inet_addr
  do
  echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
! echo "configure:2803: checking for $ac_func" >&5
  if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
    cat > conftest.$ac_ext <<EOF
! #line 2808 "configure"
  #include "confdefs.h"
  /* System header to define __stub macros and hopefully few prototypes,
      which can conflict with char $ac_func(); below.  */
--- 2808,2819 ----
     for ac_func in inet_aton inet_addr
  do
  echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
! echo "configure:2812: checking for $ac_func" >&5
  if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
    cat > conftest.$ac_ext <<EOF
! #line 2817 "configure"
  #include "confdefs.h"
  /* System header to define __stub macros and hopefully few prototypes,
      which can conflict with char $ac_func(); below.  */
*************** $ac_func();
*** 2827,2833 ****
  
  ; return 0; }
  EOF
! if { (eval echo configure:2831: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
    rm -rf conftest*
    eval "ac_cv_func_$ac_func=yes"
  else
--- 2836,2842 ----
  
  ; return 0; }
  EOF
! if { (eval echo configure:2840: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
    rm -rf conftest*
    eval "ac_cv_func_$ac_func=yes"
  else
*************** done
*** 2854,2865 ****
     for ac_func in inet_pton uname inet_ntoa
  do
  echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
! echo "configure:2858: checking for $ac_func" >&5
  if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
    cat > conftest.$ac_ext <<EOF
! #line 2863 "configure"
  #include "confdefs.h"
  /* System header to define __stub macros and hopefully few prototypes,
      which can conflict with char $ac_func(); below.  */
--- 2863,2874 ----
     for ac_func in inet_pton uname inet_ntoa
  do
  echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
! echo "configure:2867: checking for $ac_func" >&5
  if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
    cat > conftest.$ac_ext <<EOF
! #line 2872 "configure"
  #include "confdefs.h"
  /* System header to define __stub macros and hopefully few prototypes,
      which can conflict with char $ac_func(); below.  */
*************** $ac_func();
*** 2882,2888 ****
  
  ; return 0; }
  EOF
! if { (eval echo configure:2886: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
    rm -rf conftest*
    eval "ac_cv_func_$ac_func=yes"
  else
--- 2891,2897 ----
  
  ; return 0; }
  EOF
! if { (eval echo configure:2895: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
    rm -rf conftest*
    eval "ac_cv_func_$ac_func=yes"
  else
*************** done
*** 2909,2920 ****
     for ac_func in backtrace fork execvp pipe
  do
  echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
! echo "configure:2913: checking for $ac_func" >&5
  if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
    cat > conftest.$ac_ext <<EOF
! #line 2918 "configure"
  #include "confdefs.h"
  /* System header to define __stub macros and hopefully few prototypes,
      which can conflict with char $ac_func(); below.  */
--- 2918,2929 ----
     for ac_func in backtrace fork execvp pipe
  do
  echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
! echo "configure:2922: checking for $ac_func" >&5
  if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
    cat > conftest.$ac_ext <<EOF
! #line 2927 "configure"
  #include "confdefs.h"
  /* System header to define __stub macros and hopefully few prototypes,
      which can conflict with char $ac_func(); below.  */
*************** $ac_func();
*** 2937,2943 ****
  
  ; return 0; }
  EOF
! if { (eval echo configure:2941: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
    rm -rf conftest*
    eval "ac_cv_func_$ac_func=yes"
  else
--- 2946,2952 ----
  
  ; return 0; }
  EOF
! if { (eval echo configure:2950: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
    rm -rf conftest*
    eval "ac_cv_func_$ac_func=yes"
  else
*************** done
*** 2965,2981 ****
  do
  ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
  echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
! echo "configure:2969: checking for $ac_hdr" >&5
  if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
    cat > conftest.$ac_ext <<EOF
! #line 2974 "configure"
  #include "confdefs.h"
  #include <$ac_hdr>
  EOF
  ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
! { (eval echo configure:2979: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
  ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
  if test -z "$ac_err"; then
    rm -rf conftest*
--- 2974,2990 ----
  do
  ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
  echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
! echo "configure:2978: checking for $ac_hdr" >&5
  if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
    cat > conftest.$ac_ext <<EOF
! #line 2983 "configure"
  #include "confdefs.h"
  #include <$ac_hdr>
  EOF
  ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
! { (eval echo configure:2988: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
  ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
  if test -z "$ac_err"; then
    rm -rf conftest*
*************** fi
*** 3002,3008 ****
  done
   
     echo $ac_n "checking for dladdr in -ldl""... $ac_c" 1>&6
! echo "configure:3006: checking for dladdr in -ldl" >&5
  ac_lib_var=`echo dl'_'dladdr | sed 'y%./+-%__p_%'`
  if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
--- 3011,3017 ----
  done
   
     echo $ac_n "checking for dladdr in -ldl""... $ac_c" 1>&6
! echo "configure:3015: checking for dladdr in -ldl" >&5
  ac_lib_var=`echo dl'_'dladdr | sed 'y%./+-%__p_%'`
  if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
*************** else
*** 3010,3016 ****
    ac_save_LIBS="$LIBS"
  LIBS="-ldl  $LIBS"
  cat > conftest.$ac_ext <<EOF
! #line 3014 "configure"
  #include "confdefs.h"
  /* Override any gcc2 internal prototype to avoid an error.  */
  /* We use char because int might match the return type of a gcc2
--- 3019,3025 ----
    ac_save_LIBS="$LIBS"
  LIBS="-ldl  $LIBS"
  cat > conftest.$ac_ext <<EOF
! #line 3023 "configure"
  #include "confdefs.h"
  /* Override any gcc2 internal prototype to avoid an error.  */
  /* We use char because int might match the return type of a gcc2
*************** int main() {
*** 3021,3027 ****
  dladdr()
  ; return 0; }
  EOF
! if { (eval echo configure:3025: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
    rm -rf conftest*
    eval "ac_cv_lib_$ac_lib_var=yes"
  else
--- 3030,3036 ----
  dladdr()
  ; return 0; }
  EOF
! if { (eval echo configure:3034: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
    rm -rf conftest*
    eval "ac_cv_lib_$ac_lib_var=yes"
  else
*************** do
*** 3050,3056 ****
  
  ac_safe=`echo "$ac_file" | sed 'y%./+-%__p_%'`
  echo $ac_n "checking for $ac_file""... $ac_c" 1>&6
! echo "configure:3054: checking for $ac_file" >&5
  if eval "test \"`echo '$''{'ac_cv_file_$ac_safe'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
--- 3059,3065 ----
  
  ac_safe=`echo "$ac_file" | sed 'y%./+-%__p_%'`
  echo $ac_n "checking for $ac_file""... $ac_c" 1>&6
! echo "configure:3063: checking for $ac_file" >&5
  if eval "test \"`echo '$''{'ac_cv_file_$ac_safe'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
*************** done
*** 3085,3096 ****
     for ac_func in gethostbyname_r
  do
  echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
! echo "configure:3089: checking for $ac_func" >&5
  if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
    cat > conftest.$ac_ext <<EOF
! #line 3094 "configure"
  #include "confdefs.h"
  /* System header to define __stub macros and hopefully few prototypes,
      which can conflict with char $ac_func(); below.  */
--- 3094,3105 ----
     for ac_func in gethostbyname_r
  do
  echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
! echo "configure:3098: checking for $ac_func" >&5
  if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
    cat > conftest.$ac_ext <<EOF
! #line 3103 "configure"
  #include "confdefs.h"
  /* System header to define __stub macros and hopefully few prototypes,
      which can conflict with char $ac_func(); below.  */
*************** $ac_func();
*** 3113,3119 ****
  
  ; return 0; }
  EOF
! if { (eval echo configure:3117: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
    rm -rf conftest*
    eval "ac_cv_func_$ac_func=yes"
  else
--- 3122,3128 ----
  
  ; return 0; }
  EOF
! if { (eval echo configure:3126: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
    rm -rf conftest*
    eval "ac_cv_func_$ac_func=yes"
  else
*************** EOF
*** 3140,3146 ****
       # We look for the one that returns `int'.
       # Hopefully this check is robust enough.
       cat > conftest.$ac_ext <<EOF
! #line 3144 "configure"
  #include "confdefs.h"
  #include <netdb.h>
  EOF
--- 3149,3155 ----
       # We look for the one that returns `int'.
       # Hopefully this check is robust enough.
       cat > conftest.$ac_ext <<EOF
! #line 3153 "configure"
  #include "confdefs.h"
  #include <netdb.h>
  EOF
*************** rm -f conftest*
*** 3160,3166 ****
       *" -D_REENTRANT "*) ;;
       *)
  		echo $ac_n "checking whether gethostbyname_r declaration requires -D_REENTRANT""... $ac_c" 1>&6
! echo "configure:3164: checking whether gethostbyname_r declaration requires -D_REENTRANT" >&5
  if eval "test \"`echo '$''{'libjava_cv_gethostbyname_r_needs_reentrant'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
--- 3169,3175 ----
       *" -D_REENTRANT "*) ;;
       *)
  		echo $ac_n "checking whether gethostbyname_r declaration requires -D_REENTRANT""... $ac_c" 1>&6
! echo "configure:3173: checking whether gethostbyname_r declaration requires -D_REENTRANT" >&5
  if eval "test \"`echo '$''{'libjava_cv_gethostbyname_r_needs_reentrant'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
*************** ac_link='${CXX-g++} -o conftest${ac_exee
*** 3173,3186 ****
  cross_compiling=$ac_cv_prog_cxx_cross
  
  	  cat > conftest.$ac_ext <<EOF
! #line 3177 "configure"
  #include "confdefs.h"
  #include <netdb.h>
  int main() {
  gethostbyname_r("", 0, 0);
  ; return 0; }
  EOF
! if { (eval echo configure:3184: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
    rm -rf conftest*
    libjava_cv_gethostbyname_r_needs_reentrant=no
  else
--- 3182,3195 ----
  cross_compiling=$ac_cv_prog_cxx_cross
  
  	  cat > conftest.$ac_ext <<EOF
! #line 3186 "configure"
  #include "confdefs.h"
  #include <netdb.h>
  int main() {
  gethostbyname_r("", 0, 0);
  ; return 0; }
  EOF
! if { (eval echo configure:3193: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
    rm -rf conftest*
    libjava_cv_gethostbyname_r_needs_reentrant=no
  else
*************** else
*** 3190,3203 ****
    		CPPFLAGS_SAVE="$CPPFLAGS"
  		CPPFLAGS="$CPPFLAGS -D_REENTRANT"
  		cat > conftest.$ac_ext <<EOF
! #line 3194 "configure"
  #include "confdefs.h"
  #include <netdb.h>
  int main() {
  gethostbyname_r("", 0, 0);
  ; return 0; }
  EOF
! if { (eval echo configure:3201: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
    rm -rf conftest*
    libjava_cv_gethostbyname_r_needs_reentrant=yes
  else
--- 3199,3212 ----
    		CPPFLAGS_SAVE="$CPPFLAGS"
  		CPPFLAGS="$CPPFLAGS -D_REENTRANT"
  		cat > conftest.$ac_ext <<EOF
! #line 3203 "configure"
  #include "confdefs.h"
  #include <netdb.h>
  int main() {
  gethostbyname_r("", 0, 0);
  ; return 0; }
  EOF
! if { (eval echo configure:3210: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
    rm -rf conftest*
    libjava_cv_gethostbyname_r_needs_reentrant=yes
  else
*************** EOF
*** 3232,3243 ****
       esac
  
       echo $ac_n "checking for struct hostent_data""... $ac_c" 1>&6
! echo "configure:3236: checking for struct hostent_data" >&5
  if eval "test \"`echo '$''{'libjava_cv_struct_hostent_data'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
    	cat > conftest.$ac_ext <<EOF
! #line 3241 "configure"
  #include "confdefs.h"
  
  #if GETHOSTBYNAME_R_NEEDS_REENTRANT && !defined(_REENTRANT)
--- 3241,3252 ----
       esac
  
       echo $ac_n "checking for struct hostent_data""... $ac_c" 1>&6
! echo "configure:3245: checking for struct hostent_data" >&5
  if eval "test \"`echo '$''{'libjava_cv_struct_hostent_data'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
    	cat > conftest.$ac_ext <<EOF
! #line 3250 "configure"
  #include "confdefs.h"
  
  #if GETHOSTBYNAME_R_NEEDS_REENTRANT && !defined(_REENTRANT)
*************** int main() {
*** 3248,3254 ****
  struct hostent_data data;
  ; return 0; }
  EOF
! if { (eval echo configure:3252: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
    rm -rf conftest*
    libjava_cv_struct_hostent_data=yes
  else
--- 3257,3263 ----
  struct hostent_data data;
  ; return 0; }
  EOF
! if { (eval echo configure:3261: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
    rm -rf conftest*
    libjava_cv_struct_hostent_data=yes
  else
*************** done
*** 3277,3288 ****
     for ac_func in gethostbyaddr_r
  do
  echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
! echo "configure:3281: checking for $ac_func" >&5
  if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
    cat > conftest.$ac_ext <<EOF
! #line 3286 "configure"
  #include "confdefs.h"
  /* System header to define __stub macros and hopefully few prototypes,
      which can conflict with char $ac_func(); below.  */
--- 3286,3297 ----
     for ac_func in gethostbyaddr_r
  do
  echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
! echo "configure:3290: checking for $ac_func" >&5
  if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
    cat > conftest.$ac_ext <<EOF
! #line 3295 "configure"
  #include "confdefs.h"
  /* System header to define __stub macros and hopefully few prototypes,
      which can conflict with char $ac_func(); below.  */
*************** $ac_func();
*** 3305,3311 ****
  
  ; return 0; }
  EOF
! if { (eval echo configure:3309: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
    rm -rf conftest*
    eval "ac_cv_func_$ac_func=yes"
  else
--- 3314,3320 ----
  
  ; return 0; }
  EOF
! if { (eval echo configure:3318: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
    rm -rf conftest*
    eval "ac_cv_func_$ac_func=yes"
  else
*************** EOF
*** 3332,3338 ****
       # We look for the one that returns `int'.
       # Hopefully this check is robust enough.
       cat > conftest.$ac_ext <<EOF
! #line 3336 "configure"
  #include "confdefs.h"
  #include <netdb.h>
  EOF
--- 3341,3347 ----
       # We look for the one that returns `int'.
       # Hopefully this check is robust enough.
       cat > conftest.$ac_ext <<EOF
! #line 3345 "configure"
  #include "confdefs.h"
  #include <netdb.h>
  EOF
*************** done
*** 3356,3367 ****
     for ac_func in gethostname
  do
  echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
! echo "configure:3360: checking for $ac_func" >&5
  if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
    cat > conftest.$ac_ext <<EOF
! #line 3365 "configure"
  #include "confdefs.h"
  /* System header to define __stub macros and hopefully few prototypes,
      which can conflict with char $ac_func(); below.  */
--- 3365,3376 ----
     for ac_func in gethostname
  do
  echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
! echo "configure:3369: checking for $ac_func" >&5
  if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
    cat > conftest.$ac_ext <<EOF
! #line 3374 "configure"
  #include "confdefs.h"
  /* System header to define __stub macros and hopefully few prototypes,
      which can conflict with char $ac_func(); below.  */
*************** $ac_func();
*** 3384,3390 ****
  
  ; return 0; }
  EOF
! if { (eval echo configure:3388: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
    rm -rf conftest*
    eval "ac_cv_func_$ac_func=yes"
  else
--- 3393,3399 ----
  
  ; return 0; }
  EOF
! if { (eval echo configure:3397: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
    rm -rf conftest*
    eval "ac_cv_func_$ac_func=yes"
  else
*************** EOF
*** 3408,3414 ****
  EOF
  
       cat > conftest.$ac_ext <<EOF
! #line 3412 "configure"
  #include "confdefs.h"
  #include <unistd.h>
  EOF
--- 3417,3423 ----
  EOF
  
       cat > conftest.$ac_ext <<EOF
! #line 3421 "configure"
  #include "confdefs.h"
  #include <unistd.h>
  EOF
*************** done
*** 3439,3450 ****
        for ac_func in pthread_mutexattr_settype pthread_mutexattr_setkind_np
  do
  echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
! echo "configure:3443: checking for $ac_func" >&5
  if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
    cat > conftest.$ac_ext <<EOF
! #line 3448 "configure"
  #include "confdefs.h"
  /* System header to define __stub macros and hopefully few prototypes,
      which can conflict with char $ac_func(); below.  */
--- 3448,3459 ----
        for ac_func in pthread_mutexattr_settype pthread_mutexattr_setkind_np
  do
  echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
! echo "configure:3452: checking for $ac_func" >&5
  if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
    cat > conftest.$ac_ext <<EOF
! #line 3457 "configure"
  #include "confdefs.h"
  /* System header to define __stub macros and hopefully few prototypes,
      which can conflict with char $ac_func(); below.  */
*************** $ac_func();
*** 3467,3473 ****
  
  ; return 0; }
  EOF
! if { (eval echo configure:3471: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
    rm -rf conftest*
    eval "ac_cv_func_$ac_func=yes"
  else
--- 3476,3482 ----
  
  ; return 0; }
  EOF
! if { (eval echo configure:3480: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
    rm -rf conftest*
    eval "ac_cv_func_$ac_func=yes"
  else
*************** done
*** 3497,3508 ****
        for ac_func in sched_yield
  do
  echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
! echo "configure:3501: checking for $ac_func" >&5
  if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
    cat > conftest.$ac_ext <<EOF
! #line 3506 "configure"
  #include "confdefs.h"
  /* System header to define __stub macros and hopefully few prototypes,
      which can conflict with char $ac_func(); below.  */
--- 3506,3517 ----
        for ac_func in sched_yield
  do
  echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
! echo "configure:3510: checking for $ac_func" >&5
  if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
    cat > conftest.$ac_ext <<EOF
! #line 3515 "configure"
  #include "confdefs.h"
  /* System header to define __stub macros and hopefully few prototypes,
      which can conflict with char $ac_func(); below.  */
*************** $ac_func();
*** 3525,3531 ****
  
  ; return 0; }
  EOF
! if { (eval echo configure:3529: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
    rm -rf conftest*
    eval "ac_cv_func_$ac_func=yes"
  else
--- 3534,3540 ----
  
  ; return 0; }
  EOF
! if { (eval echo configure:3538: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
    rm -rf conftest*
    eval "ac_cv_func_$ac_func=yes"
  else
*************** EOF
*** 3547,3553 ****
  else
    echo "$ac_t""no" 1>&6
  echo $ac_n "checking for sched_yield in -lrt""... $ac_c" 1>&6
! echo "configure:3551: checking for sched_yield in -lrt" >&5
  ac_lib_var=`echo rt'_'sched_yield | sed 'y%./+-%__p_%'`
  if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
--- 3556,3562 ----
  else
    echo "$ac_t""no" 1>&6
  echo $ac_n "checking for sched_yield in -lrt""... $ac_c" 1>&6
! echo "configure:3560: checking for sched_yield in -lrt" >&5
  ac_lib_var=`echo rt'_'sched_yield | sed 'y%./+-%__p_%'`
  if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
*************** else
*** 3555,3561 ****
    ac_save_LIBS="$LIBS"
  LIBS="-lrt  $LIBS"
  cat > conftest.$ac_ext <<EOF
! #line 3559 "configure"
  #include "confdefs.h"
  /* Override any gcc2 internal prototype to avoid an error.  */
  /* We use char because int might match the return type of a gcc2
--- 3564,3570 ----
    ac_save_LIBS="$LIBS"
  LIBS="-lrt  $LIBS"
  cat > conftest.$ac_ext <<EOF
! #line 3568 "configure"
  #include "confdefs.h"
  /* Override any gcc2 internal prototype to avoid an error.  */
  /* We use char because int might match the return type of a gcc2
*************** int main() {
*** 3566,3572 ****
  sched_yield()
  ; return 0; }
  EOF
! if { (eval echo configure:3570: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
    rm -rf conftest*
    eval "ac_cv_lib_$ac_lib_var=yes"
  else
--- 3575,3581 ----
  sched_yield()
  ; return 0; }
  EOF
! if { (eval echo configure:3579: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
    rm -rf conftest*
    eval "ac_cv_lib_$ac_lib_var=yes"
  else
*************** else
*** 3592,3598 ****
    echo "$ac_t""no" 1>&6
  
  	  echo $ac_n "checking for sched_yield in -lposix4""... $ac_c" 1>&6
! echo "configure:3596: checking for sched_yield in -lposix4" >&5
  ac_lib_var=`echo posix4'_'sched_yield | sed 'y%./+-%__p_%'`
  if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
--- 3601,3607 ----
    echo "$ac_t""no" 1>&6
  
  	  echo $ac_n "checking for sched_yield in -lposix4""... $ac_c" 1>&6
! echo "configure:3605: checking for sched_yield in -lposix4" >&5
  ac_lib_var=`echo posix4'_'sched_yield | sed 'y%./+-%__p_%'`
  if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
*************** else
*** 3600,3606 ****
    ac_save_LIBS="$LIBS"
  LIBS="-lposix4  $LIBS"
  cat > conftest.$ac_ext <<EOF
! #line 3604 "configure"
  #include "confdefs.h"
  /* Override any gcc2 internal prototype to avoid an error.  */
  /* We use char because int might match the return type of a gcc2
--- 3609,3615 ----
    ac_save_LIBS="$LIBS"
  LIBS="-lposix4  $LIBS"
  cat > conftest.$ac_ext <<EOF
! #line 3613 "configure"
  #include "confdefs.h"
  /* Override any gcc2 internal prototype to avoid an error.  */
  /* We use char because int might match the return type of a gcc2
*************** int main() {
*** 3611,3617 ****
  sched_yield()
  ; return 0; }
  EOF
! if { (eval echo configure:3615: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
    rm -rf conftest*
    eval "ac_cv_lib_$ac_lib_var=yes"
  else
--- 3620,3626 ----
  sched_yield()
  ; return 0; }
  EOF
! if { (eval echo configure:3624: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
    rm -rf conftest*
    eval "ac_cv_lib_$ac_lib_var=yes"
  else
*************** done
*** 3647,3653 ****
        # We can save a little space at runtime if the mutex has m_count
        # or __m_count.  This is a nice hack for Linux.
        cat > conftest.$ac_ext <<EOF
! #line 3651 "configure"
  #include "confdefs.h"
  #include <pthread.h>
  int main() {
--- 3656,3662 ----
        # We can save a little space at runtime if the mutex has m_count
        # or __m_count.  This is a nice hack for Linux.
        cat > conftest.$ac_ext <<EOF
! #line 3660 "configure"
  #include "confdefs.h"
  #include <pthread.h>
  int main() {
*************** int main() {
*** 3656,3662 ****
          
  ; return 0; }
  EOF
! if { (eval echo configure:3660: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
    rm -rf conftest*
    cat >> confdefs.h <<\EOF
  #define PTHREAD_MUTEX_HAVE_M_COUNT 1
--- 3665,3671 ----
          
  ; return 0; }
  EOF
! if { (eval echo configure:3669: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
    rm -rf conftest*
    cat >> confdefs.h <<\EOF
  #define PTHREAD_MUTEX_HAVE_M_COUNT 1
*************** else
*** 3668,3674 ****
    rm -rf conftest*
    
  	cat > conftest.$ac_ext <<EOF
! #line 3672 "configure"
  #include "confdefs.h"
  #include <pthread.h>
  int main() {
--- 3677,3683 ----
    rm -rf conftest*
    
  	cat > conftest.$ac_ext <<EOF
! #line 3681 "configure"
  #include "confdefs.h"
  #include <pthread.h>
  int main() {
*************** int main() {
*** 3677,3683 ****
  	  
  ; return 0; }
  EOF
! if { (eval echo configure:3681: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
    rm -rf conftest*
    cat >> confdefs.h <<\EOF
  #define PTHREAD_MUTEX_HAVE___M_COUNT 1
--- 3686,3692 ----
  	  
  ; return 0; }
  EOF
! if { (eval echo configure:3690: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
    rm -rf conftest*
    cat >> confdefs.h <<\EOF
  #define PTHREAD_MUTEX_HAVE___M_COUNT 1
*************** rm -f conftest*
*** 3697,3708 ****
     for ac_func in gettimeofday time ftime
  do
  echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
! echo "configure:3701: checking for $ac_func" >&5
  if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
    cat > conftest.$ac_ext <<EOF
! #line 3706 "configure"
  #include "confdefs.h"
  /* System header to define __stub macros and hopefully few prototypes,
      which can conflict with char $ac_func(); below.  */
--- 3706,3717 ----
     for ac_func in gettimeofday time ftime
  do
  echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
! echo "configure:3710: checking for $ac_func" >&5
  if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
    cat > conftest.$ac_ext <<EOF
! #line 3715 "configure"
  #include "confdefs.h"
  /* System header to define __stub macros and hopefully few prototypes,
      which can conflict with char $ac_func(); below.  */
*************** $ac_func();
*** 3725,3731 ****
  
  ; return 0; }
  EOF
! if { (eval echo configure:3729: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
    rm -rf conftest*
    eval "ac_cv_func_$ac_func=yes"
  else
--- 3734,3740 ----
  
  ; return 0; }
  EOF
! if { (eval echo configure:3738: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
    rm -rf conftest*
    eval "ac_cv_func_$ac_func=yes"
  else
*************** done
*** 3756,3767 ****
     for ac_func in memmove
  do
  echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
! echo "configure:3760: checking for $ac_func" >&5
  if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
    cat > conftest.$ac_ext <<EOF
! #line 3765 "configure"
  #include "confdefs.h"
  /* System header to define __stub macros and hopefully few prototypes,
      which can conflict with char $ac_func(); below.  */
--- 3765,3776 ----
     for ac_func in memmove
  do
  echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
! echo "configure:3769: checking for $ac_func" >&5
  if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
    cat > conftest.$ac_ext <<EOF
! #line 3774 "configure"
  #include "confdefs.h"
  /* System header to define __stub macros and hopefully few prototypes,
      which can conflict with char $ac_func(); below.  */
*************** $ac_func();
*** 3784,3790 ****
  
  ; return 0; }
  EOF
! if { (eval echo configure:3788: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
    rm -rf conftest*
    eval "ac_cv_func_$ac_func=yes"
  else
--- 3793,3799 ----
  
  ; return 0; }
  EOF
! if { (eval echo configure:3797: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
    rm -rf conftest*
    eval "ac_cv_func_$ac_func=yes"
  else
*************** done
*** 3814,3825 ****
     for ac_func in memcpy
  do
  echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
! echo "configure:3818: checking for $ac_func" >&5
  if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
    cat > conftest.$ac_ext <<EOF
! #line 3823 "configure"
  #include "confdefs.h"
  /* System header to define __stub macros and hopefully few prototypes,
      which can conflict with char $ac_func(); below.  */
--- 3823,3834 ----
     for ac_func in memcpy
  do
  echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
! echo "configure:3827: checking for $ac_func" >&5
  if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
    cat > conftest.$ac_ext <<EOF
! #line 3832 "configure"
  #include "confdefs.h"
  /* System header to define __stub macros and hopefully few prototypes,
      which can conflict with char $ac_func(); below.  */
*************** $ac_func();
*** 3842,3848 ****
  
  ; return 0; }
  EOF
! if { (eval echo configure:3846: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
    rm -rf conftest*
    eval "ac_cv_func_$ac_func=yes"
  else
--- 3851,3857 ----
  
  ; return 0; }
  EOF
! if { (eval echo configure:3855: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
    rm -rf conftest*
    eval "ac_cv_func_$ac_func=yes"
  else
*************** done
*** 3890,3896 ****
     #--------------------------------------------------------------------
  
     echo $ac_n "checking for socket libraries""... $ac_c" 1>&6
! echo "configure:3894: checking for socket libraries" >&5
  if eval "test \"`echo '$''{'gcj_cv_lib_sockets'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
--- 3899,3905 ----
     #--------------------------------------------------------------------
  
     echo $ac_n "checking for socket libraries""... $ac_c" 1>&6
! echo "configure:3903: checking for socket libraries" >&5
  if eval "test \"`echo '$''{'gcj_cv_lib_sockets'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
*************** else
*** 3898,3909 ****
       gcj_checkBoth=0
       unset ac_cv_func_connect
       echo $ac_n "checking for connect""... $ac_c" 1>&6
! echo "configure:3902: checking for connect" >&5
  if eval "test \"`echo '$''{'ac_cv_func_connect'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
    cat > conftest.$ac_ext <<EOF
! #line 3907 "configure"
  #include "confdefs.h"
  /* System header to define __stub macros and hopefully few prototypes,
      which can conflict with char connect(); below.  */
--- 3907,3918 ----
       gcj_checkBoth=0
       unset ac_cv_func_connect
       echo $ac_n "checking for connect""... $ac_c" 1>&6
! echo "configure:3911: checking for connect" >&5
  if eval "test \"`echo '$''{'ac_cv_func_connect'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
    cat > conftest.$ac_ext <<EOF
! #line 3916 "configure"
  #include "confdefs.h"
  /* System header to define __stub macros and hopefully few prototypes,
      which can conflict with char connect(); below.  */
*************** connect();
*** 3926,3932 ****
  
  ; return 0; }
  EOF
! if { (eval echo configure:3930: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
    rm -rf conftest*
    eval "ac_cv_func_connect=yes"
  else
--- 3935,3941 ----
  
  ; return 0; }
  EOF
! if { (eval echo configure:3939: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
    rm -rf conftest*
    eval "ac_cv_func_connect=yes"
  else
*************** fi
*** 3949,3955 ****
       if test "$gcj_checkSocket" = 1; then
  	 unset ac_cv_func_connect
  	 echo $ac_n "checking for main in -lsocket""... $ac_c" 1>&6
! echo "configure:3953: checking for main in -lsocket" >&5
  ac_lib_var=`echo socket'_'main | sed 'y%./+-%__p_%'`
  if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
--- 3958,3964 ----
       if test "$gcj_checkSocket" = 1; then
  	 unset ac_cv_func_connect
  	 echo $ac_n "checking for main in -lsocket""... $ac_c" 1>&6
! echo "configure:3962: checking for main in -lsocket" >&5
  ac_lib_var=`echo socket'_'main | sed 'y%./+-%__p_%'`
  if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
*************** else
*** 3957,3970 ****
    ac_save_LIBS="$LIBS"
  LIBS="-lsocket  $LIBS"
  cat > conftest.$ac_ext <<EOF
! #line 3961 "configure"
  #include "confdefs.h"
  
  int main() {
  main()
  ; return 0; }
  EOF
! if { (eval echo configure:3968: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
    rm -rf conftest*
    eval "ac_cv_lib_$ac_lib_var=yes"
  else
--- 3966,3979 ----
    ac_save_LIBS="$LIBS"
  LIBS="-lsocket  $LIBS"
  cat > conftest.$ac_ext <<EOF
! #line 3970 "configure"
  #include "confdefs.h"
  
  int main() {
  main()
  ; return 0; }
  EOF
! if { (eval echo configure:3977: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
    rm -rf conftest*
    eval "ac_cv_lib_$ac_lib_var=yes"
  else
*************** fi
*** 3991,4002 ****
  	 LIBS="$LIBS -lsocket -lnsl"
  	 unset ac_cv_func_accept
  	 echo $ac_n "checking for accept""... $ac_c" 1>&6
! echo "configure:3995: checking for accept" >&5
  if eval "test \"`echo '$''{'ac_cv_func_accept'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
    cat > conftest.$ac_ext <<EOF
! #line 4000 "configure"
  #include "confdefs.h"
  /* System header to define __stub macros and hopefully few prototypes,
      which can conflict with char accept(); below.  */
--- 4000,4011 ----
  	 LIBS="$LIBS -lsocket -lnsl"
  	 unset ac_cv_func_accept
  	 echo $ac_n "checking for accept""... $ac_c" 1>&6
! echo "configure:4004: checking for accept" >&5
  if eval "test \"`echo '$''{'ac_cv_func_accept'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
    cat > conftest.$ac_ext <<EOF
! #line 4009 "configure"
  #include "confdefs.h"
  /* System header to define __stub macros and hopefully few prototypes,
      which can conflict with char accept(); below.  */
*************** accept();
*** 4019,4025 ****
  
  ; return 0; }
  EOF
! if { (eval echo configure:4023: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
    rm -rf conftest*
    eval "ac_cv_func_accept=yes"
  else
--- 4028,4034 ----
  
  ; return 0; }
  EOF
! if { (eval echo configure:4032: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
    rm -rf conftest*
    eval "ac_cv_func_accept=yes"
  else
*************** fi
*** 4046,4057 ****
       gcj_oldLibs=$LIBS
       LIBS="$LIBS $gcj_cv_lib_sockets"
       echo $ac_n "checking for gethostbyname""... $ac_c" 1>&6
! echo "configure:4050: checking for gethostbyname" >&5
  if eval "test \"`echo '$''{'ac_cv_func_gethostbyname'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
    cat > conftest.$ac_ext <<EOF
! #line 4055 "configure"
  #include "confdefs.h"
  /* System header to define __stub macros and hopefully few prototypes,
      which can conflict with char gethostbyname(); below.  */
--- 4055,4066 ----
       gcj_oldLibs=$LIBS
       LIBS="$LIBS $gcj_cv_lib_sockets"
       echo $ac_n "checking for gethostbyname""... $ac_c" 1>&6
! echo "configure:4059: checking for gethostbyname" >&5
  if eval "test \"`echo '$''{'ac_cv_func_gethostbyname'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
    cat > conftest.$ac_ext <<EOF
! #line 4064 "configure"
  #include "confdefs.h"
  /* System header to define __stub macros and hopefully few prototypes,
      which can conflict with char gethostbyname(); below.  */
*************** gethostbyname();
*** 4074,4080 ****
  
  ; return 0; }
  EOF
! if { (eval echo configure:4078: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
    rm -rf conftest*
    eval "ac_cv_func_gethostbyname=yes"
  else
--- 4083,4089 ----
  
  ; return 0; }
  EOF
! if { (eval echo configure:4087: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
    rm -rf conftest*
    eval "ac_cv_func_gethostbyname=yes"
  else
*************** if eval "test \"`echo '$ac_cv_func_'geth
*** 4092,4098 ****
  else
    echo "$ac_t""no" 1>&6
  echo $ac_n "checking for main in -lnsl""... $ac_c" 1>&6
! echo "configure:4096: checking for main in -lnsl" >&5
  ac_lib_var=`echo nsl'_'main | sed 'y%./+-%__p_%'`
  if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
--- 4101,4107 ----
  else
    echo "$ac_t""no" 1>&6
  echo $ac_n "checking for main in -lnsl""... $ac_c" 1>&6
! echo "configure:4105: checking for main in -lnsl" >&5
  ac_lib_var=`echo nsl'_'main | sed 'y%./+-%__p_%'`
  if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
*************** else
*** 4100,4113 ****
    ac_save_LIBS="$LIBS"
  LIBS="-lnsl  $LIBS"
  cat > conftest.$ac_ext <<EOF
! #line 4104 "configure"
  #include "confdefs.h"
  
  int main() {
  main()
  ; return 0; }
  EOF
! if { (eval echo configure:4111: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
    rm -rf conftest*
    eval "ac_cv_lib_$ac_lib_var=yes"
  else
--- 4109,4122 ----
    ac_save_LIBS="$LIBS"
  LIBS="-lnsl  $LIBS"
  cat > conftest.$ac_ext <<EOF
! #line 4113 "configure"
  #include "confdefs.h"
  
  int main() {
  main()
  ; return 0; }
  EOF
! if { (eval echo configure:4120: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
    rm -rf conftest*
    eval "ac_cv_lib_$ac_lib_var=yes"
  else
*************** echo "$ac_t""$gcj_cv_lib_sockets" 1>&6
*** 4139,4145 ****
  
     if test "$with_system_zlib" = yes; then
        echo $ac_n "checking for deflate in -lz""... $ac_c" 1>&6
! echo "configure:4143: checking for deflate in -lz" >&5
  ac_lib_var=`echo z'_'deflate | sed 'y%./+-%__p_%'`
  if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
--- 4148,4154 ----
  
     if test "$with_system_zlib" = yes; then
        echo $ac_n "checking for deflate in -lz""... $ac_c" 1>&6
! echo "configure:4152: checking for deflate in -lz" >&5
  ac_lib_var=`echo z'_'deflate | sed 'y%./+-%__p_%'`
  if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
*************** else
*** 4147,4153 ****
    ac_save_LIBS="$LIBS"
  LIBS="-lz  $LIBS"
  cat > conftest.$ac_ext <<EOF
! #line 4151 "configure"
  #include "confdefs.h"
  /* Override any gcc2 internal prototype to avoid an error.  */
  /* We use char because int might match the return type of a gcc2
--- 4156,4162 ----
    ac_save_LIBS="$LIBS"
  LIBS="-lz  $LIBS"
  cat > conftest.$ac_ext <<EOF
! #line 4160 "configure"
  #include "confdefs.h"
  /* Override any gcc2 internal prototype to avoid an error.  */
  /* We use char because int might match the return type of a gcc2
*************** int main() {
*** 4158,4164 ****
  deflate()
  ; return 0; }
  EOF
! if { (eval echo configure:4162: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
    rm -rf conftest*
    eval "ac_cv_lib_$ac_lib_var=yes"
  else
--- 4167,4173 ----
  deflate()
  ; return 0; }
  EOF
! if { (eval echo configure:4171: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
    rm -rf conftest*
    eval "ac_cv_lib_$ac_lib_var=yes"
  else
*************** fi
*** 4181,4193 ****
  
     else
        ZLIBSPEC=-lzgcj
     fi
  
     # On Solaris, and maybe other architectures, the Boehm collector
     # requires -ldl.
     if test "$GC" = boehm; then
        echo $ac_n "checking for main in -ldl""... $ac_c" 1>&6
! echo "configure:4191: checking for main in -ldl" >&5
  ac_lib_var=`echo dl'_'main | sed 'y%./+-%__p_%'`
  if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
--- 4190,4203 ----
  
     else
        ZLIBSPEC=-lzgcj
+       ZLIBTESTSPEC="-L`pwd`/../zlib/.libs -rpath `pwd`/../zlib/.libs"
     fi
  
     # On Solaris, and maybe other architectures, the Boehm collector
     # requires -ldl.
     if test "$GC" = boehm; then
        echo $ac_n "checking for main in -ldl""... $ac_c" 1>&6
! echo "configure:4201: checking for main in -ldl" >&5
  ac_lib_var=`echo dl'_'main | sed 'y%./+-%__p_%'`
  if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
*************** else
*** 4195,4208 ****
    ac_save_LIBS="$LIBS"
  LIBS="-ldl  $LIBS"
  cat > conftest.$ac_ext <<EOF
! #line 4199 "configure"
  #include "confdefs.h"
  
  int main() {
  main()
  ; return 0; }
  EOF
! if { (eval echo configure:4206: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
    rm -rf conftest*
    eval "ac_cv_lib_$ac_lib_var=yes"
  else
--- 4205,4218 ----
    ac_save_LIBS="$LIBS"
  LIBS="-ldl  $LIBS"
  cat > conftest.$ac_ext <<EOF
! #line 4209 "configure"
  #include "confdefs.h"
  
  int main() {
  main()
  ; return 0; }
  EOF
! if { (eval echo configure:4216: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
    rm -rf conftest*
    eval "ac_cv_lib_$ac_lib_var=yes"
  else
*************** EOF
*** 4322,4328 ****
  # See if gcj supports -fuse-divide-subroutine.  gcc 2.95 does not, and
  # we want to continue to support that version.
  echo $ac_n "checking whether gcj supports -fuse-divide-subroutine""... $ac_c" 1>&6
! echo "configure:4326: checking whether gcj supports -fuse-divide-subroutine" >&5
  cat > conftest.java << 'END'
  public class conftest { }
  END
--- 4332,4338 ----
  # See if gcj supports -fuse-divide-subroutine.  gcc 2.95 does not, and
  # we want to continue to support that version.
  echo $ac_n "checking whether gcj supports -fuse-divide-subroutine""... $ac_c" 1>&6
! echo "configure:4336: checking whether gcj supports -fuse-divide-subroutine" >&5
  cat > conftest.java << 'END'
  public class conftest { }
  END
*************** echo "$ac_t""$use_fuse" 1>&6
*** 4339,4356 ****
  
  
  echo $ac_n "checking for g++ -ffloat-store bug""... $ac_c" 1>&6
! echo "configure:4343: checking for g++ -ffloat-store bug" >&5
  save_CFLAGS="$CFLAGS"
  CFLAGS="-x c++ -O2 -ffloat-store"
  cat > conftest.$ac_ext <<EOF
! #line 4347 "configure"
  #include "confdefs.h"
  #include <math.h>
  int main() {
  
  ; return 0; }
  EOF
! if { (eval echo configure:4354: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
    rm -rf conftest*
    echo "$ac_t""no" 1>&6
  else
--- 4349,4366 ----
  
  
  echo $ac_n "checking for g++ -ffloat-store bug""... $ac_c" 1>&6
! echo "configure:4353: checking for g++ -ffloat-store bug" >&5
  save_CFLAGS="$CFLAGS"
  CFLAGS="-x c++ -O2 -ffloat-store"
  cat > conftest.$ac_ext <<EOF
! #line 4357 "configure"
  #include "confdefs.h"
  #include <math.h>
  int main() {
  
  ; return 0; }
  EOF
! if { (eval echo configure:4364: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
    rm -rf conftest*
    echo "$ac_t""no" 1>&6
  else
*************** for ac_hdr in unistd.h bstring.h sys/tim
*** 4370,4386 ****
  do
  ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
  echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
! echo "configure:4374: checking for $ac_hdr" >&5
  if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
    cat > conftest.$ac_ext <<EOF
! #line 4379 "configure"
  #include "confdefs.h"
  #include <$ac_hdr>
  EOF
  ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
! { (eval echo configure:4384: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
  ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
  if test -z "$ac_err"; then
    rm -rf conftest*
--- 4380,4396 ----
  do
  ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
  echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
! echo "configure:4384: checking for $ac_hdr" >&5
  if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
    cat > conftest.$ac_ext <<EOF
! #line 4389 "configure"
  #include "confdefs.h"
  #include <$ac_hdr>
  EOF
  ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
! { (eval echo configure:4394: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
  ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
  if test -z "$ac_err"; then
    rm -rf conftest*
*************** for ac_hdr in dirent.h
*** 4410,4426 ****
  do
  ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
  echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
! echo "configure:4414: checking for $ac_hdr" >&5
  if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
    cat > conftest.$ac_ext <<EOF
! #line 4419 "configure"
  #include "confdefs.h"
  #include <$ac_hdr>
  EOF
  ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
! { (eval echo configure:4424: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
  ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
  if test -z "$ac_err"; then
    rm -rf conftest*
--- 4420,4436 ----
  do
  ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
  echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
! echo "configure:4424: checking for $ac_hdr" >&5
  if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
    cat > conftest.$ac_ext <<EOF
! #line 4429 "configure"
  #include "confdefs.h"
  #include <$ac_hdr>
  EOF
  ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
! { (eval echo configure:4434: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
  ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
  if test -z "$ac_err"; then
    rm -rf conftest*
*************** done
*** 4448,4459 ****
  
  
  echo $ac_n "checking for ANSI C header files""... $ac_c" 1>&6
! echo "configure:4452: checking for ANSI C header files" >&5
  if eval "test \"`echo '$''{'ac_cv_header_stdc'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
    cat > conftest.$ac_ext <<EOF
! #line 4457 "configure"
  #include "confdefs.h"
  #include <stdlib.h>
  #include <stdarg.h>
--- 4458,4469 ----
  
  
  echo $ac_n "checking for ANSI C header files""... $ac_c" 1>&6
! echo "configure:4462: checking for ANSI C header files" >&5
  if eval "test \"`echo '$''{'ac_cv_header_stdc'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
    cat > conftest.$ac_ext <<EOF
! #line 4467 "configure"
  #include "confdefs.h"
  #include <stdlib.h>
  #include <stdarg.h>
*************** else
*** 4461,4467 ****
  #include <float.h>
  EOF
  ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
! { (eval echo configure:4465: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
  ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
  if test -z "$ac_err"; then
    rm -rf conftest*
--- 4471,4477 ----
  #include <float.h>
  EOF
  ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
! { (eval echo configure:4475: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
  ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
  if test -z "$ac_err"; then
    rm -rf conftest*
*************** rm -f conftest*
*** 4478,4484 ****
  if test $ac_cv_header_stdc = yes; then
    # SunOS 4.x string.h does not declare mem*, contrary to ANSI.
  cat > conftest.$ac_ext <<EOF
! #line 4482 "configure"
  #include "confdefs.h"
  #include <string.h>
  EOF
--- 4488,4494 ----
  if test $ac_cv_header_stdc = yes; then
    # SunOS 4.x string.h does not declare mem*, contrary to ANSI.
  cat > conftest.$ac_ext <<EOF
! #line 4492 "configure"
  #include "confdefs.h"
  #include <string.h>
  EOF
*************** fi
*** 4496,4502 ****
  if test $ac_cv_header_stdc = yes; then
    # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI.
  cat > conftest.$ac_ext <<EOF
! #line 4500 "configure"
  #include "confdefs.h"
  #include <stdlib.h>
  EOF
--- 4506,4512 ----
  if test $ac_cv_header_stdc = yes; then
    # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI.
  cat > conftest.$ac_ext <<EOF
! #line 4510 "configure"
  #include "confdefs.h"
  #include <stdlib.h>
  EOF
*************** if test "$cross_compiling" = yes; then
*** 4517,4523 ****
    :
  else
    cat > conftest.$ac_ext <<EOF
! #line 4521 "configure"
  #include "confdefs.h"
  #include <ctype.h>
  #define ISLOWER(c) ('a' <= (c) && (c) <= 'z')
--- 4527,4533 ----
    :
  else
    cat > conftest.$ac_ext <<EOF
! #line 4531 "configure"
  #include "confdefs.h"
  #include <ctype.h>
  #define ISLOWER(c) ('a' <= (c) && (c) <= 'z')
*************** if (XOR (islower (i), ISLOWER (i)) || to
*** 4528,4534 ****
  exit (0); }
  
  EOF
! if { (eval echo configure:4532: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
  then
    :
  else
--- 4538,4544 ----
  exit (0); }
  
  EOF
! if { (eval echo configure:4542: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
  then
    :
  else
*************** EOF
*** 4552,4563 ****
  fi
  
  echo $ac_n "checking for ssize_t""... $ac_c" 1>&6
! echo "configure:4556: checking for ssize_t" >&5
  if eval "test \"`echo '$''{'ac_cv_type_ssize_t'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
    cat > conftest.$ac_ext <<EOF
! #line 4561 "configure"
  #include "confdefs.h"
  #include <sys/types.h>
  #if STDC_HEADERS
--- 4562,4573 ----
  fi
  
  echo $ac_n "checking for ssize_t""... $ac_c" 1>&6
! echo "configure:4566: checking for ssize_t" >&5
  if eval "test \"`echo '$''{'ac_cv_type_ssize_t'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
    cat > conftest.$ac_ext <<EOF
! #line 4571 "configure"
  #include "confdefs.h"
  #include <sys/types.h>
  #if STDC_HEADERS
*************** fi
*** 4586,4594 ****
  
  
  echo $ac_n "checking for in_addr_t""... $ac_c" 1>&6
! echo "configure:4590: checking for in_addr_t" >&5
  cat > conftest.$ac_ext <<EOF
! #line 4592 "configure"
  #include "confdefs.h"
  #include <sys/types.h>
  #if STDC_HEADERS
--- 4596,4604 ----
  
  
  echo $ac_n "checking for in_addr_t""... $ac_c" 1>&6
! echo "configure:4600: checking for in_addr_t" >&5
  cat > conftest.$ac_ext <<EOF
! #line 4602 "configure"
  #include "confdefs.h"
  #include <sys/types.h>
  #if STDC_HEADERS
*************** int main() {
*** 4602,4608 ****
  in_addr_t foo;
  ; return 0; }
  EOF
! if { (eval echo configure:4606: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
    rm -rf conftest*
    cat >> confdefs.h <<\EOF
  #define HAVE_IN_ADDR_T 1
--- 4612,4618 ----
  in_addr_t foo;
  ; return 0; }
  EOF
! if { (eval echo configure:4616: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
    rm -rf conftest*
    cat >> confdefs.h <<\EOF
  #define HAVE_IN_ADDR_T 1
*************** fi
*** 4618,4633 ****
  rm -f conftest*
  
  echo $ac_n "checking whether struct ip_mreq is in netinet/in.h""... $ac_c" 1>&6
! echo "configure:4622: checking whether struct ip_mreq is in netinet/in.h" >&5
  cat > conftest.$ac_ext <<EOF
! #line 4624 "configure"
  #include "confdefs.h"
  #include <netinet/in.h>
  int main() {
  struct ip_mreq mreq;
  ; return 0; }
  EOF
! if { (eval echo configure:4631: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
    rm -rf conftest*
    cat >> confdefs.h <<\EOF
  #define HAVE_STRUCT_IP_MREQ 1
--- 4628,4643 ----
  rm -f conftest*
  
  echo $ac_n "checking whether struct ip_mreq is in netinet/in.h""... $ac_c" 1>&6
! echo "configure:4632: checking whether struct ip_mreq is in netinet/in.h" >&5
  cat > conftest.$ac_ext <<EOF
! #line 4634 "configure"
  #include "confdefs.h"
  #include <netinet/in.h>
  int main() {
  struct ip_mreq mreq;
  ; return 0; }
  EOF
! if { (eval echo configure:4641: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
    rm -rf conftest*
    cat >> confdefs.h <<\EOF
  #define HAVE_STRUCT_IP_MREQ 1
*************** fi
*** 4643,4658 ****
  rm -f conftest*
  
  echo $ac_n "checking whether struct sockaddr_in6 is in netinet/in.h""... $ac_c" 1>&6
! echo "configure:4647: checking whether struct sockaddr_in6 is in netinet/in.h" >&5
  cat > conftest.$ac_ext <<EOF
! #line 4649 "configure"
  #include "confdefs.h"
  #include <netinet/in.h>
  int main() {
  struct sockaddr_in6 addr6;
  ; return 0; }
  EOF
! if { (eval echo configure:4656: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
    rm -rf conftest*
    cat >> confdefs.h <<\EOF
  #define HAVE_INET6 1
--- 4653,4668 ----
  rm -f conftest*
  
  echo $ac_n "checking whether struct sockaddr_in6 is in netinet/in.h""... $ac_c" 1>&6
! echo "configure:4657: checking whether struct sockaddr_in6 is in netinet/in.h" >&5
  cat > conftest.$ac_ext <<EOF
! #line 4659 "configure"
  #include "confdefs.h"
  #include <netinet/in.h>
  int main() {
  struct sockaddr_in6 addr6;
  ; return 0; }
  EOF
! if { (eval echo configure:4666: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
    rm -rf conftest*
    cat >> confdefs.h <<\EOF
  #define HAVE_INET6 1
*************** fi
*** 4668,4683 ****
  rm -f conftest*
  
  echo $ac_n "checking for socklen_t in sys/socket.h""... $ac_c" 1>&6
! echo "configure:4672: checking for socklen_t in sys/socket.h" >&5
  cat > conftest.$ac_ext <<EOF
! #line 4674 "configure"
  #include "confdefs.h"
  #include <sys/socket.h>
  int main() {
  socklen_t x = 5;
  ; return 0; }
  EOF
! if { (eval echo configure:4681: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
    rm -rf conftest*
    cat >> confdefs.h <<\EOF
  #define HAVE_SOCKLEN_T 1
--- 4678,4693 ----
  rm -f conftest*
  
  echo $ac_n "checking for socklen_t in sys/socket.h""... $ac_c" 1>&6
! echo "configure:4682: checking for socklen_t in sys/socket.h" >&5
  cat > conftest.$ac_ext <<EOF
! #line 4684 "configure"
  #include "confdefs.h"
  #include <sys/socket.h>
  int main() {
  socklen_t x = 5;
  ; return 0; }
  EOF
! if { (eval echo configure:4691: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
    rm -rf conftest*
    cat >> confdefs.h <<\EOF
  #define HAVE_SOCKLEN_T 1
*************** fi
*** 4693,4708 ****
  rm -f conftest*
  
  echo $ac_n "checking for tm_gmtoff in struct tm""... $ac_c" 1>&6
! echo "configure:4697: checking for tm_gmtoff in struct tm" >&5
  cat > conftest.$ac_ext <<EOF
! #line 4699 "configure"
  #include "confdefs.h"
  #include <time.h>
  int main() {
  struct tm tim; tim.tm_gmtoff = 0;
  ; return 0; }
  EOF
! if { (eval echo configure:4706: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
    rm -rf conftest*
    cat >> confdefs.h <<\EOF
  #define STRUCT_TM_HAS_GMTOFF 1
--- 4703,4718 ----
  rm -f conftest*
  
  echo $ac_n "checking for tm_gmtoff in struct tm""... $ac_c" 1>&6
! echo "configure:4707: checking for tm_gmtoff in struct tm" >&5
  cat > conftest.$ac_ext <<EOF
! #line 4709 "configure"
  #include "confdefs.h"
  #include <time.h>
  int main() {
  struct tm tim; tim.tm_gmtoff = 0;
  ; return 0; }
  EOF
! if { (eval echo configure:4716: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
    rm -rf conftest*
    cat >> confdefs.h <<\EOF
  #define STRUCT_TM_HAS_GMTOFF 1
*************** else
*** 4715,4730 ****
    rm -rf conftest*
    echo "$ac_t""no" 1>&6
     echo $ac_n "checking for global timezone variable""... $ac_c" 1>&6
! echo "configure:4719: checking for global timezone variable" >&5
              cat > conftest.$ac_ext <<EOF
! #line 4721 "configure"
  #include "confdefs.h"
  #include <time.h>
  int main() {
  long z2 = timezone;
  ; return 0; }
  EOF
! if { (eval echo configure:4728: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
    rm -rf conftest*
    cat >> confdefs.h <<\EOF
  #define HAVE_TIMEZONE 1
--- 4725,4740 ----
    rm -rf conftest*
    echo "$ac_t""no" 1>&6
     echo $ac_n "checking for global timezone variable""... $ac_c" 1>&6
! echo "configure:4729: checking for global timezone variable" >&5
              cat > conftest.$ac_ext <<EOF
! #line 4731 "configure"
  #include "confdefs.h"
  #include <time.h>
  int main() {
  long z2 = timezone;
  ; return 0; }
  EOF
! if { (eval echo configure:4738: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
    rm -rf conftest*
    cat >> confdefs.h <<\EOF
  #define HAVE_TIMEZONE 1
*************** rm -f conftest*
*** 4744,4762 ****
  # The Ultrix 4.2 mips builtin alloca declared by alloca.h only works
  # for constant arguments.  Useless!
  echo $ac_n "checking for working alloca.h""... $ac_c" 1>&6
! echo "configure:4748: checking for working alloca.h" >&5
  if eval "test \"`echo '$''{'ac_cv_header_alloca_h'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
    cat > conftest.$ac_ext <<EOF
! #line 4753 "configure"
  #include "confdefs.h"
  #include <alloca.h>
  int main() {
  char *p = alloca(2 * sizeof(int));
  ; return 0; }
  EOF
! if { (eval echo configure:4760: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
    rm -rf conftest*
    ac_cv_header_alloca_h=yes
  else
--- 4754,4772 ----
  # The Ultrix 4.2 mips builtin alloca declared by alloca.h only works
  # for constant arguments.  Useless!
  echo $ac_n "checking for working alloca.h""... $ac_c" 1>&6
! echo "configure:4758: checking for working alloca.h" >&5
  if eval "test \"`echo '$''{'ac_cv_header_alloca_h'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
    cat > conftest.$ac_ext <<EOF
! #line 4763 "configure"
  #include "confdefs.h"
  #include <alloca.h>
  int main() {
  char *p = alloca(2 * sizeof(int));
  ; return 0; }
  EOF
! if { (eval echo configure:4770: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
    rm -rf conftest*
    ac_cv_header_alloca_h=yes
  else
*************** EOF
*** 4777,4788 ****
  fi
  
  echo $ac_n "checking for alloca""... $ac_c" 1>&6
! echo "configure:4781: checking for alloca" >&5
  if eval "test \"`echo '$''{'ac_cv_func_alloca_works'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
    cat > conftest.$ac_ext <<EOF
! #line 4786 "configure"
  #include "confdefs.h"
  
  #ifdef __GNUC__
--- 4787,4798 ----
  fi
  
  echo $ac_n "checking for alloca""... $ac_c" 1>&6
! echo "configure:4791: checking for alloca" >&5
  if eval "test \"`echo '$''{'ac_cv_func_alloca_works'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
    cat > conftest.$ac_ext <<EOF
! #line 4796 "configure"
  #include "confdefs.h"
  
  #ifdef __GNUC__
*************** int main() {
*** 4810,4816 ****
  char *p = (char *) alloca(1);
  ; return 0; }
  EOF
! if { (eval echo configure:4814: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
    rm -rf conftest*
    ac_cv_func_alloca_works=yes
  else
--- 4820,4826 ----
  char *p = (char *) alloca(1);
  ; return 0; }
  EOF
! if { (eval echo configure:4824: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
    rm -rf conftest*
    ac_cv_func_alloca_works=yes
  else
*************** EOF
*** 4842,4853 ****
  
  
  echo $ac_n "checking whether alloca needs Cray hooks""... $ac_c" 1>&6
! echo "configure:4846: checking whether alloca needs Cray hooks" >&5
  if eval "test \"`echo '$''{'ac_cv_os_cray'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
    cat > conftest.$ac_ext <<EOF
! #line 4851 "configure"
  #include "confdefs.h"
  #if defined(CRAY) && ! defined(CRAY2)
  webecray
--- 4852,4863 ----
  
  
  echo $ac_n "checking whether alloca needs Cray hooks""... $ac_c" 1>&6
! echo "configure:4856: checking whether alloca needs Cray hooks" >&5
  if eval "test \"`echo '$''{'ac_cv_os_cray'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
    cat > conftest.$ac_ext <<EOF
! #line 4861 "configure"
  #include "confdefs.h"
  #if defined(CRAY) && ! defined(CRAY2)
  webecray
*************** echo "$ac_t""$ac_cv_os_cray" 1>&6
*** 4872,4883 ****
  if test $ac_cv_os_cray = yes; then
  for ac_func in _getb67 GETB67 getb67; do
    echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
! echo "configure:4876: checking for $ac_func" >&5
  if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
    cat > conftest.$ac_ext <<EOF
! #line 4881 "configure"
  #include "confdefs.h"
  /* System header to define __stub macros and hopefully few prototypes,
      which can conflict with char $ac_func(); below.  */
--- 4882,4893 ----
  if test $ac_cv_os_cray = yes; then
  for ac_func in _getb67 GETB67 getb67; do
    echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
! echo "configure:4886: checking for $ac_func" >&5
  if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
    cat > conftest.$ac_ext <<EOF
! #line 4891 "configure"
  #include "confdefs.h"
  /* System header to define __stub macros and hopefully few prototypes,
      which can conflict with char $ac_func(); below.  */
*************** $ac_func();
*** 4900,4906 ****
  
  ; return 0; }
  EOF
! if { (eval echo configure:4904: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
    rm -rf conftest*
    eval "ac_cv_func_$ac_func=yes"
  else
--- 4910,4916 ----
  
  ; return 0; }
  EOF
! if { (eval echo configure:4914: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
    rm -rf conftest*
    eval "ac_cv_func_$ac_func=yes"
  else
*************** done
*** 4927,4933 ****
  fi
  
  echo $ac_n "checking stack direction for C alloca""... $ac_c" 1>&6
! echo "configure:4931: checking stack direction for C alloca" >&5
  if eval "test \"`echo '$''{'ac_cv_c_stack_direction'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
--- 4937,4943 ----
  fi
  
  echo $ac_n "checking stack direction for C alloca""... $ac_c" 1>&6
! echo "configure:4941: checking stack direction for C alloca" >&5
  if eval "test \"`echo '$''{'ac_cv_c_stack_direction'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
*************** else
*** 4935,4941 ****
    ac_cv_c_stack_direction=0
  else
    cat > conftest.$ac_ext <<EOF
! #line 4939 "configure"
  #include "confdefs.h"
  find_stack_direction ()
  {
--- 4945,4951 ----
    ac_cv_c_stack_direction=0
  else
    cat > conftest.$ac_ext <<EOF
! #line 4949 "configure"
  #include "confdefs.h"
  find_stack_direction ()
  {
*************** main ()
*** 4954,4960 ****
    exit (find_stack_direction() < 0);
  }
  EOF
! if { (eval echo configure:4958: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
  then
    ac_cv_c_stack_direction=1
  else
--- 4964,4970 ----
    exit (find_stack_direction() < 0);
  }
  EOF
! if { (eval echo configure:4968: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
  then
    ac_cv_c_stack_direction=1
  else
*************** do
*** 4981,4987 ****
  # Extract the first word of "$ac_prog", so it can be a program name with args.
  set dummy $ac_prog; ac_word=$2
  echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
! echo "configure:4985: checking for $ac_word" >&5
  if eval "test \"`echo '$''{'ac_cv_prog_PERL'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
--- 4991,4997 ----
  # Extract the first word of "$ac_prog", so it can be a program name with args.
  set dummy $ac_prog; ac_word=$2
  echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
! echo "configure:4995: checking for $ac_word" >&5
  if eval "test \"`echo '$''{'ac_cv_prog_PERL'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
*************** done
*** 5140,5146 ****
  ac_given_srcdir=$srcdir
  ac_given_INSTALL="$INSTALL"
  
! trap 'rm -fr `echo "Makefile libgcj.spec gcj/Makefile include/Makefile testsuite/Makefile include/config.h" | sed "s/:[^ ]*//g"` conftest*; exit 1' 1 2 15
  EOF
  cat >> $CONFIG_STATUS <<EOF
  
--- 5150,5156 ----
  ac_given_srcdir=$srcdir
  ac_given_INSTALL="$INSTALL"
  
! trap 'rm -fr `echo "Makefile libgcj.spec libgcj-test.spec gcj/Makefile include/Makefile testsuite/Makefile include/config.h" | sed "s/:[^ ]*//g"` conftest*; exit 1' 1 2 15
  EOF
  cat >> $CONFIG_STATUS <<EOF
  
*************** s%@TESTSUBDIR_FALSE@%$TESTSUBDIR_FALSE%g
*** 5223,5234 ****
--- 5233,5247 ----
  s%@LIBDATASTARTSPEC@%$LIBDATASTARTSPEC%g
  s%@CPP@%$CPP%g
  s%@SYSTEMSPEC@%$SYSTEMSPEC%g
+ s%@LIBGCJTESTSPEC@%$LIBGCJTESTSPEC%g
  s%@ZLIBSPEC@%$ZLIBSPEC%g
+ s%@ZLIBTESTSPEC@%$ZLIBTESTSPEC%g
  s%@GCLIBS@%$GCLIBS%g
  s%@GCINCS@%$GCINCS%g
  s%@GCDEPS@%$GCDEPS%g
  s%@GCOBJS@%$GCOBJS%g
  s%@GCSPEC@%$GCSPEC%g
+ s%@GCTESTSPEC@%$GCTESTSPEC%g
  s%@THREADLIBS@%$THREADLIBS%g
  s%@THREADINCS@%$THREADINCS%g
  s%@THREADDEPS@%$THREADDEPS%g
*************** EOF
*** 5298,5304 ****
  
  cat >> $CONFIG_STATUS <<EOF
  
! CONFIG_FILES=\${CONFIG_FILES-"Makefile libgcj.spec gcj/Makefile include/Makefile testsuite/Makefile"}
  EOF
  cat >> $CONFIG_STATUS <<\EOF
  for ac_file in .. $CONFIG_FILES; do if test "x$ac_file" != x..; then
--- 5311,5317 ----
  
  cat >> $CONFIG_STATUS <<EOF
  
! CONFIG_FILES=\${CONFIG_FILES-"Makefile libgcj.spec libgcj-test.spec gcj/Makefile include/Makefile testsuite/Makefile"}
  EOF
  cat >> $CONFIG_STATUS <<\EOF
  for ac_file in .. $CONFIG_FILES; do if test "x$ac_file" != x..; then

-- 
Anthony Green                                                        Red Hat
                                                       Sunnyvale, California

From java-patches-return-535-listarch-java-patches=sourceware.cygnus.com@sourceware.cygnus.com Sun Mar 05 07:21:00 2000
Return-Path: <java-patches-return-535-listarch-java-patches=sourceware.cygnus.com@sourceware.cygnus.com>
Delivered-To: listarch-java-patches@sourceware.cygnus.com
Received: (qmail 25650 invoked by alias); 5 Mar 2000 07:20:59 -0000
Mailing-List: contact java-patches-help@sourceware.cygnus.com; run by ezmlm
Precedence: bulk
List-Subscribe: <mailto:java-patches-subscribe@sourceware.cygnus.com>
List-Archive: <http://sourceware.cygnus.com/ml/java-patches/>
List-Post: <mailto:java-patches@sourceware.cygnus.com>
List-Help: <mailto:java-patches-help@sourceware.cygnus.com>, <http://sourceware.cygnus.com/ml/#faqs>
Sender: java-patches-owner@sourceware.cygnus.com
Delivered-To: mailing list java-patches@sourceware.cygnus.com
Received: (qmail 25622 invoked from network); 5 Mar 2000 07:20:57 -0000
Date: Sat, 4 Mar 2000 23:20:44 -0800
Message-Id: <200003050720.XAA04835@hoser.cygnus.com>
X-Authentication-Warning: hoser.cygnus.com: green set sender to green@cygnus.com using -f
From: Anthony Green <green@cygnus.com>
To: java-patches@sourceware.cygnus.com
CC: bryce@albatross.co.nz
Subject: Patch: test case for PR 160
X-Organization: Red Hat, Sunnyvale, California
X-URL: http://www.cygnus.com/~green
Reply-to: green@redhat.com


I'm committing the following test case from Bryce.

BTW - Bryce - you should feel free to just check tests like this in.


2000-03-04  Anthony Green  <green@redhat.com>

	* libjava.lang/PR160.java: New file.
	* libjava.lang/PR160.out: New file.


? libjava/testsuite/libjava.lang/PR160
Index: libjava/testsuite/libjava.lang/PR160.java
===================================================================
RCS file: PR160.java
diff -N PR160.java
0a1,34
> public class PR160
> {
>   static final int len = 100;
>   
>   public static void main(String args[])
>   {
>     
>     double[] a = new double[len];
>     double[] b = new double[len];
>     
>     for (int i = 0; i < len ; i++)
>       {
> 	a[i] = 0.65;
>       }
>     
>     System.arraycopy(a, 0, b, 0, len);
>     
>     boolean errors = false;
>     
>     for (int i = 0; i < len ; i++)
>       {
> 	if (a[i] != b[i])
> 	  {
> 	    System.out.println("ERROR! " + a[i] + " != " 
> 			       + b[i] + " at index " + i);
> 	    errors = true;
> 	  }
>       }
>     
>     if (!errors)
>       System.out.println("ok");
>     
>   }
> }
Index: libjava/testsuite/libjava.lang/PR160.out
===================================================================
RCS file: PR160.out
diff -N PR160.out
0a1
> ok

From java-patches-return-536-listarch-java-patches=sourceware.cygnus.com@sourceware.cygnus.com Sun Mar 05 08:30:36 2000
Return-Path: <java-patches-return-536-listarch-java-patches=sourceware.cygnus.com@sourceware.cygnus.com>
Delivered-To: listarch-java-patches@sourceware.cygnus.com
Received: (qmail 26018 invoked by alias); 5 Mar 2000 08:30:35 -0000
Mailing-List: contact java-patches-help@sourceware.cygnus.com; run by ezmlm
Precedence: bulk
List-Subscribe: <mailto:java-patches-subscribe@sourceware.cygnus.com>
List-Archive: <http://sourceware.cygnus.com/ml/java-patches/>
List-Post: <mailto:java-patches@sourceware.cygnus.com>
List-Help: <mailto:java-patches-help@sourceware.cygnus.com>, <http://sourceware.cygnus.com/ml/#faqs>
Sender: java-patches-owner@sourceware.cygnus.com
Delivered-To: mailing list java-patches@sourceware.cygnus.com
Received: (qmail 25992 invoked from network); 5 Mar 2000 08:30:34 -0000
Date: Sun, 5 Mar 2000 00:30:33 -0800
Message-Id: <200003050830.AAA04873@hoser.cygnus.com>
X-Authentication-Warning: hoser.cygnus.com: green set sender to green@cygnus.com using -f
From: Anthony Green <green@cygnus.com>
To: java-patches@sourceware.cygnus.com
Subject: Patch: don't use glibc's math inlines
X-Organization: Red Hat, Sunnyvale, California
X-URL: http://www.cygnus.com/~green
Reply-to: green@redhat.com


I'm committing the following patch, which is required for correct
behaviour.  See PR gcj/151.

AG

-- 
Anthony Green                                                        Red Hat
                                                       Sunnyvale, California

2000-03-04  Anthony Green  <green@redhat.com>

	* configure.host (libgcj_flags): Define __NO_MATH_INLINES.
	See PR gcj/151.

Index: libjava/configure.host
===================================================================
RCS file: /cvs/java/libgcj/libjava/configure.host,v
retrieving revision 1.8
diff -p -r1.8 configure.host
*** configure.host	2000/02/13 18:07:09	1.8
--- configure.host	2000/03/05 08:26:35
*************** case "${host}" in
*** 58,64 ****
   	enable_getenv_properties_default=no
  	;;
    i686-*|i586-*|i486-*|i386-*)
! 	libgcj_flags="${libgcj_flags} -ffloat-store"
  	libgcj_interpreter=yes
  	DIVIDESPEC=-fno-use-divide-subroutine
  	;;
--- 58,64 ----
   	enable_getenv_properties_default=no
  	;;
    i686-*|i586-*|i486-*|i386-*)
! 	libgcj_flags="${libgcj_flags} -ffloat-store -D__NO_MATH_INLINES"
  	libgcj_interpreter=yes
  	DIVIDESPEC=-fno-use-divide-subroutine
  	;;

From java-patches-return-537-listarch-java-patches=sourceware.cygnus.com@sourceware.cygnus.com Sun Mar 05 08:58:29 2000
Return-Path: <java-patches-return-537-listarch-java-patches=sourceware.cygnus.com@sourceware.cygnus.com>
Delivered-To: listarch-java-patches@sourceware.cygnus.com
Received: (qmail 32029 invoked by alias); 5 Mar 2000 08:58:29 -0000
Mailing-List: contact java-patches-help@sourceware.cygnus.com; run by ezmlm
Precedence: bulk
List-Subscribe: <mailto:java-patches-subscribe@sourceware.cygnus.com>
List-Archive: <http://sourceware.cygnus.com/ml/java-patches/>
List-Post: <mailto:java-patches@sourceware.cygnus.com>
List-Help: <mailto:java-patches-help@sourceware.cygnus.com>, <http://sourceware.cygnus.com/ml/#faqs>
Sender: java-patches-owner@sourceware.cygnus.com
Delivered-To: mailing list java-patches@sourceware.cygnus.com
Received: (qmail 32004 invoked from network); 5 Mar 2000 08:58:28 -0000
Date: Sun, 5 Mar 2000 00:58:24 -0800 (PST)
From: Warren Levy <warrenl@cygnus.com>
To: java-patches@sourceware.cygnus.com
Subject: Patch: DatagramSocket/MulticastSocket constructor fix
Message-ID: <Pine.SOL.3.91.1000305004301.8952C-100000@fencer.cygnus.com>
MIME-Version: 1.0
Content-Type: TEXT/PLAIN; charset=US-ASCII

Folks,
I'm committing the following patch that takes care of a problem with 
using the MulticastSocket or DatagramSocket constructors that don't take 
an address (or if you pass a null address).  These used to work but were 
affected by another change a few months back.  Enjoy!
--warrenl


2000-03-05  Warren Levy  <warrenl@cygnus.com>

        * java/net/DatagramSocket.java(DatagramSocket(int,InetAddress):
          Handle null addresses.



Index: java/net/DatagramSocket.java
===================================================================
RCS file: /cvs/java/libgcj/libjava/java/net/DatagramSocket.java,v
retrieving revision 1.6
diff -u -p -r1.6 DatagramSocket.java
--- DatagramSocket.java 2000/01/19 18:39:26     1.6
+++ DatagramSocket.java 2000/03/05 08:57:09
@@ -1,6 +1,6 @@
 // DatagramSocket.java
 
-/* Copyright (C) 1999  Red Hat, Inc.
+/* Copyright (C) 1999, 2000  Red Hat, Inc.
 
    This file is part of libgcj.
 
@@ -66,7 +66,7 @@ public class DatagramSocket
     if (this instanceof MulticastSocket)
       impl.setOption(SocketOptions.SO_REUSEADDR, new Boolean(true));
 
-    impl.bind(port, laddr);
+    impl.bind(port, laddr == null ? ServerSocket.ANY_IF : laddr);
   }
 
   public void close()

From java-patches-return-538-listarch-java-patches=sourceware.cygnus.com@sourceware.cygnus.com Sun Mar 05 09:06:54 2000
Return-Path: <java-patches-return-538-listarch-java-patches=sourceware.cygnus.com@sourceware.cygnus.com>
Delivered-To: listarch-java-patches@sourceware.cygnus.com
Received: (qmail 495 invoked by alias); 5 Mar 2000 09:06:54 -0000
Mailing-List: contact java-patches-help@sourceware.cygnus.com; run by ezmlm
Precedence: bulk
List-Subscribe: <mailto:java-patches-subscribe@sourceware.cygnus.com>
List-Archive: <http://sourceware.cygnus.com/ml/java-patches/>
List-Post: <mailto:java-patches@sourceware.cygnus.com>
List-Help: <mailto:java-patches-help@sourceware.cygnus.com>, <http://sourceware.cygnus.com/ml/#faqs>
Sender: java-patches-owner@sourceware.cygnus.com
Delivered-To: mailing list java-patches@sourceware.cygnus.com
Received: (qmail 470 invoked from network); 5 Mar 2000 09:06:53 -0000
Date: Sun, 5 Mar 2000 01:06:50 -0800
Message-Id: <200003050906.BAA04918@hoser.cygnus.com>
X-Authentication-Warning: hoser.cygnus.com: green set sender to green@cygnus.com using -f
From: Anthony Green <green@cygnus.com>
To: java-patches@sourceware.cygnus.com
Subject: Patch: new test cases (PR gcj/129)
X-Organization: Red Hat, Sunnyvale, California
X-URL: http://www.cygnus.com/~green
Reply-to: green@redhat.com


I'm committing the following new test code:


2000-03-05  Anthony Green  <green@redhat.com>

	* libjava.compile/PR129_B.java: New file.
	* libjava.compile/support/PR129_A.java: New file.
	For PR gcj/129.


Index: libjava/testsuite/libjava.compile/PR129_B.java
===================================================================
RCS file: PR129_B.java
diff -N PR129_B.java
0a1,9
> import support.PR129_A;
> 
> public class PR129_B { 
>   public static void main ( String[] args ) { 
>     int length = PR129_A.strArr.length; 
>     System.out.println ( "Array length: " + length ); 
>   } 
> } 
> 
Index: libjava/testsuite/libjava.compile/support/PR129_A.java
===================================================================
RCS file: PR129_A.java
diff -N PR129_A.java
0a1,6
> package support;
> 
> public class PR129_A { 
>   public static String[] strArr = { "A", "B", "C" }; 
> } 
> 

-- 
Anthony Green                                                        Red Hat
                                                       Sunnyvale, California

From java-patches-return-539-listarch-java-patches=sourceware.cygnus.com@sourceware.cygnus.com Sun Mar 05 22:34:53 2000
Return-Path: <java-patches-return-539-listarch-java-patches=sourceware.cygnus.com@sourceware.cygnus.com>
Delivered-To: listarch-java-patches@sourceware.cygnus.com
Received: (qmail 20652 invoked by alias); 5 Mar 2000 22:34:53 -0000
Mailing-List: contact java-patches-help@sourceware.cygnus.com; run by ezmlm
Precedence: bulk
List-Subscribe: <mailto:java-patches-subscribe@sourceware.cygnus.com>
List-Archive: <http://sourceware.cygnus.com/ml/java-patches/>
List-Post: <mailto:java-patches@sourceware.cygnus.com>
List-Help: <mailto:java-patches-help@sourceware.cygnus.com>, <http://sourceware.cygnus.com/ml/#faqs>
Sender: java-patches-owner@sourceware.cygnus.com
Delivered-To: mailing list java-patches@sourceware.cygnus.com
Received: (qmail 20618 invoked from network); 5 Mar 2000 22:34:52 -0000
Date: Sun, 5 Mar 2000 14:34:48 -0800
Message-Id: <200003052234.OAA05622@hoser.cygnus.com>
X-Authentication-Warning: hoser.cygnus.com: green set sender to green@cygnus.com using -f
From: Anthony Green <green@cygnus.com>
To: java-patches@sourceware.cygnus.com
Subject: Patch: fix __NO_MATH_INLINES botch, and move FirstThread.
X-Organization: Red Hat, Sunnyvale, California
X-URL: http://www.cygnus.com/~green
Reply-to: green@redhat.com


My previous __NO_MATH_INLINES patch was botched.  This patches fixes it.

It also moves FirstThread from java.lang to gnu.gcj.runtime.  The plan
is to keep the java namespace clean.

I'm going to close PR libgcj/45.

AG

-- 
Anthony Green                                                        Red Hat
                                                       Sunnyvale, California


2000-03-08  Anthony Green  <green@redhat.com>

	* gcj/javaprims.h ("Java"): Remove FirstThread.

	* configure.host: Fix __NO_MATH_INLNES botch.

	* Makefile.in: Rebuilt.
	* Makefile.am (nat_source_files): Move natFirstThread.cc.
	(gnu/gcj/runtime/FirstThread.h): Moved.
	(ordinary_java_source_files): Move FirstThread.java.
	* prims.cc: Deal with FirstThread movement.
	(JvRunMain): Ditto.
	(_Jv_RunMain): Ditto.

	* gnu/gcj/runtime/FirstThread.java: Moved from java/lang.
	* gnu/gcj/runtime/natFirstThread.cc: Ditto.


Index: libjava/Makefile.am
===================================================================
RCS file: /cvs/java/libgcj/libjava/Makefile.am,v
retrieving revision 1.49
diff -p -r1.49 Makefile.am
*** Makefile.am	2000/03/02 20:25:19	1.49
--- Makefile.am	2000/03/05 22:10:16
*************** java/lang/ClassLoader.h: java/lang/Class
*** 215,221 ****
  		$(basename $<)
  
  ## Our internal main program needs to be able to create a FirstThread.
! java/lang/FirstThread.h: java/lang/FirstThread.class libgcj.zip
  	$(GCJH) -classpath $(top_builddir) \
  		-friend 'void JvRunMain (jclass, int, const char **);' \
  		-friend 'void _Jv_RunMain (const char*, int, const char **);' \
--- 215,221 ----
  		$(basename $<)
  
  ## Our internal main program needs to be able to create a FirstThread.
! gnu/gcj/runtime/FirstThread.h: gnu/gcj/runtime/FirstThread.class libgcj.zip
  	$(GCJH) -classpath $(top_builddir) \
  		-friend 'void JvRunMain (jclass, int, const char **);' \
  		-friend 'void _Jv_RunMain (const char*, int, const char **);' \
*************** gnu/gcj/io/DefaultMimeTypes.java \
*** 521,526 ****
--- 521,527 ----
  gnu/gcj/io/MimeTypes.java \
  gnu/gcj/jni/NativeThread.java \
  gnu/gcj/runtime/VMClassLoader.java \
+ gnu/gcj/runtime/FirstThread.java \
  gnu/gcj/text/BaseBreakIterator.java \
  gnu/gcj/text/CharacterBreakIterator.java \
  gnu/gcj/text/LineBreakIterator.java \
*************** java/lang/Double.java \
*** 611,617 ****
  java/lang/Error.java \
  java/lang/Exception.java \
  java/lang/ExceptionInInitializerError.java \
- java/lang/FirstThread.java \
  java/lang/Float.java \
  java/lang/IllegalAccessError.java \
  java/lang/IllegalAccessException.java \
--- 612,617 ----
*************** gnu/gcj/convert/natInput_SJIS.cc \
*** 804,809 ****
--- 804,810 ----
  gnu/gcj/convert/natOutput_EUCJIS.cc \
  gnu/gcj/convert/natOutput_SJIS.cc \
  gnu/gcj/jni/natNativeThread.cc \
+ gnu/gcj/runtime/natFirstThread.cc \
  java/io/natFile.cc \
  java/io/natFileDescriptor.cc \
  java/lang/natCharacter.cc \
*************** java/lang/natClass.cc \
*** 811,817 ****
  java/lang/natClassLoader.cc \
  java/lang/natConcreteProcess.cc \
  java/lang/natDouble.cc \
- java/lang/natFirstThread.cc \
  java/lang/natFloat.cc \
  java/lang/natMath.cc \
  java/lang/natObject.cc \
--- 812,817 ----
Index: libjava/Makefile.in
===================================================================
RCS file: /cvs/java/libgcj/libjava/Makefile.in,v
retrieving revision 1.53
diff -p -r1.53 Makefile.in
*** Makefile.in	2000/03/02 20:25:19	1.53
--- Makefile.in	2000/03/05 22:10:17
*************** GCINCS = @GCINCS@
*** 82,89 ****
--- 82,91 ----
  GCLIBS = @GCLIBS@
  GCOBJS = @GCOBJS@
  GCSPEC = @GCSPEC@
+ GCTESTSPEC = @GCTESTSPEC@
  INCLTDL = @INCLTDL@
  LIBDATASTARTSPEC = @LIBDATASTARTSPEC@
+ LIBGCJTESTSPEC = @LIBGCJTESTSPEC@
  LIBGCJ_CFLAGS = @LIBGCJ_CFLAGS@
  LIBGCJ_CXXFLAGS = @LIBGCJ_CXXFLAGS@
  LIBGCJ_JAVAFLAGS = @LIBGCJ_JAVAFLAGS@
*************** ZDEPS = @ZDEPS@
*** 107,112 ****
--- 109,115 ----
  ZINCS = @ZINCS@
  ZLIBS = @ZLIBS@
  ZLIBSPEC = @ZLIBSPEC@
+ ZLIBTESTSPEC = @ZLIBTESTSPEC@
  here = @here@
  libgcj_basedir = @libgcj_basedir@
  
*************** gnu/gcj/io/DefaultMimeTypes.java \
*** 330,335 ****
--- 333,339 ----
  gnu/gcj/io/MimeTypes.java \
  gnu/gcj/jni/NativeThread.java \
  gnu/gcj/runtime/VMClassLoader.java \
+ gnu/gcj/runtime/FirstThread.java \
  gnu/gcj/text/BaseBreakIterator.java \
  gnu/gcj/text/CharacterBreakIterator.java \
  gnu/gcj/text/LineBreakIterator.java \
*************** java/lang/Double.java \
*** 420,426 ****
  java/lang/Error.java \
  java/lang/Exception.java \
  java/lang/ExceptionInInitializerError.java \
- java/lang/FirstThread.java \
  java/lang/Float.java \
  java/lang/IllegalAccessError.java \
  java/lang/IllegalAccessException.java \
--- 424,429 ----
*************** gnu/gcj/convert/natInput_SJIS.cc \
*** 613,618 ****
--- 616,622 ----
  gnu/gcj/convert/natOutput_EUCJIS.cc \
  gnu/gcj/convert/natOutput_SJIS.cc \
  gnu/gcj/jni/natNativeThread.cc \
+ gnu/gcj/runtime/natFirstThread.cc \
  java/io/natFile.cc \
  java/io/natFileDescriptor.cc \
  java/lang/natCharacter.cc \
*************** java/lang/natClass.cc \
*** 620,626 ****
  java/lang/natClassLoader.cc \
  java/lang/natConcreteProcess.cc \
  java/lang/natDouble.cc \
- java/lang/natFirstThread.cc \
  java/lang/natFloat.cc \
  java/lang/natMath.cc \
  java/lang/natObject.cc \
--- 624,629 ----
*************** cygnus_hack = 
*** 697,703 ****
  ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
  mkinstalldirs = $(SHELL) $(top_srcdir)/../mkinstalldirs
  CONFIG_HEADER = ./include/config.h
! CONFIG_CLEAN_FILES =  libgcj.spec
  LIBRARIES =  $(toolexeclib_LIBRARIES)
  
  
--- 700,706 ----
  ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
  mkinstalldirs = $(SHELL) $(top_srcdir)/../mkinstalldirs
  CONFIG_HEADER = ./include/config.h
! CONFIG_CLEAN_FILES =  libgcj.spec libgcj-test.spec
  LIBRARIES =  $(toolexeclib_LIBRARIES)
  
  
*************** LINK = $(LIBTOOL) --mode=link $(CCLD) $(
*** 733,744 ****
  DATA =  $(data_DATA) $(toolexeclib_DATA)
  
  DIST_COMMON =  README COPYING.LIB ChangeLog Makefile.am Makefile.in NEWS \
! THANKS acinclude.m4 aclocal.m4 configure configure.in libgcj.spec.in
  
  
  DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST)
  
! TAR = tar
  GZIP_ENV = --best
  DIST_SUBDIRS =  @DIRLTDL@ testsuite gcj include @DIRLTDL@ gcj include
  DEP_FILES =  .deps/$(srcdir)/$(CONVERT_DIR)/gen-from-JIS.P \
--- 736,748 ----
  DATA =  $(data_DATA) $(toolexeclib_DATA)
  
  DIST_COMMON =  README COPYING.LIB ChangeLog Makefile.am Makefile.in NEWS \
! THANKS acinclude.m4 aclocal.m4 configure configure.in \
! libgcj-test.spec.in libgcj.spec.in
  
  
  DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST)
  
! TAR = gtar
  GZIP_ENV = --best
  DIST_SUBDIRS =  @DIRLTDL@ testsuite gcj include @DIRLTDL@ gcj include
  DEP_FILES =  .deps/$(srcdir)/$(CONVERT_DIR)/gen-from-JIS.P \
*************** DEP_FILES =  .deps/$(srcdir)/$(CONVERT_D
*** 764,769 ****
--- 768,774 ----
  .deps/gnu/gcj/protocol/http/Handler.P \
  .deps/gnu/gcj/protocol/jar/Connection.P \
  .deps/gnu/gcj/protocol/jar/Handler.P \
+ .deps/gnu/gcj/runtime/FirstThread.P \
  .deps/gnu/gcj/runtime/VMClassLoader.P \
  .deps/gnu/gcj/text/BaseBreakIterator.P \
  .deps/gnu/gcj/text/CharacterBreakIterator.P \
*************** DEP_FILES =  .deps/$(srcdir)/$(CONVERT_D
*** 816,823 ****
  .deps/java/lang/Compiler.P .deps/java/lang/ConcreteProcess.P \
  .deps/java/lang/Double.P .deps/java/lang/Error.P \
  .deps/java/lang/Exception.P \
! .deps/java/lang/ExceptionInInitializerError.P \
! .deps/java/lang/FirstThread.P .deps/java/lang/Float.P \
  .deps/java/lang/IllegalAccessError.P \
  .deps/java/lang/IllegalAccessException.P \
  .deps/java/lang/IllegalArgumentException.P \
--- 821,827 ----
  .deps/java/lang/Compiler.P .deps/java/lang/ConcreteProcess.P \
  .deps/java/lang/Double.P .deps/java/lang/Error.P \
  .deps/java/lang/Exception.P \
! .deps/java/lang/ExceptionInInitializerError.P .deps/java/lang/Float.P \
  .deps/java/lang/IllegalAccessError.P \
  .deps/java/lang/IllegalAccessException.P \
  .deps/java/lang/IllegalArgumentException.P \
*************** $(srcdir)/configure: @MAINTAINER_MODE_TR
*** 961,966 ****
--- 965,972 ----
  	cd $(srcdir) && $(AUTOCONF)
  libgcj.spec: $(top_builddir)/config.status libgcj.spec.in
  	cd $(top_builddir) && CONFIG_FILES=$@ CONFIG_HEADERS= $(SHELL) ./config.status
+ libgcj-test.spec: $(top_builddir)/config.status libgcj-test.spec.in
+ 	cd $(top_builddir) && CONFIG_FILES=$@ CONFIG_HEADERS= $(SHELL) ./config.status
  
  mostlyclean-toolexeclibLIBRARIES:
  
*************** distdir: $(DISTFILES)
*** 1282,1288 ****
  	@for file in $(DISTFILES); do \
  	  d=$(srcdir); \
  	  if test -d $$d/$$file; then \
! 	    cp -pr $$/$$file $(distdir)/$$file; \
  	  else \
  	    test -f $(distdir)/$$file \
  	    || ln $$d/$$file $(distdir)/$$file 2> /dev/null \
--- 1288,1294 ----
  	@for file in $(DISTFILES); do \
  	  d=$(srcdir); \
  	  if test -d $$d/$$file; then \
! 	    cp -pr $$d/$$file $(distdir)/$$file; \
  	  else \
  	    test -f $(distdir)/$$file \
  	    || ln $$d/$$file $(distdir)/$$file 2> /dev/null \
*************** java/lang/ClassLoader.h: java/lang/Class
*** 1512,1518 ****
  		-friend 'jclass _Jv_FindClass (_Jv_Utf8Const *name, java::lang::ClassLoader *loader);' \
  		$(basename $<)
  
! java/lang/FirstThread.h: java/lang/FirstThread.class libgcj.zip
  	$(GCJH) -classpath $(top_builddir) \
  		-friend 'void JvRunMain (jclass, int, const char **);' \
  		-friend 'void _Jv_RunMain (const char*, int, const char **);' \
--- 1518,1524 ----
  		-friend 'jclass _Jv_FindClass (_Jv_Utf8Const *name, java::lang::ClassLoader *loader);' \
  		$(basename $<)
  
! gnu/gcj/runtime/FirstThread.h: gnu/gcj/runtime/FirstThread.class libgcj.zip
  	$(GCJH) -classpath $(top_builddir) \
  		-friend 'void JvRunMain (jclass, int, const char **);' \
  		-friend 'void _Jv_RunMain (const char*, int, const char **);' \
Index: libjava/configure.host
===================================================================
RCS file: /cvs/java/libgcj/libjava/configure.host,v
retrieving revision 1.9
diff -p -r1.9 configure.host
*** configure.host	2000/03/05 08:32:51	1.9
--- configure.host	2000/03/05 22:10:17
*************** case "${host}" in
*** 58,65 ****
   	enable_getenv_properties_default=no
  	;;
    i686-*|i586-*|i486-*|i386-*)
! 	libgcj_flags="${libgcj_flags} -ffloat-store -D__NO_MATH_INLINES"
  	libgcj_interpreter=yes
  	DIVIDESPEC=-fno-use-divide-subroutine
  	;;
    sparc-*)
--- 58,67 ----
   	enable_getenv_properties_default=no
  	;;
    i686-*|i586-*|i486-*|i386-*)
! 	libgcj_flags="${libgcj_flags} -ffloat-store"
  	libgcj_interpreter=yes
+ 	libgcj_cxxflags="-D__NO_MATH_INLINES"
+ 	libgcj_cflags="-D__NO_MATH_INLINES"
  	DIVIDESPEC=-fno-use-divide-subroutine
  	;;
    sparc-*)
Index: libjava/prims.cc
===================================================================
RCS file: /cvs/java/libgcj/libjava/prims.cc,v
retrieving revision 1.20
diff -p -r1.20 prims.cc
*** prims.cc	2000/02/01 06:14:25	1.20
--- prims.cc	2000/03/05 22:10:21
*************** details.  */
*** 38,44 ****
  #include <java/lang/String.h>
  #include <java/lang/Thread.h>
  #include <java/lang/ThreadGroup.h>
! #include <java/lang/FirstThread.h>
  #include <java/lang/ArrayIndexOutOfBoundsException.h>
  #include <java/lang/ArithmeticException.h>
  #include <java/lang/ClassFormatError.h>
--- 38,44 ----
  #include <java/lang/String.h>
  #include <java/lang/Thread.h>
  #include <java/lang/ThreadGroup.h>
! #include <gnu/gcj/runtime/FirstThread.h>
  #include <java/lang/ArrayIndexOutOfBoundsException.h>
  #include <java/lang/ArithmeticException.h>
  #include <java/lang/ClassFormatError.h>
*************** JvRunMain (jclass klass, int argc, const
*** 850,856 ****
  
    arg_vec = JvConvertArgv (argc - 1, argv + 1);
    main_group = new java::lang::ThreadGroup (23);
!   main_thread = new java::lang::FirstThread (main_group, klass, arg_vec);
  
    main_thread->start();
    _Jv_ThreadWait ();
--- 850,857 ----
  
    arg_vec = JvConvertArgv (argc - 1, argv + 1);
    main_group = new java::lang::ThreadGroup (23);
!   main_thread = new gnu::gcj::runtime::FirstThread (main_group, 
! 						    klass, arg_vec);
  
    main_thread->start();
    _Jv_ThreadWait ();
*************** _Jv_RunMain (const char *class_name, int
*** 873,881 ****
  
    arg_vec = JvConvertArgv (argc - 1, argv + 1);
    main_group = new java::lang::ThreadGroup (23);
!   main_thread = new java::lang::FirstThread (main_group,
! 					     JvNewStringLatin1 (class_name),
! 					     arg_vec);
    main_thread->start();
    _Jv_ThreadWait ();
  
--- 874,882 ----
  
    arg_vec = JvConvertArgv (argc - 1, argv + 1);
    main_group = new java::lang::ThreadGroup (23);
!   main_thread = new gnu::gcj::runtime::FirstThread (main_group,
! 						    JvNewStringLatin1 (class_name),
! 						    arg_vec);
    main_thread->start();
    _Jv_ThreadWait ();
  
Index: libjava/gcj/Makefile.in
===================================================================
RCS file: /cvs/java/libgcj/libjava/gcj/Makefile.in,v
retrieving revision 1.4
diff -p -r1.4 Makefile.in
*** Makefile.in	2000/01/17 19:22:20	1.4
--- Makefile.in	2000/03/05 22:10:22
*************** GCINCS = @GCINCS@
*** 83,90 ****
--- 83,92 ----
  GCLIBS = @GCLIBS@
  GCOBJS = @GCOBJS@
  GCSPEC = @GCSPEC@
+ GCTESTSPEC = @GCTESTSPEC@
  INCLTDL = @INCLTDL@
  LIBDATASTARTSPEC = @LIBDATASTARTSPEC@
+ LIBGCJTESTSPEC = @LIBGCJTESTSPEC@
  LIBGCJ_CFLAGS = @LIBGCJ_CFLAGS@
  LIBGCJ_CXXFLAGS = @LIBGCJ_CXXFLAGS@
  LIBGCJ_JAVAFLAGS = @LIBGCJ_JAVAFLAGS@
*************** ZDEPS = @ZDEPS@
*** 108,113 ****
--- 110,116 ----
  ZINCS = @ZINCS@
  ZLIBS = @ZLIBS@
  ZLIBSPEC = @ZLIBSPEC@
+ ZLIBTESTSPEC = @ZLIBTESTSPEC@
  here = @here@
  libgcj_basedir = @libgcj_basedir@
  
*************** DIST_COMMON =  Makefile.am Makefile.in
*** 125,131 ****
  
  DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST)
  
! TAR = tar
  GZIP_ENV = --best
  all: all-redirect
  .SUFFIXES:
--- 128,134 ----
  
  DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST)
  
! TAR = gtar
  GZIP_ENV = --best
  all: all-redirect
  .SUFFIXES:
*************** distdir: $(DISTFILES)
*** 194,200 ****
  	@for file in $(DISTFILES); do \
  	  d=$(srcdir); \
  	  if test -d $$d/$$file; then \
! 	    cp -pr $$/$$file $(distdir)/$$file; \
  	  else \
  	    test -f $(distdir)/$$file \
  	    || ln $$d/$$file $(distdir)/$$file 2> /dev/null \
--- 197,203 ----
  	@for file in $(DISTFILES); do \
  	  d=$(srcdir); \
  	  if test -d $$d/$$file; then \
! 	    cp -pr $$d/$$file $(distdir)/$$file; \
  	  else \
  	    test -f $(distdir)/$$file \
  	    || ln $$d/$$file $(distdir)/$$file 2> /dev/null \
Index: libjava/include/Makefile.in
===================================================================
RCS file: /cvs/java/libgcj/libjava/include/Makefile.in,v
retrieving revision 1.4
diff -p -r1.4 Makefile.in
*** Makefile.in	2000/01/17 19:22:20	1.4
--- Makefile.in	2000/03/05 22:10:22
*************** GCINCS = @GCINCS@
*** 83,90 ****
--- 83,92 ----
  GCLIBS = @GCLIBS@
  GCOBJS = @GCOBJS@
  GCSPEC = @GCSPEC@
+ GCTESTSPEC = @GCTESTSPEC@
  INCLTDL = @INCLTDL@
  LIBDATASTARTSPEC = @LIBDATASTARTSPEC@
+ LIBGCJTESTSPEC = @LIBGCJTESTSPEC@
  LIBGCJ_CFLAGS = @LIBGCJ_CFLAGS@
  LIBGCJ_CXXFLAGS = @LIBGCJ_CXXFLAGS@
  LIBGCJ_JAVAFLAGS = @LIBGCJ_JAVAFLAGS@
*************** ZDEPS = @ZDEPS@
*** 108,113 ****
--- 110,116 ----
  ZINCS = @ZINCS@
  ZLIBS = @ZLIBS@
  ZLIBSPEC = @ZLIBSPEC@
+ ZLIBTESTSPEC = @ZLIBTESTSPEC@
  here = @here@
  libgcj_basedir = @libgcj_basedir@
  
*************** DIST_COMMON =  ./stamp-h.in Makefile.am 
*** 120,126 ****
  
  DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST)
  
! TAR = tar
  GZIP_ENV = --best
  all: all-redirect
  .SUFFIXES:
--- 123,129 ----
  
  DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST)
  
! TAR = gtar
  GZIP_ENV = --best
  all: all-redirect
  .SUFFIXES:
*************** distdir: $(DISTFILES)
*** 176,182 ****
  	@for file in $(DISTFILES); do \
  	  d=$(srcdir); \
  	  if test -d $$d/$$file; then \
! 	    cp -pr $$/$$file $(distdir)/$$file; \
  	  else \
  	    test -f $(distdir)/$$file \
  	    || ln $$d/$$file $(distdir)/$$file 2> /dev/null \
--- 179,185 ----
  	@for file in $(DISTFILES); do \
  	  d=$(srcdir); \
  	  if test -d $$d/$$file; then \
! 	    cp -pr $$d/$$file $(distdir)/$$file; \
  	  else \
  	    test -f $(distdir)/$$file \
  	    || ln $$d/$$file $(distdir)/$$file 2> /dev/null \
Index: libjava/testsuite/Makefile.in
===================================================================
RCS file: /cvs/java/libgcj/libjava/testsuite/Makefile.in,v
retrieving revision 1.16
diff -p -r1.16 Makefile.in
*** Makefile.in	2000/01/17 19:22:20	1.16
--- Makefile.in	2000/03/05 22:10:22
*************** GCINCS = @GCINCS@
*** 83,90 ****
--- 83,92 ----
  GCLIBS = @GCLIBS@
  GCOBJS = @GCOBJS@
  GCSPEC = @GCSPEC@
+ GCTESTSPEC = @GCTESTSPEC@
  INCLTDL = @INCLTDL@
  LIBDATASTARTSPEC = @LIBDATASTARTSPEC@
+ LIBGCJTESTSPEC = @LIBGCJTESTSPEC@
  LIBGCJ_CFLAGS = @LIBGCJ_CFLAGS@
  LIBGCJ_CXXFLAGS = @LIBGCJ_CXXFLAGS@
  LIBGCJ_JAVAFLAGS = @LIBGCJ_JAVAFLAGS@
*************** ZDEPS = @ZDEPS@
*** 108,113 ****
--- 110,116 ----
  ZINCS = @ZINCS@
  ZLIBS = @ZLIBS@
  ZLIBSPEC = @ZLIBSPEC@
+ ZLIBTESTSPEC = @ZLIBTESTSPEC@
  here = @here@
  libgcj_basedir = @libgcj_basedir@
  
*************** DIST_COMMON =  ChangeLog Makefile.am Mak
*** 133,139 ****
  
  DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST)
  
! TAR = tar
  GZIP_ENV = --best
  all: all-redirect
  .SUFFIXES:
--- 136,142 ----
  
  DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST)
  
! TAR = gtar
  GZIP_ENV = --best
  all: all-redirect
  .SUFFIXES:
*************** distdir: $(DISTFILES)
*** 161,167 ****
  	@for file in $(DISTFILES); do \
  	  d=$(srcdir); \
  	  if test -d $$d/$$file; then \
! 	    cp -pr $$/$$file $(distdir)/$$file; \
  	  else \
  	    test -f $(distdir)/$$file \
  	    || ln $$d/$$file $(distdir)/$$file 2> /dev/null \
--- 164,170 ----
  	@for file in $(DISTFILES); do \
  	  d=$(srcdir); \
  	  if test -d $$d/$$file; then \
! 	    cp -pr $$d/$$file $(distdir)/$$file; \
  	  else \
  	    test -f $(distdir)/$$file \
  	    || ln $$d/$$file $(distdir)/$$file 2> /dev/null \
Index: libjava/gcj/javaprims.h
===================================================================
RCS file: /cvs/java/libgcj/libjava/gcj/javaprims.h,v
retrieving revision 1.4
diff -p -r1.4 javaprims.h
*** javaprims.h	2000/01/19 18:39:24	1.4
--- javaprims.h	2000/03/05 22:29:55
*************** extern "Java"
*** 119,125 ****
        class Error;
        class Exception;
        class ExceptionInInitializerError;
-       class FirstThread;
        class Float;
        class IllegalAccessError;
        class IllegalAccessException;
--- 119,124 ----

From java-patches-return-540-listarch-java-patches=sourceware.cygnus.com@sourceware.cygnus.com Mon Mar 06 02:46:50 2000
Return-Path: <java-patches-return-540-listarch-java-patches=sourceware.cygnus.com@sourceware.cygnus.com>
Delivered-To: listarch-java-patches@sourceware.cygnus.com
Received: (qmail 22842 invoked by alias); 6 Mar 2000 02:46:50 -0000
Mailing-List: contact java-patches-help@sourceware.cygnus.com; run by ezmlm
Precedence: bulk
List-Subscribe: <mailto:java-patches-subscribe@sourceware.cygnus.com>
List-Archive: <http://sourceware.cygnus.com/ml/java-patches/>
List-Post: <mailto:java-patches@sourceware.cygnus.com>
List-Help: <mailto:java-patches-help@sourceware.cygnus.com>, <http://sourceware.cygnus.com/ml/#faqs>
Sender: java-patches-owner@sourceware.cygnus.com
Delivered-To: mailing list java-patches@sourceware.cygnus.com
Received: (qmail 22822 invoked from network); 6 Mar 2000 02:46:47 -0000
To: Java Patch List <java-patches@sourceware.cygnus.com> 
Subject: Patch: install jni.h; PR 43
X-Zippy:  ...Get me a GIN and TONIC!!...make it HAIR TONIC!!
X-Attribution:  Tom
Bcc:
Reply-To:  tromey@cygnus.com
From:  Tom Tromey <tromey@cygnus.com>
Date: 05 Mar 2000 19:48:46 -0700
Message-ID: <878zzw95kh.fsf@cygnus.com>
Lines: 31
X-Mailer: Gnus v5.5/Emacs 20.3

I'm committing this patch.  It fixes PR 43.
Now we install jni.h in $(includedir).
That might not be the best place, but I think:
(1) it is an ok place, since jni.h should in theory be independent of
the underlying implementation, and
(2) if it is a real problem hopefully some system packager like Debian
or (other people at) Red Hat will give us useful advice.

2000-03-05  Tom Tromey  <tromey@cygnus.com>

	Fix for PR libgcj/43:
	* include/Makefile.in: Rebuilt.
	* include/Makefile.am (include_HEADERS): New define.

Tom

Index: include/Makefile.am
===================================================================
RCS file: /cvs/java/libgcj/libjava/include/Makefile.am,v
retrieving revision 1.1
diff -u -r1.1 Makefile.am
--- Makefile.am	1999/09/10 22:03:06	1.1
+++ Makefile.am	2000/03/06 00:57:20
@@ -2,6 +2,4 @@
 
 AUTOMAKE_OPTIONS = foreign no-installinfo
 
-## FIXME: for now we don't install jni.h because we aren't really sure
-## where to install it.
-## include_HEADERS = jni.h
+include_HEADERS = jni.h

From java-patches-return-541-listarch-java-patches=sourceware.cygnus.com@sourceware.cygnus.com Mon Mar 06 03:47:53 2000
Return-Path: <java-patches-return-541-listarch-java-patches=sourceware.cygnus.com@sourceware.cygnus.com>
Delivered-To: listarch-java-patches@sourceware.cygnus.com
Received: (qmail 29823 invoked by alias); 6 Mar 2000 03:47:53 -0000
Mailing-List: contact java-patches-help@sourceware.cygnus.com; run by ezmlm
Precedence: bulk
List-Subscribe: <mailto:java-patches-subscribe@sourceware.cygnus.com>
List-Archive: <http://sourceware.cygnus.com/ml/java-patches/>
List-Post: <mailto:java-patches@sourceware.cygnus.com>
List-Help: <mailto:java-patches-help@sourceware.cygnus.com>, <http://sourceware.cygnus.com/ml/#faqs>
Sender: java-patches-owner@sourceware.cygnus.com
Delivered-To: mailing list java-patches@sourceware.cygnus.com
Received: (qmail 29797 invoked from network); 6 Mar 2000 03:47:52 -0000
Date: Sun, 5 Mar 2000 19:47:50 -0800
Message-Id: <200003060347.TAA18002@hoser.cygnus.com>
X-Authentication-Warning: hoser.cygnus.com: green set sender to green@cygnus.com using -f
From: Anthony Green <green@cygnus.com>
To: java-patches@sourceware.cygnus.com
Subject: Patch: more test code
X-Organization: Red Hat, Sunnyvale, California
X-URL: http://www.cygnus.com/~green
Reply-to: green@redhat.com


I'm committing the following test code from Jeff Sturm:

2000-03-05  Anthony Green  <green@redhat.com>

	* libjava.lang/PR141.java: New file.
	* libjava.lang/PR141.out: New file.
	For PR java.io/141.


Index: libjava/testsuite/libjava.lang/PR141.java
===================================================================
RCS file: PR141.java
diff -N PR141.java
0a1,41
> import java.io.IOException;
> import java.io.StreamTokenizer;
> import java.io.StringReader;
> 
> public class PR141 {
>   public static void test(String str) throws IOException {
>     StringReader reader = new StringReader(str);
>     StreamTokenizer st = new StreamTokenizer(reader);
>     int t = 0;
>     
>     do {
>       t = st.nextToken();
>       
>       switch (t) {
>       case StreamTokenizer.TT_WORD:
> 	System.out.println("[TT_WORD]: " + st.sval);
> 	break;
>       case StreamTokenizer.TT_NUMBER:
> 	System.out.println("[TT_NUMBER]: " + st.nval);
> 	break;
>       case StreamTokenizer.TT_EOL:
> 	System.out.println("[TT_EOL]");
> 	break;
>       case StreamTokenizer.TT_EOF:
> 	System.out.println("[TT_EOF]");
> 	break;
>       default:
> 	System.out.println((char)t);
> 	break;
>       }
>     } while (t != StreamTokenizer.TT_EOF);
>   }
>   
>   public static void main(String[] args) {
>     try {
>       test("(a).(b)");
>     } catch (Throwable t) {
>       t.printStackTrace();
>     }
>   }
> }
Index: libjava/testsuite/libjava.lang/PR141.out
===================================================================
RCS file: PR141.out
diff -N PR141.out
0a1,8
> (
> [TT_WORD]: a
> )
> [TT_NUMBER]: 0.0
> (
> [TT_WORD]: b
> )
> [TT_EOF]

-- 
Anthony Green                                                        Red Hat
                                                       Sunnyvale, California

From java-patches-return-542-listarch-java-patches=sourceware.cygnus.com@sourceware.cygnus.com Mon Mar 06 06:03:59 2000
Return-Path: <java-patches-return-542-listarch-java-patches=sourceware.cygnus.com@sourceware.cygnus.com>
Delivered-To: listarch-java-patches@sourceware.cygnus.com
Received: (qmail 18017 invoked by alias); 6 Mar 2000 06:03:59 -0000
Mailing-List: contact java-patches-help@sourceware.cygnus.com; run by ezmlm
Precedence: bulk
List-Subscribe: <mailto:java-patches-subscribe@sourceware.cygnus.com>
List-Archive: <http://sourceware.cygnus.com/ml/java-patches/>
List-Post: <mailto:java-patches@sourceware.cygnus.com>
List-Help: <mailto:java-patches-help@sourceware.cygnus.com>, <http://sourceware.cygnus.com/ml/#faqs>
Sender: java-patches-owner@sourceware.cygnus.com
Delivered-To: mailing list java-patches@sourceware.cygnus.com
Received: (qmail 17998 invoked from network); 6 Mar 2000 06:03:55 -0000
To: Java Patch List <java-patches@sourceware.cygnus.com> 
Subject: Patch: Test for PR 124, plus test suite improvement
X-Zippy:  Do you have exactly what I want in a plaid poindexter bar bat??
X-Attribution:  Tom
Bcc:
Reply-To:  tromey@cygnus.com
From:  Tom Tromey <tromey@cygnus.com>
Date: 05 Mar 2000 23:05:56 -0700
Message-ID: <8766v08wfv.fsf@cygnus.com>
Lines: 146
X-Mailer: Gnus v5.5/Emacs 20.3

I'm committing this patch.
It adds a test for PR 124.
It also changes the test suite to allow a `shouldfail' tag in an xfail
file; if this tag is seen then the test harness will assume that the
compilation for the file should fail.  This is different from an XFAIL
(which is used to mark failures we know about and aren't planning to
fix immediately).

2000-03-05  Tom Tromey  <tromey@cygnus.com>

	* lib/libjava.exp (test_libjava): Document `shouldfail' token.
	(test_libjava_from_source): Handle `shouldfail' case.
	(test_libjava_from_javac): Likewise.

	Test for PR libgcj/124:
	* libjava.compile/PR124.java: New file.
	* libjava.compile/PR124.xfail: New file.

Tom

Index: lib/libjava.exp
===================================================================
RCS file: /cvs/java/libgcj/libjava/testsuite/lib/libjava.exp,v
retrieving revision 1.12
diff -u -r1.12 libjava.exp
--- libjava.exp	2000/01/19 18:39:27	1.12
+++ libjava.exp	2000/03/06 06:02:56
@@ -1,4 +1,4 @@
-# Copyright (C) 1998, 1999 Red Hat, Inc.
+# Copyright (C) 1998, 1999, 2000 Red Hat, Inc.
 
 load_lib "libgloss.exp"
 
@@ -275,6 +275,11 @@
 #   `xfail-gcj'   compilation from source will fail
 #   `xfail-javac' compilation with javac will fail
 #   `xfail-gcjC'  compilation with gcj -C will fail
+#   `shouldfail'  compilation from source is supposed to fail
+#                 This is different from xfail, which marks a known
+#                 failure that we just havne't fixed.
+#                 A compilation marked this way should fail with any
+#                 front end.
 #   `xfail-byte'  compilation from bytecode will fail
 #   `xfail-exec'  exec will fail
 #   `xfail-output' output will be wrong
@@ -334,6 +339,12 @@
     }
     if { $x != "" } {
 	verbose "target_compile failed: $x" 2
+
+	if {[info exists opts(shouldfail)]} {
+	    pass "$errname compilation from source"
+	    return
+	}
+
 	fail "$errname compilation from source"
 	if {[info exists opts(xfail-gcj)] || ! [info exists opts(no-exec)]} {
 	    setup_xfail "*-*-*"
@@ -341,7 +352,11 @@
 	    setup_xfail "*-*-*"
 	    fail "$errname output from source compiled test"
 	}
-	return;
+	return
+    }
+    if {[info exists opts(shouldfail)]} {
+	fail "$errname compilation from source"
+	return
     }
     pass "$errname compilation from source"
 
@@ -409,6 +424,11 @@
 #   `xfail-gcj'   compilation from source will fail
 #   `xfail-javac' compilation with javac will fail
 #   `xfail-gcjC'  compilation with gcj -C will fail
+#   `shouldfail'  compilation from source is supposed to fail
+#                 This is different from xfail, which marks a known
+#                 failure that we just havne't fixed.
+#                 A compilation marked this way should fail with any
+#                 front end.
 #   `xfail-byte'  compilation from bytecode will fail
 #   `xfail-exec'  exec will fail
 #   `xfail-output' output will be wrong
@@ -443,6 +463,10 @@
 	setup_xfail *-*-*
     }
     if {! $bc_ok} then {
+	if {[info exists opts(shouldfail)]} {
+	    pass "$errname byte compilation"
+	    return
+	}
 	fail "$errname byte compilation"
 	setup_xfail "*-*-*"
 	fail "$errname compilation from bytecode"
@@ -454,6 +478,10 @@
 	}
 	return
     }
+    if {[info exists opts(shouldfail)]} {
+	fail "$errname byte compilation"
+	return
+    }
     pass "$errname byte compilation"
 
     # Find name to use for --main, and name of all class files.
@@ -607,10 +635,15 @@
 # Run the test specified by srcfile and resultfile. compile_args and
 # exec_args are options telling this proc how to work.
 #   `no-link'     don't try to link the program
-#   `no-exec' don't try to run the test
+#   `no-exec'     don't try to run the test
 #   `xfail-gcj'   compilation from source will fail
 #   `xfail-javac' compilation with javac will fail
 #   `xfail-gcjC'  compilation with gcj -C will fail
+#   `shouldfail'  compilation from source is supposed to fail
+#                 This is different from xfail, which marks a known
+#                 failure that we just havne't fixed.
+#                 A compilation marked this way should fail with any
+#                 front end.
 #   `xfail-byte'  compilation from bytecode will fail
 #   `xfail-exec'  exec will fail
 #   `xfail-output' output will be wrong
Index: libjava.compile/PR124.java
===================================================================
RCS file: PR124.java
diff -N PR124.java
--- /dev/null	Tue May  5 13:32:27 1998
+++ PR124.java	Sun Mar  5 22:02:56 2000
@@ -0,0 +1,9 @@
+import java.lang.reflect.*;
+
+public class PR124
+{
+  public static void main (String[] args)
+  {
+    System.out.println (new InvocationTargetException ());
+  }
+}
Index: libjava.compile/PR124.xfail
===================================================================
RCS file: PR124.xfail
diff -N PR124.xfail
--- /dev/null	Tue May  5 13:32:27 1998
+++ PR124.xfail	Sun Mar  5 22:02:56 2000
@@ -0,0 +1 @@
+shouldfail

From java-patches-return-543-listarch-java-patches=sourceware.cygnus.com@sourceware.cygnus.com Mon Mar 06 10:45:07 2000
Return-Path: <java-patches-return-543-listarch-java-patches=sourceware.cygnus.com@sourceware.cygnus.com>
Delivered-To: listarch-java-patches@sourceware.cygnus.com
Received: (qmail 24167 invoked by alias); 6 Mar 2000 10:45:05 -0000
Mailing-List: contact java-patches-help@sourceware.cygnus.com; run by ezmlm
Precedence: bulk
List-Subscribe: <mailto:java-patches-subscribe@sourceware.cygnus.com>
List-Archive: <http://sourceware.cygnus.com/ml/java-patches/>
List-Post: <mailto:java-patches@sourceware.cygnus.com>
List-Help: <mailto:java-patches-help@sourceware.cygnus.com>, <http://sourceware.cygnus.com/ml/#faqs>
Sender: java-patches-owner@sourceware.cygnus.com
Delivered-To: mailing list java-patches@sourceware.cygnus.com
Received: (qmail 24076 invoked from network); 6 Mar 2000 10:44:59 -0000
Message-ID: <38C38C47.624FE01@albatross.co.nz>
Date: Mon, 06 Mar 2000 23:45:27 +1300
From: Bryce McKinlay <bryce@albatross.co.nz>
X-Mailer: Mozilla 4.7 [en] (X11; I; Linux 2.2.14 i686)
X-Accept-Language: en
MIME-Version: 1.0
To: java-patches@sourceware.cygnus.com
Subject: Patch: PR 127 test case
Content-Type: text/plain; charset=us-ascii
Content-Transfer-Encoding: 7bit

I checked in the test case from PR gcj/127.

regards

  [ bryce ]


2000-03-06  Bryce McKinlay  <bryce@albatross.co.nz>

        * libjava.compile/PR127.java: New file.
        * libjava.compile/PR127.xfail: New file.
        PR 127 test case from Joerg Brunsmann.

// Test case for PR127:
// gcj dumps core on method invocation on a primitive type

class PR127
{
  void f()
  {
    int i;
    i.f();
  }
}

shouldfail


From java-patches-return-544-listarch-java-patches=sourceware.cygnus.com@sourceware.cygnus.com Tue Mar 07 00:10:39 2000
Return-Path: <java-patches-return-544-listarch-java-patches=sourceware.cygnus.com@sourceware.cygnus.com>
Delivered-To: listarch-java-patches@sourceware.cygnus.com
Received: (qmail 23105 invoked by alias); 7 Mar 2000 00:10:38 -0000
Mailing-List: contact java-patches-help@sourceware.cygnus.com; run by ezmlm
Precedence: bulk
List-Subscribe: <mailto:java-patches-subscribe@sourceware.cygnus.com>
List-Archive: <http://sourceware.cygnus.com/ml/java-patches/>
List-Post: <mailto:java-patches@sourceware.cygnus.com>
List-Help: <mailto:java-patches-help@sourceware.cygnus.com>, <http://sourceware.cygnus.com/ml/#faqs>
Sender: java-patches-owner@sourceware.cygnus.com
Delivered-To: mailing list java-patches@sourceware.cygnus.com
Received: (qmail 23080 invoked from network); 7 Mar 2000 00:10:34 -0000
To: Java Patch List <java-patches@sourceware.cygnus.com> 
Subject: Patch: restructure JNI method finding
X-Zippy:  Boy, am I glad it's only 1971...
X-Attribution:  Tom
Bcc:
Reply-To:  tromey@cygnus.com
From:  Tom Tromey <tromey@cygnus.com>
Date: 06 Mar 2000 17:12:45 -0700
Message-ID: <87ln3v7i4i.fsf@cygnus.com>
Lines: 274
X-Mailer: Gnus v5.5/Emacs 20.3

I'm committing this patch.  It changes how JNI methods are found.  It
separates the functionality into several different functions, and it
changes the JNI implementation to always keep a single JNIEnv per
thread.  These changes are going to be used by the compiler when we
change it to generate stubs for JNI methods.

2000-03-06  Tom Tromey  <tromey@cygnus.com>

	* jni.cc (MARK_NONE): New define.
	(MARK_USER): Likewise.
	(MARK_SYSTEM): Likewise.
	(struct _Jv_JNI_LocalFrame): Made `marker' bigger and `size'
	smaller.
	(_Jv_JNI_DeleteLocalRef): Use MARK_NONE in assert.
	(_Jv_JNI_EnsureLocalCapacity): Use MARK_NONE.
	(_Jv_JNI_PushLocalFrame): Use MARK_USER.
	(_Jv_JNI_PopLocalFrame): New version with additional `stop'
	argument.
	(call): Use MARK_SYSTEM.
	(_Jv_GetJNIEnvNewFrame): New function.
	(_Jv_LookupJNIMethod): New function.
	(_Jv_JNI_PopSystemFrame): New function.
	(call): Use _Jv_JNI_PopSystemFrame and _Jv_LookupJNIMethod.

Tom

Index: jni.cc
===================================================================
RCS file: /cvs/java/libgcj/libjava/jni.cc,v
retrieving revision 1.24
diff -u -r1.24 jni.cc
--- jni.cc	2000/03/02 20:25:20	1.24
+++ jni.cc	2000/03/07 00:08:15
@@ -75,15 +75,22 @@
 // 16.
 #define FRAME_SIZE 32
 
+// Mark value indicating this is an overflow frame.
+#define MARK_NONE    0
+// Mark value indicating this is a user frame.
+#define MARK_USER    1
+// Mark value indicating this is a system frame.
+#define MARK_SYSTEM  2
+
 // This structure is used to keep track of local references.
 struct _Jv_JNI_LocalFrame
 {
   // This is true if this frame object represents a pushed frame (eg
   // from PushLocalFrame).
-  int marker :  1;
+  int marker :  2;
 
   // Number of elements in frame.
-  int size   : 31;
+  int size   : 30;
 
   // Next frame in chain.
   _Jv_JNI_LocalFrame *next;
@@ -169,7 +176,7 @@
 	}
 
       // Don't go past a marked frame.
-      JvAssert (! frame->marker);
+      JvAssert (frame->marker == MARK_NONE);
     }
 
   JvAssert (0);
@@ -194,7 +201,7 @@
       return JNI_ERR;
     }
 
-  frame->marker = true;
+  frame->marker = MARK_NONE;
   frame->size = size;
   memset (&frame->vec[0], 0, size * sizeof (jobject));
   frame->next = env->locals;
@@ -211,7 +218,7 @@
     return r;
 
   // The new frame is on top.
-  env->locals->marker = true;
+  env->locals->marker = MARK_USER;
 
   return 0;
 }
@@ -248,7 +255,7 @@
 }
 
 static jobject
-_Jv_JNI_PopLocalFrame (JNIEnv *env, jobject result)
+_Jv_JNI_PopLocalFrame (JNIEnv *env, jobject result, int stop)
 {
   _Jv_JNI_LocalFrame *rf = env->locals;
 
@@ -260,7 +267,7 @@
 	  unmark_for_gc (rf->vec[i]);
 
       // If the frame we just freed is the marker frame, we are done.
-      done = rf->marker;
+      done = (rf->marker == stop);
 
       _Jv_JNI_LocalFrame *n = rf->next;
       // When N==NULL, we've reached the stack-allocated frame, and we
@@ -279,6 +286,20 @@
   return result == NULL ? NULL : _Jv_JNI_NewLocalRef (env, result);
 }
 
+static jobject
+_Jv_JNI_PopLocalFrame (JNIEnv *env, jobject result)
+{
+  return _Jv_JNI_PopLocalFrame (env, result, MARK_USER);
+}
+
+// Pop a `system' frame from the stack.  This is `extern "C"' as it is
+// used by the compiler.
+extern "C" void
+_Jv_JNI_PopSystemFrame (JNIEnv *env)
+{
+  _Jv_JNI_PopLocalFrame (env, NULL, MARK_SYSTEM);
+}
+
 // This function is used from other template functions.  It wraps the
 // return value appropriately; we specialize it so that object returns
 // are turned into local references.
@@ -1598,29 +1619,78 @@
   buf[here] = '\0';
 }
 
+// Return the current thread's JNIEnv; if one does not exist, create
+// it.  Also create a new system frame for use.  This is `extern "C"'
+// because the compiler calls it.
+extern "C" JNIEnv *
+_Jv_GetJNIEnvNewFrame (jclass klass)
+{
+  JNIEnv *env = _Jv_GetCurrentJNIEnv ();
+  if (env == NULL)
+    {
+      env = (JNIEnv *) _Jv_MallocUnchecked (sizeof (JNIEnv));
+      env->p = &_Jv_JNIFunctions;
+      env->ex = NULL;
+      env->klass = klass;
+      env->locals = NULL;
+
+      _Jv_SetCurrentJNIEnv (env);
+    }
+
+  _Jv_JNI_LocalFrame *frame
+    = (_Jv_JNI_LocalFrame *) _Jv_MallocUnchecked (sizeof (_Jv_JNI_LocalFrame)
+						  + (FRAME_SIZE
+						     * sizeof (jobject)));
+
+  frame->marker = MARK_SYSTEM;
+  frame->size = FRAME_SIZE;
+  frame->next = env->locals;
+  env->locals = frame;
+
+  for (int i = 0; i < frame->size; ++i)
+    frame->vec[i] = NULL;
+
+  return env;
+}
+
+// Return the function which implements a particular JNI method.  If
+// we can't find the function, we throw the appropriate exception.
+// This is `extern "C"' because the compiler uses it.
+extern "C" void *
+_Jv_LookupJNIMethod (jclass klass, _Jv_Utf8Const *name,
+		     _Jv_Utf8Const *signature)
+{
+  char buf[10 + 6 * (name->length + signature->length)];
+  int long_start;
+  void *function;
+
+  mangled_name (klass, name, signature, buf, &long_start);
+  char c = buf[long_start];
+  buf[long_start] = '\0';
+  function = _Jv_FindSymbolInExecutable (buf);
+  if (function == NULL)
+    {
+      buf[long_start] = c;
+      function = _Jv_FindSymbolInExecutable (buf);
+      if (function == NULL)
+	{
+	  jstring str = JvNewStringUTF (name->data);
+	  JvThrow (new java::lang::AbstractMethodError (str));
+	}
+    }
+
+  return function;
+}
+
 // This function is the stub which is used to turn an ordinary (CNI)
 // method call into a JNI call.
 void
 _Jv_JNIMethod::call (ffi_cif *, void *ret, ffi_raw *args, void *__this)
 {
   _Jv_JNIMethod* _this = (_Jv_JNIMethod *) __this;
-
-  JNIEnv env;
-  _Jv_JNI_LocalFrame *frame
-    = (_Jv_JNI_LocalFrame *) alloca (sizeof (_Jv_JNI_LocalFrame)
-				     + FRAME_SIZE * sizeof (jobject));
 
-  env.p = &_Jv_JNIFunctions;
-  env.ex = NULL;
-  env.klass = _this->defining_class;
-  env.locals = frame;
+  JNIEnv *env = _Jv_GetJNIEnvNewFrame (_this->defining_class);
 
-  frame->marker = true;
-  frame->next = NULL;
-  frame->size = FRAME_SIZE;
-  for (int i = 0; i < frame->size; ++i)
-    frame->vec[i] = NULL;
-
   // FIXME: we should mark every reference parameter as a local.  For
   // now we assume a conservative GC, and we assume that the
   // references are on the stack somewhere.
@@ -1629,33 +1699,16 @@
   // a value we don't cache that fact -- we might subsequently load a
   // library which finds the function in question.
   if (_this->function == NULL)
-    {
-      char buf[10 + 6 * (_this->self->name->length
-			 + _this->self->signature->length)];
-      int long_start;
-      mangled_name (_this->defining_class, _this->self->name,
-		    _this->self->signature, buf, &long_start);
-      char c = buf[long_start];
-      buf[long_start] = '\0';
-      _this->function = _Jv_FindSymbolInExecutable (buf);
-      if (_this->function == NULL)
-	{
-	  buf[long_start] = c;
-	  _this->function = _Jv_FindSymbolInExecutable (buf);
-	  if (_this->function == NULL)
-	    {
-	      jstring str = JvNewStringUTF (_this->self->name->data);
-	      JvThrow (new java::lang::AbstractMethodError (str));
-	    }
-	}
-    }
+    _this->function = _Jv_LookupJNIMethod (_this->defining_class,
+					   _this->self->name,
+					   _this->self->signature);
 
   JvAssert (_this->args_raw_size % sizeof (ffi_raw) == 0);
   ffi_raw real_args[2 + _this->args_raw_size / sizeof (ffi_raw)];
   int offset = 0;
 
   // First argument is always the environment pointer.
-  real_args[offset++].ptr = &env;
+  real_args[offset++].ptr = env;
 
   // For a static method, we pass in the Class.  For non-static
   // methods, the `this' argument is already handled.
@@ -1669,14 +1722,10 @@
   ffi_raw_call (&_this->jni_cif, (void (*) (...)) _this->function,
 		ret, real_args);
 
-  do
-    {
-      _Jv_JNI_PopLocalFrame (&env, NULL);
-    }
-  while (env.locals != frame);
+  _Jv_JNI_PopSystemFrame (env);
 
-  if (env.ex)
-    JvThrow (env.ex);
+  if (env->ex)
+    JvThrow (env->ex);
 }
 
 #endif /* INTERPRETER */

From java-patches-return-545-listarch-java-patches=sourceware.cygnus.com@sourceware.cygnus.com Tue Mar 07 00:49:12 2000
Return-Path: <java-patches-return-545-listarch-java-patches=sourceware.cygnus.com@sourceware.cygnus.com>
Delivered-To: listarch-java-patches@sourceware.cygnus.com
Received: (qmail 1058 invoked by alias); 7 Mar 2000 00:49:10 -0000
Mailing-List: contact java-patches-help@sourceware.cygnus.com; run by ezmlm
Precedence: bulk
List-Subscribe: <mailto:java-patches-subscribe@sourceware.cygnus.com>
List-Archive: <http://sourceware.cygnus.com/ml/java-patches/>
List-Post: <mailto:java-patches@sourceware.cygnus.com>
List-Help: <mailto:java-patches-help@sourceware.cygnus.com>, <http://sourceware.cygnus.com/ml/#faqs>
Sender: java-patches-owner@sourceware.cygnus.com
Delivered-To: mailing list java-patches@sourceware.cygnus.com
Received: (qmail 938 invoked from network); 7 Mar 2000 00:49:05 -0000
To: Java Patch List <java-patches@sourceware.cygnus.com> 
Subject: Patch: pr 164 test
X-Zippy:  Thank god!!..  It's HENNY YOUNGMAN!!
X-Attribution:  Tom
Bcc:
Reply-To:  tromey@cygnus.com
From:  Tom Tromey <tromey@cygnus.com>
Date: 06 Mar 2000 17:51:12 -0700
Message-ID: <87k8jf7gcf.fsf@cygnus.com>
Lines: 31
X-Mailer: Gnus v5.5/Emacs 20.3

I'm checking in this test, which is from PR 164.

2000-03-06  Tom Tromey  <tromey@cygnus.com>

	Test for PR gcj/164:
	* libjava.compile/PR164.xfail: New file.
	* libjava.compile/PR164.java: New file.

Tom

Index: libjava.compile/PR164.java
===================================================================
RCS file: PR164.java
diff -N PR164.java
--- /dev/null	Tue May  5 13:32:27 1998
+++ PR164.java	Mon Mar  6 16:47:54 2000
@@ -0,0 +1,6 @@
+// Test from PR 164.
+
+class PR164
+{
+  volatile final int foo = 8;
+}
Index: libjava.compile/PR164.xfail
===================================================================
RCS file: PR164.xfail
diff -N PR164.xfail
--- /dev/null	Tue May  5 13:32:27 1998
+++ PR164.xfail	Mon Mar  6 16:47:54 2000
@@ -0,0 +1 @@
+shouldfail

From java-patches-return-546-listarch-java-patches=sourceware.cygnus.com@sourceware.cygnus.com Tue Mar 07 10:22:47 2000
Return-Path: <java-patches-return-546-listarch-java-patches=sourceware.cygnus.com@sourceware.cygnus.com>
Delivered-To: listarch-java-patches@sourceware.cygnus.com
Received: (qmail 13111 invoked by alias); 7 Mar 2000 10:22:46 -0000
Mailing-List: contact java-patches-help@sourceware.cygnus.com; run by ezmlm
Precedence: bulk
List-Subscribe: <mailto:java-patches-subscribe@sourceware.cygnus.com>
List-Archive: <http://sourceware.cygnus.com/ml/java-patches/>
List-Post: <mailto:java-patches@sourceware.cygnus.com>
List-Help: <mailto:java-patches-help@sourceware.cygnus.com>, <http://sourceware.cygnus.com/ml/#faqs>
Sender: java-patches-owner@sourceware.cygnus.com
Delivered-To: mailing list java-patches@sourceware.cygnus.com
Received: (qmail 13063 invoked from network); 7 Mar 2000 10:22:32 -0000
Message-ID: <38C4D88C.42872305@albatross.co.nz>
Date: Tue, 07 Mar 2000 23:23:08 +1300
From: Bryce McKinlay <bryce@albatross.co.nz>
X-Mailer: Mozilla 4.7 [en] (X11; I; Linux 2.2.14 i686)
X-Accept-Language: en
MIME-Version: 1.0
To: java-patches@sourceware.cygnus.com
Subject: Patch: Constant time interface method lookup
Content-Type: multipart/mixed;
 boundary="------------822F4101E043B2C5CA81D2FF"

This is a multi-part message in MIME format.
--------------822F4101E043B2C5CA81D2FF
Content-Type: text/plain; charset=us-ascii
Content-Transfer-Encoding: 7bit

I checked in this patch.

See:
http://sourceware.cygnus.com/ml/java-patches/1999-q4/msg00080.html

for a full description of what it does. The only difference between this
and the one I posted last month is some minor comment typo fixes, and
the incorporation of the resolve.cc interpreter fix.

The compiler side of the patch is here:
 http://gcc.gnu.org/ml/gcc-patches/2000-03/msg00208.html

regards

  [ bryce ]

2000-03-07  Bryce McKinlay  <bryce@albatross.co.nz>

        * resolve.cc (_Jv_SearchMethodInClass): New function.
        (_Jv_ResolvePoolEntry): Search superinterfaces for interface
methods.
        * java/lang/Class.h (_Jv_SearchMethodInClass): New prototype.

2000-03-07  Bryce McKinlay  <bryce@albatross.co.nz>

        * java/lang/Class.h (union _Jv_IDispatchTable): New declaration.

        (struct _Jv_ifaces): New declaration.
        JV_CLASS: New macro definition.
        (getComponentType): Relocate below isArray() for inlining.
        (getModifiers): Declare `inline'.
        (getSuperclass): Ditto.
        (isArray): Ditto.
        (isPrimitive): Ditto.
        (_Jv_IsAssignableFrom): New prototype.
        (_Jv_LookupInterfaceMethodIdx): New prototype. Predeclare with
"C"
        linkage.
        (_Jv_InitClass): Move from natClass.cc. Declare `inline'.
        Check for JV_STATE_DONE before invoking initializeClass().
        (_Jv_PrepareConstantTimeTables): New prototype.
        (_Jv_GetInterfaces): Ditto.
        (_Jv_GenerateITable): Ditto.
        (_Jv_GetMethodString): Ditto.
        (_Jv_AppendPartialITable): Ditto.
        (_Jv_FindIIndex): Ditto.
        depth, ancestors, idt: New class fields.

        * java/lang/natClass.cc (isAssignableFrom): Move functionality
to
        inline function `_Jv_IsAssignableFrom'. Use that function.
        (isInstance): Declare `inline'.
        (initializeClass): Get lock on class before checking `state'.
Unlock
        before calling resolveClass0. Call _Jv_PrepareConstantTimeTables
with
        the lock held.
        (_Jv_LookupInterfaceMethod): Use _Jv_GetMessageString.
        (_Jv_IsAssignableFrom): New inline function. Test assignability
using
        class->depth and ancestor table.
        (_Jv_IsInstanceOf): Use _Jv_IsAssignableFrom.
        (_Jv_CheckCast): Move from prims.cc. Use JV_CLASS and
        _Jv_IsAssignableFrom.
        (_Jv_CheckArrayStore): Ditto.
        (_Jv_LookupInterfaceMethodIdx): New function.
        INITIAL_IOFFSETS_LEN, INITIAL_IFACES_LEN: New #defines.
        (_Jv_PrepareConstantTimeTables): New function.
        (_Jv_IndexOf): Ditto.
        (_Jv_GetInterfaces): Ditto.
        (_Jv_GenerateITable): Ditto.
        (_Jv_GetMethodString): Ditto.
        (_Jv_AppendPartialITable): Ditto.
        iindex_mutex, iindex_mutex_initialized: New static fields.
        (_Jv_FindIIndex): New function.

        * java/lang/natClassLoader.cc (_Jv_NewClass): Set new jclass
fields.

        * prims.cc (_Jv_CheckCast): Moved to natClass.cc.
        (_Jv_CheckArrayStore): Ditto.
        (JvNewCharArray, JvNewBooleanArray, JvNewByteArray,
JvNewShortArray,
        JvNewIntArray, JvNewLongArray, JvNewFloatArray,
JvNewDoubleArray):
        Moved to gcj/array.h.
        (_Jv_Realloc): New function.

        * gcj/cni.h: Move _Jv_PrimClass definitions to gcj/array.h.

        * gcj/array.h: _Jv_PrimClass definitions moved from gcj/cni.h.
        (JvNewCharArray, JvNewBooleanArray, JvNewByteArray,
        JvNewShortArray, JvNewIntArray, JvNewLongArray, JvNewFloatArray,

        JvNewDoubleArray): Implementations moved from prims.cc and
        declared `inline'.

        * gcj/javaprims.h (_Jv_Realloc): Prototype.

        * include/jvm.h (_Jv_LookupInterfaceMethodIdx): Prototype.

--------------822F4101E043B2C5CA81D2FF
Content-Type: text/plain; charset=us-ascii;
 name="libgcj-interface-dispatch-4.patch"
Content-Transfer-Encoding: 7bit
Content-Disposition: inline;
 filename="libgcj-interface-dispatch-4.patch"

Index: resolve.cc
===================================================================
RCS file: /cvs/java/libgcj/libjava/resolve.cc,v
retrieving revision 1.14
diff -u -r1.14 resolve.cc
--- resolve.cc	2000/02/16 00:07:33	1.14
+++ resolve.cc	2000/03/07 09:37:26
@@ -24,6 +24,7 @@
 #include <java/lang/InternalError.h>
 #include <java/lang/VirtualMachineError.h>
 #include <java/lang/NoSuchFieldError.h>
+#include <java/lang/NoSuchMethodError.h>
 #include <java/lang/ClassFormatError.h>
 #include <java/lang/IllegalAccessError.h>
 #include <java/lang/AbstractMethodError.h>
@@ -230,59 +231,78 @@
       _Jv_Method *the_method = 0;
       jclass found_class = 0;
 
-      // we make a loop here, because methods are allowed to be moved to
-      // a super class, and still be visible.. (binary compatibility).
+      // First search the class itself.
+      the_method = _Jv_SearchMethodInClass (owner, klass, 
+	           method_name, method_signature);
+
+      if (the_method != 0)
+        {
+	  found_class = owner;
+          goto end_of_method_search;
+	}
 
-      for (jclass cls = owner; cls != 0; cls = cls->getSuperclass ())
-	{
-	  for (int i = 0;  i < cls->method_count;  i++)
+      // If we are resolving an interface method, search the interface's 
+      // superinterfaces (A superinterface is not an interface's superclass - 
+      // a superinterface is implemented by the interface).
+      if (pool->tags[index] == JV_CONSTANT_InterfaceMethodref)
+        {
+	  _Jv_ifaces ifaces;
+	  ifaces.count = 0;
+	  ifaces.len = 4;
+	  ifaces.list = (jclass *) _Jv_Malloc (ifaces.len * sizeof (jclass *));
+
+	  _Jv_GetInterfaces (owner, &ifaces);	  
+          
+	  for (int i=0; i < ifaces.count; i++)
 	    {
-	      _Jv_Method *method = &cls->methods[i];
-	      if (   (!_Jv_equalUtf8Consts (method->name,
-					    method_name))
-		  || (!_Jv_equalUtf8Consts (method->signature,
-					    method_signature)))
-		continue;
-
-	      if (cls == klass 
-		  || ((method->accflags & Modifier::PUBLIC) != 0)
-		  || (((method->accflags & Modifier::PROTECTED) != 0)
-		      && cls->isAssignableFrom (klass))
-		  || (((method->accflags & Modifier::PRIVATE) == 0)
-		      && _Jv_ClassNameSamePackage (cls->name,
-						   klass->name)))
-		{
-		  // FIXME: if (cls->loader != klass->loader), then we
-		  // must actually check that the types of arguments
-		  // correspond.  That is, for each argument type, and
-		  // the return type, doing _Jv_FindClassFromSignature
-		  // with either loader should produce the same result,
-		  // i.e., exactly the same jclass object. JVMS 5.4.3.3
-
-		  the_method = method;
+	      jclass cls = ifaces.list[i];
+	      the_method = _Jv_SearchMethodInClass (cls, klass, method_name, 
+	                                            method_signature);
+	      if (the_method != 0)
+	        {
 		  found_class = cls;
-
-		  
-		  if (pool->tags[index] == JV_CONSTANT_InterfaceMethodref)
-		    vtable_index = -1;
-		  else
-		    vtable_index = _Jv_DetermineVTableIndex
-		      (cls, method_name, method_signature);
-
-		  if (vtable_index == 0)
-		    throw_incompatible_class_change_error
-		      (JvNewStringLatin1 ("method not found"));
-
-		  goto end_of_method_search;
+                  break;
 		}
-	      else
-		{
-		  JvThrow (new java::lang::IllegalAccessError);
-		}
 	    }
+	  
+	  _Jv_Free (ifaces.list);
+	  
+	  if (the_method != 0)
+	    goto end_of_method_search;
 	}
 
+      // Finally, search superclasses. 
+      for (jclass cls = owner->getSuperclass (); cls != 0; 
+           cls = cls->getSuperclass ())
+	{
+	  the_method = _Jv_SearchMethodInClass (cls, klass, 
+	               method_name, method_signature);
+          if (the_method != 0)
+	    {
+	      found_class = cls;
+	      break;
+	    }
+	}
+
     end_of_method_search:
+    
+      // FIXME: if (cls->loader != klass->loader), then we
+      // must actually check that the types of arguments
+      // correspond.  That is, for each argument type, and
+      // the return type, doing _Jv_FindClassFromSignature
+      // with either loader should produce the same result,
+      // i.e., exactly the same jclass object. JVMS 5.4.3.3    
+    
+      if (pool->tags[index] == JV_CONSTANT_InterfaceMethodref)
+	vtable_index = -1;
+      else
+	vtable_index = _Jv_DetermineVTableIndex
+	  (found_class, method_name, method_signature);
+
+      if (vtable_index == 0)
+	throw_incompatible_class_change_error
+	  (JvNewStringLatin1 ("method not found"));
+
       if (the_method == 0)
 	{
 	  jstring msg = JvNewStringLatin1 ("method ");
@@ -290,7 +310,7 @@
 	  msg = msg->concat (JvNewStringLatin1("."));
 	  msg = msg->concat (_Jv_NewStringUTF (method_name->data));
 	  msg = msg->concat (JvNewStringLatin1(" was not found."));
-	  JvThrow(new java::lang::NoSuchFieldError (msg));
+	  JvThrow(new java::lang::NoSuchMethodError (msg));
 	}
       
       pool->data[index].rmethod = 
@@ -307,6 +327,41 @@
   return pool->data[index];
 }
 
+// Find a method declared in the cls that is referenced from klass and
+// perform access checks.
+_Jv_Method *
+_Jv_SearchMethodInClass (jclass cls, jclass klass, 
+                         _Jv_Utf8Const *method_name, 
+			 _Jv_Utf8Const *method_signature)
+{
+  using namespace java::lang::reflect;
+
+  for (int i = 0;  i < cls->method_count;  i++)
+    {
+      _Jv_Method *method = &cls->methods[i];
+      if (   (!_Jv_equalUtf8Consts (method->name,
+				    method_name))
+	  || (!_Jv_equalUtf8Consts (method->signature,
+				    method_signature)))
+	continue;
+
+      if (cls == klass 
+	  || ((method->accflags & Modifier::PUBLIC) != 0)
+	  || (((method->accflags & Modifier::PROTECTED) != 0)
+	      && cls->isAssignableFrom (klass))
+	  || (((method->accflags & Modifier::PRIVATE) == 0)
+	      && _Jv_ClassNameSamePackage (cls->name,
+					   klass->name)))
+	{
+	  return method;
+	}
+      else
+	{
+	  JvThrow (new java::lang::IllegalAccessError);
+	}
+    }
+  return 0;
+}
 
 void
 _Jv_ResolveField (_Jv_Field *field, java::lang::ClassLoader *loader)
Index: prims.cc
===================================================================
RCS file: /cvs/java/libgcj/libjava/prims.cc,v
retrieving revision 1.21
diff -u -r1.21 prims.cc
--- prims.cc	2000/03/05 22:25:11	1.21
+++ prims.cc	2000/03/07 09:37:26
@@ -42,11 +42,9 @@
 #include <java/lang/ArrayIndexOutOfBoundsException.h>
 #include <java/lang/ArithmeticException.h>
 #include <java/lang/ClassFormatError.h>
-#include <java/lang/ClassCastException.h>
 #include <java/lang/NegativeArraySizeException.h>
 #include <java/lang/NullPointerException.h>
 #include <java/lang/OutOfMemoryError.h>
-#include <java/lang/ArrayStoreException.h>
 #include <java/lang/System.h>
 #include <java/lang/reflect/Modifier.h>
 #include <java/io/PrintStream.h>
@@ -286,31 +284,6 @@
 	   (java::lang::String::valueOf(bad_index)));
 }
 
-void*
-_Jv_CheckCast (jclass c, jobject obj)
-{
-  if (obj != NULL && ! c->isAssignableFrom(obj->getClass()))
-    JvThrow (new java::lang::ClassCastException);
-  return obj;
-}
-
-void
-_Jv_CheckArrayStore (jobject arr, jobject obj)
-{
-  if (obj)
-    {
-      JvAssert (arr != NULL);
-      jclass arr_class = arr->getClass();
-      JvAssert (arr_class->isArray());
-      jclass elt_class = arr_class->getComponentType();
-      jclass obj_class = obj->getClass();
-      if (! elt_class->isAssignableFrom(obj_class))
-	JvThrow (new java::lang::ArrayStoreException);
-    }
-}
-
-
-
 // Allocate some unscanned memory and throw an exception if no memory.
 void *
 _Jv_AllocBytesChecked (jsize size)
@@ -421,54 +394,6 @@
   return arr;
 }
 
-jcharArray
-JvNewCharArray (jint length)
-{
-  return (jcharArray) _Jv_NewPrimArray (JvPrimClass (char), length);
-}
-
-jbooleanArray
-JvNewBooleanArray (jint length)
-{
-  return (jbooleanArray) _Jv_NewPrimArray (JvPrimClass (boolean), length);
-}
-
-jbyteArray
-JvNewByteArray (jint length)
-{
-  return (jbyteArray) _Jv_NewPrimArray (JvPrimClass (byte), length);
-}
-
-jshortArray
-JvNewShortArray (jint length)
-{
-  return (jshortArray) _Jv_NewPrimArray (JvPrimClass (short), length);
-}
-
-jintArray
-JvNewIntArray (jint length)
-{
-  return (jintArray) _Jv_NewPrimArray (JvPrimClass (int), length);
-}
-
-jlongArray
-JvNewLongArray (jint length)
-{
-  return (jlongArray) _Jv_NewPrimArray (JvPrimClass (long), length);
-}
-
-jfloatArray
-JvNewFloatArray (jint length)
-{
-  return (jfloatArray) _Jv_NewPrimArray (JvPrimClass (float), length);
-}
-
-jdoubleArray
-JvNewDoubleArray (jint length)
-{
-  return (jdoubleArray) _Jv_NewPrimArray (JvPrimClass (double), length);
-}
-
 jobject
 _Jv_NewArray (jint type, jint size)
 {
@@ -919,22 +844,33 @@
 
 
 void *
-_Jv_MallocUnchecked (jsize size)
+_Jv_Malloc (jsize size)
 {
   if (size == 0)
     size = 1;
-  return malloc ((size_t) size);
+  void *ptr = malloc ((size_t) size);
+  if (ptr == NULL)
+    JvThrow (no_memory);
+  return ptr;
 }
 
 void *
-_Jv_Malloc (jsize size)
+_Jv_Realloc (void *ptr, jsize size)
 {
   if (size == 0)
     size = 1;
-  void *ptr = malloc ((size_t) size);
+  ptr = realloc (ptr, (size_t) size);
   if (ptr == NULL)
     JvThrow (no_memory);
   return ptr;
+}
+
+void *
+_Jv_MallocUnchecked (jsize size)
+{
+  if (size == 0)
+    size = 1;
+  return malloc ((size_t) size);
 }
 
 void
Index: java/lang/Class.h
===================================================================
RCS file: /cvs/java/libgcj/libjava/java/lang/Class.h,v
retrieving revision 1.16
diff -u -r1.16 Class.h
--- Class.h	2000/03/02 20:25:20	1.16
+++ Class.h	2000/03/07 09:37:26
@@ -22,6 +22,10 @@
 extern "C" void _Jv_InitClass (jclass klass);
 extern "C" void _Jv_RegisterClasses (jclass *classes);
 
+// This must be predefined with "C" linkage.
+extern "C" void *_Jv_LookupInterfaceMethodIdx (jclass klass, jclass iface, 
+                                               int meth_idx);
+
 // These are the possible values for the `state' field of the class
 // structure.  Note that ordering is important here.  Whenever the
 // state changes, one should notify all waiters of this class.
@@ -60,13 +64,41 @@
   _Jv_Utf8Const *signature;
   _Jv_ushort accflags;
   void *ncode;
-
   _Jv_Method *getNextMethod ()
   { return this + 1; }
 };
 
+// Interface Dispatch Tables 
+union _Jv_IDispatchTable
+{
+  struct
+  {
+    // Index into interface's ioffsets.
+    jshort iindex;
+    jshort itable_length;
+    // Class Interface dispatch table.
+    void **itable;
+  } cls;
+
+  struct
+  {
+    // Offsets into implementation class itables.
+    jshort *ioffsets;
+  } iface;
+};
+
+// Used by _Jv_GetInterfaces ()
+struct _Jv_ifaces
+{
+  jclass *list;
+  jshort len;
+  jshort count;
+};
+
 #define JV_PRIMITIVE_VTABLE ((_Jv_VTable *) -1)
 
+#define JV_CLASS(Obj) ((jclass) (*(_Jv_VTable **) Obj)->clas)
+
 class java::lang::Class : public java::lang::Object
 {
 public:
@@ -78,11 +110,6 @@
       return loader;
     }
 
-  jclass getComponentType (void)
-    {
-      return isArray () ? (* (jclass *) &methods) : 0;
-    }
-
   java::lang::reflect::Constructor *getConstructor (JArray<jclass> *);
   JArray<java::lang::reflect::Constructor *> *getConstructors (void);
   java::lang::reflect::Constructor *getDeclaredConstructor (JArray<jclass> *);
@@ -112,7 +139,7 @@
   java::lang::reflect::Method *getMethod (jstring, JArray<jclass> *);
   JArray<java::lang::reflect::Method *> *getMethods (void);
 
-  jint getModifiers (void)
+  inline jint getModifiers (void)
     {
       return accflags;
     }
@@ -123,21 +150,26 @@
   java::io::InputStream *getResourceAsStream (jstring resourceName);
   JArray<jobject> *getSigners (void);
 
-  jclass getSuperclass (void)
+  inline jclass getSuperclass (void)
     {
       return superclass;
     }
 
-  jboolean isArray (void)
+  inline jboolean isArray (void)
     {
       return name->data[0] == '[';
     }
 
+  inline jclass getComponentType (void)
+    {
+      return isArray () ? (* (jclass *) &methods) : 0;
+    }
+
   jboolean isAssignableFrom (jclass cls);
   jboolean isInstance (jobject obj);
   jboolean isInterface (void);
-
-  jboolean isPrimitive (void)
+  
+  inline jboolean isPrimitive (void)
     {
       return vtable == JV_PRIMITIVE_VTABLE;
     }
@@ -150,11 +182,12 @@
     {
       return size_in_bytes;
     }
-
+    
   // finalization
   void finalize ();
 
-private:
+private:   
+
   void checkMemberAccess (jint flags);
 
   void initializeClass (void);
@@ -162,10 +195,19 @@
   // Friend functions implemented in natClass.cc.
   friend _Jv_Method *_Jv_GetMethodLocal (jclass klass, _Jv_Utf8Const *name,
 					 _Jv_Utf8Const *signature);
+  friend jboolean _Jv_IsAssignableFrom(jclass, jclass);
+  friend void *_Jv_LookupInterfaceMethodIdx (jclass klass, jclass iface, 
+					     int method_idx);
+
+  inline friend void 
+  _Jv_InitClass (jclass klass)
+  {
+    if (klass->state != JV_STATE_DONE)
+      klass->initializeClass ();
+  }
+
   friend _Jv_Method* _Jv_LookupDeclaredMethod (jclass, _Jv_Utf8Const *, 
 					       _Jv_Utf8Const*);
-  friend void _Jv_InitClass (jclass klass);
-
   friend jfieldID JvGetFirstInstanceField (jclass);
   friend jint JvNumInstanceFields (jclass);
   friend jfieldID JvGetFirstStaticField (jclass);
@@ -205,6 +247,12 @@
 			      java::lang::ClassLoader *loader);
 
   friend void _Jv_PrepareCompiledClass (jclass);
+  friend void _Jv_PrepareConstantTimeTables (jclass);
+  friend jshort _Jv_GetInterfaces (jclass, _Jv_ifaces *);
+  friend void _Jv_GenerateITable (jclass, _Jv_ifaces *, jshort *);
+  friend jstring _Jv_GetMethodString(jclass, _Jv_Utf8Const *);
+  friend jshort _Jv_AppendPartialITable (jclass, jclass, void **, jshort);
+  friend jshort _Jv_FindIIndex (jclass *, jshort *, jshort);
 
 #ifdef INTERPRETER
   friend jboolean _Jv_IsInterpretedClass (jclass);
@@ -213,6 +261,10 @@
 				       _Jv_Utf8Const*);
   friend void _Jv_InitField (jobject, jclass, int);
   friend _Jv_word _Jv_ResolvePoolEntry (jclass, int);
+  friend _Jv_Method *_Jv_SearchMethodInClass (jclass cls, jclass klass, 
+                        		      _Jv_Utf8Const *method_name, 
+					      _Jv_Utf8Const *method_signature);
+
   friend void _Jv_PrepareClass (jclass);
 
   friend class _Jv_ClassReader;	
@@ -265,6 +317,12 @@
   // The thread which has locked this class.  Used during class
   // initialization.
   java::lang::Thread *thread;
+  // How many levels of "extends" this class is removed from Object.
+  jshort depth;
+  // Vector of this class's superclasses, ordered by decreasing depth.
+  jclass *ancestors;
+  // Interface Dispatch Table.
+  _Jv_IDispatchTable *idt;
 };
 
 #endif /* __JAVA_LANG_CLASS_H__ */
Index: java/lang/natClass.cc
===================================================================
RCS file: /cvs/java/libgcj/libjava/java/lang/natClass.cc,v
retrieving revision 1.17
diff -u -r1.17 natClass.cc
--- natClass.cc	2000/03/02 20:25:20	1.17
+++ natClass.cc	2000/03/07 09:37:26
@@ -10,13 +10,15 @@
 
 #include <config.h>
 
-#include <stdlib.h>
+#include <limits.h>
 #include <string.h>
 
 #pragma implementation "Class.h"
 
 #include <gcj/cni.h>
 #include <jvm.h>
+#include <java-threads.h>
+
 #include <java/lang/Class.h>
 #include <java/lang/ClassLoader.h>
 #include <java/lang/String.h>
@@ -26,6 +28,8 @@
 #include <java/lang/reflect/Field.h>
 #include <java/lang/reflect/Constructor.h>
 #include <java/lang/AbstractMethodError.h>
+#include <java/lang/ArrayStoreException.h>
+#include <java/lang/ClassCastException.h>
 #include <java/lang/ClassNotFoundException.h>
 #include <java/lang/ExceptionInInitializerError.h>
 #include <java/lang/IllegalAccessException.h>
@@ -34,6 +38,7 @@
 #include <java/lang/InstantiationException.h>
 #include <java/lang/NoClassDefFoundError.h>
 #include <java/lang/NoSuchFieldException.h>
+#include <java/lang/NoSuchMethodError.h>
 #include <java/lang/NoSuchMethodException.h>
 #include <java/lang/Thread.h>
 #include <java/lang/NullPointerException.h>
@@ -608,40 +613,10 @@
 jboolean
 java::lang::Class::isAssignableFrom (jclass klass)
 {
-  if (this == klass)
-    return true;
-  // Primitive types must be equal, which we just tested for.
-  if (isPrimitive () || ! klass || klass->isPrimitive())
-    return false;
-
-  // If target is array, so must source be.
-  if (isArray ())
-    {
-      if (! klass->isArray())
-	return false;
-      return getComponentType()->isAssignableFrom(klass->getComponentType());
-    }
-
-  if (isAssignableFrom (klass->getSuperclass()))
-    return true;
-
-  if (isInterface())
-    {
-      // See if source implements this interface.
-      for (int i = 0; i < klass->interface_count; ++i)
-	{
-	  jclass interface = klass->interfaces[i];
-	  // FIXME: ensure that class is prepared here.
-	  // See Spec 12.3.2.
-	  if (isAssignableFrom (interface))
-	    return true;
-	}
-    }
-
-  return false;
+  return _Jv_IsAssignableFrom (this, klass);
 }
 
-jboolean
+inline jboolean
 java::lang::Class::isInstance (jobject obj)
 {
   if (! obj || isPrimitive ())
@@ -649,7 +624,7 @@
   return isAssignableFrom (obj->getClass());
 }
 
-jboolean
+inline jboolean
 java::lang::Class::isInterface (void)
 {
   return (accflags & java::lang::reflect::Modifier::INTERFACE) != 0;
@@ -696,36 +671,32 @@
 void
 java::lang::Class::initializeClass (void)
 {
-  // Short-circuit to avoid needless locking.
+  // jshort-circuit to avoid needless locking.
   if (state == JV_STATE_DONE)
     return;
+
+  // Step 1.
+  _Jv_MonitorEnter (this);
 
-  // do this before we enter the monitor below, since this can cause
-  // exceptions.  Here we assume, that reading "state" is an atomic
-  // operation, I pressume that is true? --Kresten
   if (state < JV_STATE_LINKED)
-    {
+    {    
 #ifdef INTERPRETER
       if (_Jv_IsInterpretedClass (this))
 	{
+	  // this can throw exceptions, so exit the monitor as a precaution.
+	  _Jv_MonitorExit (this);
 	  java::lang::ClassLoader::resolveClass0 (this);
-
-	  // Step 1.
 	  _Jv_MonitorEnter (this);
 	}
       else
 #endif
         {
-          // Step 1.
-	  _Jv_MonitorEnter (this);
 	  _Jv_PrepareCompiledClass (this);
 	}
-    }
-  else
-    {
-      // Step 1.
-      _Jv_MonitorEnter (this);
     }
+  
+  if (state <= JV_STATE_LINKED)
+    _Jv_PrepareConstantTimeTables (this);
 
   // Step 2.
   java::lang::Thread *self = java::lang::Thread::currentThread();
@@ -828,14 +799,14 @@
 
 _Jv_Method *
 _Jv_LookupDeclaredMethod (jclass klass, _Jv_Utf8Const *name,
-			_Jv_Utf8Const *signature)
+                          _Jv_Utf8Const *signature)
 {
   for (; klass; klass = klass->getSuperclass())
     {
       _Jv_Method *meth = _Jv_GetMethodLocal (klass, name, signature);
 
       if (meth)
-	return meth;
+        return meth;
     }
 
   return NULL;
@@ -854,15 +825,15 @@
 
 static void *
 _Jv_FindMethodInCache (jclass klass,
-		       _Jv_Utf8Const *name,
-		       _Jv_Utf8Const *signature)
+                       _Jv_Utf8Const *name,
+                       _Jv_Utf8Const *signature)
 {
   int index = name->hash & MCACHE_SIZE;
   _Jv_mcache *mc = method_cache + index;
   _Jv_Method *m = mc->method;
 
   if (mc->klass == klass
-      && m != NULL		// thread safe check
+      && m != NULL             // thread safe check
       && _Jv_equalUtf8Consts (m->name, name)
       && _Jv_equalUtf8Consts (m->signature, signature))
     return mc->method->ncode;
@@ -871,7 +842,7 @@
 
 static void
 _Jv_AddMethodToCache (jclass klass,
-			_Jv_Method *method)
+                       _Jv_Method *method)
 {
   _Jv_MonitorEnter (&ClassClass); 
 
@@ -885,8 +856,10 @@
 
 void *
 _Jv_LookupInterfaceMethod (jclass klass, _Jv_Utf8Const *name,
-			   _Jv_Utf8Const *signature)
+                           _Jv_Utf8Const *signature)
 {
+  using namespace java::lang::reflect;
+
   void *ncode = _Jv_FindMethodInCache (klass, name, signature);
   if (ncode != 0)
     return ncode;
@@ -895,31 +868,432 @@
     {
       _Jv_Method *meth = _Jv_GetMethodLocal (klass, name, signature);
       if (! meth)
-	continue;
+        continue;
 
-      if (java::lang::reflect::Modifier::isStatic(meth->accflags))
-	JvThrow (new java::lang::IncompatibleClassChangeError);
-      if (java::lang::reflect::Modifier::isAbstract(meth->accflags))
-	JvThrow (new java::lang::AbstractMethodError);
-      if (! java::lang::reflect::Modifier::isPublic(meth->accflags))
-	JvThrow (new java::lang::IllegalAccessError);
+      if (Modifier::isStatic(meth->accflags))
+	JvThrow (new java::lang::IncompatibleClassChangeError
+	         (_Jv_GetMethodString (klass, meth->name)));
+      if (Modifier::isAbstract(meth->accflags))
+	JvThrow (new java::lang::AbstractMethodError
+	         (_Jv_GetMethodString (klass, meth->name)));
+      if (! Modifier::isPublic(meth->accflags))
+	JvThrow (new java::lang::IllegalAccessError
+	         (_Jv_GetMethodString (klass, meth->name)));
 
       _Jv_AddMethodToCache (klass, meth);
 
       return meth->ncode;
     }
   JvThrow (new java::lang::IncompatibleClassChangeError);
-  return NULL;			// Placate compiler.
+  return NULL;                 // Placate compiler.
 }
 
-void
-_Jv_InitClass (jclass klass)
+// Fast interface method lookup by index.
+void *
+_Jv_LookupInterfaceMethodIdx (jclass klass, jclass iface, int method_idx)
 {
-  klass->initializeClass();
+  _Jv_IDispatchTable *cldt = klass->idt;
+  int idx = iface->idt->iface.ioffsets[cldt->cls.iindex] + method_idx;
+  return cldt->cls.itable[idx];
+}
+
+inline jboolean
+_Jv_IsAssignableFrom (jclass target, jclass source)
+{
+  if (target == &ObjectClass 
+      || source == target 
+      || (source->ancestors != NULL 
+          && source->ancestors[source->depth - target->depth] == target))
+     return true;
+     
+  // If target is array, so must source be.  
+  if (target->isArray ())
+    {
+      if (! source->isArray())
+	return false;
+      return _Jv_IsAssignableFrom(target->getComponentType(), 
+                                  source->getComponentType());
+    }
+        
+  if (target->isInterface())
+    {
+      _Jv_IDispatchTable *cl_idt = source->idt;
+      _Jv_IDispatchTable *if_idt = target->idt;
+      jshort cl_iindex = cl_idt->cls.iindex;
+      if (cl_iindex <= if_idt->iface.ioffsets[0])
+        {
+	  jshort offset = if_idt->iface.ioffsets[cl_iindex];
+	  if (offset < cl_idt->cls.itable_length
+	      && cl_idt->cls.itable[offset] == target)
+	    return true;
+	}
+      return false;
+    }
+    
+  return false;
 }
 
 jboolean
 _Jv_IsInstanceOf(jobject obj, jclass cl)
+{
+  return (obj ? _Jv_IsAssignableFrom (cl, JV_CLASS (obj)) : false);
+}
+
+void *
+_Jv_CheckCast (jclass c, jobject obj)
+{
+  if (obj != NULL && ! _Jv_IsAssignableFrom(c, JV_CLASS (obj)))
+    JvThrow (new java::lang::ClassCastException);
+  return obj;
+}
+
+void
+_Jv_CheckArrayStore (jobject arr, jobject obj)
+{
+  if (obj)
+    {
+      JvAssert (arr != NULL);
+      jclass elt_class = (JV_CLASS (arr))->getComponentType();
+      jclass obj_class = JV_CLASS (obj);
+      if (! _Jv_IsAssignableFrom (elt_class, obj_class))
+	JvThrow (new java::lang::ArrayStoreException);
+    }
+}
+
+#define INITIAL_IOFFSETS_LEN 4
+#define INITIAL_IFACES_LEN 4
+
+// Generate tables for constant-time assignment testing and interface
+// method lookup. This implements the technique described by Per Bothner
+// <per@bothner.com> on the java-discuss mailing list on 1999-09-02:
+// http://sourceware.cygnus.com/ml/java-discuss/1999-q3/msg00377.html
+void 
+_Jv_PrepareConstantTimeTables (jclass klass)
+{  
+  if (klass->isPrimitive () || klass->isInterface ())
+    return;
+  
+  // Short-circuit in case we've been called already.
+  if ((klass->idt != NULL) || klass->depth != 0)
+    return;
+
+  // Calculate the class depth and ancestor table. The depth of a class 
+  // is how many "extends" it is removed from Object. Thus the depth of 
+  // java.lang.Object is 0, but the depth of java.io.FilterOutputStream 
+  // is 2. Depth is defined for all regular and array classes, but not 
+  // interfaces or primitive types.
+   
+  jclass klass0 = klass;
+  while (klass0 != &ObjectClass)
+    {
+      klass0 = klass0->superclass;
+      klass->depth++;
+    }
+
+  // We do class member testing in constant time by using a small table 
+  // of all the ancestor classes within each class. The first element is 
+  // a pointer to the current class, and the rest are pointers to the 
+  // classes ancestors, ordered from the current class down by decreasing 
+  // depth. We do not include java.lang.Object in the table of ancestors, 
+  // since it is redundant.
+	
+  klass->ancestors = (jclass *) _Jv_Malloc (klass->depth * sizeof (jclass));
+  klass0 = klass;
+  for (int index = 0; index < klass->depth; index++)
+    {
+      klass->ancestors[index] = klass0;
+      klass0 = klass0->superclass;
+    }
+    
+  if (klass->isArray () 
+      || java::lang::reflect::Modifier::isAbstract (klass->accflags))
+    return;
+
+  klass->idt = 
+    (_Jv_IDispatchTable *) _Jv_Malloc (sizeof (_Jv_IDispatchTable));
+    
+  _Jv_ifaces ifaces;
+
+  ifaces.count = 0;
+  ifaces.len = INITIAL_IFACES_LEN;
+  ifaces.list = (jclass *) _Jv_Malloc (ifaces.len * sizeof (jclass *));
+
+  int itable_size = _Jv_GetInterfaces (klass, &ifaces);
+
+  if (ifaces.count > 0)
+    {
+      klass->idt->cls.itable = 
+	(void **) _Jv_Malloc (itable_size * sizeof (void *));
+      klass->idt->cls.itable_length = itable_size;
+          
+      jshort *itable_offsets = 
+	(jshort *) _Jv_Malloc (ifaces.count * sizeof (jshort));
+
+      _Jv_GenerateITable (klass, &ifaces, itable_offsets);
+
+      jshort cls_iindex = 
+	_Jv_FindIIndex (ifaces.list, itable_offsets, ifaces.count);
+
+      for (int i=0; i < ifaces.count; i++)
+	{
+	  ifaces.list[i]->idt->iface.ioffsets[cls_iindex] =
+	    itable_offsets[i];
+	}
+
+      klass->idt->cls.iindex = cls_iindex;	    
+
+      _Jv_Free (ifaces.list);
+      _Jv_Free (itable_offsets);
+    }
+  else 
+    {
+      klass->idt->cls.iindex = SHRT_MAX;
+    }
+}
+
+// Return index of item in list, or -1 if item is not present.
+jshort
+_Jv_IndexOf (void *item, void **list, jshort list_len)
 {
-  return cl->isInstance(obj);
+  for (int i=0; i < list_len; i++)
+    {
+      if (list[i] == item)
+        return i;
+    }
+  return -1;
+}
+
+// Find all unique interfaces directly or indirectly implemented by klass.
+// Returns the size of the interface dispatch table (itable) for klass, which 
+// is the number of unique interfaces plus the total number of methods that 
+// those interfaces declare. May extend ifaces if required.
+jshort
+_Jv_GetInterfaces (jclass klass, _Jv_ifaces *ifaces)
+{
+  jshort result = 0;
+  
+  for (int i=0; i < klass->interface_count; i++)
+    {
+      jclass iface = klass->interfaces[i];
+      if (_Jv_IndexOf (iface, (void **) ifaces->list, ifaces->count) == -1)
+        {
+	  if (ifaces->count + 1 >= ifaces->len)
+	    {
+	      /* Resize ifaces list */
+	      ifaces->len = ifaces->len * 2;
+	      ifaces->list = (jclass *) _Jv_Realloc (ifaces->list, 
+	                     ifaces->len * sizeof(jclass));
+	    }
+	  ifaces->list[ifaces->count] = iface;
+	  ifaces->count++;
+
+	  result += _Jv_GetInterfaces (klass->interfaces[i], ifaces);
+	}
+    }
+    
+  if (klass->isInterface())
+    {
+      result += klass->method_count + 1;
+    }
+  else
+    {
+      if (klass->superclass)
+        {
+	  result += _Jv_GetInterfaces (klass->superclass, ifaces);
+	}
+    }
+  return result;
+}
+
+// Fill out itable in klass, resolving method declarations in each ifaces.
+// itable_offsets is filled out with the position of each iface in itable,
+// such that itable[itable_offsets[n]] == ifaces.list[n].
+void
+_Jv_GenerateITable (jclass klass, _Jv_ifaces *ifaces, jshort *itable_offsets)
+{
+  void **itable = klass->idt->cls.itable;
+  jshort itable_pos = 0;
+
+  for (int i=0; i < ifaces->count; i++)
+    { 
+      jclass iface = ifaces->list[i];
+      itable_offsets[i] = itable_pos;
+      itable_pos = _Jv_AppendPartialITable (klass, iface, itable,
+                   itable_pos);
+      
+      /* Create interface dispatch table for iface */
+      if (iface->idt == NULL)
+	{
+	  iface->idt = 
+	    (_Jv_IDispatchTable *) _Jv_Malloc (sizeof (_Jv_IDispatchTable));
+
+	  // The first element of ioffsets is its length (itself included).
+	  jshort *ioffsets = 
+	    (jshort *) _Jv_Malloc (INITIAL_IOFFSETS_LEN * sizeof (jshort));
+	  ioffsets[0] = INITIAL_IOFFSETS_LEN;
+	  for (int i=1; i < INITIAL_IOFFSETS_LEN; i++)
+	    ioffsets[i] = -1;
+
+	  iface->idt->iface.ioffsets = ioffsets;	    
+	}
+    }
+}
+
+// Format method name for use in error messages.
+jstring
+_Jv_GetMethodString (jclass klass, _Jv_Utf8Const *name)
+{
+  jstring r = JvNewStringUTF (klass->name->data);
+  r = r->concat (JvNewStringUTF ("."));
+  r = r->concat (JvNewStringUTF (name->data));
+  return r;
+}
+
+void 
+_Jv_ThrowNoSuchMethodError ()
+{
+  JvThrow (new java::lang::NoSuchMethodError ());
+}
+
+// Each superinterface of a class (i.e. each interface that the class
+// directly or indirectly implements) has a corresponding "Partial
+// Interface Dispatch Table" whose size is (number of methods + 1) words.
+// The first word is a pointer to the interface (i.e. the java.lang.Class
+// instance for that interface).  The remaining words are pointers to the
+// actual methods that implement the methods declared in the interface,
+// in order of declaration.
+//
+// Append partial interface dispatch table for "iface" to "itable", at
+// position itable_pos.
+// Returns the offset at which the next partial ITable should be appended.
+jshort
+_Jv_AppendPartialITable (jclass klass, jclass iface, void **itable, 
+                         jshort pos)
+{
+  using namespace java::lang::reflect;
+
+  itable[pos++] = (void *) iface;
+  _Jv_Method *meth;
+  
+  for (int j=0; j < iface->method_count; j++)
+    {
+      meth = NULL;
+      for (jclass cl = klass; cl; cl = cl->getSuperclass())
+        {
+	  meth = _Jv_GetMethodLocal (cl, iface->methods[j].name,
+                 iface->methods[j].signature);
+		 
+	  if (meth)
+	    break;
+	}
+
+      if (meth && (meth->name->data[0] == '<'))
+	{
+	  // leave a placeholder in the itable for hidden init methods.
+          itable[pos] = NULL;	
+	}
+      else if (meth)
+        {
+	  if (Modifier::isStatic(meth->accflags))
+	    JvThrow (new java::lang::IncompatibleClassChangeError
+	             (_Jv_GetMethodString (klass, meth->name)));
+	  if (Modifier::isAbstract(meth->accflags))
+	    JvThrow (new java::lang::AbstractMethodError
+	             (_Jv_GetMethodString (klass, meth->name)));
+	  if (! Modifier::isPublic(meth->accflags))
+	    JvThrow (new java::lang::IllegalAccessError
+	             (_Jv_GetMethodString (klass, meth->name)));
+
+	  itable[pos] = meth->ncode;
+	}
+      else
+        {
+	  // The method doesn't exist in klass. Binary compatibility rules
+	  // permit this, so we delay the error until runtime using a pointer
+	  // to a method which throws an exception.
+	  itable[pos] = (void *) _Jv_ThrowNoSuchMethodError;
+	}
+      pos++;
+    }
+    
+  return pos;
+}
+
+static _Jv_Mutex_t iindex_mutex;
+bool iindex_mutex_initialized = false;
+
+// We need to find the correct offset in the Class Interface Dispatch 
+// Table for a given interface. Once we have that, invoking an interface 
+// method just requires combining the Method's index in the interface 
+// (known at compile time) to get the correct method.  Doing a type test 
+// (cast or instanceof) is the same problem: Once we have a possible Partial 
+// Interface Dispatch Table, we just compare the first element to see if it 
+// matches the desired interface. So how can we find the correct offset?  
+// Our solution is to keep a vector of candiate offsets in each interface 
+// (idt->iface.ioffsets), and in each class we have an index 
+// (idt->cls.iindex) used to select the correct offset from ioffsets.
+//
+// Calculate and return iindex for a new class. 
+// ifaces is a vector of num interfaces that the class implements.
+// offsets[j] is the offset in the interface dispatch table for the
+// interface corresponding to ifaces[j].
+// May extend the interface ioffsets if required.
+jshort
+_Jv_FindIIndex (jclass *ifaces, jshort *offsets, jshort num)
+{
+  int i;
+  int j;
+  
+  // Acquire a global lock to prevent itable corruption in case of multiple 
+  // classes that implement an intersecting set of interfaces being linked
+  // simultaneously. We can assume that the mutex will be initialized
+  // single-threaded.
+  if (! iindex_mutex_initialized)
+    {
+      _Jv_MutexInit (&iindex_mutex);
+      iindex_mutex_initialized = true;
+    }
+  
+  _Jv_MutexLock (&iindex_mutex);
+  
+  for (i=1;; i++)  /* each potential position in ioffsets */
+    {
+      for (j=0;; j++)  /* each iface */
+        {
+	  if (j >= num)
+	    goto found;
+	  if (i > ifaces[j]->idt->iface.ioffsets[0])
+	    continue;
+	  int ioffset = ifaces[j]->idt->iface.ioffsets[i];
+	  /* We can potentially share this position with another class. */
+	  if (ioffset >= 0 && ioffset != offsets[j])
+	    break; /* Nope. Try next i. */	  
+	}
+    }
+  found:
+  for (j = 0; j < num; j++)
+    {
+      int len = ifaces[j]->idt->iface.ioffsets[0];
+      if (i >= len) 
+	{
+	  /* Resize ioffsets. */
+	  int newlen = 2 * len;
+	  if (i >= newlen)
+	    newlen = i + 3;
+	  jshort *old_ioffsets = ifaces[j]->idt->iface.ioffsets;
+	  jshort *new_ioffsets = (jshort *) _Jv_Realloc (old_ioffsets, 
+	                                  newlen * sizeof(jshort));	  
+	  new_ioffsets[0] = newlen;
+
+	  while (len < newlen)
+	    new_ioffsets[len++] = -1;
+	  
+	  ifaces[j]->idt->iface.ioffsets = new_ioffsets;
+	}
+      ifaces[j]->idt->iface.ioffsets[i] = offsets[j];
+    }
+
+  _Jv_MutexUnlock (&iindex_mutex);
+
+  return i;
 }
Index: java/lang/natClassLoader.cc
===================================================================
RCS file: /cvs/java/libgcj/libjava/java/lang/natClassLoader.cc,v
retrieving revision 1.18
diff -u -r1.18 natClassLoader.cc
--- natClassLoader.cc	2000/03/02 20:25:20	1.18
+++ natClassLoader.cc	2000/03/07 09:37:26
@@ -503,6 +503,9 @@
   ret->interface_count = 0;
   ret->state = JV_STATE_NOTHING;
   ret->thread = NULL;
+  ret->depth = 0;
+  ret->ancestors = NULL;
+  ret->idt = NULL;
 
   _Jv_RegisterClass (ret);
 
Index: gcj/cni.h
===================================================================
RCS file: /cvs/java/libgcj/libjava/gcj/cni.h,v
retrieving revision 1.3
diff -u -r1.3 cni.h
--- cni.h	2000/01/19 18:39:23	1.3
+++ cni.h	2000/03/07 09:37:26
@@ -93,11 +93,6 @@
   return _Jv_NewStringUTF (bytes);
 }
 
-extern class _Jv_PrimClass _Jv_byteClass, _Jv_shortClass, _Jv_intClass,
-  _Jv_longClass, _Jv_booleanClass, _Jv_charClass, _Jv_floatClass,
-  _Jv_doubleClass, _Jv_voidClass;
-#define JvPrimClass(TYPE) ((jclass) & _Jv_##TYPE##Class)
-
 class JvSynchronize
 {
 private:
Index: gcj/array.h
===================================================================
RCS file: /cvs/java/libgcj/libjava/gcj/array.h,v
retrieving revision 1.5
diff -u -r1.5 array.h
--- array.h	2000/01/26 00:55:49	1.5
+++ array.h	2000/03/07 09:37:26
@@ -55,18 +55,68 @@
 typedef JArray<jdouble> *jdoubleArray;
 typedef JArray<jstring> *jstringArray;
 
-extern "C" jbooleanArray JvNewBooleanArray (jint length);
-extern "C" jbyteArray JvNewByteArray (jint length);
-extern "C" jcharArray JvNewCharArray (jint length);
-extern "C" jshortArray JvNewShortArray (jint length);
-extern "C" jintArray JvNewIntArray (jint length);
-extern "C" jlongArray JvNewLongArray (jint length);
-extern "C" jfloatArray JvNewFloatArray (jint length);
-extern "C" jdoubleArray JvNewDoubleArray (jint length);
+extern class _Jv_PrimClass _Jv_byteClass, _Jv_shortClass, _Jv_intClass,
+  _Jv_longClass, _Jv_booleanClass, _Jv_charClass, _Jv_floatClass,
+  _Jv_doubleClass, _Jv_voidClass;
+#define JvPrimClass(TYPE) ((jclass) & _Jv_##TYPE##Class)
+
 extern "C" jobjectArray _Jv_NewObjectArray(jsize length, jclass, jobject init);
+extern "C" jobject _Jv_NewPrimArray (jclass eltype, jint count);
+
+extern inline jobjectArray 
+JvNewObjectArray (jsize length, jclass cls, jobject init)
+{ 
+  return _Jv_NewObjectArray (length, cls, init); 
+}
+
+extern inline jcharArray 
+JvNewCharArray (jint length)
+{
+  return (jcharArray) _Jv_NewPrimArray (JvPrimClass (char), length);
+}
+
+extern inline jbooleanArray 
+JvNewBooleanArray (jint length)
+{
+  return (jbooleanArray) _Jv_NewPrimArray (JvPrimClass (boolean), length);
+}
+
+extern inline jbyteArray 
+JvNewByteArray (jint length)
+{
+  return (jbyteArray) _Jv_NewPrimArray (JvPrimClass (byte), length);
+}
+
+extern inline jshortArray 
+JvNewShortArray (jint length)
+{
+  return (jshortArray) _Jv_NewPrimArray (JvPrimClass (short), length);
+}
+
+extern inline jintArray 
+JvNewIntArray (jint length)
+{
+  return (jintArray) _Jv_NewPrimArray (JvPrimClass (int), length);
+}
+
+extern inline jlongArray 
+JvNewLongArray (jint length)
+{
+  return (jlongArray) _Jv_NewPrimArray (JvPrimClass (long), length);
+}
+
+extern inline jfloatArray 
+JvNewFloatArray (jint length)
+{
+  return (jfloatArray) _Jv_NewPrimArray (JvPrimClass (float), length);
+}
+
+extern inline jdoubleArray 
+JvNewDoubleArray (jint length)
+{
+  return (jdoubleArray) _Jv_NewPrimArray (JvPrimClass (double), length);
+}
 
-inline jobjectArray JvNewObjectArray (jsize length, jclass cls, jobject init)
-{ return _Jv_NewObjectArray (length, cls, init); }
 
 extern "C" jstringArray JvConvertArgv(int argc, const char **argv);
 
Index: gcj/javaprims.h
===================================================================
RCS file: /cvs/java/libgcj/libjava/gcj/javaprims.h,v
retrieving revision 1.5
diff -u -r1.5 javaprims.h
--- javaprims.h	2000/03/05 22:31:02	1.5
+++ javaprims.h	2000/03/07 09:37:26
@@ -272,6 +272,7 @@
 extern "C" void _Jv_Throw (void *) __attribute__ ((__noreturn__));
 extern "C" void _Jv_Sjlj_Throw (void *) __attribute__ ((__noreturn__));
 extern "C" void* _Jv_Malloc (jsize) __attribute__((__malloc__));
+extern "C" void* _Jv_Realloc (void *, jsize);
 extern "C" void _Jv_Free (void*);
 
 typedef unsigned short _Jv_ushort __attribute__((__mode__(__HI__)));
Index: include/jvm.h
===================================================================
RCS file: /cvs/java/libgcj/libjava/include/jvm.h,v
retrieving revision 1.17
diff -u -r1.17 jvm.h
--- jvm.h	2000/02/18 21:22:06	1.17
+++ jvm.h	2000/03/07 09:37:27
@@ -156,7 +156,9 @@
   __attribute__((__malloc__));
 extern "C" void *_Jv_CheckCast (jclass klass, jobject obj);
 extern "C" void *_Jv_LookupInterfaceMethod (jclass klass, Utf8Const *name,
-					    Utf8Const *signature);
+                                           Utf8Const *signature);
+extern "C" void *_Jv_LookupInterfaceMethodIdx (jclass klass, jclass iface, 
+                                               int meth_idx);
 extern "C" void _Jv_CheckArrayStore (jobject array, jobject obj);
 extern "C" void _Jv_RegisterClass (jclass klass);
 extern "C" void _Jv_RegisterClasses (jclass *classes);

--------------822F4101E043B2C5CA81D2FF--

From java-patches-return-547-listarch-java-patches=sourceware.cygnus.com@sourceware.cygnus.com Tue Mar 07 18:06:34 2000
Return-Path: <java-patches-return-547-listarch-java-patches=sourceware.cygnus.com@sourceware.cygnus.com>
Delivered-To: listarch-java-patches@sourceware.cygnus.com
Received: (qmail 3002 invoked by alias); 7 Mar 2000 18:06:33 -0000
Mailing-List: contact java-patches-help@sourceware.cygnus.com; run by ezmlm
Precedence: bulk
List-Subscribe: <mailto:java-patches-subscribe@sourceware.cygnus.com>
List-Archive: <http://sourceware.cygnus.com/ml/java-patches/>
List-Post: <mailto:java-patches@sourceware.cygnus.com>
List-Help: <mailto:java-patches-help@sourceware.cygnus.com>, <http://sourceware.cygnus.com/ml/#faqs>
Sender: java-patches-owner@sourceware.cygnus.com
Delivered-To: mailing list java-patches@sourceware.cygnus.com
Received: (qmail 2928 invoked from network); 7 Mar 2000 18:06:25 -0000
To: Java Patch List <java-patches@sourceware.cygnus.com> 
Subject: Patch: test for PR 162
X-Zippy:  Go on, EMOTE!  I was RAISED on thought balloons!!
X-Attribution:  Tom
Bcc:
Reply-To:  tromey@cygnus.com
From:  Tom Tromey <tromey@cygnus.com>
Date: 07 Mar 2000 11:08:52 -0700
Message-ID: <87ityy7ivf.fsf@cygnus.com>
Lines: 57
X-Mailer: Gnus v5.5/Emacs 20.3

I'm committing this patch, which adds the test code for PR 162.

2000-03-07  Tom Tromey  <tromey@cygnus.com>

	Test for PR gcj/162:
	* libjava.lang/PR162.out: New file.
	* libjava.lang/PR162.java: New file.

Tom

Index: libjava.lang/PR162.java
===================================================================
RCS file: PR162.java
diff -N PR162.java
--- /dev/null	Tue May  5 13:32:27 1998
+++ PR162.java	Tue Mar  7 10:05:06 2000
@@ -0,0 +1,29 @@
+interface I
+{
+  int i = 1, ii = Test.out ("ii", 2);
+}
+
+interface J extends I
+{
+  int j = Test.out ("j", 3), jj = Test.out ("jj", 4);
+}
+
+interface K extends J
+{
+  int k = Test.out ("k", 5);
+}
+
+public class PR162
+{
+  public static void main (String[] args)
+  {
+    System.out.println (J.i);
+    System.out.println (K.j);
+  }
+
+  public static int out (String s, int i)
+  {
+    System.out.println (s + "=" + i);
+    return i;
+  }
+}
Index: libjava.lang/PR162.out
===================================================================
RCS file: PR162.out
diff -N PR162.out
--- /dev/null	Tue May  5 13:32:27 1998
+++ PR162.out	Tue Mar  7 10:05:06 2000
@@ -0,0 +1,4 @@
+1
+j=3
+jj=4
+3

From java-patches-return-548-listarch-java-patches=sourceware.cygnus.com@sourceware.cygnus.com Tue Mar 07 19:51:05 2000
Return-Path: <java-patches-return-548-listarch-java-patches=sourceware.cygnus.com@sourceware.cygnus.com>
Delivered-To: listarch-java-patches@sourceware.cygnus.com
Received: (qmail 25756 invoked by alias); 7 Mar 2000 19:51:04 -0000
Mailing-List: contact java-patches-help@sourceware.cygnus.com; run by ezmlm
Precedence: bulk
List-Subscribe: <mailto:java-patches-subscribe@sourceware.cygnus.com>
List-Archive: <http://sourceware.cygnus.com/ml/java-patches/>
List-Post: <mailto:java-patches@sourceware.cygnus.com>
List-Help: <mailto:java-patches-help@sourceware.cygnus.com>, <http://sourceware.cygnus.com/ml/#faqs>
Sender: java-patches-owner@sourceware.cygnus.com
Delivered-To: mailing list java-patches@sourceware.cygnus.com
Received: (qmail 25730 invoked from network); 7 Mar 2000 19:51:02 -0000
To: Java Patch List <java-patches@sourceware.cygnus.com> 
Subject: Patch: copyright change
X-Zippy:  Oh, I get it!!  ``The BEACH goes on,'' huh, SONNY??
X-Attribution:  Tom
Bcc:
Reply-To:  tromey@cygnus.com
From:  Tom Tromey <tromey@cygnus.com>
Date: 07 Mar 2000 12:53:28 -0700
Message-ID: <87em9m7e13.fsf@cygnus.com>
Lines: 15
X-Mailer: Gnus v5.5/Emacs 20.3

I'm committing this change, which changes the copyright and license
for libgcj.  This is parts of the Classpath merger.  I'm omitting the
actual patch as it is huge and mechanical.  I made it this way:

perl -pi~  -e 's/Red Hat, Inc./Free Software Foundation/g;' $(srcs -r)

2000-03-07  Tom Tromey  <tromey@cygnus.com>

	* All files: Updated copyright information.
	* COPYING: New file.
	* COPYING.LIB: Removed.
	* LIBGCJ_LICENSE: We now use GPL + special exception.

Tom

From java-patches-return-549-listarch-java-patches=sourceware.cygnus.com@sourceware.cygnus.com Tue Mar 07 22:41:07 2000
Return-Path: <java-patches-return-549-listarch-java-patches=sourceware.cygnus.com@sourceware.cygnus.com>
Delivered-To: listarch-java-patches@sourceware.cygnus.com
Received: (qmail 13230 invoked by alias); 7 Mar 2000 22:41:07 -0000
Mailing-List: contact java-patches-help@sourceware.cygnus.com; run by ezmlm
Precedence: bulk
List-Subscribe: <mailto:java-patches-subscribe@sourceware.cygnus.com>
List-Archive: <http://sourceware.cygnus.com/ml/java-patches/>
List-Post: <mailto:java-patches@sourceware.cygnus.com>
List-Help: <mailto:java-patches-help@sourceware.cygnus.com>, <http://sourceware.cygnus.com/ml/#faqs>
Sender: java-patches-owner@sourceware.cygnus.com
Delivered-To: mailing list java-patches@sourceware.cygnus.com
Received: (qmail 13208 invoked from network); 7 Mar 2000 22:41:04 -0000
To: Java Patch List <java-patches@sourceware.cygnus.com> 
Subject: Patch: testsuite fixes
X-Zippy:  It's hard being an ARTIST!!
X-Attribution:  Tom
Bcc:
Reply-To:  tromey@cygnus.com
From:  Tom Tromey <tromey@cygnus.com>
Date: 07 Mar 2000 15:43:31 -0700
Message-ID: <87bt4q765o.fsf@cygnus.com>
Lines: 60
X-Mailer: Gnus v5.5/Emacs 20.3

I'm checking in this patch, which has a couple testsuite fixes.
One fix is to remove an ancient workaround for a bug in jv-scan which
was quashed long ago.  The other fix lets the testsuite continue to
work even when jv-scan reports a parse error.

2000-03-07  Tom Tromey  <tromey@cygnus.com>

	* lib/libjava.exp (test_libjava_from_javac): Removed hack for
	interfaces.  Fail if jv-scan reports a parse error.

Tom

Index: lib/libjava.exp
===================================================================
RCS file: /cvs/java/libgcj/libjava/testsuite/lib/libjava.exp,v
retrieving revision 1.14
diff -u -r1.14 libjava.exp
--- libjava.exp	2000/03/07 19:55:28	1.14
+++ libjava.exp	2000/03/07 22:39:14
@@ -495,20 +495,27 @@
 		     [target_compile $srcfile "" none \
 			"compiler=$jvscan additional_flags=--list-class"]]
     verbose "class list is $class_out"
-    # FIXME: As of Wed Feb 24 1999, `jv-scan --list-class' prints
-    # nothing if the file contains an interface and not a class.  I
-    # believe this is a jv-scan bug.
-    if {$class_out == ""} then {
-	set class_files \
-	  [list $objdir/[file rootname [file tail $srcfile]].class]
-    } else {
-	# Turn "a b" into "a.class b.class".
-	# Also, turn "foo.bar" into "foo/bar.class".
-	set class_files {}
-        foreach file [split [string trim $class_out]] {
-	    set file [join [split $file .] /]
-	    lappend class_files $objdir/$file.class
+
+    if {[string match "*parse error*" $main_name]
+	|| [string match "*parse error*" $class_out]} {
+	# Do the remaining fails.
+	setup_xfail "*-*-*"
+	fail "$errname compilation from bytecode"
+	if {! [info exists opts(no-exec)]} {
+	    setup_xfail "*-*-*"
+	    fail "$errname execution from bytecode->native test"
+	    setup_xfail "*-*-*"
+	    fail "$errname output from bytecode->native test"
 	}
+	return
+    }
+
+    # Turn "a b" into "a.class b.class".
+    # Also, turn "foo.bar" into "foo/bar.class".
+    set class_files {}
+    foreach file [split [string trim $class_out]] {
+	set file [join [split $file .] /]
+	lappend class_files $objdir/$file.class
     }
 
     # Usually it is an error for a test program not to have a `main'

From java-patches-return-550-listarch-java-patches=sourceware.cygnus.com@sourceware.cygnus.com Tue Mar 07 22:58:42 2000
Return-Path: <java-patches-return-550-listarch-java-patches=sourceware.cygnus.com@sourceware.cygnus.com>
Delivered-To: listarch-java-patches@sourceware.cygnus.com
Received: (qmail 19333 invoked by alias); 7 Mar 2000 22:58:42 -0000
Mailing-List: contact java-patches-help@sourceware.cygnus.com; run by ezmlm
Precedence: bulk
List-Subscribe: <mailto:java-patches-subscribe@sourceware.cygnus.com>
List-Archive: <http://sourceware.cygnus.com/ml/java-patches/>
List-Post: <mailto:java-patches@sourceware.cygnus.com>
List-Help: <mailto:java-patches-help@sourceware.cygnus.com>, <http://sourceware.cygnus.com/ml/#faqs>
Sender: java-patches-owner@sourceware.cygnus.com
Delivered-To: mailing list java-patches@sourceware.cygnus.com
Received: (qmail 19314 invoked from network); 7 Mar 2000 22:58:39 -0000
Message-ID: <38C58A66.5C480062@albatross.co.nz>
Date: Wed, 08 Mar 2000 12:01:58 +1300
From: Bryce McKinlay <bryce@albatross.co.nz>
X-Mailer: Mozilla 4.7 [en] (X11; U; Linux 2.3.25 i686)
X-Accept-Language: en
MIME-Version: 1.0
To: java-patches@sourceware.cygnus.com
Subject: Patch: PR 163 test
Content-Type: text/plain; charset=us-ascii
Content-Transfer-Encoding: 7bit

I committed the test case for PR 163. Note that this is not really the
same as the existing "BlankFinal.java" test, which deals with static
finals and is arguably legal code, even though neither javac nor jikes
accept it. PR163.java should definatly not compile and personally I
wouldn't be too worried if BlankFinal didn't either.

  [ bryce ]


2000-03-07  Bryce McKinlay  <bryce@albatross.co.nz>

        Test for PR gcj/163:
        * libjava.lang/PR163.java: New file.
        * libjava.lang/PR163.xfail: New file.


// Test case for the PR gcj/163

// Uninitalized final variables should not be permitted.

class PR163
{
  final int foo;
}


From java-patches-return-551-listarch-java-patches=sourceware.cygnus.com@sourceware.cygnus.com Wed Mar 08 05:41:29 2000
Return-Path: <java-patches-return-551-listarch-java-patches=sourceware.cygnus.com@sourceware.cygnus.com>
Delivered-To: listarch-java-patches@sourceware.cygnus.com
Received: (qmail 4206 invoked by alias); 8 Mar 2000 05:41:29 -0000
Mailing-List: contact java-patches-help@sourceware.cygnus.com; run by ezmlm
Precedence: bulk
List-Subscribe: <mailto:java-patches-subscribe@sourceware.cygnus.com>
List-Archive: <http://sourceware.cygnus.com/ml/java-patches/>
List-Post: <mailto:java-patches@sourceware.cygnus.com>
List-Help: <mailto:java-patches-help@sourceware.cygnus.com>, <http://sourceware.cygnus.com/ml/#faqs>
Sender: java-patches-owner@sourceware.cygnus.com
Delivered-To: mailing list java-patches@sourceware.cygnus.com
Received: (qmail 4173 invoked from network); 8 Mar 2000 05:41:27 -0000
To: Java Patch List <java-patches@sourceware.cygnus.com> 
Subject: Patch: fix for test PR162.java
X-Zippy:  Yow!  I forgot my PAIL!!
X-Attribution:  Tom
Bcc:
Reply-To:  tromey@cygnus.com
From:  Tom Tromey <tromey@cygnus.com>
Date: 07 Mar 2000 22:44:02 -0700
Message-ID: <87aeka6mot.fsf@cygnus.com>
Lines: 36
X-Mailer: Gnus v5.5/Emacs 20.3

This patch fixes a dumb error on my part.

2000-03-07  Tom Tromey  <tromey@cygnus.com>

	* libjava.lang/PR162.java: Mention `PR162', not `Test', as class
	name.

Tom

Index: libjava.lang/PR162.java
===================================================================
RCS file: /cvs/java/libgcj/libjava/testsuite/libjava.lang/PR162.java,v
retrieving revision 1.1
diff -u -r1.1 PR162.java
--- PR162.java	2000/03/07 18:06:31	1.1
+++ PR162.java	2000/03/08 05:40:25
@@ -1,16 +1,16 @@
 interface I
 {
-  int i = 1, ii = Test.out ("ii", 2);
+  int i = 1, ii = PR162.out ("ii", 2);
 }
 
 interface J extends I
 {
-  int j = Test.out ("j", 3), jj = Test.out ("jj", 4);
+  int j = PR162.out ("j", 3), jj = PR162.out ("jj", 4);
 }
 
 interface K extends J
 {
-  int k = Test.out ("k", 5);
+  int k = PR162.out ("k", 5);
 }
 
 public class PR162

From java-patches-return-552-listarch-java-patches=sourceware.cygnus.com@sourceware.cygnus.com Thu Mar 09 04:34:39 2000
Return-Path: <java-patches-return-552-listarch-java-patches=sourceware.cygnus.com@sourceware.cygnus.com>
Delivered-To: listarch-java-patches@sourceware.cygnus.com
Received: (qmail 9314 invoked by alias); 9 Mar 2000 04:34:39 -0000
Mailing-List: contact java-patches-help@sourceware.cygnus.com; run by ezmlm
Precedence: bulk
List-Subscribe: <mailto:java-patches-subscribe@sourceware.cygnus.com>
List-Archive: <http://sourceware.cygnus.com/ml/java-patches/>
List-Post: <mailto:java-patches@sourceware.cygnus.com>
List-Help: <mailto:java-patches-help@sourceware.cygnus.com>, <http://sourceware.cygnus.com/ml/#faqs>
Sender: java-patches-owner@sourceware.cygnus.com
Delivered-To: mailing list java-patches@sourceware.cygnus.com
Received: (qmail 9288 invoked from network); 9 Mar 2000 04:34:37 -0000
X-Authentication-Warning: fencer.cygnus.com: warrenl owned process doing -bs
Date: Wed, 8 Mar 2000 20:34:36 -0800 (PST)
From: Warren Levy <warrenl@cygnus.com>
To: java-patches@sourceware.cygnus.com
Subject: Patch: java.math.BigInteger.signum
Message-ID: <Pine.LNX.4.10.10003082028450.4658-100000@fencer.cygnus.com>
MIME-Version: 1.0
Content-Type: TEXT/PLAIN; charset=US-ASCII

Folks,
I'm committing this libgcj patch for a problem that Hans Boehm reported
the other day.
--warrenl


2000-03-08  Warren Levy  <warrenl@cygnus.com>

        * java/math/BigInteger.java(signum): Handle zero properly.


Index: java/math/BigInteger.java
===================================================================
RCS file: /cvs/java/libgcj/libjava/java/math/BigInteger.java,v
retrieving revision 1.5
diff -u -p -r1.5 BigInteger.java
--- BigInteger.java	2000/03/07 19:55:27	1.5
+++ BigInteger.java	2000/03/09 04:32:08
@@ -285,7 +285,9 @@ public class BigInteger extends Number i
   public int signum()
   {
     int top = words == null ? ival : words[ival-1];
-    return top > 0 ? 1 : top < 0 ? -1 : 0;
+    if (top == 0 && words == null)
+      return 0;
+    return top < 0 ? -1 : 1;
   }
 
   private static int compareTo(BigInteger x, BigInteger y)



From java-patches-return-553-listarch-java-patches=sourceware.cygnus.com@sourceware.cygnus.com Thu Mar 09 04:47:57 2000
Return-Path: <java-patches-return-553-listarch-java-patches=sourceware.cygnus.com@sourceware.cygnus.com>
Delivered-To: listarch-java-patches@sourceware.cygnus.com
Received: (qmail 11283 invoked by alias); 9 Mar 2000 04:47:57 -0000
Mailing-List: contact java-patches-help@sourceware.cygnus.com; run by ezmlm
Precedence: bulk
List-Subscribe: <mailto:java-patches-subscribe@sourceware.cygnus.com>
List-Archive: <http://sourceware.cygnus.com/ml/java-patches/>
List-Post: <mailto:java-patches@sourceware.cygnus.com>
List-Help: <mailto:java-patches-help@sourceware.cygnus.com>, <http://sourceware.cygnus.com/ml/#faqs>
Sender: java-patches-owner@sourceware.cygnus.com
Delivered-To: mailing list java-patches@sourceware.cygnus.com
Received: (qmail 11262 invoked from network); 9 Mar 2000 04:47:55 -0000
To: Java Patch List <java-patches@sourceware.cygnus.com> 
Subject: Patch: fix for Array.newInstance
X-Zippy:  My Aunt MAUREEN was a military advisor to IKE & TINA TURNER!!
X-Attribution:  Tom
Bcc:
Reply-To:  tromey@cygnus.com
From:  Tom Tromey <tromey@cygnus.com>
Date: 08 Mar 2000 21:50:32 -0700
Message-ID: <87put4692f.fsf@cygnus.com>
Lines: 40

I'm committing this patch.  It fixes a bug in Array.newInstance.

2000-03-08  Tom Tromey  <tromey@cygnus.com>

	* java/lang/reflect/natArray.cc (newInstance): Don't allow array
	of `void' to be created.

Tom

Index: java/lang/reflect/natArray.cc
===================================================================
RCS file: /cvs/java/libgcj/libjava/java/lang/reflect/natArray.cc,v
retrieving revision 1.5
diff -u -r1.5 natArray.cc
--- natArray.cc	2000/03/07 19:55:27	1.5
+++ natArray.cc	2000/03/09 04:46:16
@@ -1,6 +1,6 @@
 // natField.cc - Implementation of java.lang.reflect.Field native methods.
 
-/* Copyright (C) 1999  Free Software Foundation
+/* Copyright (C) 1999, 2000  Free Software Foundation
 
    This file is part of libgcj.
 
@@ -29,7 +29,14 @@
 java::lang::reflect::Array::newInstance (jclass componentType, jint length)
 {
   if (componentType->isPrimitive())
-    return _Jv_NewPrimArray (componentType, length);
+    {
+      // We could check for this in _Jv_NewPrimArray, but that seems
+      // like needless overhead when the only real route to this
+      // problem is here.
+      if (componentType == JvPrimClass (void))
+	throw new java::lang::IllegalArgumentException ();
+      return _Jv_NewPrimArray (componentType, length);
+    }
   else
     return JvNewObjectArray (length, componentType, NULL);
 

From java-patches-return-554-listarch-java-patches=sourceware.cygnus.com@sourceware.cygnus.com Thu Mar 09 09:30:26 2000
Return-Path: <java-patches-return-554-listarch-java-patches=sourceware.cygnus.com@sourceware.cygnus.com>
Delivered-To: listarch-java-patches@sourceware.cygnus.com
Received: (qmail 28932 invoked by alias); 9 Mar 2000 09:30:25 -0000
Mailing-List: contact java-patches-help@sourceware.cygnus.com; run by ezmlm
Precedence: bulk
List-Subscribe: <mailto:java-patches-subscribe@sourceware.cygnus.com>
List-Archive: <http://sourceware.cygnus.com/ml/java-patches/>
List-Post: <mailto:java-patches@sourceware.cygnus.com>
List-Help: <mailto:java-patches-help@sourceware.cygnus.com>, <http://sourceware.cygnus.com/ml/#faqs>
Sender: java-patches-owner@sourceware.cygnus.com
Delivered-To: mailing list java-patches@sourceware.cygnus.com
Received: (qmail 28909 invoked from network); 9 Mar 2000 09:30:22 -0000
Message-ID: <38C76F63.3AF4F21B@albatross.co.nz>
Date: Thu, 09 Mar 2000 22:31:15 +1300
From: Bryce McKinlay <bryce@albatross.co.nz>
X-Mailer: Mozilla 4.7 [en] (X11; I; Linux 2.2.14 i686)
X-Accept-Language: en
MIME-Version: 1.0
To: java-patches@sourceware.cygnus.com
Subject: Patch: Array classes and Constant-time dispatch
Content-Type: multipart/mixed;
 boundary="------------DCE1C41816D64CA80E81FF47"

This is a multi-part message in MIME format.
--------------DCE1C41816D64CA80E81FF47
Content-Type: text/plain; charset=us-ascii
Content-Transfer-Encoding: 7bit

I have committed this patch, which fixes a bug in the new interface
dispatch code. Array classes implement Serializable and Cloneable, so
they need to have an interface dispatch table (idt). This was causing a
NullPointerException in testsuite/java.lang/Array_1.java

Three other issues have come up:

1. Doesn't _Jv_FindArrayClass() need to be synchronized? At least the
parts below the cache lookups. Or am I missing some implicit
synchronization somewhere?

2. Array_1.java still crashes, because for some reason
System.out.println(class) doesnt work! This seems to be related to
PR libgcj/100. Weird.

3. gnats is acting up again, whats with those "Pending" PRs?

regards

  [ bryce ]


--------------DCE1C41816D64CA80E81FF47
Content-Type: text/plain; charset=us-ascii;
 name="array-interface.patch"
Content-Transfer-Encoding: 7bit
Content-Disposition: inline;
 filename="array-interface.patch"

2000-03-09  Bryce McKinlay  <bryce@albatross.co.nz>

        * java/lang/natClassLoader.cc (_Jv_FindArrayClass): Call
        _Jv_PrepareConstantTimeTables.
        * java/lang/natClass.cc (_Jv_PrepareConstantTimeTables): Array
        classes should have an IDT, so don't return if klass is an array
        class.


Index: java/lang/natClass.cc
===================================================================
RCS file: /cvs/java/libgcj/libjava/java/lang/natClass.cc,v
retrieving revision 1.19
diff -u -r1.19 natClass.cc
--- natClass.cc	2000/03/07 19:55:26	1.19
+++ natClass.cc	2000/03/09 09:13:35
@@ -1005,8 +1005,7 @@
       klass0 = klass0->superclass;
     }
     
-  if (klass->isArray () 
-      || java::lang::reflect::Modifier::isAbstract (klass->accflags))
+  if (java::lang::reflect::Modifier::isAbstract (klass->accflags))
     return;
 
   klass->idt = 
Index: java/lang/natClassLoader.cc
===================================================================
RCS file: /cvs/java/libgcj/libjava/java/lang/natClassLoader.cc,v
retrieving revision 1.20
diff -u -r1.20 natClassLoader.cc
--- natClassLoader.cc	2000/03/07 19:55:26	1.20
+++ natClassLoader.cc	2000/03/09 09:13:54
@@ -584,6 +584,9 @@
       array_class->interfaces = interfaces;
       array_class->interface_count = 1;
 
+      // Generate the interface dispatch table.
+      _Jv_PrepareConstantTimeTables (array_class);
+
       // as per vmspec 5.3.3.2
       array_class->accflags = element->accflags;
 

--------------DCE1C41816D64CA80E81FF47--

From java-patches-return-555-listarch-java-patches=sourceware.cygnus.com@sourceware.cygnus.com Thu Mar 09 22:42:03 2000
Return-Path: <java-patches-return-555-listarch-java-patches=sourceware.cygnus.com@sourceware.cygnus.com>
Delivered-To: listarch-java-patches@sourceware.cygnus.com
Received: (qmail 30810 invoked by alias); 9 Mar 2000 22:42:03 -0000
Mailing-List: contact java-patches-help@sourceware.cygnus.com; run by ezmlm
Precedence: bulk
List-Subscribe: <mailto:java-patches-subscribe@sourceware.cygnus.com>
List-Archive: <http://sourceware.cygnus.com/ml/java-patches/>
List-Post: <mailto:java-patches@sourceware.cygnus.com>
List-Help: <mailto:java-patches-help@sourceware.cygnus.com>, <http://sourceware.cygnus.com/ml/#faqs>
Sender: java-patches-owner@sourceware.cygnus.com
Delivered-To: mailing list java-patches@sourceware.cygnus.com
Received: (qmail 30755 invoked from network); 9 Mar 2000 22:42:01 -0000
Message-ID: <38C82979.108B42F8@albatross.co.nz>
Date: Fri, 10 Mar 2000 11:45:13 +1300
From: Bryce McKinlay <bryce@albatross.co.nz>
X-Mailer: Mozilla 4.7 [en] (X11; U; Linux 2.3.25 i686)
X-Accept-Language: en
MIME-Version: 1.0
To: java-patches@sourceware.cygnus.com
Subject: Patch: README
Content-Type: multipart/mixed;
 boundary="------------DFC0B7832892174AA613AEDD"

This is a multi-part message in MIME format.
--------------DFC0B7832892174AA613AEDD
Content-Type: text/plain; charset=us-ascii
Content-Transfer-Encoding: 7bit

I checked in some updates to the libjava/README file.

regards

  [ bryce ]




--------------DFC0B7832892174AA613AEDD
Content-Type: text/plain; charset=us-ascii;
 name="README.patch"
Content-Transfer-Encoding: 7bit
Content-Disposition: inline;
 filename="README.patch"

Index: README
===================================================================
RCS file: /cvs/java/libgcj/libjava/README,v
retrieving revision 1.1
diff -u -r1.1 README
--- README      1999/09/30 02:17:36     1.1
+++ README      2000/03/09 22:19:14
@@ -1,14 +1,14 @@
 This is libgcj: the runtime library for gcj, the GNU Compiler for Java. 
 libgcj provides a partial implementation of the Java Class Libraries.
 
-libgcj is free software.  See the file COPYING.LIB for copying permission.
+libgcj is free software.  See the file LIBGCJ_LICENSE for copying permission.
 
 DOCUMENTATION
 =============
 
 All documentation, including detailed installation and usage instructions,
-can be found on the gcj web pages at the following URL:
+can be found on the gcj web pages at this URL:
 
                http://sourceware.cygnus.com/java/
 
@@ -18,30 +18,26 @@
 
   > mkdir build
   > cd build
-  > ../libgcj/configure --enable-java-gc=<GC TYPE> \
-    --enable-threads=<THREADS TYPE>
+  > ../libgcj/configure --enable-threads=<THREADS_TYPE>
   > make
   > make install
 
 where:
 
-<GC TYPE> specifies the Garbage Collection library to be used by libgcj. 
-Currently the only supported value is "boehm".
-
-<THREADS TYPE> specifies the threads library to be used by libgcj. Currently 
+<THREADS_TYPE> specifies the threads library to be used by libgcj. Currently 
 the possible values are "posix" and "none". This value must be the same as
 the value used when configuring gcc itself.
 
 Consult the gcj web pages for additional "configure" arguments.
 
-NOTE: libgcj can not be configured/built in the source directory. You must
+NOTE: libgcj can not be built in the same directory as `configure'. You must 
 create a separate build directory. 
   
 BUGS
 ====
 
-Please submit bug reports to the following URL:
+Please submit bug reports via this URL:
 
        http://sourceware.cygnus.com/cgi-bin/gnatsweb.pl?database=java
Index: README
===================================================================
RCS file: /cvs/java/libgcj/libjava/README,v
retrieving revision 1.2
diff -u -r1.2 README
--- README      2000/03/09 22:20:43     1.2
+++ README      2000/03/09 22:40:30
@@ -13,12 +13,21 @@
                http://sourceware.cygnus.com/java/
 
 
+REQUIREMENTS
+============
+
+libgcj must be built with a compatible version of the gcc compiler. libgcj
+releases are usually numbered according to their corresponding gcc release.
+For example, if this is "libgcj 2.95.3", you need to build it using "gcc
+2.95.3".
+
+
 QUICK INSTALLATION
 ==================
 
   > mkdir build
   > cd build
-  > ../libgcj/configure --enable-threads=<THREADS_TYPE>
+  > ../libgcj/configure --enable-threads=<THREADS_TYPE> --prefix=<DIR>
   > make
   > make install
 
@@ -27,6 +36,9 @@
 <THREADS_TYPE> specifies the threads library to be used by libgcj. Currently 
 the possible values are "posix" and "none". This value must be the same as
 the value used when configuring gcc itself.
+
+<DIR> specifies the installation directory. This should be the same location 
+as where gcc is installed.
 
 Consult the gcj web pages for additional "configure" arguments.


--------------DFC0B7832892174AA613AEDD--

From java-patches-return-556-listarch-java-patches=sourceware.cygnus.com@sourceware.cygnus.com Fri Mar 10 02:41:51 2000
Return-Path: <java-patches-return-556-listarch-java-patches=sourceware.cygnus.com@sourceware.cygnus.com>
Delivered-To: listarch-java-patches@sourceware.cygnus.com
Received: (qmail 27706 invoked by alias); 10 Mar 2000 02:41:50 -0000
Mailing-List: contact java-patches-help@sourceware.cygnus.com; run by ezmlm
Precedence: bulk
List-Subscribe: <mailto:java-patches-subscribe@sourceware.cygnus.com>
List-Archive: <http://sourceware.cygnus.com/ml/java-patches/>
List-Post: <mailto:java-patches@sourceware.cygnus.com>
List-Help: <mailto:java-patches-help@sourceware.cygnus.com>, <http://sourceware.cygnus.com/ml/#faqs>
Sender: java-patches-owner@sourceware.cygnus.com
Delivered-To: mailing list java-patches@sourceware.cygnus.com
Received: (qmail 27681 invoked from network); 10 Mar 2000 02:41:49 -0000
X-Authentication-Warning: fencer.cygnus.com: warrenl owned process doing -bs
Date: Thu, 9 Mar 2000 18:41:47 -0800 (PST)
From: Warren Levy <warrenl@cygnus.com>
To: java-patches@sourceware.cygnus.com
Subject: Patch: New java.security.* basics
Message-ID: <Pine.LNX.4.10.10003091808500.27239-100000@fencer.cygnus.com>
MIME-Version: 1.0
Content-Type: TEXT/PLAIN; charset=US-ASCII

Folks,
I'm committing the following patch of a bunch of java.security stuff that
Tom Tromey and I have been working on recently.  It is just the basics of
java.security and some of it is indeed stubbed.  It has been tried with 
the 20000120 snapshot of Cryptix JCE http://www.cryptix.org/products/jce
so it is usable.

Please note that it is mostly JDK 1.1 based but there are some JDK 1.2
things included.  Enjoy!
--warrenl


2000-03-09  Warren Levy  <warrenl@cygnus.com>

	* java/security/AlgorithmParameterGeneratorSpi.java: New file.
	* java/security/DigestException.java: New file.
	* java/security/GeneralSecurityException.java: New file.
	* java/security/InvalidAlgorithmParameterException.java: New file.
	* java/security/InvalidKeyException.java: New file.
	* java/security/InvalidParameterException.java: New file.
	* java/security/Key.java: New file.
	* java/security/KeyException.java: New file.
	* java/security/KeyPair.java: New file.
	* java/security/KeyPairGenerator.java: New file.
	* java/security/KeyPairGeneratorSpi.java: New file.
	* java/security/NoSuchProviderException.java: New file.
	* java/security/PrivateKey.java: New file.
	* java/security/Provider.java: New file.
	* java/security/PublicKey.java: New file.
	* java/security/SecureRandom.java: New file.
	* java/security/Security.java: New file.
	* java/security/Signature.java: New file.
	* java/security/SignatureException.java: New file.
	* java/security/interfaces/DSAKey.java: New file.
	* java/security/interfaces/DSAParams.java: New file.
	* java/security/interfaces/DSAPrivateKey.java: New file.
	* java/security/interfaces/DSAPublicKey.java: New file.
	* java/security/interfaces/RSAPrivateCrtKey.java: New file.
	* java/security/interfaces/RSAPrivateKey.java: New file.
	* java/security/interfaces/RSAPublicKey.java: New file.
	* java/security/spec/AlgorithmParameterSpec.java: New file.
	* java/security/spec/InvalidKeySpecException.java: New file.
	* java/security/spec/InvalidParameterSpecException.java: New file.
	* java/security/spec/KeySpec.java: New file.
	* java/security/spec/RSAPrivateCrtKeySpec.java: New file.
	* java/security/spec/RSAPrivateKeySpec.java: New file.
	* java/security/spec/RSAPublicKeySpec.java: New file.
	* Makefile.am: Added above java.security files.
	* Makefile.in: Rebuilt.

	* java/security/MessageDigest.java: Rewritten.
	* java/security/SecureClassLoader.java: Added JDK1.2 comment.


Index: java/security/AlgorithmParameterGeneratorSpi.java
===================================================================
RCS file: AlgorithmParameterGeneratorSpi.java
diff -N AlgorithmParameterGeneratorSpi.java
--- /dev/null	Tue May  5 13:32:27 1998
+++ AlgorithmParameterGeneratorSpi.java	Thu Mar  9 18:35:09 2000
@@ -0,0 +1,25 @@
+/* Copyright (C) 2000  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 java.security;
+
+/**
+ * @author Warren Levy <warrenl@cygnus.com>
+ * @date February 7, 2000.
+ */
+
+/**
+ * Written using on-line Java Platform 1.2 API Specification.
+ * Status:  Stubbed.
+ */
+
+// JDK1.2
+public abstract class AlgorithmParameterGeneratorSpi
+{
+  // FIXME: Stubbed.
+}
Index: java/security/DigestException.java
===================================================================
RCS file: DigestException.java
diff -N DigestException.java
--- /dev/null	Tue May  5 13:32:27 1998
+++ DigestException.java	Thu Mar  9 18:35:09 2000
@@ -0,0 +1,32 @@
+/* Copyright (C) 2000  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 java.security;
+
+/**
+ * @author Warren Levy <warrenl@cygnus.com>
+ * @date February 1, 2000.
+ */
+
+/**
+ * Written using on-line Java Platform 1.2 API Specification.
+ * Status:  Believed complete and correct.
+ */
+
+public class DigestException extends GeneralSecurityException
+{
+  public DigestException()
+  {
+    super();
+  }
+
+  public DigestException(String msg)
+  {
+    super(msg);
+  }
+}
Index: java/security/GeneralSecurityException.java
===================================================================
RCS file: GeneralSecurityException.java
diff -N GeneralSecurityException.java
--- /dev/null	Tue May  5 13:32:27 1998
+++ GeneralSecurityException.java	Thu Mar  9 18:35:09 2000
@@ -0,0 +1,33 @@
+/* Copyright (C) 2000  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 java.security;
+
+/**
+ * @author Warren Levy <warrenl@cygnus.com>
+ * @date February 1, 2000.
+ */
+
+/**
+ * Written using on-line Java Platform 1.2 API Specification.
+ * Status:  Believed complete and correct.
+ */
+
+// JDK1.2
+public class GeneralSecurityException extends Exception
+{
+  public GeneralSecurityException()
+  {
+    super();
+  }
+
+  public GeneralSecurityException(String msg)
+  {
+    super(msg);
+  }
+}
Index: java/security/InvalidAlgorithmParameterException.java
===================================================================
RCS file: InvalidAlgorithmParameterException.java
diff -N InvalidAlgorithmParameterException.java
--- /dev/null	Tue May  5 13:32:27 1998
+++ InvalidAlgorithmParameterException.java	Thu Mar  9 18:35:09 2000
@@ -0,0 +1,33 @@
+/* Copyright (C) 2000  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 java.security;
+
+/**
+ * @author Warren Levy <warrenl@cygnus.com>
+ * @date February 2, 2000.
+ */
+
+/**
+ * Written using on-line Java Platform 1.2 API Specification.
+ * Status:  Believed complete and correct.
+ */
+
+// JDK1.2
+public class InvalidAlgorithmParameterException extends GeneralSecurityException
+{
+  public InvalidAlgorithmParameterException()
+  {
+    super();
+  }
+
+  public InvalidAlgorithmParameterException(String msg)
+  {
+    super(msg);
+  }
+}
Index: java/security/InvalidKeyException.java
===================================================================
RCS file: InvalidKeyException.java
diff -N InvalidKeyException.java
--- /dev/null	Tue May  5 13:32:27 1998
+++ InvalidKeyException.java	Thu Mar  9 18:35:09 2000
@@ -0,0 +1,32 @@
+/* Copyright (C) 2000  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 java.security;
+
+/**
+ * @author Warren Levy <warrenl@cygnus.com>
+ * @date February 1, 2000.
+ */
+
+/**
+ * Written using on-line Java Platform 1.2 API Specification.
+ * Status:  Believed complete and correct.
+ */
+
+public class InvalidKeyException extends KeyException
+{
+  public InvalidKeyException()
+  {
+    super();
+  }
+
+  public InvalidKeyException(String msg)
+  {
+    super(msg);
+  }
+}
Index: java/security/InvalidParameterException.java
===================================================================
RCS file: InvalidParameterException.java
diff -N InvalidParameterException.java
--- /dev/null	Tue May  5 13:32:27 1998
+++ InvalidParameterException.java	Thu Mar  9 18:35:09 2000
@@ -0,0 +1,32 @@
+/* Copyright (C) 2000  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 java.security;
+
+/**
+ * @author Warren Levy <warrenl@cygnus.com>
+ * @date February 1, 2000.
+ */
+
+/**
+ * Written using on-line Java Platform 1.2 API Specification.
+ * Status:  Believed complete and correct.
+ */
+
+public class InvalidParameterException extends IllegalArgumentException
+{
+  public InvalidParameterException()
+  {
+    super();
+  }
+
+  public InvalidParameterException(String msg)
+  {
+    super(msg);
+  }
+}
Index: java/security/Key.java
===================================================================
RCS file: Key.java
diff -N Key.java
--- /dev/null	Tue May  5 13:32:27 1998
+++ Key.java	Thu Mar  9 18:35:09 2000
@@ -0,0 +1,29 @@
+/* Copyright (C) 2000  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 java.security;
+import java.io.Serializable;
+
+/**
+ * @author Warren Levy <warrenl@cygnus.com>
+ * @date February 1, 2000.
+ */
+
+/* Written using on-line Java Platform 1.2 API Specification.
+ * Status:  Believed complete and correct.
+ */
+ 
+public interface Key extends Serializable
+{
+  // FIXME: need to set this at some point when serialization is implemented.
+  public static final long serialVersionUID;
+
+  public String getAlgorithm();
+  public String getFormat();
+  public byte[] getEncoded();
+}
Index: java/security/KeyException.java
===================================================================
RCS file: KeyException.java
diff -N KeyException.java
--- /dev/null	Tue May  5 13:32:27 1998
+++ KeyException.java	Thu Mar  9 18:35:09 2000
@@ -0,0 +1,32 @@
+/* Copyright (C) 2000  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 java.security;
+
+/**
+ * @author Warren Levy <warrenl@cygnus.com>
+ * @date February 1, 2000.
+ */
+
+/**
+ * Written using on-line Java Platform 1.2 API Specification.
+ * Status:  Believed complete and correct.
+ */
+
+public class KeyException extends GeneralSecurityException
+{
+  public KeyException()
+  {
+    super();
+  }
+
+  public KeyException(String msg)
+  {
+    super(msg);
+  }
+}
Index: java/security/KeyPair.java
===================================================================
RCS file: KeyPair.java
diff -N KeyPair.java
--- /dev/null	Tue May  5 13:32:27 1998
+++ KeyPair.java	Thu Mar  9 18:35:09 2000
@@ -0,0 +1,41 @@
+/* Copyright (C) 2000  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 java.security;
+
+/**
+ * @author Tom Tromey <tromey@cygnus.com>
+ * @date February 9, 2000.
+ */
+
+/* Written using on-line Java Platform 1.2 API Specification.
+ * Status:  Believed complete and correct.
+ */
+ 
+public class KeyPair /* FIXME: implements serializable */
+{
+  public KeyPair (PublicKey publicKey, PrivateKey privateKey)
+  {
+    this.publicKey = publicKey;
+    this.privateKey = privateKey;
+  }
+
+  public PublicKey getPublic ()
+  {
+    return publicKey;
+  }
+
+  public PrivateKey getPrivate ()
+  {
+    return privateKey;
+  }
+
+  // The keys.
+  private PublicKey publicKey;
+  private PrivateKey privateKey;
+}
Index: java/security/KeyPairGenerator.java
===================================================================
RCS file: KeyPairGenerator.java
diff -N KeyPairGenerator.java
--- /dev/null	Tue May  5 13:32:27 1998
+++ KeyPairGenerator.java	Thu Mar  9 18:35:09 2000
@@ -0,0 +1,86 @@
+/* Copyright (C) 2000  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 java.security;
+
+/**
+ * @author Warren Levy <warrenl@cygnus.com>
+ * @date February 10, 2000.
+ */
+
+/**
+ * Written using on-line Java Platform 1.2 API Specification.
+ * Status:  Partially implemented to the 1.1 spec.
+ * It is known not to comply with the 1.2 spec.
+ */
+
+public abstract class KeyPairGenerator extends KeyPairGeneratorSpi
+{
+  protected KeyPairGenerator(String algorithm)
+  {
+    name = algorithm;
+  }
+
+  public static KeyPairGenerator getInstance(String algorithm)
+    throws NoSuchAlgorithmException
+  {
+    String name = "KeyPairGenerator." + algorithm;
+    Provider[] provs = Security.getProviders();
+    for (int i = 0; i < provs.length; ++i)
+      {
+	String val = provs[i].getProperty(name);
+	if (val != null)
+	  {
+	    try
+	      {
+		return (KeyPairGenerator) Class.forName(val).newInstance();
+	      }
+	    catch (Throwable _)
+	      {
+		// We just ignore failures.
+	      }
+	  }
+      }
+
+    throw new NoSuchAlgorithmException(algorithm);
+  }
+
+  public static KeyPairGenerator getInstance(String algorithm, String provider)
+    throws NoSuchAlgorithmException, NoSuchProviderException
+  {
+    String name = "KeyPairGenerator." + algorithm;
+    Provider p = Security.getProvider(provider);
+    if (p == null)
+      throw new NoSuchProviderException(provider);
+    String val = p.getProperty(name);
+    if (val != null)
+      {
+	try
+	  {
+	    return (KeyPairGenerator) Class.forName(val).newInstance();
+	  }
+	catch (Throwable _)
+	  {
+	    // Nothing.
+	  }
+      }
+
+    throw new NoSuchAlgorithmException(algorithm);
+  }
+
+  public String getAlgorithm()
+  {
+    return name;
+  }
+
+  public abstract void initialize(int strength, SecureRandom random);
+  public abstract KeyPair generateKeyPair();
+
+  // Algorithm name.
+  private String name;
+}
Index: java/security/KeyPairGeneratorSpi.java
===================================================================
RCS file: KeyPairGeneratorSpi.java
diff -N KeyPairGeneratorSpi.java
--- /dev/null	Tue May  5 13:32:27 1998
+++ KeyPairGeneratorSpi.java	Thu Mar  9 18:35:09 2000
@@ -0,0 +1,26 @@
+/* Copyright (C) 2000  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 java.security;
+
+/**
+ * @author Warren Levy <warrenl@cygnus.com>
+ * @date February 7, 2000.
+ */
+
+/**
+ * Written using on-line Java Platform 1.2 API Specification.
+ * Status:  Partially implemented.
+ */
+
+// JDK1.2
+public abstract class KeyPairGeneratorSpi
+{
+  public abstract void initialize(int keysize, SecureRandom random);
+  public abstract KeyPair generateKeyPair();
+}
Index: java/security/MessageDigest.java
===================================================================
RCS file: /cvs/java/libgcj/libjava/java/security/MessageDigest.java,v
retrieving revision 1.3
diff -u -p -r1.3 MessageDigest.java
--- MessageDigest.java	2000/03/07 19:55:27	1.3
+++ MessageDigest.java	2000/03/10 02:35:09
@@ -1,6 +1,6 @@
 // MessageDigest.java
 
-/* Copyright (C) 1999  Free Software Foundation
+/* Copyright (C) 2000  Free Software Foundation
 
    This file is part of libgcj.
 
@@ -10,55 +10,135 @@ details.  */
 
 package java.security;
 
-// FIXME: This is just a stub for a proper implementation.
+/**
+ * @author Tom Tromey <tromey@cygnus.com>
+ * @date February 11, 2000.
+ */
+
+/**
+ * Written using on-line Java Platform 1.1 API Specification.
+ * Status:  Believed complete and correct to 1.1 spec.
+ * It is known not to comply with the 1.2 spec.
+ */
+
 public abstract class MessageDigest
 {
-    private static final byte[] dummy = { 0 };
+  protected MessageDigest (String algorithm)
+  {
+    name = algorithm;
+  }
+
+  public static MessageDigest getInstance (String algorithm)
+    throws NoSuchAlgorithmException
+  {
+    String name = "MessageDigest." + algorithm;
+    Provider[] provs = Security.getProviders ();
+    for (int i = 0; i < provs.length; ++i)
+      {
+	String val = provs[i].getProperty (name);
+	if (val != null)
+	  {
+	    try
+	      {
+		return (MessageDigest) Class.forName(val).newInstance ();
+	      }
+	    catch (Throwable _)
+	      {
+		// We just ignore failures.
+	      }
+	  }
+      }
+
+    throw new NoSuchAlgorithmException (algorithm);
+  }
+
+  public static MessageDigest getInstance (String algorithm, String provider)
+    throws NoSuchAlgorithmException, NoSuchProviderException
+  {
+    String name = "MessageDigest." + algorithm;
+    Provider p = Security.getProvider (provider);
+    if (p == null)
+      throw new NoSuchProviderException (provider);
+    String val = p.getProperty (name);
+    if (val != null)
+      {
+	try
+	  {
+	    return (MessageDigest) Class.forName(val).newInstance ();
+	  }
+	catch (Throwable _)
+	  {
+	    // Nothing.
+	  }
+      }
+
+    throw new NoSuchAlgorithmException (algorithm);
+  }
+
+  public void update (byte input)
+  {
+    engineUpdate (input);
+  }
+
+  public void update (byte[] input, int offset, int len)
+  {
+    engineUpdate (input, offset, len);
+  }
+
+  public void update (byte[] input)
+  {
+    engineUpdate (input, 0, input.length);
+  }
+
+  public byte[] digest ()
+  {
+    return engineDigest ();
+  }
+
+  public byte[] digest (byte[] input)
+  {
+    update (input);
+    return engineDigest ();
+  }
+
+  public String toString ()
+  {
+    // There is no spec for this.
+    return "[MessageDigest: " + name + "]";
+  }
+
+  public static boolean isEqual (byte[] digesta, byte[] digestb)
+  {
+    if (digesta == digestb)
+      return true;
+    if (digesta.length != digestb.length)
+      return false;
+    for (int i = digesta.length - 1; i >= 0; --i)
+      if (digesta[i] != digestb[i])
+	return false;
+    return true;
+  }
+
+  public void reset ()
+  {
+    engineReset ();
+  }
+
+  public final String getAlgorithm ()
+  {
+    return name;
+  }
+
+  protected abstract void engineUpdate (byte input);
+  protected abstract void engineUpdate (byte input[], int offset, int len);
+  protected abstract byte[] engineDigest ();
+  protected abstract void engineReset ();
+
+  public Object clone() throws CloneNotSupportedException
+  {
+    return super.clone ();
+  }
 
-    public static MessageDigest getInstance(String algorithm)
-	throws NoSuchAlgorithmException
-    {
-	Object	obj;
-
-	try {
-	    obj = Class.forName(algorithm).newInstance();
-	} catch (Exception e) {
-	    throw new NoSuchAlgorithmException("algorithm " 
-					       + algorithm 
-					       + " not available.");
-	}
-	
-	return (MessageDigest) obj;
-    }
-
-    public void update(byte input)
-    {
-	// FIXME
-    }
-
-    public void update(byte[] input, int offset, int len)
-    {
-	// FIXME
-    }
-
-    public void update(byte[] input)
-    {
-	// FIXME
-    }
-
-    public byte[] digest()
-    {
-	return dummy;
-    }
-
-    public byte[] digest(byte[] input)
-    {
-	update(input);
-	return digest();
-    }
-    
-    public void reset()
-    {
-	// FIXME
-    }
+  // Algorithm name.
+  private String name;
 }
Index: java/security/NoSuchProviderException.java
===================================================================
RCS file: NoSuchProviderException.java
diff -N NoSuchProviderException.java
--- /dev/null	Tue May  5 13:32:27 1998
+++ NoSuchProviderException.java	Thu Mar  9 18:35:09 2000
@@ -0,0 +1,32 @@
+/* Copyright (C) 2000  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 java.security;
+
+/**
+ * @author Warren Levy <warrenl@cygnus.com>
+ * @date February 4, 2000.
+ */
+
+/**
+ * Written using on-line Java Platform 1.2 API Specification.
+ * Status:  Believed complete and correct.
+ */
+
+public class NoSuchProviderException extends GeneralSecurityException
+{
+  public NoSuchProviderException()
+  {
+    super();
+  }
+
+  public NoSuchProviderException(String msg)
+  {
+    super(msg);
+  }
+}
Index: java/security/PrivateKey.java
===================================================================
RCS file: PrivateKey.java
diff -N PrivateKey.java
--- /dev/null	Tue May  5 13:32:27 1998
+++ PrivateKey.java	Thu Mar  9 18:35:09 2000
@@ -0,0 +1,24 @@
+/* Copyright (C) 2000  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 java.security;
+
+/**
+ * @author Warren Levy <warrenl@cygnus.com>
+ * @date February 1, 2000.
+ */
+
+/* Written using on-line Java Platform 1.2 API Specification.
+ * Status:  Believed complete and correct.
+ */
+ 
+public interface PrivateKey extends Key
+{
+  // This interface contains no methods or constants.  It merely serves
+  // to group (and provide type safety for) all private key interfaces.
+}
Index: java/security/Provider.java
===================================================================
RCS file: Provider.java
diff -N Provider.java
--- /dev/null	Tue May  5 13:32:27 1998
+++ Provider.java	Thu Mar  9 18:35:09 2000
@@ -0,0 +1,53 @@
+/* Copyright (C) 2000  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 java.security;
+import java.util.Properties;
+
+/**
+ * @author Warren Levy <warrenl@cygnus.com>
+ * @date February 7, 2000.
+ */
+
+/**
+ * Written using on-line Java Platform 1.2 API Specification.
+ * Status:  Partially implemented.
+ */
+
+public abstract class Provider extends Properties
+{
+  // FIXME: Check the following property values against specs!
+  protected Provider(String name, double version, String info)
+  {
+    super();
+    put("java.security.Provider.Name", name);
+    put("java.security.Provider.Version", Double.toString(version));
+    put("java.security.Provider.Info", info);
+  }
+
+  public String getName()
+  {
+    return getProperty("java.security.Provider.Name");
+  }
+
+  public double getVersion()
+  {
+    return Double.valueOf(getProperty("java.security.Provider.Version")).doubleValue();
+  }
+
+  public String getInfo()
+  {
+    return getProperty("java.security.Provider.Info");
+  }
+
+  public String toString()
+  {
+    // FIXME: Check this string against the spec.
+    return getName() + " " + getProperty("java.security.Provider.Version");
+  }
+}
Index: java/security/PublicKey.java
===================================================================
RCS file: PublicKey.java
diff -N PublicKey.java
--- /dev/null	Tue May  5 13:32:27 1998
+++ PublicKey.java	Thu Mar  9 18:35:09 2000
@@ -0,0 +1,24 @@
+/* Copyright (C) 2000  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 java.security;
+
+/**
+ * @author Warren Levy <warrenl@cygnus.com>
+ * @date February 1, 2000.
+ */
+
+/* Written using on-line Java Platform 1.2 API Specification.
+ * Status:  Believed complete and correct.
+ */
+ 
+public interface PublicKey extends Key
+{
+  // This interface contains no methods or constants.  It merely serves
+  // to group (and provide type safety for) all private key interfaces.
+}
Index: java/security/SecureClassLoader.java
===================================================================
RCS file: /cvs/java/libgcj/libjava/java/security/SecureClassLoader.java,v
retrieving revision 1.3
diff -u -p -r1.3 SecureClassLoader.java
--- SecureClassLoader.java	2000/03/07 19:55:27	1.3
+++ SecureClassLoader.java	2000/03/10 02:35:09
@@ -8,6 +8,7 @@ details.  */
 
 package java.security;
 
+// JDK1.2
 public class SecureClassLoader extends ClassLoader 
 {
     public SecureClassLoader ()
Index: java/security/SecureRandom.java
===================================================================
RCS file: SecureRandom.java
diff -N SecureRandom.java
--- /dev/null	Tue May  5 13:32:27 1998
+++ SecureRandom.java	Thu Mar  9 18:35:09 2000
@@ -0,0 +1,25 @@
+/* Copyright (C) 2000  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 java.security;
+import java.util.Random;
+
+/**
+ * @author Warren Levy <warrenl@cygnus.com>
+ * @date February 7, 2000.
+ */
+
+/**
+ * Written using on-line Java Platform 1.2 API Specification.
+ * Status:  Stubbed.
+ */
+
+public class SecureRandom extends Random
+{
+  // FIXME: Stubbed.
+}
Index: java/security/Security.java
===================================================================
RCS file: Security.java
diff -N Security.java
--- /dev/null	Tue May  5 13:32:27 1998
+++ Security.java	Thu Mar  9 18:35:09 2000
@@ -0,0 +1,107 @@
+/* Copyright (C) 2000  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 java.security;
+
+import java.util.Enumeration;
+import java.util.Properties;
+import java.util.Vector;
+
+/**
+ * @author Tom Tromey <tromey@cygnus.com>
+ * @date February 8, 2000.
+ */
+
+/**
+ * Written using on-line Java Platform 1.2 API Specification.
+ * Status:  Still missing the deprecated getAlgorithmProperty method.
+ */
+
+public final class Security
+{
+  public static int insertProviderAt (Provider provider, int position)
+  {
+    SecurityManager sm = System.getSecurityManager ();
+    if (sm != null)
+      {
+	// FIXME: need SecurityPermission.
+	// sm.checkSecurityAccess ("insertProvider." + provider.getName ());
+      }
+    if (providers.indexOf (provider) != -1)
+      return -1;
+    if (position > providers.size ())
+      position = providers.size ();
+    providers.insertElementAt (provider, position);
+    return providers.indexOf (provider);
+  }
+
+  public static int addProvider (Provider provider)
+  {
+    return insertProviderAt (provider, providers.size ());
+  }
+
+  public static void removeProvider (String name)
+  {
+    SecurityManager sm = System.getSecurityManager ();
+    if (sm != null)
+      {
+	// FIXME: need SecurityPermission.
+	// sm.checkSecurityAccess ("removeProvider." + name);
+      }
+    Provider p = getProvider (name);
+    if (p != null)
+      providers.removeElement (p);
+  }
+
+  public static Provider[] getProviders ()
+  {
+    Provider[] r = new Provider[providers.size ()];
+    providers.copyInto (r);
+    return r;
+  }
+
+  public static Provider getProvider (String name)
+  {
+    Enumeration e = providers.elements ();
+    while (e.hasMoreElements ())
+      {
+	Provider p = (Provider) e.nextElement ();
+	if (name.equals (p.getName ()))
+	  return p;
+      }
+    return null;
+  }
+
+  public static String getProperty (String key)
+  {
+    SecurityManager sm = System.getSecurityManager ();
+    if (sm != null)
+      {
+	// FIXME: need SecurityPermission.
+	// sm.checkSecurityAccess ("getProperty." + key);
+      }
+    return props.getProperty (key);
+  }
+
+  public static void setProperty (String key, String value)
+  {
+    SecurityManager sm = System.getSecurityManager ();
+    if (sm != null)
+      {
+	// FIXME: need SecurityPermission.
+	// sm.checkSecurityAccess ("setProperty." + key);
+      }
+    props.setProperty (key, value);
+  }
+
+  // The providers we list.
+  private static Vector providers = new Vector ();
+
+  // Security propertiesl
+  private static Properties props = new Properties ();
+}
Index: java/security/Signature.java
===================================================================
RCS file: Signature.java
diff -N Signature.java
--- /dev/null	Tue May  5 13:32:27 1998
+++ Signature.java	Thu Mar  9 18:35:09 2000
@@ -0,0 +1,173 @@
+/* Copyright (C) 2000  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 java.security;
+
+/**
+ * @author Tom Tromey <tromey@cygnus.com>
+ * @date February 11, 2000.
+ */
+
+/**
+ * Written using on-line Java Platform 1.1 API Specification.
+ * Status:  Believed complete and correct to 1.1 spec.
+ * It is known not to comply with the 1.2 spec.
+ */
+
+public abstract class Signature
+{
+  protected Signature (String name)
+  {
+    state = UNINITIALIZED;
+    this.name = name;
+  }
+
+  public static Signature getInstance (String algorithm)
+    throws NoSuchAlgorithmException
+  {
+    String name = "Signature." + algorithm;
+    Provider[] provs = Security.getProviders ();
+    for (int i = 0; i < provs.length; ++i)
+      {
+	String val = provs[i].getProperty (name);
+	if (val != null)
+	  {
+	    try
+	      {
+		return (Signature) Class.forName(val).newInstance ();
+	      }
+	    catch (Throwable _)
+	      {
+		// We just ignore failures.
+	      }
+	  }
+      }
+
+    throw new NoSuchAlgorithmException (algorithm);
+  }
+
+  public static Signature getInstance (String algorithm, String provider)
+    throws NoSuchAlgorithmException, NoSuchProviderException
+  {
+    String name = "Signature." + algorithm;
+    Provider p = Security.getProvider (provider);
+    if (p == null)
+      throw new NoSuchProviderException (provider);
+    String val = p.getProperty (name);
+    if (val != null)
+      {
+	try
+	  {
+	    return (Signature) Class.forName(val).newInstance ();
+	  }
+	catch (Throwable _)
+	  {
+	    // Nothing.
+	  }
+      }
+
+    throw new NoSuchAlgorithmException (algorithm);
+  }
+
+  public final void initVerify (PublicKey publicKey)
+    throws InvalidKeyException
+  {
+    engineInitVerify (publicKey);
+  }
+
+  public final void initSign (PrivateKey privateKey)
+    throws InvalidKeyException
+  {
+    engineInitSign (privateKey);
+  }
+
+  public final byte[] sign ()
+    throws SignatureException
+  {
+    return engineSign ();
+  }
+
+  public final boolean verify (byte[] signature)
+    throws SignatureException
+  {
+    return engineVerify (signature);
+  }
+
+  public final void update (byte b)
+    throws SignatureException
+  {
+    engineUpdate (b);
+  }
+
+  public final void update (byte[] data)
+    throws SignatureException
+  {
+    engineUpdate (data, 0, data.length);
+  }
+
+  public final void update (byte[] data, int off, int len)
+    throws SignatureException
+  {
+    engineUpdate (data, off, len);
+  }
+
+  public final String getAlgorithm ()
+  {
+    return name;
+  }
+
+  public String toString ()
+  {
+    // There is no spec for this.  FIXME: this is a bad choice.
+    return name + "; state = " + state;
+  }
+
+  public final void setParameter (String param, Object value)
+    throws InvalidParameterException
+  {
+    engineSetParameter (param, value);
+  }
+
+  public final Object getParameter (String param)
+    throws InvalidParameterException
+  {
+    return engineGetParameter (param);
+  }
+
+  protected abstract void engineInitVerify (PublicKey publicKey)
+    throws InvalidKeyException;
+  protected abstract void engineInitSign (PrivateKey privateKey)
+    throws InvalidKeyException;
+  protected abstract void engineUpdate (byte b)
+    throws SignatureException;
+  protected abstract void engineUpdate (byte[] b, int off, int len)
+    throws SignatureException;
+  protected abstract byte[] engineSign ()
+    throws SignatureException;
+  protected abstract boolean engineVerify (byte[] sigBytes)
+    throws SignatureException;
+  protected abstract void engineSetParameter (String param, Object value)
+    throws InvalidParameterException;
+  protected abstract Object engineGetParameter (String param)
+    throws InvalidParameterException;
+
+  public Object clone() throws CloneNotSupportedException
+  {
+    return super.clone ();
+  }
+
+  protected static final int UNINITIALIZED = 0;
+  protected static final int SIGN          = 2;
+  protected static final int VERIFY        = 3;
+
+  // Current state.
+  protected int state;
+
+  // Name of this object.
+  private String name;
+}
Index: java/security/SignatureException.java
===================================================================
RCS file: SignatureException.java
diff -N SignatureException.java
--- /dev/null	Tue May  5 13:32:27 1998
+++ SignatureException.java	Thu Mar  9 18:35:09 2000
@@ -0,0 +1,32 @@
+/* Copyright (C) 2000  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 java.security;
+
+/**
+ * @author Warren Levy <warrenl@cygnus.com>
+ * @date February 1, 2000.
+ */
+
+/**
+ * Written using on-line Java Platform 1.2 API Specification.
+ * Status:  Believed complete and correct.
+ */
+
+public class SignatureException extends GeneralSecurityException
+{
+  public SignatureException()
+  {
+    super();
+  }
+
+  public SignatureException(String msg)
+  {
+    super(msg);
+  }
+}
Index: java/security/interfaces/DSAKey.java
===================================================================
RCS file: DSAKey.java
diff -N DSAKey.java
--- /dev/null	Tue May  5 13:32:27 1998
+++ DSAKey.java	Thu Mar  9 18:35:09 2000
@@ -0,0 +1,23 @@
+/* Copyright (C) 2000  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 java.security.interfaces;
+
+/**
+ * @author Warren Levy <warrenl@cygnus.com>
+ * @date February 1, 2000.
+ */
+
+/* Written using on-line Java Platform 1.2 API Specification.
+ * Status:  Believed complete and correct.
+ */
+ 
+public interface DSAKey
+{
+  public DSAParams getParams();
+}
Index: java/security/interfaces/DSAParams.java
===================================================================
RCS file: DSAParams.java
diff -N DSAParams.java
--- /dev/null	Tue May  5 13:32:27 1998
+++ DSAParams.java	Thu Mar  9 18:35:09 2000
@@ -0,0 +1,26 @@
+/* Copyright (C) 2000  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 java.security.interfaces;
+import java.math.BigInteger;
+
+/**
+ * @author Warren Levy <warrenl@cygnus.com>
+ * @date February 1, 2000.
+ */
+
+/* Written using on-line Java Platform 1.2 API Specification.
+ * Status:  Believed complete and correct.
+ */
+ 
+public interface DSAParams
+{
+  public BigInteger getP();
+  public BigInteger getQ();
+  public BigInteger getG();
+}
Index: java/security/interfaces/DSAPrivateKey.java
===================================================================
RCS file: DSAPrivateKey.java
diff -N DSAPrivateKey.java
--- /dev/null	Tue May  5 13:32:27 1998
+++ DSAPrivateKey.java	Thu Mar  9 18:35:09 2000
@@ -0,0 +1,27 @@
+/* Copyright (C) 2000  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 java.security.interfaces;
+import java.security.PrivateKey;
+import java.math.BigInteger;
+
+/**
+ * @author Warren Levy <warrenl@cygnus.com>
+ * @date February 1, 2000.
+ */
+
+/* Written using on-line Java Platform 1.2 API Specification.
+ * Status:  Believed complete and correct.
+ */
+ 
+public interface DSAPrivateKey extends DSAKey, PrivateKey
+{
+  public static final long serialVersionUID;
+
+  public BigInteger getX();
+}
Index: java/security/interfaces/DSAPublicKey.java
===================================================================
RCS file: DSAPublicKey.java
diff -N DSAPublicKey.java
--- /dev/null	Tue May  5 13:32:27 1998
+++ DSAPublicKey.java	Thu Mar  9 18:35:09 2000
@@ -0,0 +1,27 @@
+/* Copyright (C) 2000  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 java.security.interfaces;
+import java.security.PublicKey;
+import java.math.BigInteger;
+
+/**
+ * @author Warren Levy <warrenl@cygnus.com>
+ * @date February 1, 2000.
+ */
+
+/* Written using on-line Java Platform 1.2 API Specification.
+ * Status:  Believed complete and correct.
+ */
+ 
+public interface DSAPublicKey extends DSAKey, PublicKey
+{
+  public static final long serialVersionUID;
+
+  public BigInteger getY();
+}
Index: java/security/interfaces/RSAPrivateCrtKey.java
===================================================================
RCS file: RSAPrivateCrtKey.java
diff -N RSAPrivateCrtKey.java
--- /dev/null	Tue May  5 13:32:27 1998
+++ RSAPrivateCrtKey.java	Thu Mar  9 18:35:09 2000
@@ -0,0 +1,30 @@
+/* Copyright (C) 2000  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 java.security.interfaces;
+import java.math.BigInteger;
+
+/**
+ * @author Warren Levy <warrenl@cygnus.com>
+ * @date February 1, 2000.
+ */
+
+/* Written using on-line Java Platform 1.2 API Specification.
+ * Status:  Believed complete and correct.
+ */
+ 
+// JDK1.2
+public interface RSAPrivateCrtKey extends RSAPrivateKey
+{
+  public BigInteger getPublicExponent();
+  public BigInteger getPrimeP();
+  public BigInteger getPrimeQ();
+  public BigInteger getPrimeExponentP();
+  public BigInteger getPrimeExponentQ();
+  public BigInteger getCrtCoefficient();
+}
Index: java/security/interfaces/RSAPrivateKey.java
===================================================================
RCS file: RSAPrivateKey.java
diff -N RSAPrivateKey.java
--- /dev/null	Tue May  5 13:32:27 1998
+++ RSAPrivateKey.java	Thu Mar  9 18:35:09 2000
@@ -0,0 +1,27 @@
+/* Copyright (C) 2000  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 java.security.interfaces;
+import java.security.PrivateKey;
+import java.math.BigInteger;
+
+/**
+ * @author Warren Levy <warrenl@cygnus.com>
+ * @date February 1, 2000.
+ */
+
+/* Written using on-line Java Platform 1.2 API Specification.
+ * Status:  Believed complete and correct.
+ */
+ 
+// JDK1.2
+public interface RSAPrivateKey extends PrivateKey
+{
+  public BigInteger getModulus();
+  public BigInteger getPrivateExponent();
+}
Index: java/security/interfaces/RSAPublicKey.java
===================================================================
RCS file: RSAPublicKey.java
diff -N RSAPublicKey.java
--- /dev/null	Tue May  5 13:32:27 1998
+++ RSAPublicKey.java	Thu Mar  9 18:35:09 2000
@@ -0,0 +1,27 @@
+/* Copyright (C) 2000  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 java.security.interfaces;
+import java.security.PublicKey;
+import java.math.BigInteger;
+
+/**
+ * @author Warren Levy <warrenl@cygnus.com>
+ * @date February 1, 2000.
+ */
+
+/* Written using on-line Java Platform 1.2 API Specification.
+ * Status:  Believed complete and correct.
+ */
+ 
+// JDK1.2
+public interface RSAPublicKey extends PublicKey
+{
+  public BigInteger getModulus();
+  public BigInteger getPublicExponent();
+}
Index: java/security/spec/AlgorithmParameterSpec.java
===================================================================
RCS file: AlgorithmParameterSpec.java
diff -N AlgorithmParameterSpec.java
--- /dev/null	Tue May  5 13:32:27 1998
+++ AlgorithmParameterSpec.java	Thu Mar  9 18:35:09 2000
@@ -0,0 +1,25 @@
+/* Copyright (C) 2000  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 java.security.spec;
+
+/**
+ * @author Warren Levy <warrenl@cygnus.com>
+ * @date February 1, 2000.
+ */
+
+/* Written using on-line Java Platform 1.2 API Specification.
+ * Status:  Believed complete and correct.
+ */
+ 
+// JDK1.2
+public interface AlgorithmParameterSpec
+{
+  // This interface contains no methods or constants. Its only purpose is
+  // to group (and provide type safety for) all key specifications.
+}
Index: java/security/spec/InvalidKeySpecException.java
===================================================================
RCS file: InvalidKeySpecException.java
diff -N InvalidKeySpecException.java
--- /dev/null	Tue May  5 13:32:27 1998
+++ InvalidKeySpecException.java	Thu Mar  9 18:35:09 2000
@@ -0,0 +1,33 @@
+/* Copyright (C) 2000  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 java.security.spec;
+import java.security.GeneralSecurityException;
+
+/**
+ * @author Warren Levy <warrenl@cygnus.com>
+ * @date February 1, 2000.
+ */
+
+/* Written using on-line Java Platform 1.2 API Specification.
+ * Status:  Believed complete and correct.
+ */
+
+// JDK1.2
+public class InvalidKeySpecException extends GeneralSecurityException
+{
+  public InvalidKeySpecException()
+  {
+    super();
+  }
+
+  public InvalidKeySpecException(String msg)
+  {
+    super(msg);
+  }
+}
Index: java/security/spec/InvalidParameterSpecException.java
===================================================================
RCS file: InvalidParameterSpecException.java
diff -N InvalidParameterSpecException.java
--- /dev/null	Tue May  5 13:32:27 1998
+++ InvalidParameterSpecException.java	Thu Mar  9 18:35:09 2000
@@ -0,0 +1,33 @@
+/* Copyright (C) 2000  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 java.security.spec;
+import java.security.GeneralSecurityException;
+
+/**
+ * @author Warren Levy <warrenl@cygnus.com>
+ * @date February 1, 2000.
+ */
+
+/* Written using on-line Java Platform 1.2 API Specification.
+ * Status:  Believed complete and correct.
+ */
+
+// JDK1.2
+public class InvalidParameterSpecException extends GeneralSecurityException
+{
+  public InvalidParameterSpecException()
+  {
+    super();
+  }
+
+  public InvalidParameterSpecException(String msg)
+  {
+    super(msg);
+  }
+}
Index: java/security/spec/KeySpec.java
===================================================================
RCS file: KeySpec.java
diff -N KeySpec.java
--- /dev/null	Tue May  5 13:32:27 1998
+++ KeySpec.java	Thu Mar  9 18:35:09 2000
@@ -0,0 +1,25 @@
+/* Copyright (C) 2000  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 java.security.spec;
+
+/**
+ * @author Warren Levy <warrenl@cygnus.com>
+ * @date February 1, 2000.
+ */
+
+/* Written using on-line Java Platform 1.2 API Specification.
+ * Status:  Believed complete and correct.
+ */
+ 
+// JDK1.2
+public interface KeySpec
+{
+  // This interface contains no methods or constants. Its only purpose is
+  // to group (and provide type safety for) all key specifications.
+}
Index: java/security/spec/RSAPrivateCrtKeySpec.java
===================================================================
RCS file: RSAPrivateCrtKeySpec.java
diff -N RSAPrivateCrtKeySpec.java
--- /dev/null	Tue May  5 13:32:27 1998
+++ RSAPrivateCrtKeySpec.java	Thu Mar  9 18:35:09 2000
@@ -0,0 +1,23 @@
+/* Copyright (C) 2000  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 java.security.spec;
+
+/**
+ * @author Warren Levy <warrenl@cygnus.com>
+ * @date February 7, 2000.
+ */
+
+/* Written using on-line Java Platform 1.2 API Specification.
+ * Status:  Stubbed.
+ */
+ 
+// JDK1.2
+public class RSAPrivateCrtKeySpec extends RSAPrivateKeySpec
+{
+}
Index: java/security/spec/RSAPrivateKeySpec.java
===================================================================
RCS file: RSAPrivateKeySpec.java
diff -N RSAPrivateKeySpec.java
--- /dev/null	Tue May  5 13:32:27 1998
+++ RSAPrivateKeySpec.java	Thu Mar  9 18:35:09 2000
@@ -0,0 +1,23 @@
+/* Copyright (C) 2000  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 java.security.spec;
+
+/**
+ * @author Warren Levy <warrenl@cygnus.com>
+ * @date February 7, 2000.
+ */
+
+/* Written using on-line Java Platform 1.2 API Specification.
+ * Status:  Stubbed.
+ */
+ 
+// JDK1.2
+public class RSAPrivateKeySpec implements KeySpec
+{
+}
Index: java/security/spec/RSAPublicKeySpec.java
===================================================================
RCS file: RSAPublicKeySpec.java
diff -N RSAPublicKeySpec.java
--- /dev/null	Tue May  5 13:32:27 1998
+++ RSAPublicKeySpec.java	Thu Mar  9 18:35:09 2000
@@ -0,0 +1,23 @@
+/* Copyright (C) 2000  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 java.security.spec;
+
+/**
+ * @author Warren Levy <warrenl@cygnus.com>
+ * @date February 10, 2000.
+ */
+
+/* Written using on-line Java Platform 1.2 API Specification.
+ * Status:  Stubbed.
+ */
+ 
+// JDK1.2
+public class RSAPublicKeySpec implements KeySpec
+{
+}


From java-patches-return-557-listarch-java-patches=sourceware.cygnus.com@sourceware.cygnus.com Fri Mar 10 04:20:22 2000
Return-Path: <java-patches-return-557-listarch-java-patches=sourceware.cygnus.com@sourceware.cygnus.com>
Delivered-To: listarch-java-patches@sourceware.cygnus.com
Received: (qmail 12471 invoked by alias); 10 Mar 2000 04:20:22 -0000
Mailing-List: contact java-patches-help@sourceware.cygnus.com; run by ezmlm
Precedence: bulk
List-Subscribe: <mailto:java-patches-subscribe@sourceware.cygnus.com>
List-Archive: <http://sourceware.cygnus.com/ml/java-patches/>
List-Post: <mailto:java-patches@sourceware.cygnus.com>
List-Help: <mailto:java-patches-help@sourceware.cygnus.com>, <http://sourceware.cygnus.com/ml/#faqs>
Sender: java-patches-owner@sourceware.cygnus.com
Delivered-To: mailing list java-patches@sourceware.cygnus.com
Received: (qmail 12451 invoked from network); 10 Mar 2000 04:20:19 -0000
Message-ID: <38C878CA.B5399D81@albatross.co.nz>
Date: Fri, 10 Mar 2000 17:23:39 +1300
From: Bryce McKinlay <bryce@albatross.co.nz>
X-Mailer: Mozilla 4.7 [en] (X11; U; Linux 2.3.25 i686)
X-Accept-Language: en
MIME-Version: 1.0
To: Warren Levy <warrenl@cygnus.com>
CC: java-patches@sourceware.cygnus.com
Subject: Re: Patch: New java.security.* basics
References: <Pine.LNX.4.10.10003091808500.27239-100000@fencer.cygnus.com>
Content-Type: text/plain; charset=us-ascii
Content-Transfer-Encoding: 7bit

Warren Levy wrote:

> I'm committing the following patch of a bunch of java.security stuff that
> Tom Tromey and I have been working on recently.
>

Cool!

> +  // FIXME: need to set this at some point when serialization is implemented.
> +  public static final long serialVersionUID;

Thats not not actually legal Java [*]. Probibly best to set them all to 0 for now, in case
the compiler gets fixed! ;-)

regards

  [ bryce ]


[*] - see PR gcj/163: Compiler permits uninitialized final variables
 http://sourceware.cygnus.com/cgi-bin/gnatsweb.pl?cmd=view&pr=163&database=java


From java-patches-return-558-listarch-java-patches=sourceware.cygnus.com@sourceware.cygnus.com Fri Mar 10 04:33:42 2000
Return-Path: <java-patches-return-558-listarch-java-patches=sourceware.cygnus.com@sourceware.cygnus.com>
Delivered-To: listarch-java-patches@sourceware.cygnus.com
Received: (qmail 14137 invoked by alias); 10 Mar 2000 04:33:42 -0000
Mailing-List: contact java-patches-help@sourceware.cygnus.com; run by ezmlm
Precedence: bulk
List-Subscribe: <mailto:java-patches-subscribe@sourceware.cygnus.com>
List-Archive: <http://sourceware.cygnus.com/ml/java-patches/>
List-Post: <mailto:java-patches@sourceware.cygnus.com>
List-Help: <mailto:java-patches-help@sourceware.cygnus.com>, <http://sourceware.cygnus.com/ml/#faqs>
Sender: java-patches-owner@sourceware.cygnus.com
Delivered-To: mailing list java-patches@sourceware.cygnus.com
Received: (qmail 14112 invoked from network); 10 Mar 2000 04:33:41 -0000
Date: Thu, 9 Mar 2000 20:33:38 -0800 (PST)
Message-Id: <200003100433.UAA19925@ferrule.cygnus.com>
From: Tom Tromey <tromey@cygnus.com>
To: Bryce McKinlay <bryce@albatross.co.nz>
Cc: java-patches@sourceware.cygnus.com
Subject: Re: Patch: Array classes and Constant-time dispatch
In-Reply-To: <38C76F63.3AF4F21B@albatross.co.nz>
References: <38C76F63.3AF4F21B@albatross.co.nz>
X-Zippy:  ..  My vaseline is RUNNING...
X-Attribution:  Tom

>>>>> "Bryce" == Bryce McKinlay <bryce@albatross.co.nz> writes:

Bryce> 2. Array_1.java still crashes, because for some reason
Bryce> System.out.println(class) doesnt work! This seems to be related
Bryce> to PR libgcj/100. Weird.

There is a very strange bug involving the Class vtable.
I'd bet your example would work if you linked statically.
Anthony & I looked at this a little bit one night.
I think it is either an obscure compiler bug or an ld.so bug.

Tom

From java-patches-return-559-listarch-java-patches=sourceware.cygnus.com@sourceware.cygnus.com Fri Mar 10 05:00:30 2000
Return-Path: <java-patches-return-559-listarch-java-patches=sourceware.cygnus.com@sourceware.cygnus.com>
Delivered-To: listarch-java-patches@sourceware.cygnus.com
Received: (qmail 18313 invoked by alias); 10 Mar 2000 05:00:30 -0000
Mailing-List: contact java-patches-help@sourceware.cygnus.com; run by ezmlm
Precedence: bulk
List-Subscribe: <mailto:java-patches-subscribe@sourceware.cygnus.com>
List-Archive: <http://sourceware.cygnus.com/ml/java-patches/>
List-Post: <mailto:java-patches@sourceware.cygnus.com>
List-Help: <mailto:java-patches-help@sourceware.cygnus.com>, <http://sourceware.cygnus.com/ml/#faqs>
Sender: java-patches-owner@sourceware.cygnus.com
Delivered-To: mailing list java-patches@sourceware.cygnus.com
Received: (qmail 18282 invoked from network); 10 Mar 2000 05:00:26 -0000
X-Authentication-Warning: fencer.cygnus.com: warrenl owned process doing -bs
Date: Thu, 9 Mar 2000 21:00:23 -0800 (PST)
From: Warren Levy <warrenl@cygnus.com>
To: Bryce McKinlay <bryce@albatross.co.nz>
cc: java-patches@sourceware.cygnus.com
Subject: Re: Patch: New java.security.* basics
In-Reply-To: <38C878CA.B5399D81@albatross.co.nz>
Message-ID: <Pine.LNX.4.10.10003092058330.13946-100000@fencer.cygnus.com>
MIME-Version: 1.0
Content-Type: TEXT/PLAIN; charset=US-ASCII

On Fri, 10 Mar 2000, Bryce McKinlay wrote:

> Warren Levy wrote:
> 
> > +  // FIXME: need to set this at some point when serialization is implemented.
> > +  public static final long serialVersionUID;
> 
> Thats not not actually legal Java [*]. Probibly best to set them all to 0 for now, in case
> the compiler gets fixed! ;-)

Oops, I meant to do that the other day when I saw gcj/163 come in.  Thanks
for bringing it up.
--warrenl

From java-patches-return-560-listarch-java-patches=sourceware.cygnus.com@sourceware.cygnus.com Fri Mar 10 05:09:29 2000
Return-Path: <java-patches-return-560-listarch-java-patches=sourceware.cygnus.com@sourceware.cygnus.com>
Delivered-To: listarch-java-patches@sourceware.cygnus.com
Received: (qmail 18917 invoked by alias); 10 Mar 2000 05:09:29 -0000
Mailing-List: contact java-patches-help@sourceware.cygnus.com; run by ezmlm
Precedence: bulk
List-Subscribe: <mailto:java-patches-subscribe@sourceware.cygnus.com>
List-Archive: <http://sourceware.cygnus.com/ml/java-patches/>
List-Post: <mailto:java-patches@sourceware.cygnus.com>
List-Help: <mailto:java-patches-help@sourceware.cygnus.com>, <http://sourceware.cygnus.com/ml/#faqs>
Sender: java-patches-owner@sourceware.cygnus.com
Delivered-To: mailing list java-patches@sourceware.cygnus.com
Received: (qmail 18892 invoked from network); 10 Mar 2000 05:09:29 -0000
X-Authentication-Warning: fencer.cygnus.com: warrenl owned process doing -bs
Date: Thu, 9 Mar 2000 21:09:27 -0800 (PST)
From: Warren Levy <warrenl@cygnus.com>
To: java-patches@sourceware.cygnus.com
Subject: Patch: java.security cleanup
Message-ID: <Pine.LNX.4.10.10003092105160.13946-100000@fencer.cygnus.com>
MIME-Version: 1.0
Content-Type: TEXT/PLAIN; charset=US-ASCII

Here's a small patch following up on Bryce's catch.
--warrenl

2000-03-09  Warren Levy  <warrenl@cygnus.com>

        * java/security/Key.java(serialVersionUID): Set to 0 for now.
        * java/security/interfaces/DSAPrivateKey.java(serialVersionUID): Ditto.
        * java/security/interfaces/DSAPublicKey.java(serialVersionUID): Ditto.


Index: java/security/Key.java
===================================================================
RCS file: /cvs/java/libgcj/libjava/java/security/Key.java,v
retrieving revision 1.1
diff -u -p -r1.1 Key.java
--- Key.java	2000/03/10 02:43:56	1.1
+++ Key.java	2000/03/10 05:07:32
@@ -21,7 +21,7 @@ import java.io.Serializable;
 public interface Key extends Serializable
 {
   // FIXME: need to set this at some point when serialization is implemented.
-  public static final long serialVersionUID;
+  public static final long serialVersionUID = 0;
 
   public String getAlgorithm();
   public String getFormat();
Index: java/security/interfaces/DSAPrivateKey.java
===================================================================
RCS file: /cvs/java/libgcj/libjava/java/security/interfaces/DSAPrivateKey.java,v
retrieving revision 1.1
diff -u -p -r1.1 DSAPrivateKey.java
--- DSAPrivateKey.java	2000/03/10 02:43:57	1.1
+++ DSAPrivateKey.java	2000/03/10 05:07:32
@@ -21,7 +21,8 @@ import java.math.BigInteger;
  
 public interface DSAPrivateKey extends DSAKey, PrivateKey
 {
-  public static final long serialVersionUID;
+  // FIXME: need to set this at some point when serialization is implemented.
+  public static final long serialVersionUID = 0;
 
   public BigInteger getX();
 }
Index: java/security/interfaces/DSAPublicKey.java
===================================================================
RCS file: /cvs/java/libgcj/libjava/java/security/interfaces/DSAPublicKey.java,v
retrieving revision 1.1
diff -u -p -r1.1 DSAPublicKey.java
--- DSAPublicKey.java	2000/03/10 02:43:57	1.1
+++ DSAPublicKey.java	2000/03/10 05:07:32
@@ -21,7 +21,8 @@ import java.math.BigInteger;
  
 public interface DSAPublicKey extends DSAKey, PublicKey
 {
-  public static final long serialVersionUID;
+  // FIXME: need to set this at some point when serialization is implemented.
+  public static final long serialVersionUID = 0;
 
   public BigInteger getY();
 }


From java-patches-return-561-listarch-java-patches=sourceware.cygnus.com@sourceware.cygnus.com Mon Mar 13 17:39:48 2000
Return-Path: <java-patches-return-561-listarch-java-patches=sourceware.cygnus.com@sourceware.cygnus.com>
Delivered-To: listarch-java-patches@sourceware.cygnus.com
Received: (qmail 25407 invoked by alias); 13 Mar 2000 17:39:48 -0000
Mailing-List: contact java-patches-help@sourceware.cygnus.com; run by ezmlm
Precedence: bulk
List-Subscribe: <mailto:java-patches-subscribe@sourceware.cygnus.com>
List-Archive: <http://sourceware.cygnus.com/ml/java-patches/>
List-Post: <mailto:java-patches@sourceware.cygnus.com>
List-Help: <mailto:java-patches-help@sourceware.cygnus.com>, <http://sourceware.cygnus.com/ml/#faqs>
Sender: java-patches-owner@sourceware.cygnus.com
Delivered-To: mailing list java-patches@sourceware.cygnus.com
Received: (qmail 25376 invoked from network); 13 Mar 2000 17:39:46 -0000
Message-ID: <38CD28B3.D629A3D2@sigma6.com>
Date: Mon, 13 Mar 2000 12:43:15 -0500
From: Jeff Sturm <jsturm@sigma6.com>
Organization: AppNet
X-Mailer: Mozilla 4.51 [en] (WinNT; I)
X-Accept-Language: en
MIME-Version: 1.0
To: java-patches@sourceware.cygnus.com
CC: jb7216@bristol.ac.uk
Subject: Patch: Mingw32 (Win32) support
Content-Type: multipart/mixed;
 boundary="------------BF9143A080526020AE83EA13"

This is a multi-part message in MIME format.
--------------BF9143A080526020AE83EA13
Content-Type: text/plain; charset=us-ascii
Content-Transfer-Encoding: 7bit

This is a follow-on to Jon Beniston's Win32 thread/java.net/java.io
patches:

http://sourceware.cygnus.com/ml/java-patches/2000-q1/msg00174.html

I've hacked the autoconf stuff so libgcj will compile (just barely) for
mingw32 targets.  I can now compile and run simple programs, though
libffi and boehm-gc still need more work for mingw32.  (For now I am
cross-compiling from i686-pc-linux-gnu only.)

The configure.in sources are becoming sort of ugly due to the scattering
of host-specific behavior... if someone can tell me how to improve it
I'll gladly work on it and resubmit this patch.

BTW I didn't rebuild any configure scripts... my autoconf version
doesn't appear to match whatever they are using at Cygnus, judging by
the number of conflicts I get.

-- 
Jeff Sturm
jsturm@sigma6.com
--------------BF9143A080526020AE83EA13
Content-Type: text/plain; charset=us-ascii;
 name="gcj-win32.patch"
Content-Transfer-Encoding: 7bit
Content-Disposition: inline;
 filename="gcj-win32.patch"

2000-03-13  Jeff Sturm  <jsturm@sigma6.com>

	* boehm-gc/configure.in: Activate win32 thread support.
	* boehm-gc/gcconfig.h: Handle mingw32.
	* boehm-gc/mach_dep.h: Use GCC ASM syntax for mingw32.
	* libjava/acconfig.h (USE_WIN32_SIGNALLING, USE_WINSOCK): new macros.
	* libjava/configure.in: Don't test data_start for mingw32.
	Set FILE_DESCRIPTOR, PROCESS for mingw32.
	Activate win32 thread support.
	Set SIGNAL_HANDLER, USE_WIN32_SIGNALLING, USE_WINSOCK for mingw32.
	* libjava/include/config.h.in: Rebuilt.
	* zip/tailor.h: Don't use win32 configuration for mingw32.
	* zip/unix/osdep.h: Use binary I/O for mingw32.

Index: boehm-gc/configure.in
===================================================================
RCS file: /cvs/java/libgcj/boehm-gc/configure.in,v
retrieving revision 1.16
diff -u -r1.16 configure.in
--- configure.in	1999/11/04 17:25:07	1.16
+++ configure.in	2000/03/13 15:40:22
@@ -84,7 +84,9 @@
     esac
     THREADLIB=-lpthread
     ;;
- decosf1 | irix | mach | os2 | solaris | win32 | dce | vxworks)
+  win32)
+    ;;
+ decosf1 | irix | mach | os2 | solaris | dce | vxworks)
     AC_MSG_ERROR(thread package $THREADS not yet supported)
     ;;
  *)
Index: boehm-gc/gcconfig.h
===================================================================
RCS file: /cvs/java/libgcj/boehm-gc/gcconfig.h,v
retrieving revision 1.9
diff -u -r1.9 gcconfig.h
--- gcconfig.h	2000/01/29 01:17:03	1.9
+++ gcconfig.h	2000/03/13 15:40:23
@@ -255,6 +255,11 @@
 #   define CYGWIN32
 #   define mach_type_known
 # endif
+# if defined(__MINGW32__)
+#   define I386
+#   define MSWIN32
+#   define mach_type_known
+# endif
 # if defined(__BORLANDC__)
 #   define I386
 #   define MSWIN32
Index: boehm-gc/mach_dep.c
===================================================================
RCS file: /cvs/java/libgcj/boehm-gc/mach_dep.c,v
retrieving revision 1.5
diff -u -r1.5 mach_dep.c
--- mach_dep.c	1999/11/01 23:15:51	1.5
+++ mach_dep.c	2000/03/13 15:40:23
@@ -199,7 +199,8 @@
 #	endif	/* __MWERKS__ */
 #   endif	/* MACOS */
 
-#       if defined(I386) &&!defined(OS2) &&!defined(SVR4) &&!defined(MSWIN32) \
+#       if defined(I386) &&!defined(OS2) &&!defined(SVR4) \
+	&& (defined(__MINGW32__) || !defined(MSWIN32)) \
 	&& !defined(SCO) && !defined(SCO_ELF) \
  	&& !(defined(LINUX)       && defined(__ELF__)) \
 	&& !(defined(__FreeBSD__) && defined(__ELF__)) \
@@ -230,7 +231,8 @@
 	  asm("pushl %ebx");  asm("call GC_push_one"); asm("addl $4,%esp");
 #	endif
 
-#       if defined(I386) && defined(MSWIN32) && !defined(USE_GENERIC)
+#       if defined(I386) && defined(MSWIN32) && !defined(__MINGW32__)
+	&& !defined(USE_GENERIC)
 	/* I386 code, Microsoft variant		*/
 	  __asm  push eax
 	  __asm  call GC_push_one
Index: libjava/acconfig.h
===================================================================
RCS file: /cvs/java/libgcj/libjava/acconfig.h,v
retrieving revision 1.18
diff -u -r1.18 acconfig.h
--- acconfig.h	2000/01/31 04:53:47	1.18
+++ acconfig.h	2000/03/13 15:40:23
@@ -137,3 +137,9 @@
 
 /* Define if you have working iconv() function.  */
 #undef HAVE_ICONV
+
+/* Define if using Win32 signalling. */
+#undef USE_WIN32_SIGNALLING
+
+/* Define if using Win32 winsock library. */
+#undef USE_WINSOCK
Index: libjava/configure.in
===================================================================
RCS file: /cvs/java/libgcj/libjava/configure.in,v
retrieving revision 1.53
diff -u -r1.53 configure.in
--- configure.in	2000/03/04 21:50:19	1.53
+++ configure.in	2000/03/13 15:40:23
@@ -107,12 +107,18 @@
 AC_MSG_CHECKING([for data_start])
 LIBDATASTARTSPEC=
 NEEDS_DATA_START=
-AC_TRY_LINK([extern int data_start;], [return ((int) &data_start);],
-  [AC_MSG_RESULT(found it)],
-  [LIBDATASTARTSPEC="-u data_start -lgcjdata"
-   NEEDS_DATA_START=yes	
-   AC_MSG_RESULT(missing)])
-AC_SUBST(LIBDATASTARTSPEC)
+case "${host}" in
+  i*86-*-mingw*)
+    ;;
+  *)
+    AC_TRY_LINK([extern int data_start;], [return ((int) &data_start);],
+      [AC_MSG_RESULT(found it)],
+      [LIBDATASTARTSPEC="-u data_start -lgcjdata"
+       NEEDS_DATA_START=yes	
+       AC_MSG_RESULT(missing)])
+    AC_SUBST(LIBDATASTARTSPEC)
+    ;;
+esac
 
 dnl See if the user wants to disable java.net.  This is the mildly
 dnl ugly way that we admit that target-side configuration sucks.
@@ -139,8 +145,17 @@
 
 case "$TARGET_ECOS" in
    no)
-      FILE_DESCRIPTOR=natFileDescriptorPosix.cc
-      PROCESS=${PROCESS-Posix}
+      case "${host}" in
+	i*86-*-mingw*)
+	  FILE_DESCRIPTOR=natFileDescriptorWin32.cc
+	  PROCESS=${PROCESS-Win32}
+	  ;;
+
+	*)
+	  FILE_DESCRIPTOR=natFileDescriptorPosix.cc
+	  PROCESS=${PROCESS-Posix}
+	  ;;
+      esac
       ;;
    *)
       FILE_DESCRIPTOR=natFileDescriptorEcos.cc
@@ -287,7 +302,10 @@
 	;;
     esac
     ;;
- decosf1 | irix | mach | os2 | solaris | win32 | dce | vxworks)
+ win32)
+    THREADS=win32
+    ;;
+ decosf1 | irix | mach | os2 | solaris | dce | vxworks)
     AC_MSG_ERROR(thread package $THREADS not yet supported)
     ;;
  *)
@@ -314,6 +332,11 @@
     AC_DEFINE(HAVE_PTHREAD_MUTEXATTR_INIT)
     ;;
 
+ win32)
+    THREADOBJS=win32-threads.lo
+    THREADH=win32-threads.h
+    ;;
+
  none)
     THREADOBJS=no-threads.lo
     THREADH=no-threads.h
@@ -710,6 +733,9 @@
     i?86-*-linux*)
        SIGNAL_HANDLER=include/i386-signal.h
        ;;
+    i?86-*-mingw*)
+       SIGNAL_HANDLER=include/win32-signal.h
+       ;;
     sparc-sun-solaris*)
        SIGNAL_HANDLER=include/sparc-signal.h
        ;;
@@ -718,6 +744,13 @@
        ;;
    esac
 fi
+
+case "${host}" in
+  i?86-*-mingw*)
+    AC_DEFINE(USE_WIN32_SIGNALLING)
+    AC_DEFINE(USE_WINSOCK)
+    ;;
+esac
 
 AC_LINK_FILES($SIGNAL_HANDLER, include/java-signal.h)
 
Index: libjava/include/config.h.in
===================================================================
RCS file: /cvs/java/libgcj/libjava/include/config.h.in,v
retrieving revision 1.22
diff -u -r1.22 config.h.in
--- config.h.in	2000/01/31 04:53:47	1.22
+++ config.h.in	2000/03/13 15:40:24
@@ -152,6 +152,12 @@
 /* Define if g++ has a bug preventing us from inlining math routines.  */
 #undef __NO_MATH_INLINES
 
+/* Define if using Win32 signalling. */
+#undef USE_WIN32_SIGNALLING
+
+/* Define if using Win32 winsock library. */
+#undef USE_WINSOCK
+
 /* Define if you have the access function.  */
 #undef HAVE_ACCESS
 
Index: zip/tailor.h
===================================================================
RCS file: /cvs/java/libgcj/zip/tailor.h,v
retrieving revision 1.1.1.1
diff -u -r1.1.1.1 tailor.h
--- tailor.h	1999/04/07 14:52:44	1.1.1.1
+++ tailor.h	2000/03/13 15:40:24
@@ -40,7 +40,7 @@
 #include "cmsmvs.h"
 #endif
 
-#ifdef WIN32
+#if defined(WIN32) && !defined(__MINGW32__)
 #include "win32/osdep.h"
 #endif
 
Index: zip/unix/osdep.h
===================================================================
RCS file: /cvs/java/libgcj/zip/unix/osdep.h,v
retrieving revision 1.1.1.1
diff -u -r1.1.1.1 osdep.h
--- osdep.h	1999/04/07 14:52:46	1.1.1.1
+++ osdep.h	2000/03/13 15:40:24
@@ -13,7 +13,7 @@
 
 #define USE_EF_UX_TIME          /* Enable use of "UX" extra field time info */
 
-#if defined (__CYGWIN__) || defined (__CYGWIN32__)
+#if defined (__CYGWIN__) || defined (__CYGWIN32__) || defined (__MINGW32__)
 #  define FOPW "wb"
 #  define FOPR "rb"
 #  define FOPM "r+b"

--------------BF9143A080526020AE83EA13--

From java-patches-return-562-listarch-java-patches=sourceware.cygnus.com@sourceware.cygnus.com Tue Mar 14 18:34:58 2000
Return-Path: <java-patches-return-562-listarch-java-patches=sourceware.cygnus.com@sourceware.cygnus.com>
Delivered-To: listarch-java-patches@sourceware.cygnus.com
Received: (qmail 17368 invoked by alias); 14 Mar 2000 18:34:58 -0000
Mailing-List: contact java-patches-help@sourceware.cygnus.com; run by ezmlm
Precedence: bulk
List-Subscribe: <mailto:java-patches-subscribe@sourceware.cygnus.com>
List-Archive: <http://sourceware.cygnus.com/ml/java-patches/>
List-Post: <mailto:java-patches@sourceware.cygnus.com>
List-Help: <mailto:java-patches-help@sourceware.cygnus.com>, <http://sourceware.cygnus.com/ml/#faqs>
Sender: java-patches-owner@sourceware.cygnus.com
Delivered-To: mailing list java-patches@sourceware.cygnus.com
Received: (qmail 17348 invoked from network); 14 Mar 2000 18:34:56 -0000
To: Java Patch List <java-patches@sourceware.cygnus.com> 
Subject: Patch: test for PR 174
X-Zippy:  Yes, Private DOBERMAN!!
X-Attribution:  Tom
Bcc:
Reply-To:  tromey@cygnus.com
From:  Tom Tromey <tromey@cygnus.com>
Date: 14 Mar 2000 11:37:52 -0700
Message-ID: <87d7oxxurj.fsf@cygnus.com>
Lines: 35
X-Mailer: Gnus v5.5/Emacs 20.3

I'm committing this patch, which adds a test for PR 174.

2000-03-14  Tom Tromey  <tromey@cygnus.com>

	* libjava.compile/pr174.java: New file, for PR gcj/174.

Tom

Index: libjava.compile/pr174.java
===================================================================
RCS file: pr174.java
diff -N pr174.java
--- /dev/null	Tue May  5 13:32:27 1998
+++ pr174.java	Tue Mar 14 10:33:56 2000
@@ -0,0 +1,20 @@
+class A
+{
+}
+
+public class Scope3
+{
+  public static void main(String args[])
+  {
+    new Scope3();
+  }
+
+  public Scope3()
+  {
+    A a = new A();
+  }
+
+  class A
+  {
+  }
+}

From java-patches-return-563-listarch-java-patches=sourceware.cygnus.com@sourceware.cygnus.com Tue Mar 14 18:37:22 2000
Return-Path: <java-patches-return-563-listarch-java-patches=sourceware.cygnus.com@sourceware.cygnus.com>
Delivered-To: listarch-java-patches@sourceware.cygnus.com
Received: (qmail 18266 invoked by alias); 14 Mar 2000 18:37:22 -0000
Mailing-List: contact java-patches-help@sourceware.cygnus.com; run by ezmlm
Precedence: bulk
List-Subscribe: <mailto:java-patches-subscribe@sourceware.cygnus.com>
List-Archive: <http://sourceware.cygnus.com/ml/java-patches/>
List-Post: <mailto:java-patches@sourceware.cygnus.com>
List-Help: <mailto:java-patches-help@sourceware.cygnus.com>, <http://sourceware.cygnus.com/ml/#faqs>
Sender: java-patches-owner@sourceware.cygnus.com
Delivered-To: mailing list java-patches@sourceware.cygnus.com
Received: (qmail 18241 invoked from network); 14 Mar 2000 18:37:20 -0000
To: Java Patch List <java-patches@sourceware.cygnus.com> 
Subject: Patch: test for PR 172
X-Zippy:  Do you have exactly what I want in a plaid poindexter bar bat??
X-Attribution:  Tom
Bcc:
Reply-To:  tromey@cygnus.com
From:  Tom Tromey <tromey@cygnus.com>
Date: 14 Mar 2000 11:40:16 -0700
Message-ID: <87bt4hxunj.fsf@cygnus.com>
Lines: 24
X-Mailer: Gnus v5.5/Emacs 20.3

I'm checking in this patch, which adds a test for PR 172.

2000-03-14  Tom Tromey  <tromey@cygnus.com>

	* libjava.compile/pr172.java: New file, for PR gcj/172.

Tom

Index: libjava.compile/pr172.java
===================================================================
RCS file: pr172.java
diff -N pr172.java
--- /dev/null	Tue May  5 13:32:27 1998
+++ pr172.java	Tue Mar 14 10:36:16 2000
@@ -0,0 +1,9 @@
+// jc1 (2.96 20000313) says "`A_Inner' not found"
+
+public class InnerConstructor
+{
+  class A_Inner
+  {
+    A_Inner (A_Inner i) {}
+  }
+}

From java-patches-return-564-listarch-java-patches=sourceware.cygnus.com@sourceware.cygnus.com Tue Mar 14 21:59:35 2000
Return-Path: <java-patches-return-564-listarch-java-patches=sourceware.cygnus.com@sourceware.cygnus.com>
Delivered-To: listarch-java-patches@sourceware.cygnus.com
Received: (qmail 10936 invoked by alias); 14 Mar 2000 21:59:34 -0000
Mailing-List: contact java-patches-help@sourceware.cygnus.com; run by ezmlm
Precedence: bulk
List-Subscribe: <mailto:java-patches-subscribe@sourceware.cygnus.com>
List-Archive: <http://sourceware.cygnus.com/ml/java-patches/>
List-Post: <mailto:java-patches@sourceware.cygnus.com>
List-Help: <mailto:java-patches-help@sourceware.cygnus.com>, <http://sourceware.cygnus.com/ml/#faqs>
Sender: java-patches-owner@sourceware.cygnus.com
Delivered-To: mailing list java-patches@sourceware.cygnus.com
Received: (qmail 10908 invoked from network); 14 Mar 2000 21:59:31 -0000
To: Java Patch List <java-patches@sourceware.cygnus.com> 
Subject: Patch: jni.cc fixes
X-Zippy:  My TOYOTA is built like a ... BAGEL with CREAM CHEESE!!
X-Attribution:  Tom
Bcc:
Reply-To:  tromey@cygnus.com
From:  Tom Tromey <tromey@cygnus.com>
Date: 14 Mar 2000 15:02:30 -0700
Message-ID: <878zzlxlah.fsf@cygnus.com>
Lines: 41
X-Mailer: Gnus v5.5/Emacs 20.3

This patch fixes a couple bugs that are revelead if you enable
assertions.  I'm checking it in.

2000-03-14  Tom Tromey  <tromey@cygnus.com>

	* jni.cc (mangled_name): Fixed assertion.
	(JNI_GetCreatedJavaVMs): Don't comment out `buf_len' argument;
	turned assert into actual failure.

Tom

Index: jni.cc
===================================================================
RCS file: /cvs/java/libgcj/libjava/jni.cc,v
retrieving revision 1.26
diff -u -r1.26 jni.cc
--- jni.cc	2000/03/07 19:55:24	1.26
+++ jni.cc	2000/03/14 21:57:27
@@ -1606,7 +1606,7 @@
 
   const unsigned char *sig = (const unsigned char *) signature->data;
   limit = sig + signature->length;
-  JvAssert (signature[0] == '(');
+  JvAssert (sig[0] == '(');
   ++sig;
   while (1)
     {
@@ -1958,9 +1958,11 @@
 }
 
 jint
-JNI_GetCreatedJavaVMs (JavaVM **vm_buffer, jsize /* buf_len */, jsize *n_vms)
+JNI_GetCreatedJavaVMs (JavaVM **vm_buffer, jsize buf_len, jsize *n_vms)
 {
-  JvAssert (buf_len > 0);
+  if (buf_len <= 0)
+    return JNI_ERR;
+
   // We only support a single VM.
   if (the_vm != NULL)
     {

From java-patches-return-565-listarch-java-patches=sourceware.cygnus.com@sourceware.cygnus.com Wed Mar 15 01:45:11 2000
Return-Path: <java-patches-return-565-listarch-java-patches=sourceware.cygnus.com@sourceware.cygnus.com>
Delivered-To: listarch-java-patches@sourceware.cygnus.com
Received: (qmail 10597 invoked by alias); 15 Mar 2000 01:45:10 -0000
Mailing-List: contact java-patches-help@sourceware.cygnus.com; run by ezmlm
Precedence: bulk
List-Subscribe: <mailto:java-patches-subscribe@sourceware.cygnus.com>
List-Archive: <http://sourceware.cygnus.com/ml/java-patches/>
List-Post: <mailto:java-patches@sourceware.cygnus.com>
List-Help: <mailto:java-patches-help@sourceware.cygnus.com>, <http://sourceware.cygnus.com/ml/#faqs>
Sender: java-patches-owner@sourceware.cygnus.com
Delivered-To: mailing list java-patches@sourceware.cygnus.com
Received: (qmail 10546 invoked from network); 15 Mar 2000 01:45:06 -0000
To: Java Patch List <java-patches@sourceware.cygnus.com> 
Subject: Patch: test for PR 140
X-Zippy:  You can't hurt me!!  I have an ASSUMABLE MORTGAGE!!
X-Attribution:  Tom
Bcc:
Reply-To:  tromey@cygnus.com
From:  Tom Tromey <tromey@cygnus.com>
Date: 14 Mar 2000 18:48:08 -0700
Message-ID: <87u2i9vw9z.fsf@cygnus.com>
Lines: 29
X-Mailer: Gnus v5.5/Emacs 20.3

I'm checking in this test for PR 140.

2000-03-14  Tom Tromey  <tromey@cygnus.com>

	* libjava.compile/PR140.java: New file, for PR gcj/140.


Tom

Index: libjava.compile/PR140.java
===================================================================
RCS file: PR140.java
diff -N PR140.java
--- /dev/null	Tue May  5 13:32:27 1998
+++ PR140.java	Tue Mar 14 17:44:32 2000
@@ -0,0 +1,13 @@
+public class PR140 {
+  public static void fill(int[] a) {
+    for (int i = 0; i < a.length; i++) {
+      a[i] = i;
+    }
+  }
+  public static void main(String[] args) {
+    int[] a = new int[3];
+    fill(a);
+    a.length = 3000;
+    fill(a);
+  }
+}

From java-patches-return-566-listarch-java-patches=sourceware.cygnus.com@sourceware.cygnus.com Wed Mar 15 03:15:54 2000
Return-Path: <java-patches-return-566-listarch-java-patches=sourceware.cygnus.com@sourceware.cygnus.com>
Delivered-To: listarch-java-patches@sourceware.cygnus.com
Received: (qmail 24999 invoked by alias); 15 Mar 2000 03:15:54 -0000
Mailing-List: contact java-patches-help@sourceware.cygnus.com; run by ezmlm
Precedence: bulk
List-Subscribe: <mailto:java-patches-subscribe@sourceware.cygnus.com>
List-Archive: <http://sourceware.cygnus.com/ml/java-patches/>
List-Post: <mailto:java-patches@sourceware.cygnus.com>
List-Help: <mailto:java-patches-help@sourceware.cygnus.com>, <http://sourceware.cygnus.com/ml/#faqs>
Sender: java-patches-owner@sourceware.cygnus.com
Delivered-To: mailing list java-patches@sourceware.cygnus.com
Received: (qmail 24980 invoked from network); 15 Mar 2000 03:15:49 -0000
Message-ID: <38CF0151.B9D28F2F@albatross.co.nz>
Date: Wed, 15 Mar 2000 16:19:45 +1300
From: Bryce McKinlay <bryce@albatross.co.nz>
X-Mailer: Mozilla 4.7 [en] (X11; U; Linux 2.3.25 i686)
X-Accept-Language: en
MIME-Version: 1.0
To: java-patches@sourceware.cygnus.com
Subject: Patch: Correct PR 172 & 174 class names
Content-Type: multipart/mixed;
 boundary="------------C038034D47E9F0261476CEFF"

This is a multi-part message in MIME format.
--------------C038034D47E9F0261476CEFF
Content-Type: text/plain; charset=us-ascii
Content-Transfer-Encoding: 7bit

I checked this in.


--------------C038034D47E9F0261476CEFF
Content-Type: text/plain; charset=us-ascii;
 name="pr174.patch"
Content-Transfer-Encoding: 7bit
Content-Disposition: inline;
 filename="pr174.patch"

Index: libjava.compile/pr172.java
===================================================================
RCS file: /cvs/java/libgcj/libjava/testsuite/libjava.compile/pr172.java,v
retrieving revision 1.1
diff -u -r1.1 pr172.java
--- pr172.java	2000/03/14 18:37:18	1.1
+++ pr172.java	2000/03/15 03:13:50
@@ -1,6 +1,6 @@
 // jc1 (2.96 20000313) says "`A_Inner' not found"
 
-public class InnerConstructor
+public class pr172
 {
   class A_Inner
   {
Index: libjava.compile/pr174.java
===================================================================
RCS file: /cvs/java/libgcj/libjava/testsuite/libjava.compile/pr174.java,v
retrieving revision 1.1
diff -u -r1.1 pr174.java
--- pr174.java	2000/03/14 18:35:02	1.1
+++ pr174.java	2000/03/15 03:13:50
@@ -2,14 +2,9 @@
 {
 }
 
-public class Scope3
+public class pr174
 {
-  public static void main(String args[])
-  {
-    new Scope3();
-  }
-
-  public Scope3()
+  public pr174()
   {
     A a = new A();
   }

--------------C038034D47E9F0261476CEFF--

From java-patches-return-567-listarch-java-patches=sourceware.cygnus.com@sourceware.cygnus.com Wed Mar 15 03:26:27 2000
Return-Path: <java-patches-return-567-listarch-java-patches=sourceware.cygnus.com@sourceware.cygnus.com>
Delivered-To: listarch-java-patches@sourceware.cygnus.com
Received: (qmail 25892 invoked by alias); 15 Mar 2000 03:26:27 -0000
Mailing-List: contact java-patches-help@sourceware.cygnus.com; run by ezmlm
Precedence: bulk
List-Subscribe: <mailto:java-patches-subscribe@sourceware.cygnus.com>
List-Archive: <http://sourceware.cygnus.com/ml/java-patches/>
List-Post: <mailto:java-patches@sourceware.cygnus.com>
List-Help: <mailto:java-patches-help@sourceware.cygnus.com>, <http://sourceware.cygnus.com/ml/#faqs>
Sender: java-patches-owner@sourceware.cygnus.com
Delivered-To: mailing list java-patches@sourceware.cygnus.com
Received: (qmail 25872 invoked from network); 15 Mar 2000 03:26:26 -0000
Message-ID: <38CF03CE.2528BA50@albatross.co.nz>
Date: Wed, 15 Mar 2000 16:30:22 +1300
From: Bryce McKinlay <bryce@albatross.co.nz>
X-Mailer: Mozilla 4.7 [en] (X11; U; Linux 2.3.25 i686)
X-Accept-Language: en
MIME-Version: 1.0
To: java-patches@sourceware.cygnus.com
Subject: Patch: PR140 "shouldfail"
Content-Type: text/plain; charset=us-ascii
Content-Transfer-Encoding: 7bit

I checked in an xfail "shouldfail" file for the PR140 Test case:

        * libjava.compile/PR140.xfail: New file.

From java-patches-return-568-listarch-java-patches=sourceware.cygnus.com@sourceware.cygnus.com Wed Mar 15 04:06:10 2000
Return-Path: <java-patches-return-568-listarch-java-patches=sourceware.cygnus.com@sourceware.cygnus.com>
Delivered-To: listarch-java-patches@sourceware.cygnus.com
Received: (qmail 32748 invoked by alias); 15 Mar 2000 04:06:10 -0000
Mailing-List: contact java-patches-help@sourceware.cygnus.com; run by ezmlm
Precedence: bulk
List-Subscribe: <mailto:java-patches-subscribe@sourceware.cygnus.com>
List-Archive: <http://sourceware.cygnus.com/ml/java-patches/>
List-Post: <mailto:java-patches@sourceware.cygnus.com>
List-Help: <mailto:java-patches-help@sourceware.cygnus.com>, <http://sourceware.cygnus.com/ml/#faqs>
Sender: java-patches-owner@sourceware.cygnus.com
Delivered-To: mailing list java-patches@sourceware.cygnus.com
Received: (qmail 32712 invoked from network); 15 Mar 2000 04:06:10 -0000
Date: Tue, 14 Mar 2000 20:06:05 -0800 (PST)
Message-Id: <200003150406.UAA13251@ferrule.cygnus.com>
From: Tom Tromey <tromey@cygnus.com>
To: Bryce McKinlay <bryce@albatross.co.nz>
Cc: java-patches@sourceware.cygnus.com
Subject: Re: Patch: PR140 "shouldfail"
In-Reply-To: <38CF03CE.2528BA50@albatross.co.nz>
References: <38CF03CE.2528BA50@albatross.co.nz>
X-Zippy:  If a person is FAMOUS in this country, they have to go on the ROAD
 for MONTHS at a time and have their name misspelled on the SIDE
 of a GREYHOUND SCENICRUISER!!
X-Attribution:  Tom

Bryce> I checked in an xfail "shouldfail" file for the PR140 Test case:

Thanks Bryce.
I'll be more careful about this in the future.

Tom



From java-patches-return-569-listarch-java-patches=sourceware.cygnus.com@sourceware.cygnus.com Wed Mar 15 16:36:35 2000
Return-Path: <java-patches-return-569-listarch-java-patches=sourceware.cygnus.com@sourceware.cygnus.com>
Delivered-To: listarch-java-patches@sourceware.cygnus.com
Received: (qmail 12993 invoked by alias); 15 Mar 2000 16:36:34 -0000
Mailing-List: contact java-patches-help@sourceware.cygnus.com; run by ezmlm
Precedence: bulk
List-Subscribe: <mailto:java-patches-subscribe@sourceware.cygnus.com>
List-Archive: <http://sourceware.cygnus.com/ml/java-patches/>
List-Post: <mailto:java-patches@sourceware.cygnus.com>
List-Help: <mailto:java-patches-help@sourceware.cygnus.com>, <http://sourceware.cygnus.com/ml/#faqs>
Sender: java-patches-owner@sourceware.cygnus.com
Delivered-To: mailing list java-patches@sourceware.cygnus.com
Received: (qmail 12955 invoked from network); 15 Mar 2000 16:36:32 -0000
To: Java Patch List <java-patches@sourceware.cygnus.com> 
Subject: Patch: pr 176
X-Zippy:  With YOU, I can be MYSELF..  We don't NEED Dan Rather..
X-Attribution:  Tom
Bcc:
Reply-To:  tromey@cygnus.com
From:  Tom Tromey <tromey@cygnus.com>
Date: 15 Mar 2000 09:39:43 -0700
Message-ID: <87n1o0w5kg.fsf@cygnus.com>
Lines: 33
X-Mailer: Gnus v5.5/Emacs 20.3

I'm checking in this test case for PR 176.
This time I actually tried compiling it, so now it will be really
embarrassing when the inevitable mistake is found.

2000-03-15  Tom Tromey  <tromey@cygnus.com>

	* libjava.compile/pr176.java: New file, for PR gcj/176.


Tom

Index: libjava.compile/pr176.java
===================================================================
RCS file: pr176.java
diff -N pr176.java
--- /dev/null	Tue May  5 13:32:27 1998
+++ pr176.java	Wed Mar 15 08:33:10 2000
@@ -0,0 +1,15 @@
+// gcj (20000313) reports "Type `x' not found in the declaration of the
+// return type of method `getX'."
+
+public class pr176
+{
+  class A
+  {
+    x getX()
+    {
+      return new x();
+    }
+
+    class x {}
+  }
+}

From java-patches-return-570-listarch-java-patches=sourceware.cygnus.com@sourceware.cygnus.com Wed Mar 15 21:58:10 2000
Return-Path: <java-patches-return-570-listarch-java-patches=sourceware.cygnus.com@sourceware.cygnus.com>
Delivered-To: listarch-java-patches@sourceware.cygnus.com
Received: (qmail 6354 invoked by alias); 15 Mar 2000 21:58:10 -0000
Mailing-List: contact java-patches-help@sourceware.cygnus.com; run by ezmlm
Precedence: bulk
List-Subscribe: <mailto:java-patches-subscribe@sourceware.cygnus.com>
List-Archive: <http://sourceware.cygnus.com/ml/java-patches/>
List-Post: <mailto:java-patches@sourceware.cygnus.com>
List-Help: <mailto:java-patches-help@sourceware.cygnus.com>, <http://sourceware.cygnus.com/ml/#faqs>
Sender: java-patches-owner@sourceware.cygnus.com
Delivered-To: mailing list java-patches@sourceware.cygnus.com
Received: (qmail 6329 invoked from network); 15 Mar 2000 21:58:10 -0000
Date: Wed, 15 Mar 2000 13:58:06 -0800 (PST)
Message-Id: <200003152158.NAA22363@ferrule.cygnus.com>
From: Tom Tromey <tromey@cygnus.com>
To: "Jon Beniston" <jb7216@bristol.ac.uk>
Cc: <java-patches@sourceware.cygnus.com>
Subject: Re: Win32 bits and bobs
In-Reply-To: <005a01bf809b$999331b0$010010ac@brookfield.net>
References: <005a01bf809b$999331b0$010010ac@brookfield.net>
X-Zippy:  I don't know WHY I said that..  I think it came from the FILLINGS
 in my rear molars..
X-Attribution:  Tom

>>>>> "Jon" == Jon Beniston <jb7216@bristol.ac.uk> writes:

Jon> Here's most of the code required for Win32 compatibility.

Thanks Jon.  I'll be checking this in soon.

I do have some concerns, though.  I think these should be addressed as
soon as possible.  I do think this port is important, though, so I'm
checking it in even though it isn't "perfect".

First, I'd like to understand the current Windows exception handling
code that is in there.  Can you explain it to me?  What does the
current code mean, and why do we have to do it that way?  I'm
particularly confused by (& concerned about) win32_get_restart_frame().

Second, I'm interested in seeing if we can find a way to make a nicer
abstract API to the signal handling code, so that the Windows and
POSIX ports don't need Windows-specific stuff in prims.cc.

Tom

From java-patches-return-571-listarch-java-patches=sourceware.cygnus.com@sourceware.cygnus.com Wed Mar 15 22:00:34 2000
Return-Path: <java-patches-return-571-listarch-java-patches=sourceware.cygnus.com@sourceware.cygnus.com>
Delivered-To: listarch-java-patches@sourceware.cygnus.com
Received: (qmail 7777 invoked by alias); 15 Mar 2000 22:00:34 -0000
Mailing-List: contact java-patches-help@sourceware.cygnus.com; run by ezmlm
Precedence: bulk
List-Subscribe: <mailto:java-patches-subscribe@sourceware.cygnus.com>
List-Archive: <http://sourceware.cygnus.com/ml/java-patches/>
List-Post: <mailto:java-patches@sourceware.cygnus.com>
List-Help: <mailto:java-patches-help@sourceware.cygnus.com>, <http://sourceware.cygnus.com/ml/#faqs>
Sender: java-patches-owner@sourceware.cygnus.com
Delivered-To: mailing list java-patches@sourceware.cygnus.com
Received: (qmail 7752 invoked from network); 15 Mar 2000 22:00:33 -0000
Date: Wed, 15 Mar 2000 14:00:23 -0800 (PST)
Message-Id: <200003152200.OAA22366@ferrule.cygnus.com>
From: Tom Tromey <tromey@cygnus.com>
To: Jeff Sturm <jsturm@sigma6.com>
Cc: Jon Beniston <jb7216@bristol.ac.uk>, java-patches@sourceware.cygnus.com
Subject: Re: Win32 bits and bobs
In-Reply-To: <38B96571.CC5927D3@sigma6.com>
References: <005a01bf809b$999331b0$010010ac@brookfield.net>
	<38B96571.CC5927D3@sigma6.com>
X-Zippy:  My BIOLOGICAL ALARM CLOCK just went off..  It has noiseless
 DOZE FUNCTION and full kitchen!!
X-Attribution:  Tom

>>>>> "Jeff" == Jeff Sturm <jsturm@sigma6.com> writes:

Jeff> (I don't see anything for java.lang.Process; I assume this isn't
Jeff> yet working?)

Jeff, thanks a lot for doing this.  It made the review process much
simpler for me.  I really appreciate it.

Tom

From java-patches-return-572-listarch-java-patches=sourceware.cygnus.com@sourceware.cygnus.com Wed Mar 15 22:02:27 2000
Return-Path: <java-patches-return-572-listarch-java-patches=sourceware.cygnus.com@sourceware.cygnus.com>
Delivered-To: listarch-java-patches@sourceware.cygnus.com
Received: (qmail 8904 invoked by alias); 15 Mar 2000 22:02:27 -0000
Mailing-List: contact java-patches-help@sourceware.cygnus.com; run by ezmlm
Precedence: bulk
List-Subscribe: <mailto:java-patches-subscribe@sourceware.cygnus.com>
List-Archive: <http://sourceware.cygnus.com/ml/java-patches/>
List-Post: <mailto:java-patches@sourceware.cygnus.com>
List-Help: <mailto:java-patches-help@sourceware.cygnus.com>, <http://sourceware.cygnus.com/ml/#faqs>
Sender: java-patches-owner@sourceware.cygnus.com
Delivered-To: mailing list java-patches@sourceware.cygnus.com
Received: (qmail 8614 invoked from network); 15 Mar 2000 22:02:09 -0000
To: Java Patch List <java-patches@sourceware.cygnus.com> 
Subject: Patch: partial Windows port
X-Zippy:  I want to TAKE IT HOME and DRESS IT UP in HOT PANTS!!
X-Attribution:  Tom
Bcc:
Reply-To:  tromey@cygnus.com
From:  Tom Tromey <tromey@cygnus.com>
Date: 15 Mar 2000 15:05:15 -0700
Message-ID: <87g0trx52c.fsf@cygnus.com>
Lines: 1199
X-Mailer: Gnus v5.5/Emacs 20.3

I'm checking in the appended patch.  Jon Beniston wrote the real
patch; I just added a couple minor tweaks.  I have not built this on a
Windows box, but I did verify that the change doesn't break my Linux
build (:-).

Jon says it might not actually build on Windows.  It is known to be
incomplete (Process isn't implemented and interruptable I/O doesn't
work, at least).

Special thanks to Jeff Sturm for turning Jon's contribution into an
actual patch.

2000-03-15  Tom Tromey  <tromey@cygnus.com>

	* java/io/natFileDescriptorWin32.cc (winerr): Now static.

	* prims.cc (win32_exception_handler): Reformatted.

	* include/win32-threads.h (_Jv_HaveCondDestroy): New define.
	(_Jv_HaveMutexDestroy): Likewise.

2000-03-15 Jon Beniston <jb7216@bristol.ac.uk>

	* java/io/natFileDescriptorWin32.cc: New file.
	* java/io/natFileWin32.cc: New file.
	* java/net/natInetAddress.cc: Added conditional inclusion of
	Windows / Winsock headers.
	* java/net/natPlainDatagramSocketImpl.cc: Added conditional
	inclusion of Windows / Winsock headers.
	* java/net/natPlainSocketImpl.cc: Added conditional inclusion of
	Windows / Winsock headers.
	* include/win32-signal.h: New file.
	* include/win32-threads.h: New file.
	* win32-threads.cc: New file.
	* exception.cc (win32_get_restart_frame): New function.
	* prims.cc (win32_exception_handler): New function.
	(main_init) Performs Winsock initialisation.
	(main_init) Installs exeception handler.


Tom

Index: exception.cc
===================================================================
RCS file: /cvs/java/libgcj/libjava/exception.cc,v
retrieving revision 1.8
diff -u -r1.8 exception.cc
--- exception.cc	2000/03/07 19:55:24	1.8
+++ exception.cc	2000/03/15 21:51:49
@@ -37,8 +37,8 @@
 extern "C" void __sjthrow () __attribute__ ((__noreturn__));
 extern "C" short __get_eh_table_version (void *table);
 extern "C" short __get_eh_table_language (void *table);
+extern "C" void *__get_eh_context ();
 
-
 extern "C" void *
 _Jv_type_matcher (java_eh_info *info, void* match_info, 
 		  void *exception_table)
@@ -161,3 +161,36 @@
   __throw ();
 #endif
 }
+
+#ifdef USE_WIN32_SIGNALLING
+
+// This is a mangled version of _Jv_Throw and __sjthrow except
+// rather than calling longjmp, it returns a pointer to the jmp buffer
+
+extern "C" int *
+win32_get_restart_frame (void *value)
+{
+  struct eh_context *eh = (struct eh_context *)__get_eh_context ();
+  void ***dhc = &eh->dynamic_handler_chain;
+ 
+  java_eh_info *ehinfo = *(__get_eh_info ());
+  if (ehinfo == NULL)
+    {
+      _Jv_eh_alloc ();
+      ehinfo = *(__get_eh_info ());
+    }
+  ehinfo->eh_info.match_function = (__eh_matcher) _Jv_type_matcher;
+  ehinfo->eh_info.language = EH_LANG_Java;
+  ehinfo->eh_info.version = 1;
+  ehinfo->value = value;
+
+  // FIXME: Run clean ups?
+
+  int *jmpbuf = (int*)&(*dhc)[2];
+
+  *dhc = (void**)(*dhc)[0];
+
+  return  jmpbuf;
+}
+
+#endif /* USE_WIN32_SIGNALLING */
Index: prims.cc
===================================================================
RCS file: /cvs/java/libgcj/libjava/prims.cc,v
retrieving revision 1.23
diff -u -r1.23 prims.cc
--- prims.cc	2000/03/07 19:55:24	1.23
+++ prims.cc	2000/03/15 21:51:53
@@ -10,6 +10,15 @@
 
 #include <config.h>
 
+#ifdef USE_WIN32_SIGNALLING
+#include <windows.h>
+#endif /* USE_WIN32_SIGNALLING */
+
+#ifdef USE_WINSOCK
+#undef __INSIDE_CYGWIN__
+#include <winsock.h>
+#endif /* USE_WINSOCK */
+
 #include <stdlib.h>
 #include <stdarg.h>
 #include <stdio.h>
@@ -589,6 +598,32 @@
     }
 }
 
+#ifdef USE_WIN32_SIGNALLING
+
+extern "C" int* win32_get_restart_frame (void *);
+
+LONG CALLBACK
+win32_exception_handler (LPEXCEPTION_POINTERS e)
+{
+  int* setjmp_buf;
+  if (e->ExceptionRecord->ExceptionCode == EXCEPTION_ACCESS_VIOLATION)   
+    setjmp_buf = win32_get_restart_frame (nullp);
+  else if (e->ExceptionRecord->ExceptionCode == EXCEPTION_INT_DIVIDE_BY_ZERO)
+    setjmp_buf = win32_get_restart_frame (arithexception);
+  else
+    return EXCEPTION_CONTINUE_SEARCH;
+
+  e->ContextRecord->Ebp = setjmp_buf[0];
+  // FIXME: Why does i386-signal.h increment the PC here, do we need to do it?
+  e->ContextRecord->Eip = setjmp_buf[1];
+  // FIXME: Is this the stack pointer? Do we need it?
+  e->ContextRecord->Esp = setjmp_buf[2];
+
+  return EXCEPTION_CONTINUE_EXECUTION;
+}
+
+#endif
+
 static void
 main_init ()
 {
@@ -606,12 +641,24 @@
   LTDL_SET_PRELOADED_SYMBOLS ();
 #endif
 
-  // FIXME: we only want this on POSIX systems.
+#ifdef USE_WINSOCK
+  // Initialise winsock for networking
+  WSADATA data;
+  if (WSAStartup (MAKEWORD (1, 1), &data))
+      MessageBox (NULL, "Error initialising winsock library.", "Error", MB_OK | MB_ICONEXCLAMATION);
+#endif /* USE_WINSOCK */
+
+#ifdef USE_WIN32_SIGNALLING
+  // Install exception handler
+  SetUnhandledExceptionFilter (win32_exception_handler);
+#else
+  // We only want this on POSIX systems.
   struct sigaction act;
   act.sa_handler = SIG_IGN;
   sigemptyset (&act.sa_mask);
   act.sa_flags = 0;
   sigaction (SIGPIPE, &act, NULL);
+#endif /* USE_WIN32_SIGNALLING */
 
   _Jv_JNI_Init ();
 }
Index: win32-threads.cc
===================================================================
RCS file: win32-threads.cc
diff -N win32-threads.cc
--- /dev/null	Tue May  5 13:32:27 1998
+++ win32-threads.cc	Wed Mar 15 13:51:53 2000
@@ -0,0 +1,247 @@
+// win32-threads.cc - interface between libjava and Win32 threads.
+
+/* Copyright (C) 1998, 1999  Red Hat, Inc.
+
+   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 <config.h>
+
+// If we're using the Boehm GC, then we need to override some of the
+// thread primitives.  This is fairly gross.
+#ifdef HAVE_BOEHM_GC
+extern "C"
+{
+#include <boehm-config.h>
+#include <gc.h>
+};
+#endif /* HAVE_BOEHM_GC */
+
+#include <gcj/cni.h>
+#include <jvm.h>
+#include <java/lang/Thread.h>
+#include <java/lang/System.h>
+
+#include <errno.h>
+
+#ifndef ETIMEDOUT
+#define ETIMEDOUT 116
+#endif
+
+// This is used to implement thread startup.
+struct starter
+{
+  _Jv_ThreadStartFunc *method;
+  java::lang::Thread *object;
+  _Jv_Thread_t *data;
+};
+
+// Controls access to the variable below
+static HANDLE daemon_mutex;
+static HANDLE daemon_cond;
+// Number of non-daemon threads - _Jv_ThreadWait returns when this is 0
+static int non_daemon_count;
+
+// TLS key get Java object representing the thread
+DWORD _Jv_ThreadKey;
+// TLS key to get _Jv_Thread_t* representing the thread
+DWORD _Jv_ThreadDataKey;
+
+//
+// These are the flags that can appear in _Jv_Thread_t.
+//
+
+// Thread started.
+#define FLAG_START   0x01
+// Thread is daemon.
+#define FLAG_DAEMON  0x02
+
+//
+// Condition variables.
+//
+
+int
+_Jv_CondWait (_Jv_ConditionVariable_t *cv, _Jv_Mutex_t *mu, jlong millis, jint nanos)
+{
+  DWORD time;
+  DWORD rval;
+
+  _Jv_MutexUnlock (mu);
+
+  if((millis == 0) && (nanos > 0))
+    time = 1;
+  else if(millis == 0)
+    time = INFINITE;
+  else
+    time = millis;
+
+  rval = WaitForSingleObject (*cv, time);
+  _Jv_MutexLock (mu);
+
+  if (rval == WAIT_FAILED)
+    return GetLastError ();       // FIXME: Map to errno?
+  else if (rval == WAIT_TIMEOUT)
+    return ETIMEDOUT;
+  else
+    return 0;
+}
+
+//
+// Mutexes.
+//
+
+int
+_Jv_MutexLock (_Jv_Mutex_t *mu)
+{
+  DWORD rval;
+
+  // FIXME: Are Win32 mutexs recursive? Should we use critical section objects
+  rval = WaitForSingleObject (*mu, INFINITE);
+
+  if (rval == WAIT_FAILED)
+    return GetLastError ();       // FIXME: Map to errno?
+  else if (rval == WAIT_TIMEOUT)
+    return ETIMEDOUT;
+  else
+    return 0;
+}
+
+//
+// Threads.
+//
+
+void
+_Jv_InitThreads (void)
+{
+  _Jv_ThreadKey = TlsAlloc();
+  _Jv_ThreadDataKey = TlsAlloc();
+  daemon_mutex = CreateMutex(NULL, 0, NULL);
+  daemon_cond = CreateEvent(NULL, 0, 0, NULL);
+  non_daemon_count = 0;
+}
+
+void
+_Jv_ThreadInitData (_Jv_Thread_t **data, java::lang::Thread *)
+{
+  _Jv_Thread_t *info = new _Jv_Thread_t;
+  info->flags = 0;
+
+  // FIXME register a finalizer for INFO here.
+  // FIXME also must mark INFO somehow.
+
+  *data = info;
+}
+
+void
+_Jv_ThreadSetPriority (_Jv_Thread_t *data, jint prio)
+{
+  int actual = THREAD_PRIORITY_NORMAL;
+
+  if (data->flags & FLAG_START)
+    {
+      switch (prio)
+        {
+          case 10:
+            actual = THREAD_PRIORITY_TIME_CRITICAL;
+            break;
+          case 9:
+            actual = THREAD_PRIORITY_HIGHEST;
+            break;
+          case 8:
+          case 7:
+            actual = THREAD_PRIORITY_ABOVE_NORMAL;
+            break;
+          case 6:
+          case 5:
+            actual = THREAD_PRIORITY_NORMAL;
+            break;
+          case 4:
+          case 3:
+            actual = THREAD_PRIORITY_BELOW_NORMAL;
+            break;
+          case 2:
+            actual = THREAD_PRIORITY_LOWEST;
+            break;
+          case 1:
+            actual = THREAD_PRIORITY_IDLE;
+            break;
+        }
+      SetThreadPriority(data->handle, actual);
+    }
+}
+
+// This function is called when a thread is started.  We don't arrange
+// to call the `run' method directly, because this function must
+// return a value.
+static DWORD __stdcall
+really_start (void* x)
+{
+  struct starter *info = (struct starter *) x;
+
+  TlsSetValue (_Jv_ThreadKey, info->object);
+  TlsSetValue (_Jv_ThreadDataKey, info->data);
+  info->method (info->object);
+
+  if (! (info->data->flags & FLAG_DAEMON))
+    {
+      WaitForSingleObject (daemon_mutex, INFINITE);
+      non_daemon_count--;
+      if (! non_daemon_count)
+          PulseEvent (daemon_cond);
+      ReleaseMutex (daemon_mutex);
+    }
+
+  return 0;
+}
+
+void
+_Jv_ThreadStart (java::lang::Thread *thread, _Jv_Thread_t *data, _Jv_ThreadStartFunc *meth)
+{
+  DWORD id;
+  struct starter *info;
+
+  // Do nothing if thread has already started
+  if (data->flags & FLAG_START)
+    return;
+  data->flags |= FLAG_START;
+
+  // FIXME: handle marking the info object for GC.
+  info = (struct starter *) _Jv_AllocBytes (sizeof (struct starter));
+  info->method = meth;
+  info->object = thread;
+  info->data = data;
+
+  if (! thread->isDaemon ())
+    {
+      WaitForSingleObject (daemon_mutex, INFINITE);
+      non_daemon_count++;
+      ReleaseMutex (daemon_mutex);
+    }
+  else
+    data->flags |= FLAG_DAEMON;
+
+  HANDLE h = CreateThread(NULL, 0, really_start, info, 0, &id);
+  _Jv_ThreadSetPriority(data, thread->getPriority());
+
+  //if (!h)
+    //JvThrow ();
+}
+
+void
+_Jv_ThreadWait (void)
+{
+  WaitForSingleObject(daemon_mutex, INFINITE);
+  if(non_daemon_count)
+      SignalObjectAndWait(daemon_mutex, daemon_cond, INFINITE, 0);
+  ReleaseMutex(daemon_mutex);
+}
+
+void
+_Jv_ThreadInterrupt (_Jv_Thread_t *data)
+{
+  MessageBox(NULL, "Unimplemented", "win32-threads.cc:_Jv_ThreadInterrupt", MB_OK);
+  // FIXME:
+}
Index: include/win32-signal.h
===================================================================
RCS file: win32-signal.h
diff -N win32-signal.h
--- /dev/null	Tue May  5 13:32:27 1998
+++ win32-signal.h	Wed Mar 15 13:51:53 2000
@@ -0,0 +1,43 @@
+// win32-signal.h - Catch runtime signals and turn them into exceptions.
+
+/* Copyright (C) 1998, 1999  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.  */
+
+// Exception handling is done totally differently on Win32 this stuff
+// just keeps it compatible
+
+#ifndef JAVA_SIGNAL_H
+#define JAVA_SIGNAL_H 1
+
+#define HANDLE_SEGV 1
+#define HANDLE_FPE 1
+
+#define SIGNAL_HANDLER(_name)	\
+static void _name (int _dummy)
+
+#define MAKE_THROW_FRAME    do {} while (0)
+#define HANDLE_DIVIDE_OVERFLOW	do {} while (0)
+
+#define INIT_SEGV						\
+do								\
+  {								\
+    nullp = new java::lang::NullPointerException ();		\
+  }								\
+while (0)
+
+
+#define INIT_FPE						\
+do								\
+  {								\
+    arithexception = new java::lang::ArithmeticException 	\
+      (JvNewStringLatin1 ("/ by zero"));			\
+  }								\
+while (0)
+
+
+#endif /* JAVA_SIGNAL_H */
Index: include/win32-threads.h
===================================================================
RCS file: win32-threads.h
diff -N win32-threads.h
--- /dev/null	Tue May  5 13:32:27 1998
+++ win32-threads.h	Wed Mar 15 13:51:53 2000
@@ -0,0 +1,138 @@
+// -*- c++ -*-
+// win32-threads.h - Defines for using Win32 threads.
+
+/* Copyright (C) 1998, 1999, 2000  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.  */
+
+#ifndef __JV_WIN32_THREADS__
+#define __JV_WIN32_THREADS__
+
+#include <windows.h>
+
+//
+// Typedefs.
+//
+
+typedef HANDLE _Jv_ConditionVariable_t;
+typedef HANDLE _Jv_Mutex_t;
+
+typedef struct
+{
+  int flags;            // Flags are defined in implementation.
+  HANDLE handle;        // Actual handle to the thread
+} _Jv_Thread_t;
+
+typedef void _Jv_ThreadStartFunc (java::lang::Thread *);
+
+//
+// Condition variables.
+//
+
+inline void
+_Jv_CondInit (_Jv_ConditionVariable_t *cv)
+{
+  *cv = CreateEvent (NULL, 0, 0, NULL);
+}
+
+#define _Jv_HaveCondDestroy
+
+inline void
+_Jv_CondDestroy (_Jv_ConditionVariable_t *cv)
+{
+  CloseHandle (*cv);
+  cv = NULL;
+}
+
+int _Jv_CondWait (_Jv_ConditionVariable_t *cv, _Jv_Mutex_t *mu,
+		  jlong millis, jint nanos);
+
+inline int
+_Jv_CondNotify (_Jv_ConditionVariable_t *cv, _Jv_Mutex_t *)
+{
+  return PulseEvent (*cv) ? 0 : GetLastError ();        // FIXME: Map error code?
+}
+
+inline int
+_Jv_CondNotifyAll (_Jv_ConditionVariable_t *cv, _Jv_Mutex_t *)
+{
+  return PulseEvent (*cv) ? 0 : GetLastError ();        // FIXME: Map error code?
+}
+
+//
+// Mutexes.
+//
+
+inline void
+_Jv_MutexInit (_Jv_Mutex_t *mu)
+{
+  *mu = CreateMutex (NULL, 0, NULL);
+}
+
+#define _Jv_HaveMutexDestroy
+
+inline void
+_Jv_MutexDestroy (_Jv_Mutex_t *mu)
+{
+  CloseHandle (*mu);
+  mu = NULL;
+}
+
+int _Jv_MutexLock (_Jv_Mutex_t *mu);
+
+inline int
+_Jv_MutexUnlock (_Jv_Mutex_t *mu)
+{
+  return ReleaseMutex(*mu) ? 0 : GetLastError();        // FIXME: Map error code?
+}
+
+//
+// Thread creation and manipulation.
+//
+
+void _Jv_InitThreads (void);
+void _Jv_ThreadInitData (_Jv_Thread_t **data, java::lang::Thread *thread);
+
+inline java::lang::Thread *
+_Jv_ThreadCurrent (void)
+{
+  extern DWORD _Jv_ThreadKey;
+  return (java::lang::Thread *) TlsGetValue(_Jv_ThreadKey);
+}
+
+inline _Jv_Thread_t *
+_Jv_ThreadCurrentData (void)
+{
+  extern DWORD _Jv_ThreadDataKey;
+  return (_Jv_Thread_t *) TlsGetValue(_Jv_ThreadDataKey);
+}
+
+inline void
+_Jv_ThreadYield (void)
+{
+  Sleep (0);
+}
+
+void _Jv_ThreadSetPriority (_Jv_Thread_t *data, jint prio);
+void _Jv_ThreadStart (java::lang::Thread *thread, _Jv_Thread_t *data,
+		      _Jv_ThreadStartFunc *meth);
+void _Jv_ThreadWait (void);
+void _Jv_ThreadInterrupt (_Jv_Thread_t *data);
+
+// Remove defines from <windows.h> that conflict with various things in libgcj code
+
+#undef TRUE
+#undef FALSE
+#undef MAX_PRIORITY
+#undef MIN_PRIORITY
+#undef min
+#undef max
+#undef interface
+#undef STRICT
+#undef VOID
+
+#endif /* __JV_WIN32_THREADS__ */
Index: java/io/natFileDescriptorWin32.cc
===================================================================
RCS file: natFileDescriptorWin32.cc
diff -N natFileDescriptorWin32.cc
--- /dev/null	Tue May  5 13:32:27 1998
+++ natFileDescriptorWin32.cc	Wed Mar 15 13:51:54 2000
@@ -0,0 +1,250 @@
+// natFileDescriptorWin32.cc - Native part of FileDescriptor class.
+
+/* Copyright (C) 1998, 1999, 2000  Red Hat, Inc.
+
+   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.  */
+
+// FIXME: In order to support interrupting of IO operations, we
+// need to change to use the windows asynchronous IO functions
+
+#include <config.h>
+
+#include <stdio.h>
+#include <string.h>
+
+#include <windows.h>
+
+#include <gcj/cni.h>
+#include <jvm.h>
+#include <java/io/FileDescriptor.h>
+#include <java/io/SyncFailedException.h>
+#include <java/io/IOException.h>
+#include <java/io/InterruptedIOException.h>
+#include <java/io/EOFException.h>
+#include <java/lang/ArrayIndexOutOfBoundsException.h>
+#include <java/lang/NullPointerException.h>
+#include <java/lang/String.h>
+#include <java/lang/Thread.h>
+#include <java/io/FileNotFoundException.h>
+
+static char *
+winerr (void)
+{
+  static LPVOID last = NULL;
+  LPVOID old = NULL;
+
+  if (last)
+    old = last;
+
+  FormatMessage (FORMAT_MESSAGE_ALLOCATE_BUFFER |
+    FORMAT_MESSAGE_FROM_SYSTEM |
+    FORMAT_MESSAGE_IGNORE_INSERTS,
+    NULL,
+    GetLastError(),
+    MAKELANGID(LANG_NEUTRAL, SUBLANG_DEFAULT),
+    (LPTSTR) &last,
+    0,
+    NULL);
+
+  if (old)
+    LocalFree (old);
+
+  return (char *)last;
+}
+
+jboolean
+java::io::FileDescriptor::valid (void) {
+  BY_HANDLE_FILE_INFORMATION info;
+  return GetFileInformationByHandle ((HANDLE)fd, &info) != 0;
+}
+
+void
+java::io::FileDescriptor::sync (void) {
+  if (! FlushFileBuffers ((HANDLE)fd))
+    JvThrow (new SyncFailedException (JvNewStringLatin1 (winerr ())));
+}
+
+jint
+java::io::FileDescriptor::open (jstring path, jint jflags) {
+
+  HANDLE handle = NULL;
+  DWORD access = 0;
+  DWORD share = FILE_SHARE_READ;
+  DWORD create = OPEN_EXISTING;
+  char buf[MAX_PATH] = "";
+
+  jsize total = JvGetStringUTFRegion(path, 0, path->length(), buf);
+  buf[total] = '\0';
+
+  JvAssert((jflags & READ) || (jflags & WRITE));
+
+  if ((jflags & READ) && (jflags & WRITE))
+    {
+      access = GENERIC_READ | GENERIC_WRITE;
+      share = 0;
+      if (jflags & APPEND)
+	create = OPEN_ALWAYS;
+      else
+	create = CREATE_ALWAYS;
+    }
+  else if(jflags & READ)
+    access = GENERIC_READ;
+  else
+    {
+      access = GENERIC_WRITE;
+      share = 0;
+      if (jflags & APPEND)
+	create = OPEN_ALWAYS;
+      else
+        create = CREATE_ALWAYS;
+    }
+
+  handle = CreateFile(buf, access, share, NULL, create, 0, NULL);
+
+  if (handle == INVALID_HANDLE_VALUE)
+    {
+      char msg[MAX_PATH + 1000];
+      sprintf (msg, "%s: %s", buf, winerr ());
+      JvThrow (new FileNotFoundException (JvNewStringLatin1 (msg)));
+    }
+
+  return (jint)handle;
+}
+
+void
+java::io::FileDescriptor::write (jint b)
+{
+  DWORD bytesWritten;
+  jbyte buf = (jbyte)b;
+
+  if (WriteFile ((HANDLE)fd, &buf, 1, &bytesWritten, NULL))
+    {
+      if (java::lang::Thread::interrupted())
+        {
+          InterruptedIOException *iioe = new InterruptedIOException (JvNewStringLatin1 ("write interrupted"));
+          iioe->bytesTransferred = bytesWritten;
+          JvThrow (iioe);
+        }
+      if (bytesWritten != 1)
+        JvThrow (new IOException (JvNewStringLatin1 (winerr ())));
+    }
+  else
+    JvThrow (new IOException (JvNewStringLatin1 (winerr ())));
+  // FIXME: loop until bytesWritten == 1
+}
+
+void
+java::io::FileDescriptor::write(jbyteArray b, jint offset, jint len)
+{
+  if (! b)
+    JvThrow (new java::lang::NullPointerException);
+  if(offset < 0 || len < 0 || offset + len > JvGetArrayLength (b))
+    JvThrow (new java::lang::ArrayIndexOutOfBoundsException);
+
+  jbyte *buf = elements (b) + offset;
+  DWORD bytesWritten;
+  if (WriteFile ((HANDLE)fd, buf, len, &bytesWritten, NULL))
+    {
+      if (java::lang::Thread::interrupted())
+        {
+          InterruptedIOException *iioe = new InterruptedIOException (JvNewStringLatin1 ("write interrupted"));
+          iioe->bytesTransferred = bytesWritten;
+          JvThrow (iioe);
+        }
+    }
+  else
+    JvThrow(new IOException (JvNewStringLatin1 (winerr ())));
+  // FIXME: loop until bytesWritten == len
+}
+
+void
+java::io::FileDescriptor::close (void)
+{
+  HANDLE save = (HANDLE)fd;
+  fd = (jint)INVALID_HANDLE_VALUE;
+  if (! CloseHandle (save))
+    JvThrow (new IOException (JvNewStringLatin1 (winerr ())));
+}
+
+jint
+java::io::FileDescriptor::seek (jlong pos, jint whence)
+{
+  JvAssert (whence == SET || whence == CUR);
+
+  jlong len = length();
+  jlong here = getFilePointer();
+
+  if ((whence == SET && pos > len) || (whence == CUR && here + pos > len))
+    JvThrow (new EOFException);
+
+  LONG high = pos >> 32;
+  DWORD low = SetFilePointer ((HANDLE)fd, (DWORD)(0xffffffff & pos), &high, whence == SET ? FILE_BEGIN : FILE_CURRENT);
+  if ((low == 0xffffffff) && (GetLastError () != NO_ERROR))
+    JvThrow (new IOException (JvNewStringLatin1 (winerr ())));
+  return low;
+}
+
+jlong
+java::io::FileDescriptor::getFilePointer(void)
+{
+  LONG high = 0;
+  DWORD low = SetFilePointer ((HANDLE)fd, 0, &high, FILE_CURRENT);
+  if ((low == 0xffffffff) && (GetLastError() != NO_ERROR))
+    JvThrow(new IOException (JvNewStringLatin1 (winerr ())));
+  return (((jlong)high) << 32L) | (jlong)low;
+}
+
+jlong
+java::io::FileDescriptor::length(void)
+{
+  DWORD high;
+  DWORD low;
+
+  low = GetFileSize ((HANDLE)fd, &high);
+  // FIXME: Error checking
+  return (((jlong)high) << 32L) | (jlong)low;
+}
+
+jint
+java::io::FileDescriptor::read(void)
+{
+  CHAR buf;
+  DWORD read;
+
+  if (! ReadFile ((HANDLE)fd, &buf, 1, &read, NULL))
+    JvThrow (new IOException (JvNewStringLatin1 (winerr ())));
+  if (! read)
+    return -1;
+  else
+    return (jint)(buf & 0xff);
+}
+
+jint
+java::io::FileDescriptor::read(jbyteArray buffer, jint offset, jint count)
+{
+  if (! buffer)
+    JvThrow(new java::lang::NullPointerException);
+
+  jsize bsize = JvGetArrayLength (buffer);
+  if (offset < 0 || count < 0 || offset + count > bsize)
+    JvThrow (new java::lang::ArrayIndexOutOfBoundsException);
+
+  jbyte *bytes = elements (buffer) + offset;
+
+  DWORD read;
+  if (! ReadFile((HANDLE)fd, bytes, count, &read, NULL))
+    JvThrow (new IOException (JvNewStringLatin1 (winerr ())));
+
+  return (jint)read;
+}
+
+jint
+java::io::FileDescriptor::available(void)
+{
+  // FIXME:
+  return length() - getFilePointer();
+}
Index: java/io/natFileWin32.cc
===================================================================
RCS file: natFileWin32.cc
diff -N natFileWin32.cc
--- /dev/null	Tue May  5 13:32:27 1998
+++ natFileWin32.cc	Wed Mar 15 13:51:54 2000
@@ -0,0 +1,210 @@
+// natFileWin32.cc - Native part of File class.
+
+/* Copyright (C) 1998, 1999  Red Hat, Inc.
+
+   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 <config.h>
+
+#include <stdio.h>
+#include <string.h>
+
+#include <windows.h>
+
+#include <gcj/cni.h>
+#include <jvm.h>
+#include <java/io/File.h>
+#include <java/io/IOException.h>
+#include <java/util/Vector.h>
+#include <java/lang/String.h>
+#include <java/io/FilenameFilter.h>
+#include <java/lang/System.h>
+
+jboolean
+java::io::File::access (jstring canon, jint query)
+{
+  if (! canon)
+    return false;
+  char buf[MAX_PATH];
+  jsize total = JvGetStringUTFRegion (canon, 0, canon->length(), buf);
+  // FIXME?
+  buf[total] = '\0';
+
+  JvAssert (query == READ || query == WRITE || query == EXISTS);
+
+  // FIXME: Is it possible to differentiate between existing and reading?
+  // If the file exists but cannot be read because of the secuirty attributes
+  // on an NTFS disk this wont work (it reports it can be read but cant)
+  // Could we use something from the security API?
+  DWORD attributes = GetFileAttributes (buf);
+  if ((query == EXISTS) || (query == READ))
+    return (attributes == 0xffffffff) ? false : true;
+  else
+    return ((attributes != 0xffffffff) && ((attributes & FILE_ATTRIBUTE_READONLY) == 0)) ? true : false;
+}
+
+jboolean
+java::io::File::stat (jstring canon, jint query)
+{
+  if (! canon)
+    return false;
+  char buf[MAX_PATH];
+  jsize total = JvGetStringUTFRegion (canon, 0, canon->length(), buf);
+  // FIXME?
+  buf[total] = '\0';
+
+  JvAssert (query == DIRECTORY || query == ISFILE);
+
+  DWORD attributes = GetFileAttributes (buf);
+  if (attributes == 0xffffffff)
+    return false;
+
+  if (query == DIRECTORY)
+    return attributes & FILE_ATTRIBUTE_DIRECTORY ? true : false;
+  else
+    return attributes & FILE_ATTRIBUTE_DIRECTORY ? false : true;
+}
+
+jlong
+java::io::File::attr (jstring canon, jint query)
+{
+  if (! canon)
+    return false;
+  char buf[MAX_PATH];
+  jsize total = JvGetStringUTFRegion (canon, 0, canon->length(), buf);
+  // FIXME?
+  buf[total] = '\0';
+
+  JvAssert (query == MODIFIED || query == LENGTH);
+
+  WIN32_FILE_ATTRIBUTE_DATA info;
+  if (! GetFileAttributesEx(buf, GetFileExInfoStandard, &info))
+    return 0;
+
+  if (query == LENGTH)
+    return ((long long)info.nFileSizeHigh) << 32 | (unsigned long long)info.nFileSizeLow;
+  else {
+    // FIXME? This is somewhat compiler dependant (the LL constant suffix)
+    // The file time as return by windows is the number of 100-nanosecond intervals since January 1, 1601
+    return (((((long long)info.ftLastWriteTime.dwHighDateTime) << 32) | ((unsigned long long)info.ftLastWriteTime.dwLowDateTime)) - 116444736000000000LL) / 10000LL;
+  }
+}
+
+jstring
+java::io::File::getCanonicalPath (void)
+{
+  char buf[MAX_PATH], buf2[MAX_PATH];
+  jsize total = JvGetStringUTFRegion (path, 0, path->length(), buf);
+  // FIXME?
+  buf[total] = '\0';
+
+  LPTSTR unused;
+  if(!GetFullPathName(buf, MAX_PATH, buf2, &unused))
+    _Jv_Throw (new IOException (JvNewStringLatin1 ("GetFullPathName failed")));
+
+  // FIXME: what encoding to assume for file names?  This affects many
+  // calls.
+  return JvNewStringUTF(buf2);
+}
+
+jboolean
+java::io::File::isAbsolute (void)
+{
+  if (path->charAt(0) == '/' || path->charAt(0) == '\\')
+    return true;
+  if (path->length() < 3)
+    return false;
+  // Hard-code A-Za-z because Windows (I think) can't use non-ASCII
+  // letters as drive names.
+  if ((path->charAt(0) < 'a' || path->charAt(0) > 'z')
+      && (path->charAt(0) < 'A' || path->charAt(0) > 'Z'))
+    return false;
+  return (path->charAt(1) == ':'
+	  && (path->charAt(2) == '/' || path->charAt(2) == '\\'));
+}
+
+jstringArray
+java::io::File::performList (jstring canon, FilenameFilter *filter)
+{
+  if (! canon)
+    return NULL;
+  char buf[MAX_PATH];
+  jsize total = JvGetStringUTFRegion (canon, 0, canon->length(), buf);
+  // FIXME?
+  strcpy(&buf[total], "\\*.*");
+
+  WIN32_FIND_DATA data;
+  HANDLE handle = FindFirstFile (buf, &data);
+  if (handle == INVALID_HANDLE_VALUE)
+    return NULL;
+
+  java::util::Vector *vec = new java::util::Vector ();
+
+  do
+    {
+      if (strcmp (data.cFileName, ".") && strcmp (data.cFileName, ".."))
+        {
+          jstring name = JvNewStringUTF (data.cFileName);
+          if (! filter || (filter && filter->accept(this, name)))
+            vec->addElement (name);
+        }
+    }
+  while (FindNextFile (handle, &data));
+
+  if (GetLastError () != ERROR_NO_MORE_FILES)
+    return NULL;
+
+  FindClose (handle);
+
+  jobjectArray ret = JvNewObjectArray (vec->size(), canon->getClass(), NULL);
+  vec->copyInto (ret);
+  return reinterpret_cast<jstringArray> (ret);
+}
+
+jboolean
+java::io::File::performMkdir (void)
+{
+  char buf[MAX_PATH];
+  jsize total = JvGetStringUTFRegion(path, 0, path->length(), buf);
+  // FIXME?
+  buf[total] = '\0';
+
+  return (CreateDirectory(buf, NULL)) ? true : false;
+}
+
+jboolean
+java::io::File::performRenameTo (File *dest)
+{
+  char buf[MAX_PATH];
+  jsize total = JvGetStringUTFRegion(path, 0, path->length(), buf);
+  // FIXME?
+  buf[total] = '\0';
+  char buf2[MAX_PATH];
+  total = JvGetStringUTFRegion(dest->path, 0, dest->path->length(), buf2);
+  // FIXME?
+  buf2[total] = '\0';
+
+  return (MoveFile(buf, buf2)) ? true : false;
+}
+
+jboolean
+java::io::File::performDelete (jstring canon)
+{
+  char buf[MAX_PATH];
+  jsize total = JvGetStringUTFRegion(canon, 0, canon->length(), buf);
+  // FIXME?
+  buf[total] = '\0';
+
+  DWORD attributes = GetFileAttributes (buf);
+  if (attributes == 0xffffffff)
+    return false;
+
+  if (attributes & FILE_ATTRIBUTE_DIRECTORY)
+    return (RemoveDirectory (buf)) ? true : false;
+  else
+    return (DeleteFile (buf)) ? true : false;
+}
Index: java/net/natInetAddress.cc
===================================================================
RCS file: /cvs/java/libgcj/libjava/java/net/natInetAddress.cc,v
retrieving revision 1.12
diff -u -r1.12 natInetAddress.cc
--- natInetAddress.cc	2000/03/07 19:55:27	1.12
+++ natInetAddress.cc	2000/03/15 21:51:56
@@ -14,6 +14,17 @@
 # define _REENTRANT 1
 #endif
 
+#ifdef USE_WINSOCK
+
+#include <windows.h>
+#include <winsock.h>
+
+#ifndef MAXHOSTNAMELEN
+#define MAXHOSTNAMELEN	64
+#endif /* MAXHOSTNAMELEN */
+
+#else
+
 #ifdef HAVE_UNISTD_H
 #include <unistd.h>
 #endif
@@ -34,6 +45,8 @@
 #ifdef HAVE_NETDB_H
 #include <netdb.h>
 #endif
+
+#endif /* USE_WINSOCK */
 
 #include <gcj/cni.h>
 #include <jvm.h>
Index: java/net/natPlainDatagramSocketImpl.cc
===================================================================
RCS file: /cvs/java/libgcj/libjava/java/net/natPlainDatagramSocketImpl.cc,v
retrieving revision 1.18
diff -u -r1.18 natPlainDatagramSocketImpl.cc
--- natPlainDatagramSocketImpl.cc	2000/03/07 19:55:27	1.18
+++ natPlainDatagramSocketImpl.cc	2000/03/15 21:51:57
@@ -8,6 +8,15 @@
 
 #include <config.h>
 
+#ifdef USE_WINSOCK
+#include <windows.h>
+#include <winsock.h>
+#include <errno.h>
+#include <string.h>
+#ifndef ENOPROTOOPT
+#define ENOPROTOOPT 109
+#endif
+#else /* USE_WINSOCK */
 #ifdef HAVE_SYS_TYPES_H
 #include <sys/types.h>
 #endif
@@ -26,6 +35,7 @@
 #endif
 #include <errno.h>
 #include <string.h>
+#endif /* USE_WINSOCK */
 
 #if HAVE_BSTRING_H
 // Needed for bzero, implicitly used by FD_ZERO on IRIX 5.2 
Index: java/net/natPlainSocketImpl.cc
===================================================================
RCS file: /cvs/java/libgcj/libjava/java/net/natPlainSocketImpl.cc,v
retrieving revision 1.17
diff -u -r1.17 natPlainSocketImpl.cc
--- natPlainSocketImpl.cc	2000/03/07 19:55:27	1.17
+++ natPlainSocketImpl.cc	2000/03/15 21:51:57
@@ -8,7 +8,17 @@
 
 #include <config.h>
 
+
 #ifndef DISABLE_JAVA_NET
+#ifdef USE_WINSOCK
+#include <windows.h>
+#include <winsock.h>
+#include <errno.h>
+#include <string.h>
+#ifndef ENOPROTOOPT
+#define ENOPROTOOPT 109
+#endif
+#else /* USE_WINSOCK */
 #include <sys/types.h>
 #include <sys/socket.h>
 #include <sys/time.h>
@@ -19,6 +29,7 @@
 #include <netinet/tcp.h>
 #include <errno.h>
 #include <string.h>
+#endif /* USE_WINSOCK */
 #endif /* DISABLE_JAVA_NET */
 
 #if HAVE_BSTRING_H

From java-patches-return-573-listarch-java-patches=sourceware.cygnus.com@sourceware.cygnus.com Wed Mar 15 22:16:50 2000
Return-Path: <java-patches-return-573-listarch-java-patches=sourceware.cygnus.com@sourceware.cygnus.com>
Delivered-To: listarch-java-patches@sourceware.cygnus.com
Received: (qmail 12044 invoked by alias); 15 Mar 2000 22:16:50 -0000
Mailing-List: contact java-patches-help@sourceware.cygnus.com; run by ezmlm
Precedence: bulk
List-Subscribe: <mailto:java-patches-subscribe@sourceware.cygnus.com>
List-Archive: <http://sourceware.cygnus.com/ml/java-patches/>
List-Post: <mailto:java-patches@sourceware.cygnus.com>
List-Help: <mailto:java-patches-help@sourceware.cygnus.com>, <http://sourceware.cygnus.com/ml/#faqs>
Sender: java-patches-owner@sourceware.cygnus.com
Delivered-To: mailing list java-patches@sourceware.cygnus.com
Received: (qmail 12016 invoked from network); 15 Mar 2000 22:16:47 -0000
To: java-patches@sourceware.cygnus.com
Subject: multilib(tool)bing 
From: Alexandre Oliva <oliva@lsd.ic.unicamp.br>
Date: 15 Mar 2000 19:16:22 -0300
Message-ID: <ork8j3hoax.fsf@garnize.lsd.ic.unicamp.br>
Lines: 23
User-Agent: Gnus/5.0803 (Gnus v5.8.3) XEmacs/21.1 (Canyonlands)
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="=-=-="

--=-=-=

Libtool drops most multilib-related flags from link command-lines.
This can only be properly worked around by using libtool from CVS and
adding `-Wc,' before each argument to be passed to the compiler driver
that would run the linker.  This would probably use some support from
automake, but even then, on some platforms, in which libtool runs the
linker directly, the flags would be dropped.  The only really clean
solution would be to try to arrange for the upcoming multi-language
libtool to deal with multilib-related flags too.  Maybe it already
does.

Meanwhile, I've been trying to come up with a simple solution that
would work on most cases.  Last time, I had posted an ugly and
pervasive patch for the top-level Makefile.in.  This time, I've come
up with a much simpler approach.  How do you like it?


--=-=-=
Content-Type: text/x-patch
Content-Disposition: inline; filename=multilibtool.patch

Index: ChangeLog
from  Alexandre Oliva  <oliva@lsd.ic.unicamp.br>
	
	* config-ml.in: For libtoolized multilibbed libraries, create
	a compiler wrapper to hide multilib-related flags from libtool.
	
Index: config-ml.in
===================================================================
RCS file: /cvs/java/libgcj/config-ml.in,v
retrieving revision 1.4
diff -u -r1.4 config-ml.in
--- config-ml.in	1999/09/06 19:28:20	1.4
+++ config-ml.in	2000/03/15 22:14:16
@@ -699,7 +699,21 @@
         break
       fi
     done
-    ml_config_env='CC="${CC} $flags"'
+    if grep '^LIBTOOL_DEPS=' ${ml_recprog} > /dev/null; then
+      ml_ltCC=${ML_POPDIR}/${ml_dir}/ltCC
+      if test ! -f ${ml_ltCC}; then
+        cat > ${ml_ltCC}-$$ << EOF
+#! ${CONFIG_SHELL-/bin/sh}
+exec ${CC} $flags \${1+"\$@"}
+EOF
+	chmod +x ${ml_ltCC}-$$
+	mv ${ml_ltCC}-$$ ${ml_ltCC} ||
+	rm -f ${ml_ltCC}-$$
+      fi
+      ml_config_env="CC=${ml_ltCC}"
+    else
+      ml_config_env='CC="${CC} $flags"'
+    fi
 
     if eval ${ml_config_env} ${ml_config_shell} ${ml_recprog} \
 	--with-multisubdir=${ml_dir} --with-multisrctop=${multisrctop} \

--=-=-=
Content-Type: text/plain; charset=iso-8859-1
Content-Transfer-Encoding: quoted-printable


--=20
Alexandre Oliva    Enjoy Guaran=E1, see http://www.ic.unicamp.br/~oliva/
Cygnus Solutions, a Red Hat company        aoliva@{redhat, cygnus}.com
Free Software Developer and Evangelist    CS PhD student at IC-Unicamp
oliva@{lsd.ic.unicamp.br, gnu.org}   Write to mailing lists, not to me

--=-=-=--

From java-patches-return-574-listarch-java-patches=sourceware.cygnus.com@sourceware.cygnus.com Wed Mar 15 22:28:39 2000
Return-Path: <java-patches-return-574-listarch-java-patches=sourceware.cygnus.com@sourceware.cygnus.com>
Delivered-To: listarch-java-patches@sourceware.cygnus.com
Received: (qmail 14905 invoked by alias); 15 Mar 2000 22:28:39 -0000
Mailing-List: contact java-patches-help@sourceware.cygnus.com; run by ezmlm
Precedence: bulk
List-Subscribe: <mailto:java-patches-subscribe@sourceware.cygnus.com>
List-Archive: <http://sourceware.cygnus.com/ml/java-patches/>
List-Post: <mailto:java-patches@sourceware.cygnus.com>
List-Help: <mailto:java-patches-help@sourceware.cygnus.com>, <http://sourceware.cygnus.com/ml/#faqs>
Sender: java-patches-owner@sourceware.cygnus.com
Delivered-To: mailing list java-patches@sourceware.cygnus.com
Received: (qmail 14886 invoked from network); 15 Mar 2000 22:28:35 -0000
Message-ID: <38D00F40.B12AAE8F@sigma6.com>
Date: Wed, 15 Mar 2000 17:31:28 -0500
From: Jeff Sturm <jsturm@sigma6.com>
Organization: AppNet
X-Mailer: Mozilla 4.51 [en] (WinNT; I)
X-Accept-Language: en
MIME-Version: 1.0
To: Tom Tromey <tromey@cygnus.com>
CC: Jon Beniston <jb7216@bristol.ac.uk>, java-patches@sourceware.cygnus.com
Subject: Re: Win32 bits and bobs
References: <005a01bf809b$999331b0$010010ac@brookfield.net> <200003152158.NAA22363@ferrule.cygnus.com>
Content-Type: text/plain; charset=us-ascii
Content-Transfer-Encoding: 7bit

Tom Tromey wrote:
[...]
> Second, I'm interested in seeing if we can find a way to make a nicer
> abstract API to the signal handling code, so that the Windows and
> POSIX ports don't need Windows-specific stuff in prims.cc.

Good idea.  It seems like a generic initialization routine and generic
callback function should be adequate.  But the existing POSIX signal
stuff isn't pretty, so there wasn't much to go from.

Also I don't really like the way WSAStartup() is being called from
prims.cc.  That should be deferred until if/when somebody uses
java.net.  Probably a static intializer somewhere in java.net would do
the trick.

I'll try to submit a patch, if somebody doesn't beat me to it...

-- 
Jeff Sturm
jsturm@sigma6.com

From java-patches-return-575-listarch-java-patches=sourceware.cygnus.com@sourceware.cygnus.com Wed Mar 15 22:30:11 2000
Return-Path: <java-patches-return-575-listarch-java-patches=sourceware.cygnus.com@sourceware.cygnus.com>
Delivered-To: listarch-java-patches@sourceware.cygnus.com
Received: (qmail 15140 invoked by alias); 15 Mar 2000 22:30:11 -0000
Mailing-List: contact java-patches-help@sourceware.cygnus.com; run by ezmlm
Precedence: bulk
List-Subscribe: <mailto:java-patches-subscribe@sourceware.cygnus.com>
List-Archive: <http://sourceware.cygnus.com/ml/java-patches/>
List-Post: <mailto:java-patches@sourceware.cygnus.com>
List-Help: <mailto:java-patches-help@sourceware.cygnus.com>, <http://sourceware.cygnus.com/ml/#faqs>
Sender: java-patches-owner@sourceware.cygnus.com
Delivered-To: mailing list java-patches@sourceware.cygnus.com
Received: (qmail 15121 invoked from network); 15 Mar 2000 22:30:11 -0000
Message-ID: <38D00FC4.C114D8D3@sigma6.com>
Date: Wed, 15 Mar 2000 17:33:40 -0500
From: Jeff Sturm <jsturm@sigma6.com>
Organization: AppNet
X-Mailer: Mozilla 4.51 [en] (WinNT; I)
X-Accept-Language: en
MIME-Version: 1.0
To: Tom Tromey <tromey@cygnus.com>
CC: Jon Beniston <jb7216@bristol.ac.uk>, java-patches@sourceware.cygnus.com
Subject: Re: Win32 bits and bobs
References: <005a01bf809b$999331b0$010010ac@brookfield.net>
		<38B96571.CC5927D3@sigma6.com> <200003152200.OAA22366@ferrule.cygnus.com>
Content-Type: text/plain; charset=us-ascii
Content-Transfer-Encoding: 7bit

Tom Tromey wrote:
> 
> >>>>> "Jeff" == Jeff Sturm <jsturm@sigma6.com> writes:
> 
> Jeff> (I don't see anything for java.lang.Process; I assume this isn't
> Jeff> yet working?)
> 
> Jeff, thanks a lot for doing this.  It made the review process much
> simpler for me.  I really appreciate it.

You're welcome... I wanted to see this Win32 port happen too.  Thank you
Tom, Jon and everybody else involved.

-- 
Jeff Sturm
jsturm@sigma6.com

From java-patches-return-576-listarch-java-patches=sourceware.cygnus.com@sourceware.cygnus.com Wed Mar 15 22:36:07 2000
Return-Path: <java-patches-return-576-listarch-java-patches=sourceware.cygnus.com@sourceware.cygnus.com>
Delivered-To: listarch-java-patches@sourceware.cygnus.com
Received: (qmail 15756 invoked by alias); 15 Mar 2000 22:36:07 -0000
Mailing-List: contact java-patches-help@sourceware.cygnus.com; run by ezmlm
Precedence: bulk
List-Subscribe: <mailto:java-patches-subscribe@sourceware.cygnus.com>
List-Archive: <http://sourceware.cygnus.com/ml/java-patches/>
List-Post: <mailto:java-patches@sourceware.cygnus.com>
List-Help: <mailto:java-patches-help@sourceware.cygnus.com>, <http://sourceware.cygnus.com/ml/#faqs>
Sender: java-patches-owner@sourceware.cygnus.com
Delivered-To: mailing list java-patches@sourceware.cygnus.com
Received: (qmail 15731 invoked from network); 15 Mar 2000 22:36:05 -0000
Date: Wed, 15 Mar 2000 14:35:57 -0800 (PST)
Message-Id: <200003152235.OAA22394@ferrule.cygnus.com>
From: Tom Tromey <tromey@cygnus.com>
To: Jeff Sturm <jsturm@sigma6.com>
Cc: Tom Tromey <tromey@cygnus.com>, Jon Beniston <jb7216@bristol.ac.uk>,
        java-patches@sourceware.cygnus.com
Subject: Re: Win32 bits and bobs
In-Reply-To: <38D00F40.B12AAE8F@sigma6.com>
References: <005a01bf809b$999331b0$010010ac@brookfield.net>
	<200003152158.NAA22363@ferrule.cygnus.com>
	<38D00F40.B12AAE8F@sigma6.com>
X-Zippy:  Those aren't WINOS--that's my JUGGLER, my AERIALIST,
 my SWORD SWALLOWER, and my LATEX NOVELTY SUPPLIER!!
X-Attribution:  Tom

Jeff> Also I don't really like the way WSAStartup() is being called from
Jeff> prims.cc.  That should be deferred until if/when somebody uses
Jeff> java.net.  Probably a static intializer somewhere in java.net would do
Jeff> the trick.

Yeah, I meant to mention this too.  I agree that this should only be
done as needed.

Tom

From java-patches-return-577-listarch-java-patches=sourceware.cygnus.com@sourceware.cygnus.com Thu Mar 16 17:26:04 2000
Return-Path: <java-patches-return-577-listarch-java-patches=sourceware.cygnus.com@sourceware.cygnus.com>
Delivered-To: listarch-java-patches@sourceware.cygnus.com
Received: (qmail 31165 invoked by alias); 16 Mar 2000 17:26:04 -0000
Mailing-List: contact java-patches-help@sourceware.cygnus.com; run by ezmlm
Precedence: bulk
List-Subscribe: <mailto:java-patches-subscribe@sourceware.cygnus.com>
List-Archive: <http://sourceware.cygnus.com/ml/java-patches/>
List-Post: <mailto:java-patches@sourceware.cygnus.com>
List-Help: <mailto:java-patches-help@sourceware.cygnus.com>, <http://sourceware.cygnus.com/ml/#faqs>
Sender: java-patches-owner@sourceware.cygnus.com
Delivered-To: mailing list java-patches@sourceware.cygnus.com
Received: (qmail 31144 invoked from network); 16 Mar 2000 17:26:01 -0000
To: Java Patch List <java-patches@sourceware.cygnus.com> 
Subject: Patch: for gcj, make -Wall imply -Wunused
X-Zippy:  Make me look like LINDA RONSTADT again!!
X-Attribution:  Tom
Bcc:
Reply-To:  tromey@cygnus.com
From:  Tom Tromey <tromey@cygnus.com>
Date: 16 Mar 2000 10:29:31 -0700
Message-ID: <87snxqvn5w.fsf@cygnus.com>
Lines: 26
X-Mailer: Gnus v5.5/Emacs 20.3

I'm checking in this patch with Alex's approval.
This makes gcj a bit more like the C compiler.

2000-03-16  Tom Tromey  <tromey@cygnus.com>

	* lang.c (lang_decode_option): Enable -Wunused when -Wall given.

Tom

Index: lang.c
===================================================================
RCS file: /cvs/gcc/egcs/gcc/java/lang.c,v
retrieving revision 1.38
diff -u -r1.38 lang.c
--- lang.c	2000/03/14 05:01:04	1.38
+++ lang.c	2000/03/16 17:23:53
@@ -246,6 +246,9 @@
     {
       flag_wall = 1;
       flag_redundant = 1;
+      /* When -Wall given, enable -Wunused.  We do this because the C
+	 compiler does it, and people expect it.  */
+      warn_unused = 1;
       return 1;
     }
 

From java-patches-return-578-listarch-java-patches=sourceware.cygnus.com@sourceware.cygnus.com Fri Mar 17 00:41:57 2000
Return-Path: <java-patches-return-578-listarch-java-patches=sourceware.cygnus.com@sourceware.cygnus.com>
Delivered-To: listarch-java-patches@sourceware.cygnus.com
Received: (qmail 25941 invoked by alias); 17 Mar 2000 00:41:57 -0000
Mailing-List: contact java-patches-help@sourceware.cygnus.com; run by ezmlm
Precedence: bulk
List-Subscribe: <mailto:java-patches-subscribe@sourceware.cygnus.com>
List-Archive: <http://sourceware.cygnus.com/ml/java-patches/>
List-Post: <mailto:java-patches@sourceware.cygnus.com>
List-Help: <mailto:java-patches-help@sourceware.cygnus.com>, <http://sourceware.cygnus.com/ml/#faqs>
Sender: java-patches-owner@sourceware.cygnus.com
Delivered-To: mailing list java-patches@sourceware.cygnus.com
Received: (qmail 25916 invoked from network); 17 Mar 2000 00:41:56 -0000
X-Authentication-Warning: fencer.cygnus.com: warrenl owned process doing -bs
Date: Thu, 16 Mar 2000 16:41:55 -0800 (PST)
From: Warren Levy <warrenl@cygnus.com>
To: java-patches@sourceware.cygnus.com
Subject: Patch: More java.awt and JDK1.2 Collections interfaces
Message-ID: <Pine.LNX.4.10.10003161544080.11942-100000@fencer.cygnus.com>
MIME-Version: 1.0
Content-Type: TEXT/PLAIN; charset=US-ASCII

Folks,
I'm checking the following into sourceware.  It has a bit more of java.awt
implemented (or stubbed in some cases) and includes the Collections
interfaces from JDK 1.2.  Enjoy!
--warrenl


2000-03-16  Warren Levy  <warrenl@cygnus.com>

	* java/awt/Color.java: New file.
	* java/awt/Graphics.java: New file.
	* java/awt/Image.java: New file.
	* java/awt/Paint.java: New file.
	* java/awt/PaintContext.java: New file.
	* java/awt/Transparency.java: New file.
	* java/util/Collection.java: New file.
	* java/util/Comparator.java: New file.
	* java/util/Iterator.java: New file.
	* java/util/List.java: New file.
	* java/util/ListIterator.java: New file.
	* Makefile.am: Added above new files.
	* Makefile.in: Rebuilt.

	* java/awt/Font.java (PLAIN): New field.
	(BOLD): New field.
	(ITALIC): New field.
	(ROMAN_BASELINE): New field.
	(CENTER_BASELINE): New field.
	(HANGING_BASELINE): New field.
	(name): New field.
	(style): New field.
	(size): New field.
	(pointSize): New field.
	(Font): Implemented constructor.
	(isPlain): Implemented method.
	(isBold): Implemented method.
	(isItalic): Implemented method.
	(getName): Implemented method.
	(getStyle): Implemented method.
	(getSize): Implemented method.
	(getSize2D): Implemented method.
	(decode): Stubbed.
	* java/awt/Frame.java (getFont): Stubbed.
	(postEvent): Stubbed.
	(remove): Stubbed.
	* java/awt/Menu.java (postEvent): Stubbed.
	* java/awt/MenuBar.java (getFont): Stubbed.
	(postEvent): Stubbed.
	* java/awt/Toolkit.java (getImage): Added abstract method.



Index: libjava/Makefile.am
===================================================================
RCS file: /cvs/java/libgcj/libjava/Makefile.am,v
retrieving revision 1.51
diff -u -p -r1.51 Makefile.am
--- Makefile.am	2000/03/10 02:43:56	1.51
+++ Makefile.am	2000/03/17 00:35:07
@@ -469,11 +469,14 @@ awt_java_source_files = \
 java/awt/AWTEvent.java \
 java/awt/BorderLayout.java \
 java/awt/Component.java \
+java/awt/Color.java \
 java/awt/Container.java \
 java/awt/Dimension.java \
 java/awt/Event.java \
 java/awt/Font.java \
 java/awt/Frame.java \
+java/awt/Graphics.java \
+java/awt/Image.java \
 java/awt/LayoutManager.java \
 java/awt/LayoutManager2.java \
 java/awt/Menu.java \
@@ -481,12 +484,15 @@ java/awt/MenuBar.java \
 java/awt/MenuItem.java \
 java/awt/MenuComponent.java \
 java/awt/MenuContainer.java \
+java/awt/Paint.java \
+java/awt/PaintContext.java \
 java/awt/Point.java \
 java/awt/Rectangle.java \
 java/awt/Shape.java \
 java/awt/TextArea.java \
 java/awt/TextComponent.java \
 java/awt/Toolkit.java \
+java/awt/Transparency.java \
 java/awt/Window.java \
 java/awt/event/ActionEvent.java \
 java/awt/event/ActionListener.java \
@@ -759,6 +765,8 @@ java/text/SimpleDateFormat.java	\
 java/text/StringCharacterIterator.java \
 java/util/BitSet.java \
 java/util/Calendar.java	\
+java/util/Collection.java \
+java/util/Comparator.java \
 java/util/ConcurrentModificationException.java \
 java/util/Date.java \
 java/util/Dictionary.java \
@@ -768,6 +776,9 @@ java/util/EventListener.java \
 java/util/EventObject.java \
 java/util/GregorianCalendar.java \
 java/util/Hashtable.java \
+java/util/Iterator.java \
+java/util/List.java \
+java/util/ListIterator.java \
 java/util/ListResourceBundle.java \
 java/util/Locale.java \
 java/util/MissingResourceException.java	\
Index: libjava/Makefile.in
===================================================================
RCS file: /cvs/java/libgcj/libjava/Makefile.in,v
retrieving revision 1.56
diff -u -p -r1.56 Makefile.in
--- Makefile.in	2000/03/10 02:43:56	1.56
+++ Makefile.in	2000/03/17 00:35:07
@@ -286,11 +286,14 @@ awt_java_source_files = \
 java/awt/AWTEvent.java \
 java/awt/BorderLayout.java \
 java/awt/Component.java \
+java/awt/Color.java \
 java/awt/Container.java \
 java/awt/Dimension.java \
 java/awt/Event.java \
 java/awt/Font.java \
 java/awt/Frame.java \
+java/awt/Graphics.java \
+java/awt/Image.java \
 java/awt/LayoutManager.java \
 java/awt/LayoutManager2.java \
 java/awt/Menu.java \
@@ -298,12 +301,15 @@ java/awt/MenuBar.java \
 java/awt/MenuItem.java \
 java/awt/MenuComponent.java \
 java/awt/MenuContainer.java \
+java/awt/Paint.java \
+java/awt/PaintContext.java \
 java/awt/Point.java \
 java/awt/Rectangle.java \
 java/awt/Shape.java \
 java/awt/TextArea.java \
 java/awt/TextComponent.java \
 java/awt/Toolkit.java \
+java/awt/Transparency.java \
 java/awt/Window.java \
 java/awt/event/ActionEvent.java \
 java/awt/event/ActionListener.java \
@@ -571,6 +577,8 @@ java/text/SimpleDateFormat.java	\
 java/text/StringCharacterIterator.java \
 java/util/BitSet.java \
 java/util/Calendar.java	\
+java/util/Collection.java \
+java/util/Comparator.java \
 java/util/ConcurrentModificationException.java \
 java/util/Date.java \
 java/util/Dictionary.java \
@@ -580,6 +588,9 @@ java/util/EventListener.java \
 java/util/EventObject.java \
 java/util/GregorianCalendar.java \
 java/util/Hashtable.java \
+java/util/Iterator.java \
+java/util/List.java \
+java/util/ListIterator.java \
 java/util/ListResourceBundle.java \
 java/util/Locale.java \
 java/util/MissingResourceException.java	\
@@ -974,14 +985,16 @@ DEP_FILES =  .deps/$(srcdir)/$(CONVERT_D
 .deps/java/text/ParseException.P .deps/java/text/ParsePosition.P \
 .deps/java/text/RuleBasedCollator.P .deps/java/text/SimpleDateFormat.P \
 .deps/java/text/StringCharacterIterator.P .deps/java/util/BitSet.P \
-.deps/java/util/Calendar.P \
+.deps/java/util/Calendar.P .deps/java/util/Collection.P \
+.deps/java/util/Comparator.P \
 .deps/java/util/ConcurrentModificationException.P \
 .deps/java/util/Date.P .deps/java/util/Dictionary.P \
 .deps/java/util/EmptyStackException.P .deps/java/util/Enumeration.P \
 .deps/java/util/EventListener.P .deps/java/util/EventObject.P \
 .deps/java/util/GregorianCalendar.P .deps/java/util/Hashtable.P \
-.deps/java/util/ListResourceBundle.P .deps/java/util/Locale.P \
-.deps/java/util/MissingResourceException.P \
+.deps/java/util/Iterator.P .deps/java/util/List.P \
+.deps/java/util/ListIterator.P .deps/java/util/ListResourceBundle.P \
+.deps/java/util/Locale.P .deps/java/util/MissingResourceException.P \
 .deps/java/util/NoSuchElementException.P .deps/java/util/Observable.P \
 .deps/java/util/Observer.P .deps/java/util/Properties.P \
 .deps/java/util/PropertyResourceBundle.P .deps/java/util/Random.P \
Index: libjava/java/awt/Color.java
===================================================================
RCS file: Color.java
diff -N Color.java
--- /dev/null	Tue May  5 13:32:27 1998
+++ Color.java	Thu Mar 16 16:35:07 2000
@@ -0,0 +1,64 @@
+/* Copyright (C) 2000  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 java.awt;
+
+/**
+ * @author Warren Levy <warrenl@cygnus.com>
+ * @date March 15, 2000.
+ */
+
+/**
+ * Written using on-line Java Platform 1.2 API Specification, as well
+ * as "The Java Class Libraries", 2nd edition (Addison-Wesley, 1998).
+ * Status:  Stubbed; A very incomplete implementation.
+ */
+
+public class Color extends Object implements Paint, Serializable
+{
+  public static final Color white =	new Color(0xff, 0xff, 0xff);
+  public static final Color lightGray =	new Color(0xc0, 0xc0, 0xc0);
+  public static final Color gray =	new Color(0x80, 0x80, 0x80);
+  public static final Color darkGray =	new Color(0x40, 0x40, 0x40);
+  public static final Color black =	new Color(0x00, 0x00, 0x00);
+  public static final Color red =	new Color(0xff, 0x00, 0x00);
+  public static final Color pink =	new Color(0xff, 0xaf, 0xaf);
+  public static final Color orange =	new Color(0xff, 0xc8, 0x00);
+  public static final Color yellow =	new Color(0xff, 0xff, 0x00);
+  public static final Color green =	new Color(0x00, 0xff, 0x00);
+  public static final Color magenta =	new Color(0xff, 0x00, 0xff);
+  public static final Color cyan =	new Color(0x00, 0xff, 0xff);
+  public static final Color blue =	new Color(0x00, 0x00, 0xff);
+  
+  // The internal sRGB representation.
+  private float r;
+  private float g;
+  private float b;
+  private int alpha = 255;
+
+  public Color(int rgb)
+  {
+    this(rgb, false);
+  } 
+
+  public Color(int rgba, boolean hasalpha)
+  {
+    // Alpha is bits 24-31, if hasalpha is true.
+    // Red is bits 16-23; Green is bits 8-15; Blue is bits 0-7.
+    b = rgb & 0xFF;
+    g = (rgb >>= 8) & 0xFF;
+    r = (rgb >>= 8) & 0xFF;
+    if (hasalpha)
+      alpha = (rgb >>= 8) & 0xFF;
+  }
+
+  public int getRGB()
+  {
+    return alpha << 24 | r << 16 | g << 8 | b;
+  }
+}
Index: libjava/java/awt/Font.java
===================================================================
RCS file: /cvs/java/libgcj/libjava/java/awt/Font.java,v
retrieving revision 1.3
diff -u -p -r1.3 Font.java
--- Font.java	2000/03/07 19:55:25	1.3
+++ Font.java	2000/03/17 00:35:07
@@ -1,4 +1,4 @@
-/* Copyright (C) 1999  Free Software Foundation
+/* Copyright (C) 1999, 2000  Free Software Foundation
 
    This file is part of libjava.
 
@@ -8,8 +8,83 @@ details.  */
 
 package java.awt;
 
-/* A *very* incomplete placeholder. */
+/**
+ * @author Warren Levy <warrenl@cygnus.com>
+ * @date March 16, 2000.
+ */
 
+/**
+ * Written using on-line Java Platform 1.2 API Specification, as well
+ * as "The Java Class Libraries", 2nd edition (Addison-Wesley, 1998).
+ * Status:  Stubbed; A very incomplete implementation.
+ */
+
 public class Font
 {
+  // FIXME
+
+  public static final int PLAIN = 0;
+  public static final int BOLD = 1;
+  public static final int ITALIC = 2;
+  public static final int ROMAN_BASELINE = 0;
+  public static final int CENTER_BASELINE = 1;
+  public static final int HANGING_BASELINE = 2;
+  protected String name;
+  protected int style;
+  protected int size;
+  protected float pointSize;
+
+  public Font(String name, int style, int size)
+  {
+    this.name = name;
+    this.style = style & 0x3;	// Only use lowest 2 bits.
+    this.size = size;
+    pointSize = size;		// Assume some subclass can set a different val.
+  }
+
+  public boolean isPlain()
+  {
+    if (style == PLAIN)
+      return true;
+
+    return false;
+  }
+
+  public boolean isBold()
+  {
+    if (style & BOLD == BOLD)
+      return true;
+
+    return false;
+  }
+
+  public boolean isItalic()
+  {
+    if (style & ITALIC == ITALIC)
+      return true;
+
+    return false;
+  }
+  
+  public String getName()
+  {
+    return name;
+  }
+
+  public int getStyle()
+  {
+    return style;
+  }
+
+  public int getSize()
+  {
+    return size;
+  }
+
+  public float getSize2D()
+  {
+    return pointSize;
+  }
+
+  public static Font decode(String str) { return null; } // FIXME
 }
Index: libjava/java/awt/Frame.java
===================================================================
RCS file: /cvs/java/libgcj/libjava/java/awt/Frame.java,v
retrieving revision 1.3
diff -u -p -r1.3 Frame.java
--- Frame.java	2000/03/07 19:55:25	1.3
+++ Frame.java	2000/03/17 00:35:07
@@ -1,4 +1,4 @@
-/* Copyright (C) 1999  Free Software Foundation
+/* Copyright (C) 1999, 2000  Free Software Foundation
 
    This file is part of libjava.
 
@@ -52,4 +52,8 @@ public class Frame extends Window implem
       }
     super.addNotify();
   }
+
+  public Font getFont() { return null; } // FIXME
+  public boolean postEvent(Event evt) { return null; } // FIXME
+  public void remove(MenuComponent comp) { } // FIXME
 }
Index: libjava/java/awt/Graphics.java
===================================================================
RCS file: Graphics.java
diff -N Graphics.java
--- /dev/null	Tue May  5 13:32:27 1998
+++ Graphics.java	Thu Mar 16 16:35:07 2000
@@ -0,0 +1,29 @@
+/* Copyright (C) 2000  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 java.awt;
+
+/**
+ * @author Warren Levy <warrenl@cygnus.com>
+ * @date March 15, 2000.
+ */
+
+/**
+ * Written using on-line Java Platform 1.2 API Specification, as well
+ * as "The Java Class Libraries", 2nd edition (Addison-Wesley, 1998).
+ * Status:  Stubbed; A very incomplete placeholder.
+ */
+
+public abstract class Graphics extends Object
+{
+  protected Graphics()
+  {
+    super();  // ???
+    throw new Error ("java.awt.Graphics: not implemented");
+  }
+}
Index: libjava/java/awt/Image.java
===================================================================
RCS file: Image.java
diff -N Image.java
--- /dev/null	Tue May  5 13:32:27 1998
+++ Image.java	Thu Mar 16 16:35:07 2000
@@ -0,0 +1,29 @@
+/* Copyright (C) 2000  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 java.awt;
+
+/**
+ * @author Warren Levy <warrenl@cygnus.com>
+ * @date March 15, 2000.
+ */
+
+/**
+ * Written using on-line Java Platform 1.2 API Specification, as well
+ * as "The Java Class Libraries", 2nd edition (Addison-Wesley, 1998).
+ * Status:  Stubbed; A very incomplete placeholder.
+ */
+
+public abstract class Image extends Object
+{
+  public Image()
+  {
+    super();  // ???
+    throw new Error("java.awt.Image: not implemented");
+  }
+}
Index: libjava/java/awt/Menu.java
===================================================================
RCS file: /cvs/java/libgcj/libjava/java/awt/Menu.java,v
retrieving revision 1.3
diff -u -p -r1.3 Menu.java
--- Menu.java	2000/03/07 19:55:25	1.3
+++ Menu.java	2000/03/17 00:35:07
@@ -1,4 +1,4 @@
-/* Copyright (C) 1999  Free Software Foundation
+/* Copyright (C) 1999, 2000  Free Software Foundation
 
    This file is part of libjava.
 
@@ -28,6 +28,6 @@ public class Menu extends MenuItem imple
   }
 
   public Font getFont() { return null; } // FIXME
-  //public boolean postEvent(Event evt);
+  public boolean postEvent(Event evt) { return null; } // FIXME
   public void remove(MenuComponent comp) { } // FIXME
 }
Index: libjava/java/awt/MenuBar.java
===================================================================
RCS file: /cvs/java/libgcj/libjava/java/awt/MenuBar.java,v
retrieving revision 1.3
diff -u -p -r1.3 MenuBar.java
--- MenuBar.java	2000/03/07 19:55:25	1.3
+++ MenuBar.java	2000/03/17 00:35:07
@@ -1,4 +1,4 @@
-/* Copyright (C) 1999  Free Software Foundation
+/* Copyright (C) 1999, 2000  Free Software Foundation
 
    This file is part of libjava.
 
@@ -41,4 +41,7 @@ public class MenuBar extends MenuCompone
 	  }
       }
   }
+
+  public Font getFont() { return null; } // FIXME
+  public boolean postEvent(Event evt) { return null; } // FIXME
 }
Index: libjava/java/awt/Paint.java
===================================================================
RCS file: Paint.java
diff -N Paint.java
--- /dev/null	Tue May  5 13:32:27 1998
+++ Paint.java	Thu Mar 16 16:35:07 2000
@@ -0,0 +1,30 @@
+/* Copyright (C) 2000  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 java.awt;
+
+/**
+ * @author Warren Levy <warrenl@cygnus.com>
+ * @date March 15, 2000.
+ */
+
+/**
+ * Written using on-line Java Platform 1.2 API Specification, as well
+ * as "The Java Class Libraries", 2nd edition (Addison-Wesley, 1998).
+ * Status:  Stubbed.
+ */
+
+public interface Paint extends Transparency
+{
+  // FIXME
+  // public PaintContext createContext(ColorModel cm,
+  //				    Rectangle deviceBounds,
+  //  				    Rectangle2D userBounds,
+  //				    AffineTransform xform,
+  //				    RenderingHints hints);
+}
Index: libjava/java/awt/PaintContext.java
===================================================================
RCS file: PaintContext.java
diff -N PaintContext.java
--- /dev/null	Tue May  5 13:32:27 1998
+++ PaintContext.java	Thu Mar 16 16:35:07 2000
@@ -0,0 +1,28 @@
+/* Copyright (C) 2000  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 java.awt;
+
+/**
+ * @author Warren Levy <warrenl@cygnus.com>
+ * @date March 16, 2000.
+ */
+
+/**
+ * Written using on-line Java Platform 1.2 API Specification, as well
+ * as "The Java Class Libraries", 2nd edition (Addison-Wesley, 1998).
+ * Status:  Partially stubbed.
+ */
+
+public interface PaintContext
+{
+  public void dispose();
+  // FIXME
+  // public ColorModel getColorModel();
+  // public Raster getRaster(int x, int y, int w, int h);
+}
Index: libjava/java/awt/Toolkit.java
===================================================================
RCS file: /cvs/java/libgcj/libjava/java/awt/Toolkit.java,v
retrieving revision 1.3
diff -u -p -r1.3 Toolkit.java
--- Toolkit.java	2000/03/07 19:55:25	1.3
+++ Toolkit.java	2000/03/17 00:35:07
@@ -1,4 +1,4 @@
-/* Copyright (C) 1999  Free Software Foundation
+/* Copyright (C) 1999, 2000  Free Software Foundation
 
    This file is part of libjava.
 
@@ -23,6 +23,7 @@ public abstract class Toolkit
   }
 
   protected abstract FramePeer createFrame(Frame target);
+  public abstract Image getImage(URL url);
 
   private static native void init();
   // static { init(); }
Index: libjava/java/awt/Transparency.java
===================================================================
RCS file: Transparency.java
diff -N Transparency.java
--- /dev/null	Tue May  5 13:32:27 1998
+++ Transparency.java	Thu Mar 16 16:35:07 2000
@@ -0,0 +1,29 @@
+/* Copyright (C) 2000  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 java.awt;
+
+/**
+ * @author Warren Levy <warrenl@cygnus.com>
+ * @date March 15, 2000.
+ */
+
+/**
+ * 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.
+ */
+
+public interface Transparency
+{
+  public static final int OPAQUE = 1;
+  public static final int BITMASK = 2;
+  public static final int TRANSLUCENT = 3;
+
+  public int getTransparency();
+}
Index: libjava/java/util/Collection.java
===================================================================
RCS file: Collection.java
diff -N Collection.java
--- /dev/null	Tue May  5 13:32:27 1998
+++ Collection.java	Thu Mar 16 16:35:07 2000
@@ -0,0 +1,37 @@
+/* Copyright (C) 2000  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 java.util;
+
+/**
+ * @author Warren Levy <warrenl@cygnus.com>
+ * @date March 16, 2000.
+ */
+/* Written using on-line Java Platform 1.2 API Specification.
+ * Status:  Believed complete and correct.
+ */
+
+// JDK1.2
+public interface Collection
+{
+  public int size();
+  public boolean isEmpty();
+  public boolean contains(Object o);
+  public Iterator iterator();
+  public Object[] toArray();
+  public Object[] toArray(Object[] a);
+  public boolean add(Object o);
+  public boolean remove(Object o);
+  public boolean containsAll(Collection c);
+  public boolean addAll(Collection c);
+  public boolean removeAll(Collection c);
+  public boolean retainAll(Collection c);
+  public void clear();
+  public boolean equals(Object o);
+  public int hashCode();
+}
Index: libjava/java/util/Comparator.java
===================================================================
RCS file: Comparator.java
diff -N Comparator.java
--- /dev/null	Tue May  5 13:32:27 1998
+++ Comparator.java	Thu Mar 16 16:35:07 2000
@@ -0,0 +1,24 @@
+/* Copyright (C) 2000  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 java.util;
+
+/**
+ * @author Warren Levy <warrenl@cygnus.com>
+ * @date March 16, 2000.
+ */
+/* Written using on-line Java Platform 1.2 API Specification.
+ * Status:  Believed complete and correct.
+ */
+
+// JDK1.2
+public interface Comparator
+{
+  public int compare(Object o1, Object o2);
+  public boolean equals(Object obj);
+}
Index: libjava/java/util/Iterator.java
===================================================================
RCS file: Iterator.java
diff -N Iterator.java
--- /dev/null	Tue May  5 13:32:27 1998
+++ Iterator.java	Thu Mar 16 16:35:07 2000
@@ -0,0 +1,25 @@
+/* Copyright (C) 2000  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 java.util;
+
+/**
+ * @author Warren Levy <warrenl@cygnus.com>
+ * @date March 16, 2000.
+ */
+/* Written using on-line Java Platform 1.2 API Specification.
+ * Status:  Believed complete and correct.
+ */
+
+// JDK1.2
+public interface Iterator
+{
+  public boolean hasNext();
+  public Object next();
+  public void remove();
+}
Index: libjava/java/util/List.java
===================================================================
RCS file: List.java
diff -N List.java
--- /dev/null	Tue May  5 13:32:27 1998
+++ List.java	Thu Mar 16 16:35:07 2000
@@ -0,0 +1,47 @@
+/* Copyright (C) 2000  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 java.util;
+
+/**
+ * @author Warren Levy <warrenl@cygnus.com>
+ * @date March 16, 2000.
+ */
+/* Written using on-line Java Platform 1.2 API Specification.
+ * Status:  Believed complete and correct.
+ */
+
+// JDK1.2
+public interface List extends Collection
+{
+  public int size();
+  public boolean isEmpty();
+  public boolean contains(Object o);
+  public Iterator iterator();
+  public Object[] toArray();
+  public Object[] toArray(Object[] a);
+  public boolean add(Object o);
+  public boolean remove(Object o);
+  public boolean containsAll(Collection c);
+  public boolean addAll(Collection c);
+  public boolean addAll(int index, Collection c);
+  public boolean removeAll(Collection c);
+  public boolean retainAll(Collection c);
+  public void clear();
+  public boolean equals(Object o);
+  public int hashCode();
+  public Object get(int index);
+  public Object set(int index, Object element);
+  public void add(int index, Object element);
+  public Object remove(int index);
+  public int indexOf(Object o);
+  public int lastIndexOf(Object o);
+  public ListIterator listIterator();
+  public ListIterator listIterator(int index);
+  public List subList(int fromIndex, int toIndex);
+}
Index: libjava/java/util/ListIterator.java
===================================================================
RCS file: ListIterator.java
diff -N ListIterator.java
--- /dev/null	Tue May  5 13:32:27 1998
+++ ListIterator.java	Thu Mar 16 16:35:07 2000
@@ -0,0 +1,31 @@
+/* Copyright (C) 2000  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 java.util;
+
+/**
+ * @author Warren Levy <warrenl@cygnus.com>
+ * @date March 16, 2000.
+ */
+/* Written using on-line Java Platform 1.2 API Specification.
+ * Status:  Believed complete and correct.
+ */
+
+// JDK1.2
+public interface ListIterator extends Iterator
+{
+  public boolean hasNext();
+  public Object next();
+  public boolean hasPrevious();
+  public Object previous();
+  public int nextIndex();
+  public int previousIndex();
+  public void remove();
+  public void set(Object o);
+  public void add(Object o);
+}

From java-patches-return-579-listarch-java-patches=sourceware.cygnus.com@sourceware.cygnus.com Sat Mar 18 01:45:42 2000
Return-Path: <java-patches-return-579-listarch-java-patches=sourceware.cygnus.com@sourceware.cygnus.com>
Delivered-To: listarch-java-patches@sourceware.cygnus.com
Received: (qmail 8273 invoked by alias); 18 Mar 2000 01:45:42 -0000
Mailing-List: contact java-patches-help@sourceware.cygnus.com; run by ezmlm
Precedence: bulk
List-Subscribe: <mailto:java-patches-subscribe@sourceware.cygnus.com>
List-Archive: <http://sourceware.cygnus.com/ml/java-patches/>
List-Post: <mailto:java-patches@sourceware.cygnus.com>
List-Help: <mailto:java-patches-help@sourceware.cygnus.com>, <http://sourceware.cygnus.com/ml/#faqs>
Sender: java-patches-owner@sourceware.cygnus.com
Delivered-To: mailing list java-patches@sourceware.cygnus.com
Received: (qmail 8251 invoked from network); 18 Mar 2000 01:45:38 -0000
Message-ID: <38D2DFE3.7629DABD@albatross.co.nz>
Date: Sat, 18 Mar 2000 14:46:11 +1300
From: Bryce McKinlay <bryce@albatross.co.nz>
X-Mailer: Mozilla 4.7 [en] (X11; I; Linux 2.3.99-pre1 i686)
X-Accept-Language: en
MIME-Version: 1.0
To: java-patches@sourceware.cygnus.com
Subject: Patch: Fix PR libgcj/179
Content-Type: multipart/mixed;
 boundary="------------ED7C13C1F5E96645780886EA"

This is a multi-part message in MIME format.
--------------ED7C13C1F5E96645780886EA
Content-Type: text/plain; charset=us-ascii
Content-Transfer-Encoding: 7bit

2000-03-18  Bryce McKinlay  <bryce@albatross.co.nz>

        * java/lang/natClass.cc (_Jv_IsAssignableFrom): If an interface
has
        no idt, it is not implemented by any loaded class, so return
false.



--------------ED7C13C1F5E96645780886EA
Content-Type: text/plain; charset=us-ascii;
 name="unimplemented-interface.patch"
Content-Transfer-Encoding: 7bit
Content-Disposition: inline;
 filename="unimplemented-interface.patch"

Index: natClass.cc
===================================================================
RCS file: /cvs/java/libgcj/libjava/java/lang/natClass.cc,v
retrieving revision 1.20
diff -u -r1.20 natClass.cc
--- natClass.cc	2000/03/09 09:22:36	1.20
+++ natClass.cc	2000/03/18 01:41:04
@@ -920,6 +920,8 @@
       _Jv_IDispatchTable *cl_idt = source->idt;
       _Jv_IDispatchTable *if_idt = target->idt;
       jshort cl_iindex = cl_idt->cls.iindex;
+      if (if_idt == NULL)
+        return false; // No class implementing TARGET has been loaded.
       if (cl_iindex <= if_idt->iface.ioffsets[0])
         {
 	  jshort offset = if_idt->iface.ioffsets[cl_iindex];

--------------ED7C13C1F5E96645780886EA--

From java-patches-return-580-listarch-java-patches=sourceware.cygnus.com@sourceware.cygnus.com Sun Mar 19 04:32:26 2000
Return-Path: <java-patches-return-580-listarch-java-patches=sourceware.cygnus.com@sourceware.cygnus.com>
Delivered-To: listarch-java-patches@sourceware.cygnus.com
Received: (qmail 22053 invoked by alias); 19 Mar 2000 04:32:25 -0000
Mailing-List: contact java-patches-help@sourceware.cygnus.com; run by ezmlm
Precedence: bulk
List-Subscribe: <mailto:java-patches-subscribe@sourceware.cygnus.com>
List-Archive: <http://sourceware.cygnus.com/ml/java-patches/>
List-Post: <mailto:java-patches@sourceware.cygnus.com>
List-Help: <mailto:java-patches-help@sourceware.cygnus.com>, <http://sourceware.cygnus.com/ml/#faqs>
Sender: java-patches-owner@sourceware.cygnus.com
Delivered-To: mailing list java-patches@sourceware.cygnus.com
Received: (qmail 22028 invoked from network); 19 Mar 2000 04:32:18 -0000
To: Java Patch List <java-patches@sourceware.cygnus.com> 
Subject: Patch: fix for test pr109.java
X-Zippy:  YOW!!  The land of the rising SONY!!
X-Attribution:  Tom
Bcc:
Reply-To:  tromey@cygnus.com
From:  Tom Tromey <tromey@cygnus.com>
Date: 18 Mar 2000 21:36:28 -0700
Message-ID: <87zorvtw37.fsf@cygnus.com>
Lines: 27
X-Mailer: Gnus v5.5/Emacs 20.3

I'm checking in this change.
It adds a newline to the end of "pr109"'s output.
This makes the dejagnu log a bit better.

2000-03-18  Tom Tromey  <tromey@cygnus.com>

	* libjava.lang/pr109.java: Added `println' at end.

Tom

Index: pr109.java
===================================================================
RCS file: /cvs/java/libgcj/libjava/testsuite/libjava.lang/pr109.java,v
retrieving revision 1.1
diff -u -r1.1 pr109.java
--- pr109.java	2000/01/16 19:55:09	1.1
+++ pr109.java	2000/03/19 04:25:38
@@ -21,5 +21,9 @@
 	      break;
 	    System.out.print (i);
 	  }
+
+      // We print a newline here because otherwise the DejaGNU log
+      // file is screwed up.
+      System.out.println ();
     }
 }

From java-patches-return-581-listarch-java-patches=sourceware.cygnus.com@sourceware.cygnus.com Sun Mar 19 11:22:45 2000
Return-Path: <java-patches-return-581-listarch-java-patches=sourceware.cygnus.com@sourceware.cygnus.com>
Delivered-To: listarch-java-patches@sourceware.cygnus.com
Received: (qmail 30800 invoked by alias); 19 Mar 2000 11:22:45 -0000
Mailing-List: contact java-patches-help@sourceware.cygnus.com; run by ezmlm
Precedence: bulk
List-Subscribe: <mailto:java-patches-subscribe@sourceware.cygnus.com>
List-Archive: <http://sourceware.cygnus.com/ml/java-patches/>
List-Post: <mailto:java-patches@sourceware.cygnus.com>
List-Help: <mailto:java-patches-help@sourceware.cygnus.com>, <http://sourceware.cygnus.com/ml/#faqs>
Sender: java-patches-owner@sourceware.cygnus.com
Delivered-To: mailing list java-patches@sourceware.cygnus.com
Received: (qmail 30775 invoked from network); 19 Mar 2000 11:22:41 -0000
X-Authentication-Warning: fencer.cygnus.com: warrenl owned process doing -bs
Date: Sun, 19 Mar 2000 03:22:39 -0800 (PST)
From: Warren Levy <warrenl@cygnus.com>
To: java-patches@sourceware.cygnus.com
Subject: Patch: java.awt.Color
Message-ID: <Pine.LNX.4.10.10003190317420.31511-100000@fencer.cygnus.com>
MIME-Version: 1.0
Content-Type: TEXT/PLAIN; charset=US-ASCII

Folks,
I'm checking this in.  The ChangeLog entry speaks for itself ;-).
--warrenl


2000-03-19  Warren Levy  <warrenl@cygnus.com>

        * java/awt/Color.java: Rewrote to be more memory efficient (& compile).


Index: libjava/java/awt/Color.java
===================================================================
RCS file: /cvs/java/libgcj/libjava/java/awt/Color.java,v
retrieving revision 1.1
diff -u -p -r1.1 Color.java
--- Color.java	2000/03/17 00:45:06	1.1
+++ Color.java	2000/03/19 11:15:43
@@ -21,25 +21,24 @@ package java.awt;
 
 public class Color extends Object implements Paint, Serializable
 {
-  public static final Color white =	new Color(0xff, 0xff, 0xff);
-  public static final Color lightGray =	new Color(0xc0, 0xc0, 0xc0);
-  public static final Color gray =	new Color(0x80, 0x80, 0x80);
-  public static final Color darkGray =	new Color(0x40, 0x40, 0x40);
-  public static final Color black =	new Color(0x00, 0x00, 0x00);
-  public static final Color red =	new Color(0xff, 0x00, 0x00);
-  public static final Color pink =	new Color(0xff, 0xaf, 0xaf);
-  public static final Color orange =	new Color(0xff, 0xc8, 0x00);
-  public static final Color yellow =	new Color(0xff, 0xff, 0x00);
-  public static final Color green =	new Color(0x00, 0xff, 0x00);
-  public static final Color magenta =	new Color(0xff, 0x00, 0xff);
-  public static final Color cyan =	new Color(0x00, 0xff, 0xff);
-  public static final Color blue =	new Color(0x00, 0x00, 0xff);
+  public static final Color white =	new Color(0xFFFFFFFF, true);
+  public static final Color lightGray =	new Color(0xFFC0C0C0, true);
+  public static final Color gray =	new Color(0xFF808080, true);
+  public static final Color darkGray =	new Color(0xFF404040, true);
+  public static final Color black =	new Color(0xFF000000, true);
+  public static final Color red =	new Color(0xFFFF0000, true);
+  public static final Color pink =	new Color(0xFFFFAFAF, true);
+  public static final Color orange =	new Color(0xFFFFC800, true);
+  public static final Color yellow =	new Color(0xFFFFFF00, true);
+  public static final Color green =	new Color(0xFF00FF00, true);
+  public static final Color magenta =	new Color(0xFFFF00FF, true);
+  public static final Color cyan =	new Color(0xFF00FFFF, true);
+  public static final Color blue =	new Color(0xFF0000FF, true);
   
   // The internal sRGB representation.
-  private float r;
-  private float g;
-  private float b;
-  private int alpha = 255;
+  // Alpha is bits 24-31, if hasalpha is true.
+  // Red is bits 16-23; Green is bits 8-15; Blue is bits 0-7.
+  private int rgba = 0xFFFFFFFF;
 
   public Color(int rgb)
   {
@@ -48,17 +47,44 @@ public class Color extends Object implem
 
   public Color(int rgba, boolean hasalpha)
   {
-    // Alpha is bits 24-31, if hasalpha is true.
-    // Red is bits 16-23; Green is bits 8-15; Blue is bits 0-7.
-    b = rgb & 0xFF;
-    g = (rgb >>= 8) & 0xFF;
-    r = (rgb >>= 8) & 0xFF;
-    if (hasalpha)
-      alpha = (rgb >>= 8) & 0xFF;
+    this.rgba = rgba;
+    if (!hasalpha)
+      rgba |= 0xFF000000;
   }
 
+  public Color(int r, int g, int b)
+  {
+    this(r, g, b, 0xFF);
+  }
+
+  public Color(int r, int g, int b, int a)
+  {
+    rgba = a << 24 | ((r << 16) & 0x00FF0000) | ((g << 8) & 0x0000FF00) |
+    	   (b & 0x000000FF);
+  }
+
+  public int getRed()
+  {
+    return (rgba >> 16) & 0xFF;
+  }
+
+  public int getGreen()
+  {
+    return (rgba >> 8) & 0xFF;
+  }
+
+  public int getBlue()
+  {
+    return rgba & 0xFF;
+  }
+
+  public int getAlpha()
+  {
+    return (rgba >> 24) & 0xFF;
+  }
+
   public int getRGB()
   {
-    return alpha << 24 | r << 16 | g << 8 | b;
+    return rgba;
   }
 }

From java-patches-return-582-listarch-java-patches=sourceware.cygnus.com@sourceware.cygnus.com Sun Mar 19 12:19:02 2000
Return-Path: <java-patches-return-582-listarch-java-patches=sourceware.cygnus.com@sourceware.cygnus.com>
Delivered-To: listarch-java-patches@sourceware.cygnus.com
Received: (qmail 9793 invoked by alias); 19 Mar 2000 12:19:01 -0000
Mailing-List: contact java-patches-help@sourceware.cygnus.com; run by ezmlm
Precedence: bulk
List-Subscribe: <mailto:java-patches-subscribe@sourceware.cygnus.com>
List-Archive: <http://sourceware.cygnus.com/ml/java-patches/>
List-Post: <mailto:java-patches@sourceware.cygnus.com>
List-Help: <mailto:java-patches-help@sourceware.cygnus.com>, <http://sourceware.cygnus.com/ml/#faqs>
Sender: java-patches-owner@sourceware.cygnus.com
Delivered-To: mailing list java-patches@sourceware.cygnus.com
Received: (qmail 9765 invoked from network); 19 Mar 2000 12:19:00 -0000
X-Authentication-Warning: fencer.cygnus.com: warrenl owned process doing -bs
Date: Sun, 19 Mar 2000 04:18:58 -0800 (PST)
From: Warren Levy <warrenl@cygnus.com>
To: java-patches@sourceware.cygnus.com
Subject: Patch: java.awt.Color & java.awt.Toolkit
Message-ID: <Pine.LNX.4.10.10003190417080.31511-100000@fencer.cygnus.com>
MIME-Version: 1.0
Content-Type: TEXT/PLAIN; charset=US-ASCII

Folks,
One more minor patch being checked in.  This should be the last one
tonight.
--warrenl


2000-03-19  Warren Levy  <warrenl@cygnus.com>

        * java/awt/Color.java: Specified java.io for Serializable. 
        * java/awt/Toolkit.java: Imported java.net.URL.


Index: libjava/java/awt/Color.java
===================================================================
RCS file: /cvs/java/libgcj/libjava/java/awt/Color.java,v
retrieving revision 1.2
diff -u -p -r1.2 Color.java
--- Color.java	2000/03/19 11:23:27	1.2
+++ Color.java	2000/03/19 12:13:19
@@ -19,7 +19,7 @@ package java.awt;
  * Status:  Stubbed; A very incomplete implementation.
  */
 
-public class Color extends Object implements Paint, Serializable
+public class Color extends Object implements Paint, java.io.Serializable
 {
   public static final Color white =	new Color(0xFFFFFFFF, true);
   public static final Color lightGray =	new Color(0xFFC0C0C0, true);
Index: libjava/java/awt/Toolkit.java
===================================================================
RCS file: /cvs/java/libgcj/libjava/java/awt/Toolkit.java,v
retrieving revision 1.4
diff -u -p -r1.4 Toolkit.java
--- Toolkit.java	2000/03/17 00:45:06	1.4
+++ Toolkit.java	2000/03/19 12:13:19
@@ -8,6 +8,7 @@ details.  */
 
 package java.awt;
 import java.awt.peer.*;
+import java.net.URL;
 
 /* A very incomplete placeholder. */
 



From java-patches-return-583-listarch-java-patches=sourceware.cygnus.com@sourceware.cygnus.com Tue Mar 21 01:02:44 2000
Return-Path: <java-patches-return-583-listarch-java-patches=sourceware.cygnus.com@sourceware.cygnus.com>
Delivered-To: listarch-java-patches@sourceware.cygnus.com
Received: (qmail 31959 invoked by alias); 21 Mar 2000 01:02:43 -0000
Mailing-List: contact java-patches-help@sourceware.cygnus.com; run by ezmlm
Precedence: bulk
List-Subscribe: <mailto:java-patches-subscribe@sourceware.cygnus.com>
List-Archive: <http://sourceware.cygnus.com/ml/java-patches/>
List-Post: <mailto:java-patches@sourceware.cygnus.com>
List-Help: <mailto:java-patches-help@sourceware.cygnus.com>, <http://sourceware.cygnus.com/ml/#faqs>
Sender: java-patches-owner@sourceware.cygnus.com
Delivered-To: mailing list java-patches@sourceware.cygnus.com
Received: (qmail 31937 invoked from network); 21 Mar 2000 01:02:41 -0000
To: Java Patch List <java-patches@sourceware.cygnus.com> 
Subject: Patch: libffi Makefile.in fix
X-Zippy:  UH-OH!!  I think KEN is OVER-DUE on his R.V. PAYMENTS and HE'S
 having a NERVOUS BREAKDOWN too!!  Ha ha.
X-Attribution:  Tom
Bcc:
Reply-To:  tromey@cygnus.com
From:  Tom Tromey <tromey@cygnus.com>
Date: 20 Mar 2000 18:07:22 -0700
Message-ID: <87ya7drv05.fsf@cygnus.com>
Lines: 48
X-Mailer: Gnus v5.5/Emacs 20.3

This is another hand edit to libffi/Makefile.in :-(
On the bright side I did some automake work last night,
so hopefully in the next month or two we'll have a working automake we
can use for libffi (and the rest of the world).

2000-03-20  Tom Tromey  <tromey@cygnus.com>

	* Makefile.in: Hand edit for java_raw_api.lo.

Tom

Index: Makefile.in
===================================================================
RCS file: /cvs/java/libgcj/libffi/Makefile.in,v
retrieving revision 1.9
diff -u -r1.9 Makefile.in
--- Makefile.in	2000/03/03 19:33:11	1.9
+++ Makefile.in	2000/03/21 00:57:45
@@ -152,21 +152,21 @@
 LIBS = @LIBS@
 libffi_la_LIBADD = 
 @ALPHA_TRUE@am_libffi_la_OBJECTS =  debug.lo prep_cif.lo types.lo \
-@ALPHA_TRUE@raw_api.lo ffi.lo osf.lo
+@ALPHA_TRUE@raw_api.lo java_raw_api.lo ffi.lo osf.lo
 @ARM_TRUE@am_libffi_la_OBJECTS =  debug.lo prep_cif.lo types.lo \
-@ARM_TRUE@raw_api.lo sysv.lo ffi.lo
+@ARM_TRUE@raw_api.lo java_raw_api.lo sysv.lo ffi.lo
 @M68K_TRUE@am_libffi_la_OBJECTS =  debug.lo prep_cif.lo types.lo \
-@M68K_TRUE@raw_api.lo ffi.lo sysv.lo
+@M68K_TRUE@raw_api.lo java_raw_api.lo ffi.lo sysv.lo
 @MIPS_GCC_TRUE@am_libffi_la_OBJECTS =  debug.lo prep_cif.lo types.lo \
-@MIPS_GCC_TRUE@raw_api.lo ffi.lo o32.lo n32.lo
+@MIPS_GCC_TRUE@raw_api.lo java_raw_api.lo ffi.lo o32.lo n32.lo
 @MIPS_SGI_TRUE@am_libffi_la_OBJECTS =  debug.lo prep_cif.lo types.lo \
-@MIPS_SGI_TRUE@raw_api.lo ffi.lo o32.lo n32.lo
+@MIPS_SGI_TRUE@raw_api.lo java_raw_api.lo ffi.lo o32.lo n32.lo
 @POWERPC_TRUE@am_libffi_la_OBJECTS =  debug.lo prep_cif.lo types.lo \
-@POWERPC_TRUE@raw_api.lo ffi.lo sysv.lo
+@POWERPC_TRUE@raw_api.lo java_raw_api.lo ffi.lo sysv.lo
 @SPARC_TRUE@am_libffi_la_OBJECTS =  debug.lo prep_cif.lo types.lo \
-@SPARC_TRUE@raw_api.lo ffi.lo v8.lo
+@SPARC_TRUE@raw_api.lo java_raw_api.lo ffi.lo v8.lo
 @X86_TRUE@am_libffi_la_OBJECTS =  debug.lo prep_cif.lo types.lo \
-@X86_TRUE@raw_api.lo ffi.lo sysv.lo
+@X86_TRUE@raw_api.lo java_raw_api.lo ffi.lo sysv.lo
 libffi_la_OBJECTS =  $(am_libffi_la_OBJECTS)
 noinst_PROGRAMS =  ffitest$(EXEEXT)
 PROGRAMS =  $(noinst_PROGRAMS)

From java-patches-return-584-listarch-java-patches=sourceware.cygnus.com@sourceware.cygnus.com Tue Mar 21 04:53:34 2000
Return-Path: <java-patches-return-584-listarch-java-patches=sourceware.cygnus.com@sourceware.cygnus.com>
Delivered-To: listarch-java-patches@sourceware.cygnus.com
Received: (qmail 13027 invoked by alias); 21 Mar 2000 04:53:33 -0000
Mailing-List: contact java-patches-help@sourceware.cygnus.com; run by ezmlm
Precedence: bulk
List-Subscribe: <mailto:java-patches-subscribe@sourceware.cygnus.com>
List-Archive: <http://sourceware.cygnus.com/ml/java-patches/>
List-Post: <mailto:java-patches@sourceware.cygnus.com>
List-Help: <mailto:java-patches-help@sourceware.cygnus.com>, <http://sourceware.cygnus.com/ml/#faqs>
Sender: java-patches-owner@sourceware.cygnus.com
Delivered-To: mailing list java-patches@sourceware.cygnus.com
Received: (qmail 13008 invoked from network); 21 Mar 2000 04:53:32 -0000
Message-ID: <38D700B2.4A762B18@albatross.co.nz>
Date: Tue, 21 Mar 2000 16:55:14 +1200
From: Bryce McKinlay <bryce@albatross.co.nz>
X-Mailer: Mozilla 4.7 [en] (X11; U; Linux 2.3.25 i686)
X-Accept-Language: en
MIME-Version: 1.0
To: java-patches@sourceware.cygnus.com
Subject: Patch: Extended test case for PR179
Content-Type: multipart/mixed;
 boundary="------------229F5E7E076B7059E5022E0A"

This is a multi-part message in MIME format.
--------------229F5E7E076B7059E5022E0A
Content-Type: text/plain; charset=us-ascii
Content-Transfer-Encoding: 7bit

I'm checking in this test case. It is based on the Alex's test case in
PR179 but adds extra checks for some related issues.

regards

  [ bryce ]


2000-03-21  Bryce McKinlay  <bryce@albatross.co.nz>

        Test case for PR libgcj/179:
        * libjava.lang/pr179.java: New file.
        * libjava.lang/pr179.out: New file.



--------------229F5E7E076B7059E5022E0A
Content-Type: text/plain; charset=us-ascii;
 name="pr179.java"
Content-Transfer-Encoding: 7bit
Content-Disposition: inline;
 filename="pr179.java"

// Extended regression test for the PR 179.
//
// This tests the ".class" language syntax, initialization behaviour for 
// Class.isInstance() and Class.isAssignableFrom(), and isAssignableFrom()
// functionality in the event that an interface argument that is not 
// implemented by any loaded class is given.
//
// Bryce McKinlay <bryce@albatross.co.nz>

class A
{
  static 
  {
    System.out.println("A initialized");
  }
}

interface IA {}

class B implements IA
{
  static 
  {
    System.out.println("B initialized");
  }
}

class C
{
  static 
  {
    System.out.println("C initialized");
  }
}

interface IB {}

public class pr179
{
  public static void main(String[] args)
  {
    System.out.println (A.class.isAssignableFrom (Object.class));
    System.out.println (IB.class.isAssignableFrom (B.class));
    System.out.println (IA.class.isAssignableFrom (B.class));
    A a = new A();
    System.out.println (C.class.isInstance (a));
    C c = new C();
    System.out.println (C.class.isInstance (c));
  }
}

/* Expected Output:
A initialized
false
B initialized
false
true
C initialized
false
true
*/

--------------229F5E7E076B7059E5022E0A
Content-Type: text/plain; charset=us-ascii;
 name="pr179.out"
Content-Transfer-Encoding: 7bit
Content-Disposition: inline;
 filename="pr179.out"

A initialized
false
B initialized
false
true
C initialized
false
true

--------------229F5E7E076B7059E5022E0A--

From java-patches-return-585-listarch-java-patches=sourceware.cygnus.com@sourceware.cygnus.com Tue Mar 21 05:13:24 2000
Return-Path: <java-patches-return-585-listarch-java-patches=sourceware.cygnus.com@sourceware.cygnus.com>
Delivered-To: listarch-java-patches@sourceware.cygnus.com
Received: (qmail 17561 invoked by alias); 21 Mar 2000 05:13:23 -0000
Mailing-List: contact java-patches-help@sourceware.cygnus.com; run by ezmlm
Precedence: bulk
List-Subscribe: <mailto:java-patches-subscribe@sourceware.cygnus.com>
List-Archive: <http://sourceware.cygnus.com/ml/java-patches/>
List-Post: <mailto:java-patches@sourceware.cygnus.com>
List-Help: <mailto:java-patches-help@sourceware.cygnus.com>, <http://sourceware.cygnus.com/ml/#faqs>
Sender: java-patches-owner@sourceware.cygnus.com
Delivered-To: mailing list java-patches@sourceware.cygnus.com
Received: (qmail 17525 invoked from network); 21 Mar 2000 05:13:17 -0000
Message-ID: <38D70557.8B9907A7@albatross.co.nz>
Date: Tue, 21 Mar 2000 17:15:03 +1200
From: Bryce McKinlay <bryce@albatross.co.nz>
X-Mailer: Mozilla 4.7 [en] (X11; U; Linux 2.3.25 i686)
X-Accept-Language: en
MIME-Version: 1.0
To: java-patches@sourceware.cygnus.com
Subject: Patch: Fix PR 179 and add class initialization calls
Content-Type: multipart/mixed;
 boundary="------------7C48322E7921E470EADA5325"

This is a multi-part message in MIME format.
--------------7C48322E7921E470EADA5325
Content-Type: text/plain; charset=us-ascii
Content-Transfer-Encoding: 7bit

My origional fix for PR 179 didn't quite solve the problem - although it
prevented crashes, it remained possible,  given JDK 1.1 ".class" syntax,
for isAssignableFrom() to be called on an unitialized class which did in
fact implement its interface argument, in which case an incorrect result
would be returned. Upon further investigation, it turns out that
instanceOf() and isAssignableFrom() should in fact cause initialization
of "this" and their arguments to occur.

The JLS (2nd ed draft, S 12.4.1) says:

"Invocation of certain reflective methods in class Class and in package
java.lang.reflect also causes class or interface initialization. A class
or interface
will not be initialized under any other circumstance."

This behaviour is confirmed by my new pr179 test case. With this patch,
gcj behaves correctly with either compiled or interpreted classes
[although there seems to be an unrelated problem with mixing bytecode
and compiled classes here].

Its possible that the reflection calls in Class should also cause
initialization, but I havn't tested or addressed this here.

I'm committing this.

regards

  [ bryce ]



--------------7C48322E7921E470EADA5325
Content-Type: text/plain; charset=us-ascii;
 name="pr179-2.patch"
Content-Transfer-Encoding: 7bit
Content-Disposition: inline;
 filename="pr179-2.patch"

2000-03-21  Bryce McKinlay  <bryce@albatross.co.nz>

        * java/lang/natClass.cc (isInstance): Initialize `this'.
        (isAssignableFrom): Initialize `this' and `klass'.
        (_Jv_IsAssignableFrom): If an interface has no idt, it is not
        implemented by any loaded class, so return false.


Index: java/lang/natClass.cc
===================================================================
RCS file: /cvs/java/libgcj/libjava/java/lang/natClass.cc,v
retrieving revision 1.20
diff -u -r1.20 natClass.cc
--- natClass.cc	2000/03/09 09:22:36	1.20
+++ natClass.cc	2000/03/21 04:31:51
@@ -613,6 +613,9 @@
 jboolean
 java::lang::Class::isAssignableFrom (jclass klass)
 {
+  // Arguments may not have been initialized, given ".class" syntax.
+  _Jv_InitClass (this);
+  _Jv_InitClass (klass);
   return _Jv_IsAssignableFrom (this, klass);
 }
 
@@ -621,6 +624,7 @@
 {
   if (! obj || isPrimitive ())
     return false;
+  _Jv_InitClass (this);
   return isAssignableFrom (obj->getClass());
 }
 
@@ -919,6 +923,8 @@
     {
       _Jv_IDispatchTable *cl_idt = source->idt;
       _Jv_IDispatchTable *if_idt = target->idt;
+      if (if_idt == NULL)
+	return false; // No class implementing TARGET has been loaded.    
       jshort cl_iindex = cl_idt->cls.iindex;
       if (cl_iindex <= if_idt->iface.ioffsets[0])
         {
@@ -927,7 +933,6 @@
 	      && cl_idt->cls.itable[offset] == target)
 	    return true;
 	}
-      return false;
     }
     
   return false;

--------------7C48322E7921E470EADA5325--

From java-patches-return-586-listarch-java-patches=sourceware.cygnus.com@sourceware.cygnus.com Tue Mar 21 05:21:08 2000
Return-Path: <java-patches-return-586-listarch-java-patches=sourceware.cygnus.com@sourceware.cygnus.com>
Delivered-To: listarch-java-patches@sourceware.cygnus.com
Received: (qmail 18469 invoked by alias); 21 Mar 2000 05:21:07 -0000
Mailing-List: contact java-patches-help@sourceware.cygnus.com; run by ezmlm
Precedence: bulk
List-Subscribe: <mailto:java-patches-subscribe@sourceware.cygnus.com>
List-Archive: <http://sourceware.cygnus.com/ml/java-patches/>
List-Post: <mailto:java-patches@sourceware.cygnus.com>
List-Help: <mailto:java-patches-help@sourceware.cygnus.com>, <http://sourceware.cygnus.com/ml/#faqs>
Sender: java-patches-owner@sourceware.cygnus.com
Delivered-To: mailing list java-patches@sourceware.cygnus.com
Received: (qmail 18441 invoked from network); 21 Mar 2000 05:21:06 -0000
Message-ID: <38D707A4.60046D18@albatross.co.nz>
Date: Tue, 21 Mar 2000 17:24:52 +1200
From: Bryce McKinlay <bryce@albatross.co.nz>
X-Mailer: Mozilla 4.7 [en] (X11; U; Linux 2.3.25 i686)
X-Accept-Language: en
MIME-Version: 1.0
To: java-patches@sourceware.cygnus.com
Subject: Patch: java/awt/Event.java
Content-Type: multipart/mixed;
 boundary="------------B4D6020739F638ADCC5B65FD"

This is a multi-part message in MIME format.
--------------B4D6020739F638ADCC5B65FD
Content-Type: text/plain; charset=us-ascii
Content-Transfer-Encoding: 7bit

This is an almost complete implementation of the AWT 1.0 event class. I
wrote it a while back with classpath in mind, but I never contributed
it. Now that we're not using classpath AWT it makes sense to contribute
it to libgcj instead. ok to commit?

regards

  [ bryce ]


--------------B4D6020739F638ADCC5B65FD
Content-Type: text/plain; charset=us-ascii;
 name="event.java.patch"
Content-Transfer-Encoding: 7bit
Content-Disposition: inline;
 filename="event.java.patch"

2000-03-21  Bryce McKinlay  <bryce@albatross.co.nz>

        * java/awt/Event.java: Add all the event type constants.
        (Event): Implemented constructors.
        (controlDown): Implemented.
        (metaDown): Implemented.
        (paramString): Stubbed.
        (shiftDown): Implemented.
        (toString): Implemented.
        (translate): Implemented.


Index: java/awt/Event.java
===================================================================
RCS file: /cvs/java/libgcj/libjava/java/awt/Event.java,v
retrieving revision 1.3
diff -u -r1.3 Event.java
--- Event.java	2000/03/07 19:55:25	1.3
+++ Event.java	2000/03/21 05:14:29
@@ -1,4 +1,4 @@
-/* Copyright (C) 1999  Free Software Foundation
+/* Copyright (C) 1999, 2000  Free Software Foundation
 
    This file is part of libjava.
 
@@ -8,19 +8,148 @@
 
 package java.awt;
 
-/* A very incomplete placeholder. */
+/**
+ * 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, except for the paramString()
+ * method, which is stubbed.
+ */
 
 public class Event
 {
+  public static final int SHIFT_MASK = 1,
+			  CTRL_MASK = 2,
+			  META_MASK = 4,
+			  ALT_MASK = 8;
+
+  public static final int ACTION_EVENT = 1001,
+			  BACK_SPACE = 8,
+			  CAPS_LOCK = 1022,
+			  DELETE = 127,
+			  DOWN = 1005,
+			  END = 1001,
+			  ENTER = 10,
+			  ESCAPE = 27,
+			  F1 = 1008,
+			  F10 = 1017,
+			  F11 = 1018,
+			  F12 = 1019,
+			  F2 = 1009,
+			  F3 = 1010,
+			  F4 = 1011,
+			  F5 = 1012,
+			  F6 = 1013,
+			  F7 = 1014,
+			  F8 = 1015,
+			  F9 = 1016,
+			  GOT_FOCUS = 1004,
+			  HOME = 1000,
+			  INSERT = 1025,
+			  KEY_ACTION = 403,
+			  KEY_ACTION_RELEASE = 404,
+			  KEY_PRESS = 401,
+			  KEY_RELEASE = 402,
+			  LEFT = 1006,
+			  LIST_DESELECT = 702,
+			  LIST_SELECT = 701,
+			  LOAD_FILE = 1002,
+			  LOST_FOCUS = 1005,
+			  MOUSE_DOWN = 501,
+			  MOUSE_DRAG = 506,
+			  MOUSE_ENTER = 504,
+			  MOUSE_EXIT = 505,
+			  MOUSE_MOVE = 503,
+			  MOUSE_UP = 502,
+			  NUM_LOCK = 1023,
+			  PAUSE = 1024,
+			  PGDN = 1003,
+			  PGUP = 1002,
+			  PRINT_SCREEN = 1020,
+			  RIGHT = 1007,
+			  SAVE_FILE = 1003,
+			  SCROLL_ABSOLUTE = 605,
+			  SCROLL_BEGIN = 606,
+			  SCROLL_END = 607,
+			  SCROLL_LINE_DOWN = 602,
+			  SCROLL_LINE_UP = 601,
+			  SCROLL_LOCK = 1021,
+			  SCROLL_PAGE_DOWN = 604,
+			  SCROLL_PAGE_UP = 603,
+			  TAB = 9,
+			  UP = 1004,
+			  WINDOW_DEICONIFY = 204,
+			  WINDOW_DESTROY = 201,
+			  WINDOW_EXPOSE = 202,
+			  WINDOW_ICONIFY = 203,
+			  WINDOW_MOVED = 205;
+
   public Event evt;
   public Object arg;
+  public int clickCount;
   public int id;
+  public int key; 
+  public int modifiers;
   public Object target;
+  public long when;
+  public int x;
+  public int y;
 
   public Event (Object target, int id, Object arg)
   {
     this.id = id;
     this.target = target;
     this.arg = arg;
+  }
+  
+  public Event (Object target, long when, int id, int x, int y, int key, 
+		int modifiers)
+  {
+    this.target = target;
+    this.when = when;
+    this.id = id;
+    this.x = x;
+    this.y = y;
+    this.key = key;
+    this.modifiers = modifiers;
+  }
+
+  public Event (Object target, long when, int id, int x, int y, int key, 
+	        int modifiers, Object arg) 
+  {
+    this (target, when, id, x, y, key, modifiers);
+    this.arg = arg;
+  }
+
+  public boolean controlDown ()
+  {
+    return ((modifiers & CTRL_MASK) == 0 ? false : true);
+  }
+
+  public boolean metaDown ()
+  {
+    return ((modifiers & META_MASK) == 0 ? false : true);
+  }
+
+  protected String paramString ()
+  {
+    return "Event.paramString() not implemented";
+  }
+
+  public boolean shiftDown() 
+  {
+    return ((modifiers & SHIFT_MASK) == 0 ? false : true);
+  }
+
+  public String toString()
+  {
+    String r = getClass() + "[id=" + id + ",x=" + x + ",y=" + y + "target=" 
+               + ((target == null) ? "null" : target) + "]";
+    return r;
+  }
+
+  public void translate (int x, int y)
+  {
+    this.x += x;
+    this.y += y;
   }
 }

--------------B4D6020739F638ADCC5B65FD--

From java-patches-return-587-listarch-java-patches=sourceware.cygnus.com@sourceware.cygnus.com Tue Mar 21 05:42:38 2000
Return-Path: <java-patches-return-587-listarch-java-patches=sourceware.cygnus.com@sourceware.cygnus.com>
Delivered-To: listarch-java-patches@sourceware.cygnus.com
Received: (qmail 21472 invoked by alias); 21 Mar 2000 05:42:38 -0000
Mailing-List: contact java-patches-help@sourceware.cygnus.com; run by ezmlm
Precedence: bulk
List-Subscribe: <mailto:java-patches-subscribe@sourceware.cygnus.com>
List-Archive: <http://sourceware.cygnus.com/ml/java-patches/>
List-Post: <mailto:java-patches@sourceware.cygnus.com>
List-Help: <mailto:java-patches-help@sourceware.cygnus.com>, <http://sourceware.cygnus.com/ml/#faqs>
Sender: java-patches-owner@sourceware.cygnus.com
Delivered-To: mailing list java-patches@sourceware.cygnus.com
Received: (qmail 21452 invoked from network); 21 Mar 2000 05:42:36 -0000
Message-ID: <38D70CA7.6C0A8B3@albatross.co.nz>
Date: Tue, 21 Mar 2000 17:46:15 +1200
From: Bryce McKinlay <bryce@albatross.co.nz>
X-Mailer: Mozilla 4.7 [en] (X11; U; Linux 2.3.25 i686)
X-Accept-Language: en
MIME-Version: 1.0
To: java-patches@sourceware.cygnus.com
Subject: Patch: Class.instanceOf()
Content-Type: multipart/mixed;
 boundary="------------673B28FE0E882C282B912FE0"

This is a multi-part message in MIME format.
--------------673B28FE0E882C282B912FE0
Content-Type: text/plain; charset=us-ascii
Content-Transfer-Encoding: 7bit

Oops, I forgot to put this in with the last patch. This makes
Class.instanceOf() a bit more efficient. Committed.

regards

  [ bryce ]


--------------673B28FE0E882C282B912FE0
Content-Type: text/plain; charset=us-ascii;
 name="class-instanceof.patch"
Content-Transfer-Encoding: 7bit
Content-Disposition: inline;
 filename="class-instanceof.patch"

2000-03-21  Bryce McKinlay  <bryce@albatross.co.nz>

        * java/lang/natClass.cc (isInstance): Use _Jv_IsAssignableFrom(),
        not Class.isAssignableFrom().

Index: java/lang/natClass.cc
===================================================================
RCS file: /cvs/java/libgcj/libjava/java/lang/natClass.cc,v
retrieving revision 1.21
diff -u -r1.21 natClass.cc
--- natClass.cc	2000/03/21 05:12:20	1.21
+++ natClass.cc	2000/03/21 05:35:32
@@ -625,7 +625,7 @@
   if (! obj || isPrimitive ())
     return false;
   _Jv_InitClass (this);
-  return isAssignableFrom (obj->getClass());
+  return _Jv_IsAssignableFrom (this, obj->getClass());
 }
 
 inline jboolean

--------------673B28FE0E882C282B912FE0--

From java-patches-return-588-listarch-java-patches=sourceware.cygnus.com@sourceware.cygnus.com Tue Mar 21 05:53:52 2000
Return-Path: <java-patches-return-588-listarch-java-patches=sourceware.cygnus.com@sourceware.cygnus.com>
Delivered-To: listarch-java-patches@sourceware.cygnus.com
Received: (qmail 24297 invoked by alias); 21 Mar 2000 05:53:52 -0000
Mailing-List: contact java-patches-help@sourceware.cygnus.com; run by ezmlm
Precedence: bulk
List-Subscribe: <mailto:java-patches-subscribe@sourceware.cygnus.com>
List-Archive: <http://sourceware.cygnus.com/ml/java-patches/>
List-Post: <mailto:java-patches@sourceware.cygnus.com>
List-Help: <mailto:java-patches-help@sourceware.cygnus.com>, <http://sourceware.cygnus.com/ml/#faqs>
Sender: java-patches-owner@sourceware.cygnus.com
Delivered-To: mailing list java-patches@sourceware.cygnus.com
Received: (qmail 24278 invoked from network); 21 Mar 2000 05:53:50 -0000
Message-ID: <38D70F51.A4B29976@albatross.co.nz>
Date: Tue, 21 Mar 2000 17:57:37 +1200
From: Bryce McKinlay <bryce@albatross.co.nz>
X-Mailer: Mozilla 4.7 [en] (X11; U; Linux 2.3.25 i686)
X-Accept-Language: en
MIME-Version: 1.0
To: java-patches@sourceware.cygnus.com
Subject: Patch: Class.instanceOf, again.
Content-Type: multipart/mixed;
 boundary="------------E93B869406E80CAC629E21BC"

This is a multi-part message in MIME format.
--------------E93B869406E80CAC629E21BC
Content-Type: text/plain; charset=us-ascii
Content-Transfer-Encoding: 7bit

This is the last time I change this method today, I promise ;-)

regards

  [ bryce ]


--------------E93B869406E80CAC629E21BC
Content-Type: text/plain; charset=us-ascii;
 name="class-instanceof-2.patch"
Content-Transfer-Encoding: 7bit
Content-Disposition: inline;
 filename="class-instanceof-2.patch"

2000-03-21  Bryce McKinlay  <bryce@albatross.co.nz>

        * java/lang/natClass.cc (isInstance): Use JV_CLASS, not getClass().

Index: java/lang/natClass.cc
===================================================================
RCS file: /cvs/java/libgcj/libjava/java/lang/natClass.cc,v
retrieving revision 1.22
diff -u -r1.22 natClass.cc
--- natClass.cc	2000/03/21 05:44:29	1.22
+++ natClass.cc	2000/03/21 05:52:43
@@ -625,7 +625,7 @@
   if (! obj || isPrimitive ())
     return false;
   _Jv_InitClass (this);
-  return _Jv_IsAssignableFrom (this, obj->getClass());
+  return _Jv_IsAssignableFrom (this, JV_CLASS (obj));
 }
 
 inline jboolean

--------------E93B869406E80CAC629E21BC--

From java-patches-return-589-listarch-java-patches=sourceware.cygnus.com@sourceware.cygnus.com Tue Mar 21 15:37:04 2000
Return-Path: <java-patches-return-589-listarch-java-patches=sourceware.cygnus.com@sourceware.cygnus.com>
Delivered-To: listarch-java-patches@sourceware.cygnus.com
Received: (qmail 11529 invoked by alias); 21 Mar 2000 15:37:03 -0000
Mailing-List: contact java-patches-help@sourceware.cygnus.com; run by ezmlm
Precedence: bulk
List-Subscribe: <mailto:java-patches-subscribe@sourceware.cygnus.com>
List-Archive: <http://sourceware.cygnus.com/ml/java-patches/>
List-Post: <mailto:java-patches@sourceware.cygnus.com>
List-Help: <mailto:java-patches-help@sourceware.cygnus.com>, <http://sourceware.cygnus.com/ml/#faqs>
Sender: java-patches-owner@sourceware.cygnus.com
Delivered-To: mailing list java-patches@sourceware.cygnus.com
Received: (qmail 11496 invoked from network); 21 Mar 2000 15:37:03 -0000
Date: Tue, 21 Mar 2000 07:37:01 -0800 (PST)
Message-Id: <200003211537.HAA03305@ferrule.cygnus.com>
From: Tom Tromey <tromey@cygnus.com>
To: Bryce McKinlay <bryce@albatross.co.nz>
Cc: java-patches@sourceware.cygnus.com
Subject: Re: Patch: java/awt/Event.java
In-Reply-To: <38D707A4.60046D18@albatross.co.nz>
References: <38D707A4.60046D18@albatross.co.nz>
X-Zippy:  TAPPING?  You POLITICIANS!  Don't you realize that the END of the
 ``Wash Cycle'' is a TREASURED MOMENT for most people?!
X-Attribution:  Tom

Bryce> This is an almost complete implementation of the AWT 1.0 event
Bryce> class. I wrote it a while back with classpath in mind, but I
Bryce> never contributed it. Now that we're not using classpath AWT it
Bryce> makes sense to contribute it to libgcj instead. ok to commit?

Please do!  Thanks.
I'd say you should feel free to check in whatever AWT classes you
might happen to write.

Tom

From java-patches-return-590-listarch-java-patches=sourceware.cygnus.com@sourceware.cygnus.com Wed Mar 22 21:21:35 2000
Return-Path: <java-patches-return-590-listarch-java-patches=sourceware.cygnus.com@sourceware.cygnus.com>
Delivered-To: listarch-java-patches@sourceware.cygnus.com
Received: (qmail 15772 invoked by alias); 22 Mar 2000 21:21:34 -0000
Mailing-List: contact java-patches-help@sourceware.cygnus.com; run by ezmlm
Precedence: bulk
List-Subscribe: <mailto:java-patches-subscribe@sourceware.cygnus.com>
List-Archive: <http://sourceware.cygnus.com/ml/java-patches/>
List-Post: <mailto:java-patches@sourceware.cygnus.com>
List-Help: <mailto:java-patches-help@sourceware.cygnus.com>, <http://sourceware.cygnus.com/ml/#faqs>
Sender: java-patches-owner@sourceware.cygnus.com
Delivered-To: mailing list java-patches@sourceware.cygnus.com
Received: (qmail 15748 invoked from network); 22 Mar 2000 21:21:30 -0000
To: Java Patch List <java-patches@sourceware.cygnus.com> 
Subject: Patch: more tests from Alex
X-Zippy:  But was he mature enough last night at the lesbian masquerade?
X-Attribution:  Tom
Bcc:
Reply-To:  tromey@cygnus.com
From:  Tom Tromey <tromey@cygnus.com>
Date: 22 Mar 2000 14:21:33 -0700
Message-ID: <871z52sntu.fsf@cygnus.com>
Lines: 319
X-Mailer: Gnus v5.5/Emacs 20.3

Here's a bunch of tests that Alex was using to test the compiler.
Many of these were never checked in before because until recently we
had no way to indicate that the compiler was supposed to give an error
for a particular file.

2000-03-22  Tom Tromey  <tromey@cygnus.com>

	* libjava.compile/iface.java: New file.
	* libjava.compile/static_3.java: New file.
	* libjava.compile/static_2.java: New file.
	* libjava.compile/static_1.xfail: New file.
	* libjava.compile/static_1.java: New file.
	* libjava.compile/redef6.xfail: New file.
	* libjava.compile/redef6.java: New file.
	* libjava.compile/redef5.xfail: New file.
	* libjava.compile/redef5.java: New file.
	* libjava.compile/redef4.xfail: New file.
	* libjava.compile/redef4.java: New file.
	* libjava.compile/redef3.xfail: New file.
	* libjava.compile/redef3.java: New file.
	* libjava.compile/redef2.xfail: New file.
	* libjava.compile/redef2.java: New file.
	* libjava.compile/redef1.xfail: New file.
	* libjava.compile/redef1.java: New file.
	* libjava.compile/not_a_redef.java: New file.
	* libjava.compile/inner_1.java: New file.
	* libjava.compile/static_init.xfail: New file.
	* libjava.compile/static_init.java: New file.

Tom

Index: libjava.compile/iface.java
===================================================================
RCS file: iface.java
diff -N iface.java
--- /dev/null	Tue May  5 13:32:27 1998
+++ iface.java	Wed Mar 22 13:17:37 2000
@@ -0,0 +1,24 @@
+// Test for searching through interface extension.
+
+interface basei
+{
+  public int method ();
+}
+
+interface basei2
+{
+  public int confuse ();
+}
+
+interface derivedi extends basei, basei2
+{
+  public void nothing ();
+}
+
+public class iface
+{
+  public int try_it (derivedi x)
+  {
+    return x.method ();
+  }
+}
Index: libjava.compile/inner_1.java
===================================================================
RCS file: inner_1.java
diff -N inner_1.java
--- /dev/null	Tue May  5 13:32:27 1998
+++ inner_1.java	Wed Mar 22 13:17:37 2000
@@ -0,0 +1,36 @@
+// inner class regression test.
+
+package bar.foo;
+
+class other {
+  class foo {}
+}
+
+class inner_1 {
+    static void bar () {
+        inner_1 xxxx;			// Refers to inner_1
+	bar.foo.another xyz;		// Refers to non inner another 
+	bar.foo.other.foo X;		// OK to declare, inner class foo
+	bar.foo.inner_1.t bar;		// Inner class t
+	inner_1.t foo;			// Inner class t
+	t foobar;			// Inner class t
+	other.foo zag;			// Valid for declaration.
+	t.ungah x;
+    }
+    void foo () {
+	// z.t.u foo;
+	t t1 = new t();
+        t1.print (); 
+	new t().print();
+    }
+
+    class t {
+	void print () {
+	    System.out.println ("This is `inner_1.t'");
+	}
+	class ungah {}
+    }
+}
+
+class another {
+} 
Index: libjava.compile/not_a_redef.java
===================================================================
RCS file: not_a_redef.java
diff -N not_a_redef.java
--- /dev/null	Tue May  5 13:32:27 1998
+++ not_a_redef.java	Wed Mar 22 13:17:37 2000
@@ -0,0 +1,6 @@
+package bar.foo;
+// This is not a redef.
+
+class not_a_redef {
+ class baz { class bar { class foo {}} class foo {}}	
+}
Index: libjava.compile/redef1.java
===================================================================
RCS file: redef1.java
diff -N redef1.java
--- /dev/null	Tue May  5 13:32:27 1998
+++ redef1.java	Wed Mar 22 13:17:37 2000
@@ -0,0 +1,6 @@
+package bar.foo;
+// A case of innerclass redefinition
+
+class redef1 {
+    class redef1 {}
+}
Index: libjava.compile/redef1.xfail
===================================================================
RCS file: redef1.xfail
diff -N redef1.xfail
--- /dev/null	Tue May  5 13:32:27 1998
+++ redef1.xfail	Wed Mar 22 13:17:37 2000
@@ -0,0 +1 @@
+shouldfail
Index: libjava.compile/redef2.java
===================================================================
RCS file: redef2.java
diff -N redef2.java
--- /dev/null	Tue May  5 13:32:27 1998
+++ redef2.java	Wed Mar 22 13:17:37 2000
@@ -0,0 +1,6 @@
+package bar.foo;
+// A case of innerclass redefinition
+
+class redef2 {
+    class foo {class redef2{}}
+}
Index: libjava.compile/redef2.xfail
===================================================================
RCS file: redef2.xfail
diff -N redef2.xfail
--- /dev/null	Tue May  5 13:32:27 1998
+++ redef2.xfail	Wed Mar 22 13:17:37 2000
@@ -0,0 +1 @@
+shouldfail
Index: libjava.compile/redef3.java
===================================================================
RCS file: redef3.java
diff -N redef3.java
--- /dev/null	Tue May  5 13:32:27 1998
+++ redef3.java	Wed Mar 22 13:17:37 2000
@@ -0,0 +1,6 @@
+package bar.foo;
+// A case of innerclass redefinition
+
+class redef3 {
+  class foo { class bar {} class bar {}}
+}
Index: libjava.compile/redef3.xfail
===================================================================
RCS file: redef3.xfail
diff -N redef3.xfail
--- /dev/null	Tue May  5 13:32:27 1998
+++ redef3.xfail	Wed Mar 22 13:17:37 2000
@@ -0,0 +1 @@
+shouldfail
Index: libjava.compile/redef4.java
===================================================================
RCS file: redef4.java
diff -N redef4.java
--- /dev/null	Tue May  5 13:32:27 1998
+++ redef4.java	Wed Mar 22 13:17:37 2000
@@ -0,0 +1,6 @@
+package bar.foo;
+// A case of innerclass redefinition
+
+class redef4 {
+  class foo { class bar { class foo {}}}
+}
Index: libjava.compile/redef4.xfail
===================================================================
RCS file: redef4.xfail
diff -N redef4.xfail
--- /dev/null	Tue May  5 13:32:27 1998
+++ redef4.xfail	Wed Mar 22 13:17:37 2000
@@ -0,0 +1 @@
+shouldfail
Index: libjava.compile/redef5.java
===================================================================
RCS file: redef5.java
diff -N redef5.java
--- /dev/null	Tue May  5 13:32:27 1998
+++ redef5.java	Wed Mar 22 13:17:37 2000
@@ -0,0 +1,6 @@
+package bar.foo;
+// Redefining and stuffing the redefined class with something
+
+class redef5 {
+  class redef5 {void foobar() {}}
+}
Index: libjava.compile/redef5.xfail
===================================================================
RCS file: redef5.xfail
diff -N redef5.xfail
--- /dev/null	Tue May  5 13:32:27 1998
+++ redef5.xfail	Wed Mar 22 13:17:37 2000
@@ -0,0 +1 @@
+shouldfail
Index: libjava.compile/redef6.java
===================================================================
RCS file: redef6.java
diff -N redef6.java
--- /dev/null	Tue May  5 13:32:27 1998
+++ redef6.java	Wed Mar 22 13:17:37 2000
@@ -0,0 +1,6 @@
+package bar.foo;
+// Redefining and stuffing the redefined class with something
+
+class redef6 {
+  class redef6 {int foo;}
+}
Index: libjava.compile/redef6.xfail
===================================================================
RCS file: redef6.xfail
diff -N redef6.xfail
--- /dev/null	Tue May  5 13:32:27 1998
+++ redef6.xfail	Wed Mar 22 13:17:37 2000
@@ -0,0 +1 @@
+shouldfail
Index: libjava.compile/static_1.java
===================================================================
RCS file: static_1.java
diff -N static_1.java
--- /dev/null	Tue May  5 13:32:27 1998
+++ static_1.java	Wed Mar 22 13:17:37 2000
@@ -0,0 +1,12 @@
+package bar.foo;
+
+class static_1 {
+    class bar {
+	// No Static members: methods, fields, inner classes.
+	static int foo;			
+	static int xyzzy (){return 0;}
+	static {}		
+	static class foo {}
+	// No Member interface FIXME
+        }
+}
Index: libjava.compile/static_1.xfail
===================================================================
RCS file: static_1.xfail
diff -N static_1.xfail
--- /dev/null	Tue May  5 13:32:27 1998
+++ static_1.xfail	Wed Mar 22 13:17:37 2000
@@ -0,0 +1 @@
+shouldfail
Index: libjava.compile/static_2.java
===================================================================
RCS file: static_2.java
diff -N static_2.java
--- /dev/null	Tue May  5 13:32:27 1998
+++ static_2.java	Wed Mar 22 13:17:37 2000
@@ -0,0 +1,10 @@
+package bar.foo;
+
+class static_2 {
+	static class koink {
+	 	static int i;					
+		static void foo (){}				
+		static {}					
+		static class foo {}				
+	}
+}
Index: libjava.compile/static_3.java
===================================================================
RCS file: static_3.java
diff -N static_3.java
--- /dev/null	Tue May  5 13:32:27 1998
+++ static_3.java	Wed Mar 22 13:17:37 2000
@@ -0,0 +1,5 @@
+package bar.foo;
+
+class static_3 {
+    static class zoink { static class zork {}}
+}
Index: libjava.compile/static_init.java
===================================================================
RCS file: static_init.java
diff -N static_init.java
--- /dev/null	Tue May  5 13:32:27 1998
+++ static_init.java	Wed Mar 22 13:17:37 2000
@@ -0,0 +1,4 @@
+class static_init
+{
+  native { }
+}
Index: libjava.compile/static_init.xfail
===================================================================
RCS file: static_init.xfail
diff -N static_init.xfail
--- /dev/null	Tue May  5 13:32:27 1998
+++ static_init.xfail	Wed Mar 22 13:17:37 2000
@@ -0,0 +1 @@
+shouldfail

From java-patches-return-591-listarch-java-patches=sourceware.cygnus.com@sourceware.cygnus.com Thu Mar 23 12:29:08 2000
Return-Path: <java-patches-return-591-listarch-java-patches=sourceware.cygnus.com@sourceware.cygnus.com>
Delivered-To: listarch-java-patches@sourceware.cygnus.com
Received: (qmail 5197 invoked by alias); 23 Mar 2000 12:29:08 -0000
Mailing-List: contact java-patches-help@sourceware.cygnus.com; run by ezmlm
Precedence: bulk
List-Subscribe: <mailto:java-patches-subscribe@sourceware.cygnus.com>
List-Archive: <http://sourceware.cygnus.com/ml/java-patches/>
List-Post: <mailto:java-patches@sourceware.cygnus.com>
List-Help: <mailto:java-patches-help@sourceware.cygnus.com>, <http://sourceware.cygnus.com/ml/#faqs>
Sender: java-patches-owner@sourceware.cygnus.com
Delivered-To: mailing list java-patches@sourceware.cygnus.com
Received: (qmail 5173 invoked from network); 23 Mar 2000 12:29:03 -0000
Message-ID: <38DA0DC9.844C6857@albatross.co.nz>
Date: Fri, 24 Mar 2000 00:27:53 +1200
From: Bryce McKinlay <bryce@albatross.co.nz>
X-Mailer: Mozilla 4.7 [en] (X11; I; Linux 2.3.99-pre1 i686)
X-Accept-Language: en
MIME-Version: 1.0
To: java-patches@sourceware.cygnus.com
Subject: Patch: New threads regression tests
Content-Type: multipart/mixed;
 boundary="------------F9EAEAFBDE9012CEB928FC27"

This is a multi-part message in MIME format.
--------------F9EAEAFBDE9012CEB928FC27
Content-Type: text/plain; charset=us-ascii
Content-Transfer-Encoding: 7bit

2000-03-23  Bryce McKinlay  <bryce@albatross.co.nz>

        * libjava.lang/Thread_Wait.java: New file.
        * libjava.lang/Thread_Sleep.java: New file.
        * libjava.lang/Thread_Monitor.java: New file.
        * libjava.lang/Thread_Wait.out: New file.
        * libjava.lang/Thread_Sleep.out: New file.
        * libjava.lang/Thread_Monitor.out: New file.
        * libjava.lang/Thread_Interrupt.java: New file.
        * libjava.lang/Thread_Wait_2.java: New file.
        * libjava.lang/Thread_Wait_2.out: New file.
        * libjava.lang/Thread_Wait_Interrupt.java: New file.
        * libjava.lang/Thread_Wait_Interrupt.out: New file.
        * libjava.lang/Thread_Interrupt.out: New file.
        * libjava.lang/Thread_Join.java: New file.
        * libjava.lang/Thread_Join.out: New file.
        * libjava.lang/Thread_Alive.java: New file.
        * libjava.lang/Thread_Alive.out: New file.

I'm checking these in.

regards

  [ bryce ]


--------------F9EAEAFBDE9012CEB928FC27
Content-Type: text/plain; charset=us-ascii;
 name="Thread_Wait.java"
Content-Transfer-Encoding: 7bit
Content-Disposition: inline;
 filename="Thread_Wait.java"

// Test basic thread creation and wait/notify functionality.
// Origin: Bryce McKinlay <bryce@albatross.co.nz>

public class Thread_Wait implements Runnable
{
  public static void main(String args[])
  {
    new Thread_Wait();
  }
  
  public Thread_Wait()
  {
    System.out.println("creating thread");
    Thread t = new Thread(this);
    t.start();
    
    try
    {
      Thread.sleep(100);
    }
    catch (Exception x)
    {
      System.out.println("exception occured: " + x);
    }

    synchronized (this)
    {
      System.out.println("notifying other thread");
      notify();
    }
  }
  
  public void run()
  {
    System.out.println ("new thread running");
    synchronized (this)
    {
      try
      {
	wait();
      }
      catch (Exception x)
      {
        System.out.println("exception occured: " + x);
      }
    }    
    System.out.println ("thread notified okay");
  }
}

--------------F9EAEAFBDE9012CEB928FC27
Content-Type: text/plain; charset=us-ascii;
 name="Thread_Alive.java"
Content-Transfer-Encoding: 7bit
Content-Disposition: inline;
 filename="Thread_Alive.java"

// Test the status of the isAlive() flag before, during, and after thread 
// execution. Check that thread's threadgroup is null after thread exits.
// Origin: Bryce McKinlay <bryce@albatross.co.nz>

public class Thread_Alive implements Runnable
{
  public static void main(String args[]) throws InterruptedException
  {
    Thread_Alive ta = new Thread_Alive();
    Thread t = new Thread(ta);
    System.out.println(t.isAlive());
    t.start();
    System.out.println(t.isAlive());

    Thread.sleep(100);
    
    synchronized (ta)
    {
      ta.notifyAll();
    }

    t.join();
    System.out.println(t.isAlive());
    
    try
    {
      t.start();
      System.out.println("Error: dead thread can be restarted.");
    }
    catch (IllegalThreadStateException x)
    {
      System.out.println ("ok");
    }

    System.out.println(t.getThreadGroup());
  }
  
  public synchronized void run()
  {
    try
    {
      wait();
    }
    catch (InterruptedException x) {}
  }
  
}

--------------F9EAEAFBDE9012CEB928FC27
Content-Type: text/plain; charset=us-ascii;
 name="Thread_Alive.out"
Content-Transfer-Encoding: 7bit
Content-Disposition: inline;
 filename="Thread_Alive.out"

false
true
false
ok
null

--------------F9EAEAFBDE9012CEB928FC27
Content-Type: text/plain; charset=us-ascii;
 name="Thread_Interrupt.java"
Content-Transfer-Encoding: 7bit
Content-Disposition: inline;
 filename="Thread_Interrupt.java"

// Test interrupt() behaviour on a thread in wait(), sleep(), and spinning 
// in a loop.
// Origin: Bryce McKinlay <bryce@albatross.co.nz>

class Waiter extends Thread
{
  public synchronized void run()
  {
    System.out.println ("wait()");
    try
    {
      wait();
      System.out.println("Error: wait() completed normally.");
    }
    catch (InterruptedException x)
    {
      if (isInterrupted() || interrupted()) 
        System.out.println("Error: interrupt flag is still set.");
    
    }
      System.out.println("interrupted - ok");
  }
}

class Sleeper extends Thread
{
  public void run()
  {
    System.out.println ("sleep()");
    try
    {
      sleep(2000);
      System.out.println("Error: sleep() completed normally.");
    }
    catch (InterruptedException x)
    {
      if (isInterrupted() || interrupted()) 
        System.out.println("Error: interrupt flag is still set.");
    
      System.out.println("interrupted - ok");
    }
  }
}

class Looper extends Thread
{
  public void run()
  {
    System.out.println ("Busy waiting");

    int count = 0;
    for (int i=0; i < 1000000; i++)
      {
        Thread.yield();
	count += 5;
	if (isInterrupted ())
	  break;
      }
    synchronized (this)
    {  
      if (interrupted ())
	{
	  System.out.println ("interrupted - ok");
	  if (isInterrupted () || interrupted ())
	    System.out.println("Error: interrupt flag is still set.");
	}
      else
	System.out.println ("Error: Busy wait was not interrupted.");          
    }
  }
}

class Joiner extends Thread
{
  public void run()
  {
    System.out.println("join()");
    try
    {
      join(2000);
      System.out.println("Error: join() completed normally??!");
    }
    catch (InterruptedException x)
    {
      if (isInterrupted() || interrupted()) 
        System.out.println("Error: interrupt flag is still set.");
    
      System.out.println("interrupted - ok");
    }

  }
}

public class Thread_Interrupt
{
  public static void main(String args[])
  {
    Waiter w = new Waiter();
    w.start ();
    sleep_and_interrupt (w);
    
    Sleeper s = new Sleeper();
    s.start ();
    sleep_and_interrupt (s);

    Looper l = new Looper ();
    l.start ();
    sleep_and_interrupt (l);

    Joiner j = new Joiner ();
    j.start ();
    sleep_and_interrupt (j);
  }
  
  public static void sleep_and_interrupt(Thread t)
  {
    try
    {
      Thread.sleep (250);
      t.interrupt ();
      long t1 = System.currentTimeMillis();
      t.join (5000);
      long time = System.currentTimeMillis() - t1;
      if (time > 2900)
        {
	  System.out.println ("Error: join() from main thread timed out");
	}
    }
    catch (InterruptedException x)
    {
      System.out.println("Error: main thread interrupted.");
    }
  }
}

--------------F9EAEAFBDE9012CEB928FC27
Content-Type: text/plain; charset=us-ascii;
 name="Thread_Interrupt.out"
Content-Transfer-Encoding: 7bit
Content-Disposition: inline;
 filename="Thread_Interrupt.out"

wait()
interrupted - ok
sleep()
interrupted - ok
Busy waiting
interrupted - ok
join()
interrupted - ok

--------------F9EAEAFBDE9012CEB928FC27
Content-Type: text/plain; charset=us-ascii;
 name="Thread_Join.java"
Content-Transfer-Encoding: 7bit
Content-Disposition: inline;
 filename="Thread_Join.java"

// Many threads join a single thread.
// Origin: Bryce McKinlay <bryce@albatross.co.nz>

class Sleeper implements Runnable
{
  int num = -1;
  
  public Sleeper(int num)
  {
    this.num = num;
  }
  
  public void run()
  {
    System.out.println("sleeping");
    try
    {
      Thread.sleep(500);
    }
    catch (InterruptedException x)
    {
      System.out.println("sleep() interrupted");
    }
    System.out.println("done");
  }
}

class Joiner implements Runnable
{
  Thread join_target;
  
  public Joiner(Thread t)
  {
    this.join_target = t;
  }
  
  public void run()
  {
    try
    {
      long start = System.currentTimeMillis();
      join_target.join(2000);
      if ((System.currentTimeMillis() - start) > 1900)
        System.out.println("Error: Join timed out");
      else
        System.out.println("ok");
    }
    catch (InterruptedException x)
    {
      System.out.println("join() interrupted");
    }
  }
  
}

public class Thread_Join
{
  public static void main(String[] args)
  {
    Thread primary = new Thread(new Sleeper(1));
    primary.start();
    for (int i=0; i < 10; i++)
    {
      Thread t = new Thread(new Joiner(primary));
      t.start();
    }
  }
}

--------------F9EAEAFBDE9012CEB928FC27
Content-Type: text/plain; charset=us-ascii;
 name="Thread_Join.out"
Content-Transfer-Encoding: 7bit
Content-Disposition: inline;
 filename="Thread_Join.out"

sleeping
done
ok
ok
ok
ok
ok
ok
ok
ok
ok
ok

--------------F9EAEAFBDE9012CEB928FC27
Content-Type: text/plain; charset=us-ascii;
 name="Thread_Monitor.java"
Content-Transfer-Encoding: 7bit
Content-Disposition: inline;
 filename="Thread_Monitor.java"

// Test that monitor locks work and are recursive.
// Origin: Bryce McKinlay <bryce@albatross.co.nz>

class T implements Runnable
{
  public int count = 0;
  Counter c;
  
  public T (Counter c)
  {
    this.c = c;
  }

  public void run()
  {
    while (true)
      {
        // NOTE: double-synchronization here.
	synchronized (c)
	{
	  if (c.getCount() <= 100000)
	    count++;
	  else
	    break;
	}
      }
  }
}

class Counter
{
  int i = 0;
  public synchronized int getCount ()
  {
    return ++i; 
  }
}

public class Thread_Monitor
{
  public static void main(String args[])
  {
    Counter c = new Counter();
    T t1 = new T(c);
    T t2 = new T(c);
    
    Thread th1 = new Thread(t1);
    Thread th2 = new Thread(t2);
    th1.start();
    th2.start();
    try
    {
      th1.join();
      th2.join();
    } 
    catch (InterruptedException x)
    {
      System.out.println("failed: Interrupted");
    }
    if (t1.count + t2.count == 100000)
      System.out.println ("ok");
    else
      System.out.println ("failed: total count incorrect");
  }
}

--------------F9EAEAFBDE9012CEB928FC27
Content-Type: text/plain; charset=us-ascii;
 name="Thread_Monitor.out"
Content-Transfer-Encoding: 7bit
Content-Disposition: inline;
 filename="Thread_Monitor.out"

ok

--------------F9EAEAFBDE9012CEB928FC27
Content-Type: text/plain; charset=us-ascii;
 name="Thread_Sleep.java"
Content-Transfer-Encoding: 7bit
Content-Disposition: inline;
 filename="Thread_Sleep.java"

// Test that Thread.sleep() works.
// Origin: Bryce McKinlay <bryce@albatross.co.nz>

public class Thread_Sleep
{
  public static void main(String args[])
  {
    try
    {
      long start = System.currentTimeMillis();
      System.out.println("sleeping");
      Thread.sleep(1000);
      long end = System.currentTimeMillis();
      if ((end - start) > 1100 || (end - start) < 990)
        System.out.println ("failed");
      else
	System.out.println("ok");
    }
    catch (InterruptedException x)
    {
      System.out.println("error: Thread interrupted.");
    }
  }
}

--------------F9EAEAFBDE9012CEB928FC27
Content-Type: text/plain; charset=us-ascii;
 name="Thread_Sleep.out"
Content-Transfer-Encoding: 7bit
Content-Disposition: inline;
 filename="Thread_Sleep.out"

sleeping
ok

--------------F9EAEAFBDE9012CEB928FC27
Content-Type: text/plain; charset=us-ascii;
 name="Thread_Wait.out"
Content-Transfer-Encoding: 7bit
Content-Disposition: inline;
 filename="Thread_Wait.out"

creating thread
new thread running
notifying other thread
thread notified okay

--------------F9EAEAFBDE9012CEB928FC27
Content-Type: text/plain; charset=us-ascii;
 name="Thread_Wait_2.java"
Content-Transfer-Encoding: 7bit
Content-Disposition: inline;
 filename="Thread_Wait_2.java"

// Create many threads waiting on a monitor. Interrupt some of them. Do the 
// others wake up correctly with notify() and/or notifyAll()?
// Origin: Bryce McKinlay <bryce@albatross.co.nz>

import java.util.Vector;

class Waiter extends Thread
{
  Object monitor;
  int thread_num;
  boolean interrupted = false;
  boolean notified = false;

  Waiter (Object monitor, int thread_num)
  {
    this.monitor = monitor;
    this.thread_num = thread_num;
  }  
  
  public void run()
  {
    synchronized (monitor)
      {
	try
	{
	  monitor.wait();
	  notified = true;
	}
	catch (InterruptedException x)
	{
	  interrupted = true;
	}
      }
    
  }
}

public class Thread_Wait_2
{
  static Vector threads;
  static Object monitor = new Object();
  
  static final int NUM_THREADS = 10;
  
  public static void main(String args[])
  {
    
    
    try
    {
      makeThreads ();
      
      Thread.sleep(250);
      
      // Interrupt a few threads...
      Waiter i1 = (Waiter) threads.elementAt(3);
      Waiter i2 = (Waiter) threads.elementAt(4);
      Waiter i3 = (Waiter) threads.elementAt(9);
      i1.interrupt();
      i2.interrupt();
      i3.interrupt();
      
      // Call notify the exact number of times required to wake the remaining
      // threads.
      synchronized (monitor)
      {
	for (int i=0; i < NUM_THREADS -3 ; i++)
	{
	  monitor.notify ();
	}
      }
      
      joinAll();
      printStatus();
      
      // Repeat all the above, but use notifyAll() instead.
      makeThreads();

      Thread.sleep(250);
      
      // Interrupt a few threads...
      i1 = (Waiter) threads.elementAt(0);
      i2 = (Waiter) threads.elementAt(1);
      i3 = (Waiter) threads.elementAt(9);
      i1.interrupt();
      i2.interrupt();
      i3.interrupt();
      
      // Call notifyAll to wake the remaining threads.
      synchronized (monitor)
      {
        monitor.notifyAll ();
      }

      joinAll();
      printStatus();

    }
    catch (InterruptedException x)
    {
      System.out.println (x);
    }


  }
  
  static void makeThreads()
  {
    threads = new Vector(NUM_THREADS);
    
    for (int i=0; i < NUM_THREADS; i++)
      {
	Waiter w = new Waiter(monitor, i);
	w.start();
	threads.addElement(w);
      }
  }
  
  static void joinAll()
  {
    try
    {
      for (int i=0; i < threads.size(); i++)
	{
          Thread t = (Thread) threads.elementAt(i);
	  t.join();
	}
    }
    catch (InterruptedException x) {}
  }
  
  static void printStatus()
  {
    for (int i=0; i < threads.size(); i++)
      {
        Waiter w = (Waiter) threads.elementAt(i);
	if (w.interrupted)
	  System.out.println (i + " interrupted.");
	if (w.notified)
	  System.out.println (i + " notified.");
      }
  }
  
}

--------------F9EAEAFBDE9012CEB928FC27
Content-Type: text/plain; charset=us-ascii;
 name="Thread_Wait_2.out"
Content-Transfer-Encoding: 7bit
Content-Disposition: inline;
 filename="Thread_Wait_2.out"

0 notified.
1 notified.
2 notified.
3 interrupted.
4 interrupted.
5 notified.
6 notified.
7 notified.
8 notified.
9 interrupted.
0 interrupted.
1 interrupted.
2 notified.
3 notified.
4 notified.
5 notified.
6 notified.
7 notified.
8 notified.
9 interrupted.

--------------F9EAEAFBDE9012CEB928FC27
Content-Type: text/plain; charset=us-ascii;
 name="Thread_Wait_Interrupt.java"
Content-Transfer-Encoding: 7bit
Content-Disposition: inline;
 filename="Thread_Wait_Interrupt.java"

// Create two threads waiting on a monitor. Interrupt one of them. Does the 
// other wake up correctly?
// Origin: Bryce McKinlay <bryce@albatross.co.nz>

class Waiter extends Thread
{
  Object monitor;
  int thread_num;
  boolean interrupted = false;
  boolean notified = false; 

  Waiter (Object monitor, int thread_num)
  {
    this.monitor = monitor;
    this.thread_num = thread_num;
  }
  
  public void run()
  {
    synchronized (monitor)
      {
        System.out.println ("Thread waiting.");
	try
	{
	  long start = System.currentTimeMillis();
	  monitor.wait(1000);
	  long time = System.currentTimeMillis() - start;
	  if (time > 990)
	    System.out.println ("Error: wait on thread " + thread_num 
	                        + " timed out.");
	  else
	    notified = true;
	}
	catch (InterruptedException x)
	{
	  interrupted = true;
	}
      }
    
  }
}

public class Thread_Wait_Interrupt
{
  public static void main(String args[])
  {
    Object monitor = new Object();
    Waiter w1 = new Waiter(monitor, 1);
    Waiter w2 = new Waiter(monitor, 2);
    w1.start();
    w2.start();
    try
    {
      Thread.sleep(250);

      synchronized (monitor)
      {
	w1.interrupt();
	monitor.notify();
      }

      w1.join();
      w2.join();
      System.out.println("join ok");
      System.out.println("Thread 1 " + 
                         (w1.interrupted ? "interrupted ok" : "error"));
      System.out.println("Thread 2 " +
                         (w2.notified ? "notified ok" : "error"));

    }
    catch (InterruptedException x)
    {
      System.out.println (x);
    }
  }
}

--------------F9EAEAFBDE9012CEB928FC27
Content-Type: text/plain; charset=us-ascii;
 name="Thread_Wait_Interrupt.out"
Content-Transfer-Encoding: 7bit
Content-Disposition: inline;
 filename="Thread_Wait_Interrupt.out"

Thread waiting.
Thread waiting.
join ok
Thread 1 interrupted ok
Thread 2 notified ok

--------------F9EAEAFBDE9012CEB928FC27--

From java-patches-return-592-listarch-java-patches=sourceware.cygnus.com@sourceware.cygnus.com Thu Mar 23 13:56:27 2000
Return-Path: <java-patches-return-592-listarch-java-patches=sourceware.cygnus.com@sourceware.cygnus.com>
Delivered-To: listarch-java-patches@sourceware.cygnus.com
Received: (qmail 5701 invoked by alias); 23 Mar 2000 13:56:26 -0000
Mailing-List: contact java-patches-help@sourceware.cygnus.com; run by ezmlm
Precedence: bulk
List-Subscribe: <mailto:java-patches-subscribe@sourceware.cygnus.com>
List-Archive: <http://sourceware.cygnus.com/ml/java-patches/>
List-Post: <mailto:java-patches@sourceware.cygnus.com>
List-Help: <mailto:java-patches-help@sourceware.cygnus.com>, <http://sourceware.cygnus.com/ml/#faqs>
Sender: java-patches-owner@sourceware.cygnus.com
Delivered-To: mailing list java-patches@sourceware.cygnus.com
Received: (qmail 5675 invoked from network); 23 Mar 2000 13:56:19 -0000
Message-ID: <38DA22B3.3A862FB2@albatross.co.nz>
Date: Fri, 24 Mar 2000 01:57:07 +1200
From: Bryce McKinlay <bryce@albatross.co.nz>
X-Mailer: Mozilla 4.7 [en] (X11; I; Linux 2.3.99-pre1 i686)
X-Accept-Language: en
MIME-Version: 1.0
To: java-patches@sourceware.cygnus.com
Subject: Patch: posix-threads code update
Content-Type: multipart/mixed;
 boundary="------------E8CCD97FD2F750BBE26CAEF3"

This is a multi-part message in MIME format.
--------------E8CCD97FD2F750BBE26CAEF3
Content-Type: text/plain; charset=us-ascii
Content-Transfer-Encoding: 7bit

This patch improves the posix-threads code. It should fix a lot of bugs,
improve portability, and reduce code complexity.

The major changes are:

1. We no longer (ever) use the platform-native implementation of
recursive mutexes. These are a non-standard extension to the
posix-threads spec, are buggy on some platforms when they do exist, and
do not interact well with pthread_cond_wait(). Instead, we now implement
recursion ourselves in the _Jv_MutexLock()/_Jv_MutexUnlock() calls.

2. We now use our own interruptable condition variables to implement
wait()/sleep()/join(). Each thread has its own associated 'native'
condition variable and mutex that is used to implement waiting. For each
libgcj condition variable, a linked list of threads waiting on that
variable is maintained. When a condition variable is notified, it picks
one waiting thread, signals it, and removes it from the linked list of
waiters (wait set). When a thread is interrupted (or if a wait timeout
occurs), the thread removes itself from the wait set for the condition
variable it is waiting on. This implementation is based on a suggestion
from Tom Tromey (thanks, Tom).

The patch also fixes a few other threads bugs, which should be
self-explanitory.

I'm awaiting review of this code. Enjoy!

regards

  [ bryce ]



--------------E8CCD97FD2F750BBE26CAEF3
Content-Type: text/plain; charset=us-ascii;
 name="libgcj-threads-000323.patch"
Content-Transfer-Encoding: 7bit
Content-Disposition: inline;
 filename="libgcj-threads-000323.patch"

2000-03-23  Bryce McKinlay  <bryce@albatross.co.nz>

	* Makefile.in: New #defines and friends for Thread.h.
	* posix-threads.cc: (struct starter): Remove `object'.
	(_Jv_CondWait): Use interruptable condition variables and new
	recursive mutexes.
	(_Jv_CondNotify): Ditto.
	(_Jv_CondNotifyAll): Ditto.
	(_Jv_ThreadInterrupt): Set thread interrupt flag directly. Interrupt
	the target thread by signaling its wait condition.
	(_Jv_ThreadInitData): Set `thread_obj' in the thread data struct,
	not the starter struct. Initialize wait_mutex and wait_cond.
	(_Jv_MutexLock): New recursive mutex implementation. Moved from 
	posix-threads.h.
	(_Jv_MutexUnlock): Ditto.
	(really_start): Set info->data->thread from pthread_self() to work 
	around a race condition.	
	* java/lang/Thread.java: (isInterrupted_): Renamed to overloaded
	`isInterrupted(boolean)'. Clear interrupted flag if clear_flag is
	set.
	startable_flag: New private field.
	(Thread): Initialize `startable_flag'.
	(toString): Check for null thread group.
	* java/lang/natThread.cc: (struct natThread): New fields 
	`join_mutex', `join_cond'. Removed fields `joiner', `next'.
	(class locker): Removed.
	(initialize_native): Initialize `join_cond' and `join_mutex'.
	(interrupt): Now just calls _Jv_ThreadInterrupt().
	(join): Simplified. Just wait on the target thread's join condition.
	(finish_): Remove join list code. Unset thread group. Signal
	potential joiners by notifying the dying threads join_cond.
	(start): Check for illegal restarts.
	* java/lang/natObject.cc: Check for return value of _Jv_CondWait and
	act appropriatly.
	* include/posix-threads.h: Remove all HAVE_RECURSIVE_MUTEX related
	#defines and #ifdefs.
	(struct _Jv_Thread_t): New fields `thread_obj', `wait_cond',
	`wait_mutex', `next'.
	(struct _Jv_ConditionVariable_t): Declare as a struct.
	(struct _Jv_Mutex_t): New recursive implementation.
	(_Jv_PthreadCheckMonitor): Reimplemented. Simple `owner' check.
	_Jv_HaveCondDestroy: Never define this for posix-threads.
	(_Jv_CondNotify): Remove inline implementation(s), prototype instead.
	(_Jv_CondNotifyAll): Ditto.
	(_Jv_MutexLock): Ditto.
	(_Jv_MutexUnlock): Ditto.
	(_Jv_MutexInit): Changed to reflect new mutex implementation.
	(_Jv_MutexDestroy): Ditto.
	(_Jv_CondDestroy): Removed.

Index: Makefile.in
===================================================================
RCS file: /cvs/java/libgcj/libjava/Makefile.in,v
retrieving revision 1.57
diff -u -r1.57 Makefile.in
--- Makefile.in	2000/03/17 00:45:06	1.57
+++ Makefile.in	2000/03/23 13:50:34
@@ -1635,9 +1635,14 @@
 	$(GCJH) -classpath $(top_builddir) \
 		-prepend 'class _Jv_JNIEnv;' \
 		-prepend 'extern "Java" { namespace gnu { namespace gcj { namespace jni { class NativeThread; } } } };' \
+		-prepend '#define _JV_NOT_OWNER 1' \
+		-prepend '#define _JV_INTERRUPTED 2' \
 		-friend '_Jv_JNIEnv * _Jv_GetCurrentJNIEnv ();' \
 		-friend 'void _Jv_SetCurrentJNIEnv (_Jv_JNIEnv *env);' \
 		-friend 'class gnu::gcj::jni::NativeThread;' \
+		-friend 'int _Jv_CondWait (_Jv_ConditionVariable_t *cv, _Jv_Mutex_t *mu, jlong millis, jint nanos);' \
+		-friend 'int _Jv_CondNotify (_Jv_ConditionVariable_t *cv, _Jv_Mutex_t *mu);' \
+		-friend 'void _Jv_ThreadInterrupt (_Jv_Thread_t *data);' \
 		$(basename $<)
 
 java/lang/String.h: java/lang/String.class libgcj.zip
Index: posix-threads.cc
===================================================================
RCS file: /cvs/java/libgcj/libjava/posix-threads.cc,v
retrieving revision 1.17
diff -u -r1.17 posix-threads.cc
--- posix-threads.cc	2000/03/07 19:55:24	1.17
+++ posix-threads.cc	2000/03/23 13:50:42
@@ -40,7 +40,6 @@
 struct starter
 {
   _Jv_ThreadStartFunc *method;
-  java::lang::Thread *object;
   _Jv_Thread_t *data;
 };
 
@@ -78,30 +77,23 @@
 
 
 
+// Wait for the condition variable "CV" to be notified. 
+// Return values:
+// 0: the condition was notified, or the timeout expired.
+// _JV_NOT_OWNER: the thread does not own the mutex "MU".   
+// _JV_INTERRUPTED: the thread was interrupted. Its interrupted flag is set.   
 int
 _Jv_CondWait (_Jv_ConditionVariable_t *cv, _Jv_Mutex_t *mu,
 	      jlong millis, jint nanos)
 {
-  if (_Jv_PthreadCheckMonitor (mu))
-    return 1;
+  pthread_t self = pthread_self();
+  if (mu->owner != self)
+    return _JV_NOT_OWNER;
 
-  int r;
-  pthread_mutex_t *pmu = _Jv_PthreadGetMutex (mu);
   struct timespec ts;
-  jlong m, m2, startTime;
-  bool done_sleeping = false;
+  jlong m, startTime;
 
-  if (millis == 0 && nanos == 0)
-    {
-#ifdef LINUX_THREADS
-      // pthread_cond_timedwait can be interrupted by a signal on linux, while
-      // pthread_cond_wait can not. So pthread_cond_timedwait() forever.
-      m = java::lang::Long::MAX_VALUE;
-      ts.tv_sec = LONG_MAX;
-      ts.tv_nsec = 0;
-#endif
-    }
-  else
+  if (millis > 0 || nanos > 0)
     {
       startTime = java::lang::System::currentTimeMillis();
       m = millis + startTime;
@@ -109,173 +101,179 @@
       ts.tv_nsec = ((m % 1000) * 1000000) + nanos; 
     }
 
-  java::lang::Thread *current = _Jv_ThreadCurrent();
+  _Jv_Thread_t *current = _Jv_ThreadCurrentData ();
+  java::lang::Thread *current_obj = _Jv_ThreadCurrent ();
+
+  // Add this thread to the cv's wait set.
+  current->next = NULL;
+
+  if (cv->first == NULL)
+    cv->first = current;
+  else
+    for (_Jv_Thread_t *t = cv->first;; t = t->next)
+      {
+        if (t->next == NULL)
+          {
+            t->next = current;
+            break;
+          }
+      }
+
+  pthread_mutex_lock (&current->wait_mutex);
+  
+  // Now that we hold the wait mutex, check if this thread has been 
+  // interrupted already.
+  if (current_obj->interrupt_flag)
+    {
+      pthread_mutex_unlock (&current->wait_mutex);
+      return _JV_INTERRUPTED;
+    }
+
+  // Record the current lock depth, so it can be restored when we reaquire it.
+  int count = mu->count;
+
+  // Release the monitor mutex.
+  mu->count = 0;
+  mu->owner = 0;
+  pthread_mutex_unlock (&mu->mutex);
+  
+  int r = 0;
+  bool done_sleeping = false;
+
+  while (! done_sleeping)
+    {
+      if (millis == 0 && nanos == 0)
+	r = pthread_cond_wait (&current->wait_cond, &current->wait_mutex);
+      else
+	r = pthread_cond_timedwait (&current->wait_cond, &current->wait_mutex, 
+				    &ts);
+				    
+      // In older glibc's (prior to 2.1.3), the cond_wait functions may 
+      // spuriously wake up on a signal. Catch that here.
+      if (r != EINTR)
+        done_sleeping = true;
+    }
+  
+  // Check for an interrupt *before* unlocking the wait mutex.
+  jboolean interrupted = current_obj->interrupt_flag;
+  
+  pthread_mutex_unlock (&current->wait_mutex);
 
-  do
+  //  Reaquire the monitor mutex, and restore the lock count.
+  pthread_mutex_lock (&mu->mutex);
+  mu->owner = self;
+  mu->count = count;
+
+  // If we were interrupted, or if a timeout occured, remove ourself from
+  // the cv wait list now. (If we were notified normally, notify() will have
+  // already taken care of this)
+  if (r == ETIMEDOUT || interrupted)
     {
-      r = EINTR;
-      // Check to ensure the thread hasn't already been interrupted.
-      if (!(current->isInterrupted ()))
+      _Jv_Thread_t *prev = NULL;
+      for (_Jv_Thread_t *t = cv->first; t != NULL; t = t->next)
         {
-#ifdef LINUX_THREADS	
-	  // FIXME: in theory, interrupt() could be called on this thread
-	  // between the test above and the wait below, resulting in the 
-	  // interupt() call failing. I don't see a way to fix this 
-	  // without significant changes to the implementation.
-	  r = pthread_cond_timedwait (cv, pmu, &ts);
-#else
-	  if (millis == 0 && nanos == 0)
-	    r = pthread_cond_wait (cv, pmu);
-	  else	  
-	    r = pthread_cond_timedwait (cv, pmu, &ts);	  
-#endif
-	}
-      
-      if (r == EINTR)
-	{
-	  /* We were interrupted by a signal.  Either this is
-	     because we were interrupted intentionally (i.e. by
-	     Thread.interrupt()) or by the GC if it is
-	     signal-based.  */
-	  if (current->isInterrupted ())
+	  if (t == current)
 	    {
-	      r = 0;
-              done_sleeping = true;
-            }
-	  else
-            {
-	      /* We were woken up by the GC or another signal.  */
-	      m2 = java::lang::System::currentTimeMillis ();
-	      if (m2 >= m)
-		{
-		  r = 0;
-		  done_sleeping = true;
-		}
+	      if (prev != NULL)
+		prev->next = t->next;
+	      else
+	        cv->first = t->next;
+	      t->next = NULL;
+	      break;
 	    }
+	  prev = t;
 	}
-      else if (r == ETIMEDOUT)
-	{
-	  /* A timeout is a normal result.  */
-	  r = 0;
-	  done_sleeping = true;
-	}
-      else
-	done_sleeping = true;
+      if (interrupted)
+	return _JV_INTERRUPTED;
     }
-  while (! done_sleeping);
-
-  return r != 0;
+  
+  return 0;
 }
 
-#ifndef RECURSIVE_MUTEX_IS_DEFAULT
-
-void
-_Jv_MutexInit (_Jv_Mutex_t *mu)
+int
+_Jv_CondNotify (_Jv_ConditionVariable_t *cv, _Jv_Mutex_t *mu)
 {
-#ifdef HAVE_RECURSIVE_MUTEX
-  pthread_mutexattr_t *val = NULL;
-
-#if defined (HAVE_PTHREAD_MUTEXATTR_SETTYPE)
-  pthread_mutexattr_t attr;
-
-  // If this is slow, then allocate it statically and only initialize
-  // it once.
-  pthread_mutexattr_init (&attr);
-  pthread_mutexattr_settype (&attr, PTHREAD_MUTEX_RECURSIVE);
-  val = &attr;
-#elif defined (HAVE_PTHREAD_MUTEXATTR_SETKIND_NP)
-  pthread_mutexattr_t attr;
-  pthread_mutexattr_init (&attr);
-  pthread_mutexattr_setkind_np (&attr, PTHREAD_MUTEX_RECURSIVE_NP);
-  val = &attr;
-#endif
-
-  pthread_mutex_init (_Jv_PthreadGetMutex (mu), val);
-#ifdef PTHREAD_MUTEX_IS_STRUCT
-  mu->count = 0;
-#endif
+  if (_Jv_PthreadCheckMonitor (mu))
+    return 1;
 
-#if defined (HAVE_PTHREAD_MUTEXATTR_SETTYPE) || defined (HAVE_PTHREAD_MUTEXATTR_SETKIND_NP)
-  pthread_mutexattr_destroy (&attr);
-#endif
-
-#else /* HAVE_RECURSIVE_MUTEX */
-
-  // No recursive mutex, so simulate one.
-  pthread_mutex_init (&mu->mutex, NULL);
-  pthread_mutex_init (&mu->mutex2, NULL);
-  pthread_cond_init (&mu->cond, 0);
-  mu->count = 0;
+  _Jv_Thread_t *target;
+  _Jv_Thread_t *prev = NULL;
 
-#endif /* HAVE_RECURSIVE_MUTEX */
-}
-
-#endif /* not RECURSIVE_MUTEX_IS_DEFAULT */
+  for (target = cv->first; target != NULL; target = target->next)
+    {
+      pthread_mutex_lock (&target->wait_mutex);
 
-#if ! defined (LINUX_THREADS) && ! defined (HAVE_RECURSIVE_MUTEX)
+      if (target->thread_obj->interrupt_flag)
+        {
+	  // Don't notify a thread that has already been interrupted.
+	  pthread_mutex_unlock (&target->wait_mutex);
+          prev = target;
+	  continue;
+	}
 
-void
-_Jv_MutexDestroy (_Jv_Mutex_t *mu)
-{
-  pthread_mutex_destroy (&mu->mutex);
-  pthread_mutex_destroy (&mu->mutex2);
-  pthread_cond_destroy (&mu->cond);
-}
+      pthread_cond_signal (&target->wait_cond);
+      pthread_mutex_unlock (&target->wait_mutex);
 
-int
-_Jv_MutexLock (_Jv_Mutex_t *mu)
-{
-  if (pthread_mutex_lock (&mu->mutex))
-    return -1;
-  while (1)
-    {
-      if (mu->count == 0)
-	{
-	  // Grab the lock.
-	  mu->thread = pthread_self ();
-	  mu->count = 1;
-	  pthread_mutex_lock (&mu->mutex2);
-	  break;
-	}
-      else if (pthread_self () == mu->thread)
-	{
-	  // Already have the lock.
-	  mu->count += 1;
-	  break;
-	}
+      // Two successive notify() calls should not be delivered to the same 
+      // thread, so we remove the target thread from the cv wait list now.
+      if (prev == NULL)
+	cv->first = target->next;
       else
-	{
-	  // Try to acquire the lock.
-	  pthread_cond_wait (&mu->cond, &mu->mutex);
-	}
+        prev->next = target->next;
+		
+      target->next = NULL;
+      
+      break;
     }
-  pthread_mutex_unlock (&mu->mutex);
+
   return 0;
 }
 
 int
-_Jv_MutexUnlock (_Jv_Mutex_t *mu)
+_Jv_CondNotifyAll (_Jv_ConditionVariable_t *cv, _Jv_Mutex_t *mu)
 {
-  if (pthread_mutex_lock (&mu->mutex))
-    return -1;
-  int r = 0;
-  if (mu->count == 0 || pthread_self () != mu->thread)
-    r = -1;
-  else
+  if (_Jv_PthreadCheckMonitor (mu))
+    return 1;
+
+  _Jv_Thread_t *target;
+  _Jv_Thread_t *prev = NULL;
+
+  for (target = cv->first; target != NULL; target = target->next)
     {
-      mu->count -= 1;
-      if (! mu->count)
-	{
-	  pthread_mutex_unlock (&mu->mutex2);
-	  pthread_cond_signal (&mu->cond);
-	}
+      pthread_mutex_lock (&target->wait_mutex);
+      pthread_cond_signal (&target->wait_cond);
+      pthread_mutex_unlock (&target->wait_mutex);
+
+      if (prev != NULL)
+	prev->next = NULL;
+      prev = target;
     }
-  pthread_mutex_unlock (&mu->mutex);
-  return r;
+  if (prev != NULL)
+    prev->next = NULL;
+    
+  cv->first = NULL;
+
+  return 0;
 }
 
-#endif /* not LINUX_THREADS and not HAVE_RECURSIVE_MUTEX */
+void
+_Jv_ThreadInterrupt (_Jv_Thread_t *data)
+{
+  pthread_mutex_lock (&data->wait_mutex);
 
+  // Set the thread's interrupted flag *after* aquiring its wait_mutex. This
+  // ensures that there are no races with the interrupt flag being set after 
+  // the waiting thread checks it and before pthread_cond_wait is entered.
+  data->thread_obj->interrupt_flag = true;
+
+  // Interrupt blocking system calls using a signal.
+//  pthread_kill (data->thread, INTR);
+  
+  pthread_cond_signal (&data->wait_cond);
+  
+  pthread_mutex_unlock (&data->wait_mutex);
+}
+
 static void
 handle_intr (int)
 {
@@ -300,10 +298,14 @@
 }
 
 void
-_Jv_ThreadInitData (_Jv_Thread_t **data, java::lang::Thread *)
+_Jv_ThreadInitData (_Jv_Thread_t **data, java::lang::Thread *obj)
 {
   _Jv_Thread_t *info = new _Jv_Thread_t;
   info->flags = 0;
+  info->thread_obj = obj;
+
+  pthread_mutex_init (&info->wait_mutex, NULL);
+  pthread_cond_init (&info->wait_cond, NULL);
 
   // FIXME register a finalizer for INFO here.
   // FIXME also must mark INFO somehow.
@@ -331,10 +333,16 @@
 {
   struct starter *info = (struct starter *) x;
 
-  pthread_setspecific (_Jv_ThreadKey, info->object);
+  pthread_setspecific (_Jv_ThreadKey, info->data->thread_obj);
   pthread_setspecific (_Jv_ThreadDataKey, info->data);
-  info->method (info->object);
 
+  // glibc 2.1.3 doesn't set the value of `thread' until after start_routine
+  // is called. Since it may need to be accessed from the new thread, work 
+  // around the potential race here by explicitly setting it again.
+  info->data->thread = pthread_self ();
+
+  info->method (info->data->thread_obj);
+  
   if (! (info->data->flags & FLAG_DAEMON))
     {
       pthread_mutex_lock (&daemon_mutex);
@@ -367,7 +375,6 @@
   // FIXME: handle marking the info object for GC.
   info = (struct starter *) _Jv_AllocBytes (sizeof (struct starter));
   info->method = meth;
-  info->object = thread;
   info->data = data;
 
   if (! thread->isDaemon())
@@ -389,6 +396,38 @@
     }
 }
 
+int
+_Jv_MutexLock (_Jv_Mutex_t *mu)
+{
+  pthread_t self = pthread_self ();
+  if (mu->owner == self)
+    {
+      mu->count++;
+    }
+  else
+    {
+      pthread_mutex_lock (&mu->mutex);
+      mu->count = 1;
+      mu->owner = self;
+    }
+  return 0;
+}
+
+int
+_Jv_MutexUnlock (_Jv_Mutex_t *mu)
+{
+  _Jv_PthreadCheckMonitor (mu);
+    
+  mu->count--;
+
+  if (mu->count == 0)
+    {
+      mu->owner = 0;
+      pthread_mutex_unlock (&mu->mutex);
+    }
+  return 0;
+}
+
 void
 _Jv_ThreadWait (void)
 {
@@ -396,10 +435,4 @@
   if (non_daemon_count)
     pthread_cond_wait (&daemon_cond, &daemon_mutex);
   pthread_mutex_unlock (&daemon_mutex);
-}
-
-void
-_Jv_ThreadInterrupt (_Jv_Thread_t *data)
-{
-  pthread_kill (data->thread, INTR);
 }
Index: java/lang/Thread.java
===================================================================
RCS file: /cvs/java/libgcj/libjava/java/lang/Thread.java,v
retrieving revision 1.8
diff -u -r1.8 Thread.java
--- Thread.java	2000/03/07 19:55:26	1.8
+++ Thread.java	2000/03/23 13:50:42
@@ -79,12 +79,11 @@
 
   public static boolean interrupted ()
   {
-    return currentThread().isInterrupted_();
+    return currentThread().isInterrupted (true);
   }
 
-  // FIXME: it seems to me that this should be synchronized.
   // Check the threads interrupted status. Note that this does not clear the
-  // threads interrupted status (per JDK 1.2 online API documentation).
+  // thread's interrupted status (per JDK 1.2 online API documentation).
   public boolean isInterrupted ()
   {
     return interrupt_flag;
@@ -119,11 +118,18 @@
   private static final native void run_ (Object obj);
   private final native void finish_ ();
 
-  // Convenience method to check and clear the thread's interrupted status.  
-  private boolean isInterrupted_ ()
+  // Check the thread's interrupted status. If clear_flag is true, the 
+  // thread's interrupted status is also cleared.
+  private boolean isInterrupted (boolean clear_flag)
   {
     boolean r = interrupt_flag;
-    interrupt_flag = false;
+    if (clear_flag && r)
+      {
+	// Only clear the flag if we saw it as set. Otherwise this could 
+	// potentially cause us to miss an interrupt in a race condition, 
+	// because this method is not synchronized.
+	interrupt_flag = false;
+      }
     return r;
   }
   
@@ -221,6 +227,8 @@
     data = null;
     interrupt_flag = false;
     alive_flag = false;
+    startable_flag = true;
+    
     if (current != null)
       {
 	daemon_flag = current.isDaemon();
@@ -267,7 +275,8 @@
 
   public String toString ()
   {
-    return "Thread[" + name + "," + priority + "," + group.getName() + "]";
+    return "Thread[" + name + "," + priority + "," + 
+	   (group == null ? "" : group.getName()) + "]";
   }
 
   public static native void yield ();
@@ -280,6 +289,7 @@
   private boolean daemon_flag;
   private boolean interrupt_flag;
   private boolean alive_flag;
+  private boolean startable_flag;
 
   // Our native data.
   private RawData data;
Index: java/lang/natThread.cc
===================================================================
RCS file: /cvs/java/libgcj/libjava/java/lang/natThread.cc,v
retrieving revision 1.15
diff -u -r1.15 natThread.cc
--- natThread.cc	2000/03/07 19:55:26	1.15
+++ natThread.cc	2000/03/23 13:50:42
@@ -35,47 +35,16 @@
 struct natThread
 {
   // These are used to interrupt sleep and join calls.  We can share a
-  // condition variable here since this thread can either be sleeping
-  // or waiting for a thread exit, but not both.
-  _Jv_Mutex_t interrupt_mutex;
-  _Jv_ConditionVariable_t interrupt_cond;
+  // condition variable here since it only ever gets notified when the thread
+  // exits.
+  _Jv_Mutex_t join_mutex;
+  _Jv_ConditionVariable_t join_cond;
 
   // This is private data for the thread system layer.
   _Jv_Thread_t *thread;
 
   // Each thread has its own JNI object.
   JNIEnv *jni_env;
-
-  // All threads waiting to join this thread are linked together and
-  // waiting on their respective `interrupt' condition variables.
-  // When this thread exits, it notifies each such thread by
-  // signalling the condition.  In this case the `interrupt_flag' is
-  // not set; this is how the waiting thread knows whether the join
-  // has failed or whether it should throw an exception.
-  struct natThread *joiner;
-
-  // Chain for waiters.
-  struct natThread *next;
-};
-
-// We use this for its side effects: it lets us lock a mutex directly
-// and not lose if an exception is thrown.
-class locker
-{
-private:
-  _Jv_Mutex_t *mutex;
-
-public:
-  locker (_Jv_Mutex_t *m)
-    : mutex (m)
-  {
-    _Jv_MutexLock (mutex);
-  }
-
-  ~locker ()
-  {
-    _Jv_MutexUnlock (mutex);
-  }
 };
 
 // This is called from the constructor to initialize the native side
@@ -90,14 +59,12 @@
   // any "interesting" point.
   natThread *nt = (natThread *) _Jv_AllocBytes (sizeof (natThread));
   data = reinterpret_cast<gnu::gcj::RawData *> (nt);
-  _Jv_MutexInit (&nt->interrupt_mutex);
-  _Jv_CondInit (&nt->interrupt_cond);
+  _Jv_MutexInit (&nt->join_mutex);
+  _Jv_CondInit (&nt->join_cond);
   _Jv_ThreadInitData (&nt->thread, this);
   // FIXME: if JNI_ENV is set we will want to free it.  It is
   // malloc()d.
   nt->jni_env = NULL;
-  nt->joiner = 0;
-  nt->next = 0;
 }
 
 jint
@@ -125,90 +92,33 @@
 void
 java::lang::Thread::interrupt (void)
 {
-  interrupt_flag = true;
-
-  // Wake up this thread, whether it is sleeping or waiting for
-  // another thread to exit.
   natThread *nt = (natThread *) data;
-  _Jv_MutexLock (&nt->interrupt_mutex);
-  // Notify the interrupt condition to interrupt sleep() and join() calls.
-  _Jv_CondNotify (&nt->interrupt_cond, &nt->interrupt_mutex);
-  // Send a signal to the target thread to interrupt system calls. On Linux,
-  // this will also interrupt the target thread from *any* _Jv_CondWait call,
-  // ie wait(). This behaviour is not portable, however.
   _Jv_ThreadInterrupt (nt->thread);
-  _Jv_MutexUnlock (&nt->interrupt_mutex);
 }
 
 void
 java::lang::Thread::join (jlong millis, jint nanos)
 {
-  // FIXME: what if we are trying to join ourselves with no timeout?
-
   if (millis < 0 || nanos < 0 || nanos > 999999)
     _Jv_Throw (new IllegalArgumentException);
 
   Thread *current = currentThread ();
-  if (current->isInterrupted_ ())
-    _Jv_Throw (new InterruptedException);
 
-  // Update the list of all threads waiting for this thread to exit.
-  // We grab a mutex when doing this in order to ensure that the
-  // required state changes are atomic.
-  _Jv_MonitorEnter (this);
-  if (! isAlive ())
-    {
-      _Jv_MonitorExit (this);
-      return;
-    }
-
-  // Here `CURR_NT' is the native structure for the currently
-  // executing thread, while `NT' is the native structure for the
-  // thread we are trying to join.
-  natThread *curr_nt = (natThread *) current->data;
+  // Here `NT' is the native structure for the thread we are trying to join.
   natThread *nt = (natThread *) data;
 
-  JvAssert (curr_nt->next == NULL);
-  // Put thread CURR_NT onto NT's list.  When NT exits, it will
-  // traverse its list and notify all joiners.
-  curr_nt->next = nt->joiner;
-  nt->joiner = curr_nt;
-  _Jv_MonitorExit (this);
-
-
   // Now wait for: (1) an interrupt, (2) the thread to exit, or (3)
-  // the timeout to occur.  Use a `locker' object because _Jv_CondWait
-  // can throw an exception.
-  {
-    locker l (&curr_nt->interrupt_mutex);
-    _Jv_CondWait (&curr_nt->interrupt_cond,
-		  &curr_nt->interrupt_mutex,
-		  millis, nanos);
-  }
-
-  // Now the join has completed, one way or another.  Update the
-  // joiners list to account for this.
-  _Jv_MonitorEnter (this);
-  JvAssert (nt->joiner != NULL);
-  natThread *prev = 0;
-  natThread *t;
-  for (t = nt->joiner; t != NULL; t = t->next)
+  // the timeout to occur. 
+  _Jv_MutexLock (&nt->join_mutex);
+  if (! isAlive ())
     {
-      if (t == curr_nt)
-	{
-	  if (prev)
-	    prev->next = t->next;
-	  else
-	    nt->joiner = t->next;
-	  t->next = 0;
-	  break;
-	}
-      prev = t;
+      _Jv_MutexUnlock (&nt->join_mutex);
+      return;
     }
-  JvAssert (t != NULL);
-  _Jv_MonitorExit (this);
+  _Jv_CondWait (&nt->join_cond, &nt->join_mutex, millis, nanos);
+  _Jv_MutexUnlock (&nt->join_mutex);
 
-  if (current->isInterrupted_ ())
+  if (current->isInterrupted (true))
     _Jv_Throw (new InterruptedException);
 }
 
@@ -245,43 +155,31 @@
     ++nanos;
 
   Thread *current = currentThread ();
-  if (current->isInterrupted_ ())
-    _Jv_Throw (new InterruptedException);
 
   // We use a condition variable to implement sleeping so that an
-  // interrupt can wake us up.
+  // interrupt can wake us up. 
   natThread *nt = (natThread *) current->data;
-  {
-    // Use a locker because _Jv_CondWait can throw an exception.
-    locker l (&nt->interrupt_mutex);
-    _Jv_CondWait (&nt->interrupt_cond, &nt->interrupt_mutex,
-		  millis, nanos);
-  }
+  _Jv_MutexLock (&nt->join_mutex);
+  _Jv_CondWait (&nt->join_cond, &nt->join_mutex, millis, nanos);
+  _Jv_MutexUnlock (&nt->join_mutex);
 
-  if (current->isInterrupted_ ())
+  if (current->isInterrupted (true))
     _Jv_Throw (new InterruptedException);
 }
 
 void
 java::lang::Thread::finish_ ()
 {
-  // Notify all threads waiting to join this this.
-  _Jv_MonitorEnter (this);
-  alive_flag = false;
-
-  // Note that we don't bother cleaning up the joiner list here.  That
-  // is taken care of when each thread wakes up again.
   natThread *nt = (natThread *) data;
-  for (natThread *t = nt->joiner; t != NULL; t = t->next)
-    {
-      _Jv_MutexLock (&t->interrupt_mutex);
-      _Jv_CondNotify (&t->interrupt_cond, &t->interrupt_mutex);
-      _Jv_MutexUnlock (&t->interrupt_mutex);
-    }
-
+  
   group->remove (this);
-
-  _Jv_MonitorExit (this);
+  group = NULL;
+  
+  // Signal any threads that are waiting to join() us.
+  _Jv_MutexLock (&nt->join_mutex);
+  alive_flag = false;
+  _Jv_CondNotifyAll (&nt->join_cond, &nt->join_mutex);
+  _Jv_MutexUnlock (&nt->join_mutex);  
 }
 
 void
@@ -314,10 +212,12 @@
 {
   JvSynchronize sync (this);
 
-  if (alive_flag)
+  // Its illegal to re-start() a thread, even if its dead.
+  if (!startable_flag)
     _Jv_Throw (new IllegalThreadStateException);
 
   alive_flag = true;
+  startable_flag = false;
   natThread *nt = (natThread *) data;
   _Jv_ThreadStart (this, nt->thread, (_Jv_ThreadStartFunc *) &run_);
 }
Index: java/lang/natObject.cc
===================================================================
RCS file: /cvs/java/libgcj/libjava/java/lang/natObject.cc,v
retrieving revision 1.8
diff -u -r1.8 natObject.cc
--- natObject.cc	2000/03/07 19:55:26	1.8
+++ natObject.cc	2000/03/23 13:50:42
@@ -198,11 +198,15 @@
   if (timeout < 0 || nanos < 0 || nanos > 999999)
     JvThrow (new IllegalArgumentException);
   _Jv_SyncInfo *si = (_Jv_SyncInfo *) sync_info;
-  if (_Jv_CondWait (&si->condition, &si->mutex, timeout, nanos))
-    JvThrow (new IllegalMonitorStateException(JvNewStringLatin1 
-                                              ("current thread not owner")));
-  if (Thread::interrupted())
-    JvThrow (new InterruptedException);
+  switch (_Jv_CondWait (&si->condition, &si->mutex, timeout, nanos))
+    {
+      case _JV_NOT_OWNER:
+	JvThrow (new IllegalMonitorStateException (JvNewStringLatin1 
+                          ("current thread not owner")));        
+      case _JV_INTERRUPTED:
+	if (Thread::interrupted ())
+	  JvThrow (new InterruptedException);        
+    }
 }
 
 //
Index: include/posix-threads.h
===================================================================
RCS file: /cvs/java/libgcj/libjava/include/posix-threads.h,v
retrieving revision 1.12
diff -u -r1.12 posix-threads.h
--- posix-threads.h	2000/03/07 19:55:25	1.12
+++ posix-threads.h	2000/03/23 13:50:42
@@ -20,82 +20,65 @@
 #include <pthread.h>
 #include <sched.h>
 
-#if defined (HAVE_PTHREAD_MUTEXATTR_SETTYPE) || defined (HAVE_PTHREAD_MUTEXATTR_SETKIND_NP)
-#  define HAVE_RECURSIVE_MUTEX 1
-#endif
-
-
 //
 // Typedefs.
 //
-
-typedef pthread_cond_t _Jv_ConditionVariable_t;
 
-#if defined (PTHREAD_MUTEX_HAVE_M_COUNT) || defined (PTHREAD_MUTEX_HAVE___M_COUNT)
+typedef struct _Jv_Thread_t
+{
+  // Flag values are defined in implementation.
+  int flags;
 
-// On Linux we use implementation details of mutexes in order to get
-// faster results.
-typedef pthread_mutex_t _Jv_Mutex_t;
+  // Actual thread id.
+  pthread_t thread;
+  
+  // Java Thread object.
+  java::lang::Thread *thread_obj;
+  
+  // Condition variable and corresponding mutex, used to implement the
+  // interruptable wait/notify mechanism.
+  pthread_cond_t wait_cond;
+  pthread_mutex_t wait_mutex;
+
+  // Next thread for Condition Variable wait-list chain.
+  _Jv_Thread_t *next;
+  
+} _Jv_Thread_t;
 
-#else /* LINUX_THREADS */
+typedef void _Jv_ThreadStartFunc (java::lang::Thread *);
 
-#define PTHREAD_MUTEX_IS_STRUCT
 
+// Condition Variables used to implement wait/notify/sleep/interrupt.
 typedef struct
 {
-  // Mutex used when locking this structure transiently.
-  pthread_mutex_t mutex;
-#ifndef HAVE_RECURSIVE_MUTEX
-  // Some systems do not have recursive mutexes, so we must simulate
-  // them.  Solaris is one such system.
-
-  // Mutex the thread holds the entire time this mutex is held.  This
-  // is used to make condition variables work properly.
-  pthread_mutex_t mutex2;
-  // Condition variable used when waiting for this lock.
-  pthread_cond_t cond;
-  // Thread holding this mutex.  If COUNT is 0, no thread is holding.
-  pthread_t thread;
-#endif /* HAVE_RECURSIVE_MUTEX */
+  // Linked list of Threads that are waiting to be notified.
+  _Jv_Thread_t *first;
 
-  // Number of times mutex is held.  If 0, the lock is not held.  We
-  // do this even if we have a native recursive mutex so that we can
-  // keep track of whether the lock is held; this lets us do error
-  // checking.  FIXME it would be nice to optimize this; on some
-  // systems we could do so by relying on implementation details of
-  // recursive mutexes.
-  int count;
-} _Jv_Mutex_t;
+} _Jv_ConditionVariable_t;
 
-#endif
-
 typedef struct
 {
-  // Flag values are defined in implementation.
-  int flags;
+  // For compatibility, simplicity, and correctness, we do not use the native
+  // pthreads recursive mutex implementation, but simulate them instead.
 
-  // Actual thread id.
-  pthread_t thread;
-} _Jv_Thread_t;
-typedef void _Jv_ThreadStartFunc (java::lang::Thread *);
+  // Mutex the thread holds the entire time this mutex is held. 
+  pthread_mutex_t mutex;
 
+  // Thread holding this mutex.
+  pthread_t owner;
 
+  // Number of times mutex is held (lock depth).  If 0, the lock is not held.
+  int count;
+} _Jv_Mutex_t;
+
 // This convenience function is used to return the POSIX mutex
 // corresponding to our mutex.
 inline pthread_mutex_t *
 _Jv_PthreadGetMutex (_Jv_Mutex_t *mu)
 {
-#if ! defined (PTHREAD_MUTEX_IS_STRUCT)
-  return mu;
-#elif defined (HAVE_RECURSIVE_MUTEX)
   return &mu->mutex;
-#else
-  return &mu->mutex2;
-#endif
 }
 
-#include <stdio.h>
-
 // This is a convenience function used only by the pthreads thread
 // implementation.  This is slow, but that's too bad -- we need to do
 // the checks for correctness.  It might be nice to be able to compile
@@ -104,95 +87,44 @@
 inline int
 _Jv_PthreadCheckMonitor (_Jv_Mutex_t *mu)
 {
-  pthread_mutex_t *pmu;
-#ifdef HAVE_RECURSIVE_MUTEX
-  pmu = _Jv_PthreadGetMutex (mu);
-  // See if the mutex is locked by this thread.
-  if (pthread_mutex_trylock (pmu))
-    return 1;
-
-#if defined (PTHREAD_MUTEX_HAVE_M_COUNT)
-  // On Linux we exploit knowledge of the implementation.
-  int r = pmu->m_count == 1;
-#elif defined (PTHREAD_MUTEX_HAVE___M_COUNT)
-  // In glibc 2.1, the first time the mutex is grabbed __m_count is
-  // set to 0 and __m_owner is set to pthread_self().
-  int r = ! pmu->__m_count;
-#else
-  int r = mu->count == 0;
-#endif
-
-#else /* HAVE_RECURSIVE_MUTEX */
-  // In this case we must lock our structure and then see if this
-  // thread owns the mutex.
-  pmu = &mu->mutex;
-  if (pthread_mutex_lock (pmu))
-    return 1;
-
-  int r = mu->thread != pthread_self () || mu->count == 0;
-#endif /* HAVE_RECURSIVE_MUTEX */
-
-  pthread_mutex_unlock (pmu);
-  return r;
+  pthread_t self = pthread_self();
+  if (mu->owner == self)
+    return 0;
+  else return 1;
 }
 
 //
 // Condition variables.
 //
 
-inline void
-_Jv_CondInit (_Jv_ConditionVariable_t *cv)
-{
-  pthread_cond_init (cv, 0);
-}
-
-#ifndef LINUX_THREADS
-
-// pthread_cond_destroy does nothing on Linux and it is a win to avoid
-// defining this macro.
-
-#define _Jv_HaveCondDestroy
-
-inline void
-_Jv_CondDestroy (_Jv_ConditionVariable_t *cv)
-{
-  pthread_cond_destroy (cv);
-}
-
-#endif /* LINUX_THREADS */
-
 int _Jv_CondWait (_Jv_ConditionVariable_t *cv, _Jv_Mutex_t *mu,
 		  jlong millis, jint nanos);
+		  
+int _Jv_CondNotify (_Jv_ConditionVariable_t *cv, _Jv_Mutex_t *mu);
 
-inline int
-_Jv_CondNotify (_Jv_ConditionVariable_t *cv, _Jv_Mutex_t *mu)
-{
-  return _Jv_PthreadCheckMonitor (mu) || pthread_cond_signal (cv);
-}
+int _Jv_CondNotifyAll (_Jv_ConditionVariable_t *cv, _Jv_Mutex_t *mu);
 
-inline int
-_Jv_CondNotifyAll (_Jv_ConditionVariable_t *cv, _Jv_Mutex_t *mu)
+inline void
+_Jv_CondInit (_Jv_ConditionVariable_t *cv)
 {
-  return _Jv_PthreadCheckMonitor (mu) || pthread_cond_broadcast (cv);
+  cv->first = NULL;
 }
 
-
 //
 // Mutexes.
 //
 
-#ifdef RECURSIVE_MUTEX_IS_DEFAULT
 inline void
 _Jv_MutexInit (_Jv_Mutex_t *mu)
 {
-  pthread_mutex_init (_Jv_PthreadGetMutex (mu), NULL);
-#ifdef PTHREAD_MUTEX_IS_STRUCT
+  pthread_mutex_init (&mu->mutex, NULL);
+
   mu->count = 0;
-#endif
+  mu->owner = 0;
 }
-#else
-void _Jv_MutexInit (_Jv_Mutex_t *mu);
-#endif
+
+int _Jv_MutexLock (_Jv_Mutex_t *mu);
+int _Jv_MutexUnlock (_Jv_Mutex_t *mu);
 
 #ifndef LINUX_THREADS
 
@@ -201,52 +133,13 @@
 
 #define _Jv_HaveMutexDestroy
 
-#ifdef HAVE_RECURSIVE_MUTEX
-
-inline void
+inline void 
 _Jv_MutexDestroy (_Jv_Mutex_t *mu)
 {
-  pthread_mutex_destroy (_Jv_PthreadGetMutex (mu));
+  pthread_mutex_destroy (&mu->mutex);
 }
 
-#else /* HAVE_RECURSIVE_MUTEX */
-
-extern void _Jv_MutexDestroy (_Jv_Mutex_t *mu);
-
-#endif /* HAVE_RECURSIVE_MUTEX */
 #endif /* LINUX_THREADS */
-
-#ifdef HAVE_RECURSIVE_MUTEX
-
-inline int
-_Jv_MutexLock (_Jv_Mutex_t *mu)
-{
-  int r = pthread_mutex_lock (_Jv_PthreadGetMutex (mu));
-#ifdef PTHREAD_MUTEX_IS_STRUCT
-  if (! r)
-    ++mu->count;
-#endif
-  return r;
-}
-
-inline int
-_Jv_MutexUnlock (_Jv_Mutex_t *mu)
-{
-  int r = pthread_mutex_unlock (_Jv_PthreadGetMutex (mu));
-#ifdef PTHREAD_MUTEX_IS_STRUCT
-  if (! r)
-    --mu->count;
-#endif
-  return r;
-}
-
-#else /* HAVE_RECURSIVE_MUTEX */
-
-extern int _Jv_MutexLock (_Jv_Mutex_t *mu);
-extern int _Jv_MutexUnlock (_Jv_Mutex_t *mu);
-
-#endif /* HAVE_RECURSIVE_MUTEX */
-
 
 //
 // Thread creation and manipulation.

--------------E8CCD97FD2F750BBE26CAEF3--

From java-patches-return-593-listarch-java-patches=sourceware.cygnus.com@sourceware.cygnus.com Fri Mar 24 09:10:08 2000
Return-Path: <java-patches-return-593-listarch-java-patches=sourceware.cygnus.com@sourceware.cygnus.com>
Delivered-To: listarch-java-patches@sourceware.cygnus.com
Received: (qmail 9656 invoked by alias); 24 Mar 2000 09:10:07 -0000
Mailing-List: contact java-patches-help@sourceware.cygnus.com; run by ezmlm
Precedence: bulk
List-Subscribe: <mailto:java-patches-subscribe@sourceware.cygnus.com>
List-Archive: <http://sourceware.cygnus.com/ml/java-patches/>
List-Post: <mailto:java-patches@sourceware.cygnus.com>
List-Help: <mailto:java-patches-help@sourceware.cygnus.com>, <http://sourceware.cygnus.com/ml/#faqs>
Sender: java-patches-owner@sourceware.cygnus.com
Delivered-To: mailing list java-patches@sourceware.cygnus.com
Received: (qmail 9630 invoked from network); 24 Mar 2000 09:10:06 -0000
X-Authentication-Warning: fencer.cygnus.com: warrenl owned process doing -bs
Date: Fri, 24 Mar 2000 01:10:06 -0800 (PST)
From: Warren Levy <warrenl@cygnus.com>
To: java-patches@sourceware.cygnus.com
Subject: Patch: java.awt cleanups
Message-ID: <Pine.LNX.4.10.10003240057310.24352-100000@fencer.cygnus.com>
MIME-Version: 1.0
Content-Type: TEXT/PLAIN; charset=US-ASCII

A few more cleanups of awt code.
--warrenl

2000-03-24  Warren Levy  <warrenl@cygnus.com>

        * java/awt/Font.java(isBold): Fix syntax error.
        (isItalic): ditto.
        * java/awt/Frame.java(postEvent): ditto.
        * java/awt/Menu.java(postEvent): ditto.
        * java/awt/MenuBar.java(postEvent): ditto.
        * java/awt/Toolkit.java(init): Included a stub.


Index: java/awt/Font.java
===================================================================
RCS file: /cvs/java/libgcj/libjava/java/awt/Font.java,v
retrieving revision 1.4
diff -u -p -r1.4 Font.java
--- Font.java	2000/03/17 00:45:06	1.4
+++ Font.java	2000/03/24 09:05:48
@@ -52,7 +52,7 @@ public class Font
 
   public boolean isBold()
   {
-    if (style & BOLD == BOLD)
+    if ((style & BOLD) == BOLD)
       return true;
 
     return false;
@@ -60,7 +60,7 @@ public class Font
 
   public boolean isItalic()
   {
-    if (style & ITALIC == ITALIC)
+    if ((style & ITALIC) == ITALIC)
       return true;
 
     return false;
Index: java/awt/Frame.java
===================================================================
RCS file: /cvs/java/libgcj/libjava/java/awt/Frame.java,v
retrieving revision 1.4
diff -u -p -r1.4 Frame.java
--- Frame.java	2000/03/17 00:45:06	1.4
+++ Frame.java	2000/03/24 09:05:48
@@ -54,6 +54,6 @@ public class Frame extends Window implem
   }
 
   public Font getFont() { return null; } // FIXME
-  public boolean postEvent(Event evt) { return null; } // FIXME
+  public boolean postEvent(Event evt) { return false; } // FIXME
   public void remove(MenuComponent comp) { } // FIXME
 }
Index: java/awt/Menu.java
===================================================================
RCS file: /cvs/java/libgcj/libjava/java/awt/Menu.java,v
retrieving revision 1.4
diff -u -p -r1.4 Menu.java
--- Menu.java	2000/03/17 00:45:06	1.4
+++ Menu.java	2000/03/24 09:05:48
@@ -28,6 +28,6 @@ public class Menu extends MenuItem imple
   }
 
   public Font getFont() { return null; } // FIXME
-  public boolean postEvent(Event evt) { return null; } // FIXME
+  public boolean postEvent(Event evt) { return false; } // FIXME
   public void remove(MenuComponent comp) { } // FIXME
 }
Index: java/awt/MenuBar.java
===================================================================
RCS file: /cvs/java/libgcj/libjava/java/awt/MenuBar.java,v
retrieving revision 1.4
diff -u -p -r1.4 MenuBar.java
--- MenuBar.java	2000/03/17 00:45:06	1.4
+++ MenuBar.java	2000/03/24 09:05:48
@@ -43,5 +43,5 @@ public class MenuBar extends MenuCompone
   }
 
   public Font getFont() { return null; } // FIXME
-  public boolean postEvent(Event evt) { return null; } // FIXME
+  public boolean postEvent(Event evt) { return false; } // FIXME
 }
Index: java/awt/Toolkit.java
===================================================================
RCS file: /cvs/java/libgcj/libjava/java/awt/Toolkit.java,v
retrieving revision 1.5
diff -u -p -r1.5 Toolkit.java
--- Toolkit.java	2000/03/19 12:20:12	1.5
+++ Toolkit.java	2000/03/24 09:05:48
@@ -26,6 +26,7 @@ public abstract class Toolkit
   protected abstract FramePeer createFrame(Frame target);
   public abstract Image getImage(URL url);
 
-  private static native void init();
+  private static void init() { }
+  // private static native void init();
   // static { init(); }
 }

From java-patches-return-594-listarch-java-patches=sourceware.cygnus.com@sourceware.cygnus.com Fri Mar 24 09:18:30 2000
Return-Path: <java-patches-return-594-listarch-java-patches=sourceware.cygnus.com@sourceware.cygnus.com>
Delivered-To: listarch-java-patches@sourceware.cygnus.com
Received: (qmail 10964 invoked by alias); 24 Mar 2000 09:18:29 -0000
Mailing-List: contact java-patches-help@sourceware.cygnus.com; run by ezmlm
Precedence: bulk
List-Subscribe: <mailto:java-patches-subscribe@sourceware.cygnus.com>
List-Archive: <http://sourceware.cygnus.com/ml/java-patches/>
List-Post: <mailto:java-patches@sourceware.cygnus.com>
List-Help: <mailto:java-patches-help@sourceware.cygnus.com>, <http://sourceware.cygnus.com/ml/#faqs>
Sender: java-patches-owner@sourceware.cygnus.com
Delivered-To: mailing list java-patches@sourceware.cygnus.com
Received: (qmail 10939 invoked from network); 24 Mar 2000 09:18:29 -0000
X-Authentication-Warning: fencer.cygnus.com: warrenl owned process doing -bs
Date: Fri, 24 Mar 2000 01:18:29 -0800 (PST)
From: Warren Levy <warrenl@cygnus.com>
To: java-patches@sourceware.cygnus.com
Subject: Patch: java.math.BigInteger
Message-ID: <Pine.LNX.4.10.10003240114280.24352-100000@fencer.cygnus.com>
MIME-Version: 1.0
Content-Type: TEXT/PLAIN; charset=US-ASCII

A couple patches to fix problems identified by Hans Boehm.
--warrenl


2000-03-24  Warren Levy  <warrenl@cygnus.com>

        * java/math/BigInteger.java(divide): Handle the special case when
        dividing by 1 and the high bit of the dividend is set.
        (setShiftRight): Handle case when count == 0.



Index: java/math/BigInteger.java
===================================================================
RCS file: /cvs/java/libgcj/libjava/java/math/BigInteger.java,v
retrieving revision 1.6
diff -u -p -r1.6 BigInteger.java
--- BigInteger.java	2000/03/09 04:35:30	1.6
+++ BigInteger.java	2000/03/24 09:14:22
@@ -750,6 +750,12 @@ public class BigInteger extends Number i
     else if (ylen == 1)
       {
 	qlen = xlen;
+	// Need to leave room for a word of leading zeros if dividing by 1
+	// and the dividend has the high bit set.  It might be safe to
+	// increment qlen in all cases, but it certainly is only necessary
+	// in the following case.
+	if (ywords[0] == 1 && xwords[xlen-1] < 0)
+	  qlen++;
 	rlen = 1;
 	ywords[0] = MPN.divmod_1(xwords, xwords, xlen, ywords[0]);
       }
@@ -770,7 +776,7 @@ public class BigInteger extends Number i
 	    // significant word.
 	    int x_high = MPN.lshift(xwords, 0, xwords, xlen, nshift);
 	    xwords[xlen++] = x_high;
-	}
+	  }
 
 	if (xlen == ylen)
 	  xwords[xlen++] = 0;
@@ -1381,7 +1387,10 @@ public class BigInteger extends Number i
 	  {
 	    if (words == null || words.length < d_len)
 	      realloc(d_len);
-	    MPN.rshift(words, x.words, word_count, d_len, count);
+	    if (count == 0)
+	      System.arraycopy(x.words, word_count, words, 0, d_len);
+	    else
+	      MPN.rshift(words, x.words, word_count, d_len, count);
 	    ival = d_len;
 	    if (neg)
 	      words[ival-1] |= -1 << (32 - count);

From java-patches-return-595-listarch-java-patches=sourceware.cygnus.com@sourceware.cygnus.com Sun Mar 26 20:20:31 2000
Return-Path: <java-patches-return-595-listarch-java-patches=sourceware.cygnus.com@sourceware.cygnus.com>
Delivered-To: listarch-java-patches@sourceware.cygnus.com
Received: (qmail 26390 invoked by alias); 26 Mar 2000 20:20:30 -0000
Mailing-List: contact java-patches-help@sourceware.cygnus.com; run by ezmlm
Precedence: bulk
List-Subscribe: <mailto:java-patches-subscribe@sourceware.cygnus.com>
List-Archive: <http://sourceware.cygnus.com/ml/java-patches/>
List-Post: <mailto:java-patches@sourceware.cygnus.com>
List-Help: <mailto:java-patches-help@sourceware.cygnus.com>, <http://sourceware.cygnus.com/ml/#faqs>
Sender: java-patches-owner@sourceware.cygnus.com
Delivered-To: mailing list java-patches@sourceware.cygnus.com
Received: (qmail 26371 invoked from network); 26 Mar 2000 20:20:29 -0000
To: Java Patch List <java-patches@sourceware.cygnus.com> 
Subject: Patch: removed Array_1 xfail
X-Zippy:  Just to have MORE FUN, I'll pretend I am JAMES CAGNEY and I am having
 a tense, UP-TIGHT EXPERIENCE!!
X-Attribution:  Tom
Bcc:
Reply-To:  tromey@cygnus.com
From:  Tom Tromey <tromey@cygnus.com>
Date: 26 Mar 2000 13:21:41 -0700
Message-ID: <87zorlpjmy.fsf@cygnus.com>
Lines: 9
X-Mailer: Gnus v5.5/Emacs 20.3

I'm checking in this change.
Array_1 should no longer fail, as Alex has changed the compiler to
accept the `.class' syntax.

2000-03-26  Tom Tromey  <tromey@cygnus.com>

	* libjava.lang/Array_1.xfail: Removed.

Tom

From java-patches-return-596-listarch-java-patches=sourceware.cygnus.com@sourceware.cygnus.com Sun Mar 26 20:29:25 2000
Return-Path: <java-patches-return-596-listarch-java-patches=sourceware.cygnus.com@sourceware.cygnus.com>
Delivered-To: listarch-java-patches@sourceware.cygnus.com
Received: (qmail 27354 invoked by alias); 26 Mar 2000 20:29:25 -0000
Mailing-List: contact java-patches-help@sourceware.cygnus.com; run by ezmlm
Precedence: bulk
List-Subscribe: <mailto:java-patches-subscribe@sourceware.cygnus.com>
List-Archive: <http://sourceware.cygnus.com/ml/java-patches/>
List-Post: <mailto:java-patches@sourceware.cygnus.com>
List-Help: <mailto:java-patches-help@sourceware.cygnus.com>, <http://sourceware.cygnus.com/ml/#faqs>
Sender: java-patches-owner@sourceware.cygnus.com
Delivered-To: mailing list java-patches@sourceware.cygnus.com
Received: (qmail 27328 invoked from network); 26 Mar 2000 20:29:20 -0000
To: Java Patch List <java-patches@sourceware.cygnus.com> 
Subject: Patch: IA-64 port
X-Zippy:  NOW, I'm supposed to SCRAMBLE two, and HOLD th' MAYO!!
X-Attribution:  Tom
Bcc:
Reply-To:  tromey@cygnus.com
From:  Tom Tromey <tromey@cygnus.com>
Date: 26 Mar 2000 13:30:28 -0700
Message-ID: <87vh29pj8b.fsf@cygnus.com>
Lines: 354
X-Mailer: Gnus v5.5/Emacs 20.3

I'm checking in the appended patch.  It implements a port of libgcj to
the IA-64.  Hans Boehm wrote most of this; I just added some minor
cleanups.

2000-03-26  Tom Tromey  <tromey@cygnus.com>

	* java/lang/mprec.h: Use SIZEOF_VOID_P.
	* interpret.cc: Use SIZEOF_VOID_P.
	* include/java-cpool.h (_Jv_storeLong): Use SIZEOF_VOID_P.
	(_Jv_loadLong): Likewise.
	(_Jv_storeDouble): Likewise.
	* configure: Rebuilt.
	* configure.in: Check size of void*.

	* resolve.cc (ncode): Use FFI_PREP_RAW_CLOSURE and FFI_RAW_SIZE.

2000-03-26  Hans Boehm  <boehm@acm.org>

	* include/java-cpool.h (_Jv_storeLong, _Jv_loadLong,
	_Jv_storeDouble, _Jv_loadDouble): Define differently on 64 bit
	machine.
	* java/lang/ieeefp.h: Define __IEEE_BIG_ENDIAN or
	__IEEE_LITTLE_ENDIAN appropriately on IA64.
	* java/lang/mprec.h: Don't define Pack_32 on 64 bit machine.
	* javaprims.h (_Jv_word): Added `l' and `d' entries in 64 bit
	case.
	* resolve.cc (FFI_PREP_RAW_CLOSURE): New define.
	(FFI_RAW_SIZE): Likewise.
	(_Jv_InterpMethod::ncode): Use them.
	* interpret.cc (PUSHL, PUSHD, POPL, POPD, LOADL, LOADD, STOREL,
	STORED): Define differently on a 64 bit machine.
	(continue1): Use ffi_java_raw_call when appropriate.

Tom

Index: configure.in
===================================================================
RCS file: /cvs/java/libgcj/libjava/configure.in,v
retrieving revision 1.53
diff -u -r1.53 configure.in
--- configure.in	2000/03/04 21:50:19	1.53
+++ configure.in	2000/03/26 20:27:18
@@ -573,6 +573,9 @@
    fi
 fi
 
+dnl FIXME: cross compilation
+AC_CHECK_SIZEOF(void *)
+
 ZLIBS=
 ZDEPS=
 ZINCS=
Index: interpret.cc
===================================================================
RCS file: /cvs/java/libgcj/libjava/interpret.cc,v
retrieving revision 1.14
diff -u -r1.14 interpret.cc
--- interpret.cc	2000/03/07 19:55:24	1.14
+++ interpret.cc	2000/03/26 20:27:21
@@ -77,41 +77,60 @@
 #define PUSHA(V)  (sp++)->o = (V)
 #define PUSHI(V)  (sp++)->i = (V)
 #define PUSHF(V)  (sp++)->f = (V)
-#define PUSHL(V)  do { _Jv_word2 w2; w2.l=(V); \
-                     (sp++)->ia[0] = w2.ia[0]; \
-                     (sp++)->ia[0] = w2.ia[1]; } while (0)
-#define PUSHD(V)  do { _Jv_word2 w2; w2.d=(V); \
-                     (sp++)->ia[0] = w2.ia[0]; \
-                     (sp++)->ia[0] = w2.ia[1]; } while (0)
+#if SIZEOF_VOID_P == 8
+# define PUSHL(V)   (sp->l = (V), sp += 2)
+# define PUSHD(V)   (sp->d = (V), sp += 2)
+#else
+# define PUSHL(V)  do { _Jv_word2 w2; w2.l=(V); \
+                        (sp++)->ia[0] = w2.ia[0]; \
+                        (sp++)->ia[0] = w2.ia[1]; } while (0)
+# define PUSHD(V)  do { _Jv_word2 w2; w2.d=(V); \
+                        (sp++)->ia[0] = w2.ia[0]; \
+                        (sp++)->ia[0] = w2.ia[1]; } while (0)
+#endif
 
 #define POPA()    ((--sp)->o)
 #define POPI()    ((jint) (--sp)->i) // cast since it may be promoted
 #define POPF()    ((jfloat) (--sp)->f)
-#define POPL()    ({ _Jv_word2 w2; \
+#if SIZEOF_VOID_P == 8
+# define POPL()	  (sp -= 2, (jlong) sp->l)
+# define POPD()	  (sp -= 2, (jdouble) sp->d)
+#else
+# define POPL()    ({ _Jv_word2 w2; \
                      w2.ia[1] = (--sp)->ia[0]; \
                      w2.ia[0] = (--sp)->ia[0]; w2.l; })
-#define POPD()    ({ _Jv_word2 w2; \
+# define POPD()    ({ _Jv_word2 w2; \
                      w2.ia[1] = (--sp)->ia[0]; \
                      w2.ia[0] = (--sp)->ia[0]; w2.d; })
+#endif
 
 #define LOADA(I)  (sp++)->o = locals[I].o
 #define LOADI(I)  (sp++)->i = locals[I].i
 #define LOADF(I)  (sp++)->f = locals[I].f
-#define LOADL(I)  do { jint __idx = (I); \
-    (sp++)->ia[0] = locals[__idx].ia[0]; \
-    (sp++)->ia[0] = locals[__idx+1].ia[0]; \
- } while (0)
-#define LOADD(I)  LOADL(I)
-
+#if SIZEOF_VOID_P == 8
+# define LOADL(I)  (sp->l = locals[I].l, sp += 2)
+# define LOADD(I)  (sp->d = locals[I].d, sp += 2)
+#else
+# define LOADL(I)  do { jint __idx = (I); \
+    			(sp++)->ia[0] = locals[__idx].ia[0]; \
+    			(sp++)->ia[0] = locals[__idx+1].ia[0]; \
+ 		   } while (0)
+# define LOADD(I)  LOADL(I)
+#endif
 
 #define STOREA(I) locals[I].o = (--sp)->o
 #define STOREI(I) locals[I].i = (--sp)->i
 #define STOREF(I) locals[I].f = (--sp)->f
-#define STOREL(I) do { jint __idx = (I); \
-    locals[__idx+1].ia[0] = (--sp)->ia[0]; \
-    locals[__idx].ia[0] = (--sp)->ia[0]; \
- } while (0)
-#define STORED(I) STOREL(I)
+#if SIZEOF_VOID_P == 8
+# define STOREL(I) (sp -= 2, locals[I].l = sp->l)
+# define STORED(I) (sp -= 2, locals[I].d = sp->d)
+#else
+# define STOREL(I) do { jint __idx = (I); \
+    		       locals[__idx+1].ia[0] = (--sp)->ia[0]; \
+    		       locals[__idx].ia[0] = (--sp)->ia[0]; \
+		   } while (0)
+# define STORED(I) STOREL(I)
+#endif
 
 #define PEEKI(I)  (locals+(I))->i
 #define PEEKA(I)  (locals+(I))->o
@@ -199,7 +218,7 @@
   _Jv_word *locals = inv->local_base ();
 
   /* Go straight at it!  the ffi raw format matches the internal
-     stack representation exactly.  At leat, that's the idea.
+     stack representation exactly.  At least, that's the idea.
   */
   memcpy ((void*) locals, (void*) args, args_raw_size);
 
@@ -693,7 +712,13 @@
 
 	jdouble rvalue;
 
+#if FFI_NATIVE_RAW_API
+	/* We assume that this is only implemented if it's correct	*/
+	/* to use it here.  On a 64 bit machine, it never is.		*/
 	ffi_raw_call (cif, fun, (void*)&rvalue, raw);
+#else
+	ffi_java_raw_call (cif, fun, (void*)&rvalue, raw);
+#endif
 
 	int rtype = cif->rtype->type;
 
Index: resolve.cc
===================================================================
RCS file: /cvs/java/libgcj/libjava/resolve.cc,v
retrieving revision 1.16
diff -u -r1.16 resolve.cc
--- resolve.cc	2000/03/07 19:55:24	1.16
+++ resolve.cc	2000/03/26 20:27:24
@@ -1045,6 +1045,13 @@
   return item_count;
 }
 
+#if FFI_NATIVE_RAW_API
+#   define FFI_PREP_RAW_CLOSURE ffi_prep_raw_closure
+#   define FFI_RAW_SIZE ffi_raw_size
+#else
+#   define FFI_PREP_RAW_CLOSURE ffi_prep_java_raw_closure
+#   define FFI_RAW_SIZE ffi_java_raw_size
+#endif
 
 /* we put this one here, and not in interpret.cc because it
  * calls the utility routines count_arguments 
@@ -1083,7 +1090,7 @@
 
   ffi_closure_fun fun;
 
-  args_raw_size = ffi_raw_size (&closure->cif);
+  args_raw_size = FFI_RAW_SIZE (&closure->cif);
 
   JvAssert ((self->accflags & Modifier::NATIVE) == 0);
 
@@ -1099,10 +1106,10 @@
       fun = (ffi_closure_fun)&_Jv_InterpMethod::run_normal;
     }
 
-  ffi_prep_raw_closure (&closure->closure,
-			&closure->cif, 
-			fun,
-			(void*) this);
+  FFI_PREP_RAW_CLOSURE (&closure->closure,
+		        &closure->cif, 
+		        fun,
+		        (void*)this);
 
   self->ncode = (void*)closure;
   return self->ncode;
@@ -1134,7 +1141,7 @@
 
   ffi_closure_fun fun;
 
-  args_raw_size = ffi_raw_size (&closure->cif);
+  args_raw_size = FFI_RAW_SIZE (&closure->cif);
 
   // Initialize the argument types and CIF that represent the actual
   // underlying JNI function.
@@ -1161,7 +1168,7 @@
   // interpreted code use JNI.
   fun = (ffi_closure_fun) &_Jv_JNIMethod::call;
 
-  ffi_prep_raw_closure (&closure->closure,
+  FFI_PREP_RAW_CLOSURE (&closure->closure,
 			&closure->cif, 
 			fun,
 			(void*) this);
Index: gcj/javaprims.h
===================================================================
RCS file: /cvs/java/libgcj/libjava/gcj/javaprims.h,v
retrieving revision 1.7
diff -u -r1.7 javaprims.h
--- javaprims.h	2000/03/07 19:55:24	1.7
+++ javaprims.h	2000/03/26 20:27:25
@@ -285,7 +285,16 @@
   jint ia[1];			// Half of _Jv_word2.
   void* p;
 
-  // these are things we will store in the constant 
+  // We use __LP64__ and not SIZEOF_VOID_P here because we want
+  // something that will be predefined by the compiler.  FIXME -- this
+  // definition probably shouldn't appear here anyway.
+#ifdef __LP64__
+  // We can safely put a long or a double in here without increasing
+  // the size of _Jv_Word; we take advantage of this in the interpreter.
+  jlong l;
+  jdouble d;
+#endif
+
   jclass                     clazz;
   jstring                    string;
   struct _Jv_Field          *field;
Index: include/default-signal.h
===================================================================
RCS file: /cvs/java/libgcj/libjava/include/default-signal.h,v
retrieving revision 1.5
diff -u -r1.5 default-signal.h
--- default-signal.h	2000/03/07 19:55:25	1.5
+++ default-signal.h	2000/03/26 20:27:25
@@ -13,8 +13,8 @@
 
 #ifdef SJLJ_EXCEPTIONS
 
-#define HANDLE_SEGV
-#define HANDLE_FPE
+#define HANDLE_SEGV 1
+#define HANDLE_FPE 1
 
 #include <signal.h>
 
Index: include/java-cpool.h
===================================================================
RCS file: /cvs/java/libgcj/libjava/include/java-cpool.h,v
retrieving revision 1.5
diff -u -r1.5 java-cpool.h
--- java-cpool.h	2000/03/07 19:55:25	1.5
+++ java-cpool.h	2000/03/26 20:27:25
@@ -1,6 +1,6 @@
 // java-cpool.h - Constant pool parsing header.  -*- c++ -*-
 
-/* Copyright (C) 1999  Free Software Foundation
+/* Copyright (C) 1999, 2000  Free Software Foundation
 
    This file is part of libgcj.
 
@@ -80,37 +80,53 @@
 extern inline void
 _Jv_storeLong (_Jv_word *data, jlong l)
 {
+#if SIZEOF_VOID_P == 8
+  data[0].l = l;
+#else
   _Jv_word2 tmp;
   tmp.l = l;
   data[0].ia[0] = tmp.ia[0];
   data[1].ia[0] = tmp.ia[1];
+#endif
 }
 
 extern inline jlong
 _Jv_loadLong (_Jv_word *data)
 {
+#if SIZEOF_VOID_P == 8
+  return data -> l;
+#else
   _Jv_word2 tmp;
   tmp.ia[0] = data[0].ia[0];
   tmp.ia[1] = data[1].ia[0];
   return tmp.l;
+#endif
 }
 
 extern inline void
 _Jv_storeDouble (_Jv_word *data, jdouble d)
 {
+#if SIZEOF_VOID_P == 8
+  data[0].d = d;
+#else
   _Jv_word2 tmp;
   tmp.d = d;
   data[0].ia[0] = tmp.ia[0];
   data[1].ia[0] = tmp.ia[1];
+#endif
 }
 
 extern inline jdouble
 _Jv_loadDouble (_Jv_word *data)
 {
+#if SIZEOF_VOID_P == 8
+  return data -> d;
+#else
   _Jv_word2 tmp;
   tmp.ia[0] = data[0].ia[0];
   tmp.ia[1] = data[1].ia[0];
   return tmp.d;
+#endif
 }
 
 
Index: java/lang/mprec.h
===================================================================
RCS file: /cvs/java/libgcj/libjava/java/lang/mprec.h,v
retrieving revision 1.4
diff -u -r1.4 mprec.h
--- mprec.h	2000/01/10 20:02:47	1.4
+++ mprec.h	2000/03/26 20:27:26
@@ -284,7 +284,9 @@
  */
 
 #ifndef Pack_32
+#if SIZEOF_VOID_P != 8
 #define Pack_32
+#endif
 #endif
 #endif
 

From java-patches-return-597-listarch-java-patches=sourceware.cygnus.com@sourceware.cygnus.com Mon Mar 27 08:06:05 2000
Return-Path: <java-patches-return-597-listarch-java-patches=sourceware.cygnus.com@sourceware.cygnus.com>
Delivered-To: listarch-java-patches@sourceware.cygnus.com
Received: (qmail 7453 invoked by alias); 27 Mar 2000 08:06:05 -0000
Mailing-List: contact java-patches-help@sourceware.cygnus.com; run by ezmlm
Precedence: bulk
List-Subscribe: <mailto:java-patches-subscribe@sourceware.cygnus.com>
List-Archive: <http://sourceware.cygnus.com/ml/java-patches/>
List-Post: <mailto:java-patches@sourceware.cygnus.com>
List-Help: <mailto:java-patches-help@sourceware.cygnus.com>, <http://sourceware.cygnus.com/ml/#faqs>
Sender: java-patches-owner@sourceware.cygnus.com
Delivered-To: mailing list java-patches@sourceware.cygnus.com
Received: (qmail 7428 invoked from network); 27 Mar 2000 08:06:04 -0000
Date: Mon, 27 Mar 2000 00:06:03 -0800
Message-Id: <200003270806.AAA01490@hoser.cygnus.com>
X-Authentication-Warning: hoser.cygnus.com: green set sender to green@cygnus.com using -f
From: Anthony Green <green@cygnus.com>
To: java-patches@sourceware.cygnus.com
Subject: Patch: JVMPI
X-Organization: Red Hat, Sunnyvale, California
X-URL: http://www.cygnus.com/~green
Reply-to: green@cygnus.com


The following patch implements partial support for JVMPI, the
profiling interface.

It is enabled by default.  A configure option, --disable-jvmpi, can
turn it off.  I have not included a patch for the generated configure
file below.

This patch only provides support for object allocation, thread start
and thread end events.

JVMPI is described here...
      http://java.sun.com/products/jdk/1.3/docs/guide/jvmpi/jvmpi.html

Some of the magic numbers aren't defined in the spec, so I made them
up and noted them with FIXME's in the headers.

This patch also introduces a way to call JNI libraries at program
startup.  JNI_OnLoad is defined as a weak symbol in natFirstThread.cc.
If a JNI library providing JNI_OnLoad is linked into an executable
then that function is called just before the main java function.  Some
systems, like Linux, let you preload shared libraries before running a
fully linked executable.  This is a neat trick, and here's how you can
take advantage of it with JVMPI.  Consider sizes.c...

---- cut here ------------------------------------------------------------
#include <jni.h>
#include <jvmpi.h>
#include <stdio.h>

JVMPI_Interface *jvmpi_interface;

void notify (JVMPI_Event *event)
{
  if (event->event_type == JVMPI_EVENT_OBJECT_ALLOC)
    printf ("size = %d\n", event->u.obj_alloc.size);
}

jint JNI_OnLoad (JavaVM *jvm, void *args)
{
  int res = (*jvm)->GetEnv (jvm, (void **)&jvmpi_interface, JVMPI_VERSION_1);
  if (res != 0)
    return JNI_ERR;

  jvmpi_interface->NotifyEvent = notify;
  (*jvmpi_interface->EnableEvent) (JVMPI_EVENT_OBJECT_ALLOC, NULL);

  return JNI_VERSION_1_2;
}
---- cut here ------------------------------------------------------------

Compile it like so...

$ gcc -shared -o libsizes.so sizes.c

Given a gcj built java program `hello'...

$ hello
Hello World

...using LD_PRELOAD will magically enable the profiling code...

$ LD_PRELOAD=libsizes.so hello
size = 38
size = 12
size = 12
size = 12
size = 68
size = 12
...etc...
size = 16
Hello World
size = 12


This patch also introduces _Jv_DisableGC and _Jv_EnableGC, which are
required by JVMPI.


AG

-- 
Anthony Green                                                        Red Hat
                                                       Sunnyvale, California

2000-03-27  Anthony Green  <green@redhat.com>
 
	* include/config.h.in: Rebuilt.
	* acconfig.h: Add ENABLE_JVMPI.
	* configure: Rebuilt.
	* configure.in: Add --disable-jvmpi.
 
	* java/lang/natThread.cc: Include JVMPI headers if necessary.
	(finish_): Generate JVMPI thread end events.
	(run_): Generate JVMPI thread start events.
	* gnu/gcj/runtime/natFirstThread.cc (run): Call JNI_OnLoad for any
	preloaded JNI library.
	Include JVMPI headers if necessary.
	(run): Generate JVMPI thread start events.
  
	* include/jvm.h: Declare _Jv_DisableGC and _Jv_EnableGC.
  
	* boehm.cc: Define GC_disable and GC_enable.
	(_Jv_DisableGC): New function.
	(_Jv_EnableGC): New function.
  
	* jni.cc (_Jv_JNI_GetEnv): Handle JVMPI interface requests.
	(_Jv_JVMPI_Interface): Define.
	(jvmpiEnableEvent): New function.
	(_Jv_JNI_Init): Initialize _Jv_JVMPI_Interface.
	
	* include/jvmpi.h: New file.

Index: acconfig.h
===================================================================
RCS file: /cvs/java/libgcj/libjava/acconfig.h,v
retrieving revision 1.18
diff -c -r1.18 acconfig.h
*** acconfig.h	2000/01/31 04:53:47	1.18
--- acconfig.h	2000/03/27 07:24:27
***************
*** 137,139 ****
--- 137,142 ----
  
  /* Define if you have working iconv() function.  */
  #undef HAVE_ICONV
+ 
+ /* Define if you are using JVMPI.  */
+ #undef ENABLE_JVMPI
Index: boehm.cc
===================================================================
RCS file: /cvs/java/libgcj/libjava/boehm.cc,v
retrieving revision 1.15
diff -c -r1.15 boehm.cc
*** boehm.cc	2000/03/07 19:55:24	1.15
--- boehm.cc	2000/03/27 07:24:28
***************
*** 391,396 ****
--- 391,412 ----
    GC_set_max_heap_size ((GC_word) size);
  }
  
+ // From boehm's misc.c 
+ extern "C" void GC_enable();
+ extern "C" void GC_disable();
+ 
+ void
+ _Jv_DisableGC (void)
+ {
+   GC_disable();
+ }
+ 
+ void
+ _Jv_EnableGC (void)
+ {
+   GC_enable();
+ }
+ 
  void
  _Jv_InitGC (void)
  {
Index: configure.in
===================================================================
RCS file: /cvs/java/libgcj/libjava/configure.in,v
retrieving revision 1.54
diff -c -r1.54 configure.in
*** configure.in	2000/03/26 20:33:03	1.54
--- configure.in	2000/03/27 07:24:31
***************
*** 127,132 ****
--- 127,140 ----
     AC_DEFINE(DISABLE_JAVA_NET)
  fi
  
+ dnl See if the user wants to disable JVMPI support.
+ AC_ARG_ENABLE(jvmpi,
+ [  --disable-jvmpi         disable JVMPI support])
+ 
+ if test "$enable_jvmpi" != no; then
+     AC_DEFINE(ENABLE_JVMPI)
+ fi
+ 
  dnl If the target is an eCos system, use the appropriate eCos
  dnl I/O routines.
  dnl FIXME: this should not be a local option but a global target
Index: jni.cc
===================================================================
RCS file: /cvs/java/libgcj/libjava/jni.cc,v
retrieving revision 1.27
diff -c -r1.27 jni.cc
*** jni.cc	2000/03/14 21:59:54	1.27
--- jni.cc	2000/03/27 07:24:34
***************
*** 20,25 ****
--- 20,28 ----
  #include <jvm.h>
  #include <java-assert.h>
  #include <jni.h>
+ #ifdef ENABLE_JVMPI
+ #include <jvmpi.h>
+ #endif
  
  #include <java/lang/Class.h>
  #include <java/lang/ClassLoader.h>
***************
*** 105,116 ****
--- 108,178 ----
  // The only VM.
  static JavaVM *the_vm;
  
+ #ifdef ENABLE_JVMPI
+ extern void (*_Jv_JVMPI_Notify_OBJECT_ALLOC) (JVMPI_Event *event);
+ extern void (*_Jv_JVMPI_Notify_THREAD_END) (JVMPI_Event *event);
+ extern void (*_Jv_JVMPI_Notify_THREAD_START) (JVMPI_Event *event);
+ 
+ // The only JVMPI interface description.
+ static JVMPI_Interface _Jv_JVMPI_Interface;
+ 
+ static jint
+ jvmpiEnableEvent (jint event_type, void *arg)
+ {
+   switch (event_type)
+     {
+     case JVMPI_EVENT_OBJECT_ALLOC:
+       _Jv_JVMPI_Notify_OBJECT_ALLOC = _Jv_JVMPI_Interface.NotifyEvent;
+       break;
+       
+     case JVMPI_EVENT_THREAD_START:
+       _Jv_JVMPI_Notify_THREAD_START = _Jv_JVMPI_Interface.NotifyEvent;
+       break;
+       
+     case JVMPI_EVENT_THREAD_END:
+       _Jv_JVMPI_Notify_THREAD_END = _Jv_JVMPI_Interface.NotifyEvent;
+       break;
+       
+     default:
+       return JVMPI_NOT_AVAILABLE;
+     }
+   
+   return JVMPI_SUCCESS;
+ }
+ 
+ static jint
+ jvmpiDisableEvent (jint event_type, void *arg)
+ {
+   switch (event_type)
+     {
+     case JVMPI_EVENT_OBJECT_ALLOC:
+       _Jv_JVMPI_Notify_OBJECT_ALLOC = NULL;
+       break;
+       
+     default:
+       return JVMPI_NOT_AVAILABLE;
+     }
+   
+   return JVMPI_SUCCESS;
+ }
+ #endif
+ 
  
  
  void
  _Jv_JNI_Init (void)
  {
    ref_table = new java::util::Hashtable;
+   
+ #ifdef ENABLE_JVMPI
+   _Jv_JVMPI_Interface.version = 1;
+   _Jv_JVMPI_Interface.EnableEvent = &jvmpiEnableEvent;
+   _Jv_JVMPI_Interface.DisableEvent = &jvmpiDisableEvent;
+   _Jv_JVMPI_Interface.EnableGC = &_Jv_EnableGC;
+   _Jv_JVMPI_Interface.DisableGC = &_Jv_DisableGC;
+   _Jv_JVMPI_Interface.DisableGC = &_Jv_DisableGC;
+   _Jv_JVMPI_Interface.RunGC = &_Jv_RunGC;
+ #endif
  }
  
  // Tell the GC that a certain pointer is live.
***************
*** 1867,1872 ****
--- 1929,1943 ----
        *penv = NULL;
        return JNI_EDETACHED;
      }
+ 
+ #ifdef ENABLE_JVMPI
+   // Handle JVMPI requests.
+   if (version == JVMPI_VERSION_1)
+     {
+       *penv = (void *) &_Jv_JVMPI_Interface;
+       return 0;
+     }
+ #endif
  
    // FIXME: do we really want to support 1.1?
    if (version != JNI_VERSION_1_2 && version != JNI_VERSION_1_1)
Index: prims.cc
===================================================================
RCS file: /cvs/java/libgcj/libjava/prims.cc,v
retrieving revision 1.24
diff -c -r1.24 prims.cc
*** prims.cc	2000/03/15 22:03:19	1.24
--- prims.cc	2000/03/27 07:24:34
***************
*** 34,39 ****
--- 34,43 ----
  #include <java-signal.h>
  #include <java-threads.h>
  
+ #ifdef ENABLE_JVMPI
+ #include <jvmpi.h>
+ #endif
+ 
  #ifndef DISABLE_GETENV_PROPERTIES
  #include <ctype.h>
  #include <java-props.h>
***************
*** 83,88 ****
--- 87,96 ----
  // The name of this executable.
  static char * _Jv_execName;
  
+ #ifdef ENABLE_JVMPI
+ // Pointer to JVMPI notification functions.
+ void (*_Jv_JVMPI_Notify_OBJECT_ALLOC) (JVMPI_Event *event);
+ #endif
  
  
  #ifdef HANDLE_SEGV
***************
*** 325,330 ****
--- 333,359 ----
    // appropriate index in the method vector.
    if (c->vtable->method[1] != ObjectClass.vtable->method[1])
      _Jv_RegisterFinalizer (obj, _Jv_FinalizeObject);
+ 
+ #ifdef ENABLE_JVMPI
+   // Service JVMPI request.
+ 
+   if (_Jv_JVMPI_Notify_OBJECT_ALLOC)
+     {
+       JVMPI_Event event;
+ 
+       event.event_type = JVMPI_EVENT_OBJECT_ALLOC;
+       event.env_id = NULL;
+       event.u.obj_alloc.arena_id = 0;
+       event.u.obj_alloc.class_id = (jobjectID) c;
+       event.u.obj_alloc.is_array = 0;
+       event.u.obj_alloc.size = size;
+       event.u.obj_alloc.obj_id = (jobjectID) obj;
+ 
+       _Jv_DisableGC ();
+       (*_Jv_JVMPI_Notify_OBJECT_ALLOC) (&event);
+       _Jv_EnableGC ();
+     }
+ #endif
  
    return obj;
  }
Index: gnu/gcj/runtime/natFirstThread.cc
===================================================================
RCS file: /cvs/java/libgcj/libjava/gnu/gcj/runtime/natFirstThread.cc,v
retrieving revision 1.2
diff -c -r1.2 natFirstThread.cc
*** natFirstThread.cc	2000/03/07 19:55:25	1.2
--- natFirstThread.cc	2000/03/27 07:24:35
***************
*** 14,19 ****
--- 14,20 ----
  
  #include <gcj/cni.h>
  #include <jvm.h>
+ #include <jni.h>
  
  #include <gnu/gcj/runtime/FirstThread.h>
  #include <java/lang/Class.h>
***************
*** 22,37 ****
--- 23,78 ----
  #include <java/lang/reflect/Modifier.h>
  #include <java/io/PrintStream.h>
  
+ #ifdef ENABLE_JVMPI
+ #include <jvmpi.h>
+ #include <java/lang/ThreadGroup.h>
+ #include <java/lang/UnsatisfiedLinkError.h>
+ #endif
+ 
  #define DIE(Message)  die (JvNewStringLatin1 (Message))
  
  typedef void main_func (jobject);
  
+ #ifdef WITH_JVMPI
+ extern void (*_Jv_JVMPI_Notify_THREAD_START) (JVMPI_Event *event);
+ #endif
+ 
+ /* This will be non-NULL if the user has preloaded a JNI library, or
+    linked one into the executable.  */
+ extern "C" 
+ {
+ #pragma weak JNI_OnLoad
+   extern jint JNI_OnLoad (JavaVM *, void *) __attribute__((weak));
+ }
+ 
  void
  gnu::gcj::runtime::FirstThread::run (void)
  {
+ 
    Utf8Const* main_signature = _Jv_makeUtf8Const ("([Ljava.lang.String;)V", 22);
    Utf8Const* main_name = _Jv_makeUtf8Const ("main", 4);
  
+   /* Some systems let you preload shared libraries before running a
+      program.  Under Linux, this is done by setting the LD_PRELOAD
+      environment variable.  We take advatage of this here to allow for
+      dynamically loading a JNI library into a fully linked executable.  */
+ 
+   if (JNI_OnLoad != NULL)
+     {
+       JavaVM *vm = _Jv_GetJavaVM ();
+       if (vm == NULL)
+ 	{
+ 	  // FIXME: what?
+ 	  return;
+ 	}
+       jint vers = JNI_OnLoad (vm, NULL);
+       if (vers != JNI_VERSION_1_1 && vers != JNI_VERSION_1_2)
+ 	{
+ 	  // FIXME: unload the library.
+ 	  _Jv_Throw (new java::lang::UnsatisfiedLinkError (JvNewStringLatin1 ("unrecognized version from preloaded JNI_OnLoad")));
+ 	}
+     }
+ 
    if (klass == NULL)
      {
        klass = java::lang::Class::forName (klass_name);
***************
*** 47,52 ****
--- 88,147 ----
      DIE ("`main' must be static");
    if (! java::lang::reflect::Modifier::isPublic(meth->accflags))
      DIE ("`main' must be public");
+ 
+ #ifdef WITH_JVMPI
+   if (_Jv_JVMPI_Notify_THREAD_START)
+     {
+       JVMPI_Event event;
+ 
+       jstring thread_name = getName ();
+       jstring group_name = NULL, parent_name = NULL;
+       java::lang::ThreadGroup *group = getThreadGroup ();
+ 
+       if (group)
+ 	{
+ 	  group_name = group->getName ();
+ 	  group = group->getParent ();
+ 
+ 	  if (group)
+ 	    parent_name = group->getName ();
+ 	}
+ 
+       int thread_len = thread_name ? JvGetStringUTFLength (thread_name) : 0;
+       int group_len = group_name ? JvGetStringUTFLength (group_name) : 0;
+       int parent_len = parent_name ? JvGetStringUTFLength (parent_name) : 0;
+ 
+       char thread_chars[thread_len + 1];
+       char group_chars[group_len + 1];
+       char parent_chars[parent_len + 1];
+ 
+       if (thread_name)
+ 	JvGetStringUTFRegion (thread_name, 0, 
+ 			      thread_name->length(), thread_chars);
+       if (group_name)
+ 	JvGetStringUTFRegion (group_name, 0, 
+ 			      group_name->length(), group_chars);
+       if (parent_name)
+ 	JvGetStringUTFRegion (parent_name, 0, 
+ 			      parent_name->length(), parent_chars);
+ 
+       thread_chars[thread_len] = '\0';
+       group_chars[group_len] = '\0';
+       parent_chars[parent_len] = '\0';
+ 
+       event.event_type = JVMPI_EVENT_THREAD_START;
+       event.env_id = NULL;
+       event.u.thread_start.thread_name = thread_chars;
+       event.u.thread_start.group_name = group_chars;
+       event.u.thread_start.parent_name = parent_chars;
+       event.u.thread_start.thread_id = (jobjectID) this;
+       event.u.thread_start.thread_env_id = _Jv_GetCurrentJNIEnv ();
+ 
+       _Jv_DisableGC ();
+       (*_Jv_JVMPI_Notify_THREAD_START) (&event);
+       _Jv_EnableGC ();
+     }
+ #endif
  
    main_func *real_main = (main_func *) meth->ncode;
    (*real_main) (args);
Index: include/config.h.in
===================================================================
RCS file: /cvs/java/libgcj/libjava/include/config.h.in,v
retrieving revision 1.22
diff -c -r1.22 config.h.in
*** config.h.in	2000/01/31 04:53:47	1.22
--- config.h.in	2000/03/27 07:24:35
***************
*** 152,157 ****
--- 152,163 ----
  /* Define if g++ has a bug preventing us from inlining math routines.  */
  #undef __NO_MATH_INLINES
  
+ /* Define if you are using JVMPI.  */
+ #undef ENABLE_JVMPI
+ 
+ /* The number of bytes in a void *.  */
+ #undef SIZEOF_VOID_P
+ 
  /* Define if you have the access function.  */
  #undef HAVE_ACCESS
  
Index: include/jvm.h
===================================================================
RCS file: /cvs/java/libgcj/libjava/include/jvm.h,v
retrieving revision 1.19
diff -c -r1.19 jvm.h
*** jvm.h	2000/03/07 19:55:25	1.19
--- jvm.h	2000/03/27 07:24:35
***************
*** 82,87 ****
--- 82,90 ----
  void _Jv_RunAllFinalizers (void);
  /* Perform a GC.  */
  void _Jv_RunGC (void);
+ /* Disable and enable GC.  */
+ void _Jv_DisableGC (void);
+ void _Jv_EnableGC (void);
  
  /* Return approximation of total size of heap.  */
  long _Jv_GCTotalMemory (void);
Index: include/jvmpi.h
===================================================================
RCS file: jvmpi.h
diff -N jvmpi.h
*** /dev/null	Tue May  5 13:32:27 1998
--- jvmpi.h	Sun Mar 26 23:24:35 2000
***************
*** 0 ****
--- 1,230 ----
+ /* Copyright (C) 2000  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.  */
+ 
+ /* Note: this file must be compilable by the C compiler (for now,
+    assuming GNU C is ok).  This means you must never use `//'
+    comments, and all C++-specific code must be conditional on
+    __cplusplus.  */
+ 
+ #ifndef __GCJ_JVMPI_H__
+ #define __GCJ_JVMPI_H__
+ 
+ #include <jni.h>
+ 
+ /* JVMPI version numbers.  FIXME: this is a semi-random number.  The
+    documentation doesn't say what it should be.  */
+ #define JVMPI_VERSION_1 0x00020001
+ 
+ /* JVMPI return codes.  FIXME: These are semi-random numbers.  The
+    documentation doesn't say what they should be.  */
+ #define JVMPI_SUCCESS       0
+ #define JVMPI_FAIL          1
+ #define JVMPI_NOT_AVAILABLE 2
+ 
+ /* An opaque pointer representing an object ID.  */
+ struct _jobjectID;
+ typedef struct _jobjectID * jobjectID;       
+ 
+ typedef struct
+ {
+   /* Source line number.  */
+   jint lineno;
+   /* Method being executed.  */
+   jmethodID method_id;
+ } JVMPI_CallFrame;
+ 
+ typedef struct 
+ {
+   JNIEnv *env_id;
+   /* Number of frames in the call trace.  */
+   jint num_frames;
+   /* An array of frames representing the trace.  Callees first.  */
+   JVMPI_CallFrame *frames;
+ } JVMPI_CallTrace;
+ 
+ typedef struct
+ {
+   /* Name of the field.  */
+   char *field_name;
+   /* Signature of the field.  */
+   char *field_signature;
+ } JVMPI_Field;
+ 
+ /* The documentation doesn't actually specify what the
+    JVMPI_DUMP_LEVEL macros should be defined to.  Here's a reasonable
+    guess.  */
+ #define JVMPI_DUMP_LEVEL_0 0
+ #define JVMPI_DUMP_LEVEL_1 1
+ #define JVMPI_DUMP_LEVEL_2 2
+ #define JVMPI_DUMP_LEVEL_3 3
+ 
+ typedef struct
+ {
+   /* One of JVMPI_DUMP_LEVEL_0, JVMPI_DUMP_LEVEL_1 or
+      JVMPI_DUMP_LEVEL_2.  */
+   jint heap_dump_level;
+ } JVMPI_HeapDumpArg;
+ 
+ typedef struct
+ {
+   /* Offset from the beginning of the method.  */
+   jint offset;
+   /* Line number from the beginning of the source file.  */
+   jint lineno;
+ } JVMPI_Lineno;
+ 
+ typedef struct
+ {
+   /* Name of the method.  */
+   char *method_name;
+   /* Signature of the method.  */
+   char *method_signature;
+   /* Start line number from the beginning of the source file.  */
+   jint start_lineno;
+   /* End line number from the beginning of the source file.  */
+   jint end_lineno;
+   /* The method ID.  */
+   jmethodID method_id;
+ } JVMPI_Method;
+ 
+ /* An opaque pointer representing a raw monitor.  */
+ struct _JVMPI_RawMonitor;
+ typedef struct _JVMPI_RawMonitor *JVMPI_RawMonitor;
+ 
+ /* JVMPI event codes.  FIXME: These are semi-random numbers.  The
+    documentation doesn't say what they should be.  */
+ #define JVMPI_EVENT_ARENA_DELETE                   0
+ #define JVMPI_EVENT_ARENA_NEW                      1
+ #define JVMPI_EVENT_CLASS_LOAD                     2
+ #define JVMPI_EVENT_CLASS_LOAD_HOOK                3
+ #define JVMPI_EVENT_CLASS_UNLOAD                   4
+ #define JVMPI_EVENT_COMPILED_METHOD_LOAD           5
+ #define JVMPI_EVENT_COMPILED_METHOD_UNLOAD         6
+ #define JVMPI_EVENT_DATA_DUMP_REQUEST              7
+ #define JVMPI_EVENT_DATA_RESET_REQUEST             8
+ #define JVMPI_EVENT_GC_FINISH                      9
+ #define JVMPI_EVENT_GC_START                      10
+ #define JVMPI_EVENT_HEAP_DUMP                     11
+ #define JVMPI_EVENT_JNI_GLOBALREF_ALLOC           12
+ #define JVMPI_EVENT_JNI_GLOBALREF_FREE            13
+ #define JVMPI_EVENT_JNI_WEAK_GLOBALREF_ALLOC      14
+ #define JVMPI_EVENT_JNI_WEAK_GLOBALREF_FREE       15
+ #define JVMPI_EVENT_JVM_INIT_DONE                 16
+ #define JVMPI_EVENT_JVM_SHUT_DOWN                 17
+ #define JVMPI_EVENT_METHOD_ENTRY                  18
+ #define JVMPI_EVENT_METHOD_ENTRY2                 19
+ #define JVMPI_EVENT_METHOD_EXIT                   20
+ #define JVMPI_EVENT_MONITOR_CONTENDED_ENTER       21
+ #define JVMPI_EVENT_MONITOR_CONTENDED_ENTERED     22
+ #define JVMPI_EVENT_MONITOR_CONTENDED_EXIT        23
+ #define JVMPI_EVENT_MONITOR_DUMP                  24
+ #define JVMPI_EVENT_MONITOR_WAIT                  25
+ #define JVMPI_EVENT_MONITOR_WAITED                26
+ #define JVMPI_EVENT_OBJECT_ALLOC                  27
+ #define JVMPI_EVENT_OBJECT_DUMP                   28
+ #define JVMPI_EVENT_OBJECT_FREE                   29
+ #define JVMPI_EVENT_OBJECT_MOVE                   30
+ #define JVMPI_EVENT_RAW_MONITOR_CONTENDED_ENTER   31
+ #define JVMPI_EVENT_RAW_MONITOR_CONTENDED_ENTERED 32
+ #define JVMPI_EVENT_RAW_MONITOR_CONTENDED_EXIT    33
+ #define JVMPI_EVENT_THREAD_END                    34
+ #define JVMPI_EVENT_THREAD_START                  35
+ #define JVMPI_EVENT_INSTRUCTION_START             36
+ 
+ 
+ typedef struct
+ {
+   /* Event type.  */
+   jint event_type;
+ 
+   /* Evn where this event occurred.  */
+   JNIEnv *env_id;
+ 
+   union 
+   {
+     struct
+     {
+       char *class_name;
+       char *source_name;
+       jint num_interfaces;
+       jint num_methods;
+       JVMPI_Method *methods;
+       jint num_static_fields;
+       JVMPI_Field *statics;
+       jint num_instance_fields;
+       JVMPI_Field *instances;
+       jobjectID class_id;
+     } class_load;
+ 
+     struct
+     {
+       jobjectID class_id;
+     } class_unload;
+ 
+     struct
+     {
+       jint arena_id;
+       jobjectID class_id;
+       jint is_array;
+       jint size;
+       jobjectID obj_id;
+     } obj_alloc;
+ 
+     struct
+     {
+       char *thread_name;
+       char *group_name;
+       char *parent_name;
+       jobjectID thread_id;
+       JNIEnv *thread_env_id;
+     } thread_start;
+ 
+   } u;
+ 
+ } JVMPI_Event;
+ 
+ typedef struct
+ {
+   /* JVMPI version number.  */
+   jint version;
+   
+   /* Implemented by the user...  */
+   void (*NotifyEvent) (JVMPI_Event *event);
+   
+   /* Implemented by the runtime...  */
+   jint (*EnableEvent) (jint event_type, void *arg);
+   jint (*DisableEvent) (jint event_type, void *arg);
+   jint (*RequestEvent) (jint event_type, void *arg);
+   void (*GetCallTrace) (JVMPI_CallTrace *trace, jint depth);
+   void (*ProfilerExit) (jint);
+   JVMPI_RawMonitor (*RawMonitorCreate) (char *lock_name);
+   void (*RawMonitorEnter) (JVMPI_RawMonitor lock_id);
+   void (*RawMonitorExit) (JVMPI_RawMonitor lock_id);
+   void (*RawMonitorWait) (JVMPI_RawMonitor lock_id, jlong ms);
+   void (*RawMonitorNotifyAll) (JVMPI_RawMonitor lock_id);
+   void (*RawMonitorDestroy) (JVMPI_RawMonitor lock_id);
+   jlong (*GetCurrentThreadCpuTime) (void);
+   void (*SuspendThread) (JNIEnv *env);
+   void (*ResumeThread) (JNIEnv *env);
+   jint (*GetThreadStatus) (JNIEnv *env);
+   jboolean (*ThreadHasRun) (JNIEnv *env);
+   jint (*CreateSystemThread) (char *name, jint priority, void (*f) (void *));
+   void (*SetThreadLocalStorage) (JNIEnv *env_id, void *ptr);
+   void *(*GetThreadLocalStorage) (JNIEnv *env_id);
+   void (*DisableGC) (void);
+   void (*EnableGC) (void);
+   void (*RunGC) (void);
+   jobjectID (*GetThreadObject) (JNIEnv *env);
+   jobjectID (*GetMethodClass) (jmethodID mid);
+   
+ } JVMPI_Interface;
+ 
+ /* Global event flags.  */
+ extern void (*_Jv_JVMPI_Notify_OBJECT_ALLOC) (JVMPI_Event *event);
+ 
+ #endif /* __GCJ_JVMPI_H__ */
Index: java/lang/natThread.cc
===================================================================
RCS file: /cvs/java/libgcj/libjava/java/lang/natThread.cc,v
retrieving revision 1.15
diff -c -r1.15 natThread.cc
*** natThread.cc	2000/03/07 19:55:26	1.15
--- natThread.cc	2000/03/27 07:24:35
***************
*** 27,32 ****
--- 27,38 ----
  
  #include <jni.h>
  
+ #ifdef ENABLE_JVMPI
+ #include <jvmpi.h>
+ void (*_Jv_JVMPI_Notify_THREAD_END) (JVMPI_Event *event);
+ void (*_Jv_JVMPI_Notify_THREAD_START) (JVMPI_Event *event);
+ #endif
+ 
  
  
  // This structure is used to represent all the data the native side
***************
*** 281,286 ****
--- 287,306 ----
  
    group->remove (this);
  
+ #ifdef ENABLE_JVMPI  
+   if (_Jv_JVMPI_Notify_THREAD_END)
+     {
+       JVMPI_Event event;
+ 
+       event.event_type = JVMPI_EVENT_THREAD_END;
+       event.env_id = _Jv_GetCurrentJNIEnv ();
+ 
+       _Jv_DisableGC ();
+       (*_Jv_JVMPI_Notify_THREAD_END) (&event);
+       _Jv_EnableGC ();
+     }
+ #endif
+ 
    _Jv_MonitorExit (this);
  }
  
***************
*** 290,295 ****
--- 310,370 ----
    java::lang::Thread *thread = (java::lang::Thread *) obj;
    try
      {
+ 
+ #ifdef ENABLE_JVMPI
+       if (_Jv_JVMPI_Notify_THREAD_START)
+ 	{
+ 	  JVMPI_Event event;
+ 	  
+ 	  jstring thread_name = thread->getName ();
+ 	  jstring group_name = NULL, parent_name = NULL;
+ 	  java::lang::ThreadGroup *group = thread->getThreadGroup ();
+ 
+ 	  if (group)
+ 	    {
+ 	      group_name = group->getName ();
+ 	      group = group->getParent ();
+ 	      
+ 	      if (group)
+ 		parent_name = group->getName ();
+ 	    }
+ 	  
+ 	  int thread_len = thread_name ? JvGetStringUTFLength (thread_name) : 0;
+ 	  int group_len = group_name ? JvGetStringUTFLength (group_name) : 0;
+ 	  int parent_len = parent_name ? JvGetStringUTFLength (parent_name) : 0;
+ 	  
+ 	  char thread_chars[thread_len + 1];
+ 	  char group_chars[group_len + 1];
+ 	  char parent_chars[parent_len + 1];
+ 	  
+ 	  if (thread_name)
+ 	    JvGetStringUTFRegion (thread_name, 0, 
+ 				  thread_name->length(), thread_chars);
+ 	  if (group_name)
+ 	    JvGetStringUTFRegion (group_name, 0, 
+ 				  group_name->length(), group_chars);
+ 	  if (parent_name)
+ 	    JvGetStringUTFRegion (parent_name, 0, 
+ 				  parent_name->length(), parent_chars);
+ 	  
+ 	  thread_chars[thread_len] = '\0';
+ 	  group_chars[group_len] = '\0';
+ 	  parent_chars[parent_len] = '\0';
+ 	  
+ 	  event.event_type = JVMPI_EVENT_THREAD_START;
+ 	  event.env_id = NULL;
+ 	  event.u.thread_start.thread_name = thread_chars;
+ 	  event.u.thread_start.group_name = group_chars;
+ 	  event.u.thread_start.parent_name = parent_chars;
+ 	  event.u.thread_start.thread_id = (jobjectID) thread;
+ 	  event.u.thread_start.thread_env_id = _Jv_GetCurrentJNIEnv ();
+ 	  
+ 	  _Jv_DisableGC ();
+ 	  (*_Jv_JVMPI_Notify_THREAD_START) (&event);
+ 	  _Jv_EnableGC ();
+ 	}
+ #endif
+ 
        thread->run ();
      }
    catch (java::lang::Throwable *t)



...and from boehm-gc...

2000-03-26  Anthony Green  <green@redhat.com>

	* misc.c (GC_enable): Always define GC_enable and GC_disable.


Index: misc.c
===================================================================
RCS file: /cvs/cvsfiles/devo/boehm-gc/misc.c,v
retrieving revision 1.14
diff -c -r1.14 misc.c
*** misc.c     2000/03/13 21:02:57	1.14
--- misc.c     2000/03/27 07:49:00
***************
*** 819,825 ****
  
  #endif /* SAVE_CALL_CHAIN */
  
- # ifdef SRC_M3
  void GC_enable()
  {
      GC_dont_gc--;
--- 819,824 ----
***************
*** 829,835 ****
  {
      GC_dont_gc++;
  }
- # endif
  
  #if !defined(NO_DEBUGGING)

From java-patches-return-598-listarch-java-patches=sourceware.cygnus.com@sourceware.cygnus.com Mon Mar 27 14:47:56 2000
Return-Path: <java-patches-return-598-listarch-java-patches=sourceware.cygnus.com@sourceware.cygnus.com>
Delivered-To: listarch-java-patches@sourceware.cygnus.com
Received: (qmail 21319 invoked by alias); 27 Mar 2000 14:47:56 -0000
Mailing-List: contact java-patches-help@sourceware.cygnus.com; run by ezmlm
Precedence: bulk
List-Subscribe: <mailto:java-patches-subscribe@sourceware.cygnus.com>
List-Archive: <http://sourceware.cygnus.com/ml/java-patches/>
List-Post: <mailto:java-patches@sourceware.cygnus.com>
List-Help: <mailto:java-patches-help@sourceware.cygnus.com>, <http://sourceware.cygnus.com/ml/#faqs>
Sender: java-patches-owner@sourceware.cygnus.com
Delivered-To: mailing list java-patches@sourceware.cygnus.com
Received: (qmail 21297 invoked from network); 27 Mar 2000 14:47:54 -0000
Message-ID: <38DF757C.D938C5A5@sigma6.com>
Date: Mon, 27 Mar 2000 09:51:40 -0500
From: Jeff Sturm <jsturm@sigma6.com>
Organization: AppNet
X-Mailer: Mozilla 4.51 [en] (WinNT; I)
X-Accept-Language: en
MIME-Version: 1.0
To: green@cygnus.com
CC: java-patches@sourceware.cygnus.com
Subject: Re: Patch: JVMPI
References: <200003270806.AAA01490@hoser.cygnus.com>
Content-Type: text/plain; charset=us-ascii
Content-Transfer-Encoding: 7bit

The line below is repeated...

Anthony Green wrote:
> +   _Jv_JVMPI_Interface.DisableGC = &_Jv_DisableGC;
> +   _Jv_JVMPI_Interface.DisableGC = &_Jv_DisableGC;

-- 
Jeff Sturm
jsturm@sigma6.com

From java-patches-return-599-listarch-java-patches=sourceware.cygnus.com@sourceware.cygnus.com Mon Mar 27 14:56:41 2000
Return-Path: <java-patches-return-599-listarch-java-patches=sourceware.cygnus.com@sourceware.cygnus.com>
Delivered-To: listarch-java-patches@sourceware.cygnus.com
Received: (qmail 24958 invoked by alias); 27 Mar 2000 14:56:41 -0000
Mailing-List: contact java-patches-help@sourceware.cygnus.com; run by ezmlm
Precedence: bulk
List-Subscribe: <mailto:java-patches-subscribe@sourceware.cygnus.com>
List-Archive: <http://sourceware.cygnus.com/ml/java-patches/>
List-Post: <mailto:java-patches@sourceware.cygnus.com>
List-Help: <mailto:java-patches-help@sourceware.cygnus.com>, <http://sourceware.cygnus.com/ml/#faqs>
Sender: java-patches-owner@sourceware.cygnus.com
Delivered-To: mailing list java-patches@sourceware.cygnus.com
Received: (qmail 24932 invoked from network); 27 Mar 2000 14:56:40 -0000
Date: Mon, 27 Mar 2000 06:56:39 -0800
Message-Id: <200003271456.GAA01895@hoser.cygnus.com>
X-Authentication-Warning: hoser.cygnus.com: green set sender to green@cygnus.com using -f
From: Anthony Green <green@cygnus.com>
To: jsturm@sigma6.com
CC: java-patches@sourceware.cygnus.com
In-reply-to: <38DF757C.D938C5A5@sigma6.com> (message from Jeff Sturm on Mon,
	27 Mar 2000 09:51:40 -0500)
Subject: Re: Patch: JVMPI
X-Organization: Red Hat, Sunnyvale, California
X-URL: http://www.cygnus.com/~green
Reply-to: green@cygnus.com
References: <200003270806.AAA01490@hoser.cygnus.com> <38DF757C.D938C5A5@sigma6.com>


Jeff wrote:
> The line below is repeated...
>
> Anthony Green wrote:
> > +   _Jv_JVMPI_Interface.DisableGC = &_Jv_DisableGC;
> > +   _Jv_JVMPI_Interface.DisableGC = &_Jv_DisableGC;

Fixed - thanks.

AG

-- 
Anthony Green                                                        Red Hat
                                                       Sunnyvale, California

From java-patches-return-600-listarch-java-patches=sourceware.cygnus.com@sourceware.cygnus.com Mon Mar 27 19:12:13 2000
Return-Path: <java-patches-return-600-listarch-java-patches=sourceware.cygnus.com@sourceware.cygnus.com>
Delivered-To: listarch-java-patches@sourceware.cygnus.com
Received: (qmail 32101 invoked by alias); 27 Mar 2000 19:12:12 -0000
Mailing-List: contact java-patches-help@sourceware.cygnus.com; run by ezmlm
Precedence: bulk
List-Subscribe: <mailto:java-patches-subscribe@sourceware.cygnus.com>
List-Archive: <http://sourceware.cygnus.com/ml/java-patches/>
List-Post: <mailto:java-patches@sourceware.cygnus.com>
List-Help: <mailto:java-patches-help@sourceware.cygnus.com>, <http://sourceware.cygnus.com/ml/#faqs>
Sender: java-patches-owner@sourceware.cygnus.com
Delivered-To: mailing list java-patches@sourceware.cygnus.com
Received: (qmail 32076 invoked from network); 27 Mar 2000 19:12:12 -0000
Date: Mon, 27 Mar 2000 11:12:11 -0800 (PST)
Message-Id: <200003271912.LAA25539@ferrule.cygnus.com>
From: Tom Tromey <tromey@cygnus.com>
To: green@cygnus.com
Cc: java-patches@sourceware.cygnus.com
Subject: Re: Patch: JVMPI
In-Reply-To: <200003270806.AAA01490@hoser.cygnus.com>
References: <200003270806.AAA01490@hoser.cygnus.com>
X-Zippy:  I Know A Joke
X-Attribution:  Tom

Anthony> The following patch implements partial support for JVMPI, the
Anthony> profiling interface.

Cool.

Anthony> Some of the magic numbers aren't defined in the spec, so I
Anthony> made them up and noted them with FIXME's in the headers.

We should get them from Sun's header.
Usually, code written to interfaces like this (and JNI) should be
binary compatible between implementations.

I have some notes on the implementation.

Anthony> 	* boehm.cc: Define GC_disable and GC_enable.
Anthony> 	(_Jv_DisableGC): New function.
Anthony> 	(_Jv_EnableGC): New function.

The user can make nested calls to these functions.  I think we have to
track this in boehm.cc, since it isn't handled in the GC itself.

These functions must also be defined in nogc.cc.
  
Anthony> + extern void (*_Jv_JVMPI_Notify_OBJECT_ALLOC) (JVMPI_Event *event);
Anthony> + extern void (*_Jv_JVMPI_Notify_THREAD_END) (JVMPI_Event *event);
Anthony> + extern void (*_Jv_JVMPI_Notify_THREAD_START) (JVMPI_Event *event);

Could we declare these in a header somewhere?
Also, why call these instead of just calling through the global
JVMPI_Interface structure?

Anthony> + #pragma weak JNI_OnLoad
Anthony> +   extern jint JNI_OnLoad (JavaVM *, void *) __attribute__((weak));

Interesting approach :-).
Do we know that one or the other of these will always work?
I know that the #pragma doesn't work everywhere.

One last thing: we should install jvmpi.h in the same place we install
jni.h.

Tom

From java-patches-return-601-listarch-java-patches=sourceware.cygnus.com@sourceware.cygnus.com Mon Mar 27 19:24:09 2000
Return-Path: <java-patches-return-601-listarch-java-patches=sourceware.cygnus.com@sourceware.cygnus.com>
Delivered-To: listarch-java-patches@sourceware.cygnus.com
Received: (qmail 2882 invoked by alias); 27 Mar 2000 19:24:09 -0000
Mailing-List: contact java-patches-help@sourceware.cygnus.com; run by ezmlm
Precedence: bulk
List-Subscribe: <mailto:java-patches-subscribe@sourceware.cygnus.com>
List-Archive: <http://sourceware.cygnus.com/ml/java-patches/>
List-Post: <mailto:java-patches@sourceware.cygnus.com>
List-Help: <mailto:java-patches-help@sourceware.cygnus.com>, <http://sourceware.cygnus.com/ml/#faqs>
Sender: java-patches-owner@sourceware.cygnus.com
Delivered-To: mailing list java-patches@sourceware.cygnus.com
Received: (qmail 2856 invoked from network); 27 Mar 2000 19:24:08 -0000
Date: Mon, 27 Mar 2000 11:24:07 -0800
Message-Id: <200003271924.LAA02413@hoser.cygnus.com>
X-Authentication-Warning: hoser.cygnus.com: green set sender to green@cygnus.com using -f
From: Anthony Green <green@cygnus.com>
To: tromey@cygnus.com
CC: java-patches@sourceware.cygnus.com
In-reply-to: <200003271912.LAA25539@ferrule.cygnus.com> (message from Tom
	Tromey on Mon, 27 Mar 2000 11:12:11 -0800 (PST))
Subject: Re: Patch: JVMPI
X-Organization: Red Hat, Sunnyvale, California
X-URL: http://www.cygnus.com/~green
Reply-to: green@cygnus.com
References: <200003270806.AAA01490@hoser.cygnus.com> <200003271912.LAA25539@ferrule.cygnus.com>



Tom wrote:
> The user can make nested calls to these functions.  I think we have to
> track this in boehm.cc, since it isn't handled in the GC itself.

Right - I forgot about that.

> These functions must also be defined in nogc.cc.

Ok.
  
> Anthony> + extern void (*_Jv_JVMPI_Notify_OBJECT_ALLOC) (JVMPI_Event *event);
> Anthony> + extern void (*_Jv_JVMPI_Notify_THREAD_END) (JVMPI_Event *event);
> Anthony> + extern void (*_Jv_JVMPI_Notify_THREAD_START) (JVMPI_Event *event);
> 
> Could we declare these in a header somewhere?

Ok.

> Also, why call these instead of just calling through the global
> JVMPI_Interface structure?

The way I've done it, each event can have a different notify callback.
The JVMPI_Interface structure can only hold one.  I didn't find any
documentation explaining whether or not you can have different notify
callbacks, so I just picked which one would be most useful.

> Anthony> + #pragma weak JNI_OnLoad
> Anthony> +   extern jint JNI_OnLoad (JavaVM *, void *) __attribute__((weak));
> 
> Interesting approach :-).
> Do we know that one or the other of these will always work?

No.  I don't remember why I did this.  I think maybe only the #pragma
was actually working because jni.h's JNI_OnLoad prototype doesn't have
the weak attribute and was overriding the one in this file.

> One last thing: we should install jvmpi.h in the same place we install
> jni.h.

Oops.  Yes.

Thanks,

AG

-- 
Anthony Green                                                        Red Hat
                                                       Sunnyvale, California

From java-patches-return-602-listarch-java-patches=sourceware.cygnus.com@sourceware.cygnus.com Mon Mar 27 19:29:14 2000
Return-Path: <java-patches-return-602-listarch-java-patches=sourceware.cygnus.com@sourceware.cygnus.com>
Delivered-To: listarch-java-patches@sourceware.cygnus.com
Received: (qmail 4240 invoked by alias); 27 Mar 2000 19:29:14 -0000
Mailing-List: contact java-patches-help@sourceware.cygnus.com; run by ezmlm
Precedence: bulk
List-Subscribe: <mailto:java-patches-subscribe@sourceware.cygnus.com>
List-Archive: <http://sourceware.cygnus.com/ml/java-patches/>
List-Post: <mailto:java-patches@sourceware.cygnus.com>
List-Help: <mailto:java-patches-help@sourceware.cygnus.com>, <http://sourceware.cygnus.com/ml/#faqs>
Sender: java-patches-owner@sourceware.cygnus.com
Delivered-To: mailing list java-patches@sourceware.cygnus.com
Received: (qmail 4212 invoked from network); 27 Mar 2000 19:29:13 -0000
Date: Mon, 27 Mar 2000 11:29:12 -0800 (PST)
Message-Id: <200003271929.LAA25549@ferrule.cygnus.com>
From: Tom Tromey <tromey@cygnus.com>
To: green@cygnus.com
Cc: tromey@cygnus.com, java-patches@sourceware.cygnus.com
Subject: Re: Patch: JVMPI
In-Reply-To: <200003271924.LAA02413@hoser.cygnus.com>
References: <200003270806.AAA01490@hoser.cygnus.com>
	<200003271912.LAA25539@ferrule.cygnus.com>
	<200003271924.LAA02413@hoser.cygnus.com>
X-Zippy:  ..  My pants just went on a wild rampage through
 a Long Island Bowling Alley!!
X-Attribution:  Tom

Anthony> I think maybe only the #pragma was actually working because
Anthony> jni.h's JNI_OnLoad prototype doesn't have the weak attribute
Anthony> and was overriding the one in this file.

Good point.
Thanks.

I don't know if you're waiting for approval or not, but with the
changes this patch is fine.

Tom

From java-patches-return-603-listarch-java-patches=sourceware.cygnus.com@sourceware.cygnus.com Mon Mar 27 19:38:27 2000
Return-Path: <java-patches-return-603-listarch-java-patches=sourceware.cygnus.com@sourceware.cygnus.com>
Delivered-To: listarch-java-patches@sourceware.cygnus.com
Received: (qmail 6042 invoked by alias); 27 Mar 2000 19:38:27 -0000
Mailing-List: contact java-patches-help@sourceware.cygnus.com; run by ezmlm
Precedence: bulk
List-Subscribe: <mailto:java-patches-subscribe@sourceware.cygnus.com>
List-Archive: <http://sourceware.cygnus.com/ml/java-patches/>
List-Post: <mailto:java-patches@sourceware.cygnus.com>
List-Help: <mailto:java-patches-help@sourceware.cygnus.com>, <http://sourceware.cygnus.com/ml/#faqs>
Sender: java-patches-owner@sourceware.cygnus.com
Delivered-To: mailing list java-patches@sourceware.cygnus.com
Received: (qmail 6011 invoked from network); 27 Mar 2000 19:38:25 -0000
To: Java Patch List <java-patches@sourceware.cygnus.com> 
Subject: Patch: new tests
X-Zippy:  I demand IMPUNITY!
X-Attribution:  Tom
Bcc:
Reply-To:  tromey@cygnus.com
From:  Tom Tromey <tromey@cygnus.com>
Date: 27 Mar 2000 12:39:51 -0700
Message-ID: <87n1nkp5h4.fsf@cygnus.com>
Lines: 24
X-Mailer: Gnus v5.5/Emacs 20.3

I'm checking in this new test.

2000-03-27  Tom Tromey  <tromey@cygnus.com>

	* libjava.lang/test_long.out: New file.
	* libjava.lang/test_long.java: New file.

Tom

class test_long {

  public static void main (String[] arg)
  {
    long a, b, c, d, e;
    e = 234L;
    d = 0x8888888888888888L;
    a = 0x0123456789ABCDEFL;
    b = 0xFEDCBA9876543210L;
    c = 0xF096A5B4C3B2E187L;
    System.out.println (a+" "+b+" "+c+" "+d+" "+e);
  }
}

81985529216486895 -81985529216486896 -1110518062304271993 -8608480567731124088 234

From java-patches-return-604-listarch-java-patches=sourceware.cygnus.com@sourceware.cygnus.com Mon Mar 27 19:51:34 2000
Return-Path: <java-patches-return-604-listarch-java-patches=sourceware.cygnus.com@sourceware.cygnus.com>
Delivered-To: listarch-java-patches@sourceware.cygnus.com
Received: (qmail 10099 invoked by alias); 27 Mar 2000 19:51:34 -0000
Mailing-List: contact java-patches-help@sourceware.cygnus.com; run by ezmlm
Precedence: bulk
List-Subscribe: <mailto:java-patches-subscribe@sourceware.cygnus.com>
List-Archive: <http://sourceware.cygnus.com/ml/java-patches/>
List-Post: <mailto:java-patches@sourceware.cygnus.com>
List-Help: <mailto:java-patches-help@sourceware.cygnus.com>, <http://sourceware.cygnus.com/ml/#faqs>
Sender: java-patches-owner@sourceware.cygnus.com
Delivered-To: mailing list java-patches@sourceware.cygnus.com
Received: (qmail 10074 invoked from network); 27 Mar 2000 19:51:32 -0000
To: Java Patch List <java-patches@sourceware.cygnus.com> 
Subject: Patch: minor JNI tweak
X-Zippy:  Here we are in America...  when do we collect unemployment?
X-Attribution:  Tom
Bcc:
Reply-To:  tromey@cygnus.com
From:  Tom Tromey <tromey@cygnus.com>
Date: 27 Mar 2000 12:53:01 -0700
Message-ID: <87ity8p4v6.fsf@cygnus.com>
Lines: 38
X-Mailer: Gnus v5.5/Emacs 20.3

I'm checking in this patch.
It will make stub generation in the compiler a bit simpler.

2000-03-26  Tom Tromey  <tromey@cygnus.com>

	* jni.cc (_Jv_JNI_PopSystemFrame): If environment has exception
	set, throw it.
	(call): Don't throw exception here.

Tom

Index: jni.cc
===================================================================
RCS file: /cvs/java/libgcj/libjava/jni.cc,v
retrieving revision 1.27
diff -u -r1.27 jni.cc
--- jni.cc	2000/03/14 21:59:54	1.27
+++ jni.cc	2000/03/27 19:39:13
@@ -298,6 +298,9 @@
 _Jv_JNI_PopSystemFrame (JNIEnv *env)
 {
   _Jv_JNI_PopLocalFrame (env, NULL, MARK_SYSTEM);
+
+  if (env->ex)
+    throw env->ex;
 }
 
 // This function is used from other template functions.  It wraps the
@@ -1723,9 +1726,6 @@
 		ret, real_args);
 
   _Jv_JNI_PopSystemFrame (env);
-
-  if (env->ex)
-    JvThrow (env->ex);
 }
 
 #endif /* INTERPRETER */

From java-patches-return-605-listarch-java-patches=sourceware.cygnus.com@sourceware.cygnus.com Mon Mar 27 20:00:55 2000
Return-Path: <java-patches-return-605-listarch-java-patches=sourceware.cygnus.com@sourceware.cygnus.com>
Delivered-To: listarch-java-patches@sourceware.cygnus.com
Received: (qmail 13498 invoked by alias); 27 Mar 2000 20:00:55 -0000
Mailing-List: contact java-patches-help@sourceware.cygnus.com; run by ezmlm
Precedence: bulk
List-Subscribe: <mailto:java-patches-subscribe@sourceware.cygnus.com>
List-Archive: <http://sourceware.cygnus.com/ml/java-patches/>
List-Post: <mailto:java-patches@sourceware.cygnus.com>
List-Help: <mailto:java-patches-help@sourceware.cygnus.com>, <http://sourceware.cygnus.com/ml/#faqs>
Sender: java-patches-owner@sourceware.cygnus.com
Delivered-To: mailing list java-patches@sourceware.cygnus.com
Received: (qmail 13407 invoked from network); 27 Mar 2000 20:00:51 -0000
Date: Mon, 27 Mar 2000 14:42:15 -0500
From: gchambers@linuxbox
Message-Id: <200003271942.OAA29886@linuxbox.cvs.care-web.net>
To: java-patches@sourceware.cygnus.com
Subject: FAQ Patch

Here's a minor tweak to the recent FAQ entries
by Joerg Brunsmann.  "gcj -c -shared" isn't
quite kosher; the '-c' shouldn't be there.

2000-03-27  Glenn Chambers <gchambers@provsol.com>

	* faq.html: Remove bogus '-c' from gij shared library
	example


Index: faq.html
===================================================================
RCS file: /cvs/java/htdocs/faq.html,v
retrieving revision 1.19
diff -u -r1.19 faq.html
--- faq.html	2000/03/15 05:16:52	1.19
+++ faq.html	2000/03/27 19:50:07
@@ -196,7 +196,7 @@
 	much like a traditional virtual machine. You can even use "gij" to run a shared library 
 	which is compiled from java code and contains a main method:
 <pre>
-$ gcj -shared -c -o HelloWorld.so HelloWorld.java
+$ gcj -shared -o HelloWorld.so HelloWorld.java
 $ gij HelloWorld
 </pre>
           This works because gij uses Class.forName, which now knows how to load shared objects.

From java-patches-return-606-listarch-java-patches=sourceware.cygnus.com@sourceware.cygnus.com Mon Mar 27 20:24:30 2000
Return-Path: <java-patches-return-606-listarch-java-patches=sourceware.cygnus.com@sourceware.cygnus.com>
Delivered-To: listarch-java-patches@sourceware.cygnus.com
Received: (qmail 19577 invoked by alias); 27 Mar 2000 20:24:29 -0000
Mailing-List: contact java-patches-help@sourceware.cygnus.com; run by ezmlm
Precedence: bulk
List-Subscribe: <mailto:java-patches-subscribe@sourceware.cygnus.com>
List-Archive: <http://sourceware.cygnus.com/ml/java-patches/>
List-Post: <mailto:java-patches@sourceware.cygnus.com>
List-Help: <mailto:java-patches-help@sourceware.cygnus.com>, <http://sourceware.cygnus.com/ml/#faqs>
Sender: java-patches-owner@sourceware.cygnus.com
Delivered-To: mailing list java-patches@sourceware.cygnus.com
Received: (qmail 19550 invoked from network); 27 Mar 2000 20:24:28 -0000
Date: Mon, 27 Mar 2000 12:24:27 -0800 (PST)
Message-Id: <200003272024.MAA25593@ferrule.cygnus.com>
From: Tom Tromey <tromey@cygnus.com>
To: gchambers@linuxbox
Cc: java-patches@sourceware.cygnus.com
Subject: Re: FAQ Patch
In-Reply-To: <200003271942.OAA29886@linuxbox.cvs.care-web.net>
References: <200003271942.OAA29886@linuxbox.cvs.care-web.net>
X-Zippy:  If Robert Di Niro assassinates Walter Slezak, will
 Jodie Foster marry Bonzo??
X-Attribution:  Tom

>>>>> "Glenn" == gchambers  <gchambers@linuxbox> writes:

Glenn> Here's a minor tweak to the recent FAQ entries
Glenn> by Joerg Brunsmann.  "gcj -c -shared" isn't
Glenn> quite kosher; the '-c' shouldn't be there.

Thanks, I've committed this.
What do you think of the idea of using FAQ-o_Matic for this project?
It would be quite easy to set up, and it would let anybody edit the
FAQ.  (You have to give a valid email address before you can edit, so
it isn't completely unaccountable.)

Tom

From java-patches-return-607-listarch-java-patches=sourceware.cygnus.com@sourceware.cygnus.com Mon Mar 27 20:29:15 2000
Return-Path: <java-patches-return-607-listarch-java-patches=sourceware.cygnus.com@sourceware.cygnus.com>
Delivered-To: listarch-java-patches@sourceware.cygnus.com
Received: (qmail 21265 invoked by alias); 27 Mar 2000 20:29:15 -0000
Mailing-List: contact java-patches-help@sourceware.cygnus.com; run by ezmlm
Precedence: bulk
List-Subscribe: <mailto:java-patches-subscribe@sourceware.cygnus.com>
List-Archive: <http://sourceware.cygnus.com/ml/java-patches/>
List-Post: <mailto:java-patches@sourceware.cygnus.com>
List-Help: <mailto:java-patches-help@sourceware.cygnus.com>, <http://sourceware.cygnus.com/ml/#faqs>
Sender: java-patches-owner@sourceware.cygnus.com
Delivered-To: mailing list java-patches@sourceware.cygnus.com
Received: (qmail 21235 invoked from network); 27 Mar 2000 20:29:09 -0000
Message-ID: <38DFC573.92D42B7F@sigma6.com>
Date: Mon, 27 Mar 2000 15:32:51 -0500
From: Jeff Sturm <jsturm@sigma6.com>
Organization: AppNet
X-Mailer: Mozilla 4.51 [en] (WinNT; I)
X-Accept-Language: en
MIME-Version: 1.0
To: Tom Tromey <tromey@cygnus.com>
CC: gchambers@linuxbox, java-patches@sourceware.cygnus.com
Subject: Re: FAQ Patch
References: <200003271942.OAA29886@linuxbox.cvs.care-web.net> <200003272024.MAA25593@ferrule.cygnus.com>
Content-Type: text/plain; charset=us-ascii
Content-Transfer-Encoding: 7bit

Tom Tromey wrote:
> What do you think of the idea of using FAQ-o_Matic for this project?
> It would be quite easy to set up, and it would let anybody edit the
> FAQ.  (You have to give a valid email address before you can edit, so
> it isn't completely unaccountable.)

GCC is on FOM now.  What works for them should work for gcj.

I personally think it's a good idea.

-- 
Jeff Sturm
jsturm@sigma6.com

From java-patches-return-608-listarch-java-patches=sourceware.cygnus.com@sourceware.cygnus.com Mon Mar 27 20:55:11 2000
Return-Path: <java-patches-return-608-listarch-java-patches=sourceware.cygnus.com@sourceware.cygnus.com>
Delivered-To: listarch-java-patches@sourceware.cygnus.com
Received: (qmail 30792 invoked by alias); 27 Mar 2000 20:55:11 -0000
Mailing-List: contact java-patches-help@sourceware.cygnus.com; run by ezmlm
Precedence: bulk
List-Subscribe: <mailto:java-patches-subscribe@sourceware.cygnus.com>
List-Archive: <http://sourceware.cygnus.com/ml/java-patches/>
List-Post: <mailto:java-patches@sourceware.cygnus.com>
List-Help: <mailto:java-patches-help@sourceware.cygnus.com>, <http://sourceware.cygnus.com/ml/#faqs>
Sender: java-patches-owner@sourceware.cygnus.com
Delivered-To: mailing list java-patches@sourceware.cygnus.com
Received: (qmail 30657 invoked from network); 27 Mar 2000 20:55:09 -0000
Date: Mon, 27 Mar 2000 12:55:07 -0800 (PST)
Message-Id: <200003272055.MAA25607@ferrule.cygnus.com>
From: Tom Tromey <tromey@cygnus.com>
To: Bryce McKinlay <bryce@albatross.co.nz>
Cc: java-patches@sourceware.cygnus.com
Subject: Re: Patch: posix-threads code update
In-Reply-To: <38DA22B3.3A862FB2@albatross.co.nz>
References: <38DA22B3.3A862FB2@albatross.co.nz>
X-Zippy:  Don't hit me!!  I'm in the Twilight Zone!!!
X-Attribution:  Tom

Bryce> [ new POSIX threads implementation ]
Bryce> I'm awaiting review of this code. Enjoy!

I think this is definitely the way we should go.

A couple minor points:

1. Could you update the thread porting document to reflect the new
   definition of the return values from _Jv_CondWait?

2. Could you fix the Windows threads code to reflect this change?

With those changes, this patch is fine.

Tom

From java-patches-return-609-listarch-java-patches=sourceware.cygnus.com@sourceware.cygnus.com Tue Mar 28 00:44:00 2000
Return-Path: <java-patches-return-609-listarch-java-patches=sourceware.cygnus.com@sourceware.cygnus.com>
Delivered-To: listarch-java-patches@sourceware.cygnus.com
Received: (qmail 6137 invoked by alias); 28 Mar 2000 00:43:59 -0000
Mailing-List: contact java-patches-help@sourceware.cygnus.com; run by ezmlm
Precedence: bulk
List-Subscribe: <mailto:java-patches-subscribe@sourceware.cygnus.com>
List-Archive: <http://sourceware.cygnus.com/ml/java-patches/>
List-Post: <mailto:java-patches@sourceware.cygnus.com>
List-Help: <mailto:java-patches-help@sourceware.cygnus.com>, <http://sourceware.cygnus.com/ml/#faqs>
Sender: java-patches-owner@sourceware.cygnus.com
Delivered-To: mailing list java-patches@sourceware.cygnus.com
Received: (qmail 6089 invoked from network); 28 Mar 2000 00:43:57 -0000
Message-ID: <38E00159.5008FAFB@albatross.co.nz>
Date: Tue, 28 Mar 2000 12:48:25 +1200
From: Bryce McKinlay <bryce@albatross.co.nz>
X-Mailer: Mozilla 4.7 [en] (X11; U; Linux 2.3.25 i686)
X-Accept-Language: en
MIME-Version: 1.0
To: Tom Tromey <tromey@cygnus.com>, java-patches@sourceware.cygnus.com
Subject: Re: Patch: posix-threads code update
References: <38DA22B3.3A862FB2@albatross.co.nz> <200003272055.MAA25607@ferrule.cygnus.com>
Content-Type: text/plain; charset=us-ascii
Content-Transfer-Encoding: 7bit

Tom Tromey wrote:

> Bryce> [ new POSIX threads implementation ]
> Bryce> I'm awaiting review of this code. Enjoy!
>
> I think this is definitely the way we should go.
>
> A couple minor points:
>
> 1. Could you update the thread porting document to reflect the new
>    definition of the return values from _Jv_CondWait?

Sure.

> 2. Could you fix the Windows threads code to reflect this change?

Hmm. The win32-threads.cc doesn't implement interrupt() and its
_Jv_CondWait() doesnt appear to check for mutex ownership, so I would
say that the changes don't apply until win32-threads.cc is improved.
Since I don't have a win32 build environement set up, I'll have to leave
this to someone else, sorry.

regards

  [ bryce ]


From java-patches-return-610-listarch-java-patches=sourceware.cygnus.com@sourceware.cygnus.com Tue Mar 28 01:12:13 2000
Return-Path: <java-patches-return-610-listarch-java-patches=sourceware.cygnus.com@sourceware.cygnus.com>
Delivered-To: listarch-java-patches@sourceware.cygnus.com
Received: (qmail 14909 invoked by alias); 28 Mar 2000 01:12:13 -0000
Mailing-List: contact java-patches-help@sourceware.cygnus.com; run by ezmlm
Precedence: bulk
List-Subscribe: <mailto:java-patches-subscribe@sourceware.cygnus.com>
List-Archive: <http://sourceware.cygnus.com/ml/java-patches/>
List-Post: <mailto:java-patches@sourceware.cygnus.com>
List-Help: <mailto:java-patches-help@sourceware.cygnus.com>, <http://sourceware.cygnus.com/ml/#faqs>
Sender: java-patches-owner@sourceware.cygnus.com
Delivered-To: mailing list java-patches@sourceware.cygnus.com
Received: (qmail 14878 invoked from network); 28 Mar 2000 01:12:12 -0000
Date: Mon, 27 Mar 2000 17:12:11 -0800 (PST)
Message-Id: <200003280112.RAA25735@ferrule.cygnus.com>
From: Tom Tromey <tromey@cygnus.com>
To: Bryce McKinlay <bryce@albatross.co.nz>
Cc: Tom Tromey <tromey@cygnus.com>, java-patches@sourceware.cygnus.com
Subject: Re: Patch: posix-threads code update
In-Reply-To: <38E00159.5008FAFB@albatross.co.nz>
References: <38DA22B3.3A862FB2@albatross.co.nz>
	<200003272055.MAA25607@ferrule.cygnus.com>
	<38E00159.5008FAFB@albatross.co.nz>
X-Zippy:  The Osmonds!  You are all Osmonds!!  Throwing up on a freeway at dawn!!!
X-Attribution:  Tom

Bryce> Hmm. The win32-threads.cc doesn't implement interrupt() and its
Bryce> _Jv_CondWait() doesnt appear to check for mutex ownership, so I
Bryce> would say that the changes don't apply until win32-threads.cc
Bryce> is improved.

Ok.

How about changing the Windows _Jv_CondWait to return the correct
_JV_* values at least?  Currently it returns error codes, which isn't
right.

Tom

From java-patches-return-611-listarch-java-patches=sourceware.cygnus.com@sourceware.cygnus.com Tue Mar 28 01:20:29 2000
Return-Path: <java-patches-return-611-listarch-java-patches=sourceware.cygnus.com@sourceware.cygnus.com>
Delivered-To: listarch-java-patches@sourceware.cygnus.com
Received: (qmail 19568 invoked by alias); 28 Mar 2000 01:20:29 -0000
Mailing-List: contact java-patches-help@sourceware.cygnus.com; run by ezmlm
Precedence: bulk
List-Subscribe: <mailto:java-patches-subscribe@sourceware.cygnus.com>
List-Archive: <http://sourceware.cygnus.com/ml/java-patches/>
List-Post: <mailto:java-patches@sourceware.cygnus.com>
List-Help: <mailto:java-patches-help@sourceware.cygnus.com>, <http://sourceware.cygnus.com/ml/#faqs>
Sender: java-patches-owner@sourceware.cygnus.com
Delivered-To: mailing list java-patches@sourceware.cygnus.com
Received: (qmail 19461 invoked from network); 28 Mar 2000 01:20:24 -0000
Message-ID: <38E009E3.C2BC7113@albatross.co.nz>
Date: Tue, 28 Mar 2000 13:24:51 +1200
From: Bryce McKinlay <bryce@albatross.co.nz>
X-Mailer: Mozilla 4.7 [en] (X11; U; Linux 2.3.25 i686)
X-Accept-Language: en
MIME-Version: 1.0
To: Tom Tromey <tromey@cygnus.com>
CC: java-patches@sourceware.cygnus.com
Subject: Re: Patch: posix-threads code update
References: <38DA22B3.3A862FB2@albatross.co.nz>
		<200003272055.MAA25607@ferrule.cygnus.com>
		<38E00159.5008FAFB@albatross.co.nz> <200003280112.RAA25735@ferrule.cygnus.com>
Content-Type: multipart/mixed;
 boundary="------------7C9396852286C083C3C5CB2C"

This is a multi-part message in MIME format.
--------------7C9396852286C083C3C5CB2C
Content-Type: text/plain; charset=us-ascii
Content-Transfer-Encoding: 7bit

Tom Tromey wrote:

> How about changing the Windows _Jv_CondWait to return the correct
> _JV_* values at least?  Currently it returns error codes, which isn't
> right.

OK.


--------------7C9396852286C083C3C5CB2C
Content-Type: text/plain; charset=us-ascii;
 name="win32-threads-patch.FIXME"
Content-Transfer-Encoding: 7bit
Content-Disposition: inline;
 filename="win32-threads-patch.FIXME"

Index: win32-threads.cc
===================================================================
RCS file: /cvs/java/libgcj/libjava/win32-threads.cc,v
retrieving revision 1.1
diff -u -r1.1 win32-threads.cc
--- win32-threads.cc	2000/03/15 22:03:19	1.1
+++ win32-threads.cc	2000/03/28 01:18:43
@@ -69,6 +69,8 @@
   DWORD time;
   DWORD rval;
 
+  // FIXME: check for mutex ownership?
+
   _Jv_MutexUnlock (mu);
 
   if((millis == 0) && (nanos > 0))
@@ -82,9 +84,7 @@
   _Jv_MutexLock (mu);
 
   if (rval == WAIT_FAILED)
-    return GetLastError ();       // FIXME: Map to errno?
-  else if (rval == WAIT_TIMEOUT)
-    return ETIMEDOUT;
+    return _JV_NOT_OWNER;       // FIXME?
   else
     return 0;
 }
Index: include/win32-threads.h
===================================================================
RCS file: /cvs/java/libgcj/libjava/include/win32-threads.h,v
retrieving revision 1.1
diff -u -r1.1 win32-threads.h
--- win32-threads.h	2000/03/15 22:03:19	1.1
+++ win32-threads.h	2000/03/28 01:18:43
@@ -54,13 +54,15 @@
 inline int
 _Jv_CondNotify (_Jv_ConditionVariable_t *cv, _Jv_Mutex_t *)
 {
-  return PulseEvent (*cv) ? 0 : GetLastError ();        // FIXME: Map error code?
+  // FIXME: check for mutex ownership?
+  return PulseEvent (*cv) ? 0 : _JV_NOT_OWNER;        // FIXME?
 }
 
 inline int
 _Jv_CondNotifyAll (_Jv_ConditionVariable_t *cv, _Jv_Mutex_t *)
 {
-  return PulseEvent (*cv) ? 0 : GetLastError ();        // FIXME: Map error code?
+  // FIXME: check for mutex ownership?
+  return PulseEvent (*cv) ? 0 : _JV_NOT_OWNER;        // FIXME?
 }
 
 //

--------------7C9396852286C083C3C5CB2C--

From java-patches-return-612-listarch-java-patches=sourceware.cygnus.com@sourceware.cygnus.com Tue Mar 28 01:47:02 2000
Return-Path: <java-patches-return-612-listarch-java-patches=sourceware.cygnus.com@sourceware.cygnus.com>
Delivered-To: listarch-java-patches@sourceware.cygnus.com
Received: (qmail 23726 invoked by alias); 28 Mar 2000 01:47:02 -0000
Mailing-List: contact java-patches-help@sourceware.cygnus.com; run by ezmlm
Precedence: bulk
List-Subscribe: <mailto:java-patches-subscribe@sourceware.cygnus.com>
List-Archive: <http://sourceware.cygnus.com/ml/java-patches/>
List-Post: <mailto:java-patches@sourceware.cygnus.com>
List-Help: <mailto:java-patches-help@sourceware.cygnus.com>, <http://sourceware.cygnus.com/ml/#faqs>
Sender: java-patches-owner@sourceware.cygnus.com
Delivered-To: mailing list java-patches@sourceware.cygnus.com
Received: (qmail 23707 invoked from network); 28 Mar 2000 01:47:01 -0000
Message-ID: <38E01022.EE339B4F@albatross.co.nz>
Date: Tue, 28 Mar 2000 13:51:30 +1200
From: Bryce McKinlay <bryce@albatross.co.nz>
X-Mailer: Mozilla 4.7 [en] (X11; U; Linux 2.3.25 i686)
X-Accept-Language: en
MIME-Version: 1.0
To: java-patches@sourceware.cygnus.com
Subject: Patch: htdocs/port-threads.html
Content-Type: multipart/mixed;
 boundary="------------A88E73F5533C17FC700B98B3"

This is a multi-part message in MIME format.
--------------A88E73F5533C17FC700B98B3
Content-Type: text/plain; charset=us-ascii
Content-Transfer-Encoding: 7bit

I'm committing this update to the threads porting documentation.



--------------A88E73F5533C17FC700B98B3
Content-Type: text/plain; charset=us-ascii;
 name="port-threads.patch"
Content-Transfer-Encoding: 7bit
Content-Disposition: inline;
 filename="port-threads.patch"

Index: port-threads.html
===================================================================
RCS file: /cvs/java/htdocs/port-threads.html,v
retrieving revision 1.3
diff -u -r1.3 port-threads.html
--- port-threads.html	1999/11/04 16:54:33	1.3
+++ port-threads.html	2000/03/28 01:45:51
@@ -38,8 +38,8 @@
 does; the two must agree so that a single configure from the top level
 will succeed.
 
-<li>Write a new ``gthr-PORT.h'' header file.  See the existing gthr.h
-to see what must go into this file.
+<li>Write a new ``PORT-threads.h'' header file.  See the existing no-threads.h
+or posix-threads.h to see what must go into this file.
 
 <li>Contact the gcc maintainers and try to get your patch installed.
 Allocate plenty of time for this step.
@@ -122,11 +122,11 @@
 takes the form of an atomic release of the mutex (fully releasing it,
 if it is held several times by the thread) followed by blocking.  When
 the condition variable is signalled by some other thread, the waiting
-thread reawakens, reacquires the mutex (restoring it to its previous
+thread reawakens, re-acquires the mutex (restoring it to its previous
 state -- the reference counting must be handled correctly), and
 returns.  It's possible for several threads to wait on a condition
 variable at the same time, and to all be reawakened simultaneously (of
-course, only one thread at a time can reacquire the mutex).<p>
+course, only one thread at a time can re-acquire the mutex).<p>
 
 Once again, a typedef and several functions are required.
 <dl>
@@ -146,19 +146,24 @@
 <dd>Wait on the condition variable using the associated mutex.  The
 final arguments are a timeout; if 0 then no timeout is to be used.  It
 isn't necessary to implement nanosecond resolution.  However, the best
-possible resolution should be implemented.  Returns 0 on success.
-If the thread is interrupted while waiting on a condition variable,
-_Jv_CondWait should reacquire the mutex and then throw the appropriate
-exception.
+possible resolution should be implemented. 
+_Jv_CondWait should check that MUTEX is locked by the current thread. If it 
+isn't, it should return _JV_NOT_OWNER. The interrupted status flag of the 
+calling thread should be checked before _Jv_CondWait blocks, if this is not
+done automatically by the OS thread layer. If the thread is interrupted (either
+before or during the wait), _JV_INTERRUPTED should be returned. The interrupted
+status flag is not cleared.
+_Jv_CondWait should never throw an exception directly.
+Returns 0 if CONDVAR was signalled normally, or if the timeout expired.
 
 <dt>int _Jv_CondNotify (_Jv_ConditionVariable_t *condvar, _Jv_Mutex_t *mutex)
-<dd>Signal the condition variable.  This wakes up the first thread
-waiting on the variable.  Returns 0 on success.  Should return error
+<dd>Signal the condition variable.  This wakes up one thread
+waiting on the variable.  Returns 0 on success.  Should return _JV_NOT_OWNER
 if current thread does not hold the mutex.
 
 <dt>int _Jv_CondNotifyAll (_Jv_ConditionVariable_t *condvar, _Jv_Mutex_t *mutex)
 <dd>Wake up all threads waiting on the condition variable.  Returns 0
-on success.  Should return error if current thread does not hold the
+on success.  Should return _JV_NOT_OWNER if current thread does not hold the
 mutex.
 </dl>
 
@@ -220,9 +225,21 @@
 priorities to which Java priorities should be mapped.
 
 <dt>void _Jv_ThreadInterrupt (_Jv_Thread_t *data)
-<dd>This function is called by Thread.interrupt after its
-platform-independent work is done.  This function should only be used
-to interrupt I/O operations in the target thread.
+<dd>This function is called by Thread.interrupt().  It should set 
+the interrupt_flag of the Thread object corresponding to DATA, and cause any
+"slow" or "blocking" system I/O or a call to _Jv_CondWait to return immediately.
+Interrupting of _Jv_CondWait calls should be implemented in such a way that 
+simultaneous interrupt() and notify() calls always result in one thread waking
+up normally (if there are enough threads waiting). That is, if two threads are 
+waiting up on condition variable and one of them is interrupted while the variable
+is concurrently notified by another thread, then EITHER _JV_INTERRUPTED should
+be returned for one thread's _Jv_CondWait() and the others to return normally,
+or the interrupted thread's _Jv_CondWait() call should just return normally (but 
+its interrupted status flag should be set). It is also important to prevent
+possible races in the interrupt implementation: it should not be possible for
+an interrupt to be delivered to a thread immediately after it checks its 
+interrupted status flag but before it enters an interruptible blocking call,
+for example.
 </dl>
 
 <h2>Unimplemented functionality</h2>
@@ -239,12 +256,6 @@
       implemented.  They are deprecated in JDK 1.2.  The current
       implementations simply cause the program to crash (not the best
       idea, I admit).
-
-      <dt>Thread.countStackFrames</dt>
-      <dt>Thread.dumpStack</dt>
-      <dd>These are hard to implement and so have not been
-      implemented.  It is unlikely that help from the thread system
-      will be needed to implement these.</dd>
 
     </dl>
 

--------------A88E73F5533C17FC700B98B3--

From java-patches-return-613-listarch-java-patches=sourceware.cygnus.com@sourceware.cygnus.com Tue Mar 28 01:59:09 2000
Return-Path: <java-patches-return-613-listarch-java-patches=sourceware.cygnus.com@sourceware.cygnus.com>
Delivered-To: listarch-java-patches@sourceware.cygnus.com
Received: (qmail 27850 invoked by alias); 28 Mar 2000 01:59:09 -0000
Mailing-List: contact java-patches-help@sourceware.cygnus.com; run by ezmlm
Precedence: bulk
List-Subscribe: <mailto:java-patches-subscribe@sourceware.cygnus.com>
List-Archive: <http://sourceware.cygnus.com/ml/java-patches/>
List-Post: <mailto:java-patches@sourceware.cygnus.com>
List-Help: <mailto:java-patches-help@sourceware.cygnus.com>, <http://sourceware.cygnus.com/ml/#faqs>
Sender: java-patches-owner@sourceware.cygnus.com
Delivered-To: mailing list java-patches@sourceware.cygnus.com
Received: (qmail 27830 invoked from network); 28 Mar 2000 01:59:07 -0000
Message-ID: <38E012F9.85345F3D@albatross.co.nz>
Date: Tue, 28 Mar 2000 14:03:37 +1200
From: Bryce McKinlay <bryce@albatross.co.nz>
X-Mailer: Mozilla 4.7 [en] (X11; U; Linux 2.3.25 i686)
X-Accept-Language: en
MIME-Version: 1.0
To: java-patches@sourceware.cygnus.com
Subject: Re: Patch: htdocs/port-threads.html
References: <38E01022.EE339B4F@albatross.co.nz>
Content-Type: text/plain; charset=us-ascii
Content-Transfer-Encoding: 7bit

Bryce McKinlay wrote:

>
> -<li>Write a new ``gthr-PORT.h'' header file.  See the existing gthr.h
> -to see what must go into this file.
> +<li>Write a new ``PORT-threads.h'' header file.  See the existing no-threads.h
> +or posix-threads.h to see what must go into this file.

Oops, I wasn't paying attention to the context there. I will roll that part back.

regards

  [ bryce ]


From java-patches-return-614-listarch-java-patches=sourceware.cygnus.com@sourceware.cygnus.com Tue Mar 28 02:25:50 2000
Return-Path: <java-patches-return-614-listarch-java-patches=sourceware.cygnus.com@sourceware.cygnus.com>
Delivered-To: listarch-java-patches@sourceware.cygnus.com
Received: (qmail 31269 invoked by alias); 28 Mar 2000 02:25:50 -0000
Mailing-List: contact java-patches-help@sourceware.cygnus.com; run by ezmlm
Precedence: bulk
List-Subscribe: <mailto:java-patches-subscribe@sourceware.cygnus.com>
List-Archive: <http://sourceware.cygnus.com/ml/java-patches/>
List-Post: <mailto:java-patches@sourceware.cygnus.com>
List-Help: <mailto:java-patches-help@sourceware.cygnus.com>, <http://sourceware.cygnus.com/ml/#faqs>
Sender: java-patches-owner@sourceware.cygnus.com
Delivered-To: mailing list java-patches@sourceware.cygnus.com
Received: (qmail 31249 invoked from network); 28 Mar 2000 02:25:48 -0000
Message-ID: <38E01937.71D95301@albatross.co.nz>
Date: Tue, 28 Mar 2000 14:30:15 +1200
From: Bryce McKinlay <bryce@albatross.co.nz>
X-Mailer: Mozilla 4.7 [en] (X11; U; Linux 2.3.25 i686)
X-Accept-Language: en
MIME-Version: 1.0
To: Tom Tromey <tromey@cygnus.com>
CC: java-patches@sourceware.cygnus.com
Subject: Re: Patch: posix-threads code update
References: <38DA22B3.3A862FB2@albatross.co.nz> <200003272055.MAA25607@ferrule.cygnus.com>
Content-Type: text/plain; charset=us-ascii
Content-Transfer-Encoding: 7bit

Tom Tromey wrote:

> With those changes, this patch is fine.

Checked in, with one small change. I added the following code to the end
of really_start in posix-threads.cc.

#ifndef LINUX_THREADS
  // Clean up. These calls do nothing on Linux.
  pthread_mutex_destroy (&info->data->wait_mutex);
  pthread_cond_destroy (&info->data->wait_cond);
#endif /* ! LINUX_THREADS */

regards

  [ bryce ]


From java-patches-return-615-listarch-java-patches=sourceware.cygnus.com@sourceware.cygnus.com Wed Mar 29 20:48:15 2000
Return-Path: <java-patches-return-615-listarch-java-patches=sourceware.cygnus.com@sourceware.cygnus.com>
Delivered-To: listarch-java-patches@sourceware.cygnus.com
Received: (qmail 14368 invoked by alias); 29 Mar 2000 20:48:14 -0000
Mailing-List: contact java-patches-help@sourceware.cygnus.com; run by ezmlm
Precedence: bulk
List-Subscribe: <mailto:java-patches-subscribe@sourceware.cygnus.com>
List-Archive: <http://sourceware.cygnus.com/ml/java-patches/>
List-Post: <mailto:java-patches@sourceware.cygnus.com>
List-Help: <mailto:java-patches-help@sourceware.cygnus.com>, <http://sourceware.cygnus.com/ml/#faqs>
Sender: java-patches-owner@sourceware.cygnus.com
Delivered-To: mailing list java-patches@sourceware.cygnus.com
Received: (qmail 14201 invoked from network); 29 Mar 2000 20:48:13 -0000
Message-ID: <FDD8932D6ED1D211B3500008C7F4D3272D940E@EXCHANGE>
From: Glenn Chambers <GChambers@provsol.com>
To: "'java-patches@sourceware.cygnus.com'"
	 <java-patches@sourceware.cygnus.com>
Subject: Another documentation update
Date: Wed, 29 Mar 2000 15:45:50 -0500
MIME-Version: 1.0
X-Mailer: Internet Mail Service (5.5.2448.0)
Content-Type: multipart/mixed;
	boundary="----_=_NextPart_000_01BF99BF.C7933A82"

This message is in MIME format. Since your mail reader does not understand
this format, some or all of this message may not be legible.

------_=_NextPart_000_01BF99BF.C7933A82
Content-Type: text/plain;
	charset="iso-8859-1"

2000-03-29	Glenn Chambers <gchambers@provsol.com>

	* faq.html: Update license text for new GPL+libgcc-exception
	fix spello.



------_=_NextPart_000_01BF99BF.C7933A82
Content-Type: application/octet-stream;
	name="libgcj-doc.patch"
Content-Transfer-Encoding: quoted-printable
Content-Disposition: attachment;
	filename="libgcj-doc.patch"

Index: faq.html=0A=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=0A=
RCS file: /cvs/java/htdocs/faq.html,v=0A=
retrieving revision 1.20=0A=
diff -u -r1.20 faq.html=0A=
--- faq.html	2000/03/27 20:23:21	1.20=0A=
+++ faq.html	2000/03/29 20:44:07=0A=
@@ -123,7 +123,12 @@=0A=
           <h3><a name=3D"1_1">1.1 What license is used for =
libgcj?</a></h3>=0A=
         </dt>=0A=
         <p> =0A=
-        <dd>libgcj is distributed under the Library GPL.</dd>=0A=
+        <dd>=0A=
+          libgcj is distributed under the GPL, with the 'libgcc =
exception'.=0A=
+          This means that if linking with libgcj does not by itself =
cause=0A=
+          your program to fall under the GPL.  See LIBGCJ_LICENSE =
in=0A=
+          the source tree for more details.=0A=
+        </dd>=0A=
         <p></p>=0A=
         <dt> =0A=
           <hr>=0A=
@@ -320,7 +325,7 @@=0A=
               <p>1) Swing 1.1.1 for JDK 1.1.x with license that allows =
to redistribute =0A=
                 it as part of the value-added applet or application. =
This needs =0A=
                 some research, however I feel that the term =
"value-added application" =0A=
-                might inlcude e.g. gcj-based development system; if it =
is not =0A=
+                might include e.g. gcj-based development system; if it =
is not =0A=
                 by itself, a simple Swing-based application might be =
added to =0A=
                 the distribution). This version depends on AWT 1.1 =
only (well, =0A=
                 1.1.x, x >=3D7) and it seems that the Sun's version =
could be used =0A=

------_=_NextPart_000_01BF99BF.C7933A82--

From java-patches-return-616-listarch-java-patches=sourceware.cygnus.com@sourceware.cygnus.com Wed Mar 29 21:02:09 2000
Return-Path: <java-patches-return-616-listarch-java-patches=sourceware.cygnus.com@sourceware.cygnus.com>
Delivered-To: listarch-java-patches@sourceware.cygnus.com
Received: (qmail 19759 invoked by alias); 29 Mar 2000 21:02:09 -0000
Mailing-List: contact java-patches-help@sourceware.cygnus.com; run by ezmlm
Precedence: bulk
List-Subscribe: <mailto:java-patches-subscribe@sourceware.cygnus.com>
List-Archive: <http://sourceware.cygnus.com/ml/java-patches/>
List-Post: <mailto:java-patches@sourceware.cygnus.com>
List-Help: <mailto:java-patches-help@sourceware.cygnus.com>, <http://sourceware.cygnus.com/ml/#faqs>
Sender: java-patches-owner@sourceware.cygnus.com
Delivered-To: mailing list java-patches@sourceware.cygnus.com
Received: (qmail 19731 invoked from network); 29 Mar 2000 21:02:08 -0000
Date: Wed, 29 Mar 2000 13:02:07 -0800 (PST)
Message-Id: <200003292102.NAA00212@ferrule.cygnus.com>
From: Tom Tromey <tromey@cygnus.com>
To: Glenn Chambers <GChambers@provsol.com>
Cc: "'java-patches@sourceware.cygnus.com'" <java-patches@sourceware.cygnus.com>
Subject: Re: Another documentation update
In-Reply-To: <FDD8932D6ED1D211B3500008C7F4D3272D940E@EXCHANGE>
References: <FDD8932D6ED1D211B3500008C7F4D3272D940E@EXCHANGE>
X-Zippy:  My uncle Murray conquered Egypt in 53 B.C.  And I can prove it too!!
X-Attribution:  Tom

Glenn> 2000-03-29	Glenn Chambers <gchambers@provsol.com>
Glenn> 	* faq.html: Update license text for new GPL+libgcc-exception
Glenn> 	fix spello.

I checked this in.

Tom