[dev.link] cmd/link: combine decodesym.go and decodesym2.go

And remove "2" from some function names.

Change-Id: Ibf1089970d849a42f53976064ceb9ade20bf6eba
Reviewed-on: https://go-review.googlesource.com/c/go/+/231017
Run-TryBot: Cherry Zhang <cherryyz@google.com>
TryBot-Result: Gobot Gobot <gobot@golang.org>
Reviewed-by: Jeremy Faller <jeremy@golang.org>
This commit is contained in:
Cherry Zhang 2020-04-29 17:34:46 -04:00
parent 2a33f5368a
commit 4048fb8780
6 changed files with 217 additions and 232 deletions

View file

@ -1123,7 +1123,7 @@ func (p *GCProg2) AddSym(s loader.Sym) {
sval := ldr.SymValue(s)
if decodetypeUsegcprog(p.ctxt.Arch, typData) == 0 {
// Copy pointers from mask into program.
mask := decodetypeGcmask2(p.ctxt, typ)
mask := decodetypeGcmask(p.ctxt, typ)
for i := int64(0); i < nptr; i++ {
if (mask[i/8]>>uint(i%8))&1 != 0 {
p.w.Ptr(sval/ptrsize + i)
@ -1133,7 +1133,7 @@ func (p *GCProg2) AddSym(s loader.Sym) {
}
// Copy program.
prog := decodetypeGcprog2(p.ctxt, typ)
prog := decodetypeGcprog(p.ctxt, typ)
p.w.ZeroUntil(sval / ptrsize)
p.w.Append(prog[4:], nptr)
}