* src/native/vm/Makefile.am

(JAVA_UTIL_CONCURRENT_ATOMIC_ATOMICLONG_SOURCES): Removed.
(libnativevm_la_SOURCES): Removed
JAVA_UTIL_CONCURRENT_ATOMIC_ATOMICLONG_SOURCES.

* src/native/vm/gnu/java_util_concurrent_atomic_AtomicLong.c
(native/vm/java_util_concurrent_atomic_AtomicLong.h): Removed.
(native/include/java_util_concurrent_atomic_AtomicLong.h): Added.
(methods): VMSupportsCS8: Use
Java_java_util_concurrent_atomic_AtomicLong_VMSupportsCS8.
(Java_java_util_concurrent_atomic_AtomicLong_VMSupportsCS8): New
function.

* src/native/vm/sun/jvm.c
(native/vm/java_util_concurrent_atomic_AtomicLong.h): Removed.
(JVM_SupportsCX8): Just return 0 for now.

* src/native/vm/java_util_concurrent_atomic_AtomicLong.c: Removed.
* src/native/vm/java_util_concurrent_atomic_AtomicLong.h: Likewise.

diff --git a/src/native/vm/Makefile.am b/src/native/vm/Makefile.am
index 5442e8752087a3eec0b1b0fef7af1259ff51a52f..708c861a787131c1597e450cc121ab969555454f 100644 (file)
--- a/src/native/vm/Makefile.am
+++ b/src/native/vm/Makefile.am
@@ -73,10 +73,6 @@ JAVA_LANG_REFLECT_METHOD_SOURCES = \
        java_lang_reflect_Method.c \
        java_lang_reflect_Method.h
 
-JAVA_UTIL_CONCURRENT_ATOMIC_ATOMICLONG_SOURCES = \
-       java_util_concurrent_atomic_AtomicLong.c \
-       java_util_concurrent_atomic_AtomicLong.h
-
 SUN_MISC_UNSAFE_SOURCES = \
        sun_misc_Unsafe.c
 endif
@@ -98,7 +94,6 @@ libnativevm_la_SOURCES = \
        java_lang_Thread.h \
        $(JAVA_LANG_REFLECT_CONSTRUCTOR_SOURCES) \
        $(JAVA_LANG_REFLECT_METHOD_SOURCES) \
-       $(JAVA_UTIL_CONCURRENT_ATOMIC_ATOMICLONG_SOURCES) \
        $(SUN_MISC_UNSAFE_SOURCES)
 
 libnativevm_la_LIBADD = \

diff --git a/src/native/vm/gnu/java_util_concurrent_atomic_AtomicLong.c b/src/native/vm/gnu/java_util_concurrent_atomic_AtomicLong.c
index ac9aa388258dc7331d64d061db02d88cb8e05a18..7105e65f8f61a6d735d8fbf2cfdd6c9201b33f1e 100644 (file)
--- a/src/native/vm/gnu/java_util_concurrent_atomic_AtomicLong.c
+++ b/src/native/vm/gnu/java_util_concurrent_atomic_AtomicLong.c
@@ -32,7 +32,7 @@
 #include "native/jni.h"
 #include "native/native.h"
 
-#include "native/vm/java_util_concurrent_atomic_AtomicLong.h"
+#include "native/include/java_util_concurrent_atomic_AtomicLong.h"
 
 #include "vmcore/utf8.h"
 
@@ -40,7 +40,7 @@
 /* native methods implemented by this file ************************************/
 
 static JNINativeMethod methods[] = {
-       { "VMSupportsCS8", "()Z", (void *) (intptr_t) &_Jv_java_util_concurrent_atomic_AtomicLong_VMSupportsCS8 },
+       { "VMSupportsCS8", "()Z", (void *) (intptr_t) &Java_java_util_concurrent_atomic_AtomicLong_VMSupportsCS8 },
 };
 
 
@@ -60,6 +60,19 @@ void _Jv_java_util_concurrent_atomic_AtomicLong_init(void)
 }
 
 
