codea: aus kompliziert mach einfach

[uebersetzerbau-ss10.git] / codea / code.bfe

diff --git a/codea/code.bfe b/codea/code.bfe
index 4d024afa153327e2e2dc635271f764ae6d6d2576..71508309984d84be3344ba341443eccd1c46b5d6 100644 (file)
--- a/codea/code.bfe
+++ b/codea/code.bfe
@@ -39,6 +39,14 @@ void gen_e_eno(struct treenode *bnode, char *instr)
        printf("\t%s %%%s, %%%s\n", instr, KID_REG(1), KID_REG(0));
 }
 
+void gen_id_eno(struct treenode *bnode)
+{
+       printf("\t//gen_id_eno\n");
+       KIDKIDREG2PARM(1,0);
+       printf("\taddq %%%s, %%%s\n", KIDKID_REG(1,0), KIDKID_REG(1,1));
+       printf("\tsubq %%%s, %%%s\n", KIDKID_REG(1,1), BN_REG);
+}
+
 void gen_e_field(struct treenode *bnode, char *instr)
 {
        printf("\t//gen_e_field(%s)\n", instr);
@@ -52,12 +60,7 @@ void gen_field_imm(struct treenode *bnode)
        printf("\t//gen_field_imm\n");
        KIDKIDREG2PARM(0,0);
        KIDREG2ID(1);
-
-       if(KID_VAL(1) == 1 && strcmp(KID_REG(0), BN_REG) == 0) {
-               printf("\t//multiplikation mit 1 wegoptimiert\n");
-       } else {
-               printf("\timulq $%d, %d(%%%s), %%%s\n", KID_VAL(1), bnode->kids[0]->soffset * 8, KIDKID_REG(0, 0), BN_REG);
-       }
+       printf("\timulq $%d, %d(%%%s), %%%s\n", KID_VAL(1), bnode->kids[0]->soffset * 8, KIDKID_REG(0, 0), BN_REG);
 }
 
 void gen_e_imm(struct treenode *bnode, char *instr)
@@ -105,11 +108,8 @@ void gen_imm_eno(struct treenode *bnode, char *instr)
                } else {
                        printf("\timulq $%d, %%%s, %%%s\n", KID_VAL(0), KID_REG(1), BN_REG);
                }
-       } else if(strcmp(instr, "addq") == 0) {
+       } else { /* addq */
                printf("\taddq $%d, %%%s\n", KID_VAL(0), BN_REG);
-       } else { /* subq */
-               moveimm(KID_VAL(0), BN_REG);
-               printf("\t%s %%%s, %%%s\n", instr, KID_REG(1), BN_REG);
        }
 }
 
@@ -189,15 +189,15 @@ expr: O_ID # 0 #
 expr: imm # 1 # moveimm(BN_VAL, BN_REG);
 
 
-expr: O_SUB(expr,expr)          # 1 # gen_e_eno(bnode, "subq");
+expr: O_SUB(expr,expr)          # 2 # gen_e_eno(bnode, "subq");
 expr: O_SUB(expr,O_FIELD(expr)) # 2 # gen_e_field(bnode, "subq");
-expr: O_SUB(expr,imm)           # 2 # gen_e_imm(bnode, "subq");
-expr: O_SUB(imm,expr)           # 2 # gen_imm_eno(bnode, "subq");
-expr: O_SUB(imm,O_FIELD(expr))  # 2 # gen_imm_field(bnode);
+expr: O_SUB(expr,imm)           # 1 # gen_e_imm(bnode, "subq");
 
 expr: O_SUB(expr,O_SUB(O_ID,expr)) # 2 # gen_subspecial(bnode, 0);
 expr: O_SUB(expr,O_SUB(imm,expr))  # 2 # gen_subspecial(bnode, 1);
 
+expr: O_SUB(expr, O_ADD(O_ID,expr))    # 1 # gen_id_eno(bnode);
+
 expr: O_SUB(expr,O_MUL(O_MONE,expr))   # 1 # gen_lea(bnode,0);
 expr: O_SUB(expr,O_MUL(O_MTWO,expr))   # 1 # gen_lea(bnode,0);
 expr: O_SUB(expr,O_MUL(O_MFOUR,expr))  # 1 # gen_lea(bnode,0);
@@ -211,7 +211,7 @@ expr: O_SUB(expr,O_MUL(expr,O_MEIGHT)) # 1 # gen_lea(bnode,1);
 
 expr: O_ADD(expr,expr)   # 1 # gen_e_eno(bnode, "addq");
 expr: O_ADD(expr,imm)    # 2 # gen_e_imm(bnode, "addq");
-expr: O_ADD(imm,expr)    # 2 # gen_imm_eno(bnode, "addq");
+expr: O_ADD(imm,expr)    # 1 # gen_imm_eno(bnode, "addq");
 
 expr: O_ADD(expr,O_FIELD(expr)) # 2 # gen_e_field(bnode, "addq");