Commit 3405db97 authored by Andy Polyakov's avatar Andy Polyakov Committed by Richard Levitte
Browse files

ARM assembly pack: make it Windows-friendly. 



"Windows friendliness" means a) flipping .thumb and .text directives,
b) always generate Thumb-2 code when asked(*); c) Windows-specific
references to external OPENSSL_armcap_P.

(*) so far *some* modules were compiled as .code 32 even if Thumb-2
was targeted. It works at hardware level because processor can alternate
between the modes with no overhead. But clang --target=arm-windows's
builtin assembler just refuses to compile .code 32...

Reviewed-by: default avatarPaul Dale <paul.dale@oracle.com>
Reviewed-by: default avatarRichard Levitte <levitte@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/8252)
parent b2b580fe

crypto/aes/asm/aes-armv4.pl

+2 −1
Original line number Diff line number Diff line
@@ -76,7 +76,6 @@ $code=<<___; 
# define __ARM_ARCH__ __LINUX_ARM_ARCH__

#endif



.text

#if defined(__thumb2__) && !defined(__APPLE__)

.syntax	unified

.thumb
@@ -85,6 +84,8 @@ $code=<<___; 
#undef __thumb2__

#endif



.text



.type	AES_Te,%object

.align	5

AES_Te:

crypto/aes/asm/aesv8-armx.pl

+18 −6
Original line number Diff line number Diff line
@@ -53,18 +53,27 @@ open OUT,"| \"$^X\" $xlate $flavour $output"; 


$prefix="aes_v8";



$_byte = ($flavour =~ /win/ ? "DCB" : ".byte");



$code=<<___;

#include "arm_arch.h"



#if __ARM_MAX_ARCH__>=7

.text

___

$code.=".arch	armv8-a+crypto\n"			if ($flavour =~ /64/);

$code.=".arch	armv8-a+crypto\n.text\n"		if ($flavour =~ /64/);

$code.=<<___						if ($flavour !~ /64/);

.arch	armv7-a	// don't confuse not-so-latest binutils with argv8 :-)

.fpu	neon

#ifdef	__thumb2__

.syntax	unified

.thumb

# define INST(a,b,c,d)	$_byte	c,d|0xc,a,b

#else

.code	32

#undef	__thumb2__

# define INST(a,b,c,d)	$_byte	a,b,c,d

#endif



.text

___



# Assembler mnemonics are an eclectic mix of 32- and 64-bit syntax,
@@ -955,7 +964,7 @@ if ($flavour =~ /64/) { ######## 64-bit code 
	    # since ARMv7 instructions are always encoded little-endian.

	    # correct solution is to use .inst directive, but older

	    # assemblers don't implement it:-(

	    sprintf ".byte\t0x%02x,0x%02x,0x%02x,0x%02x\t@ %s %s",

	    sprintf "INST(0x%02x,0x%02x,0x%02x,0x%02x)\t@ %s %s",

			$word&0xff,($word>>8)&0xff,

			($word>>16)&0xff,($word>>24)&0xff,

			$mnemonic,$arg;
@@ -996,14 +1005,17 @@ if ($flavour =~ /64/) { ######## 64-bit code 
	s/\],#[0-9]+/]!/o;



	s/[v]?(aes\w+)\s+([qv].*)/unaes($1,$2)/geo	or

	s/cclr\s+([^,]+),\s*([a-z]+)/mov$2	$1,#0/o	or

	s/cclr\s+([^,]+),\s*([a-z]+)/mov.$2	$1,#0/o	or

	s/vtbl\.8\s+(.*)/unvtbl($1)/geo			or

	s/vdup\.32\s+(.*)/unvdup32($1)/geo		or

	s/vmov\.32\s+(.*)/unvmov32($1)/geo		or

	s/^(\s+)b\./$1b/o				or

	s/^(\s+)mov\./$1mov/o				or

	s/^(\s+)ret/$1bx\tlr/o;



	if (s/^(\s+)mov\.([a-z]+)/$1mov$2/) {

	    print "	it	$2\n";

	}



	print $_,"\n";

    }

}

crypto/aes/asm/bsaes-armv7.pl

+4 −3
Original line number Diff line number Diff line
@@ -728,7 +728,6 @@ $code.=<<___; 
.arch	armv7-a

.fpu	neon



.text

.syntax	unified 	@ ARMv7-capable assembler is expected to handle this

#if defined(__thumb2__) && !defined(__APPLE__)

.thumb
@@ -737,6 +736,8 @@ $code.=<<___; 
# undef __thumb2__

#endif



.text



.type	_bsaes_decrypt8,%function

.align	4

_bsaes_decrypt8:
@@ -1125,9 +1126,9 @@ bsaes_cbc_encrypt: 
#ifndef	__thumb__

	blo	AES_cbc_encrypt

#else

	bhs	1f

	bhs	.Lcbc_do_bsaes

	b	AES_cbc_encrypt

1:

.Lcbc_do_bsaes:

#endif

#endif

crypto/armv4cpuid.pl

+2 −1
Original line number Diff line number Diff line
@@ -21,7 +21,6 @@ open OUT,"| \"$^X\" $xlate $flavour $output"; 
$code.=<<___;

#include "arm_arch.h"



.text

#if defined(__thumb2__) && !defined(__APPLE__)

.syntax	unified

.thumb
@@ -30,6 +29,8 @@ $code.=<<___; 
#undef	__thumb2__

#endif



.text



.align	5

.global	OPENSSL_atomic_add

.type	OPENSSL_atomic_add,%function

crypto/bn/asm/armv4-gf2m.pl

+10 −3
Original line number Diff line number Diff line
@@ -57,13 +57,14 @@ if ($flavour && $flavour ne "void") { 
$code=<<___;

#include "arm_arch.h"



.text

#if defined(__thumb2__)

.syntax	unified

.thumb

#else

.code	32

#endif



.text

___

################

# private interface to mul_1x1_ialu
@@ -176,9 +177,11 @@ bn_GF2m_mul_2x2: 
#if __ARM_MAX_ARCH__>=7

	stmdb	sp!,{r10,lr}

	ldr	r12,.LOPENSSL_armcap

# if !defined(_WIN32)

	adr	r10,.LOPENSSL_armcap

	ldr	r12,[r12,r10]

#ifdef	__APPLE__

# endif

# if defined(__APPLE__) || defined(_WIN32)

	ldr	r12,[r12]

# endif

	tst	r12,#ARMV7_NEON
@@ -310,8 +313,12 @@ $code.=<<___; 
#if __ARM_MAX_ARCH__>=7

.align	5

.LOPENSSL_armcap:

# ifdef	_WIN32

.word	OPENSSL_armcap_P

# else

.word	OPENSSL_armcap_P-.

# endif

#endif

.asciz	"GF(2^m) Multiplication for ARMv4/NEON, CRYPTOGAMS by <appro\@openssl.org>"

.align	5