Changeset 59f74a2


Ignore:
Timestamp:
Jul 10, 2020, 2:18:11 PM (17 months ago)
Author:
Thierry Delisle <tdelisle@…>
Branches:
arm-eh, jacob/cs343-translation, master, new-ast, new-ast-unique-expr
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:
3 edited

Legend:

Unmodified
Added
Removed
  • libcfa/src/concurrency/io.cfa

    r20ab637 r59f74a2  
    218218                        // adjust the size according to the parameters
    219219                        if ((params.features & IORING_FEAT_SINGLE_MMAP) != 0) {
    220                                 cq->ring_sz = sq->ring_sz = max(cq->ring_sz, sq->ring_sz);
     220                                cq.ring_sz = sq.ring_sz = max(cq.ring_sz, sq.ring_sz);
    221221                        }
    222222                #endif
     
    232232                        // mmap the Completion Queue into existence (may or may not be needed)
    233233                        if ((params.features & IORING_FEAT_SINGLE_MMAP) != 0) {
    234                                 cq->ring_ptr = sq->ring_ptr;
     234                                cq.ring_ptr = sq.ring_ptr;
    235235                        }
    236236                        else
     
    494494        static [int, bool] __drain_io( & struct __io_data ring, * sigset_t mask ) {
    495495                /* paranoid */ verify( !kernelTLS.preemption_state.enabled );
    496                 const uint32_t smask = *ring.submit_q.mask;
    497496
    498497                unsigned to_submit = 0;
  • src/Makefile.in

    r20ab637 r59f74a2  
    626626
    627627BUILT_SOURCES = Parser/parser.hh
    628 AM_YFLAGS = -d -t -v
     628AM_YFLAGS = -d -t -v -Wno-yacc
    629629SRC_RESOLVEXPR = \
    630630      ResolvExpr/AdjustExprType.cc \
  • src/Parser/module.mk

    r20ab637 r59f74a2  
    1717BUILT_SOURCES = Parser/parser.hh
    1818
    19 AM_YFLAGS = -d -t -v
     19AM_YFLAGS = -d -t -v -Wno-yacc
    2020
    2121SRC += \
Note: See TracChangeset for help on using the changeset viewer.