qbit/go
1
0
Fork 0
mirror of https://github.com/golang/go synced 2024-11-23 20:00:04 -07:00
Code Releases Activity

[dev.cc] cmd/internal/asm: fix build: was mishandling SP reference on amd64

Browse Source 
A consequence of the ARM work overlooked that SP is a real register
on x86, so we need to detect it specially.

This will be done better soon, but this is a fast fix for the build.

Change-Id: Ia30d111c3f42a5f0b5f4eddd4cc4d8b10470c14f
Reviewed-on: https://go-review.googlesource.com/4963
Reviewed-by: Russ Cox <rsc@golang.org>
This commit is contained in:
Rob Pike 2015-02-16 20:14:37 -08:00
parent bf2d611a85
commit 188296e5bf
1 changed files with 13 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/cmd/asm/internal/asm/parse.go
View File

@ -492,11 +492,18 @@ func (p *Parser) symbolReference(a *obj.Addr, name string, prefix rune) {
p.get('(') p.get('(')
reg := p.get(scanner.Ident).String() reg := p.get(scanner.Ident).String()
p.get(')') p.get(')')
p.setPseudoRegister(a, p.arch.Registers[reg], isStatic != 0, prefix) // On some machines, SP is a real register, on some it's pseudo. Make sure
// setPseudoRegister sees the pseudo always.
// TODO: Set up a pseudo-register map analogous to the register map in arch?
r := p.arch.Registers[reg]
if reg == "SP" {
r = arch.RSP
}
p.setPseudoRegister(a, reg, r, isStatic != 0, prefix)
} }
// setPseudoRegister sets the NAME field of addr for a pseudo-register reference such as (SB). // setPseudoRegister sets the NAME field of addr for a pseudo-register reference such as (SB).
func (p *Parser) setPseudoRegister(addr *obj.Addr, reg int16, isStatic bool, prefix rune) { func (p *Parser) setPseudoRegister(addr *obj.Addr, name string, reg int16, isStatic bool, prefix rune) {
if addr.Reg != 0 { if addr.Reg != 0 {
p.errorf("internal error: reg already set in psuedo") p.errorf("internal error: reg already set in psuedo")
} }
@ -517,7 +524,7 @@ func (p *Parser) setPseudoRegister(addr *obj.Addr, reg int16, isStatic bool, pre
case arch.RSP: case arch.RSP:
addr.Name = obj.NAME_AUTO // The pseudo-stack. addr.Name = obj.NAME_AUTO // The pseudo-stack.
default: default:
p.errorf("expected pseudo-register; found %d", reg) p.errorf("expected pseudo-register; found %s", name)
} }
if prefix == '$' { if prefix == '$' {
addr.Type = obj.TYPE_ADDR addr.Type = obj.TYPE_ADDR
@ -531,7 +538,8 @@ func (p *Parser) setPseudoRegister(addr *obj.Addr, reg int16, isStatic bool, pre
// The opening parenthesis has already been consumed. // The opening parenthesis has already been consumed.
func (p *Parser) registerIndirect(a *obj.Addr, prefix rune) { func (p *Parser) registerIndirect(a *obj.Addr, prefix rune) {
tok := p.next() tok := p.next()
r1, r2, scale, ok := p.register(tok.String(), 0) name := tok.String()
r1, r2, scale, ok := p.register(name, 0)
if !ok { if !ok {
p.errorf("indirect through non-register %s", tok) p.errorf("indirect through non-register %s", tok)
} }
@ -543,7 +551,7 @@ func (p *Parser) registerIndirect(a *obj.Addr, prefix rune) {
p.errorf("cannot use pseudo-register in pair") p.errorf("cannot use pseudo-register in pair")
return return
} }
p.setPseudoRegister(a, r1, false, prefix) p.setPseudoRegister(a, name, r1, false, prefix)
return return
} }
a.Reg = r1 a.Reg = r1