Changeset 9aa9126 for libcfa/src

Timestamp:

Aug 9, 2018, 1:14:24 PM (7 years ago)

Author:

Thierry Delisle <tdelisle@…>

Branches:

ADT, aaron-thesis, arm-eh, ast-experimental, cleanup-dtors, deferred_resn, demangler, enum, forall-pointer-decay, jacob/cs343-translation, jenkins-sandbox, master, new-ast, new-ast-unique-expr, no_list, persistent-indexer, pthread-emulation, qualifiedEnum

Children:

fc846ae

Parents:

7a7ab42 (diff), 3b2b37f (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge branch 'master' of plg.uwaterloo.ca:software/cfa/cfa-cc

Location:

libcfa/src

Files:

• bits/locks.hfa (modified) (2 diffs)
• concurrency/kernel.cfa (modified) (1 diff)
• startup.cfa (modified) (1 diff)

libcfa/src/bits/locks.hfa

@@ -64 +64 @@
                 extern void disable_interrupts();
                 extern void enable_interrupts_noPoll();
+
+                #ifdef __CFA_DEBUG__
+                        void __cfaabi_dbg_record(__spinlock_t & this, const char * prev_name);
+                #else
+                        #define __cfaabi_dbg_record(x, y)
+                #endif
         }
 
@@ -71 +77 @@
                 this.lock = 0;
         }
-
-
-        #ifdef __CFA_DEBUG__
-                void __cfaabi_dbg_record(__spinlock_t & this, const char * prev_name);
-        #else
-                #define __cfaabi_dbg_record(x, y)
-        #endif
 
         // Lock the spinlock, return false if already acquired

libcfa/src/concurrency/kernel.cfa

@@ -833 +833 @@
 // Debug
 __cfaabi_dbg_debug_do(
-        void __cfaabi_dbg_record(__spinlock_t & this, const char * prev_name) {
-                this.prev_name = prev_name;
-                this.prev_thrd = kernelTLS.this_thread;
+        extern "C" {
+                void __cfaabi_dbg_record(__spinlock_t & this, const char * prev_name) {
+                        this.prev_name = prev_name;
+                        this.prev_thrd = kernelTLS.this_thread;
+                }
         }
 )

libcfa/src/startup.cfa

@@ -40 +40 @@
 
 struct __spinlock_t;
-void __cfaabi_dbg_record(struct __spinlock_t & this, const char * prev_name) __attribute__(( weak )) {}
+extern "C" {
+        void __cfaabi_dbg_record(struct __spinlock_t & this, const char * prev_name) __attribute__(( weak )) {}
+}
 
 // Local Variables: //