From c28bcd90568eaca63d5cf347c7a305678c1314a4 Mon Sep 17 00:00:00 2001 From: Bernhard Urban Date: Mon, 14 Jun 2010 21:23:08 +0200 Subject: [PATCH] gesamt: unschoenheiten gefixt --- gesamt/TODO | 0 gesamt/parser.y | 59 +++++++++++++++++++++---------------------------- 2 files changed, 25 insertions(+), 34 deletions(-) delete mode 100644 gesamt/TODO diff --git a/gesamt/TODO b/gesamt/TODO deleted file mode 100644 index e69de29..0000000 diff --git a/gesamt/parser.y b/gesamt/parser.y index 88b808e..6702256 100644 --- a/gesamt/parser.y +++ b/gesamt/parser.y @@ -39,6 +39,11 @@ * node: baum fuer iburg * sin: symboltabelle fuer statement ("eingabe") * sout: symboltabelle die aus einem statement wieder rauskommt ("ausgabe") + * lblcnt_{in,out}: label counter + * vars_{in,out}: counter fuer lokale variablen + * call: enthaelt block einen call? (sonst kann man sich stack setup sparen) + * imm: fuer ein paar quirks mit immediates im ast + * paramcount: zum zaehlen der paramter eines methodenaufrufes */ @autoinh s gparamges vars_in @autosyn node imm call @@ -53,7 +58,7 @@ @attributes { struct symbol *s; int gparamges; int lblcnt_in; int lblcnt_out; int vars_in; int vars_out; int call; } Statseq @attributes { struct symbol *s; int gparamges; int lblcnt_in; int lblcnt_out; int reallblcnt; int vars_in; int vars_out; int call; } Elsestat @attributes { struct symbol *s; int gparamges; int vars_in; struct treenode *node; short imm; int call; } Expr Minusterm Multerm Orterm Feld Term -@attributes { struct symbol *s; int gparamges; int vars_in; struct treenode *node; } Lexpr +@attributes { struct symbol *s; int gparamges; int vars_in; struct treenode *node; } Lexpr IdentCommon @attributes { struct symbol *sin; int gparamges; struct symbol *sout; struct treenode *node; int vars_in; int vars_out; int lblcnt_in; int lblcnt_out; int call; } Statement @traversal @postorder c @@ -225,7 +230,6 @@ 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@); } @gen @revorder(1) printf(".%s_ifend_%d:\n", get_func_name(), @Statement.lblcnt_in@); @@ -257,7 +261,6 @@ 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@); } @gen @revorder(1) printf(".%s_ifend_%d:\n", get_func_name(), @Statement.lblcnt_in@); @@ -283,7 +286,6 @@ 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@); } @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@); @@ -316,31 +318,34 @@ Elsestat: @} Lexpr: + IdentCommon + | Feld + ; + +IdentCommon: IDENT @{ - @c check(@Lexpr.s@, @IDENT.name@, S_VAR|S_PARM); + @c check(@IdentCommon.s@, @IDENT.name@, S_VAR|S_PARM); - /* TODO: selbe Code wie bei Term/IDENT -- schoener machen! */ @i { - @Lexpr.node@ = TREENULL; - if(tab_lookup(@Lexpr.s@, @IDENT.name@, S_VAR|S_PARM) == SYMNULL) { + @IdentCommon.node@ = TREENULL; + if(tab_lookup(@IdentCommon.s@, @IDENT.name@, S_VAR|S_PARM) == SYMNULL) { /* es handelt sich um ein feldzugriff auf this */ - @Lexpr.node@ = new_field(@IDENT.name@, new_param(O_ID, strdup("this"), TREENULL, TREENULL, 0), TREENULL, tab_lookup(@Lexpr.s@, @IDENT.name@, S_FIELD) == SYMNULL ? -1 : tab_lookup(@Lexpr.s@, @IDENT.name@, S_FIELD)->soffset); + @IdentCommon.node@ = new_field(@IDENT.name@, new_param(O_ID, strdup("this"), TREENULL, TREENULL, 0), TREENULL, tab_lookup(@IdentCommon.s@, @IDENT.name@, S_FIELD) == SYMNULL ? -1 : tab_lookup(@IdentCommon.s@, @IDENT.name@, S_FIELD)->soffset); } else { /* param oder var */ - int tmp = tab_lookup(@Lexpr.s@, @IDENT.name@, S_VAR|S_PARM) == SYMNULL ? -1 : tab_lookup(@Lexpr.s@, @IDENT.name@, S_VAR|S_PARM)->param_index; - @Lexpr.node@ = new_param(O_ID, @IDENT.name@, TREENULL, TREENULL, tmp); + int tmp = tab_lookup(@IdentCommon.s@, @IDENT.name@, S_VAR|S_PARM) == SYMNULL ? -1 : tab_lookup(@IdentCommon.s@, @IDENT.name@, S_VAR|S_PARM)->param_index; + @IdentCommon.node@ = new_param(O_ID, @IDENT.name@, TREENULL, TREENULL, tmp); } } - @reg if(tab_lookup(@Lexpr.s@, @IDENT.name@, S_VAR|S_PARM) == SYMNULL) { + @reg if(tab_lookup(@IdentCommon.s@, @IDENT.name@, S_VAR|S_PARM) == SYMNULL) { /* TODO: kein schoener hack? */ - @Lexpr.node@->kids[0]->reg = @Lexpr.node@->reg; + @IdentCommon.node@->kids[0]->reg = @IdentCommon.node@->reg; } @} - - | Feld ; + Feld: Term '.' IDENT @{ @c check(@Feld.s@, @IDENT.name@, S_FIELD); @@ -530,27 +535,10 @@ Term: @i @Term.call@ = 0; @} - | IDENT + | IdentCommon @{ - @c check(@Term.s@, @IDENT.name@, S_VAR|S_PARM); - @i @Term.imm@ = 0; @i @Term.call@ = 0; - @i { - @Term.node@ = TREENULL; - if(tab_lookup(@Term.s@, @IDENT.name@, S_VAR|S_PARM) == SYMNULL) { - /* es handelt sich um ein feldzugriff auf this */ - @Term.node@ = new_field(@IDENT.name@, new_param(O_ID, strdup("this"), TREENULL, TREENULL, 0), TREENULL, tab_lookup(@Term.s@, @IDENT.name@, S_FIELD) == SYMNULL ? -1 : tab_lookup(@Term.s@, @IDENT.name@, S_FIELD)->soffset); - } else { /* param oder var */ - int tmp = tab_lookup(@Term.s@, @IDENT.name@, S_VAR|S_PARM) == SYMNULL ? -1 : tab_lookup(@Term.s@, @IDENT.name@, S_VAR|S_PARM)->param_index; - @Term.node@ = new_param(O_ID, @IDENT.name@, TREENULL, TREENULL, tmp); - } - } - - @reg if(tab_lookup(@Term.s@, @IDENT.name@, S_VAR|S_PARM) == SYMNULL) { - /* TODO: kein schoener hack? */ - @Term.node@->kids[0]->reg = @Term.node@->reg; - } @} | Feld @@ -593,7 +581,10 @@ Exprs: @i @Exprs.0.node@ = new_arg(@Expr.0.node@, @Exprs.1.node@, @Exprs.0.cnt@); @i @Exprs.0.paramcount@ = @Exprs.1.paramcount@; @i @Exprs.1.cnt@ = @Exprs.0.cnt@ + 1; - @reg @Expr.node@->reg = @Exprs.0.node@->reg; @Exprs.1.node@->reg = next_reg(@Exprs.0.node@->reg, @Exprs.gparamges@); + @reg { + @Expr.node@->reg = @Exprs.0.node@->reg; + @Exprs.1.node@->reg = next_reg(@Exprs.0.node@->reg, @Exprs.gparamges@); + } @} | Expr @{ -- 2.25.1