codea: immediate values gehen auch fuer subtraktion

diff --git a/codea/chelper.c b/codea/chelper.c
index 70c8a662611eab493618b201113f4580bea854ec..4926b8ac6283fe1c15640b91a8343a0940b25a43 100644 (file)
--- a/codea/chelper.c
+++ b/codea/chelper.c
@@ -19,6 +19,13 @@ void move(char *src, char *dst)
        }
 }
 
+void moveimm(long imm, char *dst)
+{
+       char buf[100];
+       sprintf(buf, "$%li", imm);
+       printf("\tmovq %s, %%%s\n", buf, dst);
+}
+
 void ret(void)
 {
        printf("\tret\n");

diff --git a/codea/code.bfe b/codea/code.bfe
index 9dcffae83212fccbd4c4e5966d975ad00c8bd108..0b14110b88c157699202abd854b284046681e70a 100644 (file)
--- a/codea/code.bfe
+++ b/codea/code.bfe
@@ -1,6 +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
+
 #include <stdio.h>
 #include <stdlib.h>
 #include <assert.h>
@@ -10,19 +15,30 @@
 %}
 
 %start begin
-%term O_RET=1 O_NOT=2 O_SUB=3 O_MUL=4 O_OR=5 O_LESS=6 O_EQ=7 O_ID=8 O_ADD=9
+%term O_RET=1 O_NOT=2 O_SUB=3 O_MUL=4 O_OR=5 O_LESS=6 O_EQ=7 O_ID=8 O_ADD=9 O_NUM=10
 
 %%
 
 begin: ret # 0 # printf("// end\n");
-ret: O_RET(expr) # 1 # move(bnode->reg, "rax"); ret();
+ret: O_RET(expr) # 2 # move(BNR, "rax"); ret();
 
-expr: O_ID # 1 # if(bnode->param_index > -1) move(param_reg(bnode->param_index), bnode->reg);
-expr: O_SUB(expr,expr) # 1 # printf("\tsubq %%%s, %%%s\n", bnode->kids[0]->reg, bnode->kids[1]->reg);
-expr: O_ADD(expr,expr) # 1 # printf("\taddq %%%s, %%%s\n", bnode->kids[1]->reg, bnode->kids[0]->reg);
+expr: O_ID # 1 # if(bnode->param_index > -1) move(param_reg(bnode->param_index), BNR);
+expr: imm # 1 # moveimm(BNV, BNR);
 
-%%
+expr: O_SUB(expr,expr) # 1 # fprintf(stderr, "osub0\n"); printf("\tsubq %%%s, %%%s\n", KIDR(0), KIDR(1));
+expr: O_SUB(imm,expr) # 2 # fprintf(stderr, "osub1\n"); printf("\tsubq $%li, %%%s\n", KIDV(0), KIDR(1)); move(KIDR(1), BNR);
+expr: O_SUB(expr,imm) # 3 # fprintf(stderr, "osub2\n"); moveimm(KIDV(1), BNR); printf("\tsubq %%%s, %%%s\n", KIDR(0), BNR);
+
+expr: O_ADD(expr,expr) # 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(0), KIDR(1)); move(KIDR(1), BNR);
 
 
+imm: O_ADD(imm,imm) # 0 # BNV = KIDV(0)+KIDV(1);
+imm: O_SUB(imm,imm) # 0 # BNV = KIDV(1)-KIDV(0);
+imm: O_NUM # 0 #
+
+%%
+
 /* vim: filetype=c
  */

diff --git a/codea/parser.y b/codea/parser.y
index 0622a80543d273d1eb5baf067d872460300de05f..4bd07bb6b2e232058695a74ac43a78c5a55d7d35 100644 (file)
--- a/codea/parser.y
+++ b/codea/parser.y
@@ -22,15 +22,15 @@
 @end
 
 @autoinh s
-@autosyn node
+@autosyn node imm
 
 @attributes { char *name; } IDENT
 @attributes { long val; } NUM
 @attributes { struct symbol *f; int parms; } Parms
 @attributes { struct symbol *f; } FeldID Structdef Program
 @attributes { struct symbol *s; } Methoddef Statseq Exprs
