codeb: ups, andere registerbelegung noetig feur Feld: ..

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

diff --git a/codeb/parser.y b/codeb/parser.y
index 7d9af97417b0c5a81b5baa2296f4e3a7de7620b4..a9860895d0df459dced36bf255aa8dace1370832 100644 (file)
--- a/codeb/parser.y
+++ b/codeb/parser.y
@@ -46,7 +46,8 @@
 @attributes { struct symbol *f; int offsetcount; } FeldID
 @attributes { struct symbol *s; } Methoddef
 @attributes { struct symbol *s; int gparamges; } Exprs
-@attributes { struct symbol *s; int gparamges; int lblcnt_in; int lblcnt_out; } Statseq Elsestat
+@attributes { struct symbol *s; int gparamges; int lblcnt_in; int lblcnt_out; } Statseq
+@attributes { struct symbol *s; int gparamges; int lblcnt_in; int lblcnt_out; int reallblcnt; } Elsestat
 @attributes { struct symbol *s; int gparamges; struct treenode *node; short imm; } Expr Minusterm Multerm Orterm Feld Term
 @attributes { struct symbol *s; int gparamges; struct treenode *node; } Lexpr
 @attributes { struct symbol *sin; int gparamges; struct symbol *sout; struct treenode *node; int vars; int lblcnt_in; int lblcnt_out; } Statement
@@ -152,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);
          @}
@@ -167,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@);
 
@@ -196,6 +198,7 @@ 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@);
@@ -206,10 +209,12 @@ Statement:
        | IF Expr THEN Statseq Elsestat END
          @{
                statinout()
-               @i @Statseq.0.lblcnt_in@ =  @Statement.lblcnt_in@ + 1;
-               @i @Elsestat.lblcnt_in@ =  @Statement.lblcnt_in@;
-               /* TODO: welchen wert lblcnt_out zuweisen? :/ */
-               @i @Statement.lblcnt_out@ = @Statseq.lblcnt_out@;
+               @i @Statseq.0.lblcnt_in@ = @Statement.lblcnt_in@ + 1;
+               @i @Elsestat.lblcnt_in@ = @Statseq.lblcnt_out@;
+               @i @Statement.lblcnt_out@ = @Elsestat.lblcnt_out@;
+
+               /* im Elsestat muss noch ein label numeriert werden */
+               @i @Elsestat.reallblcnt@ = @Statement.lblcnt_in@;
 
                xxputsin(@Expr.s@,)
                xxputsin(@Statseq.0.s@,)
@@ -220,6 +225,7 @@ 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@);
@@ -230,13 +236,22 @@ Statement:
        | 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("\ttest %s1, %%rax\n\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
@@ -256,10 +271,10 @@ Statement:
 Elsestat:
          ELSE Statseq
          @{
-               @i @Statseq.lblcnt_in@ =  @Elsestat.lblcnt_in@ + 1;
+               @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.lblcnt_in@, get_func_name(), @Elsestat.lblcnt_in@);
+               @gen printf("\tjmp %s_ifend_%d\n%s_ifelse_%d:\n", get_func_name(), @Elsestat.reallblcnt@, get_func_name(), @Elsestat.reallblcnt@);
          @}
 
 Lexpr:
@@ -293,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@);
          @}
        ;