* NEWS: Updated for JSR 166.

	* vm/reference/sun/reflect/Reflection.java (verifyMemberAccess):
	Removed.
	(getCallerClass): Now static.
	* vm/reference/sun/reflect/misc/ReflectUtil.java: New file.

5 files changed, 159 insertions, 3 deletions

diff --git a/ChangeLog b/ChangeLog
index b9190dff0..453f049a2 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2006-06-16  Tom Tromey  <tromey@redhat.com>
+
+	* NEWS: Updated for JSR 166.
+	* vm/reference/sun/reflect/Reflection.java (verifyMemberAccess):
+	Removed.
+	(getCallerClass): Now static.
+	* vm/reference/sun/reflect/misc/ReflectUtil.java: New file.
+
 2006-06-16  Kyle Galloway  <kgallowa@redhat.com>
 
 	* gnu/classpath/jdwp/event/ExceptionEvent:
diff --git a/NEWS b/NEWS
index b7019e5c6..959916643 100644
--- a/NEWS
+++ b/NEWS
@@ -36,6 +36,10 @@ Runtime interface changes:
   time of the VM.  In addition, one of sun.boot.class.path
   or java.boot.class.path should be defined by the VM to
   support the optional boot class path access functionality.
+* The Unsafe class was moved back to the place expected by the JSR 166
+  reference implementation.  We've also added a couple other new VM
+  classes to support the JSR 166 code -- sun.reflect.Reflection and
+  sun.reflect.misc.ReflectUtil.
 
 New in release 0.91 (May 15, 2006)
 
diff --git a/vm/reference/sun/misc/ReflectUtil.java b/vm/reference/sun/misc/ReflectUtil.java
new file mode 100644
index 000000000..547427748
--- /dev/null
+++ b/vm/reference/sun/misc/ReflectUtil.java
@@ -0,0 +1,93 @@
+/* ReflectUtil.java - JSR 166 reflection hooks
+   Copyright (C) 2006 Free Software Foundation
+
+This file is part of GNU Classpath.
+
+GNU Classpath is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation; either version 2, or (at your option)
+any later version.
+
+GNU Classpath is distributed in the hope that it will be useful, but
+WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with GNU Classpath; see the file COPYING.  If not, write to the
+Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+02110-1301 USA.
+
+Linking this library statically or dynamically with other modules is
+making a combined work based on this library.  Thus, the terms and
+conditions of the GNU General Public License cover the whole
+combination.
+
+As a special exception, the copyright holders of this library give you
+permission to link this library with independent modules to produce an
+executable, regardless of the license terms of these independent
+modules, and to copy and distribute the resulting executable under
+terms of your choice, provided that you also meet, for each linked
+independent module, the terms and conditions of the license of that
+module.  An independent module is a module which is not derived from
+or based on this library.  If you modify this library, you may extend
+this exception to your version of the library, but you are not
+obligated to do so.  If you do not wish to do so, delete this
+exception statement from your version. */
+
+package sun.reflect.misc;
+
+import java.lang.reflect.Modifier;
+
+public class ReflectUtil
+{
+  // We use this inaccessible inner class as an argument type
+  // in verifyMemberAccess.  All current users of this method
+  // in the JSR 166 RI pass 'null' for this argument, and
+  // consequently we don't know what it means.  Using a funny
+  // type like this for the argument means that if the RI changes,
+  // we will see a compilation error.
+  private static class MustBeNull
+  {
+  }
+
+  public static void checkPackageAccess(Class declaringClass)
+  {
+    // FIXME: not sure what to check here.
+  }
+
+  /**
+   * Perform access checks on a member of a class.  This API is
+   * derived from the public domain code in the JSR 166 reference
+   * implementation.
+   * @param caller the class requesting access to the member
+   * @param declarer the declaring class of the member
+   * @param ignored unknown parameter; always null
+   * @param modifiers the modifiers on the member
+   * @return true if access is granted, false otherwise
+   */
+  public static void ensureMemberAccess(Class caller,
+                                        Class declarer,
+                                        MustBeNull ignored,
+                                        int modifiers)
+  {
+    // Same class, always ok.
+    if (caller == declarer)
+      return;
+    // Public access is ok.
+    if ((modifiers & Modifier.PUBLIC) != 0)
+      return;
+    // Protected access and request comes from
+    // a subclass of the declarer -- ok.
+    if ((modifiers & Modifier.PROTECTED) != 0
+        && declarer.isAssignableFrom(caller))
+      return;
+    // Package-private access, or protected access,
+    // and the packages are the same --ok.
+    if ((modifiers & Modifier.PRIVATE) == 0
+        && caller.getPackage() == declarer.getPackage())
+      return;
+    // Otherwise, no.
+    throw new IllegalAccessError();
+  }
+}
diff --git a/vm/reference/gnu/classpath/Unsafe.java b/vm/reference/sun/misc/Unsafe.java
index 6e4ec9802..fa199f83e 100644
--- a/vm/reference/gnu/classpath/Unsafe.java
+++ b/vm/reference/sun/misc/Unsafe.java
@@ -35,7 +35,7 @@ this exception to your version of the library, but you are not
 obligated to do so.  If you do not wish to do so, delete this
 exception statement from your version. */
 
