code review 7221082: cmd/dist: redirect acid output to file to separate from...

src/cmd/dist/buildruntime.c

 // Copyright 2012 The Go Authors.  All rights reserved.
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
 
 #include "a.h"
 
 /*
  * Helpers for building pkg/runtime.
  */
 
@@ skipping 187 matching lines @@
         bwritestr(&out, "// auto generated by go tool dist\n\n");
         for(i=0; i<nelem(zasmhdr); i++) {
                 if(hasprefix(goarch, zasmhdr[i].goarch) && hasprefix(goos, zasmhdr[i].goos)) {
                         bwritestr(&out, zasmhdr[i].hdr);
                         goto ok;
                 }
         }
         fatal("unknown $GOOS/$GOARCH in mkzasm");
 ok:
 
-        // Run 6c -D GOOS_goos -D GOARCH_goarch -I workdir -a -o workdir/proc.acid proc.c
+        // Run 6c -D GOOS_goos -D GOARCH_goarch -I workdir -a -n -o workdir/proc.acid proc.c
         // to get acid [sic] output.
         vreset(&argv);
         vadd(&argv, bpathf(&b, "%s/%sc", tooldir, gochar));
         vadd(&argv, "-D");
         vadd(&argv, bprintf(&b, "GOOS_%s", goos));
         vadd(&argv, "-D");
         vadd(&argv, bprintf(&b, "GOARCH_%s", goarch));
         vadd(&argv, "-I");
         vadd(&argv, bprintf(&b, "%s", workdir));
+        vadd(&argv, "-a");
+        vadd(&argv, "-n");
         vadd(&argv, "-o");
         vadd(&argv, bpathf(&b, "%s/proc.acid", workdir));
-        vadd(&argv, "-a");
-        vadd(&argv, "-n");

[iant, 2013/02/01 05:57:18]

This -n option is not in the comment above.

         vadd(&argv, "proc.c");
         runv(nil, dir, CheckExit, &argv);
         readfile(&in, bpathf(&b, "%s/proc.acid", workdir));
 ········
         // Convert input like
         //      aggr G
         //      {
         //              Gobuf 24 sched;
         //              'Y' 48 stack0;
         //      }
@@ skipping 53 matching lines @@
 // Mostly we just write the output of 6c -q to the file.
 // However, we run it on multiple files, so we have to delete
 // the duplicated definitions, and we don't care about the funcs
 // and consts, so we delete those too.
 //·
 void
 mkzruntimedefs(char *dir, char *file)
 {
         int i, skip;
         char *p;
-        Buf in, b, out;
+        Buf in, b, b1, out;
         Vec argv, lines, fields, seen;
 ········
         binit(&in);
         binit(&b);
+        binit(&b1);
         binit(&out);
         vinit(&argv);
         vinit(&lines);
         vinit(&fields);
         vinit(&seen);
 ········
         bwritestr(&out, "// auto generated by go tool dist\n"
                 "\n"
                 "package runtime\n"
                 "import \"unsafe\"\n"
                 "var _ unsafe.Pointer\n"
                 "\n"
         );
 
 ········
-        // Run 6c -D GOOS_goos -D GOARCH_goarch -I workdir -q
+        // Run 6c -D GOOS_goos -D GOARCH_goarch -I workdir -q -n -o workdir/runtimedefs
         // on each of the runtimedefs C files.
         vadd(&argv, bpathf(&b, "%s/%sc", tooldir, gochar));
         vadd(&argv, "-D");
         vadd(&argv, bprintf(&b, "GOOS_%s", goos));
         vadd(&argv, "-D");
         vadd(&argv, bprintf(&b, "GOARCH_%s", goarch));
         vadd(&argv, "-I");
         vadd(&argv, bprintf(&b, "%s", workdir));
         vadd(&argv, "-q");
+        vadd(&argv, "-n");
+        vadd(&argv, "-o");
+        vadd(&argv, bpathf(&b, "%s/runtimedefs", workdir));
         vadd(&argv, "");
         p = argv.p[argv.len-1];
         for(i=0; i<nelem(runtimedefs); i++) {
                 argv.p[argv.len-1] = runtimedefs[i];
-                runv(&b, dir, CheckExit, &argv);
+                runv(nil, dir, CheckExit, &argv);
+                readfile(&b, bpathf(&b1, "%s/runtimedefs", workdir));
                 bwriteb(&in, &b);
         }
         argv.p[argv.len-1] = p;
 ················
         // Process the aggregate output.
         skip = 0;
         splitlines(&lines, bstr(&in));
         for(i=0; i<lines.len; i++) {
                 p = lines.p[i];
                 // Drop comment, func, and const lines.
@@ skipping 21 matching lines @@
                         continue;
                 }
 ················
                 bwritestr(&out, p);
         }
 ········
         writefile(&out, file, 0);
 
         bfree(&in);
         bfree(&b);
+        bfree(&b1);
         bfree(&out);
         vfree(&argv);
         vfree(&lines);
         vfree(&fields);
         vfree(&seen);
 }