Changeset 2963


Ignore:
Timestamp:
Mar 23, 2013, 7:44:28 PM (5 years ago)
Author:
ksherdy
Message:

Renamed CarryQ to CarrySet?.

Location:
proto/pabloj/trunk/src/compilers/pabloB/lang/carrySet
Files:
1 copied
4 moved

Legend:

Unmodified
Added
Removed
  • proto/pabloj/trunk/src/compilers/pabloB/lang/carrySet/CarrySetBuiltins.java

    r2956 r2963  
    88 */
    99
    10 package compilers.pabloB.lang.carry;
     10package compilers.pabloB.lang.carrySet;
    1111
    12 public enum CarryBuiltins {
    13         LOCALCARRYDECLARE(2),                          
    14         CARRYTEST(2),
    15         GETCARRYIN(1),
    16         GETPENDING64(1),
     12public enum CarrySetBuiltins {
     13        CARRYDECLARE(3),               
     14        CARRYRANGE(2),
     15        CARRYAT(1),
     16        PENDING64(1),
    1717        CARRYCOMBINE(3),
    18         CARRYQADJUST(2),
     18        CARRYADJUST(2),
    1919        CARRYFLIP(2),
    2020        CARRYDEQUEUEENQUEUE(2);
     
    2323        private final int argCount;
    2424               
    25         CarryBuiltins(int argCount ) {
     25        CarrySetBuiltins(int argCount ) {
    2626                this.argCount = argCount;
    2727        }
  • proto/pabloj/trunk/src/compilers/pabloB/lang/carrySet/CarrySetBuiltins2CPP.java

    r2956 r2963  
    66 */
    77
    8 package compilers.pabloB.lang.carry;
     8package compilers.pabloB.lang.carrySet;
    99
    1010import java.util.HashMap;
    1111import java.util.Map;
    1212
    13 public class CarryBuiltins2CPP extends CarryBuiltins2Lang {
     13public class CarrySetBuiltins2CPP extends CarrySetBuiltins2Lang {
    1414       
    15         private static Map<CarryBuiltins, String> carry2CPPCode;
     15        private static Map<CarrySetBuiltins, String> carry2CPPCode;
    1616       
    1717    static {
    18 
    19         CARRYSETDECLAREFORMATSTRING = "CarryArray<%s,%s> %s";
    20 
    21         carry2CPPCode = new HashMap<CarryBuiltins, String>();
    2218       
    23         carry2CPPCode.put(CarryBuiltins.LOCALCARRYDECLARE, "LocalCarryDeclare");
    24         carry2CPPCode.put(CarryBuiltins.CARRYTEST,"PabloJCarryTest");
    25         carry2CPPCode.put(CarryBuiltins.GETCARRYIN,"get_carry_in");
    26         carry2CPPCode.put(CarryBuiltins.GETPENDING64,"get_pending64");
    27         carry2CPPCode.put(CarryBuiltins.CARRYCOMBINE,"CarryCombine");
    28         carry2CPPCode.put(CarryBuiltins.CARRYQADJUST,"CarryQ_Adjust");
    29         carry2CPPCode.put(CarryBuiltins.CARRYDEQUEUEENQUEUE,"CarryDequeueEnqueue");
    30         carry2CPPCode.put(CarryBuiltins.CARRYFLIP,"carry_flip");
     19        carry2CPPCode = new HashMap<CarrySetBuiltins, String>();
     20        carry2CPPCode.put(CarrySetBuiltins.CARRYDECLARE, "CarryDeclare");
     21        carry2CPPCode.put(CarrySetBuiltins.CARRYRANGE,"CarryRange");
     22        carry2CPPCode.put(CarrySetBuiltins.CARRYAT,"CarryAt");
     23        carry2CPPCode.put(CarrySetBuiltins.PENDING64,"Pending64");
     24        carry2CPPCode.put(CarrySetBuiltins.CARRYCOMBINE,"CarryCombine");
     25        carry2CPPCode.put(CarrySetBuiltins.CARRYADJUST,"CarryAdjust");
     26        carry2CPPCode.put(CarrySetBuiltins.CARRYDEQUEUEENQUEUE,"CarryDequeueEnqueue");
     27        carry2CPPCode.put(CarrySetBuiltins.CARRYFLIP,"CarryFlip");
    3128        //carry2CPPCode.put(CarrySetBuiltins.VALUEOF,"cq[%s]");
    3229       
    33         for(CarryBuiltins op : CarryBuiltins.values()) {
     30        for(CarrySetBuiltins op : CarrySetBuiltins.values()) {
    3431                if(!carry2CPPCode.containsKey(op)) {
    35                                 throw new RuntimeException("CarrySet to CPP code mapping unimplemented :" + CarryBuiltins2CPP.class.getSimpleName());
     32                                throw new RuntimeException("CarrySet to CPP code mapping unimplemented :" + CarrySetBuiltins2CPP.class.getSimpleName());
    3633                }
    3734        }
    38        
    3935    }
    4036   
    41         public String getCode(CarryBuiltins op) {                       
     37        public String getCode(CarrySetBuiltins op) {                   
    4238                return carry2CPPCode.get(op);
    4339        }
  • proto/pabloj/trunk/src/compilers/pabloB/lang/carrySet/CarrySetBuiltins2Lang.java

    r2956 r2963  
    55 */
    66
    7 package compilers.pabloB.lang.carry;
     7package compilers.pabloB.lang.carrySet;
    88
    9 public abstract class CarryBuiltins2Lang {
    10         public abstract String getCode(CarryBuiltins op);
     9public abstract class CarrySetBuiltins2Lang {
     10        public abstract String getCode(CarrySetBuiltins op);
    1111       
    12         public static final String CARRYQNAME                                   = "carryQ";
    13         public static final String LOCALCARRYQNAME                              = "subcarryQ";
    14         public static final String LOCALCARRYQARRAYNAME                 = "cq";
     12        public static final String CARRYSET_BASENAME_PREFIX             = "carry_set_";
     13        public static final String CARRYSETBASENAME                             = CARRYSET_BASENAME_PREFIX + "0";
     14        //public static final String LOCALCARRYQNAME                            = "subcarryQ";
     15        public static final String CARRYQARRAYNAME                              = "cq";
    1516        public static   String CARRYSETDECLAREFORMATSTRING                      = null;
    1617       
  • proto/pabloj/trunk/src/compilers/pabloB/lang/carrySet/CarrySetInfoSet.java

    r2956 r2963  
    66 */
    77
    8 package compilers.pabloB.lang.carry;
     8package compilers.pabloB.lang.carrySet;
    99
    10 public class CarryInfoSet {
     10public class CarrySetInfoSet {
    1111
    1212        public static final String CARRY1STATENAME      = "carry1";
     
    1919       
    2020       
    21         public CarryInfoSet() {
     21        public CarrySetInfoSet() {
    2222                // C++ habits die hard
    2323        }
Note: See TracChangeset for help on using the changeset viewer.