Commit 9389a86b authored by Austin Clements's avatar Austin Clements

cmd/compile: use obj.ARET instead of ppc64.ARETURN

obj.ARET is the portable return mnemonic. ppc64.ARETURN is a legacy
alias.

This was done with
    sed -i s/ppc64\.ARETURN/obj.ARET/ cmd/compile/**/*.go
    sed -i s/ARETURN/obj.ARET/ cmd/internal/obj/ppc64/obj9.go

Change-Id: I4d8e83ff411cee764774a40ef4c7c34dcbca4e43
Reviewed-on: https://go-review.googlesource.com/10673Reviewed-by: default avatarRuss Cox <rsc@golang.org>
Reviewed-by: default avatarMinux Ma <minux@golang.org>
parent 2774b373
...@@ -870,7 +870,7 @@ func copyu(p *obj.Prog, v *obj.Addr, s *obj.Addr) int { ...@@ -870,7 +870,7 @@ func copyu(p *obj.Prog, v *obj.Addr, s *obj.Addr) int {
} }
return 0 return 0
case ppc64.ARETURN: /* funny */ case obj.ARET: /* funny */
if s != nil { if s != nil {
return 0 return 0
} }
......
...@@ -99,7 +99,7 @@ var progtable = [ppc64.ALAST]obj.ProgInfo{ ...@@ -99,7 +99,7 @@ var progtable = [ppc64.ALAST]obj.ProgInfo{
ppc64.ABLT: {gc.Cjmp, 0, 0, 0}, ppc64.ABLT: {gc.Cjmp, 0, 0, 0},
ppc64.ABGT: {gc.Cjmp, 0, 0, 0}, ppc64.ABGT: {gc.Cjmp, 0, 0, 0},
ppc64.ABLE: {gc.Cjmp, 0, 0, 0}, ppc64.ABLE: {gc.Cjmp, 0, 0, 0},
ppc64.ARETURN: {gc.Break, 0, 0, 0}, obj.ARET: {gc.Break, 0, 0, 0},
obj.ADUFFZERO: {gc.Call, 0, 0, 0}, obj.ADUFFZERO: {gc.Call, 0, 0, 0},
obj.ADUFFCOPY: {gc.Call, 0, 0, 0}, obj.ADUFFCOPY: {gc.Call, 0, 0, 0},
} }
......
...@@ -44,7 +44,7 @@ func progedit(ctxt *obj.Link, p *obj.Prog) { ...@@ -44,7 +44,7 @@ func progedit(ctxt *obj.Link, p *obj.Prog) {
switch p.As { switch p.As {
case ABR, case ABR,
ABL, ABL,
ARETURN, obj.ARET,
obj.ADUFFZERO, obj.ADUFFZERO,
obj.ADUFFCOPY: obj.ADUFFCOPY:
if p.To.Sym != nil { if p.To.Sym != nil {
...@@ -283,7 +283,7 @@ func preprocess(ctxt *obj.Link, cursym *obj.LSym) { ...@@ -283,7 +283,7 @@ func preprocess(ctxt *obj.Link, cursym *obj.LSym) {
p.Mark |= FCMP | FLOAT p.Mark |= FCMP | FLOAT
continue continue
case ARETURN: case obj.ARET:
q = p q = p
if p.Link != nil { if p.Link != nil {
p.Link.Mark |= LABEL p.Link.Mark |= LABEL
...@@ -467,7 +467,7 @@ func preprocess(ctxt *obj.Link, cursym *obj.LSym) { ...@@ -467,7 +467,7 @@ func preprocess(ctxt *obj.Link, cursym *obj.LSym) {
p2.Pcond = q p2.Pcond = q
} }
case ARETURN: case obj.ARET:
if p.From.Type == obj.TYPE_CONST { if p.From.Type == obj.TYPE_CONST {
ctxt.Diag("using BECOME (%v) is not supported!", p) ctxt.Diag("using BECOME (%v) is not supported!", p)
break break
...@@ -860,7 +860,7 @@ loop: ...@@ -860,7 +860,7 @@ loop:
continue continue
} }
if a == ABR || a == ARETURN || a == ARFI || a == ARFCI || a == ARFID || a == AHRFID { if a == ABR || a == obj.ARET || a == ARFI || a == ARFCI || a == ARFID || a == AHRFID {
goto copy goto copy
} }
if q.Pcond == nil || (q.Pcond.Mark&FOLL != 0) { if q.Pcond == nil || (q.Pcond.Mark&FOLL != 0) {
...@@ -888,7 +888,7 @@ loop: ...@@ -888,7 +888,7 @@ loop:
(*last).Link = r (*last).Link = r
*last = r *last = r
if a == ABR || a == ARETURN || a == ARFI || a == ARFCI || a == ARFID || a == AHRFID { if a == ABR || a == obj.ARET || a == ARFI || a == ARFCI || a == ARFID || a == AHRFID {
return return
} }
r.As = int16(b) r.As = int16(b)
...@@ -917,7 +917,7 @@ loop: ...@@ -917,7 +917,7 @@ loop:
p.Mark |= FOLL p.Mark |= FOLL
(*last).Link = p (*last).Link = p
*last = p *last = p
if a == ABR || a == ARETURN || a == ARFI || a == ARFCI || a == ARFID || a == AHRFID { if a == ABR || a == obj.ARET || a == ARFI || a == ARFCI || a == ARFID || a == AHRFID {
if p.Mark&NOSCHED != 0 { if p.Mark&NOSCHED != 0 {
p = p.Link p = p.Link
goto loop goto loop
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment