codea: refactor

diff --git a/codea/code.bfe b/codea/code.bfe
index 750f308a518a0af87b48263b89caa29bb436f1d2..52803e40b34493631b2ed5a62c6f9076f86682df 100644 (file)
--- a/codea/code.bfe
+++ b/codea/code.bfe
@@ -1,11 +1,11 @@
 %{
 #define BFEHAX
 
-#define KIDR(A) bnode->kids[A]->reg
-#define KIDV(A) bnode->kids[A]->val
-#define BNR bnode->reg
-#define BNV bnode->val
-#define KIDPARM(A) if(bnode->kids[A]->param_index > -1) { bnode->kids[A]->reg = param_reg(bnode->kids[A]->param_index); }
+#define KID_REG(A) bnode->kids[A]->reg
+#define KID_VAL(A) bnode->kids[A]->val
+#define BN_REG bnode->reg
+#define BN_VAL bnode->val
+#define KIDREG2PARM(A) if(bnode->kids[A]->param_index > -1) { bnode->kids[A]->reg = param_reg(bnode->kids[A]->param_index); }
 
 #include <stdio.h>
 #include <stdlib.h>
@@ -21,25 +21,24 @@
 %%
 
 begin: ret # 0 # printf("\n");
-ret: O_RET(expr) # 2 # move(BNR, "rax"); func_footer();
+ret: O_RET(expr) # 2 # move(BN_REG, "rax"); func_footer();
 
-expr: O_ID # 1 # if(bnode->param_index > -1) move(param_reg(bnode->param_index), BNR);
-expr: imm # 1 # moveimm(BNV, BNR);
+expr: O_ID # 1 # if(bnode->param_index > -1) move(param_reg(bnode->param_index), BN_REG);
+expr: imm # 1 # moveimm(BN_VAL, BN_REG);
 
-expr: O_SUB(expr,exprno) # 1 # KIDPARM(1); printf("\tsubq %%%s, %%%s\n", KIDR(1), KIDR(0));
-expr: O_SUB(expr,imm) # 2 # printf("\tsubq $%li, %%%s\n", KIDV(1), KIDR(0)); move(KIDR(0), BNR);
-expr: O_SUB(imm,exprno) # 3 # moveimm(KIDV(0), BNR); KIDPARM(1); printf("\tsubq %%%s, %%%s\n", KIDR(1), BNR);
+expr: O_SUB(expr,exprno) # 1 # KIDREG2PARM(1); printf("\tsubq %%%s, %%%s\n", KID_REG(1), KID_REG(0));
+expr: O_SUB(expr,imm) # 2 # printf("\tsubq $%li, %%%s\n", KID_VAL(1), KID_REG(0)); move(KID_REG(0), BN_REG);
+expr: O_SUB(imm,exprno) # 3 # moveimm(KID_VAL(0), BN_REG); KIDREG2PARM(1); printf("\tsubq %%%s, %%%s\n", KID_REG(1), BN_REG);
 
-expr: O_ADD(expr,exprno) # 1 # KIDPARM(1); printf("\taddq %%%s, %%%s\n", KIDR(1), KIDR(0));
-expr: O_ADD(imm,expr) # 1 # printf("\taddq $%li, %%%s\n", KIDV(1), KIDR(0)); move(KIDR(0), BNR);
-expr: O_ADD(expr,imm) # 1 # printf("\taddq $%li, %%%s\n", KIDV(1), KIDR(0)); move(KIDR(0), BNR);
+expr: O_ADD(expr,exprno) # 1 # KIDREG2PARM(1); printf("\taddq %%%s, %%%s\n", KID_REG(1), KID_REG(0));
+expr: O_ADD(imm,expr) # 1 # printf("\taddq $%li, %%%s\n", KID_VAL(1), KID_REG(0)); move(KID_REG(0), BN_REG);
 
 exprno: O_ID # 0 # /* brauchen wir nicht 'zwischenlagern', weil nur gelesen wird */
 exprno: expr
 
 
-imm: O_ADD(imm,imm) # 0 # BNV = KIDV(0)+KIDV(1);
-imm: O_SUB(imm,imm) # 0 # BNV = KIDV(0)-KIDV(1);
+imm: O_ADD(imm,imm) # 0 # BN_VAL = KID_VAL(0)+KID_VAL(1);
+imm: O_SUB(imm,imm) # 0 # BN_VAL = KID_VAL(0)-KID_VAL(1);
 imm: O_NUM # 0 #
 
 %%