codeb: 'test' ins bfe-file auslagern

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

diff --git a/codeb/parser.y b/codeb/parser.y
index 49602fc786796a3bcc71531f96020e625b734769..62f4a4c5d2690cca64ce025d8511a260cc2c0241 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,12 +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@);
+                       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
@@ -224,12 +225,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@);
+                       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
@@ -245,12 +246,12 @@ Statement:
 
                @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@);
+                       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("\ttest %s1, %%rax\n\tjz %s_whileend_%d\n", "$", get_func_name(), @Statement.lblcnt_in@);
+                       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@);
+               @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
@@ -273,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:
@@ -307,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@);
          @}
        ;