Commit 1f3f79e5 authored by Andy Polyakov's avatar Andy Polyakov
Browse files

sha/asm/sha{256|512}-armv4.pl: harmonize thumb2 support with the rest. 



Reviewed-by: default avatarRichard Levitte <levitte@openssl.org>
(cherry picked from commit 2e51557b)
parent 2b451311

crypto/sha/asm/sha256-armv4.pl

+1 −1
Original line number Diff line number Diff line
@@ -254,7 +254,7 @@ for($i=0;$i<16;$i++) { &BODY_00_15($i,@V); unshift(@V,pop(@V)); } 
$code.=".Lrounds_16_xx:\n";

for (;$i<32;$i++)	{ &BODY_16_XX($i,@V); unshift(@V,pop(@V)); }

$code.=<<___;

#if __ARM_ARCH__>=7

#ifdef	__thumb2__

	ite	eq			@ Thumb2 thing, sanity check in ARM

#endif

	ldreq	$t3,[sp,#16*4]		@ pull ctx

crypto/sha/asm/sha512-armv4.pl

+2 −2
Original line number Diff line number Diff line
@@ -157,7 +157,7 @@ $code.=<<___; 
	teq	$t0,#$magic



	ldr	$t3,[sp,#$Coff+0]	@ c.lo

#if __ARM_ARCH__>=7

#ifdef	__thumb2__

	it	eq			@ Thumb2 thing, sanity check in ARM

#endif

	orreq	$Ktbl,$Ktbl,#1
@@ -411,7 +411,7 @@ $code.=<<___; 
___

	&BODY_00_15(0x17);

$code.=<<___;

#if __ARM_ARCH__>=7

#ifdef	__thumb2__

	ittt	eq			@ Thumb2 thing, sanity check in ARM

#endif

	ldreq	$t0,[sp,#`$Xoff+8*(16-1)`+0]