mirror
/
go
mirror of https://github.com/golang/go.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

cmd/internal/obj/riscv: simplify rewriteMOV 

Rewrite and simplify the rewriteMOV function in preparation for eliminating it
entirely. Improve some error messages in the process.

Change-Id: Id9a77be5174d46cc23651930c2e9068ee6555690
Reviewed-on: https://go-review.googlesource.com/c/go/+/344458
Trust: Joel Sing <joel@sing.id.au>
Reviewed-by: Cherry Mui <cherryyz@google.com>
Run-TryBot: Cherry Mui <cherryyz@google.com>
TryBot-Result: Go Bot <gobot@golang.org>
This commit is contained in:
Joel Sing 2021-08-21 04:30:29 +00:00
parent bab79dd362
commit f5bdbf311c
2 changed files with 30 additions and 48 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/cmd/asm/internal/asm/testdata/riscv64error.s vendored
View File

@ -3,12 +3,12 @@
// license that can be found in the LICENSE file. // license that can be found in the LICENSE file.
TEXT errors(SB),$0 TEXT errors(SB),$0
MOV $errors(SB), (X5) // ERROR "unsupported addr MOV" MOV $errors(SB), (X5) // ERROR "address load must target register"
MOV $8(SP), (X5) // ERROR "unsupported addr MOV" MOV $8(SP), (X5) // ERROR "address load must target register"
MOVB $8(SP), X5 // ERROR "unsupported addr MOV" MOVB $8(SP), X5 // ERROR "unsupported address load"
MOVH $8(SP), X5 // ERROR "unsupported addr MOV" MOVH $8(SP), X5 // ERROR "unsupported address load"
MOVW $8(SP), X5 // ERROR "unsupported addr MOV" MOVW $8(SP), X5 // ERROR "unsupported address load"
MOVF $8(SP), X5 // ERROR "unsupported addr MOV" MOVF $8(SP), X5 // ERROR "unsupported address load"
MOV $1234, 0(SP) // ERROR "constant load must target register" MOV $1234, 0(SP) // ERROR "constant load must target register"
MOV $1234, 8(SP) // ERROR "constant load must target register" MOV $1234, 8(SP) // ERROR "constant load must target register"
MOV $0, 0(SP) // ERROR "constant load must target register" MOV $0, 0(SP) // ERROR "constant load must target register"

50
src/cmd/internal/obj/riscv/obj.go
View File

@ -226,51 +226,32 @@ func rewriteMOV(ctxt *obj.Link, newprog obj.ProgAlloc, p *obj.Prog) {
panic(fmt.Sprintf("%+v is not a MOV pseudo-instruction", p.As)) panic(fmt.Sprintf("%+v is not a MOV pseudo-instruction", p.As))
} }
switch p.From.Type { switch {
case obj.TYPE_MEM: case p.From.Type == obj.TYPE_REG && p.To.Type == obj.TYPE_REG:
switch p.From.Name {
case obj.NAME_AUTO, obj.NAME_PARAM, obj.NAME_NONE:
if p.To.Type != obj.TYPE_REG {
ctxt.Diag("unsupported load for %v", p)
}
case p.From.Type == obj.TYPE_MEM && p.To.Type == obj.TYPE_REG:
switch p.From.Name {
case obj.NAME_AUTO, obj.NAME_NONE, obj.NAME_PARAM:
case obj.NAME_EXTERN, obj.NAME_STATIC: case obj.NAME_EXTERN, obj.NAME_STATIC:
p.Mark |= NEED_PCREL_ITYPE_RELOC p.Mark |= NEED_PCREL_ITYPE_RELOC
default: default:
ctxt.Diag("unsupported name %d for %v", p.From.Name, p) ctxt.Diag("unsupported name %d for %v", p.From.Name, p)
} }
case obj.TYPE_REG: case p.From.Type == obj.TYPE_REG && p.To.Type == obj.TYPE_MEM:
switch p.To.Type {
case obj.TYPE_REG:
switch p.As {
case AMOV, AMOVB, AMOVH, AMOVW, AMOVBU, AMOVHU, AMOVWU, AMOVF, AMOVD:
default:
ctxt.Diag("unsupported register-register move at %v", p)
}
case obj.TYPE_MEM:
switch p.As { switch p.As {
case AMOVBU, AMOVHU, AMOVWU: case AMOVBU, AMOVHU, AMOVWU:
ctxt.Diag("unsupported unsigned store at %v", p) ctxt.Diag("unsupported unsigned store at %v", p)
return
} }
switch p.To.Name { switch p.To.Name {
case obj.NAME_AUTO, obj.NAME_PARAM, obj.NAME_NONE: case obj.NAME_AUTO, obj.NAME_NONE, obj.NAME_PARAM:
case obj.NAME_EXTERN, obj.NAME_STATIC: case obj.NAME_EXTERN, obj.NAME_STATIC:
p.Mark |= NEED_PCREL_STYPE_RELOC p.Mark |= NEED_PCREL_STYPE_RELOC
default: default:
ctxt.Diag("unsupported name %d for %v", p.From.Name, p) ctxt.Diag("unsupported name %d for %v", p.From.Name, p)
} }
default: case p.From.Type == obj.TYPE_CONST:
ctxt.Diag("unsupported MOV at %v", p)
}
case obj.TYPE_CONST:
if p.As != AMOV { if p.As != AMOV {
ctxt.Diag("%v: unsupported constant load", p) ctxt.Diag("%v: unsupported constant load", p)
} }
@ -278,18 +259,19 @@ func rewriteMOV(ctxt *obj.Link, newprog obj.ProgAlloc, p *obj.Prog) {
ctxt.Diag("%v: constant load must target register", p) ctxt.Diag("%v: constant load must target register", p)
} }
case obj.TYPE_ADDR: case p.From.Type == obj.TYPE_ADDR:
if p.To.Type != obj.TYPE_REG || p.As != AMOV { if p.As != AMOV {
ctxt.Diag("unsupported addr MOV at %v", p) ctxt.Diag("%v: unsupported address load", p)
}
if p.To.Type != obj.TYPE_REG {
ctxt.Diag("%v: address load must target register", p)
} }
switch p.From.Name { switch p.From.Name {
case obj.NAME_AUTO, obj.NAME_PARAM, obj.NAME_NONE: case obj.NAME_AUTO, obj.NAME_NONE, obj.NAME_PARAM:
case obj.NAME_EXTERN, obj.NAME_STATIC: case obj.NAME_EXTERN, obj.NAME_STATIC:
p.Mark |= NEED_PCREL_ITYPE_RELOC p.Mark |= NEED_PCREL_ITYPE_RELOC
default: default:
ctxt.Diag("bad addr MOV from name %v at %v", p.From.Name, p) ctxt.Diag("unsupported name %d for %v", p.From.Name, p)
} }
default: default: