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

[dev.cc] cmd/internal/obj/arm: add a couple of missing settings of Ctxt

Browse Source 
Change-Id: Ic33431cdcc93db300fc2c3467eafdb5340ee4896
Reviewed-on: https://go-review.googlesource.com/4924
Reviewed-by: Dave Cheney <dave@cheney.net>
Reviewed-by: Russ Cox <rsc@golang.org>
This commit is contained in:
Rob Pike 2015-02-15 15:37:28 -08:00
parent c497349a5b
commit 581c309d8f
2 changed files with 5 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/cmd/internal/obj/arm/asm5.go
View File

@ -865,6 +865,7 @@ func flushpool(ctxt *obj.Link, p *obj.Prog, skip int, force int) int {
q.Pcond = p.Link
q.Link = ctxt.Blitrl
q.Lineno = p.Lineno
q.Ctxt = p.Ctxt
ctxt.Blitrl = q
} else if !(force != 0) && (p.Pc+int64(12+pool.size)-int64(pool.start) < 2048) { // 12 take into account the maximum nacl literal pool alignment padding size
return 0
@ -874,6 +875,7 @@ func flushpool(ctxt *obj.Link, p *obj.Prog, skip int, force int) int {
q = new(obj.Prog)
q.As = ADATABUNDLEEND
q.Ctxt = p.Ctxt
ctxt.Elitrl.Link = q
ctxt.Elitrl = q
}
@ -909,6 +911,7 @@ func addpool(ctxt *obj.Link, p *obj.Prog, a *obj.Addr) {
t = obj.Zprog
t.As = AWORD
t.Ctxt = p.Ctxt
switch c {
default:
@ -952,6 +955,7 @@ func addpool(ctxt *obj.Link, p *obj.Prog, a *obj.Addr) {
*q = obj.Zprog
q.As = ADATABUNDLE
q.Pc = int64(pool.size)
q.Ctxt = p.Ctxt
pool.size += 4
if ctxt.Blitrl == nil {
ctxt.Blitrl = q

1
src/cmd/internal/obj/arm/obj5.go
View File

@ -1034,6 +1034,7 @@ loop:
q.To.Type = obj.TYPE_BRANCH
q.To.Offset = p.Pc
q.Pcond = p
q.Ctxt = p.Ctxt
p = q
}