Changeset 59f74a2

Timestamp:

Jul 10, 2020, 2:18:11 PM (4 years ago)

Author:

Thierry Delisle <tdelisle@…>

Branches:

ADT, arm-eh, ast-experimental, enum, forall-pointer-decay, jacob/cs343-translation, master, new-ast, new-ast-unique-expr, pthread-emulation, qualifiedEnum

Children:

365e423

Parents:

20ab637 (diff), 0376da9 (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

Files:

• libcfa/src/concurrency/io.cfa (modified) (3 diffs)
• src/Makefile.in (modified) (1 diff)
• src/Parser/module.mk (modified) (1 diff)

libcfa/src/concurrency/io.cfa

@@ -218 +218 @@
                         // adjust the size according to the parameters
                         if ((params.features & IORING_FEAT_SINGLE_MMAP) != 0) {
-                                cq->ring_sz = sq->ring_sz = max(cq->ring_sz, sq->ring_sz);
+                                cq.ring_sz = sq.ring_sz = max(cq.ring_sz, sq.ring_sz);
                         }
                 #endif
@@ -232 +232 @@
                         // mmap the Completion Queue into existence (may or may not be needed)
                         if ((params.features & IORING_FEAT_SINGLE_MMAP) != 0) {
-                                cq->ring_ptr = sq->ring_ptr;
+                                cq.ring_ptr = sq.ring_ptr;
                         }
                         else
@@ -494 +494 @@
         static [int, bool] __drain_io( & struct __io_data ring, * sigset_t mask ) {
                 /* paranoid */ verify( !kernelTLS.preemption_state.enabled );
-                const uint32_t smask = *ring.submit_q.mask;
 
                 unsigned to_submit = 0;

src/Makefile.in

@@ -626 +626 @@
 
 BUILT_SOURCES = Parser/parser.hh
-AM_YFLAGS = -d -t -v
+AM_YFLAGS = -d -t -v -Wno-yacc
 SRC_RESOLVEXPR = \
       ResolvExpr/AdjustExprType.cc \

src/Parser/module.mk

@@ -17 +17 @@
 BUILT_SOURCES = Parser/parser.hh
 
-AM_YFLAGS = -d -t -v
+AM_YFLAGS = -d -t -v -Wno-yacc
 
 SRC += \