codeb: (opt) unneotige test instrutkionen wegoptimiert

[uebersetzerbau-ss10.git] / codeb / parser.y

diff --git a/codeb/parser.y b/codeb/parser.y
index 7e354cebda70ff299a4ba19f86ac8587392fd0b4..39cc35dbe86ea521fc84c18bcccc679ba47ae200 100644 (file)
--- a/codeb/parser.y
+++ b/codeb/parser.y
@@ -153,9 +153,10 @@ Statement:
                lblcountinout()
                xxputsin(@Lexpr.s@,)
                xxputsin(@Expr.s@,)
-           @i @Statement.node@ = new_node(O_ASSIGN, @Lexpr.node@, @Expr.node@);
+           @i @Statement.node@ = new_node(O_ASSIGN, @Expr.node@, @Lexpr.node@);
                @i @Statement.vars@ = 0;
                @reg @Statement.node@->reg = @Expr.node@->reg = next_reg((char *)NULL, @Expr.gparamges@);
+               @reg @Lexpr.node@->reg = next_reg(@Expr.node@->reg, @Expr.gparamges@);
 
                @gen write_tree(@Statement.node@, 0); burm_label(@Statement.node@); burm_reduce(@Statement.node@, 1);
          @}
@@ -168,7 +169,7 @@ Statement:
                lblcountinout()
                xxputsin(@Expr.s@,)
 
-               @i @Statement.node@ = new_node(O_ASSIGN, new_param(O_ID, @IDENT.name@, TREENULL, TREENULL, @Statement.gparamges@), @Expr.node@);
+               @i @Statement.node@ = new_node(O_ASSIGN, @Expr.node@, new_param(O_ID, @IDENT.name@, TREENULL, TREENULL, @Statement.gparamges@));
                @i @Statement.vars@ = 1;
                @reg @Statement.node@->reg = @Expr.node@->reg = next_reg((char *)NULL, @Expr.gparamges@);
 
@@ -197,11 +198,12 @@ Statement:
 
                @reg @Statement.node@->reg = @Expr.node@->reg = next_reg((char *)NULL, @Expr.gparamges@);
                @gen {
+                       printf(".%s_ifstart_%d:\n", get_func_name(), @Statement.lblcnt_in@);
                        write_tree(@Statement.node@, 0); burm_label(@Statement.node@); burm_reduce(@Statement.node@, 1);
                        /* TODO: kann ich mir das test wirklich wegan and davor sparen? */
-                       printf("\ttest %s1, %%rax\n\tjz %s_ifend_%d\n", "$", get_func_name(), @Statement.lblcnt_in@);
+                       printf("\tjz .%s_ifend_%d\n", get_func_name(), @Statement.lblcnt_in@);
                }
-               @gen @revorder(1) printf("%s_ifend_%d:\n", get_func_name(), @Statement.lblcnt_in@);
+               @gen @revorder(1) printf(".%s_ifend_%d:\n", get_func_name(), @Statement.lblcnt_in@);
          @}
 
        | IF Expr THEN Statseq Elsestat END
@@ -223,23 +225,33 @@ Statement:
 
                @reg @Statement.node@->reg = @Expr.node@->reg = next_reg((char *)NULL, @Expr.gparamges@);
                @gen {
+                       printf(".%s_ifstart_%d:\n", get_func_name(), @Statement.lblcnt_in@);
                        write_tree(@Statement.node@, 0); burm_label(@Statement.node@); burm_reduce(@Statement.node@, 1);
                        /* TODO: kann ich mir das test wirklich wegan and davor sparen? */
-                       printf("\ttest %s1, %%rax\n\tjz %s_ifelse_%d\n", "$", get_func_name(), @Statement.lblcnt_in@);
+                       printf("\tjz .%s_ifelse_%d\n", get_func_name(), @Statement.lblcnt_in@);
                }
