code review 108570043: liblink: fix warnings on Plan 9

src/liblink/asm5.c

 // Inferno utils/5l/span.c
 // http://code.google.com/p/inferno-os/source/browse/utils/5l/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 699 matching lines @@
                                 p = op;
                                 continue;
                         }
                         // can't happen: blitrl is not nil, but checkpool didn't flushpool
                         ctxt->diag("internal inconsistency");
                         break;
                 }
                 ctxt->curp = p;
                 p->pc = c;
                 o = oplook(ctxt, p);
-                m = o->size;
                 if(ctxt->headtype != Hnacl) {
                         m = o->size;
                 } else {
                         m = asmoutnacl(ctxt, c, p, o, nil);
                         c = p->pc; // asmoutnacl might change pc for alignment
                         o = oplook(ctxt, p); // asmoutnacl might change p in rare cases
                 }
                 if(m % 4 != 0 || p->pc % 4 != 0) {
                         ctxt->diag("!pc invalid: %P size=%d", p, m);
                 }
@@ skipping 63 matching lines @@
                                         p->link = q;
                                         q->as = AB;
                                         q->to.type = D_BRANCH;
                                         q->pcond = q->link->link;
                                         bflag = 1;
                                 }
                         }
  */
                         opc = p->pc;
                         if(ctxt->headtype != Hnacl) {
                                 m = o->size;

[minux, 2014/07/11 20:19:50]

you may as well remove the braces around this line for consistency.

[0intro, 2014/07/11 20:24:20]

Done.

-                        } else {
+                        } else
                                 m = asmoutnacl(ctxt, c, p, o, nil);
-                                c = p->pc; // asmoutnacl might change pc for alignment
-                        }
                         if(p->pc != opc) {
                                 bflag = 1;
                                 //print("%P pc changed %d to %d in iter. %d\n", p, opc, (int32)p->pc, times);
                         }
                         c = p->pc + m;
                         if(m % 4 != 0 || p->pc % 4 != 0) {
                                 ctxt->diag("pc invalid: %P size=%d", p, m);
                         }
                         if(m > sizeof(out))
                                 ctxt->diag("instruction size too large: %d > %d", m, sizeof(out));
@@ skipping 1893 matching lines @@
 
         // rest of exp and mantissa (cd-efgh)
         n |= (h >> 16) & 0x3f;
 
 //print("match %.8lux %.8lux %d\n", l, h, n);
         return n;
 
 no:
         return -1;
 }