code review 2623043: 5l, 6l, 8l: introduce sub-symbols

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 28 matching lines @@
 
 void
 span1(Sym *s)
 {
         Prog *p, *q;
         int32 c, v, loop;
         uchar *bp;
         int n, m, i;
 
         cursym = s;
+········
+        if(s->p != nil)
+                return;
 
         for(p = s->text; p != P; p = p->link) {
                 p->back = 2;    // use short branches first time through
                 if((q = p->pcond) != P && (q->back & 2))
                         p->back |= 1;   // backward jump
 
                 if(p->as == AADJSP) {
                         p->to.type = D_SP;
                         v = -p->from.offset;
                         p->from.offset = v;
@@ skipping 79 matching lines @@
         vlong c;
         int n;
         Section *sect;
 
         if(debug['v'])
                 Bprint(&bso, "%5.2f span\n", cputime());
 
         // NOTE(rsc): If we get rid of the globals we should
         // be able to parallelize these iterations.
         for(cursym = textp; cursym != nil; cursym = cursym->next) {
+                if(cursym->p != nil)
+                        continue;
                 // TODO: move into span1
                 for(p = cursym->text; p != P; p = p->link) {
                         n = 0;
                         if(p->to.type == D_BRANCH)
                                 if(p->pcond == P)
                                         p->pcond = p;
                         if((q = p->pcond) != P)
                                 if(q->back != 2)
                                         n = 1;
                         p->back = n;
@@ skipping 506 matching lines @@
                 r->siz = 8;
                 r->off = p->pc + andptr - and;
         }
         put8(v);
 }
 */
 
 vlong
 symaddr(Sym *s)
 {
-        switch(s->type) {
-        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;
-        }
+        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)
@@ skipping 1056 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++;
         }
 }