Remove debug spew

1 files changed, 29 insertions, 59 deletions

diff --git a/optimize.c b/optimize.c
index d34d375..d90a559 100644
--- a/optimize.c
+++ b/optimize.c
@@ -34,8 +34,7 @@ remove_nops (node_t *node, gboolean *changed)
 	    n->common.type == NODE_FUN_REF)
 	{
 	    
-	    printf ("triggered at line %d\n", __LINE__);
-	    (*changed)++;
+	    *changed = TRUE;
 	    
 	    if (next)
 		next->common.prev = prev;
@@ -141,8 +140,7 @@ peephole (node_t *node,
 	    nop_node (node, 0);
 	    nop_node (node, 2);
 	    
-	    printf ("triggered at line %d\n", __LINE__);
-	    (*changed)++;
+	    *changed = TRUE;
 	}
 	else if (node_is (node0, NODE_DUP)			&&
 		 node_is (node1, NODE_LOAD)			&&
@@ -152,8 +150,7 @@ peephole (node_t *node,
 	    nop_node (node, 0);
 	    nop_node (node, 3);
 	    
-	    printf ("triggered at line %d\n", __LINE__);
-	    (*changed)++;
+	    *changed = TRUE;
 	}
 	else if (node_is (node0, NODE_DUP)			&&
 		 node_is (node1, NODE_LITERAL)			&&
@@ -164,8 +161,7 @@ peephole (node_t *node,
 	    nop_node (node, 0);
 	    nop_node (node, 4);
 
-	    printf ("triggered at line %d\n", __LINE__);
-	    (*changed)++;
+	    *changed = TRUE;
 	}
 	else if (node_is (node0, NODE_DUP)			&&
 		 node_is (node1, NODE_LOAD)			&&
@@ -176,8 +172,7 @@ peephole (node_t *node,
 	    nop_node (node, 0);
 	    nop_node (node, 4);
 	    
-	    printf ("triggered at line %d\n", __LINE__);
-	    (*changed)++;
+	    *changed = TRUE;
 	}
 	else if (node_is (node0, NODE_IF)			&&
 		 node_is (node1, NODE_GOTO)			&&
@@ -194,8 +189,7 @@ peephole (node_t *node,
 	{
 	    nop_node (node, 0);
 	    
-	    printf ("triggered at line %d\n", __LINE__);
-	    (*changed)++;
+	    *changed = TRUE;
 	}
 	else if (node_is (node0, NODE_LABEL)			&&
 		 node_is (node1, NODE_LABEL))
@@ -212,8 +206,7 @@ peephole (node_t *node,
 	    
 	    nop_node (node, 0);
 	    
-	    printf ("triggered at line %d\n", __LINE__);
-	    (*changed)++;
+	    *changed = TRUE;
 	}
 	else if (node_is (node0, NODE_GOTO)			&&
 		 !node_is (node1, NODE_LABEL)			&&
@@ -222,8 +215,7 @@ peephole (node_t *node,
 	{
 	    nop_node (node, 1);
 	    
-	    printf ("triggered at line %d\n", __LINE__);
-	    (*changed)++;
+	    *changed = TRUE;
 	}
 	else if (node_is (node0, NODE_GOTO)			&&
 		 node_is (node1, NODE_LABEL)			&&
@@ -231,8 +223,7 @@ peephole (node_t *node,
 	{
 	    nop_node (node, 0);
 	    
-	    printf ("triggered at line %d\n", __LINE__);
-	    (*changed)++;
+	    *changed = TRUE;
 	}
 	else if (node_is (node0, NODE_UNARY)			&&
 		 node_is (node1, NODE_UNARY)			&&
@@ -242,8 +233,7 @@ peephole (node_t *node,
 	    nop_node (node, 0);
 	    nop_node (node, 1);
 	    
-	    printf ("triggered at line %d\n", __LINE__);
-	    (*changed)++;
+	    *changed = TRUE;
 	}
 	else if (node_is (node0, NODE_LABEL)			&&
 		 node_is (node1, NODE_GOTO)			&&
@@ -260,8 +250,7 @@ peephole (node_t *node,
 	    
 	    nop_node (node, 0);
 	    
-	    printf ("triggered at line %d\n", __LINE__);
-	    (*changed)++;
+	    *changed = TRUE;
 	}
 	else if (node_is (node0, NODE_LITERAL)			&&
 		 node_is (node1, NODE_IF))
@@ -272,8 +261,7 @@ peephole (node_t *node,
 	    nop_node (node0, 0);
 	    nop_node (node1, 0);
 	    
-	    printf ("triggered at line %d\n", __LINE__);
-	    (*changed)++;
+	    *changed = TRUE;
 	}
 	else if (node_is (node0, NODE_IF)			&&
 		 node_is (node1, NODE_LABEL)			&&
@@ -283,16 +271,14 @@ peephole (node_t *node,
 	    
 	    nop_node (node0, 0);
 	    
-	    printf ("triggered at line %d\n", __LINE__);
-	    (*changed)++;
+	    *changed = TRUE;
 	}
 	else if (node_is (node0, NODE_UNARY)			&&
 		 node_is (node1, NODE_POP))
 	{
 	    nop_node (node, 0);
 	    
-	    printf ("triggered at line %d\n", __LINE__);
-	    (*changed)++;
+	    *changed = TRUE;
 	}
 	else if (node_is (node0, NODE_LOAD)				&&
 		 node_is (node1, NODE_POP))
@@ -300,8 +286,7 @@ peephole (node_t *node,
 	    nop_node (node, 0);
 	    nop_node (node, 1);
 	    
-	    printf ("triggered at line %d\n", __LINE__);
-	    (*changed)++;
+	    *changed = TRUE;
 	}
 	else if (node_is (node0, NODE_IF)				&&
 		 node_is (node1, NODE_GOTO)				&&
@@ -311,16 +296,14 @@ peephole (node_t *node,
 	    
 	    nop_node (node0, 0);
 	    
-	    printf ("triggered at line %d\n", __LINE__);
-	    (*changed)++;
+	    *changed = TRUE;
 	}
 	else if (node_is (node0, NODE_BINOP)			&&
 		 node_is (node1, NODE_POP))
 	{
 	    node0->common.type = NODE_POP;
 	    
-	    printf ("triggered at line %d\n", __LINE__);
-	    (*changed)++;
+	    *changed = TRUE;
 	}
 	else if (node_is (node0, NODE_LITERAL)			&&
 		 node_is (node1, NODE_POP))
@@ -328,8 +311,7 @@ peephole (node_t *node,
 	    nop_node (node, 0);
 	    nop_node (node, 1);
 	    
-	    printf ("triggered at line %d\n", __LINE__);
-	    (*changed)++;
+	    *changed = TRUE;
 	}
 	else if (node_is (node0, NODE_DUP)				&&
 		 node_is (node1, NODE_IF)				&&
@@ -345,8 +327,7 @@ peephole (node_t *node,
 	    nop_node (node2, 0);
 	    nop_node (node1, 0);
 	    
-	    printf ("triggered at line %d\n", __LINE__);
-	    (*changed)++;
+	    *changed = TRUE;
 	}
 	else if (node_is (node0, NODE_DYN_LABEL)			&&
 		 node_is (node1, NODE_DYN_GOTO)			&&
@@ -359,8 +340,7 @@ peephole (node_t *node,
 	    nop_node (node0, 0);
 	    nop_node (node1, 0);
 	    
-	    printf ("triggered at line %d\n", __LINE__);
-	    (*changed)++;
+	    *changed = TRUE;
 	}
 	else if (node_is (node0, NODE_DUP)				&&
 		 node_is (node1, NODE_IF)				&&
@@ -389,8 +369,7 @@ peephole (node_t *node,
 	    nop_node (node1, 0);
 	    nop_node (node2, 0);
 	    
-	    printf ("triggered at line %d\n", __LINE__);
-	    (*changed)++;
+	    *changed = TRUE;
 	}
 	else if (node_is (node0, NODE_UNARY)		&&
 		 node0->unary.operator == AST_UNARY_NOT	&&
@@ -400,8 +379,7 @@ peephole (node_t *node,
 	    
 	    nop_node (node0, 0);
 	    
-	    printf ("triggered at line %d\n", __LINE__);
-	    (*changed)++;
+	    *changed = TRUE;
 	}
 	else if (node_is (node0, NODE_LITERAL)			&&
 		 node_is (node1, NODE_GOTO)				&&
@@ -424,24 +402,21 @@ peephole (node_t *node,
 	    nop_node (node0, 0);
 	    nop_node (node1, 0);
 	    
-	    printf ("triggered at line %d\n", __LINE__);
-	    (*changed)++;
+	    *changed = TRUE;
 	}
 	else if (node_is (node0, NODE_STORE)	&&
 		 !node0->store.definition->used)
 	{
 	    node0->common.type = NODE_POP;
 	    
-	    printf ("triggered at line %d\n", __LINE__);
-	    (*changed)++;
+	    *changed = TRUE;
 	}
 	else if (node_is (node0, NODE_STORE_IND)	&&
 		 !node0->store_ind.definition->used)
 	{
 	    node0->common.type = NODE_POP;
 	    
-	    printf ("triggered at line %d\n", __LINE__);
-	    (*changed)++;
+	    *changed = TRUE;
 	}
 	else if (node_is (node0, NODE_STORE)			&&
 		 node_is (node1, NODE_LOAD)			&&
@@ -457,8 +432,7 @@ peephole (node_t *node,
 	    nop_node (node0, 0);
 	    nop_node (node1, 0);
 	    
-	    printf ("triggered at line %d\n", __LINE__);
-	    (*changed)++;
+	    *changed = TRUE;
 	}
 	else if (node_is (node0, NODE_DUP) &&
 		 node_is (node1, NODE_POP))
@@ -466,8 +440,7 @@ peephole (node_t *node,
 	    nop_node (node0, 0);
 	    nop_node (node1, 0);
 	    
-	    printf ("triggered at line %d\n", __LINE__);
-	    (*changed)++;
+	    *changed = TRUE;
 	}
 	else if (node_is (node0, NODE_LITERAL) &&
 		 node_is (node1, NODE_TO_STRING))
@@ -484,8 +457,7 @@ peephole (node_t *node,
 	    nop_node (node0, 0);
 	    nop_node (node1, 0);
 	    
-	    printf ("triggered at line %d\n", __LINE__);
-	    (*changed)++;
+	    *changed = TRUE;
 	}
     }
 }
@@ -521,13 +493,11 @@ do_optimize (ast_t *ast, gboolean *changed)
 	
 	do
 	{
-	    c = 0;
+	    c = FALSE;
 	    
 	    peephole (*node, &c);
 	    *node = remove_nops (*node, &c);
 
-	    printf ("changes: %d\n", c);
-	    
 	    if (c)
 		*changed = TRUE;
 	}