diff options
| author | Russ Cox <rsc@golang.org> | 2015-01-21 14:48:18 -0500 |
|---|---|---|
| committer | Russ Cox <rsc@golang.org> | 2015-01-21 21:24:40 +0000 |
| commit | ebaf8db4f62af36c7215735891f014dc4bb4e2ba (patch) | |
| tree | 495631b6dcac2a18344ff42725d389881ba0cd03 /src/cmd/internal/obj/data.go | |
| parent | 7522e135a3b294c9f85b1bea901f5fe062b6f73a (diff) | |
| download | go-ebaf8db4f62af36c7215735891f014dc4bb4e2ba.tar.xz | |
[dev.cc] cmd/internal/obj: export more symbols, rename Type_ to Type
For new assembler, reconvert using rsc.io/c2go rev f9db76e.
- Removes trailing _ from Go keywords that are exported.
- Export regstr as Register, anames[5689] as Anames.
Also update clients.
Change-Id: I41c8fd2d14490236f548b4aa0ed0b9bd7571d2d7
Reviewed-on: https://go-review.googlesource.com/3151
Reviewed-by: Rob Pike <r@golang.org>
Diffstat (limited to 'src/cmd/internal/obj/data.go')
| -rw-r--r-- | src/cmd/internal/obj/data.go | 40 |
1 files changed, 20 insertions, 20 deletions
diff --git a/src/cmd/internal/obj/data.go b/src/cmd/internal/obj/data.go index 9130e30664..35d5182db8 100644 --- a/src/cmd/internal/obj/data.go +++ b/src/cmd/internal/obj/data.go @@ -67,7 +67,7 @@ func savedata(ctxt *Link, s *LSym, p *Prog, pn string) { } Symgrow(ctxt, s, int64(off+siz)) - switch int(p.To.Type_) { + switch int(p.To.Type) { default: ctxt.Diag("bad data: %P", p) @@ -89,12 +89,12 @@ func savedata(ctxt *Link, s *LSym, p *Prog, pn string) { copy(s.P[off:off+siz], p.To.U.Sval) case ctxt.Arch.D_CONST, ctxt.Arch.D_ADDR: - if p.To.Sym != nil || int(p.To.Type_) == ctxt.Arch.D_ADDR { + if p.To.Sym != nil || int(p.To.Type) == ctxt.Arch.D_ADDR { r := Addrel(s) r.Off = off r.Siz = uint8(siz) r.Sym = p.To.Sym - r.Type_ = R_ADDR + r.Type = R_ADDR r.Add = p.To.Offset break } @@ -120,8 +120,8 @@ func Addrel(s *LSym) *Reloc { } func setuintxx(ctxt *Link, s *LSym, off int64, v uint64, wid int64) int64 { - if s.Type_ == 0 { - s.Type_ = SDATA + if s.Type == 0 { + s.Type = SDATA } s.Reachable = 1 if s.Size < off+wid { @@ -187,8 +187,8 @@ func addaddrplus(ctxt *Link, s *LSym, t *LSym, add int64) int64 { var i int64 var r *Reloc - if s.Type_ == 0 { - s.Type_ = SDATA + if s.Type == 0 { + s.Type = SDATA } s.Reachable = 1 i = s.Size @@ -198,7 +198,7 @@ func addaddrplus(ctxt *Link, s *LSym, t *LSym, add int64) int64 { r.Sym = t r.Off = int32(i) r.Siz = uint8(ctxt.Arch.Ptrsize) - r.Type_ = R_ADDR + r.Type = R_ADDR r.Add = add return i + int64(r.Siz) } @@ -207,8 +207,8 @@ func addpcrelplus(ctxt *Link, s *LSym, t *LSym, add int64) int64 { var i int64 var r *Reloc - if s.Type_ == 0 { - s.Type_ = SDATA + if s.Type == 0 { + s.Type = SDATA } s.Reachable = 1 i = s.Size @@ -218,7 +218,7 @@ func addpcrelplus(ctxt *Link, s *LSym, t *LSym, add int64) int64 { r.Sym = t r.Off = int32(i) r.Add = add - r.Type_ = R_PCREL + r.Type = R_PCREL r.Siz = 4 return i + int64(r.Siz) } @@ -230,8 +230,8 @@ func addaddr(ctxt *Link, s *LSym, t *LSym) int64 { func setaddrplus(ctxt *Link, s *LSym, off int64, t *LSym, add int64) int64 { var r *Reloc - if s.Type_ == 0 { - s.Type_ = SDATA + if s.Type == 0 { + s.Type = SDATA } s.Reachable = 1 if off+int64(ctxt.Arch.Ptrsize) > s.Size { @@ -243,7 +243,7 @@ func setaddrplus(ctxt *Link, s *LSym, off int64, t *LSym, add int64) int64 { r.Sym = t r.Off = int32(off) r.Siz = uint8(ctxt.Arch.Ptrsize) - r.Type_ = R_ADDR + r.Type = R_ADDR r.Add = add return off + int64(r.Siz) } @@ -256,8 +256,8 @@ func addsize(ctxt *Link, s *LSym, t *LSym) int64 { var i int64 var r *Reloc - if s.Type_ == 0 { - s.Type_ = SDATA + if s.Type == 0 { + s.Type = SDATA } s.Reachable = 1 i = s.Size @@ -267,7 +267,7 @@ func addsize(ctxt *Link, s *LSym, t *LSym) int64 { r.Sym = t r.Off = int32(i) r.Siz = uint8(ctxt.Arch.Ptrsize) - r.Type_ = R_SIZE + r.Type = R_SIZE return i + int64(r.Siz) } @@ -275,8 +275,8 @@ func addaddrplus4(ctxt *Link, s *LSym, t *LSym, add int64) int64 { var i int64 var r *Reloc - if s.Type_ == 0 { - s.Type_ = SDATA + if s.Type == 0 { + s.Type = SDATA } s.Reachable = 1 i = s.Size @@ -286,7 +286,7 @@ func addaddrplus4(ctxt *Link, s *LSym, t *LSym, add int64) int64 { r.Sym = t r.Off = int32(i) r.Siz = 4 - r.Type_ = R_ADDR + r.Type = R_ADDR r.Add = add return i + int64(r.Siz) } |
