From: Russ Cox <rsc@golang.org>
Date: Mon, 3 May 2010 20:24:39 +0000 (-0700)
Subject: runtime/arm: fix build
X-Git-Tag: weekly.2010-05-04~11
X-Git-Url: http://www.git.cypherpunks.su/?a=commitdiff_plain;h=23c0aa3916ef65bde60db5ec3a48df226cd4cc49;p=gostls13.git

runtime/arm: fix build

Import _mulv from Inferno again, change R9 to R2.
Not sure what the other differences were for, but
they weren't working.

TBR=kaib
CC=golang-dev
https://golang.org/cl/1079041
---

diff --git a/src/pkg/runtime/arm/vlop.s b/src/pkg/runtime/arm/vlop.s
index db19f402e8..c9e7090fc0 100644
--- a/src/pkg/runtime/arm/vlop.s
+++ b/src/pkg/runtime/arm/vlop.s
@@ -32,17 +32,17 @@ arg=0
 
 TEXT	_mulv(SB), $0
 	MOVW	0(FP), R0
-	MOVW	8(FP), R2		/* l0 */
-	MOVW	4(FP), R3	  /* h0 */
-	MOVW	16(FP), R4	  /* l1 */
-	MOVW	12(FP), R5	  /* h1 */
+	MOVW	4(FP), R2	/* l0 */
+	MOVW	8(FP), R11	/* h0 */
+	MOVW	12(FP), R4	/* l1 */
+	MOVW	16(FP), R5	/* h1 */
 	UMULL(4, 2, 7, 6, 0)
-	MUL(3, 4, 8, 0)
+	MUL(11, 4, 8, 0)
 	ADD	R8, R7
 	MUL(2, 5, 8, 0)
 	ADD	R8, R7
-	MOVW	R6, 4(R(arg))
-	MOVW	R7, 0(R(arg))
+	MOVW	R6, 0(R(arg))
+	MOVW	R7, 4(R(arg))
 	RET