codea: less/equal mehr optimiert

diff --git a/codea/code.bfe b/codea/code.bfe
index 2928538df945fbe305d6660a1ec31cddf947cc74..53d61c6c0b30bc3dcaccaec6616e6c2a1ed89cdc 100644 (file)
--- a/codea/code.bfe
+++ b/codea/code.bfe
@@ -45,51 +45,28 @@ void gen_imm_eno(struct treenode *bnode, char *instr)
        }
 }
 
-void gen_eqless_footer(struct treenode *bnode, char *op)
+void gen_eqless(struct treenode *bnode, char *op, short e0, short e1)
 {
+       printf("\t//gen_eqless_%i%i\n", e0, e1);
+       if(e0) KIDREG2PARM(0);
+       if(e1) KIDREG2PARM(1);
+
+       if(e0 && e1) {
+               printf("\tcmp %%%s, %%%s\n", KID_REG(1), KID_REG(0));
+       } else if(e0 && !e1) {
+               printf("\tcmp $%li, %%%s\n", KID_VAL(1), KID_REG(0));
+       } else if(!e0 && e1) {
+               if(strcmp("e", op) == 0) {
+                       printf("\tcmp $%li, %%%s\n", KID_VAL(0), KID_REG(1));
+               } else {
+                       moveimm(KID_VAL(0), BN_REG);
+                       printf("\tcmp %%%s, %%%s\n", KID_REG(1), BN_REG);
+               }
+       }
        printf("\tset%s %%%s\n", op, reg_64to8l(BN_REG));
        printf("\tand $1, %%%s\n", BN_REG);
 }
 
-void gen_eqless_ee(struct treenode *bnode, char *op)
-{
-       printf("\t//gen_eqless_ee\n");
-       KIDREG2PARM(0);
-#if 0
-       /* TODO */
-       KIDREG2PARM(1)
-#endif
-       printf("\tcmp %%%s, %%%s\n", KID_REG(1), KID_REG(0));
-
-       gen_eqless_footer(bnode, op);
-}
-
-void gen_eqless_ei(struct treenode *bnode, char *op)
-{
-       printf("\t//gen_eqless_ei\n");
-#if 0
-       /* TODO */
-       KIDREG2PARM(1)
-#endif
-       printf("\tcmp $%li, %%%s\n", KID_VAL(1), KID_REG(0));
-
-       gen_eqless_footer(bnode, op);
-}
-
-void gen_eqless_ie(struct treenode *bnode, char *op)
-{
-       printf("\t//gen_eqless_ie\n");
-       if(strcmp("e", op) == 0) {
-               printf("\tcmp $%li, %%%s\n", KID_VAL(0), KID_REG(1));
-               gen_eqless_footer(bnode, op);
-       } else {
-               moveimm(KID_VAL(0), BN_REG);
-               printf("\tcmp %%%s, %%%s\n", KID_REG(1), BN_REG);
-
-               gen_eqless_footer(bnode, op);
-       }
-}
-
 %}
 
 %start begin
@@ -104,26 +81,26 @@ expr: O_ID # 1 # if(bnode->param_index > -1) move(param_reg(bnode->param_index),
 expr: imm # 1 # moveimm(BN_VAL, BN_REG);
 
 expr: O_SUB(expr,exprno) # 1 # gen_e_eno(bnode, "subq");
-expr: O_SUB(expr,imm) # 2 # gen_e_imm(bnode, "subq");
-expr: O_SUB(imm,exprno) # 2 # gen_imm_eno(bnode, "subq");
+expr: O_SUB(expr,imm)    # 2 # gen_e_imm(bnode, "subq");
+expr: O_SUB(imm,exprno)  # 2 # gen_imm_eno(bnode, "subq");
 
 expr: O_ADD(expr,exprno) # 1 # gen_e_eno(bnode, "addq");
-expr: O_ADD(imm,expr) # 2 # gen_e_imm(bnode, "addq");
+expr: O_ADD(imm,expr)    # 2 # gen_e_imm(bnode, "addq");
 
 expr: O_MUL(expr,exprno) # 1 # gen_e_eno(bnode, "imulq");
-expr: O_MUL(expr,imm) # 1 # gen_e_imm(bnode, "imulq");
-expr: O_MUL(imm,exprno) # 1 # gen_imm_eno(bnode, "imulq");
+expr: O_MUL(expr,imm)    # 1 # gen_e_imm(bnode, "imulq");
+expr: O_MUL(imm,exprno)  # 1 # gen_imm_eno(bnode, "imulq");
 
 expr: O_OR(expr,exprno) # 1 # gen_e_eno(bnode, "orq");
-expr: O_OR(expr,imm) # 2 # gen_e_imm(bnode, "orq");
+expr: O_OR(expr,imm)    # 2 # gen_e_imm(bnode, "orq");
 
-expr: O_LESS(expr,expr) # 5 # gen_eqless_ee(bnode, "l");
-expr: O_LESS(expr,imm) # 5 # gen_eqless_ei(bnode, "l");
-expr: O_LESS(imm,expr) # 6 # gen_eqless_ie(bnode, "l");
+expr: O_LESS(expr,expr) # 3 # gen_eqless(bnode, "l", 1, 1);
+expr: O_LESS(expr,imm)  # 3 # gen_eqless(bnode, "l", 1, 0);
+expr: O_LESS(imm,expr)  # 3 # gen_eqless(bnode, "l", 0, 1);
 
-expr: O_EQ(expr,expr) # 5 # gen_eqless_ee(bnode, "e");
-expr: O_EQ(expr,imm) # 5 # gen_eqless_ei(bnode, "e");
-expr: O_EQ(imm,expr) # 5 # gen_eqless_ie(bnode, "e");
+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_FIELD(exprno) # 1 # KIDREG2PARM(0); printf("\tmovq %li(%%%s), %%%s\n", bnode->soffset * 8, KID_REG(0), BN_REG);