[dotgnu-pnet-commits] pnet ChangeLog codegen/cg_stmt.tc engine/debugg...

[Radek Polak]

CVSROOT:        /sources/dotgnu-pnet
Module name:    pnet
Changes by:     Radek Polak <radekp>    07/03/21 12:58:07

Modified files:
        .              : ChangeLog 
        codegen        : cg_stmt.tc 
        engine         : debugger.c 

Log message:
        fix IL output and quote local variable names

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/pnet/ChangeLog?cvsroot=dotgnu-pnet&r1=1.3439&r2=1.3440
http://cvs.savannah.gnu.org/viewcvs/pnet/codegen/cg_stmt.tc?cvsroot=dotgnu-pnet&r1=1.44&r2=1.45
http://cvs.savannah.gnu.org/viewcvs/pnet/engine/debugger.c?cvsroot=dotgnu-pnet&r1=1.16&r2=1.17

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/dotgnu-pnet/pnet/ChangeLog,v
retrieving revision 1.3439
retrieving revision 1.3440
diff -u -b -r1.3439 -r1.3440
--- ChangeLog   21 Mar 2007 08:37:04 -0000      1.3439
+++ ChangeLog   21 Mar 2007 12:58:07 -0000      1.3440
@@ -1,5 +1,12 @@
 2007-03-21  Radek Polak  <address@hidden>
 
+       * codegen/cg_stmt.tc: Output quoted variable names so that we produce
+       valid IL output on variable name named after one of IL keywords.
+
+       * engine/debugger.c: Remove hack for variables starting with '_'.
+
+2007-03-21  Radek Polak  <address@hidden>
+
        * codegen/cg_decls.tc, codegen/cg_gen.h: Flag to suppress creating extra
        scope for locals after method declaration.
 

Index: codegen/cg_stmt.tc
===================================================================
RCS file: /sources/dotgnu-pnet/pnet/codegen/cg_stmt.tc,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -b -r1.44 -r1.45
--- codegen/cg_stmt.tc  21 Mar 2007 08:37:04 -0000      1.44
+++ codegen/cg_stmt.tc  21 Mar 2007 12:58:07 -0000      1.45
@@ -1707,10 +1707,7 @@
                while((data = ILScopeLocalsIter(node->scope, data, &iter, 
&index,
                                                                                
                                                        &name)))
                {
-                       /* TODO: fix ilasm so that it can compile local 
variables with same
-                          name as IL opcode. Now it fails e.g. when local 
variable is
-                          named "box" */
-                       fprintf(info->asmOutput, ".locals <_%s=%lu>\n", name, 
index);
+                       fprintf(info->asmOutput, ".locals <'%s'=%lu>\n", name, 
index);
                }
        }
 

Index: engine/debugger.c
===================================================================
RCS file: /sources/dotgnu-pnet/pnet/engine/debugger.c,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -b -r1.16 -r1.17
--- engine/debugger.c   21 Mar 2007 08:37:04 -0000      1.16
+++ engine/debugger.c   21 Mar 2007 12:58:07 -0000      1.17
@@ -1143,8 +1143,7 @@
                                continue;
                        }
                }
-               /* TODO: fix ilasm and remove starting '_' from locals names */
-               DebuggerHelper_AddLocal(thread, name + 1, type, local->addr);
+               DebuggerHelper_AddLocal(thread, name, type, local->addr);
 
                current++;
                num--;