aboutsummaryrefslogtreecommitdiff
path: root/src/cmd/5l
diff options
context:
space:
mode:
authorRuss Cox <rsc@golang.org>2015-03-05 13:57:36 -0500
committerRuss Cox <rsc@golang.org>2015-03-05 21:49:39 +0000
commitcdb7d7dcc22a2f09df0267641b73d45703ffc6e8 (patch)
treec4eb0505b505287138c8cc05e3321f4c0b7277e8 /src/cmd/5l
parentd970bea88500b21c85d51199d6b0deb1e764950a (diff)
downloadgo-cdb7d7dcc22a2f09df0267641b73d45703ffc6e8.tar.xz
cmd/5l etc: restore comments lost during C -> Go conversion
It appears that c2go dropped comments inside struct { ... } and enum { ... }. Restore them. Identified missing comments by checking for comments present in the C code but not the Go code, made a list, and then reapplied with some mechanical help. Missing comment finder: http://play.golang.org/p/g6qNUAo1Y0 Change-Id: I323ab45c7ef9d51e28eab3b699eb14bee1eef66b Reviewed-on: https://go-review.googlesource.com/6899 Reviewed-by: Rob Pike <r@golang.org>
Diffstat (limited to 'src/cmd/5l')
-rw-r--r--src/cmd/5l/asm.go2
-rw-r--r--src/cmd/5l/l.go4
2 files changed, 3 insertions, 3 deletions
diff --git a/src/cmd/5l/asm.go b/src/cmd/5l/asm.go
index 3f9b7ada90..525764edf4 100644
--- a/src/cmd/5l/asm.go
+++ b/src/cmd/5l/asm.go
@@ -619,7 +619,7 @@ func asmb() {
fmt.Fprintf(&ld.Bso, "%5.2f dwarf\n", obj.Cputime())
}
- if ld.Debug['w'] == 0 {
+ if ld.Debug['w'] == 0 { // TODO(minux): enable DWARF Support
dwarfoff := uint32(ld.Rnd(int64(uint64(ld.HEADR)+ld.Segtext.Length), int64(ld.INITRND)) + ld.Rnd(int64(ld.Segdata.Filelen), int64(ld.INITRND)))
ld.Cseek(int64(dwarfoff))
diff --git a/src/cmd/5l/l.go b/src/cmd/5l/l.go
index 9eb078dcc5..a52154594d 100644
--- a/src/cmd/5l/l.go
+++ b/src/cmd/5l/l.go
@@ -67,8 +67,8 @@ const (
PtrSize = 4
IntSize = 4
RegSize = 4
- MaxAlign = 8
- FuncAlign = 4
+ MaxAlign = 8 // max data alignment
+ FuncAlign = 4 // single-instruction alignment
MINLC = 4
)