Changeset 2444


Ignore:
Timestamp:
Oct 12, 2012, 4:36:48 PM (7 years ago)
Author:
ksherdy
Message:

Minor updates.

Location:
proto/pablo
Files:
3 deleted
7 edited

Legend:

Unmodified
Added
Removed
  • proto/pablo/runConfigurations/pabloCompiler.launch

    r2415 r2444  
    99</listAttribute>
    1010<stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value="compiler.PabloCompiler"/>
    11 <stringAttribute key="org.eclipse.jdt.launching.PROGRAM_ARGUMENTS" value="${workspace_loc}/pablo/input/test/pablo/visitors/Bitwise2IDISA/bitwise2IDISA.pablo"/>
     11<stringAttribute key="org.eclipse.jdt.launching.PROGRAM_ARGUMENTS" value="${workspace_loc}/pablo/input/test/pablo/visitors/CarryIntro/atEOF.pablo"/>
    1212<stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="pablo"/>
    1313<stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-ea"/>
  • proto/pablo/src/compiler/PabloCompiler.java

    r2418 r2444  
    4949               
    5050                for (Map.Entry<String, ASTNode> entry : streamFunctionMap.entrySet()) {
    51 /*                     
    52                     AdvanceCombiner advanceCombiner = new AdvanceCombiner(entry.getValue());
    53                     advanceCombiner.transform();
    54                     CarryCounter carryCounter = new CarryCounter(entry.getValue());
    55                     AdvanceNCounter advNCounter = new AdvanceNCounter(entry.getValue());
    5651                       
    57                         System.out.println(entry.getKey());
    58                         System.out.println("Carry Count = " + carryCounter.count());
    59                         System.out.println("Adv n Count = " + advNCounter.count());
    60                         System.out.println();
     52//                  AdvanceCombiner advanceCombiner = new AdvanceCombiner(entry.getValue());
     53//                  advanceCombiner.transform();
     54//                  CarryCounter carryCounter = new CarryCounter(entry.getValue());
     55//                  AdvanceNCounter advNCounter = new AdvanceNCounter(entry.getValue());
     56                       
     57//                      System.out.println(entry.getKey());
     58//                      System.out.println("Carry Count = " + carryCounter.count());
     59//                      System.out.println("Adv n Count = " + advNCounter.count());
     60//                      System.out.println();
    6161
    62                         Bitwise2IDISA bitwiseToIDISA = new Bitwise2IDISA(entry.getValue());
    63                         bitwiseToIDISA.transform();
    64 */
    65                         AugmentedAssignmentRemoval augmentedAssignmentRemoval = new AugmentedAssignmentRemoval(entry.getValue());
    66                         augmentedAssignmentRemoval.transform();
     62//                      Bitwise2IDISA bitwiseToIDISA = new Bitwise2IDISA(entry.getValue());
     63//                      bitwiseToIDISA.transform();
     64//
     65//                      AugmentedAssignmentRemoval augmentedAssignmentRemoval = new AugmentedAssignmentRemoval(entry.getValue());
     66//                      augmentedAssignmentRemoval.transform();
     67
     68                        CarryIntro carryIntro = new CarryIntro(entry.getValue());
     69                        carryIntro.transform(true, false);                     
    6770                }
    6871
  • proto/pablo/src/compiler/codeGeneration/CPlusPlusContentGenerator.java

    r2421 r2444  
    22
    33import java.io.PrintStream;
    4 import java.util.ArrayList;
    5 import java.util.Collections;
    6 import java.util.Comparator;
    7 import java.util.HashSet;
    8 import java.util.List;
    9 import java.util.Set;
    10 
    114import compiler.templating.Template;
    12 
    13 import lexicalAnalyzer.Lextant;
    14 
    155import ast.*;
    166
  • proto/pablo/src/compiler/codeGeneration/CarryQ.java

    r2434 r2444  
    1313                CARRYFLIP("carry_flip",1),
    1414                CARRYDEQUEUEENQUEUE("CarryDequeueEnqueue",2),
    15                 VALUEOF("cq[%i]",1);
     15                VALUEOF("cq[%d]",1);
    1616                               
    1717                private final String cName;
  • proto/pablo/src/compiler/lang/idisa/SIMD.java

    r2414 r2444  
    4646        private static final String SIMD = "simd";
    4747       
    48         public String getFunctionName() { return (SIMD + "_" + name); }
    49         public String getFunctionName(int fieldWidth) { return (SIMD + "<" + Integer.toString(fieldWidth) + ">::" + name); }
    50         public String getConstantFunctionName(int fieldWidth, int constant) {
     48        public String idisaName() { return (SIMD + "_" + name); }
     49        public String idisaName(int fieldWidth) { return (SIMD + "<" + Integer.toString(fieldWidth) + ">::" + name); }
     50        public String idisaConstantName(int fieldWidth, int constant) {
    5151                return (SIMD + "<" + Integer.toString(fieldWidth) + ">::" + CONSTANT.name + "<" + Integer.toString(constant) +">");
    5252        }
  • proto/pablo/src/compiler/lang/pablo/builtins/CarryN.java

    r2436 r2444  
    44
    55    ADVANCE32("Advance32", 1, "BitBlock_advance_n_<32>"),
    6     ADVANCE("Advance", 2, "BitBlock_advance_n_<%i>");
    7    
     6    ADVANCE("Advance", 2, "BitBlock_advance_n_<%d>");
    87        private final String pabloName;
    98        private final int argCount;
  • proto/pablo/src/compiler/templating/MemoryTemplate.java

    r2421 r2444  
    66import java.util.List;
    77import java.util.Map;
    8 
    9 import logging.ScatterLogger;
    108
    119public class MemoryTemplate implements Template {
Note: See TracChangeset for help on using the changeset viewer.