Changeset 2292 for trunk


Ignore:
Timestamp:
Aug 9, 2012, 9:00:02 PM (7 years ago)
Author:
ksherdy
Message:

Additional symbol table modifications for integration with current ICXML structure.

Location:
trunk/symbol_table
Files:
7 edited

Legend:

Unmodified
Added
Removed
  • trunk/symbol_table/pablo/bit_byte_group_strms.py

    r2291 r2292  
    88        follows_0 = 0 # byte
    99
    10 def Gen_lgth_groups(marker, groups):
    11 
    12         groups.starts = marker.starts
    13         groups.follows = marker.follows
     10def Gen_lgth_groups(groups):
    1411
    1512        # Groups symbols of length 1 to length 7
     
    3734
    3835def Main(marker, groups):
    39         Gen_lgth_groups(marker, groups)
     36        Gen_lgth_groups(groups)
    4037
  • trunk/symbol_table/pablo/div2_group_strms.py

    r2291 r2292  
    1515        follows_0 = 0
    1616
    17 def Gen_lgth_groups(marker, groups):
    18 
    19         groups.starts = marker.starts
    20         groups.follows = marker.follows
    21 
     17def Gen_lgth_groups(groups):
     18       
    2219        ### Div2 Strategy ###
    2320        follows_gt_0 = groups.follows
     
    6158        groups.follows_0 = follows_gt_16
    6259
    63 def Main(marker, groups):
    64         Gen_lgth_groups(marker, groups)
     60def Main(groups):
     61        Gen_lgth_groups(groups)
  • trunk/symbol_table/pablo/div2_logbase2_group_strms.py

    r2291 r2292  
    1111        follows_0 = 0
    1212
    13 def Gen_lgth_groups(marker, groups):
    14 
    15         groups.starts = marker.starts
    16         groups.follows = marker.follows
    17 
     13def Gen_lgth_groups(groups):
     14       
    1815        ### Div2 Strategy ###
    1916        follows_gt_0 = groups.follows
     
    6057        groups.follows_0 = follows_gt_16
    6158
    62 def Main(marker, groups):
    63         Gen_lgth_groups(marker, groups)
     59def Main(groups):
     60        Gen_lgth_groups(groups)
  • trunk/symbol_table/pablo/id_group_strms.py

    r2291 r2292  
    2323        follows_0 = 0
    2424
    25 def Gen_lgth_groups(marker, groups):
    26 
    27         groups.starts = marker.starts
    28         groups.follows = marker.follows
     25def Gen_lgth_groups(groups):
    2926
    3027        cursor = groups.starts
     
    114111        groups.follows_0 = temp
    115112
    116 def Main(marker, groups):
    117         Gen_lgth_groups(marker, groups)
     113def Main(groups):
     114        Gen_lgth_groups(groups)
    118115
  • trunk/symbol_table/pablo/logbase2_group_strms.py

    r2291 r2292  
    1111        follows_0 = 0
    1212
    13 def Gen_lgth_groups(marker, groups):
    14 
    15                 groups.starts = marker.starts
    16                 groups.follows = marker.follows
     13def Gen_lgth_groups(groups):
    1714
    1815                starts = groups.starts
     
    5653                groups.follows_0 = remaining_follows
    5754
    58 def Main(marker, groups):
    59                 Gen_lgth_groups(marker, groups)
     55def Main(groups):
     56                Gen_lgth_groups(groups)
  • trunk/symbol_table/templates/group_strms.template.hpp

    r2291 r2292  
    1010@group_strms_stream_stmts
    1111
    12 static IDISA_ALWAYS_INLINE void group_strms_do_block(Marker & marker, Groups & groups) {
    13         // groups.starts = markers.starts;
    14         // groups.follows = markers.follows;
     12static IDISA_ALWAYS_INLINE void group_strms_do_block(BitBlock & starts, BitBlock & follows, Groups & groups) {
     13        groups.starts = starts;
     14         groups.follows = follows;
    1515        // GENERATED
    1616        @group_strms_block_stmts
    1717}
    1818
    19 static IDISA_ALWAYS_INLINE void group_strms_do_final_block(Marker & marker, Groups & groups, BitBlock & EOF_mask) {
    20         // groups.starts = markers.starts;
    21         // groups.follows = markers.follows;
     19static IDISA_ALWAYS_INLINE void group_strms_do_final_block(BitBlock & starts, BitBlock & follows, Groups & groups, BitBlock & EOF_mask) {
     20         groups.starts = starts;
     21         groups.follows = follows;
    2222        // GENERATED
    2323        @group_strms_final_block_stmts
  • trunk/symbol_table/templates/main.template.cpp

    r2291 r2292  
    146146                        marker_do_block(basis_bits[blk], marker[blk]);                              // gen symbol spans, mark starts & follows
    147147                        hash_strms_do_block(basis_bits[blk], hash[blk]);                            // gen hash bit streams
    148                         group_strms_do_block(marker[blk], groups[blk]);                     // sort marker bit stream (identity)
     148                        group_strms_do_block(marker[blk].starts, marker[blk].follows, groups[blk]);                         // sort marker bit stream (identity)
    149149    }
    150150
     
    200200                        marker_do_block(basis_bits[blk], marker[blk]);
    201201                        hash_strms_do_block(basis_bits[blk], hash[blk]);
    202                         group_strms_do_block(marker[blk], groups[blk]);
     202                        group_strms_do_block(marker[blk].starts, marker[blk].follows, groups[blk]);
    203203                        blk++;
    204204                        remaining -= BLOCK_SIZE;
     
    213213                        marker_do_final_block(basis_bits[blk], marker[blk], EOF_mask);
    214214                        hash_strms_do_final_block(basis_bits[blk], hash[blk], EOF_mask);
    215                         group_strms_do_final_block(marker[blk], groups[blk], EOF_mask);
     215                        group_strms_do_final_block(marker[blk].starts, marker[blk].follows, groups[blk], EOF_mask);
    216216                        blk++;
    217217    }
Note: See TracChangeset for help on using the changeset viewer.