ir_visit_tree is no longer used, remove ir_visit_tree.{cpp,h}

diff --git a/Makefile.am b/Makefile.am
index aa050217b242d69197e569d9faac506952273d74..42f0ae557ef62f592442ef636132cb926373c3ac 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -45,8 +45,6 @@ glsl_SOURCES = \
        ir_if_simplification.cpp \
        ir_optimization.h \
        ir_reader.cpp s_expression.cpp \
-       ir_visit_tree.cpp \
-       ir_visit_tree.h \
        ir_hv_accept.cpp \
        ir_hierarchical_visitor.h \
        ir_hierarchical_visitor.cpp

diff --git a/ir_visit_tree.cpp b/ir_visit_tree.cpp
deleted file mode 100644 (file)
index b94c1b0..0000000
--- a/ir_visit_tree.cpp
+++ /dev/null
@@ -1,208 +0,0 @@
-/*
- * Copyright © 2010 Intel Corporation
- *
- * Permission is hereby granted, free of charge, to any person obtaining a
- * copy of this software and associated documentation files (the "Software"),
- * to deal in the Software without restriction, including without limitation
- * the rights to use, copy, modify, merge, publish, distribute, sublicense,
- * and/or sell copies of the Software, and to permit persons to whom the
- * Software is furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice (including the next
- * paragraph) shall be included in all copies or substantial portions of the
- * Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
- * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
- * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
- * DEALINGS IN THE SOFTWARE.
- */
-
-/**
- * \file ir_dead_code.cpp
- *
- * Eliminates dead assignments and variable declarations from the code.
- */
-
-#define NULL 0
-#include "ir.h"
-#include "ir_visitor.h"
-#include "ir_visit_tree.h"
-
-class ir_tree_visitor : public ir_visitor {
-public:
-
-   /**
-    * \name Visit methods
-    *
-    * As typical for the visitor pattern, there must be one \c visit method for
-    * each concrete subclass of \c ir_instruction.  Virtual base classes within
-    * the hierarchy should not have \c visit methods.
-    */
-   /*@{*/
-   virtual void visit(ir_variable *);
-   virtual void visit(ir_loop *);
-   virtual void visit(ir_loop_jump *);
-   virtual void visit(ir_function_signature *);
-   virtual void visit(ir_function *);
-   virtual void visit(ir_expression *);
-   virtual void visit(ir_swizzle *);
-   virtual void visit(ir_dereference *);
-   virtual void visit(ir_assignment *);
-   virtual void visit(ir_constant *);
-   virtual void visit(ir_call *);
-   virtual void visit(ir_return *);
-   virtual void visit(ir_if *);
-   /*@}*/
-
-   void (*callback)(ir_instruction *ir, void *data);
-   void *data;
-};
-
-void
-ir_tree_visitor::visit(ir_variable *ir)
-{
-   this->callback(ir, this->data);
-}
-
-
-void
-ir_tree_visitor::visit(ir_loop *ir)
-{
-   this->callback(ir, this->data);
-
-   visit_exec_list(&ir->body_instructions, this);
-   if (ir->from)
-      ir->from->accept(this);
-   if (ir->to)
-      ir->to->accept(this);
-   if (ir->increment)
-      ir->increment->accept(this);
-}
-
-void
-ir_tree_visitor::visit(ir_loop_jump *ir)
-{
-   this->callback(ir, this->data);
-}
-
-
-void
-ir_tree_visitor::visit(ir_function_signature *ir)
-{
-   this->callback(ir, this->data);
-
-   visit_exec_list(&ir->body, this);
-}
-
-void
-ir_tree_visitor::visit(ir_function *ir)
-{
-   this->callback(ir, this->data);
-
-   /* FINISHME: Do we want to walk into functions? */
-}
-
-void
-ir_tree_visitor::visit(ir_expression *ir)
-{
-   unsigned int operand;
-
-   this->callback(ir, this->data);
-
-   for (operand = 0; operand < ir->get_num_operands(); operand++) {
-      ir->operands[operand]->accept(this);
-   }
-}
-
-
-void
-ir_tree_visitor::visit(ir_swizzle *ir)
-{
-   this->callback(ir, this->data);
-
-   ir->val->accept(this);
-}
-
-
-void
-ir_tree_visitor::visit(ir_dereference *ir)
-{
-   this->callback(ir, this->data);
-
-   if (ir->mode == ir_dereference::ir_reference_array) {
-      ir->selector.array_index->accept(this);
-   }
-   ir->var->accept(this);
-}
-
-void
-ir_tree_visitor::visit(ir_assignment *ir)
-{
-   this->callback(ir, this->data);
-
-   ir->lhs->accept(this);
-   ir->rhs->accept(this);
-   if (ir->condition)
-      ir->condition->accept(this);
-}
-
-
-void
-ir_tree_visitor::visit(ir_constant *ir)
-{
-   this->callback(ir, this->data);
-}
-
-
-void
-ir_tree_visitor::visit(ir_call *ir)
-{
-   this->callback(ir, this->data);
-
-   foreach_iter(exec_list_iterator, iter, *ir) {
-      ir_rvalue *param = (ir_rvalue *)iter.get();
-
-      param->accept(this);
-   }
-}
-
-
-void
-ir_tree_visitor::visit(ir_return *ir)
-{
-   ir_rvalue *val = ir->get_value();
-
-   this->callback(ir, this->data);
-
-   if (val)
-      val->accept(this);
-}
-
-
-void
-ir_tree_visitor::visit(ir_if *ir)
-{
-   this->callback(ir, this->data);
-
-   ir->condition->accept(this);
-
-   visit_exec_list(&ir->then_instructions, this);
-   visit_exec_list(&ir->else_instructions, this);
-}
-
-void ir_visit_tree(ir_instruction *ir,
-                  void (*callback)(ir_instruction *ir,
-                                   void *data),
-                  void *data)
-{
-   ir_tree_visitor v;
-   v.callback = callback;
-   v.data = data;
-
-   ir->accept(&v);
-}
-

diff --git a/ir_visit_tree.h b/ir_visit_tree.h
deleted file mode 100644 (file)
index 2467278..0000000
--- a/ir_visit_tree.h
+++ /dev/null
@@ -1,27 +0,0 @@
-/*
- * Copyright © 2010 Intel Corporation
- *
- * Permission is hereby granted, free of charge, to any person obtaining a
- * copy of this software and associated documentation files (the "Software"),
- * to deal in the Software without restriction, including without limitation
- * the rights to use, copy, modify, merge, publish, distribute, sublicense,
- * and/or sell copies of the Software, and to permit persons to whom the
- * Software is furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice (including the next
- * paragraph) shall be included in all copies or substantial portions of the
- * Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
- * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
- * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
- * DEALINGS IN THE SOFTWARE.
- */
-
-void ir_visit_tree(ir_instruction *ir,
-                  void (*callback)(ir_instruction *ir,
-                                   void *data),
-                  void *data);