Merge to subtype-trunk (manually: src/vm/linker.hpp, src/vm/vftbl.hpp)

[cacao.git] / src / vm / linker.hpp

diff --git a/src/vm/linker.hpp b/src/vm/linker.hpp
index 7f4c6326f675eff953952ab5d0234d083265b967..10355d0a6096bb499702303d9f51d78727d28a65 100644 (file)
--- a/src/vm/linker.hpp
+++ b/src/vm/linker.hpp
@@ -61,6 +61,25 @@ struct arraydescriptor {
 };
 
 
+/* global variables ***********************************************************/
+
+/* This lock must be taken while renumbering classes or while atomically      */
+/* accessing classes.                                                         */
+
+#if USES_NEW_SUBTYPE
+
+#define LOCK_CLASSRENUMBER_LOCK   /* nothing */
+#define UNLOCK_CLASSRENUMBER_LOCK /* nothing */
+
+#else
+extern java_object_t *linker_classrenumber_lock;
+
+#define LOCK_CLASSRENUMBER_LOCK   LOCK_MONITOR_ENTER(linker_classrenumber_lock)
+#define UNLOCK_CLASSRENUMBER_LOCK LOCK_MONITOR_EXIT(linker_classrenumber_lock)
+
+#endif
+
+
 /* function prototypes ********************************************************/
 
 #ifdef __cplusplus