-               @gen @revorder(1) printf("%s_ifend_%d:\n", get_func_name(), @Statement.lblcnt_in@);
+               @gen @revorder(1) printf(".%s_ifend_%d:\n", get_func_name(), @Statement.lblcnt_in@);
          @}
 
        | WHILE Expr DO Statseq END
          @{
                statinout()
-               lblcountinout()
-               /* TODO */
-               @i @Statseq.0.lblcnt_in@ =  @Statement.lblcnt_in@ + 1;
+               @i @Statseq.lblcnt_in@ =  @Statement.lblcnt_in@ + 1;
+               @i @Statement.lblcnt_out@ = @Statseq.lblcnt_out@;
                xxputsin(@Expr.s@,)
                xxputsin(@Statseq.s@,)
-           @i @Statement.node@ = TREENULL;
+
+               @i @Statement.node@ = new_node(O_IF, @Expr.node@, TREENULL);
                @i @Statement.vars@ = 0;
+
+               @reg @Statement.node@->reg = @Expr.node@->reg = next_reg((char *)NULL, @Expr.gparamges@);
+               @gen {
+                       printf(".%s_whilestart_%d:\n", get_func_name(), @Statement.lblcnt_in@);
+                       write_tree(@Statement.node@, 0); burm_label(@Statement.node@); burm_reduce(@Statement.node@, 1);
+                       /* TODO: kann ich mir das test wirklich wegan and davor sparen? */
+                       printf("\tjz .%s_whileend_%d\n", get_func_name(), @Statement.lblcnt_in@);
+               }
+               @gen @revorder(1) printf("\tjmp .%s_whilestart_%d\n.%s_whileend_%d:\n", get_func_name(), @Statement.lblcnt_in@, get_func_name(), @Statement.lblcnt_in@);
          @}
 
        | RETURN Expr
@@ -262,7 +274,7 @@ Elsestat:
                @i @Statseq.lblcnt_in@ =  @Elsestat.lblcnt_in@;
                @i @Elsestat.lblcnt_out@ =  @Statseq.lblcnt_out@;
 
-               @gen printf("\tjmp %s_ifend_%d\n%s_ifelse_%d:\n", get_func_name(), @Elsestat.reallblcnt@, get_func_name(), @Elsestat.reallblcnt@);
+               @gen printf("\tjmp .%s_ifend_%d\n.%s_ifelse_%d:\n", get_func_name(), @Elsestat.reallblcnt@, get_func_name(), @Elsestat.reallblcnt@);
          @}
 
 Lexpr:
@@ -296,7 +308,7 @@ Feld: Term '.' IDENT
            @c check(@Feld.s@, @IDENT.name@, S_FIELD);
            @i @Feld.node@ = new_field(@IDENT.name@, @Term.node@, TREENULL, tab_lookup(@Feld.s@, @IDENT.name@, S_FIELD) == SYMNULL ? -1 : tab_lookup(@Feld.s@, @IDENT.name@, S_FIELD)->soffset);
 
-               @reg @Term.node@->reg = @Feld.node@->reg;
+               @reg @Term.node@->reg = next_reg(@Feld.node@->reg, @Term.gparamges@);
          @}
        ;
 
@@ -308,9 +320,9 @@ Expr:
 
        | NOT Term
          @{
-               @i @Expr.node@ = new_node(O_EQ, @Term.node@, new_node(O_NULL, TREENULL, TREENULL));
+               @i @Expr.node@ = new_node(O_BOOL, new_node(O_EQ, @Term.node@, new_node(O_NULL, TREENULL, TREENULL)), TREENULL);
 
-               @reg @Term.node@->reg = @Expr.node@->reg;
+               @reg @Term.node@->reg = @Expr.node@->kids[0]->reg = @Expr.node@->reg;
          @}
 
        | Term Minusterm
@@ -358,22 +370,22 @@ Expr:
 
        | Term '<' Term
          @{
-           @i @Expr.node@ = new_node(O_LESS, @Term.0.node@, @Term.1.node@);
+           @i @Expr.node@ = new_node(O_BOOL, new_node(O_LESS, @Term.0.node@, @Term.1.node@), TREENULL);
                @i @Expr.imm@ = @Term.0.imm@ && @Term.0.imm@;
 
                @reg {
-                       @Term.0.node@->reg = @Expr.node@->reg;
+                       @Term.0.node@->reg = @Expr.node@->kids[0]->reg = @Expr.node@->reg;
                        @Term.1.node@->reg = next_reg(@Term.0.node@->reg, @Expr.gparamges@);
                }
          @}
 
        | Term '=' Term
          @{
-           @i @Expr.node@ = new_node(O_EQ, @Term.0.node@, @Term.1.node@);
+           @i @Expr.node@ = new_node(O_BOOL, new_node(O_EQ, @Term.0.node@, @Term.1.node@), TREENULL);
                @i @Expr.imm@ = @Term.0.imm@ && @Term.0.imm@;
 
                @reg {
-                       @Term.0.node@->reg = @Expr.node@->reg;
+                       @Term.0.node@->reg = @Expr.node@->kids[0]->reg = @Expr.node@->reg;
                        @Term.1.node@->reg = next_reg(@Term.0.node@->reg, @Expr.gparamges@);
                }
          @}