Ignore:
Timestamp:
Mar 27, 2013, 2:35:01 PM (6 years ago)
Author:
ksherdy
Message:

Updated tests and driver.

Location:
proto/pabloj/trunk/input/test
Files:
4 edited

Legend:

Unmodified
Added
Removed
  • proto/pabloj/trunk/input/test/pabloS/statements/while/while1.pablos

    r2972 r2975  
    11function void While() {
    2                
     2                       
    33        var stream cursor = 1;
    44       
  • proto/pabloj/trunk/input/test/visitors/CarryIntroXFormer/FinalBlock/atEOF.pablos

    r2834 r2975  
    44                       
    55        // Translate atEOF(X) calls in non-final blocks to andc(X, EOF_mask)
    6         R = simd_andc(EOF_mask, X);
     6        R = simd_andc(X, EOF_mask);
    77        R = atEOF(X);
    88}
  • proto/pabloj/trunk/input/test/visitors/CarryIntroXFormer/FinalBlock/pablo2CarryQ.pablos

    r2834 r2975  
    77        // TODO - UPDATE EXPECTED RESULTS
    88       
    9         R = carryQ.BitBlock_advance_ci_co(C,carryQ.get_carry_in(0),0);  // Expected
     9        R = carry_set_0.BitBlock_advance_ci_co(C,carry_set_0.CarryAt(0),0);     // Expected
    1010        R = Advance(C);                                                                                                 // Translated
    1111               
    12         R = carryQ.BitBlock_advance_ci_co(C,carryQ.get_carry_in(1),1);
     12        R = carry_set_0.BitBlock_advance_ci_co(C,carry_set_0.CarryAt(1),1);
    1313        R = pablo.Advance(C);
    1414       
    15         R = carryQ.BitBlock_scantofirst(M,carryQ.get_carry_in(2),2);
     15        R = carry_set_0.BitBlock_scantofirst(M,carry_set_0.CarryAt(2),2);
    1616        R = ScanToFirst(M);
    1717
    18         R = carryQ.BitBlock_scantofirst(M,carryQ.get_carry_in(3),3);   
     18        R = carry_set_0.BitBlock_scantofirst(M,carry_set_0.CarryAt(3),3);       
    1919        R = pablo.ScanToFirst(M);
    2020
    21         R = carryQ.BitBlock_scanthru_ci_co(C,X,carryQ.get_carry_in(4),4);
     21        R = carry_set_0.BitBlock_scanthru_ci_co(C,X,carry_set_0.CarryAt(4),4);
    2222        R = ScanThru(C,X);
    2323
    24         R = carryQ.BitBlock_scanthru_ci_co(C,X,carryQ.get_carry_in(5),5);
     24        R = carry_set_0.BitBlock_scanthru_ci_co(C,X,carry_set_0.CarryAt(5),5);
    2525        R = pablo.ScanThru(C,X);
    2626
    27         R = carryQ.BitBlock_scanthru_ci_co(C,simd_andc(EOF_mask, X),carryQ.get_carry_in(6),6);
     27        R = carry_set_0.BitBlock_scanthru_ci_co(C,simd_andc(EOF_mask, X),carry_set_0.CarryAt(6),6);
    2828        R = ScanTo(C,X);
    2929       
    30         R = carryQ.BitBlock_scanthru_ci_co(C,simd_andc(EOF_mask, X),carryQ.get_carry_in(7),7); 
     30        R = carry_set_0.BitBlock_scanthru_ci_co(C,simd_andc(EOF_mask, X),carry_set_0.CarryAt(7),7);     
    3131        R = pablo.ScanTo(C,X);
    3232
    33         R = carryQ.BitBlock_advance_then_scanthru(C,X,carryQ.get_carry_in(8),8);
     33        R = carry_set_0.BitBlock_advance_then_scanthru(C,X,carry_set_0.CarryAt(8),8);
    3434        R = AdvanceThenScanThru(C,X);
    3535       
    36         R = carryQ.BitBlock_advance_then_scanthru(C,X,carryQ.get_carry_in(9),9);       
     36        R = carry_set_0.BitBlock_advance_then_scanthru(C,X,carry_set_0.CarryAt(9),9);   
    3737        R = pablo.AdvanceThenScanThru(C,X);
    3838
    39         R = carryQ.BitBlock_advance_then_scanthru(C,simd_andc(EOF_mask, X),carryQ.get_carry_in(10),10);                 
     39        R = carry_set_0.BitBlock_advance_then_scanthru(C,simd_andc(EOF_mask, X),carry_set_0.CarryAt(10),10);                   
    4040        R = AdvanceThenScanTo(C,X);
    4141       
    42         R = carryQ.BitBlock_advance_then_scanthru(C,simd_andc(EOF_mask, X),carryQ.get_carry_in(11),11);
     42        R = carry_set_0.BitBlock_advance_then_scanthru(C,simd_andc(EOF_mask, X),carry_set_0.CarryAt(11),11);   
    4343        R = pablo.AdvanceThenScanTo(C,X);
    4444
    45         R = carryQ.BitBlock_span_upto(C,X,carryQ.get_carry_in(12),12);
     45        R = carry_set_0.BitBlock_span_upto(C,X,carry_set_0.CarryAt(12),12);
    4646        R = SpanUpTo(C,X);
    4747       
    48         R = carryQ.BitBlock_span_upto(C,X,carryQ.get_carry_in(13),13); 
     48        R = carry_set_0.BitBlock_span_upto(C,X,carry_set_0.CarryAt(13),13);     
    4949        R = pablo.SpanUpTo(C,X);
    5050               
    51         R = carryQ.BitBlock_inclusive_span(C,X,carryQ.get_carry_in(14),14);     
     51        R = carry_set_0.BitBlock_inclusive_span(C,X,carry_set_0.CarryAt(14),14);       
    5252        R = InclusiveSpan(C,X);
    5353       
    54         R = carryQ.BitBlock_inclusive_span(C,X,carryQ.get_carry_in(15),15);     
     54        R = carry_set_0.BitBlock_inclusive_span(C,X,carry_set_0.CarryAt(15),15);       
    5555        R = pablo.InclusiveSpan(C,X);                   
    5656
    57         R = carryQ.BitBlock_exclusive_span(C,X,carryQ.get_carry_in(16),16);     
     57        R = carry_set_0.BitBlock_exclusive_span(C,X,carry_set_0.CarryAt(16),16);       
    5858        R = ExclusiveSpan(C,X);
    5959       
    60         R = carryQ.BitBlock_exclusive_span(C,X,carryQ.get_carry_in(17),17);             
     60        R = carry_set_0.BitBlock_exclusive_span(C,X,carry_set_0.CarryAt(17),17);               
    6161        R = pablo.ExclusiveSpan(C,X);                   
    6262               
  • proto/pabloj/trunk/input/test/visitors/CarryIntroXFormer/NotFinalBlock/pablo2CarryQ.pablos

    r2834 r2975  
    77        // TODO - UPDATE EXPECTED RESULTS
    88       
    9         R = carryQ.BitBlock_advance_ci_co(C,carryQ.get_carry_in(0),0);  // Expected
     9        R = carry_set_0.BitBlock_advance_ci_co(C,carry_set_0.CarryAt(0),0);     // Expected
    1010        R = Advance(C);                                                                                                 // Translated
    1111               
    12         R = carryQ.BitBlock_advance_ci_co(C,carryQ.get_carry_in(1),1);
     12        R = carry_set_0.BitBlock_advance_ci_co(C,carry_set_0.CarryAt(1),1);
    1313        R = pablo.Advance(C);
    1414       
    15         R = carryQ.BitBlock_scantofirst(M,carryQ.get_carry_in(2),2);
     15        R = carry_set_0.BitBlock_scantofirst(M,carry_set_0.CarryAt(2),2);
    1616        R = ScanToFirst(M);
    1717
    18         R = carryQ.BitBlock_scantofirst(M,carryQ.get_carry_in(3),3);   
     18        R = carry_set_0.BitBlock_scantofirst(M,carry_set_0.CarryAt(3),3);       
    1919        R = pablo.ScanToFirst(M);
    2020
    21         R = carryQ.BitBlock_scanthru_ci_co(C,X,carryQ.get_carry_in(4),4);
     21        R = carry_set_0.BitBlock_scanthru_ci_co(C,X,carry_set_0.CarryAt(4),4);
    2222        R = ScanThru(C,X);
    2323
    24         R = carryQ.BitBlock_scanthru_ci_co(C,X,carryQ.get_carry_in(5),5);
     24        R = carry_set_0.BitBlock_scanthru_ci_co(C,X,carry_set_0.CarryAt(5),5);
    2525        R = pablo.ScanThru(C,X);
    2626
    27         R = carryQ.BitBlock_scanthru_ci_co(C,simd_not(X),carryQ.get_carry_in(6),6);
     27        R = carry_set_0.BitBlock_scanthru_ci_co(C,simd_not(X),carry_set_0.CarryAt(6),6);
    2828        R = ScanTo(C,X);
    2929       
    30         R = carryQ.BitBlock_scanthru_ci_co(C,simd_not(X),carryQ.get_carry_in(7),7);     
     30        R = carry_set_0.BitBlock_scanthru_ci_co(C,simd_not(X),carry_set_0.CarryAt(7),7);       
    3131        R = pablo.ScanTo(C,X);
    3232
    33         R = carryQ.BitBlock_advance_then_scanthru(C,X,carryQ.get_carry_in(8),8);
     33        R = carry_set_0.BitBlock_advance_then_scanthru(C,X,carry_set_0.CarryAt(8),8);
    3434        R = AdvanceThenScanThru(C,X);
    3535       
    36         R = carryQ.BitBlock_advance_then_scanthru(C,X,carryQ.get_carry_in(9),9);       
     36        R = carry_set_0.BitBlock_advance_then_scanthru(C,X,carry_set_0.CarryAt(9),9);   
    3737        R = pablo.AdvanceThenScanThru(C,X);
    3838
    39         R = carryQ.BitBlock_advance_then_scanthru(C,simd_not(X),carryQ.get_carry_in(10),10);                   
     39        R = carry_set_0.BitBlock_advance_then_scanthru(C,simd_not(X),carry_set_0.CarryAt(10),10);                       
    4040        R = AdvanceThenScanTo(C,X);
    4141       
    42         R = carryQ.BitBlock_advance_then_scanthru(C,simd_not(X),carryQ.get_carry_in(11),11);   
     42        R = carry_set_0.BitBlock_advance_then_scanthru(C,simd_not(X),carry_set_0.CarryAt(11),11);       
    4343        R = pablo.AdvanceThenScanTo(C,X);
    4444
    45         R = carryQ.BitBlock_span_upto(C,X,carryQ.get_carry_in(12),12);
     45        R = carry_set_0.BitBlock_span_upto(C,X,carry_set_0.CarryAt(12),12);
    4646        R = SpanUpTo(C,X);
    4747       
    48         R = carryQ.BitBlock_span_upto(C,X,carryQ.get_carry_in(13),13); 
     48        R = carry_set_0.BitBlock_span_upto(C,X,carry_set_0.CarryAt(13),13);     
    4949        R = pablo.SpanUpTo(C,X);
    5050               
    51         R = carryQ.BitBlock_inclusive_span(C,X,carryQ.get_carry_in(14),14);     
     51        R = carry_set_0.BitBlock_inclusive_span(C,X,carry_set_0.CarryAt(14),14);       
    5252        R = InclusiveSpan(C,X);
    5353       
    54         R = carryQ.BitBlock_inclusive_span(C,X,carryQ.get_carry_in(15),15);     
     54        R = carry_set_0.BitBlock_inclusive_span(C,X,carry_set_0.CarryAt(15),15);       
    5555        R = pablo.InclusiveSpan(C,X);                   
    5656
    57         R = carryQ.BitBlock_exclusive_span(C,X,carryQ.get_carry_in(16),16);     
     57        R = carry_set_0.BitBlock_exclusive_span(C,X,carry_set_0.CarryAt(16),16);       
    5858        R = ExclusiveSpan(C,X);
    5959       
    60         R = carryQ.BitBlock_exclusive_span(C,X,carryQ.get_carry_in(17),17);             
     60        R = carry_set_0.BitBlock_exclusive_span(C,X,carry_set_0.CarryAt(17),17);               
    6161        R = pablo.ExclusiveSpan(C,X);                   
    6262               
Note: See TracChangeset for help on using the changeset viewer.