Changeset 3370

Timestamp:

Jun 27, 2013, 5:29:25 PM (6 years ago)

Author:

ksherdy

Message:

Added assert_0 call.

Location:

proto/pabloj/trunk/src/toolchain

Files:

• pabloB/codeGenerator/visitors/Unparser.java (modified) (2 diffs)
• pabloS/transformer/visitors/pabloS2PabloB/CarryIntroXFormer.java (modified) (3 diffs)
• pabloS/transformer/visitors/pabloS2PabloB/PabloS2PabloBController.java (modified) (1 diff)
• pabloS/transformer/visitors/pabloS2PabloB/PabloS2PabloBXFormer.java (modified) (2 diffs)
• pabloS/transformer/visitors/pabloS2PabloB/SurroundConditionsWithBitBlockAny.java (deleted)
• pabloS/transformer/visitors/pabloS2pabloS/PabloS2SPabloController.java (modified) (1 diff)
• pabloS/transformer/visitors/pabloS2pabloS/SurroundAssert0sWithIfs.java (modified) (1 diff)
• pabloS/transformer/visitors/pabloS2pabloS/TempifyCarrySetBuiltinCalls.java (moved) (moved from proto/pabloj/trunk/src/toolchain/pabloS/transformer/visitors/pabloS2PabloB/TempifyCarrySetBuiltinCalls.java) (2 diffs)

proto/pabloj/trunk/src/toolchain/pabloB/codeGenerator/visitors/Unparser.java

@@ -306 +306 @@
                 resultVar.append(")");
                 
-                code.setResultVarName(resultVar.toString());            // Function invocation as an expression 
-                
-                code.addFormattedLine("%s;", resultVar.toString()); // Function invocation as a statement
+                code.setResultVarName(resultVar.toString());            // function invocation as an expression 
+                
+                code.addFormattedLine("%s;", resultVar.toString()); // function invocation as a statement
                 
                 return code;
@@ -322 +322 @@
         public CodeStore visitLeave(IdisaFuncCallNode node, List<CodeStore> childResults) { 
                 CodeStore code = new CodeStore();
-                
-                System.out.println(node);
                 
                 String idisaFullyQualifiedName  = childResults.get(0).getResultVarName();

proto/pabloj/trunk/src/toolchain/pabloS/transformer/visitors/pabloS2PabloB/CarryIntroXFormer.java

@@ -61 +61 @@
 public class CarryIntroXFormer {            
     
-    private static boolean isTempified = false;
+//    private static boolean isTempified = false;
     
     private static ASTNode TempifyOnce(ASTNode ASTree) {
-        if(!isTempified) {
-            isTempified = true;
-            return TempifyCarrySetBuiltinCalls.apply(ASTree);
-        }
+//        if(!isTempified) {
+//            isTempified = true;
+//            return TempifyCarrySetBuiltinCalls.apply(ASTree);
+//        }
         return ASTree;
     }
@@ -74 +74 @@
         
         ASTNode xTree = apply(root, builtinEncoder, carrySetEncoder, finalBlockMode, true, 0);
-        isTempified = false;
+//        isTempified = false;
         return xTree;
     }
@@ -198 +198 @@
                 public void visitLeave(FuncCallNode node) {
                         if(BuiltinCallUtil.isCarryNone(node)) {
-                                PabloSBuiltin builtin = BuiltinCallUtil.builtin(node);
-                                Counter counter = selectCounter(builtin, carryCounter, advanceNCounter);
-                                PabloSBuiltinTranslator translator = builtin.getTranslator();
-                                translator.translate(builtin, node, counter, context);
+                            if(!BuiltinCallUtil.isAssertZero(node)) {
+                            
+                                PabloSBuiltin builtin = BuiltinCallUtil.builtin(node);
+
+
+
+                                Counter counter = selectCounter(builtin, carryCounter, advanceNCounter);
+                                PabloSBuiltinTranslator translator = builtin.getTranslator();
+
+
+
+                                translator.translate(builtin, node, counter, context);
+                            }
                         }       
                 }

proto/pabloj/trunk/src/toolchain/pabloS/transformer/visitors/pabloS2PabloB/PabloS2PabloBController.java

@@ -36 +36 @@
             
         pabloS.ast.ASTNode decoratedTree = ASTree.deepCopy();
-        decoratedTree = SurroundAssert0sWithIfs.apply(decoratedTree, builtinEncoder);      
+        
+        //decoratedTree = SurroundAssert0sWithIfs.apply(decoratedTree, builtinEncoder);      
+        
         decoratedTree = CarryIntroXFormer.apply(decoratedTree, builtinEncoder, carrySetEncoder, finalBlockMode);
+        
         //decoratedTree = SurroundConditionsWithBitBlockAny.apply(decoratedTree);
         //decoratedTree = BitwiseBoolean2IDISA.apply(decoratedTree); 

proto/pabloj/trunk/src/toolchain/pabloS/transformer/visitors/pabloS2PabloB/PabloS2PabloBXFormer.java

@@ -282 +282 @@
             
             String assert0CallName                  = builtinEncoder.getName(PabloSBuiltin.ASSERT_ZERO);
-            pabloB.ast.ASTNode errorStream          = childResults.get(1).deepCopy();
-            pabloB.ast.ASTNode errorMsg             = childResults.get(2).deepCopy();
+            pabloB.ast.ASTNode errorStream          = childResults.get(1).child(0).deepCopy();
+            pabloB.ast.ASTNode errorMsg             = childResults.get(1).child(1).deepCopy();
             
             pabloB.ast.ASTNode assert0Call          = Generators.makeFuncCallNode(locator, 
@@ -291 +291 @@
           
             BlockStmtNode blockStmt                 = Generators.makeBlockStmtNode(locator, assert0Call);
-            pabloB.ast.ASTNode replacement          = Generators.makeIfStmtNode(locator,
+            IfStmtNode replacement                  = Generators.makeIfStmtNode(locator,
                                                               errorStream.deepCopy(), 
                                                               blockStmt);
+            
+            surroundConditionWithBitBlockAny(replacement, Accessors.condition(replacement));
+
             return replacement;
         }

proto/pabloj/trunk/src/toolchain/pabloS/transformer/visitors/pabloS2pabloS/PabloS2SPabloController.java

@@ -16 +16 @@
         decoratedTree = ExpandAugmentedAssignments.apply(decoratedTree);
         decoratedTree = CombineAdvances.apply(decoratedTree);
+        decoratedTree = TempifyCarrySetBuiltinCalls.apply(decoratedTree);
         return decoratedTree;
         }       

proto/pabloj/trunk/src/toolchain/pabloS/transformer/visitors/pabloS2pabloS/SurroundAssert0sWithIfs.java

@@ -58 +58 @@
                                 
                                 node.updateSelf(ifStmt);
+                                
+                                System.out.println(node);
+                                System.exit(1);
                         }       
                 }

proto/pabloj/trunk/src/toolchain/pabloS/transformer/visitors/pabloS2pabloS/TempifyCarrySetBuiltinCalls.java

@@ -42 +42 @@
  *   
  */
-package toolchain.pabloS.transformer.visitors.pabloS2PabloB;
+package toolchain.pabloS.transformer.visitors.pabloS2pabloS;
 
 import java.util.LinkedHashMap;
@@ -57 +57 @@
 import static toolchain.util.MapUtil.*;
 
-import toolchain.pabloS.transformer.visitors.pabloS2pabloS.SplitVarDeclInits;
 public class TempifyCarrySetBuiltinCalls {