GNU header update.

[cacao.git] / src / native / vm / VMObject.c

diff --git a/src/native/vm/VMObject.c b/src/native/vm/VMObject.c
index abc6167c74b86363aba620377f00c92ac42894ed..13c3bf4fd6729e11a7e0e47b9ce88261c5860ed5 100644 (file)
--- a/src/native/vm/VMObject.c
+++ b/src/native/vm/VMObject.c
@@ -1,9 +1,9 @@
-/* nat/VMObject.c - java/lang/Object
+/* native/vm/VMObject.c - java/lang/Object
 
-   Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003
-   R. Grafl, A. Krall, C. Kruegel, C. Oates, R. Obermaisser,
-   M. Probst, S. Ring, E. Steiner, C. Thalinger, D. Thuernbeck,
-   P. Tomsich, J. Wenninger
+   Copyright (C) 1996-2005 R. Grafl, A. Krall, C. Kruegel, C. Oates,
+   R. Obermaisser, M. Platter, M. Probst, S. Ring, E. Steiner,
+   C. Thalinger, D. Thuernbeck, P. Tomsich, C. Ullrich, J. Wenninger,
+   Institut f. Computersprachen - TU Wien
 
    This file is part of CACAO.
 
@@ -28,22 +28,34 @@
 
    Changes: Joseph Wenninger
 
-   $Id: VMObject.c 930 2004-03-02 21:18:23Z jowenn $
+   $Id: VMObject.c 1735 2004-12-07 14:33:27Z twisti $
 
 */
 
 
 #include <stdlib.h>
 #include <string.h>
-#include "jni.h"
-#include "builtin.h"
-#include "native.h"
+
 #include "mm/boehm.h"
-#include "threads/locks.h"
-#include "toolbox/loging.h"
-#include "toolbox/memory.h"
-#include "java_lang_Cloneable.h"
-#include "java_lang_Object.h"
+#include "mm/memory.h"
+#include "toolbox/logging.h"
+#include "native/jni.h"
+#include "native/native.h"
+#include "native/include/java_lang_Cloneable.h"
+#include "native/include/java_lang_Object.h"
+#include "vm/builtin.h"
+#include "vm/exceptions.h"
+#include "vm/loader.h"
+#include "vm/options.h"
+
+#if defined(USE_THREADS)
+# if defined(NATIVE_THREADS)
+#  include "threads/native/threads.h"
+# else
+#  include "threads/green/threads.h"
+#  include "threads/green/locks.h"
+# endif
+#endif
 
 
 /*
@@ -53,9 +65,6 @@
  */
 JNIEXPORT java_lang_Object* JNICALL Java_java_lang_VMObject_clone(JNIEnv *env, jclass clazz, java_lang_Cloneable *this)
 {
-/*     log_text("Java_java_lang_VMObject_clone called");
-       log_utf(((java_objectheader*)this)->vftbl->class->name);
-       log_text("starting cloning");     */
        classinfo *c;
        java_lang_Object *new;
        arraydescriptor *desc;
@@ -67,25 +76,31 @@ JNIEXPORT java_lang_Object* JNICALL Java_java_lang_VMObject_clone(JNIEnv *env, j
         
                new = (java_lang_Object *) heap_allocate(size, (desc->arraytype == ARRAYTYPE_OBJECT), NULL);
                memcpy(new, this, size);
+#if defined(USE_THREADS) && defined(NATIVE_THREADS)
+               initObjectLock((java_objectheader *) new);
+#endif
         
                return new;
        }
     
     /* We are cloning a non-array */
     if (!builtin_instanceof((java_objectheader *) this, class_java_lang_Cloneable)) {
-        *exceptionptr = native_new_and_init (class_java_lang_CloneNotSupportedException);
+        *exceptionptr =
+                       new_exception(string_java_lang_CloneNotSupportedException);
         return NULL;
     }
 
     /* XXX should use vftbl */
     c = this->header.vftbl->class;
     new = (java_lang_Object *) builtin_new(c);
-    if (!new) {
-        *exceptionptr = proto_java_lang_OutOfMemoryError;
+
+    if (!new)
         return NULL;
-    }
 
     memcpy(new, this, c->instancesize);
+#if defined(USE_THREADS) && defined(NATIVE_THREADS)
+       initObjectLock((java_objectheader *) new);
+#endif
 
     return new;
 }
@@ -101,7 +116,7 @@ JNIEXPORT void JNICALL Java_java_lang_VMObject_notify(JNIEnv *env, jclass clazz,
        if (runverbose)
                log_text("java_lang_Object_notify called");
 
-#if defined(USE_THREADS) && !defined(NATIVE_THREADS)
+#if defined(USE_THREADS)
        signal_cond_for_object(&this->header);
 #endif
 }
@@ -117,7 +132,7 @@ JNIEXPORT void JNICALL Java_java_lang_VMObject_notifyAll(JNIEnv *env, jclass cla
        if (runverbose)
                log_text("java_lang_Object_notifyAll called");
 
-#if defined(USE_THREADS) && !defined(NATIVE_THREADS)
+#if defined(USE_THREADS)
        broadcast_cond_for_object(&this->header);
 #endif
 }
@@ -133,8 +148,8 @@ JNIEXPORT void JNICALL Java_java_lang_VMObject_wait(JNIEnv *env, jclass clazz, j
        if (runverbose)
                log_text("java_lang_VMObject_wait called");
 
-#if defined(USE_THREADS) && !defined(NATIVE_THREADS)
-       wait_cond_for_object(&this->header, time);
+#if defined(USE_THREADS)
+       wait_cond_for_object(&this->header, time, par3);
 #endif
 }