gesamt: registerbelegung fuer VARs doch wieder geaendert...

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

diff --git a/gesamt/code.bfe b/gesamt/code.bfe
index dba50235426bbed1fe7f5ca1fafd391771e66342..33979ba71c1aed73be25d9e7cb0e8298e453f5bd 100644 (file)
--- a/gesamt/code.bfe
+++ b/gesamt/code.bfe
@@ -187,18 +187,15 @@ void assign_var(struct treenode *bnode)
        printf("\tsub $%d, %%%s\n", KIDKID_VAL(0,1), KID_REG(1));
 }
 
-/* dirty...*/
-static short xchg_param[7] = {0};
 void make_call(struct treenode *bnode)
 {
        int j;
        printf("\t//params pushen\n");
        for(j = 0; j < bnode->soffset; j++) {
-               if(xchg_param[j] == 1)
-                       printf("\txchg %%%s, %d(%%rsp)\n", param_reg(j), j*8);
+               printf("\txchg %%%s, %d(%%rsp)\n", param_reg(j), j*8);
        }
        printf("\t//vars pushen\n");
-       for(j = 6; j > 6 - bnode->vars; j--) {
+       for(j = bnode->soffset; j < bnode->soffset + bnode->vars; j++) {
                printf("\tpushq %%%s\n", param_reg(j));
        }
 
@@ -220,7 +217,7 @@ void make_call(struct treenode *bnode)
        }
 
        /* vars poppen */
-       for(j = 7 - bnode->vars; j < 7; j++) {
+       for(j = bnode->soffset + bnode->vars - 1; j > bnode->soffset - 1; j--) {
                printf("\tpopq %%%s\n", param_reg(j));
        }
 
@@ -233,7 +230,6 @@ void make_call(struct treenode *bnode)
 void prep_arg(struct treenode *bnode, int moveit)
 {
        printf("\t//args-nr-> %i (%%%s) [moveit= %i]\n", bnode->soffset, param_reg(bnode->soffset), moveit);
-       xchg_param[bnode->soffset] = 1;
        if(moveit) { /* expr */
                if((BN_REG == (char *) NULL) || (bnode->kids[1] != TREENULL && bnode->kids[1]->op == O_ID && bnode->kids[1]->kids[0] == TREENULL && bnode->kids[1]->kids[1] == TREENULL)) {
                        if(bnode->kids[1]->name != (char *) NULL && strcmp(bnode->kids[1]->name,"this")!=0) {
@@ -241,7 +237,6 @@ void prep_arg(struct treenode *bnode, int moveit)
                                printf("\tpushq %%%s\n", KID_REG(1));
                        } else {
                                printf("\tpushq %%%s\n", param_reg(bnode->soffset));
-                               xchg_param[bnode->soffset] = 0;
                        }
                } else {
                        printf("\tpushq %%%s\n", BN_REG);
@@ -249,16 +244,27 @@ void prep_arg(struct treenode *bnode, int moveit)
        } else { /* just O_ID */
                KIDREG2PARM(0);
                printf("\tpushq %%%s\n", KID_REG(0));
-               if(strcmp(KID_REG(0), param_reg(bnode->soffset)) == 0) {
-                       xchg_param[bnode->soffset] = 0;
-               }
        }
 }
 
+void gen_sub_field(struct treenode *bnode)
+{
+       /* siehe intelli_03.0 @ gesamt */
+       printf("\t//gen_sub_field\n");
+       KIDKIDREG2PARM(1,0);
+       if(!(strcmp(bnode->kids[0]->kids[0]->kids[0]->name, bnode->kids[1]->kids[0]->name) == 0 &&
+                       bnode->kids[0]->kids[0]->soffset == bnode->kids[1]->soffset)) {
+               KIDKIDKIDREG2PARM(0,0,0);
+               printf("\tmov %d(%%%s), %%%s\n", bnode->kids[0]->kids[0]->soffset * 8, KIDKIDKID_REG(0,0,0), BN_REG);
+               printf("\tmov %%%s, %d(%%%s)\n", BN_REG, bnode->kids[1]->soffset * 8, KIDKID_REG(1,0));
+       }
+       printf("\tsub $%d, %d(%%%s)\n", bnode->kids[0]->kids[1]->val, bnode->kids[1]->soffset * 8, KIDKID_REG(1,0));
+}
+
 %}
 
 %start begin
-%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 O_MTWO=12 O_MFOUR=13 O_MEIGHT=14 O_MONE=15 O_ASSIGN=16 O_IF=17 O_BOOL=18 O_CALL=19 O_ARG=20 O_NOTHING=21
+%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 O_MTWO=12 O_MFOUR=13 O_MEIGHT=14 O_MONE=15 O_ASSIGN=16 O_IF=17 O_BOOL=18 O_CALL=19 O_ARG=20 O_NOTHING=21 O_EXPR=22
 
 %%
 
@@ -276,6 +282,7 @@ assign: O_ASSIGN(O_SUB(O_ID,O_NUM), O_ID) # 1 # assign_var(bnode);
 
 assign: O_ASSIGN(expr, O_FIELD(expr)) # 1 # KIDKIDREG2PARM(1,0); printf("\tmovq %%%s, %d(%%%s)\n", BN_REG, bnode->kids[1]->soffset * 8, KIDKID_REG(1,0));
 assign: O_ASSIGN(O_ID, O_FIELD(expr)) # 1 # KIDREG2PARM(0); KIDKIDREG2PARM(1,0); printf("\tmovq %%%s, %d(%%%s)\n", KID_REG(0), bnode->kids[1]->soffset * 8, KIDKID_REG(1,0));
+assign: O_ASSIGN(O_SUB(O_FIELD(O_ID), imm), O_FIELD(O_ID)) # 1 # gen_sub_field(bnode);
 
 
 ifstat: O_IF(O_ID) # 1 # /* fuer faelle wie "if bla then" noetig */ KIDREG2PARM(0); printf("\ttest $-1, %%%s\n", KID_REG(0));
@@ -284,6 +291,7 @@ ifstat: O_IF(O_BOOL(expr)) # 1 # /* dann braucht man kein test */
 
 
 ret: O_RET(retexpr) # 2 # printf("\t//o_ret(expr)\n"); move(BN_REG, "rax");
+ret: O_EXPR(expr) # 0 #
 
 retexpr: O_ID # 1 # printf("\t//retexpr\n"); if(bnode->param_index > -1) move(param_reg(bnode->param_index), BN_REG);
 retexpr: expr