-package gnu.classpath;
+package sun.misc;
 
 import java.lang.reflect.Field;
 
@@ -48,7 +48,7 @@ import java.lang.reflect.Field;
  * @author Tom Tromey (tromey@redhat.com)
  * @author Andrew John Hughes (gnu_andrew@member.fsf.org)
  */
-public final class Unsafe
+public class Unsafe
 {
   // Singleton class.
   private static Unsafe unsafe = new Unsafe();
@@ -279,7 +279,7 @@ public final class Unsafe
    * @param arrayClass the class for which the first element's address should
    *                   be obtained.
    * @return the offset of the first element of the array class.
-   * @see #arrayIndexScale(Class)
+   * @see arrayIndexScale(Class)
    */
   public native int arrayBaseOffset(Class arrayClass);
 
diff --git a/vm/reference/sun/reflect/Reflection.java b/vm/reference/sun/reflect/Reflection.java
new file mode 100644
index 000000000..ef25ce71f
--- /dev/null
+++ b/vm/reference/sun/reflect/Reflection.java
@@ -0,0 +1,51 @@
+/* Reflection.java - JSR 166 reflection hooks
+   Copyright (C) 2006 Free Software Foundation
+
+This file is part of GNU Classpath.
+
+GNU Classpath is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation; either version 2, or (at your option)
+any later version.
+
+GNU Classpath is distributed in the hope that it will be useful, but
+WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with GNU Classpath; see the file COPYING.  If not, write to the
+Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+02110-1301 USA.
+
+Linking this library statically or dynamically with other modules is
+making a combined work based on this library.  Thus, the terms and
+conditions of the GNU General Public License cover the whole
+combination.
+
+As a special exception, the copyright holders of this library give you
+permission to link this library with independent modules to produce an
+executable, regardless of the license terms of these independent
+modules, and to copy and distribute the resulting executable under
+terms of your choice, provided that you also meet, for each linked
+independent module, the terms and conditions of the license of that
+module.  An independent module is a module which is not derived from
+or based on this library.  If you modify this library, you may extend
+this exception to your version of the library, but you are not
+obligated to do so.  If you do not wish to do so, delete this
+exception statement from your version. */
+
+package sun.reflect;
+
+import gnu.classpath.VMStackWalker;
+
+public class Reflection
+{
+  /**
+   * A stack-walking wrapper method used by the JSR 166 RI. 
+   */
+  public static Class getCallerClass(int depth)
+  {
+    return VMStackWalker.getClassContext()[depth];
+  }
+}