code review 2587041: 5l, 6l, 8l: link pclntab and symtab as ordinary rodata ...

src/cmd/6l/span.c

 // Inferno utils/6l/span.c
 // http://code.google.com/p/inferno-os/source/browse/utils/6l/span.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 178 matching lines @@
 
 void
 xdefine(char *p, int t, vlong v)
 {
         Sym *s;
 
         s = lookup(p, 0);
         s->type = t;
         s->value = v;
         s->reachable = 1;
+        s->special = 1;
 }
 
 void
 instinit(void)
 {
         int c, i;
 
         for(i=1; optab[i].as; i++) {
                 c = optab[i].as;
                 if(opindex[c] != nil) {
@@ skipping 455 matching lines @@
                 r->off = p->pc + andptr - and;
         }
         put8(v);
 }
 */
 
 vlong
 symaddr(Sym *s)
 {
         switch(s->type) {
-        case SFIXED:
-                return s->value;
-········
         case SMACHO:
                 return segdata.vaddr + segdata.filelen - dynptrsize + s->value;
 
         default:
                 if(!s->reachable)
                         diag("unreachable symbol in symaddr - %s", s->name);
                 return s->value;
         }
 }
 
 static vlong
 vaddr(Adr *a, Reloc *r)
 {
         int t;
         vlong v;
         Sym *s;
 ········
         if(r != nil)
                 memset(r, 0, sizeof *r);
 
         t = a->type;
         v = a->offset;
         if(t == D_ADDR)
                 t = a->index;
         switch(t) {
         case D_STATIC:
         case D_EXTERN:
                 s = a->sym;
-                switch(s->type) {
-                case SFIXED:
-                        v += s->value;
-                        break;
-                default:
-                        if(!s->reachable)
-                                diag("unreachable symbol in vaddr - %s", s->name);
-                        if(r == nil) {
-                                diag("need reloc for %D", a);
-                                errorexit();
-                        }
-                        r->type = D_ADDR;
-                        r->siz = 4;     // TODO: 8 for external symbols
-                        r->off = -1;    // caller must fill in
-                        r->sym = s;
-                        r->add = v;
-                        v = 0;
-                        break;
+                if(!s->reachable)
+                        diag("unreachable symbol in vaddr - %s", s->name);
+                if(r == nil) {
+                        diag("need reloc for %D", a);
+                        errorexit();
                 }
+                r->type = D_ADDR;
+                r->siz = 4;     // TODO: 8 for external symbols
+                r->off = -1;    // caller must fill in
+                r->sym = s;
+                r->add = v;
+                v = 0;
         }
         return v;
 }
 
 static void
 asmandsz(Adr *a, int r, int rex, int m64)
 {
         int32 v;
         int t, scale;
         Reloc rel;
@@ skipping 1024 matching lines @@
                 for(r=cursym->r+cursym->nr; r-- > cursym->r; ) {
                         if(r->off < p->pc)
                                 break;
                         r->off++;
                 }
                 memmove(and+np+1, and+np, n-np);
                 and[np] = 0x40 | rexflag;
                 andptr++;
         }
 }