2006-02-08 Bryce McKinlay <mckinlay@redhat.com>

        PR libgcj/25187:
        * gnu/gcj/io/natSimpleSHSStream.cc
        (gnu::gcj::io::SimpleSHSStream::shsFinal): Remove bogus cast.
        * interpret.cc (_Jv_InterpMethod::run): Simplify arguments to
        _Jv_InterpFrame().
        * boehm.cc: #undef some autoconf macros before including gc-config.h.
        (_Jv_MarkObject): Don't mark the class, it is reachable via the vtable.
        (_Jv_MarkArray): Likewise.
        * java/lang/ref/natReference.cc (java::lang::ref::Reference::create):
        Simplify _Jv_GCRegisterDisappearingLink() call.
        * java/lang/Class.h (getComponentType): Use element_type.
        (element_type): New field declaration, as a union with "methods".
        * java/lang/natClassLoader.cc (_Jv_NewArrayClass): Use "element_type".
        * java/net/natVMNetworkInterfacePosix.cc
        (java::net::VMNetworkInterface::getInterfaces): Add "int" cast to
        avoid sign comparison warning.
        * include/java-interp.h (_Jv_InterpFrame): Take thread as second
        argument, not parent call frame.
        * include/x86_64-signal.h (MAKE_THROW_FRAME): Use "gregs" directly,
        without a cast.
        (restore_rt): Declare with hidden visibility, not "static".
        * posix.cc (_Jv_platform_initProperties): Make "tmpdir" a string
        constant.
        * jni.cc (_Jv_JNI_DestroyJavaVM): Use a union to avoid strict alias
        warning


git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@110783 138bc75d-0d04-0410-961f-82ee72b054a4

12 files changed, 65 insertions, 29 deletions

diff --git a/libjava/ChangeLog b/libjava/ChangeLog
index 5e93e681fc8..894add7fa3f 100644
--- a/libjava/ChangeLog
+++ b/libjava/ChangeLog
@@ -1,5 +1,33 @@
 2006-02-08  Bryce McKinlay  <mckinlay@redhat.com>
 
+	PR libgcj/25187:
+	* gnu/gcj/io/natSimpleSHSStream.cc
+	(gnu::gcj::io::SimpleSHSStream::shsFinal): Remove bogus cast.
+	* interpret.cc (_Jv_InterpMethod::run): Simplify arguments to
+	_Jv_InterpFrame(). 
+	* boehm.cc: #undef some autoconf macros before including gc-config.h.
+	(_Jv_MarkObject): Don't mark the class, it is reachable via the vtable.
+	(_Jv_MarkArray): Likewise.
+	* java/lang/ref/natReference.cc (java::lang::ref::Reference::create):
+	Simplify _Jv_GCRegisterDisappearingLink() call.
+	* java/lang/Class.h (getComponentType): Use element_type.
+	(element_type): New field declaration, as a union with "methods".
+	* java/lang/natClassLoader.cc (_Jv_NewArrayClass): Use "element_type".
+	* java/net/natVMNetworkInterfacePosix.cc
+	(java::net::VMNetworkInterface::getInterfaces): Add "int" cast to
+	avoid sign comparison warning.	
+	* include/java-interp.h (_Jv_InterpFrame): Take thread as second
+	argument, not parent call frame.
+	* include/x86_64-signal.h (MAKE_THROW_FRAME): Use "gregs" directly,
+	without a cast.
+	(restore_rt): Declare with hidden visibility, not "static".
+	* posix.cc (_Jv_platform_initProperties): Make "tmpdir" a string
+	constant.
+	* jni.cc (_Jv_JNI_DestroyJavaVM): Use a union to avoid strict alias
+	warning.
+
+2006-02-08  Bryce McKinlay  <mckinlay@redhat.com>
+
 	PR libgcj/26113:
 	* link.cc (_Jv_Linker::print_class_loaded): Declare string constants
 	as "const char *".
diff --git a/libjava/boehm.cc b/libjava/boehm.cc
index fc75bdb7005..7066e286b49 100644
--- a/libjava/boehm.cc
+++ b/libjava/boehm.cc
@@ -26,6 +26,12 @@ details.  */
 #undef TRUE
 #undef FALSE
 
