code review 884041: runtime: various arm fixes

src/cmd/5l/pass.c

 // Inferno utils/5l/pass.c
 // http://code.google.com/p/inferno-os/source/browse/utils/5l/pass.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 214 matching lines @@
         setarch(p);
         a = p->as;
         if(a == ATEXT)
                 curtext = p;
         if(!curtext->from.sym->reachable) {
                 p = p->cond;
                 goto loop;
         }
         if(a == AB) {
                 q = p->cond;
-                if(q != P) {
+                if(q != P && q->as != ATEXT) {

[kaib, 2010/04/05 10:34:38]

heh, this would have taken me a while to find..

[rsc1, 2010/04/05 17:48:57]

Me too.

                         p->mark |= FOLL;
                         p = q;
                         if(!(p->mark & FOLL))
                                 goto loop;
                 }
         }
         if(p->mark & FOLL) {
                 for(i=0,q=p; i<4; i++,q=q->link) {
                         if(q == lastp)
                                 break;
@@ skipping 727 matching lines @@
                 newdata(et, off, sizeof(int32), D_EXTERN);
                 off += sizeof(int32);
         }
         et->value = off;
         if(sv == 0)
                 sv = 1;
         str->value = sv;
         exports = ne;
         free(esyms);
 }