code review 9223046: cmd/5l, cmd/6l, cmd/8l, cmd/gc, runtime: generate and u...

src/cmd/8l/obj.c

 // Inferno utils/8l/obj.c
 // http://code.google.com/p/inferno-os/source/browse/utils/8l/obj.c
 //
 //      Copyright © 1994-1999 Lucent Technologies Inc.  All rights reserved.
 //      Portions Copyright © 1995-1997 C H Forsyth (forsyth@terzarima.net)
 //      Portions Copyright © 1997-1999 Vita Nuova Limited
 //      Portions Copyright © 2000-2007 Vita Nuova Holdings Limited (www.vitanuova.com)
 //      Portions Copyright © 2004,2006 Bruce Ellis
 //      Portions Copyright © 2005-2007 C H Forsyth (forsyth@terzarima.net)
 //      Revisions Copyright © 2000-2007 Lucent Technologies Inc. and others
@@ skipping 612 matching lines @@
         case ATYPE:
                 if(skip)
                         goto casdef;
                 pc++;
                 goto loop;
 
         case ANPTRS:
                 if(skip)
                         goto casdef;
                 if(cursym->nptrs != -1) {
-                        diag("ldobj1: multiple pointer maps defined for %s", s->name);
+                        diag("ldobj1: multiple pointer maps defined for %s", cursym->name);
                         errorexit();
                 }
                 if(p->to.offset > cursym->args/PtrSize) {
-                        diag("ldobj1: pointer map definition for %s exceeds its argument size", s->name);
+                        diag("ldobj1: pointer map definition for %s exceeds its argument size", cursym->name);
                         errorexit();
                 }
                 cursym->nptrs = p->to.offset;
                 if(cursym->nptrs != 0)
                         cursym->ptrs = mal((rnd(cursym->nptrs, 32) / 32) * sizeof(*cursym->ptrs));
                 pc++;
                 goto loop;
 
         case APTRS:
                 if(skip)
                         goto casdef;
                 if(cursym->nptrs == -1 || cursym->ptrs == NULL) {
-                        diag("ldobj1: pointer map data provided for %s without a definition", s->name);
+                        diag("ldobj1: pointer map data provided for %s without a definition", cursym->name);
                         errorexit();
                 }
                 if(p->from.offset*32 >= rnd(cursym->nptrs, 32)) {
-                        diag("ldobj1: excessive pointer map data provided for %s", s->name);
+                        diag("ldobj1: excessive pointer map data provided for %s", cursym->name);
                         errorexit();
                 }
                 cursym->ptrs[p->from.offset] = p->to.offset;
                 pc++;
                 goto loop;
 
         case ATEXT:
                 s = p->from.sym;
                 if(s->text != nil) {
                         if(p->from.scale & DUPOK) {
@@ skipping 152 matching lines @@
 appendp(Prog *q)
 {
         Prog *p;
 
         p = prg();
         p->link = q->link;
         q->link = p;
         p->line = q->line;
         return p;
 }