Changeset 2058


Ignore:
Timestamp:
Apr 27, 2012, 10:53:11 PM (7 years ago)
Author:
ksherdy
Message:

Fixed EOF carry bug in test driver.

Location:
trunk/symbol_table
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • trunk/symbol_table/Makefile

    r2054 r2058  
    4343        python $(PABLO_COMPILER) $(GROUP_PABLO_SRC) -t $(GROUP_TEMPLATE) -l$(GROUP_PREFIX) -o $(GROUP_OUTFILE) $(PABLO_ADD_DEBUG)
    4444        python $(PABLO_COMPILER) $(MARKER_PABLO_SRC) -t $(MAIN_TEMPLATE) -l$(MARKER_PREFIX) -o $(MAIN_OUTFILE) $(PABLO_ADD_DEBUG) # @marker_strms_any_carry
    45 
     45        python $(PABLO_COMPILER) $(GROUP_PABLO_SRC) -t $(MAIN_OUTFILE) -l$(GROUP_PREFIX) -o $(MAIN_OUTFILE) $(PABLO_ADD_DEBUG) # @marker_strms_any_carry
    4646clean:
    4747        rm -f $(MARKER_OUTFILE) $(HASH_OUTFILE) $(GROUP_OUTFILE) $(MAIN_OUTFILE)
  • trunk/symbol_table/main_template.cpp

    r2054 r2058  
    203203    // Final partial block or any carry
    204204    ///////////////////////////////////////////////////////////////////////////
    205     if (remaining > 0 || @marker_strms_any_carry /*|| hash_strms_any_carry*/) {
     205    if (remaining > 0 || @marker_strms_any_carry || @group_strms_any_carry /*|| hash_strms_any_carry*/) {
    206206                        BitBlock EOF_mask = bitblock::srl(simd<1>::constant<1>(), convert(BLOCK_SIZE-remaining));
    207207                        s2p_do_final_block((BytePack *) &raw_buffer[blk*BLOCK_SIZE], basis_bits[blk], EOF_mask);
Note: See TracChangeset for help on using the changeset viewer.