Changeset 780 for proto/parabix2/src


Ignore:
Timestamp:
Dec 5, 2010, 9:37:22 AM (9 years ago)
Author:
cameron
Message:

Use sse2 for default make

Location:
proto/parabix2/src
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • proto/parabix2/src/Makefile

    r565 r780  
    55CC= g++ $(CFLAGS)
    66CFLAGS= $(SSE) -O3
    7 SSE=-msse4.1 -DUSE_PTEST #-mssse3 -msse4.1 -msse4.2
     7SSE=-msse2 #-msse4.1 -DUSE_PTEST #-mssse3 -msse4.1 -msse4.2
    88
    99OS = $(shell uname)
  • proto/parabix2/src/xmlwf.c

    r775 r780  
    411411  BitBlock colon2_err, ncname_err, namespace_error, error_mask, tag_marks;
    412412  BitBlock NameFollows, AttRef;
    413   CarryDeclare(carryQ, 62);
     413CarryDeclare(carryQ, 62);
    414414
    415415
     
    472472  }
    473473 
    474  
     474  CarryInit(carryQ, 62);
     475
    475476  CtCDPI_Cursor = sisd_from_int(1);
    476477
     
    731732    while (bitblock_has_bit(CtCDPI_Cursor)) {
    732733      CarryDeclare(subcarryQ, 14);
     734      CarryInit(subcarryQ, 14);
    733735      CtCDPI_starts = simd_or(CtCDPI_starts, CtCDPI_Cursor);
    734736      PI_Cursor = simd_and(CtCDPI_Cursor, lex.PI_start);
     
    809811    while (bitblock_has_bit(AttNameStart)) {
    810812      CarryDeclare(subcarryQ, 7);
     813      CarryInit(subcarryQ, 7);
    811814      AttNameStarts = simd_or(AttNameStarts, AttNameStart);
    812815      AttNameFollow = BitBlock_scanthru_co(AttNameStart, lex.NameScan, subcarryQ, 0);
     
    894897  AttRef = simd_and(callouts.AttVals, Ref2);
    895898  CtCDPI_Cursor = simd_const_1(0);
     899  CarryQ_Adjust(carryQ, 62);
    896900
    897901
     
    11721176    while (bitblock_has_bit(CtCDPI_Cursor)) {
    11731177      CarryDeclare(subcarryQ, 14);
     1178      CarryInit(subcarryQ, 14);
    11741179      CtCDPI_starts = simd_or(CtCDPI_starts, CtCDPI_Cursor);
    11751180      PI_Cursor = simd_and(CtCDPI_Cursor, lex.PI_start);
     
    12501255    while (bitblock_has_bit(AttNameStart)) {
    12511256      CarryDeclare(subcarryQ, 7);
     1257      CarryInit(subcarryQ, 7);
    12521258      AttNameStarts = simd_or(AttNameStarts, AttNameStart);
    12531259      AttNameFollow = BitBlock_scanthru_co(AttNameStart, lex.NameScan, subcarryQ, 0);
     
    13351341  AttRef = simd_and(callouts.AttVals, Ref2);
    13361342  CtCDPI_Cursor = simd_const_1(0);
     1343  CarryQ_Adjust(carryQ, 62);
    13371344       
    13381345        if (bitblock_has_bit(error_mask)) {
Note: See TracChangeset for help on using the changeset viewer.