X-Git-Url: http://wien.tomnetworks.com/gitweb/?a=blobdiff_plain;f=codea%2Fcode.bfe;h=b00bdfebde1f1858501e6ed72345d9d4a1540bb7;hb=b871b3e6a4d6fc4f1e7f830bace6f6c654ec1b0f;hp=12e712cebd55a5e6078181bb3af46d84c0f1ebd6;hpb=2409d7f24e555476f099496bb2c541f590b7d37b;p=uebersetzerbau-ss10.git

diff --git a/codea/code.bfe b/codea/code.bfe
index 12e712c..b00bdfe 100644
--- a/codea/code.bfe
+++ b/codea/code.bfe
@@ -32,10 +32,18 @@ void gen_e_eno(struct treenode *bnode, char *instr)
 	printf("\t%s %%%s, %%%s\n", instr, KID_REG(1), KID_REG(0));
 }
 
+void gen_e_field(struct treenode *bnode, char *instr)
+{
+	printf("\t//gen_e_field(%s)\n", instr);
+	KIDREG2ID(0);
+	KIDKIDREG2PARM(1,0);
+	printf("\t%s %d(%%%s), %%%s\n", instr, bnode->kids[1]->soffset * 8, KIDKID_REG(1,0), KID_REG(0));
+}
+
 void gen_e_imm(struct treenode *bnode, char *instr)
 {
 	printf("\t//gen_e_imm(%s)\n", instr);
-	KIDREG2ID(0);
+	KIDREG2PARM(0);
 	KIDREG2ID(1);
 	/* man kann sich ein move der konstante bei der multiplikation ersparen */
 	if(strcmp(instr, "imulq") == 0) {
@@ -69,7 +77,12 @@ void gen_eqless(struct treenode *bnode, char *op, short e0, short e1, short deep
 	if(e1) { KIDREG2PARM(1); } else { KIDREG2ID(1); }
 
 	if(e0 && e1) {
-		printf("\tcmp %%%s, %%%s\n", KID_REG(1), KID_REG(0));
+		if(deep) {
+			KIDKIDREG2PARM(1,0);
+			printf("\tcmp %d(%%%s), %%%s\n", bnode->kids[1]->soffset *8, KIDKID_REG(1,0), KID_REG(0));
+		} else {
+			printf("\tcmp %%%s, %%%s\n", KID_REG(1), KID_REG(0));
+		}
 	} else if(e0 && !e1) {
 		if (deep == 0) {
 			printf("\tcmp $%d, %%%s\n", KID_VAL(1), KID_REG(0));
@@ -119,15 +132,17 @@ expr: imm # 1 # moveimm(BN_VAL, BN_REG);
 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,expr)  # 2 # gen_imm_eno(bnode, "subq");
-expr: O_SUB(O_ID,O_MUL(O_MONE,expr)) # 1 # gen_lea(bnode,0);
-expr: O_SUB(O_ID,O_MUL(O_MTWO,expr)) # 1 # gen_lea(bnode,0);
-expr: O_SUB(O_ID,O_MUL(O_MFOUR,expr)) # 1 # gen_lea(bnode,0);
-expr: O_SUB(O_ID,O_MUL(O_MEIGHT,expr)) # 1 # gen_lea(bnode,0);
+expr: O_SUB(expr,O_FIELD(expr)) # 2 # gen_e_field(bnode, "subq");
+
+expr: O_SUB(expr,O_MUL(O_MONE,expr)) # 1 # gen_lea(bnode,0);
+expr: O_SUB(expr,O_MUL(O_MTWO,expr)) # 1 # gen_lea(bnode,0);
+expr: O_SUB(expr,O_MUL(O_MFOUR,expr)) # 1 # gen_lea(bnode,0);
+expr: O_SUB(expr,O_MUL(O_MEIGHT,expr)) # 1 # gen_lea(bnode,0);
 
-expr: O_SUB(O_ID,O_MUL(expr,O_MONE)) # 1 # gen_lea(bnode,1);
-expr: O_SUB(O_ID,O_MUL(expr,O_MTWO)) # 1 # gen_lea(bnode,1);
-expr: O_SUB(O_ID,O_MUL(expr,O_MFOUR)) # 1 # gen_lea(bnode,1);
-expr: O_SUB(O_ID,O_MUL(expr,O_MEIGHT)) # 1 # gen_lea(bnode,1);
+expr: O_SUB(expr,O_MUL(expr,O_MONE)) # 1 # gen_lea(bnode,1);
+expr: O_SUB(expr,O_MUL(expr,O_MTWO)) # 1 # gen_lea(bnode,1);
+expr: O_SUB(expr,O_MUL(expr,O_MFOUR)) # 1 # gen_lea(bnode,1);
+expr: O_SUB(expr,O_MUL(expr,O_MEIGHT)) # 1 # gen_lea(bnode,1);
 
 expr: O_ADD(expr,expr) # 1 # gen_e_eno(bnode, "addq");
 expr: O_ADD(expr,imm)    # 2 # gen_e_imm(bnode, "addq");
@@ -139,12 +154,15 @@ expr: O_MUL(imm,expr)  # 1 # gen_imm_eno(bnode, "imulq");
 
 expr: O_OR(expr,expr) # 1 # gen_e_eno(bnode, "orq");
 expr: O_OR(expr,imm)    # 2 # gen_e_imm(bnode, "orq");
+expr: O_OR(expr,O_FIELD(expr)) # 2 # gen_e_field(bnode, "orq");
 
 expr: O_LESS(expr,expr) # 3 # gen_eqless(bnode, "l", 1, 1, 0);
+expr: O_LESS(expr,O_FIELD(expr)) # 3 # gen_eqless(bnode, "l", 1, 1, 1);
 expr: O_LESS(expr,imm)  # 3 # gen_eqless(bnode, "l", 1, 0, 0);
 expr: O_LESS(imm,expr)  # 3 # gen_eqless(bnode, "g", 0, 1, 0);
 
 expr: O_EQ(expr,expr) # 3 # gen_eqless(bnode, "e", 1, 1, 0);
+expr: O_EQ(expr,O_FIELD(expr)) # 3 # gen_eqless(bnode, "e", 1, 1, 1);
 expr: O_EQ(expr,imm)    # 3 # gen_eqless(bnode, "e", 1, 0, 0);
 expr: O_EQ(imm,expr)    # 3 # gen_eqless(bnode, "e", 0, 1, 0);
 expr: O_EQ(expr,O_NULL) # 3 # gen_eqless(bnode, "e", 1, 0, 0);
@@ -161,6 +179,7 @@ imm: O_SUB(imm,imm)  # 0 # BN_VAL = KID_VAL(0) - KID_VAL(1);
 imm: O_MUL(imm,imm)  # 0 # BN_VAL = KID_VAL(0) * KID_VAL(1);
 imm: O_LESS(imm,imm) # 0 # BN_VAL = KID_VAL(0) < KID_VAL(1) ? 1 : 0;
 imm: O_EQ(imm,imm)   # 0 # BN_VAL = KID_VAL(0) == KID_VAL(1) ? 1 : 0;
+imm: O_OR(imm,imm)   # 0 # BN_VAL = KID_VAL(0) | KID_VAL(1);
 imm: O_NUM # 0 #
 imm: O_MONE # 0 #
 imm: O_MTWO # 0 #