+/*
+ * Class:     java/util/concurrent/atomic/AtomicLong
+ * Method:    VMSupportsCS8
+ * Signature: ()Z
+ */
+JNIEXPORT int32_t JNICALL Java_java_util_concurrent_atomic_AtomicLong_VMSupportsCS8(JNIEnv *env, jclass clazz)
+{
+       /* IMPLEMENT ME */
+
+       return 0;
+}
+
+
 /*
  * These are local overrides for various environment variables in Emacs.
  * Please do not remove this and leave it at the end of the file, where

diff --git a/src/native/vm/java_util_concurrent_atomic_AtomicLong.c b/src/native/vm/java_util_concurrent_atomic_AtomicLong.c
deleted file mode 100644 (file)
index 8bb5fb6..0000000
--- a/src/native/vm/java_util_concurrent_atomic_AtomicLong.c
+++ /dev/null
@@ -1,59 +0,0 @@
-/* src/native/vm/java_util_concurrent_atomic_AtomicLong.c
-
-   Copyright (C) 2007 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.
-
-   This program 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.
-
-   This program 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 this program; if not, write to the Free Software
-   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
-   02110-1301, USA.
-
-*/
-
-
-#include "config.h"
-
-#include <stdint.h>
-
-#include "native/jni.h"
-
-
-/*
- * Class:     java/util/concurrent/atomic/AtomicLong
- * Method:    VMSupportsCS8
- * Signature: ()Z
- */
-JNIEXPORT int32_t JNICALL _Jv_java_util_concurrent_atomic_AtomicLong_VMSupportsCS8(JNIEnv *env, jclass clazz)
-{
-       /* IMPLEMENT ME */
-
-       return 0;
-}
-
-
-/*
- * These are local overrides for various environment variables in Emacs.
- * Please do not remove this and leave it at the end of the file, where
- * Emacs will automagically detect them.
- * ---------------------------------------------------------------------
- * Local variables:
- * mode: c
- * indent-tabs-mode: t
- * c-basic-offset: 4
- * tab-width: 4
- * End:
- */

diff --git a/src/native/vm/java_util_concurrent_atomic_AtomicLong.h b/src/native/vm/java_util_concurrent_atomic_AtomicLong.h
deleted file mode 100644 (file)
index fe653de..0000000
--- a/src/native/vm/java_util_concurrent_atomic_AtomicLong.h
+++ /dev/null
@@ -1,56 +0,0 @@
-/* src/native/vm/java_util_concurrent_atomic_AtomicLong.h
-
-   Copyright (C) 2007 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.
-
-   This program 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.
-
-   This program 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 this program; if not, write to the Free Software
-   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
-   02110-1301, USA.
-
-*/
-
-
-#ifndef _JV_UTIL_CONCURRENT_ATOMIC_ATOMICLONG_H
-#define _JV_UTIL_CONCURRENT_ATOMIC_ATOMICLONG_H
-
-#include "config.h"
-
-#include <stdint.h>
-
-#include "native/jni.h"
-
-
-/* function prototypes ********************************************************/
-
-int32_t _Jv_java_util_concurrent_atomic_AtomicLong_VMSupportsCS8(JNIEnv *env, jclass clazz);
-
-#endif /* _JV_UTIL_CONCURRENT_ATOMIC_ATOMICLONG_H */
-
-
-/*
- * These are local overrides for various environment variables in Emacs.
- * Please do not remove this and leave it at the end of the file, where
- * Emacs will automagically detect them.
- * ---------------------------------------------------------------------
- * Local variables:
- * mode: c
- * indent-tabs-mode: t
- * c-basic-offset: 4
- * tab-width: 4
- * End:
- */

diff --git a/src/native/vm/sun/jvm.c b/src/native/vm/sun/jvm.c
index 9f41d302ddaa3bcb6678c525ca7a759fce6bfcc8..2cf77ebe1da80dc2250b246b7946751cb0d9a88a 100644 (file)
--- a/src/native/vm/sun/jvm.c
+++ b/src/native/vm/sun/jvm.c
@@ -79,7 +79,6 @@
 #include "native/vm/java_lang_Thread.h"
 #include "native/vm/java_lang_reflect_Constructor.h"
 #include "native/vm/java_lang_reflect_Method.h"
-#include "native/vm/java_util_concurrent_atomic_AtomicLong.h"
 #include "native/vm/reflect.h"
 
 #include "threads/lock-common.h"
@@ -2861,10 +2860,11 @@ jobject JVM_NewInstanceFromConstructor(JNIEnv *env, jobject c, jobjectArray args
 
 jboolean JVM_SupportsCX8()
 {
-#if PRINTJVM
-       log_println("JVM_SupportsCX8");
-#endif
-       return _Jv_java_util_concurrent_atomic_AtomicLong_VMSupportsCS8(NULL, NULL);
+       TRACEJVMCALLS("JVM_SupportsCX8()");
+
+       /* IMPLEMENT ME */
+
+       return 0;
 }