ppc: alle codeb testfaelle klappen nun auch

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

diff --git a/gesamt_ppc/parser.y b/gesamt_ppc/parser.y
index 4b453522a9469260b8bae5883f8300abb1a2caf3..c0088d01c744f0e111c5423629726c161d1c6f81 100644 (file)
--- a/gesamt_ppc/parser.y
+++ b/gesamt_ppc/parser.y
@@ -65,7 +65,7 @@ Input:
          Program
          @{
            @i @Program.f@ = tab_new();
-           @gen printf("\t.text\n");
+           @gen printf("\t.section\t\".text\"\n");
          @}
        ;
 
@@ -178,14 +178,14 @@ Statement:
          @{
                /* tab_clone ist hier noetig, vgl. folgendes statement
                 * > var x := x - 1; */
-               @i @Statement.sout@ = tab_add_symbol(tab_clone(@Statement.sin@), @IDENT.name@, S_VAR, 1, @Statement.gparamges@ + @Statement.vars_in@, -1);
+               @i @Statement.sout@ = tab_add_symbol(tab_clone(@Statement.sin@), @IDENT.name@, S_VAR, 1, VARBEGIN - @Statement.vars_in@, -1);
                lblcountinout()
 
                @i @Statement.vars_out@ = @Statement.vars_in@ + 1;
 
                xxputsin(@Expr.s@,)
 
-               @i @Statement.node@ = new_node(O_ASSIGN, @Expr.node@, new_param(O_ID, @IDENT.name@, TREENULL, TREENULL, @Statement.gparamges@ + @Statement.vars_in@));
+               @i @Statement.node@ = new_node(O_ASSIGN, @Expr.node@, new_param(O_ID, @IDENT.name@, TREENULL, TREENULL, VARBEGIN - @Statement.vars_in@));
                @reg @Statement.node@->reg = @Expr.node@->reg = next_reg((char *)NULL, @Expr.gparamges@);
 
                @gen write_tree(@Statement.node@, 0); burm_label(@Statement.node@); burm_reduce(@Statement.node@, 1);
@@ -223,8 +223,7 @@ Statement:
                @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("\tjz .%s_ifend_%d\n", get_func_name(), @Statement.lblcnt_in@);
+                       printf("\tbeq 0,.%s_ifend_%d\n", get_func_name(), @Statement.lblcnt_in@);
                }
                @gen @revorder(1) printf(".%s_ifend_%d:\n", get_func_name(), @Statement.lblcnt_in@);
          @}
@@ -256,7 +255,7 @@ Statement:
                        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("\tjz .%s_ifelse_%d\n", get_func_name(), @Statement.lblcnt_in@);
+                       printf("\tbeq 0,.%s_ifelse_%d\n", get_func_name(), @Statement.lblcnt_in@);
                }
                @gen @revorder(1) printf(".%s_ifend_%d:\n", get_func_name(), @Statement.lblcnt_in@);
          @}
@@ -282,9 +281,9 @@ Statement:
                        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@);
+                       printf("\tbeq 0,.%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("\tb .%s_whilestart_%d\n.%s_whileend_%d:\n", get_func_name(), @Statement.lblcnt_in@, get_func_name(), @Statement.lblcnt_in@);
          @}
 
        | RETURN Expr
@@ -310,7 +309,7 @@ Elsestat:
                @i @Statseq.vars_in@ = @Elsestat.vars_in@;
                @i @Elsestat.vars_out@ = @Statseq.vars_out@;
 
-               @gen printf("\tjmp .%s_ifend_%d\n.%s_ifelse_%d:\n", get_func_name(), @Elsestat.reallblcnt@, get_func_name(), @Elsestat.reallblcnt@);
+               @gen printf("\tb .%s_ifend_%d\n.%s_ifelse_%d:\n", get_func_name(), @Elsestat.reallblcnt@, get_func_name(), @Elsestat.reallblcnt@);
          @}
 
 Lexpr: