From: Nikos Mavrogiannopoulos <nmav@gnutls.org>
Date: Sun, 23 Oct 2011 14:56:45 +0000 (+0200)
Subject: is_padlock_nano is behaving properly and saving registers.
X-Git-Tag: gnutls_3_0_5~30
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=692120e24e0ee4e1d6e05fe3bb80ec87c01cf503;p=thirdparty%2Fgnutls.git

is_padlock_nano is behaving properly and saving registers.
---

diff --git a/lib/accelerated/x86/asm/padlock-common.s b/lib/accelerated/x86/asm/padlock-common.s
index bd9123e953..f61eb27c5c 100644
--- a/lib/accelerated/x86/asm/padlock-common.s
+++ b/lib/accelerated/x86/asm/padlock-common.s
@@ -25,6 +25,7 @@
 .type	is_padlock_nano,@function
 .align	16
 is_padlock_nano:
+	pusha
 	xorl	%eax,%eax
 	cpuid
 	movl    $1,%eax
@@ -32,9 +33,11 @@ is_padlock_nano:
 	or      $0x000f,%eax
         cmp     $0x06ff,%eax
 	jne     .Lno_nano
+	popa
 	mov     $1,%eax
         ret
 .Lno_nano:
+	popa
 	xorl	%eax,%eax
         ret
 .size	is_padlock_nano,.-is_padlock_nano