X-Git-Url: http://wien.tomnetworks.com/gitweb/?a=blobdiff_plain;f=gesamt%2Fcode.bfe;h=33979ba71c1aed73be25d9e7cb0e8298e453f5bd;hb=666304deecc2d65c75b5633cce0669b08a1f821c;hp=68d6089d3fa4d0b62cc39858496073fc20ec7c30;hpb=3fa41a742ef73439fac40da45356f0b20ef8d8fc;p=uebersetzerbau-ss10.git

diff --git a/gesamt/code.bfe b/gesamt/code.bfe
index 68d6089..33979ba 100644
--- a/gesamt/code.bfe
+++ b/gesamt/code.bfe
@@ -148,7 +148,7 @@ void gen_eqless(struct treenode *bnode, char *op, short e0, short e1, short deep
 
 void gen_lea(struct treenode *bnode, short e)
 {
-	printf("\t//gen_lea(e: %i)\n", e);
+	printf("\t//gen_lea(e= %i)\n", e);
 	KIDREG2PARM(0);
 	if(e) {
 		KIDKIDREG2PARM(1,0);
@@ -190,17 +190,18 @@ void assign_var(struct treenode *bnode)
 void make_call(struct treenode *bnode)
 {
 	int j;
-	/* params pushen */
+	printf("\t//params pushen\n");
 	for(j = 0; j < bnode->soffset; j++) {
 		printf("\txchg %%%s, %d(%%rsp)\n", param_reg(j), j*8);
 	}
-	/* vars pushen */
-	for(j = 6; j > 6 - bnode->vars - 1; j--) {
+	printf("\t//vars pushen\n");
+	for(j = bnode->soffset; j < bnode->soffset + bnode->vars; j++) {
 		printf("\tpushq %%%s\n", param_reg(j));
 	}
 
 	/* TODO: schoener machen... */
 	if(strcmp(BN_REG, "rax")!=0) {
+		printf("\t//tmp register pushen\n");
 		printf("\tpushq %%rax\n");
 		if(strcmp(BN_REG, "r10")!=0) {
 			printf("\tpushq %%r10\n");
@@ -216,7 +217,7 @@ void make_call(struct treenode *bnode)
 	}
 
 	/* vars poppen */
-	for(j = 6 - bnode->vars; j < 6+1; j++) {
+	for(j = bnode->soffset + bnode->vars - 1; j > bnode->soffset - 1; j--) {
 		printf("\tpopq %%%s\n", param_reg(j));
 	}
 
@@ -228,19 +229,42 @@ 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);
+	printf("\t//args-nr-> %i (%%%s) [moveit= %i]\n", bnode->soffset, param_reg(bnode->soffset), moveit);
 	if(moveit) { /* expr */
-		printf("\tpushq %%%s\n", BN_REG == (char *) NULL ? param_reg(bnode->soffset) : BN_REG);
+		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) {
+				KIDREG2PARM(1);
+				printf("\tpushq %%%s\n", KID_REG(1));
+			} else {
+				printf("\tpushq %%%s\n", param_reg(bnode->soffset));
+			}
+		} else {
+			printf("\tpushq %%%s\n", BN_REG);
+		}
 	} else { /* just O_ID */
 		KIDREG2PARM(0);
 		printf("\tpushq %%%s\n", KID_REG(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
 
 %%
 
@@ -258,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));
@@ -266,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