codea: bessere combo fuer less und equal

diff --git a/codea/chelper.c b/codea/chelper.c
index bbbb3617fbd2756b10d53985cf3d7830aad8b6f6..2392092d083b8628aa2c8b296a9b35231c22ff67 100644 (file)
--- a/codea/chelper.c
+++ b/codea/chelper.c
@@ -8,6 +8,10 @@
 #define DDCHELP
 #endif
 
+#define REGLEN 9
+static char *regs64[] = {"rax", "r10", "r11", "r9", "r8", "rcx", "rdx", "rsi", "rdi"};
+static char *regs8l[] = {"al", "r10b", "r11b", "r9b", "r8b", "cl", "dl", "sil", "dil"};
+
 void func_header(char *s)
 {
        printf("\t.globl %1$s\n\t.type %1$s, @function\n%1$s:\n", s);
@@ -39,14 +43,10 @@ void ret(void)
 
 char *next_reg(char *s, short skip, int params)
 {
-       /* TODO: bessere registerwahl. das is gerade a wengal suboptimal... */
-#define REGLEN 9
-       char *regs[] = {"rax", "r10", "r11", "r9", "r8", "rcx", "rdx", "rsi", "rdi"};
-
-       int i=0;
+       int i = 0;
        if (s != (char*) NULL) {
                while(i < REGLEN) {
-                       if(!strcmp(s, regs[i++])) {
+                       if(!strcmp(s, regs64[i++])) {
                                break;
                        }
                }
@@ -55,20 +55,36 @@ char *next_reg(char *s, short skip, int params)
                i++;
        }
 #ifdef DDCHELP
-       fprintf(stderr, "next_reg(): %s (bei %i parameter)\n", regs[i], params);
+       fprintf(stderr, "next_reg(): %s (bei %i parameter)\n", regs64[i], params);
 #endif
        /* TODO: <= passt? */
        if(REGLEN - params <= i) {
-               fprintf(stderr, "next_reg(): register \"%s\" in dem sich ein parameter befindet wird als temporaeres register verwendet(params: %i, i: %i)\n", regs[i], params, i);
+               fprintf(stderr, "next_reg(): register \"%s\" in dem sich ein parameter befindet wird als temporaeres register verwendet(params: %i, i: %i)\n", regs64[i], params, i);
                /* TODO: exit hier? */
 #if 0
                exit(4);
 #endif
        }
+       return regs64[i];
+}
 
-       return regs[i];
+char *reg_64to8l(char *s)
+{
+       int i = 0;
+       if (s != (char*) NULL) {
+               while(i < REGLEN) {
+                       if(!strcmp(s, regs64[i])) {
+                               return regs8l[i];
+                       } else {
+                               i++;
+                       }
+               }
+       }
+       fprintf(stderr, "reg_64to8l(): sollte nicht passieren\n");
+       exit(4);
 }
 
+
 char *param_reg(int num)
 {
        char *regs[] = {"rdi", "rsi", "rdx", "rcx", "r8", "r9"};

diff --git a/codea/chelper.h b/codea/chelper.h
index 396859cc9a1676237a7876eced49216e8fcad568..de14489a05716e0a6aa1e3c587723acb3b93fc79 100644 (file)
--- a/codea/chelper.h
+++ b/codea/chelper.h
@@ -3,6 +3,7 @@
 void func_header(char *s);
 void func_footer(void);
 char *next_reg(char *s, short skip, int params);
+char *reg_64to8l(char *s);
 char *param_reg(int num);
 void ret(void);
 void move(char *src, char *dest);

diff --git a/codea/code.bfe b/codea/code.bfe
index c366fbfbab5e2800b2c1f459ca2308b28cfe6aa9..2928538df945fbe305d6660a1ec31cddf947cc74 100644 (file)
--- a/codea/code.bfe
+++ b/codea/code.bfe
@@ -47,10 +47,8 @@ void gen_imm_eno(struct treenode *bnode, char *instr)
 
 void gen_eqless_footer(struct treenode *bnode, char *op)
 {
-       moveimm(1, BN_REG);
-       printf("\tcmov%s %%%2$s, %%%2$s\n", op, BN_REG);
-       moveimm(0, KID_REG(1));
-       printf("\tcmovn%s %%%s, %%%s\n", op, KID_REG(1), BN_REG);
+       printf("\tset%s %%%s\n", op, reg_64to8l(BN_REG));
+       printf("\tand $1, %%%s\n", BN_REG);
 }
 
 void gen_eqless_ee(struct treenode *bnode, char *op)