Ignore:
Timestamp:
Oct 15, 2014, 12:15:44 PM (5 years ago)
Author:
nmedfort
Message:

Minor changes in preperation for adding multiplexing.

File:
1 edited

Legend:

Unmodified
Added
Removed
  • icGREP/icgrep-devel/icgrep/icgrep.cpp

    r4237 r4242  
    231231        timer = getElapsedTime();
    232232    }
    233     const auto llvm_codegen = icgrep::compile(compile_time_option, encoding, (regex_from_file_option ? fileregex : inregex));
     233    const auto llvm_codegen = icgrep::compile(encoding, (regex_from_file_option ? fileregex : inregex), compile_time_option);
    234234
    235235    if (compile_time_option)
     
    319319    struct Basis_bits basis_bits;
    320320    struct Output output;
    321     BitBlock match_vector = simd<1>::constant<0>();
    322     BitBlock * carry_q = new BitBlock[carry_count];
     321    BitBlock match_vector;
     322    BitBlock carry_q[carry_count];
    323323    int match_count=0;
    324324    int blk = 0;
     
    336336    ScannerT match_scanner;
    337337
     338    match_vector = simd<1>::constant<0>();
    338339    memset (carry_q, 0, sizeof(BitBlock) * carry_count);
    339340
     
    524525
    525526    buffer_pos += chars_avail;
    526     delete carry_q;
    527527}
    528528
Note: See TracChangeset for help on using the changeset viewer.