X-Git-Url: http://wien.tomnetworks.com/gitweb/?a=blobdiff_plain;f=gesamt%2Fcode.bfe;h=76175ab861406e4a53d3926abe98321e77bf09f0;hb=7ba1a3cafae8f8c6bf6caaedf5cc4a3f73a5aa10;hp=1dc1e3f75e4546bf2e0d80f70fe12981cb312ed7;hpb=146b4d2c403e663e1fb454621bb5656e4798ce57;p=uebersetzerbau-ss10.git

diff --git a/gesamt/code.bfe b/gesamt/code.bfe
index 1dc1e3f..76175ab 100644
--- a/gesamt/code.bfe
+++ b/gesamt/code.bfe
@@ -43,8 +43,11 @@ 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));
+	KIDKIDREG2PARM(1,1);
+	KIDREG2PARM(0);
+	move(KID_REG(0), BN_REG);
 	printf("\tsubq %%%s, %%%s\n", KIDKID_REG(1,1), BN_REG);
+	printf("\tsubq %%%s, %%%s\n", KIDKID_REG(1,0), BN_REG);
 }
 
 void gen_e_field(struct treenode *bnode, char *instr)
@@ -187,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 = bnode->paramges; j < bnode->paramges + bnode->vars; j++) {
+	printf("\t//vars pushen\n");
+	for(j = 6; j > 6 - 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");
@@ -213,16 +217,12 @@ void make_call(struct treenode *bnode)
 	}
 
 	/* vars poppen */
-	for(j = bnode->paramges + bnode->vars - 1; j >= bnode->paramges; j--) {
+	for(j = 7 - bnode->vars; j < 7; j++) {
 		printf("\tpopq %%%s\n", param_reg(j));
 	}
 
 	/* params poppen */
-#if 0
-	for(j = bnode->soffset - 1; j >= 0; j--) {
-#else
 	for(j = 0; j < bnode->soffset; j++) {
-#endif
 		printf("\tpopq %%%s\n", param_reg(j));
 	}
 }
@@ -231,7 +231,16 @@ void prep_arg(struct treenode *bnode, int 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));