* src/vm/jit/arm/emit.c (emit_verbosecall_enter): Remove broken support for

[cacao.git] / src / mm / gc.hpp

diff --git a/src/mm/gc.hpp b/src/mm/gc.hpp
index 4443c93c324562ad0b27db72dd4da0b5137e9229..0a0791205e7cb1e8a18ad94bf4bdf250c072be7c 100644 (file)
--- a/src/mm/gc.hpp
+++ b/src/mm/gc.hpp
@@ -36,9 +36,20 @@
 
 class GC {
 public:
-       // Critical section functions.
-       static void critical_enter(void);
-       static void critical_leave(void);
+};
+
+
+/**
+ * Critical section for the GC.
+ */
+class GCCriticalSection {
+public:
+       GCCriticalSection()  { enter(); }
+       ~GCCriticalSection() { leave(); }
+
+       inline static void enter ();
+       inline static void leave ();
+       inline static bool inside();
 };
 
 
@@ -56,13 +67,14 @@ public:
  * section, because each thread only modifies its own thread local flag
  * and the GC reads the flags while the world is stopped.
  */
-inline void GC::critical_enter()
+void GCCriticalSection::enter()
 {
 #if defined(ENABLE_GC_CACAO)
-       threadobject *t;
+       threadobject* t = thread_get_current();
+
+       // Sanity check.
+       assert(t->gc_critical == false);
 
-       t = THREADOBJECT;
-       assert(!t->gc_critical);
        t->gc_critical = true;
 #endif
 }
@@ -71,17 +83,34 @@ inline void GC::critical_enter()
  * Leaves a LLNI critical section and allows the GC to move objects
  * around on the collected heap again.
  */
-inline void GC::critical_leave()
+void GCCriticalSection::leave()
 {
 #if defined(ENABLE_GC_CACAO)
-       threadobject *t;
+       threadobject* t = thread_get_current();
+
+       // Sanity check.
+       assert(t->gc_critical == true);
 
-       t = THREADOBJECT;
-       assert(t->gc_critical);
        t->gc_critical = false;
 #endif
 }
 
+
+/**
+ * Checks if the calling thread is inside a GC critical section.
+ *
+ * @return true if inside, false otherwise.
+ */
+bool GCCriticalSection::inside()
+{
+#if defined(ENABLE_GC_CACAO)
+       threadobject* t = thread_get_current();
+       return t->gc_critical;
+#else
+       return true;
+#endif
+}
+
 #endif
 
 
@@ -101,7 +130,7 @@ enum {
 
 // Includes.
 #include "vm/global.h"
-#include "vm/method.h"
+#include "vm/method.hpp"
 
 
 /* function prototypes ********************************************************/