Changeset 3524


Ignore:
Timestamp:
Sep 19, 2013, 5:31:36 AM (6 years ago)
Author:
cameron
Message:

Use carry_value_0/1 vs. Carry0/1

Files:
2 edited

Legend:

Unmodified
Added
Removed
  • proto/Compiler/pablo.py

    r3520 r3524  
    423423                carry_in_expr = self.ccgo.GenerateCarryInAccess(self.operation_count)
    424424            else:
    425                 carry_in_expr = mkast.var('Carry0')
     425                carry_in_expr = mkast.var('carry_value_0')
    426426            callnode = assigNode.value
    427427            if isAdvance(f):
     
    442442                carry_in_expr = self.ccgo.GenerateAdvanceInAccess(self.operation_count)
    443443            else:
    444                 carry_in_expr = mkast.var('Carry0')
     444                carry_in_expr = mkast.var('carry_value_0')
    445445            callnode = assigNode.value
    446446            pablo_routine_call = mkast.call('pablo_blk_Advance_n_<%i>' %  assigNode.value.args[1].n, [assigNode.value.args[0], carry_in_expr, assigNode.targets[0]])
  • trunk/lib/carryQ.hpp

    r3519 r3524  
    5959
    6060#ifndef CARRY64
    61     #define Carry0 simd<BLOCK_SIZE>::constant<0>()
    62     #define Carry1 simd<BLOCK_SIZE>::constant<1>()
     61    #define carry_value_0 simd<BLOCK_SIZE>::constant<0>()
     62    #define carry_value_1 simd<BLOCK_SIZE>::constant<1>()
    6363#endif
    6464#ifdef CARRY64
    65     #define Carry0 0
    66     #define Carry1 1
     65    #define carry_value_0 0
     66    #define carry_value_1 1
    6767#endif
    6868
     
    208208        {
    209209                  cq[carryno] = carry_or(cq[carryno], cq[carry2]);
    210                   cq[carry2] = Carry0;
     210                  cq[carry2] = carry_value_0;
    211211        }
    212212
     
    245245        IDISA_ALWAYS_INLINE carry_t carry_flip(carry_t carry) const
    246246        {
    247                 return simd_xor(carry, Carry1);
     247                return simd_xor(carry, carry_value_1);
    248248        }
    249249
    250250        IDISA_ALWAYS_INLINE BitBlock CarryFlip(carry_t carry) const
    251251        {
    252                 return simd_xor(carry, Carry1);
     252                return simd_xor(carry, carry_value_1);
    253253        }
    254254
Note: See TracChangeset for help on using the changeset viewer.