[release-branch.go1] cmd/gc: limit data disassembly to -SS

««« backport 14ce24bcd818
cmd/gc: limit data disassembly to -SS

This makes -S useful again.

R=ken2
CC=golang-dev
https://golang.org/cl/6302054

»»»

diff --git a/src/cmd/5g/gobj.c b/src/cmd/5g/gobj.c
index b562ba888ba26115ccc0563a6a3f0e66bc42ba68..2763e7b1673d16c4dbf9e9d85fdd1a7b5d2c7039 100644 (file)
--- a/src/cmd/5g/gobj.c
+++ b/src/cmd/5g/gobj.c
@@ -198,7 +198,8 @@ dumpfuncs(void)
                if(isblank(pl->name))
                        continue;
 
-               if(debug['S']) {
+               // -S prints code; -SS prints code and data
+               if(debug['S'] && (pl->name || debug['S']>1)) {
                        s = S;
                        if(pl->name != N)
                                s = pl->name->sym;

diff --git a/src/cmd/6g/gobj.c b/src/cmd/6g/gobj.c
index 80de2f750b8265e2fc16a2acc9e2fdca2eeb248f..8c9208374a45f93763d20c82a94ef139b52fd954 100644 (file)
--- a/src/cmd/6g/gobj.c
+++ b/src/cmd/6g/gobj.c
@@ -244,7 +244,8 @@ dumpfuncs(void)
                if(isblank(pl->name))
                        continue;
 
-               if(debug['S']) {
+               // -S prints code; -SS prints code and data
+               if(debug['S'] && (pl->name || debug['S']>1)) {
                        s = S;
                        if(pl->name != N)
                                s = pl->name->sym;

diff --git a/src/cmd/8g/gobj.c b/src/cmd/8g/gobj.c
index d8c8f5ab9fe9c8f20136678f8c8fbf430b787077..da0055cd9b9792db9b148982472e31361852b0a2 100644 (file)
--- a/src/cmd/8g/gobj.c
+++ b/src/cmd/8g/gobj.c
@@ -242,7 +242,8 @@ dumpfuncs(void)
                if(isblank(pl->name))
                        continue;
 
-               if(debug['S']) {
+               // -S prints code; -SS prints code and data
+               if(debug['S'] && (pl->name || debug['S']>1)) {
                        s = S;
                        if(pl->name != N)
                                s = pl->name->sym;

diff --git a/src/cmd/gc/doc.go b/src/cmd/gc/doc.go
index 163d3862c31c9a1a4ad994a12ada29a92a3a8c75..8d8f8967b7147ecfd5ab97a9d8243a6fcfad25f4 100644 (file)
--- a/src/cmd/gc/doc.go
+++ b/src/cmd/gc/doc.go
@@ -47,7 +47,9 @@ Flags:
        -N
                disable optimizations
        -S
-               write assembly language text to standard output
+               write assembly language text to standard output (code only)
+       -SS
+               write assembly language text to standard output (code and data)
        -u
                disallow importing packages not marked as safe
        -V