change some names

diff --git a/util/ceg/EM_parser/common/C_instr2.c b/util/ceg/EM_parser/common/C_instr2.c
index 8d71003..ad4742f 100644 (file)
--- a/util/ceg/EM_parser/common/C_instr2.c
+++ b/util/ceg/EM_parser/common/C_instr2.c
@@ -73,7 +73,7 @@ t_C_info C_info[] = {
        /* EXTERNAL     */   { "( g)\narith g;\n{\n",
                               { STRING, ARITH, 0, 0},
                               { "FAKE-ARGUMENT", "g", 0, 0},
-                              { "extnd_hol( holno)", "g", 0, 0}},
+                              { "extnd_hol( B_holno)", "g", 0, 0}},
        /* EXTERNAL_DNAM*/   { "( g, o)\nchar *g;\narith o;\n{\n",
                               { STRING, ARITH, 0, 0},
                               { "g", "o", 0, 0},
@@ -89,7 +89,7 @@ t_C_info C_info[] = {
        /* B_ARG        */   { "( b)\nlabel b;\n{\n",
                               { STRING, 0, 0, 0},
                               { "b", 0, 0, 0},
-                              { "extnd_ilb( b, procno)", 0, 0, 0}},
+                              { "extnd_ilb( b, B_procno)", 0, 0, 0}},
        /* STRING+ARITH */   { "( val, sz)\nchar *val;\narith sz;\n{\n",
                               { STRING, ARITH, 0, 0},
                               { "val", "sz", 0, 0},
@@ -117,7 +117,7 @@ t_C_info C_info[] = {
        /* BSS_ILB      */   { "( n, b, i)\narith n;\nlabel b;int i;\n\n{\n",
                               { ARITH, STRING, INT, 0},
                               { "n", "b", "i", 0},
-                              { "n", "extnd_ilb( b, procno)", "i", 0}},
+                              { "n", "extnd_ilb( b, B_procno)", "i", 0}},
        /* ID+N_ARG     */   { "( p, n)\nchar *p;\narith n;\n{\n",
                               { STRING, ARITH, 0, 0},
                               { "p", "n", 0, 0},

diff --git a/util/ceg/EM_parser/common/help.c b/util/ceg/EM_parser/common/help.c
index bb2c143..811a8b5 100644 (file)
--- a/util/ceg/EM_parser/common/help.c
+++ b/util/ceg/EM_parser/common/help.c
@@ -157,8 +157,7 @@ char *name;
 file_header()
 {
        out( "#define CODE_EXPANDER\n");
-       out( "#include <em.h>\n");
        out( "#include \"mach.h\"\n");
        out( "#include \"back.h\"\n\n");
-       out( "extern int holno, procno;\n\n");
+       out( "extern int B_holno, B_procno;\n\n");
 }