codea: register werden anders bzw. spaeter belegt

diff --git a/codea/chelper.c b/codea/chelper.c
index af9cf4cebf88ba3a82a33ff3f841e9cfd65279e0..37c03be8b1c0b889cfe5e08f154794b631d4272f 100644 (file)
--- a/codea/chelper.c
+++ b/codea/chelper.c
@@ -24,6 +24,12 @@ void func_footer(void)
 
 void move(char *src, char *dst)
 {
+       if(src == NULL) {
+               printf("//wtf, src ist null\n");
+       }
+       if(dst == NULL) {
+               printf("//wtf, dst ist null\n");
+       }
        if(strcmp(src,dst) != 0) {
                printf("\tmovq %%%s, %%%s\n", src, dst);
        }

diff --git a/codea/code.bfe b/codea/code.bfe
index 5ec22a21ccfc6c42ba2b44108a00da3138b6112f..a3e1c192b51a77d940eaade26948366288546228 100644 (file)
--- a/codea/code.bfe
+++ b/codea/code.bfe
@@ -10,6 +10,8 @@
  * register verwendet werden */
 #define KIDREG2PARM(A) if(bnode->kids[A]->param_index > -1) { bnode->kids[A]->reg = param_reg(bnode->kids[A]->param_index); }
 
+#define KIDREG2ID(A) if(bnode->kids[A]->op == O_ID && bnode->kids[A]->param_index > -1) move(param_reg(bnode->kids[A]->param_index), bnode->kids[A]->reg);
+
 #include <stdio.h>
 #include <stdlib.h>
 #include <assert.h>
@@ -18,12 +20,17 @@
 
 void gen_e_eno(struct treenode *bnode, char *instr)
 {
+       printf("\t//gen_e_eno(%s)\n", instr);
+       KIDREG2ID(0);
        KIDREG2PARM(1);
        printf("\t%s %%%s, %%%s\n", instr, KID_REG(1), KID_REG(0));
 }
 
 void gen_e_imm(struct treenode *bnode, char *instr)
 {
+       printf("\t//gen_e_imm(%s)\n", instr);
+       KIDREG2ID(0);
+       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);
@@ -35,6 +42,8 @@ void gen_e_imm(struct treenode *bnode, char *instr)
 
 void gen_imm_eno(struct treenode *bnode, char *instr)
 {
+       printf("\t//gen_imm_eno(%s)\n", instr);
+       KIDREG2ID(0);
        KIDREG2PARM(1);
        /* man kann sich ein move der konstante bei der multiplikation ersparen */
        if(strcmp(instr, "imulq") == 0) {
@@ -48,8 +57,8 @@ void gen_imm_eno(struct treenode *bnode, char *instr)
 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) { KIDREG2PARM(0); } else { KIDREG2ID(0); }
+       if(e1) { KIDREG2PARM(1); } else { KIDREG2ID(1); }
 
        if(e0 && e1) {
                printf("\tcmp %%%s, %%%s\n", KID_REG(1), KID_REG(0));
@@ -75,41 +84,41 @@ void gen_eqless(struct treenode *bnode, char *op, short e0, short e1)
 %%
 
 begin: ret # 0 # printf("\n");
-ret: O_RET(expr) # 2 # move(BN_REG, "rax"); func_footer();
+ret: O_RET(retexpr) # 2 # printf("\t//o_ret(expr)\n"); move(BN_REG, "rax"); func_footer();
+
+retexpr: O_ID # 1 # printf("\t//retexpr\n"); if(bnode->param_index > -1) move(param_reg(bnode->param_index), BN_REG);
+retexpr: expr
 
-expr: O_ID # 1 # if(bnode->param_index > -1) move(param_reg(bnode->param_index), BN_REG);
+expr: O_ID # 0 #
 expr: imm # 1 # moveimm(BN_VAL, BN_REG);
 
-expr: O_SUB(expr,exprno) # 1 # gen_e_eno(bnode, "subq");
+expr: O_SUB(expr,expr) # 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(imm,expr)  # 2 # gen_imm_eno(bnode, "subq");
 
-expr: O_ADD(expr,exprno) # 1 # gen_e_eno(bnode, "addq");
+expr: O_ADD(expr,expr) # 1 # gen_e_eno(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,expr) # 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(imm,expr)  # 1 # gen_imm_eno(bnode, "imulq");
 
-expr: O_OR(expr,exprno) # 1 # gen_e_eno(bnode, "orq");
+expr: O_OR(expr,expr) # 1 # gen_e_eno(bnode, "orq");
 expr: O_OR(expr,imm)    # 2 # gen_e_imm(bnode, "orq");
 
 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(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(expr,expr) # 3 # gen_eqless(bnode, "e", 1, 1);
+expr: O_EQ(expr,imm)    # 3 # gen_eqless(bnode, "e", 1, 0);
+expr: O_EQ(imm,expr)    # 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 %d(%%%s), %%%s\n", bnode->soffset * 8, KID_REG(0), BN_REG);
-expr: O_FIELD(imm) # 1 # printf("\tmovq %d, %%%s\n", KID_VAL(0) + (bnode->soffset * 8), BN_REG);
+expr: O_EQ(expr,O_NULL) # 3 # gen_eqless(bnode, "e", 1, 0);
 
+expr: O_FIELD(expr) # 1 # printf("\t//field(expr)\n"); KIDREG2PARM(0); printf("\tmovq %d(%%%s), %%%s\n", bnode->soffset * 8, KID_REG(0), BN_REG);
+expr: O_FIELD(imm) # 1 # printf("\t//field(imm)\n"); printf("\tmovq %d, %%%s\n", KID_VAL(0) + (bnode->soffset * 8), BN_REG);
 
-exprno: O_ID # 0 # /* brauchen wir nicht 'zwischenlagern', weil nur gelesen wird */
-exprno: expr
 
 nexpr: O_EQ(expr,O_NULL) # 0 #