Stowage/go
2
0
Fork 0
mirror of https://github.com/golang/go.git synced 2025-12-08 06:10:04 +00:00
Code Issues Projects Releases Packages Wiki Activity

cmd/internal/obj/arm: remove CASE and BCASE

Browse source 
Update #10994

CASE and BCASE were used by 5c in switch statements, cmd/compile
does not use them.

Change-Id: I7a578c461b52b94690e35460926849b28971b770
Reviewed-on: https://go-review.googlesource.com/14009
Reviewed-by: Brad Fitzpatrick <bradfitz@golang.org>
Reviewed-by: Minux Ma <minux@golang.org>
Run-TryBot: Minux Ma <minux@golang.org>
TryBot-Result: Gobot Gobot <gobot@golang.org>
This commit is contained in:
Dave Cheney 2015-08-31 10:14:00 +10:00
parent a088f1b76c
commit 8d478e845c
7 changed files with 22 additions and 114 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/cmd/internal/obj/arm/a.out.go
View file

@ -251,8 +251,6 @@ const (
AMULA
AWORD
ABCASE
ACASE
AMULL
AMULAL

2
src/cmd/internal/obj/arm/anames.go
View file

@ -82,8 +82,6 @@ var Anames = []string{
"SWI",
"MULA",
"WORD",
"BCASE",
"CASE",
"MULL",
"MULAL",
"MULLU",

59
src/cmd/internal/obj/arm/asm5.go
View file

@ -188,8 +188,6 @@ var optab = []Optab{
Optab{AMOVB, C_REG, C_NONE, C_SHIFT, 61, 4, 0, 0, 0},
Optab{AMOVBS, C_REG, C_NONE, C_SHIFT, 61, 4, 0, 0, 0},
Optab{AMOVBU, C_REG, C_NONE, C_SHIFT, 61, 4, 0, 0, 0},
Optab{ACASE, C_REG, C_NONE, C_NONE, 62, 4, 0, LPCREL, 8},
Optab{ABCASE, C_NONE, C_NONE, C_SBRA, 63, 4, 0, LPCREL, 0},
Optab{AMOVH, C_REG, C_NONE, C_HAUTO, 70, 4, REGSP, 0, 0},
Optab{AMOVH, C_REG, C_NONE, C_HOREG, 70, 4, 0, 0, 0},
Optab{AMOVHS, C_REG, C_NONE, C_HAUTO, 70, 4, REGSP, 0, 0},
@ -274,25 +272,6 @@ var xcmp [C_GOK + 1][C_GOK + 1]uint8
var deferreturn *obj.LSym
/* size of a case statement including jump table */
func casesz(ctxt *obj.Link, p *obj.Prog) int32 {
var jt int = 0
var n int32 = 0
var o *Optab
for ; p != nil; p = p.Link {
if p.As == ABCASE {
jt = 1
} else if jt != 0 {
break
}
o = oplook(ctxt, p)
n += int32(o.size)
}
return n
}
// Note about encoding: Prog.scond holds the condition encoding,
// but XOR'ed with C_SCOND_XOR, so that C_SCOND_NONE == 0.
// The code that shifts the value << 28 has the responsibility
@ -625,9 +604,6 @@ func span5(ctxt *obj.Link, cursym *obj.LSym) {
// must check literal pool here in case p generates many instructions
if ctxt.Blitrl != nil {
i = m
if p.As == ACASE {
i = int(casesz(ctxt, p))
}
if checkpool(ctxt, op, i) {
p = op
continue
@ -1442,8 +1418,6 @@ func buildop(ctxt *obj.Link) {
ARFE,
obj.ATEXT,
obj.AUSEFIELD,
ACASE,
ABCASE,
obj.ATYPE:
break
@ -2035,39 +2009,6 @@ func asmout(ctxt *obj.Link, p *obj.Prog, o *Optab, out []uint32) {
o1 |= 1 << 22
}
case 62: /* case R -> movw R<<2(PC),PC */
if o.flag&LPCREL != 0 {
o1 = oprrr(ctxt, AADD, int(p.Scond)) | uint32(immrot(1)) | (uint32(p.From.Reg)&15)<<16 | (REGTMP&15)<<12
o2 = olrr(ctxt, REGTMP&15, REGPC, REGTMP, int(p.Scond))
o2 |= 2 << 7
o3 = oprrr(ctxt, AADD, int(p.Scond)) | REGTMP&15 | (REGPC&15)<<16 | (REGPC&15)<<12
} else {
o1 = olrr(ctxt, int(p.From.Reg)&15, REGPC, REGPC, int(p.Scond))
o1 |= 2 << 7
}
case 63: /* bcase */
if p.Pcond != nil {
rel := obj.Addrel(ctxt.Cursym)
rel.Off = int32(ctxt.Pc)
rel.Siz = 4
if p.To.Sym != nil && p.To.Sym.Type != 0 {
rel.Sym = p.To.Sym
rel.Add = p.To.Offset
} else {
rel.Sym = ctxt.Cursym
rel.Add = p.Pcond.Pc
}
if o.flag&LPCREL != 0 {
rel.Type = obj.R_PCREL
rel.Add += ctxt.Pc - p.Rel.Pc - 16 + int64(rel.Siz)
} else {
rel.Type = obj.R_ADDR
}
o1 = 0
}
/* reloc ops */
case 64: /* mov/movb/movbu R,addr */
o1 = omvl(ctxt, p, &p.To, REGTMP)

21
src/cmd/internal/obj/arm/obj5.go
View file

@ -156,17 +156,6 @@ const (
LEAF = 1 << 2
)
func linkcase(casep *obj.Prog) {
for p := casep; p != nil; p = p.Link {
if p.As == ABCASE {
for ; p != nil && p.As == ABCASE; p = p.Link {
p.Rel = casep
}
break
}
}
}
func preprocess(ctxt *obj.Link, cursym *obj.LSym) {
autosize := int32(0)
@ -196,11 +185,6 @@ func preprocess(ctxt *obj.Link, cursym *obj.LSym) {
var q *obj.Prog
for p := cursym.Text; p != nil; p = p.Link {
switch p.As {
case ACASE:
if ctxt.Flag_shared != 0 {
linkcase(p)
}
case obj.ATEXT:
p.Mark |= LEAF
@ -230,8 +214,7 @@ func preprocess(ctxt *obj.Link, cursym *obj.LSym) {
cursym.Text.Mark &^= LEAF
fallthrough
case ABCASE,
AB,
case AB,
ABEQ,
ABNE,
ABCS,
@ -914,7 +897,7 @@ loop:
if p.Pcond != nil {
if a != ABL && a != ABX && p.Link != nil {
q = obj.Brchain(ctxt, p.Link)
if a != obj.ATEXT && a != ABCASE {
if a != obj.ATEXT {
if q != nil && (q.Mark&FOLL != 0) {
p.As = int16(relinv(a))
p.Link = p.Pcond