[dev.power64] code review 152570049: all: merge default into dev.power64

src/liblink/data.c

 // Derived from Inferno utils/6l/obj.c and utils/6l/span.c
 // http://code.google.com/p/inferno-os/source/browse/utils/6l/obj.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)
@@ skipping 65 matching lines @@
         int32 off, siz, i, fl;
         float32 flt;
         uchar *cast;
         vlong o;
         Reloc *r;
 
         off = p->from.offset;
         siz = ctxt->arch->datasize(p);
         if(off < 0 || siz < 0 || off >= 1<<30 || siz >= 100)
                 mangle(pn);
+        if(ctxt->enforce_data_order && off < s->np)
+                ctxt->diag("data out of order (already have %d)\n%P", p);
         symgrow(ctxt, s, off+siz);
 
         if(p->to.type == ctxt->arch->D_FCONST) {
                 switch(siz) {
                 default:
                 case 4:
                         flt = p->to.u.dval;
                         cast = (uchar*)&flt;
                         for(i=0; i<4; i++)
                                 s->p[off+i] = cast[fnuxi4[i]];
@@ skipping 265 matching lines @@
         s->size += 4;
         symgrow(ctxt, s, s->size);
         r = addrel(s);
         r->sym = t;
         r->off = i;
         r->siz = 4;
         r->type = R_ADDR;
         r->add = add;
         return i + r->siz;
 }