codea: zomg, lauter kleine eingeschlichene bugs!

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

diff --git a/codea/code.bfe b/codea/code.bfe
index c184545647a072bb69a129cd6205c86fef4540cd..f51ccc2d76c0f79ca2a0f969eee524066ac99a4b 100644 (file)
--- a/codea/code.bfe
+++ b/codea/code.bfe
@@ -40,6 +40,19 @@ void gen_e_field(struct treenode *bnode, char *instr)
        printf("\t%s %d(%%%s), %%%s\n", instr, bnode->kids[1]->soffset * 8, KIDKID_REG(1,0), KID_REG(0));
 }
 
+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);
+       }
+}
+
 void gen_e_imm(struct treenode *bnode, char *instr)
 {
        printf("\t//gen_e_imm(%s)\n", instr);
@@ -47,13 +60,32 @@ void gen_e_imm(struct treenode *bnode, char *instr)
        KIDREG2ID(1);
        /* man kann sich ein move der konstante bei der multiplikation ersparen */
        if(strcmp(instr, "imulq") == 0) {
-               printf("\timulq $%d, %%%s, %%%s\n", KID_VAL(1), KID_REG(0), BN_REG);
+               if(KID_VAL(1) == 1 && strcmp(KID_REG(0), BN_REG) == 0) {
+                       printf("\t//multiplikation mit 1 wegoptimiert\n");
+               } else {
+                       printf("\timulq $%d, %%%s, %%%s\n", KID_VAL(1), KID_REG(0), BN_REG);
+               }
        } else {
-               printf("\t%s $%d, %%%s\n", instr, KID_VAL(1), KID_REG(0));
-               move(KID_REG(0), BN_REG);
+               if(strcmp(instr, "subq") == 0 && KID_VAL(1) == 0) {
+                       printf("\t//subtraktion mit 0 wegoptimiert\n");
+                       move(KID_REG(0), BN_REG);
+               } else {
+                       move(KID_REG(0), BN_REG);
+                       printf("\t%s $%d, %%%s\n", instr, KID_VAL(1), BN_REG);
+               }
        }
 }
 
+void gen_imm_field(struct treenode *bnode)
+{
+       printf("\t//gen_imm_field\n");
+       KIDREG2ID(0);
+       KIDKIDREG2PARM(1, 0);
+
+       moveimm(KID_VAL(0), BN_REG);
+       printf("\tsubq %d(%%%s), %%%s\n", bnode->kids[1]->soffset * 8, KIDKID_REG(1, 0), BN_REG);
+}
+
 void gen_imm_eno(struct treenode *bnode, char *instr)
 {
        printf("\t//gen_imm_eno(%s)\n", instr);
@@ -61,7 +93,11 @@ void gen_imm_eno(struct treenode *bnode, char *instr)
        KIDREG2PARM(1);
        /* man kann sich ein move der konstante bei der multiplikation ersparen */
        if(strcmp(instr, "imulq") == 0) {
-               printf("\timulq $%d, %%%s, %%%s\n", KID_VAL(0), KID_REG(1), BN_REG);
+               if(KID_VAL(0) == 1 && strcmp(KID_REG(1), BN_REG) == 0) {
+                       printf("\t//multiplikation mit 1 wegoptimiert\n");
+               } else {
+                       printf("\timulq $%d, %%%s, %%%s\n", KID_VAL(0), KID_REG(1), BN_REG);
+               }
        } else if(strcmp(instr, "addq") == 0) {
                printf("\taddq $%d, %%%s\n", KID_VAL(0), BN_REG);
        } else { /* subq */
@@ -77,7 +113,12 @@ void gen_eqless(struct treenode *bnode, char *op, short e0, short e1, short deep
        if(e1) { KIDREG2PARM(1); } else { KIDREG2ID(1); }
 
        if(e0 && e1) {
-               printf("\tcmp %%%s, %%%s\n", KID_REG(1), KID_REG(0));
+               if(deep) {
+                       KIDKIDREG2PARM(1,0);
+                       printf("\tcmp %d(%%%s), %%%s\n", bnode->kids[1]->soffset *8, KIDKID_REG(1,0), KID_REG(0));
+               } else {
+                       printf("\tcmp %%%s, %%%s\n", KID_REG(1), KID_REG(0));
+               }
        } else if(e0 && !e1) {
                if (deep == 0) {
                        printf("\tcmp $%d, %%%s\n", KID_VAL(1), KID_REG(0));
@@ -108,6 +149,16 @@ void gen_lea(struct treenode *bnode, short e)
        }
 }
 
+void gen_subspecial(struct treenode *bnode)
+{
+       /* tritt z.b. bei snafu_05.0 auf */
+       printf("\t//gen_subspecial\n");
+       KIDREG2ID(0);
+       KIDKIDREG2PARM(1,0);
+       printf("\tsubq %%%s, %%%s\n", KIDKID_REG(1,0), BN_REG);
+       printf("\taddq %%%s, %%%s\n", KIDKID_REG(1,1), BN_REG);
+}
+
 %}
 
 %start begin
@@ -125,8 +176,13 @@ 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,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,O_SUB(O_ID,expr)) # 2 # gen_subspecial(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);
@@ -138,11 +194,14 @@ expr: O_SUB(expr,O_MUL(expr,O_MFOUR)) # 1 # gen_lea(bnode,1);
 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,O_FIELD(expr)) # 2 # gen_e_field(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_MUL(expr,expr) # 1 # gen_e_eno(bnode, "imulq");
+expr: O_MUL(expr,O_FIELD(expr)) # 2 # gen_e_field(bnode, "imulq");
 expr: O_MUL(expr,imm)    # 1 # gen_e_imm(bnode, "imulq");
+expr: O_MUL(O_FIELD(expr),imm)  # 1 # gen_field_imm(bnode);
 expr: O_MUL(imm,expr)  # 1 # gen_imm_eno(bnode, "imulq");
 
 expr: O_OR(expr,expr) # 1 # gen_e_eno(bnode, "orq");
@@ -150,10 +209,12 @@ expr: O_OR(expr,imm)    # 2 # gen_e_imm(bnode, "orq");
 expr: O_OR(expr,O_FIELD(expr)) # 2 # gen_e_field(bnode, "orq");
 
 expr: O_LESS(expr,expr) # 3 # gen_eqless(bnode, "l", 1, 1, 0);
+expr: O_LESS(expr,O_FIELD(expr)) # 3 # gen_eqless(bnode, "l", 1, 1, 1);
 expr: O_LESS(expr,imm)  # 3 # gen_eqless(bnode, "l", 1, 0, 0);
 expr: O_LESS(imm,expr)  # 3 # gen_eqless(bnode, "g", 0, 1, 0);
 
 expr: O_EQ(expr,expr) # 3 # gen_eqless(bnode, "e", 1, 1, 0);
+expr: O_EQ(expr,O_FIELD(expr)) # 3 # gen_eqless(bnode, "e", 1, 1, 1);
 expr: O_EQ(expr,imm)    # 3 # gen_eqless(bnode, "e", 1, 0, 0);
 expr: O_EQ(imm,expr)    # 3 # gen_eqless(bnode, "e", 0, 1, 0);
 expr: O_EQ(expr,O_NULL) # 3 # gen_eqless(bnode, "e", 1, 0, 0);