+// We include two autoconf headers. Avoid multiple definition warnings.
+#undef PACKAGE_NAME
+#undef PACKAGE_STRING
+#undef PACKAGE_TARNAME
+#undef PACKAGE_VERSION
+
 extern "C"
 {
 #include <gc_config.h>
@@ -93,9 +99,6 @@ _Jv_MarkObj (void *addr, void *msp, void *msl, void *env)
     p = (GC_PTR) obj->sync_info;
     MAYBE_MARK (p, mark_stack_ptr, mark_stack_limit, obj);
 # endif
-  // Mark the object's class.
-  p = (GC_PTR) klass;
-  MAYBE_MARK (p, mark_stack_ptr, mark_stack_limit, obj);
 
   if (__builtin_expect (klass == &java::lang::Class::class$, false))
     {
@@ -208,7 +211,6 @@ _Jv_MarkArray (void *addr, void *msp, void *msl, void *env)
   // we may need to round up the size.
   if (__builtin_expect (! dt || !(dt -> get_finalizer()), false))
     return mark_stack_ptr;
-  jclass klass = dt->clas;
   GC_PTR p;
 
   p = (GC_PTR) dt;
@@ -219,9 +221,6 @@ _Jv_MarkArray (void *addr, void *msp, void *msl, void *env)
     p = (GC_PTR) array->sync_info;
     MAYBE_MARK (p, mark_stack_ptr, mark_stack_limit, array);
 # endif
-  // Mark the object's class.
-  p = (GC_PTR) klass;
-  MAYBE_MARK (p, mark_stack_ptr, mark_stack_limit, &(dt -> clas));
 
   for (int i = 0; i < JvGetArrayLength (array); ++i)
     {
diff --git a/libjava/gnu/gcj/io/natSimpleSHSStream.cc b/libjava/gnu/gcj/io/natSimpleSHSStream.cc
index 5e7b8460012..0487ce740be 100644
--- a/libjava/gnu/gcj/io/natSimpleSHSStream.cc
+++ b/libjava/gnu/gcj/io/natSimpleSHSStream.cc
@@ -29,7 +29,7 @@ gnu::gcj::io::SimpleSHSStream::shsFinal (jbyteArray shs_info)
   ::shsFinal (info);
 
   jbyteArray buffer = JvNewByteArray (SHS_DIGESTSIZE);
-  memcpy (elements (buffer), (jbyte *)&info->digest, SHS_DIGESTSIZE);
+  memcpy (elements (buffer), &info->digest, SHS_DIGESTSIZE);
   return buffer;
 }
     
diff --git a/libjava/include/java-interp.h b/libjava/include/java-interp.h
index 73ab2fe0ae6..aed642b576d 100644
--- a/libjava/include/java-interp.h
+++ b/libjava/include/java-interp.h
@@ -22,6 +22,8 @@ details.  */
 #include <java/lang/Class.h>
 #include <java/lang/ClassLoader.h>
 #include <java/lang/reflect/Modifier.h>
+#include <java/lang/Thread.h>
+#include <gnu/gcj/RawData.h>
 
 // Define this to get the direct-threaded interpreter.  If undefined,
 // we revert to a basic bytecode interpreter.  The former is faster
@@ -290,22 +292,22 @@ public:
 struct _Jv_InterpFrame
 {
   _Jv_InterpMethod *self;
-  _Jv_InterpFrame **ptr;
+  java::lang::Thread *thread;
   _Jv_InterpFrame *next;
   pc_t pc;
 
-  _Jv_InterpFrame (_Jv_InterpMethod *s, _Jv_InterpFrame **n)
+  _Jv_InterpFrame (_Jv_InterpMethod *s, java::lang::Thread *thr)
   {
     self = s;
-    ptr = n;
-    next = *n;
-    *n = this;
+    thread = thr;
+    next = (_Jv_InterpFrame *) thr->interp_frame;
+    thr->interp_frame = (gnu::gcj::RawData *) this;
     pc = NULL;
   }
 
   ~_Jv_InterpFrame ()
   {
-    *ptr = next;
+    thread->interp_frame = (gnu::gcj::RawData *) next;
   }
 };
 
diff --git a/libjava/include/x86_64-signal.h b/libjava/include/x86_64-signal.h
index 1e769f484b6..f6df7d71732 100644
--- a/libjava/include/x86_64-signal.h
+++ b/libjava/include/x86_64-signal.h
@@ -41,8 +41,7 @@ do									     \
      instruction:  the x86_64 exception handler expects			     \
      the PC to point to the instruction after a call. */		     \
   struct ucontext *_uc = (struct ucontext *)_p;				     \
-  volatile struct sigcontext *_sc = (struct sigcontext *) &_uc->uc_mcontext; \
-  _sc->rip += 2;							     \
+  _uc->uc_mcontext.gregs[REG_RIP] += 2;				     	     \
 }									     \
 while (0)
 
@@ -60,7 +59,8 @@ asm						\
 
 /* The return code for realtime-signals.  */
 RESTORE (restore_rt, __NR_rt_sigreturn)
-static void restore_rt (void) asm ("__restore_rt");
+void restore_rt (void) asm ("__restore_rt")
+  __attribute__ ((visibility ("hidden")));
 
 #define INIT_SEGV						\
 do								\
diff --git a/libjava/interpret.cc b/libjava/interpret.cc
index 4e5e5df7028..ddb469788f0 100644
--- a/libjava/interpret.cc
+++ b/libjava/interpret.cc
@@ -807,8 +807,7 @@ _Jv_InterpMethod::run (void *retp, ffi_raw *args, _Jv_InterpMethod *meth)
   // destructor so it cleans up automatically when the interpreter
   // returns.
   java::lang::Thread *thread = java::lang::Thread::currentThread();
-  _Jv_InterpFrame frame_desc (meth,
-			      (_Jv_InterpFrame **) &thread->interp_frame);
+  _Jv_InterpFrame frame_desc (meth, thread);
 
   _Jv_word stack[meth->max_stack];
   _Jv_word *sp = stack;
diff --git a/libjava/java/lang/Class.h b/libjava/java/lang/Class.h
index c94b6d39217..62e280ced82 100644
--- a/libjava/java/lang/Class.h
+++ b/libjava/java/lang/Class.h
@@ -368,7 +368,7 @@ public:
 
   inline jclass getComponentType (void)
     {
-      return isArray () ? (* (jclass *) &methods) : 0;
+      return isArray () ? element_type : 0;
     }
 
   jboolean isAssignableFrom (jclass cls);
@@ -554,7 +554,11 @@ private:
   _Jv_Constants constants;
   // Methods.  If this is an array class, then this field holds a
   // pointer to the element type.
-  _Jv_Method *methods;
+  union
+  {
+    _Jv_Method *methods;
+    jclass element_type;
+  };
   // Number of methods.  If this class is primitive, this holds the
   // character used to represent this type in a signature.
   jshort method_count;
diff --git a/libjava/java/lang/natClassLoader.cc b/libjava/java/lang/natClassLoader.cc
index 5f4d957f61c..fa6f201db46 100644
--- a/libjava/java/lang/natClassLoader.cc
+++ b/libjava/java/lang/natClassLoader.cc
@@ -458,7 +458,7 @@ _Jv_NewArrayClass (jclass element, java::lang::ClassLoader *loader,
     = java::lang::Object::class$.vtable_method_count;
 
   // Stash the pointer to the element type.
-  array_class->methods = (_Jv_Method *) element;
+  array_class->element_type = element;
 
   // Register our interfaces.
   static jclass interfaces[] =
diff --git a/libjava/java/lang/ref/natReference.cc b/libjava/java/lang/ref/natReference.cc
index 5ad5b107405..23f435f4def 100644
--- a/libjava/java/lang/ref/natReference.cc
+++ b/libjava/java/lang/ref/natReference.cc
@@ -363,8 +363,8 @@ void
       // finalizer for ourselves as well.
       _Jv_RegisterFinalizer (this, finalize_reference);
       _Jv_RegisterFinalizer (referent, finalize_referred_to_object);
-      jobject *objp = reinterpret_cast<jobject *> (&referent);
-      _Jv_GCRegisterDisappearingLink (objp);
+      gnu::gcj::RawData **p = &referent;
+     _Jv_GCRegisterDisappearingLink ((jobject *) p);
       add_to_hash (this);
     }
 }
