summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAustin Clements <austin@google.com>2014-11-03 17:24:13 -0500
committerAustin Clements <austin@google.com>2014-11-03 17:24:13 -0500
commit473bfae5ae3c4adccebc14bca40d0fb0a2ff09ab (patch)
tree252c5d9ad3753b7b599f95c0808c4242fdd1feed
parent810019286fdb8ad6b60096f2b0e2dcf0bc900c3a (diff)
downloadgo-git-473bfae5ae3c4adccebc14bca40d0fb0a2ff09ab.tar.gz
[dev.power64] liblink: fix printing of branch targets
Print PC stored in target Prog* of branch instructions when available instead of the offset stored in the branch instruction. The offset tends to be wrong after code transformations, so previously this led to confusing listings. LGTM=rsc R=rsc CC=golang-codereviews https://golang.org/cl/168980043
-rw-r--r--src/liblink/list9.c11
1 files changed, 6 insertions, 5 deletions
diff --git a/src/liblink/list9.c b/src/liblink/list9.c
index 041c6884f1..c9190d8940 100644
--- a/src/liblink/list9.c
+++ b/src/liblink/list9.c
@@ -259,11 +259,12 @@ Dconv(Fmt *fp)
sprint(str, "%s+%.5lux(BRANCH)", a->sym->name, v);
else
sprint(str, "%.5lux(BRANCH)", v);
- } else
- if(a->sym != nil)
- sprint(str, "%s+%lld(APC)", a->sym->name, a->offset);
- else
- sprint(str, "%lld(APC)", a->offset);
+ } else if(a->u.branch != nil)
+ sprint(str, "%lld", a->u.branch->pc);
+ else if(a->sym != nil)
+ sprint(str, "%s+%lld(APC)", a->sym->name, a->offset);
+ else
+ sprint(str, "%lld(APC)", a->offset);
break;
case D_FCONST: