- Timestamp:
- Aug 8, 2018, 10:59:19 PM (6 years ago)
- 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:
- 8f34661, 9aa9126
- Parents:
- cc22003 (diff), 1997b4e (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. - Location:
- src
- Files:
-
- 4 edited
Legend:
- Unmodified
- Added
- Removed
-
src/driver/cfa.cc
rcc22003 r3b2b37f 347 347 args[nargs] = "--undefined=__cfaabi_appready_startup"; 348 348 nargs += 1; 349 args[nargs] = "-Xlinker"; 350 nargs += 1; 351 args[nargs] = "--undefined=__cfaabi_dbg_record"; 352 nargs += 1; 349 353 350 354 // include the cfa library in case it's needed -
src/libcfa/bits/locks.h
rcc22003 r3b2b37f 64 64 extern void disable_interrupts(); 65 65 extern void enable_interrupts_noPoll(); 66 67 #ifdef __CFA_DEBUG__ 68 void __cfaabi_dbg_record(__spinlock_t & this, const char * prev_name); 69 #else 70 #define __cfaabi_dbg_record(x, y) 71 #endif 66 72 } 67 73 … … 71 77 this.lock = 0; 72 78 } 73 74 75 #ifdef __CFA_DEBUG__76 void __cfaabi_dbg_record(__spinlock_t & this, const char * prev_name);77 #else78 #define __cfaabi_dbg_record(x, y)79 #endif80 79 81 80 // Lock the spinlock, return false if already acquired -
src/libcfa/concurrency/kernel.c
rcc22003 r3b2b37f 833 833 // Debug 834 834 __cfaabi_dbg_debug_do( 835 void __cfaabi_dbg_record(__spinlock_t & this, const char * prev_name) { 836 this.prev_name = prev_name; 837 this.prev_thrd = kernelTLS.this_thread; 835 extern "C" { 836 void __cfaabi_dbg_record(__spinlock_t & this, const char * prev_name) { 837 this.prev_name = prev_name; 838 this.prev_thrd = kernelTLS.this_thread; 839 } 838 840 } 839 841 ) -
src/libcfa/startup.c
rcc22003 r3b2b37f 40 40 41 41 struct __spinlock_t; 42 void __cfaabi_dbg_record(struct __spinlock_t & this, const char * prev_name) __attribute__(( weak )) {} 42 extern "C" { 43 void __cfaabi_dbg_record(struct __spinlock_t & this, const char * prev_name) __attribute__(( weak )) {} 44 } 43 45 44 46 // Local Variables: //
Note: See TracChangeset
for help on using the changeset viewer.