Refactor IR function representation.

Now, ir_function is emitted as part of the IR instructions, rather than
simply existing in the symbol table.  Individual ir_function_signatures
are not emitted themselves, but only as part of ir_function.

1 files changed, 10 insertions, 2 deletions

diff --git a/ir_print_visitor.cpp b/ir_print_visitor.cpp
index 908f1c3ad8..5d98937c9c 100644
--- a/ir_print_visitor.cpp
+++ b/ir_print_visitor.cpp
@@ -75,14 +75,14 @@ void ir_print_visitor::visit(ir_label *ir)
 
 void ir_print_visitor::visit(ir_function_signature *ir)
 {
-   printf("(paramaters\n");
+   printf("(signature\n  (parameters\n");
    foreach_iter(exec_list_iterator, iter, ir->parameters) {
       ir_variable *const inst = (ir_variable *) iter.get();
 
       inst->accept(this);
       printf("\n");
    }
-   printf(")\n");
+   printf("  )\n(");
 
    foreach_iter(exec_list_iterator, iter, ir->body) {
       ir_instruction *const inst = (ir_instruction *) iter.get();
@@ -90,12 +90,20 @@ void ir_print_visitor::visit(ir_function_signature *ir)
       inst->accept(this);
       printf("\n");
    }
+   printf("))\n");
 }
 
 
 void ir_print_visitor::visit(ir_function *ir)
 {
    printf("(function %s\n", ir->name);
+   foreach_iter(exec_list_iterator, iter, *ir) {
+      ir_function_signature *const sig = (ir_function_signature *) iter.get();
+
+      sig->accept(this);
+      printf("\n");
+   }
+
    printf(")\n");
 }