X-Git-Url: http://wien.tomnetworks.com/gitweb/?a=blobdiff_plain;f=gesamt%2Fcode.bfe;h=a95ed5b6996ca83b07df25c842bad44043b77c4c;hb=e01d4b5591d2684af59e9dbb30330da9aa145794;hp=4bd1e83219cba8d57c760efedf09eb946abd7153;hpb=bd2d6716e386dd5cafc483af0cfc5aa608c1891e;p=uebersetzerbau-ss10.git

diff --git a/gesamt/code.bfe b/gesamt/code.bfe
index 4bd1e83..a95ed5b 100644
--- a/gesamt/code.bfe
+++ b/gesamt/code.bfe
@@ -187,18 +187,20 @@ 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};
+/* ... dirty */
+static short sc[8] = {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)
+		if(sc[j] == 1)
 			printf("\txchg %%%s, %d(%%rsp)\n", param_reg(j), j*8);
+		else if (sc[j] == 0)
+			printf("\tpushq %%%s\n", param_reg(j));
 	}
 	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,20 +222,29 @@ 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));
 	}
 
 	/* params poppen */
+	for(j = bnode->soffset - 1; j >= 0; j--) {
+		if(sc[j] == 0)
+			printf("\tpopq %%%s\n", param_reg(j));
+	}
 	for(j = 0; j < bnode->soffset; j++) {
-		printf("\tpopq %%%s\n", param_reg(j));
+		if(sc[j] > 0)
+			printf("\tpopq %%%s\n", param_reg(j));
 	}
+
+	/* clear stack_control array */
+	for(j = 0; j < sizeof sc / sizeof sc[0]; j++)
+		sc[j] = 0;
 }
 
 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;
+	sc[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 +252,7 @@ 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;
+				sc[bnode->soffset] = 2;
 			}
 		} else {
 			printf("\tpushq %%%s\n", BN_REG);
@@ -249,12 +260,23 @@ 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
@@ -265,7 +287,7 @@ void prep_arg(struct treenode *bnode, int moveit)
 begin: ret # 0 # printf("\n");
 begin: assign # 0 #
 begin: ifstat # 0 #
-begin: args # 0 #
+begin: expr # 0 #
 
 
 assign: O_ASSIGN(expr, O_ID) # 1 # KIDREG2PARM(1); printf("\tmovq %%%s, %%%s\n", BN_REG, KID_REG(1));
@@ -276,6 +298,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));