From: Russ Cox <rsc@golang.org>
Date: Thu, 12 Feb 2015 02:16:00 +0000 (-0500)
Subject: [dev.cc] liblink, cmd/internal/obj: fix printing of TYPE_REGREG and TYPE_REGREG2
X-Git-Tag: go1.5beta1~1915^2~70
X-Git-Url: http://www.git.cypherpunks.su/?a=commitdiff_plain;h=01925bd3f306c899cddfa59aa2ad41c9b77fcd74;p=gostls13.git

[dev.cc] liblink, cmd/internal/obj: fix printing of TYPE_REGREG and TYPE_REGREG2

Now:

	0x0000 00000 (/tmp/x.s:2)	MULLU	R6,R3,(R7, R6)

The space is a little odd but I'd rather fix the usual printing to add spaces
than delete that one. But in a different CL, once C is gone.

Change-Id: I344e0b06eedaaf53cd79d370fa13c444a1e69c81
Reviewed-on: https://go-review.googlesource.com/4647
Reviewed-by: Rob Pike <r@golang.org>
---

diff --git a/src/cmd/internal/obj/arm/list5.go b/src/cmd/internal/obj/arm/list5.go
index c37a563621..9986d14931 100644
--- a/src/cmd/internal/obj/arm/list5.go
+++ b/src/cmd/internal/obj/arm/list5.go
@@ -190,7 +190,12 @@ func Dconv(p *obj.Prog, flag int, a *obj.Addr) string {
 
 	case obj.TYPE_SCONST:
 		str = fmt.Sprintf("$\"%q\"", a.U.Sval)
-		break
+
+	case obj.TYPE_REGREG:
+		str = fmt.Sprintf("(%v, %v)", Rconv(int(a.Reg)), Rconv(int(a.Offset)))
+
+	case obj.TYPE_REGREG2:
+		str = fmt.Sprintf("%v, %v", Rconv(int(a.Reg)), Rconv(int(a.Offset)))
 	}
 
 	fp += str
diff --git a/src/liblink/list5.c b/src/liblink/list5.c
index 3d3e8e7d12..bca10f6899 100644
--- a/src/liblink/list5.c
+++ b/src/liblink/list5.c
@@ -213,6 +213,14 @@ Dconv(Fmt *fp)
 	case TYPE_SCONST:
 		sprint(str, "$\"%$\"", a->u.sval);
 		break;
+	
+	case TYPE_REGREG:
+		sprint(str, "(%R, %R)", a->reg, (int)a->offset);
+		break;
+	
+	case TYPE_REGREG2:
+		sprint(str, "%R, %R", a->reg, (int)a->offset);
+		break;
 	}
 	return fmtstrcpy(fp, str);
 }