Changeset 4101 for proto

Timestamp:

Aug 30, 2014, 10:42:34 PM (5 years ago)

Author:

ksherdy

Message:

Tempify IDISA calls.

File:

• proto/s2k/trunk/framework/src/toolchain/s2k/transformer/visitors/S2K2S2K/TempifyCarrySetBuiltinCalls.java (modified) (4 diffs)

proto/s2k/trunk/framework/src/toolchain/s2k/transformer/visitors/S2K2S2K/TempifyCarrySetBuiltinCalls.java

@@ -1 +1 @@
 /*
- * Converts carry generating builtins expressions to compiled form.
+ * Converts carry generating builtins expressions to a compiled form.
  * Applied before carry variable insertion.
  *
@@ -53 +53 @@
 import toolchain.s2k.ast.Generators;
 import toolchain.s2k.lang.builtin.S2KBuiltinsUtil;
+import toolchain.s2k.lang.builtin.S2KBuiltins.CarryType;
 import toolchain.util.Labeller;
 import toolchain.util.Pair;
+import static toolchain.s2k.lang.signatures.SignatureShorthand.sig_II_S;
+import static toolchain.s2k.lang.signatures.SignatureShorthand.sig_ST_V;
+import static toolchain.s2k.lang.signatures.SignatureShorthand.sig_S_S;
 import static toolchain.util.MapUtil.*;
 
@@ -132 +136 @@
             
             
-            if(S2KBuiltinsUtil.isCarry(node)) {
+            if(S2KBuiltinsUtil.isCarry(node)) { // KH: bug to fix 
                 
                 if(!(node.getParent() instanceof AssignNode)) {
@@ -151 +155 @@
         }
         
+        public void visitLeave(IdisaFuncCallNode node) { 
+            if(!(node.getParent() instanceof AssignNode)) {
+            
+                BlockStmtNode blockStmt          = Accessors.getEnclosingBlockStmt(node);
+                Locator locator                  = blockStmt;
+                IdentifierNode name              = Generators.makeIdentifierNode(locator, labeller.newLabel());
+                StreamTypeNode type              = Generators.makeStreamType(locator);
+                VarDeclNode varDecl              = Generators.makeVarDeclNode(locator, type, name.deepCopy());
+                AssignNode assignStmt            = Generators.makeAssignNode(locator, name.deepCopy(), node.deepCopy());
+
+                addValueToList(enclBlockStmtTempDecls, blockStmt, varDecl);
+                addValueToList(enclBlockStmtTempAssigns, blockStmt, assignStmt);
+
+                node.updateSelf(name);                
+            }
+        }        
+        
         //////////////////////////////////////////////////////////////
         // helpers