-@attributes { struct symbol *s; struct treenode *node; } Expr Minusterm
-@attributes { struct symbol *s; struct treenode *node; } Lexpr Multerm Orterm Term Feld
+@attributes { struct symbol *s; struct treenode *node; short imm; } Expr Minusterm Term
+@attributes { struct symbol *s; struct treenode *node; } Lexpr Multerm Orterm Feld
 @attributes { struct symbol *sin; struct symbol *sout; struct treenode *node; } Statement
 
 @traversal @postorder c
@@ -204,11 +204,19 @@ Expr:
        | Term Minusterm
          @{
            @i @Expr.node@ = new_node(O_SUB, @Minusterm.node@, @Term.node@);
-
-               @reg {@Term.node@->reg = @Expr.node@->reg;
-                       @Minusterm.node@->reg = next_reg(@Term.node@->reg, @Expr.node@->skip);
-                       fprintf(stderr, "2at-expr_: Term.node \"%s\", Minusterm.node \"%s\"\n", @Term.node@->reg, @Minusterm.node@->reg);
+               @i @Expr.imm@ = @Term.imm@ && @Minusterm.imm@;
+
+               @reg {
+                       /* TODO */
+                       if(@Minusterm.imm@) {
+                               @Minusterm.node@->reg = @Expr.node@->reg;
+                               @Term.node@->reg = next_reg(@Minusterm.node@->reg, @Expr.node@->skip);
+                               @Minusterm.node@->skip = 1;
+                       } else {
+                               @Term.node@->reg = @Expr.node@->reg;
+                               @Minusterm.node@->reg = next_reg(@Term.node@->reg, @Expr.node@->skip);
                        }
+               }
          @}
 
        | Term Multerm
@@ -224,11 +232,13 @@ Expr:
        | Term '<' Term
          @{
            @i @Expr.node@ = TREENULL; fprintf(stderr, "w00t6\n");
+               /* das is bloedsinn atm */ @i @Expr.imm@ = @Term.0.imm@ && @Term.1.imm@;
          @}
 
        | Term '=' Term
          @{
            @i @Expr.node@ = TREENULL; fprintf(stderr, "w00t7\n");
+               /* das is bloedsinn atm */ @i @Expr.imm@ = @Term.0.imm@ && @Term.1.imm@;
          @}
        ;
 
@@ -236,18 +246,17 @@ Minusterm:
          '-' Term Minusterm
          @{
            @i @Minusterm.node@ = new_node(O_ADD, @Minusterm.1.node@, @Term.node@);
+               @i @Minusterm.imm@ = @Term.imm@ && @Minusterm.1.imm@;
 
-           @reg { @Minusterm.1.node@->reg = @Minusterm.node@->reg;
+           @reg {
+                       @Minusterm.1.node@->reg = @Minusterm.node@->reg;
                        @Term.node@->reg = next_reg(@Minusterm.1.node@->reg, @Minusterm.node@->skip);
-                       fprintf(stderr, "0at-minusterm_: Minusterm.node \"%s\", Minusterm.1.node \"%s\", Term.node \"%s\"\n", @Minusterm.node@->reg, @Minusterm.1.node@->reg, @Term.node@->reg);
-                       }
+               }
          @}
 
        | '-' Term
          @{
-           @reg @Term.node@->reg = @Minusterm.node@->reg; {
-                       fprintf(stderr, "1at-minusterm_: Minusterm.node \"%s\", Term.node \"%s\"\n", @Minusterm.node@->reg, @Term.node@->reg);
-                       }
+           @reg @Term.node@->reg = @Minusterm.node@->reg;
          @}
        ;
 
@@ -288,19 +297,25 @@ Term:
 
        | NUM
          @{
-           @i @Term.node@ = TREENULL;
+           @i @Term.node@ = new_number(@NUM.val@);
+               @i @Term.imm@ = 1;
+
            @reg fprintf(stderr, "wtf2\n");
          @}
 
        | '-' NUM
          @{
-           @i @Term.node@ = TREENULL;
+           @i @Term.node@ = new_number(-1 * (@NUM.val@));
+               @i @Term.imm@ = 1;
+
            @reg fprintf(stderr, "wtf3\n");
          @}
 
        | THIS
          @{
            @i @Term.node@ = new_node(O_ID, TREENULL, TREENULL); @Term.node@->param_index = 0;
+               @i @Term.imm@ = 0;
+
            @reg fprintf(stderr, "wtf4\n");
          @}
 
@@ -313,24 +328,32 @@ Term:
                                @Term.node@->param_index = tmp->param_index;
                        }
                }
