code review 6922048: cmd/{5,6,8}g: reduce size of Prog and Addr

src/cmd/6g/list.c

 // Derived from Inferno utils/6c/list.c
 // http://code.google.com/p/inferno-os/source/browse/utils/6c/list.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 89 matching lines @@
                         snprint(str, sizeof(str), "$%lld,%R", a->offset, i);
                 else
                         snprint(str, sizeof(str), "%R", i);
                 break;
 
         case D_NONE:
                 str[0] = 0;
                 break;
 
         case D_BRANCH:
-                if(a->branch == nil)
+                if(a->u.branch == nil)
                         snprint(str, sizeof(str), "<nil>");
                 else
-                        snprint(str, sizeof(str), "%d", a->branch->loc);
+                        snprint(str, sizeof(str), "%d", a->u.branch->loc);
                 break;
 
         case D_EXTERN:
                 snprint(str, sizeof(str), "%S+%lld(SB)", a->sym, a->offset);
                 break;
 
         case D_STATIC:
                 snprint(str, sizeof(str), "%S<>+%lld(SB)", a->sym, a->offset);
                 break;
 
         case D_AUTO:
                 snprint(str, sizeof(str), "%S+%lld(SP)", a->sym, a->offset);
                 break;
 
         case D_PARAM:
                 snprint(str, sizeof(str), "%S+%lld(FP)", a->sym, a->offset);
                 break;
 
         case D_CONST:
                 if(fp->flags & FmtLong) {
                         d1 = a->offset & 0xffffffffLL;
                         d2 = (a->offset>>32) & 0xffffffffLL;
                         snprint(str, sizeof(str), "$%lud-%lud", (ulong)d1, (ulong)d2);
                         break;
                 }
                 snprint(str, sizeof(str), "$%lld", a->offset);
                 break;
 
         case D_FCONST:
-                snprint(str, sizeof(str), "$(%.17e)", a->dval);
+                snprint(str, sizeof(str), "$(%.17e)", a->u.dval);
                 break;
 
         case D_SCONST:
-                snprint(str, sizeof(str), "$\"%Y\"", a->sval);
+                snprint(str, sizeof(str), "$\"%Y\"", a->u.sval);
                 break;
 
         case D_ADDR:
                 a->type = a->index;
                 a->index = D_NONE;
                 snprint(str, sizeof(str), "$%D", a);
                 a->index = a->type;
                 a->type = D_ADDR;
                 goto conv;
         }
@@ skipping 194 matching lines @@
                         *p++ = 't';
                         continue;
                 }
                 *p++ = (c>>6) + '0';
                 *p++ = ((c>>3) & 7) + '0';
                 *p++ = (c & 7) + '0';
         }
         *p = 0;
         return fmtstrcpy(fp, str);
 }