From beb3b1cdfe7bb7b447e0e59a0163780c1addcd38 Mon Sep 17 00:00:00 2001 From: Bernhard Urban Date: Sun, 30 May 2010 15:10:00 +0200 Subject: [PATCH] codeb: (opt) unneotige test instrutkionen wegoptimiert --- codeb/code.bfe | 4 +++- codeb/parser.y | 12 ++++++------ codeb/tree.h | 4 ++-- 3 files changed, 11 insertions(+), 9 deletions(-) diff --git a/codeb/code.bfe b/codeb/code.bfe index e36c0d2..4b74b12 100644 --- a/codeb/code.bfe +++ b/codeb/code.bfe @@ -175,7 +175,7 @@ void gen_subspecial(struct treenode *bnode, short e) %} %start begin -%term O_RET=1 O_NULL=2 O_SUB=3 O_MUL=4 O_OR=5 O_LESS=6 O_EQ=7 O_ID=8 O_ADD=9 O_NUM=10 O_FIELD=11 O_MTWO=12 O_MFOUR=13 O_MEIGHT=14 O_MONE=15 O_ASSIGN=16 O_IF=17 +%term O_RET=1 O_NULL=2 O_SUB=3 O_MUL=4 O_OR=5 O_LESS=6 O_EQ=7 O_ID=8 O_ADD=9 O_NUM=10 O_FIELD=11 O_MTWO=12 O_MFOUR=13 O_MEIGHT=14 O_MONE=15 O_ASSIGN=16 O_IF=17 O_BOOL=18 %% @@ -197,9 +197,11 @@ retexpr: expr ifstat: O_IF(O_ID) # 1 # /* fuer faelle wie "if bla then" noetig */ KIDREG2PARM(0); printf("\ttest $-1, %%%s\n", KID_REG(0)); ifstat: O_IF(expr) # 2 # /* iburg beschummeln :/ */ printf("\ttest $-1, %%rax\n"); +ifstat: O_IF(O_BOOL(expr)) # 1 # /* dann braucht man kein test */ expr: O_ID # 0 # expr: imm # 1 # moveimm(BN_VAL, BN_REG); +expr: O_BOOL(expr) # 0 # expr: O_SUB(expr,expr) # 2 # gen_e_eno(bnode, "subq"); diff --git a/codeb/parser.y b/codeb/parser.y index 62f4a4c..39cc35d 100644 --- a/codeb/parser.y +++ b/codeb/parser.y @@ -320,9 +320,9 @@ Expr: | NOT Term @{ - @i @Expr.node@ = new_node(O_EQ, @Term.node@, new_node(O_NULL, TREENULL, TREENULL)); + @i @Expr.node@ = new_node(O_BOOL, new_node(O_EQ, @Term.node@, new_node(O_NULL, TREENULL, TREENULL)), TREENULL); - @reg @Term.node@->reg = @Expr.node@->reg; + @reg @Term.node@->reg = @Expr.node@->kids[0]->reg = @Expr.node@->reg; @} | Term Minusterm @@ -370,22 +370,22 @@ Expr: | Term '<' Term @{ - @i @Expr.node@ = new_node(O_LESS, @Term.0.node@, @Term.1.node@); + @i @Expr.node@ = new_node(O_BOOL, new_node(O_LESS, @Term.0.node@, @Term.1.node@), TREENULL); @i @Expr.imm@ = @Term.0.imm@ && @Term.0.imm@; @reg { - @Term.0.node@->reg = @Expr.node@->reg; + @Term.0.node@->reg = @Expr.node@->kids[0]->reg = @Expr.node@->reg; @Term.1.node@->reg = next_reg(@Term.0.node@->reg, @Expr.gparamges@); } @} | Term '=' Term @{ - @i @Expr.node@ = new_node(O_EQ, @Term.0.node@, @Term.1.node@); + @i @Expr.node@ = new_node(O_BOOL, new_node(O_EQ, @Term.0.node@, @Term.1.node@), TREENULL); @i @Expr.imm@ = @Term.0.imm@ && @Term.0.imm@; @reg { - @Term.0.node@->reg = @Expr.node@->reg; + @Term.0.node@->reg = @Expr.node@->kids[0]->reg = @Expr.node@->reg; @Term.1.node@->reg = next_reg(@Term.0.node@->reg, @Expr.gparamges@); } @} diff --git a/codeb/tree.h b/codeb/tree.h index a4cfd60..8e39fe3 100644 --- a/codeb/tree.h +++ b/codeb/tree.h @@ -13,14 +13,14 @@ enum { O_RET=1, O_NULL, O_SUB, O_MUL, O_OR=5, O_LESS, O_EQ, O_ID, O_ADD, O_NUM=10, O_FIELD, O_MTWO, O_MFOUR, O_MEIGHT, - O_MONE=15, O_ASSIGN, O_IF + O_MONE=15, O_ASSIGN, O_IF, O_BOOL }; static char *o_names[] = { "", "O_RET", "O_NULL", "O_SUB", "O_MUL", "O_OR", "O_LESS", "O_EQ", "O_ID", "O_ADD", "O_NUM", "O_FIELD", "O_MTWO", "O_MFOUR", "O_MEIGHT", - "O_MONE", "O_ASSIGN", "O_IF" + "O_MONE", "O_ASSIGN", "O_IF", "O_BOOL" }; struct treenode { -- 2.25.1