From 92bdc21ddb9bb871600e6047fa24056476606d8c Mon Sep 17 00:00:00 2001
From: Alexandre Bique <alexandre.bique@citrix.com>
Date: Thu, 5 Mar 2009 20:34:48 +0000
Subject: [PATCH] factorised loop code

---
 src/ast/generator-data.cc               | 24 +++++++-------
 src/ast/llvm-generator-visitor.cc       | 37 +++++++--------------
 src/ast/llvm-generator-visitor.hh       |  1 +
 src/ast/simplify-visitor.cc             | 57 +++++++++++++--------------------
 src/lang/mugiwara/bison-parser/parser.y |  8 ++---
 5 files changed, 51 insertions(+), 76 deletions(-)

diff --git a/src/ast/generator-data.cc b/src/ast/generator-data.cc
index 7f76811..e440d90 100644
--- a/src/ast/generator-data.cc
+++ b/src/ast/generator-data.cc
@@ -253,28 +253,28 @@ const ag::Node ag::nodes[] = {
     }
   },
 
-  {"If", "Node", "If statement", {
+  {"ConditionalBranch", "Node", "Factorisation code for loops", {
       {"Exp *", "cond"},
-      {"Node *", "ifTrue"},
-      {"Node *", "ifFalse"},
+      {"Label *", "trueLabel"},
+      {"Label *", "falseLabel"},
+    },
+  },
+
+  {"If", "ConditionalBranch", "If statement", {
+      {"Node *", "trueBlock"},
+      {"Node *", "falseBlock"},
       {"Label *", "endLabel"}
     },
   },
 
-  {"While", "Node", "While statement", {
-      {"Exp *", "cond"},
+  {"While", "ConditionalBranch", "While statement", {
       {"Node *", "block"},
-      {"Label *", "beginLabel"},
-      {"Label *", "middleLabel"},
-      {"Label *", "endLabel"}
+      {"Label *", "beginLabel"}
     },
   },
 
-  {"DoWhile", "Node", "Do while statement", {
-      {"Exp *", "cond"},
+  {"DoWhile", "ConditionalBranch", "Do while statement", {
       {"Node *", "block"},
-      {"Label *", "beginLabel"},
-      {"Label *", "endLabel"}
     },
   },
 
diff --git a/src/ast/llvm-generator-visitor.cc b/src/ast/llvm-generator-visitor.cc
index 4c73864..787c7a1 100644
--- a/src/ast/llvm-generator-visitor.cc
+++ b/src/ast/llvm-generator-visitor.cc
@@ -263,37 +263,24 @@ namespace ast
     out_ << "  br label %" << node.label << std::endl;
   }
 
-  void
-  LLVMGeneratorVisitor::visit(const If & node)
-  {
-    assert(node.ifTrue->nodeType == Label::nodeTypeId());
-    assert(node.ifFalse->nodeType == Label::nodeTypeId());
-
-    Label * trueLabel = reinterpret_cast<Label *>(node.ifTrue);
-    Label * falseLabel = reinterpret_cast<Label *>(node.ifFalse);
-
-    out_ << "  br i1 ";
-    node.cond->accept(*this);
-    out_ << ", label %" << trueLabel->name << ", label %"
-         << falseLabel->name << std::endl;
+#define VISIT_COND_BRANCH(Type)                         \
+  void                                                  \
+  LLVMGeneratorVisitor::visit(const Type & node)        \
+  {                                                     \
+    visit((ConditionalBranch)node);                     \
   }
 
-  void
-  LLVMGeneratorVisitor::visit(const While & node)
-  {
-    out_ << "  br i1 ";
-    node.cond->accept(*this);
-    out_ << ", label %" << node.middleLabel->name << ", label %"
-         << node.endLabel->name << std::endl;
-  }
+  VISIT_COND_BRANCH(If)
+  VISIT_COND_BRANCH(While)
+  VISIT_COND_BRANCH(DoWhile)
 
   void
-  LLVMGeneratorVisitor::visit(const DoWhile & node)
+  LLVMGeneratorVisitor::visit(const ConditionalBranch & node)
   {
     out_ << "  br i1 ";
     node.cond->accept(*this);
-    out_ << ", label %" << node.beginLabel->name << ", label %"
-         << node.endLabel->name << std::endl;
+    out_ << ", label %" << node.trueLabel->name << ", label %"
+         << node.falseLabel->name << std::endl;
   }
 
   void
@@ -437,7 +424,7 @@ namespace ast
 
 #define FLOAT_TO_BOOL(Type, Str)                                        \
   void                                                                  \
-  LLVMGeneratorVisitor::cast##Type##ToBool(const ast::CastExp & node)   \
+  LLVMGeneratorVisitor::cast##Type##ToBool(const ast::CastExp & /*node*/) \
   {                                                                     \
     /** @todo throw a warning */                                        \
     assert_msg(false, "casting float to bool is a non sense.");         \
diff --git a/src/ast/llvm-generator-visitor.hh b/src/ast/llvm-generator-visitor.hh
index 63ef2ae..107d4a8 100644
--- a/src/ast/llvm-generator-visitor.hh
+++ b/src/ast/llvm-generator-visitor.hh
@@ -69,6 +69,7 @@ namespace ast
 
     virtual void visit(const Label & node);
     virtual void visit(const Goto & node);
+    virtual void visit(const ConditionalBranch & node);
     virtual void visit(const If & node);
     virtual void visit(const While & node);
     virtual void visit(const DoWhile & node);
diff --git a/src/ast/simplify-visitor.cc b/src/ast/simplify-visitor.cc
index 62efc74..b65879a 100644
--- a/src/ast/simplify-visitor.cc
+++ b/src/ast/simplify-visitor.cc
@@ -236,39 +236,26 @@ namespace ast
   void
   SimplifyVisitor::visit(If & node)
   {
-    assert(node.cond);
-    assert(node.ifTrue);
-
     node.cond->accept(*this);
     assert(replacement_);
     node.cond = replacement_;
 
     simplifications_.push_back(&node);
 
-#define EXPAND_BLOCK(True)                                              \
-    do {                                                                \
-      Label * True##Label = new Label;                                  \
-      True##Label->name = std::string(#True "Label_") + nextId();       \
-      simplifications_.push_back(True##Label);                          \
-                                                                        \
-      node.if##True->accept(*this);                                     \
-      if (node.if##True->nodeType == Block::nodeTypeId()) {             \
-        BOOST_FOREACH(Node * elt,                                       \
-                      *reinterpret_cast<Block *>(node.if##True)->statements) \
-          simplifications_.push_back(elt);                              \
-      }                                                                 \
-      node.if##True = True##Label;                                      \
-    } while (0)
-
-    EXPAND_BLOCK(True);
-
+    node.trueLabel = new Label;
+    node.trueLabel->name = std::string("if_true_") + nextId();
+    node.falseLabel = new Label;
+    node.falseLabel->name = std::string("if_false_") + nextId();
     node.endLabel = new Label;
-    node.endLabel->name = std::string("EndLabel_") + nextId();
+    node.endLabel->name = std::string("if_end_") + nextId();
+
+    simplifications_.push_back(node.trueLabel);
+    node.trueBlock->accept(*this);
     Goto * gotoNode = new Goto;
     gotoNode->label = node.endLabel->name;
-    simplifications_.push_back(gotoNode);
 
-    EXPAND_BLOCK(False);
+    simplifications_.push_back(node.falseLabel);
+    node.falseBlock->accept(*this);
     simplifications_.push_back(node.endLabel);
   }
 
@@ -280,23 +267,23 @@ namespace ast
 
     node.beginLabel = new Label;
     node.beginLabel->name = std::string("do_while_1_") + nextId();
-    node.middleLabel = new Label;
-    node.middleLabel->name = std::string("do_while_2_") + nextId();
-    node.endLabel = new Label;
-    node.endLabel->name = std::string("do_while_3_") + nextId();
+    node.trueLabel = new Label;
+    node.trueLabel->name = std::string("do_while_2_") + nextId();
+    node.falseLabel = new Label;
+    node.falseLabel->name = std::string("do_while_3_") + nextId();
 
     simplifications_.push_back(node.beginLabel);
     node.cond->accept(*this);
     node.cond = replacement_;
     simplifications_.push_back(&node);
-    simplifications_.push_back(node.middleLabel);
+    simplifications_.push_back(node.trueLabel);
     node.block->accept(*this);
     node.block = replacement_;
 
     Goto * gt = new Goto;
     gt->label = node.beginLabel->name;
     simplifications_.push_back(gt);
-    simplifications_.push_back(node.endLabel);
+    simplifications_.push_back(node.falseLabel);
   }
 
   void
@@ -305,11 +292,11 @@ namespace ast
     assert(node.block);
     assert(node.cond);
 
-    node.beginLabel = new Label;
-    node.beginLabel->name = std::string("do_while_1_") + nextId();
-    node.endLabel = new Label;
-    node.endLabel->name = std::string("do_while_2_") + nextId();
-    simplifications_.push_back(node.beginLabel);
+    node.trueLabel = new Label;
+    node.trueLabel->name = std::string("do_while_1_") + nextId();
+    node.falseLabel = new Label;
+    node.falseLabel->name = std::string("do_while_2_") + nextId();
+    simplifications_.push_back(node.trueLabel);
 
     node.block->accept(*this);
     node.block = replacement_;
@@ -318,6 +305,6 @@ namespace ast
 
     replacement_ = 0;
     simplifications_.push_back(&node);
-    simplifications_.push_back(node.endLabel);
+    simplifications_.push_back(node.falseLabel);
   }
 }
diff --git a/src/lang/mugiwara/bison-parser/parser.y b/src/lang/mugiwara/bison-parser/parser.y
index 2af3e50..6a8118e 100644
--- a/src/lang/mugiwara/bison-parser/parser.y
+++ b/src/lang/mugiwara/bison-parser/parser.y
@@ -215,10 +215,10 @@ if_statement: IF LPAR exp RPAR statement else_statement {
   assert($3);
   assert($5);
   assert($6);
-  ifStmt->cond    = $3;
-  ifStmt->ifTrue  = $5;
-  ifStmt->ifFalse = $6;
-  $$              = ifStmt;
+  ifStmt->cond       = $3;
+  ifStmt->trueBlock  = $5;
+  ifStmt->falseBlock = $6;
+  $$                 = ifStmt;
 };
 
 while_statement: WHILE LPAR exp RPAR statement {
-- 
2.11.4.GIT