merged volatile memory barriers

[cacao.git] / src / native / vm / cldc1.1 / java_lang_Object.cpp

diff --git a/src/native/vm/cldc1.1/java_lang_Object.cpp b/src/native/vm/cldc1.1/java_lang_Object.cpp
index f302cea182cb041e7a4c3d8b7565974652040cc9..8d4fa016b57107a5a144bc658b0f2d0a965d9dbf 100644 (file)
--- a/src/native/vm/cldc1.1/java_lang_Object.cpp
+++ b/src/native/vm/cldc1.1/java_lang_Object.cpp
@@ -30,15 +30,16 @@
 
 #include "native/jni.hpp"
 #include "native/llni.h"
-#include "native/native.h"
+#include "native/native.hpp"
 
 #if defined(ENABLE_JNI_HEADERS)
 # include "native/include/java_lang_Object.h"
 #endif
 
-#include "threads/lock-common.h"
+#include "threads/lock.hpp"
 
 #include "vm/exceptions.hpp"
+#include "vm/javaobjects.hpp"
 
 
 // Native functions are exported as C functions.
@@ -51,16 +52,14 @@ extern "C" {
  */
 JNIEXPORT jclass JNICALL Java_java_lang_Object_getClass(JNIEnv *env, jobject obj)
 {
-       classinfo *c;
-
        if (obj == NULL) {
                exceptions_throw_nullpointerexception();
                return NULL;
        }
 
-       LLNI_class_get(obj, c);
+       java_lang_Object o(obj);
 
-       return (jclass) LLNI_classinfo_wrap(c);
+       return (jclass) LLNI_classinfo_wrap(o.get_Class());
 }
 
 
@@ -71,11 +70,9 @@ JNIEXPORT jclass JNICALL Java_java_lang_Object_getClass(JNIEnv *env, jobject obj
  */
 JNIEXPORT jint JNICALL Java_java_lang_Object_hashCode(JNIEnv *env, jobject _this)
 {
-#if defined(ENABLE_GC_CACAO)
-       assert(0);
-#else
-       return (int32_t) ((uintptr_t) _this);
-#endif
+       java_lang_Object o(_this);
+
+       return o.get_hashcode();
 }
 
 
@@ -112,20 +109,9 @@ JNIEXPORT void JNICALL Java_java_lang_Object_notifyAll(JNIEnv *env, jobject _thi
  */
 JNIEXPORT void JNICALL Java_java_lang_Object_wait(JNIEnv *env, jobject _this, jlong timeout)
 {
-#if defined(ENABLE_JVMTI)
-       /* Monitor Wait */
-       if (jvmti) jvmti_MonitorWaiting(true, _this, timeout);
-#endif
-
 #if defined(ENABLE_THREADS)
        lock_wait_for_object((java_handle_t *) _this, timeout, 0);
 #endif
-
-#if defined(ENABLE_JVMTI)
-       /* Monitor Waited */
-       /* XXX: How do you know if wait timed out ?*/
-       if (jvmti) jvmti_MonitorWaiting(false, _this, 0);
-#endif
 }
 
 } // extern "C"
@@ -148,16 +134,12 @@ static JNINativeMethod methods[] = {
  
 *******************************************************************************/
  
-// FIXME
-extern "C" {
 void _Jv_java_lang_Object_init(void)
 {
-       utf *u;
+       utf* u = utf_new_char("java/lang/Object");
  
-       u = utf_new_char("java/lang/Object");
- 
-       native_method_register(u, methods, NATIVE_METHODS_COUNT);
-}
+       NativeMethods& nm = VM::get_current()->get_nativemethods();
+       nm.register_methods(u, methods, NATIVE_METHODS_COUNT);
 }