codea: offset fuer feldzugriff

[uebersetzerbau-ss10.git] / codea / parser.y

diff --git a/codea/parser.y b/codea/parser.y
index 736cb233a8aa3073ab0547a7608bbfb493dfe4e8..a6bb1d3a059a43fa0d98676876fd9a2ae9ef6c05 100644 (file)
--- a/codea/parser.y
+++ b/codea/parser.y
@@ -39,7 +39,8 @@
 @attributes { char *name; } IDENT
 @attributes { long val; } NUM
 @attributes { struct symbol *f; int paramges; int parms; } Parms
-@attributes { struct symbol *f; } FeldID Structdef Program
+@attributes { struct symbol *f; int soffset; } Program
+@attributes { struct symbol *f; int soffset; int offsetcount; } FeldID Structdef
 @attributes { struct symbol *s; } Methoddef
 @attributes { struct symbol *s; int gparamges; } Statseq Exprs
 @attributes { struct symbol *s; int gparamges; struct treenode *node; int exprcount; } Expr Minusterm Term Multerm Orterm
@@ -55,6 +56,7 @@ Input:
          Program
          @{
            @i @Program.f@ = tab_new();
+               @i @Program.soffset@ = 0;
            @gen @revorder(1) printf("\t.text\n");
          @}
        ;
@@ -64,11 +66,14 @@ Program:
          @{
            @i @Methoddef.s@ = @Program.0.f@;
            @i @Program.1.f@ = @Program.0.f@;
+           @i @Program.1.soffset@ = @Program.0.soffset@;
          @}
 
        | Structdef ';' Program
          @{
            @i @Program.1.f@ = tab_merge(@Program.0.f@, @Structdef.f@, 1);
+               @i @Structdef.offsetcount@ = @Program.0.soffset@;
+               @i @Program.1.soffset@ = @Structdef.soffset@;
          @}
        |
        ;
@@ -87,6 +92,8 @@ Structdef:
          STRUCT FeldID END
          @{
            @i @Structdef.f@ = @FeldID.f@;
+               @i @FeldID.offsetcount@ = @Structdef.offsetcount@;
+               @i @Structdef.soffset@ = @FeldID.soffset@;
          @}
        ;
 
@@ -94,9 +101,9 @@ Parms:
          /* lokale Vars werden in Statement in die tabelle eingefuegt */
          IDENT Parms
          @{
-           @i @Parms.1.parms@ = @Parms.parms@ + 1;
+           @i @Parms.1.parms@ = @Parms.0.parms@ + 1;
                @i @Parms.0.paramges@ = @Parms.1.paramges@;
-           @i @Parms.0.f@ = tab_add_symbol(@Parms.1.f@, @IDENT.name@, S_PARM, 1, @Parms.parms@);
+           @i @Parms.0.f@ = tab_add_symbol(@Parms.1.f@, @IDENT.name@, S_PARM, 1, @Parms.parms@, -1);
          @}
 
        |
@@ -109,12 +116,16 @@ Parms:
 FeldID:
          IDENT FeldID
          @{
-           @i @FeldID.0.f@ = tab_add_symbol(@FeldID.1.f@, @IDENT.name@, S_FIELD, 1, -1);
+           @i @FeldID.1.offsetcount@ = @FeldID.0.offsetcount@ + 1;
+               @i @FeldID.0.soffset@ = @FeldID.1.soffset@;
+               /* TODO: offset hier verwenden */
+           @i @FeldID.0.f@ = tab_add_symbol(@FeldID.1.f@, @IDENT.name@, S_FIELD, 1, -1, @FeldID.0.offsetcount@);
          @}
 
        |
          @{
            @i @FeldID.f@ = tab_new();
+               @i @FeldID.soffset@ = @FeldID.offsetcount@;
          @}
        ;
 
@@ -142,7 +153,7 @@ Statement:
          @{
                /* tab_clone ist hier noetig, vgl. folgendes statement
                 * > var x := x - 1; */
-               @i @Statement.sout@ = tab_add_symbol(tab_clone(@Statement.sin@), @IDENT.name@, S_VAR, 1, -1);
+               @i @Statement.sout@ = tab_add_symbol(tab_clone(@Statement.sin@), @IDENT.name@, S_VAR, 1, -1, -1);
                xxputsin(@Expr.s@,)
            @i @Statement.node@ = TREENULL;
          @}