Changeset 167a9c8

Timestamp:

Feb 24, 2017, 3:58:07 PM (8 years ago)

Author:

Rob Schluntz <rschlunt@…>

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, new-env, no_list, persistent-indexer, pthread-emulation, qualifiedEnum, resolv-new, with_gc

Children:

1630f18, ef9cc56

Parents:

43c89a7 (diff), 23c4aa8 (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 plg2:software/cfa/cfa-cc

Files:

• doc/LaTeXmacros/common.tex (modified) (2 diffs)
• src/InitTweak/GenInit.cc (modified) (1 diff)
• src/libcfa/concurrency/monitor (modified) (1 diff)
• src/libcfa/concurrency/monitor.c (modified) (1 diff)
• src/tests/.expect/globals.txt (added)
• src/tests/globals.c (added)
• src/tests/monitor.c (modified) (1 diff)
• src/tests/simpleGenericTriple.c (modified) (1 diff)

doc/LaTeXmacros/common.tex

@@ -248 +248 @@
         morekeywords={_Alignas,_Alignof,__alignof,__alignof__,asm,__asm,__asm__,_At,_Atomic,__attribute,__attribute__,auto,
                 _Bool,catch,catchResume,choose,_Complex,__complex,__complex__,__const,__const__,disable,dtype,enable,__extension__,
-                fallthrough,fallthru,finally,forall,ftype,_Generic,_Imaginary,inline,__label__,lvalue,_Noreturn,otype,restrict,_Static_assert,
-                _Thread_local,throw,throwResume,trait,try,typeof,__typeof,__typeof__,},
+                fallthrough,fallthru,finally,forall,ftype,_Generic,_Imaginary,inline,__label__,lvalue,_Noreturn,one_t,otype,restrict,_Static_assert,
+                _Thread_local,throw,throwResume,trait,try,typeof,__typeof,__typeof__,zero_t},
 }%
 
@@ -263 +263 @@
 escapechar=§,                                                                                   % LaTeX escape in CFA code §...§ (section symbol), emacs: C-q M-'
 mathescape=true,                                                                                % LaTeX math escape in CFA code $...$
-%keepspaces=true,                                                                               % 
+%keepspaces=true,                                                                               %
 showstringspaces=false,                                                                 % do not show spaces with cup
 showlines=true,                                                                                 % show blank lines at end of code

src/InitTweak/GenInit.cc

@@ -332 +332 @@
                         if ( ObjectDecl * field = dynamic_cast< ObjectDecl * >( member ) ) {
                                 if ( isManaged( field ) ) {
-                                        managedTypes.insert( SymTab::Mangler::mangle( aggregateDecl ) );
+                                        StructInstType inst( Type::Qualifiers(), aggregateDecl );
+                                        managedTypes.insert( SymTab::Mangler::mangle( &inst ) );
                                         break;
                                 }

src/libcfa/concurrency/monitor

@@ -30 +30 @@
 void leave(monitor *);
 
+struct monitor_guard {
+        monitor * m;
+};
+
+static inline void ?{}( monitor_guard * this, monitor * m ) {
+        this->m = m;
+        enter( this->m );
+}
+
+static inline void ^?{}( monitor_guard * this ) {
+        leave( this->m );
+}
+
 #endif //MONITOR_H

src/libcfa/concurrency/monitor.c

@@ -44 +44 @@
 
         unlock( &this->lock );
+
         if( this->holder ) ScheduleThread( this->holder );
 }

src/tests/monitor.c

@@ -16 +16 @@
 
 void increment( /*mutex*/ global_t * this ) {
-        enter( &this->m );
+        monitor_guard g = { &this->m };
         this->value += 1;
-        leave( &this->m );
 }
 

src/tests/simpleGenericTriple.c

@@ -28 +28 @@
   int x1 = 123, x3 = 456;
   double x2 = 999.123;
-  struct T3(int) Li = { x1, x2, x3 };
+  struct T3(int) Li = { x1, (int)x2, x3 };
   struct T3(int) Ri = { 9, 2, 3 };
   struct T3(int) reti = Li+Ri;