X-Git-Url: http://wien.tomnetworks.com/gitweb/?a=blobdiff_plain;f=gesamt_ppc%2Fparser.y;h=e6fc7a5a2f772a03b17ff70c48cd92a71a50da3a;hb=HEAD;hp=182a08d66253ce6f012aecdc5fae8b3ec93c2715;hpb=2d7a57dd7dec94f4436b8494bed78bb80b064235;p=uebersetzerbau-ss10.git

diff --git a/gesamt_ppc/parser.y b/gesamt_ppc/parser.y
index 182a08d..e6fc7a5 100644
--- a/gesamt_ppc/parser.y
+++ b/gesamt_ppc/parser.y
@@ -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, VARBEGIN - @Statement.vars_in@, -1);
+		@i @Statement.sout@ = tab_add_symbol(tab_clone(@Statement.sin@), @IDENT.name@, S_VAR, 1, @Statement.gparamges@ + @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, VARBEGIN - @Statement.vars_in@));
+		@i @Statement.node@ = new_node(O_ASSIGN, @Expr.node@, new_param(O_ID, @IDENT.name@, TREENULL, TREENULL, @Statement.gparamges@ + @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@);
 	  @}
@@ -255,8 +254,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_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@);
 	  @}
@@ -281,10 +279,9 @@ Statement:
 		@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@);
+			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 +307,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: