codea: not inkl. optimierung

diff --git a/codea/code.bfe b/codea/code.bfe
index 53d61c6c0b30bc3dcaccaec6616e6c2a1ed89cdc..5cdd1804015a291c47c05e00adeabc615b5cb027 100644 (file)
--- a/codea/code.bfe
+++ b/codea/code.bfe
@@ -70,7 +70,7 @@ void gen_eqless(struct treenode *bnode, char *op, short e0, short e1)
 %}
 
 %start begin
-%term O_RET=1 O_NOT=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
+%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
 
 %%
 
@@ -101,6 +101,8 @@ expr: O_LESS(imm,expr)  # 3 # gen_eqless(bnode, "l", 0, 1);
 expr: O_EQ(exprno,exprno) # 3 # gen_eqless(bnode, "e", 1, 1);
 expr: O_EQ(exprno,imm)    # 3 # gen_eqless(bnode, "e", 1, 0);
 expr: O_EQ(imm,exprno)    # 3 # gen_eqless(bnode, "e", 0, 1);
+expr: O_EQ(nexpr,O_NULL)  # 0 #
+expr: O_EQ(exprno,O_NULL) # 3 # gen_eqless(bnode, "e", 1, 0);
 
 expr: O_FIELD(exprno) # 1 # KIDREG2PARM(0); printf("\tmovq %li(%%%s), %%%s\n", bnode->soffset * 8, KID_REG(0), BN_REG);
 
@@ -108,6 +110,8 @@ expr: O_FIELD(exprno) # 1 # KIDREG2PARM(0); printf("\tmovq %li(%%%s), %%%s\n", b
 exprno: O_ID # 0 # /* brauchen wir nicht 'zwischenlagern', weil nur gelesen wird */
 exprno: expr
 
+nexpr: O_EQ(expr,O_NULL) # 0 #
+
 
 imm: O_ADD(imm,imm)  # 0 # BN_VAL = KID_VAL(0) + KID_VAL(1);
 imm: O_SUB(imm,imm)  # 0 # BN_VAL = KID_VAL(0) - KID_VAL(1);

diff --git a/codea/parser.y b/codea/parser.y
index fa8d988e2beaba4e79e879c48234d8bec38d7fce..01ff3cfb9f4f3994d50cfa51932526d58aa72ff9 100644 (file)
--- a/codea/parser.y
+++ b/codea/parser.y
@@ -230,8 +230,10 @@ Expr:
 
        | NOT Term
          @{
-           @i @Expr.node@ = TREENULL;
                @i @Expr.exprcount@ = @Term.exprcount@; fprintf(stderr, "(Expr)- NOT Term\n");
+               @i @Expr.node@ = new_node(O_EQ, @Term.node@, new_node(O_NULL, TREENULL, TREENULL, @Expr.exprcount@), @Expr.exprcount@);
+
+               @reg @Term.node@->reg = @Expr.node@->reg;
          @}
 
        | Term Minusterm

diff --git a/codea/tree.h b/codea/tree.h
index b824d1520562cfa95472d15af45362905b5b6a22..f33d1e06edbc84d9afec504ebc1ddcf041c38a5a 100644 (file)
--- a/codea/tree.h
+++ b/codea/tree.h
@@ -11,7 +11,7 @@ typedef struct burm_state *STATEPTR_TYPE;
 
 enum {
        O_RET=1,
-       O_NOT,
+       O_NULL,
        O_SUB,
        O_MUL,
        O_OR,
@@ -26,7 +26,7 @@ enum {
 static char *o_names[] = {
        "",
        "O_RET",
-       "O_NOT",
+       "O_NULL",
        "O_SUB",
        "O_MUL",
        "O_OR",