+               @i @Term.imm@ = 0;
+
            @reg fprintf(stderr, "wtf5\n");
          @}
 
        | Feld
          @{
            @i @Term.node@ = TREENULL;
+               @i @Term.imm@ = 0;
+
            @reg fprintf(stderr, "wtf6\n");
          @}
 
        | IDENT '(' Exprs ')'
          @{
            @i @Term.node@ = TREENULL;
+               @i @Term.imm@ = 0;
+
            @reg fprintf(stderr, "wtf7\n");
          @}
 
        | Term '.' IDENT '(' Exprs ')'
          @{
            @i @Term.node@ = TREENULL;
+               @i @Term.imm@ = 0;
+
            @reg fprintf(stderr, "wtf8\n");
          @}
 

diff --git a/codea/tree.c b/codea/tree.c
index 8807c785bcbd42de98f3997bbce7cc1a4342a0ec..1490ae6302c0b58891775605fa0977f7a26229f6 100644 (file)
--- a/codea/tree.c
+++ b/codea/tree.c
@@ -6,9 +6,22 @@
 #define DDTREE
 #endif
 
-struct treenode *new_node(int op, struct treenode *l, struct treenode *r)
+static struct treenode *_new_plain(int op)
 {
        struct treenode *new = (TREECAST) malloc(TREESIZE);
+       new->op = op;
+       new->kids[0] = new->kids[1] = TREENULL;
+       new->parent = TREENULL;
+       new->label = NULL;
+       new->name = new->reg = (char *)NULL;
+       new->val = new->skip = 0;
+       new->param_index = -1;
+       return new;
+}
+
+struct treenode *new_node(int op, struct treenode *l, struct treenode *r)
+{
+       struct treenode *new = _new_plain(op);
 
 #ifdef DDTREE
        fprintf(stderr, "new_node: %i (%s)\n", op, o_names[op]);
@@ -16,8 +29,17 @@ struct treenode *new_node(int op, struct treenode *l, struct treenode *r)
 
        new->kids[0] = l;
        new->kids[1] = r;
-       new->op = op;
        new->name = (char *)NULL;
        return new;
 }
 
+struct treenode *new_number(long val)
+{
+       struct treenode *new = _new_plain(O_NUM);
+#ifdef DDTREE
+       fprintf(stderr, "new_number: %i\n", val);
+#endif
+       new->val = val;
+       return new;
+}
+

diff --git a/codea/tree.h b/codea/tree.h
index 0d46c38ecccddc96288d61fcb3b7704adfba694a..b4e6fca76db5a6bbad3a8f699744f3a8cc339393 100644 (file)
--- a/codea/tree.h
+++ b/codea/tree.h
@@ -18,7 +18,8 @@ enum {
        O_LESS,
        O_EQ,
        O_ID,
-       O_ADD
+       O_ADD,
+       O_NUM
 };
 
 static char *o_names[] = {
@@ -31,7 +32,8 @@ static char *o_names[] = {
        "O_LESS",
        "O_EQ",
        "O_ID",
-       "O_ADD"
+       "O_ADD",
+       "O_NUM"
 };
 
 struct treenode {
@@ -56,5 +58,6 @@ typedef struct treenode *treenodep;
 #define PANIC printf
 
 struct treenode *new_node(int op, struct treenode *l, struct treenode *r);
+struct treenode *new_number(long val);
 
 #endif