diff --git a/libjava/java/net/natVMNetworkInterfacePosix.cc b/libjava/java/net/natVMNetworkInterfacePosix.cc
index c3a222aed6b..b840907ccab 100644
--- a/libjava/java/net/natVMNetworkInterfacePosix.cc
+++ b/libjava/java/net/natVMNetworkInterfacePosix.cc
@@ -75,7 +75,7 @@ java::net::VMNetworkInterface::getInterfaces ()
       if (::ioctl (fd, SIOCGIFCONF, &if_data) < 0)
         throw new java::net::SocketException;
     }
-  while (if_data.ifc_len >= (sizeof (struct ifreq) * num_interfaces));
+  while (if_data.ifc_len >= (int) (sizeof (struct ifreq) * num_interfaces));
 
   // Get addresses of all interfaces.
   if_record = if_data.ifc_req;
diff --git a/libjava/jni.cc b/libjava/jni.cc
index 5a93753f006..62a96ce9c6f 100644
--- a/libjava/jni.cc
+++ b/libjava/jni.cc
@@ -2426,7 +2426,12 @@ _Jv_JNI_DestroyJavaVM (JavaVM *vm)
 {
   JvAssert (the_vm && vm == the_vm);
 
-  JNIEnv *env;
+  union
+  {
+    JNIEnv *env;
+    void *env_p;
+  };
+
   if (_Jv_ThreadCurrent () != NULL)
     {
       jstring main_name;
@@ -2440,8 +2445,7 @@ _Jv_JNI_DestroyJavaVM (JavaVM *vm)
 	  return JNI_ERR;
 	}
 
-      jint r = _Jv_JNI_AttachCurrentThread (vm, main_name,
-					    reinterpret_cast<void **> (&env),
+      jint r = _Jv_JNI_AttachCurrentThread (vm, main_name, &env_p,
 					    NULL, false);
       if (r < 0)
 	return r;
diff --git a/libjava/posix.cc b/libjava/posix.cc
index 73c0f5f4329..3b551966fca 100644
--- a/libjava/posix.cc
+++ b/libjava/posix.cc
@@ -98,7 +98,7 @@ _Jv_platform_initProperties (java::util::Properties* newprops)
   SET ("file.separator", "/");
   SET ("path.separator", ":");
   SET ("line.separator", "\n");
-  char *tmpdir = ::getenv("TMPDIR");
+  const char *tmpdir = ::getenv("TMPDIR");
   if (! tmpdir)
     tmpdir = "/tmp";
   SET ("java.io.tmpdir", tmpdir);