From d39f5aa373a4422f7a5f3ee764fb0f6b0b719d61 Mon Sep 17 00:00:00 2001
From: Ondřej Surý <ondrej@sury.org>
Date: Thu, 30 Jun 2011 15:34:22 +0200
Subject: Imported Upstream version 58

---
 src/pkg/runtime/amd64/memmove.s | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

(limited to 'src/pkg/runtime/amd64')

diff --git a/src/pkg/runtime/amd64/memmove.s b/src/pkg/runtime/amd64/memmove.s
index 9966b0ba7..fc9573f72 100644
--- a/src/pkg/runtime/amd64/memmove.s
+++ b/src/pkg/runtime/amd64/memmove.s
@@ -33,7 +33,6 @@ TEXT runtime·memmove(SB), 7, $0
 
 /*
  * check and set for backwards
- * should we look closer for overlap?
  */
 	CMPQ	SI, DI
 	JLS	back
@@ -41,6 +40,7 @@ TEXT runtime·memmove(SB), 7, $0
 /*
  * forward copy loop
  */
+forward:	
 	MOVQ	BX, CX
 	SHRQ	$3, CX
 	ANDQ	$7, BX
@@ -51,11 +51,19 @@ TEXT runtime·memmove(SB), 7, $0
 
 	MOVQ	to+0(FP),AX
 	RET
+back:
+/*
+ * check overlap
+ */
+	MOVQ	SI, CX
+	ADDQ	BX, CX
+	CMPQ	CX, DI
+	JLS	forward
+	
 /*
  * whole thing backwards has
  * adjusted addresses
  */
-back:
 	ADDQ	BX, DI
 	ADDQ	BX, SI
 	STD
-- 
cgit v1.2.3