Commit 14e21f86 authored by Andy Polyakov's avatar Andy Polyakov
Browse files

Add framework for yet another assembler module dubbed "cpuid." Idea 

is to have a placeholder to small routines, which can be written only
in assembler. In IA-32 case this includes processor capability
identification and access to Time-Stamp Counter. As discussed earlier
OPENSSL_ia32cap is introduced to control recently added SSE2 code
pathes (see docs/crypto/OPENSSL_ia32cap.pod). For the moment the
code is operational on ELF platforms only. I haven't checked it yet,
but I have all reasons to believe that Windows build should fail to
link too. I'll be looking into it shortly...
parent f10725a6

Configure

+51 −47

File changed.

Preview size limit exceeded, changes collapsed.

Makefile.org

+8 −4
Original line number Diff line number Diff line
@@ -80,6 +80,13 @@ MAKEDEPPROG=makedepend 
AS=$(CC) -c

ASFLAG=$(CFLAG)



# For x86 assembler: Set PROCESSOR to 386 if you want to support

# the 80386.

PROCESSOR=



# CPUID module collects small commonly used assembler snippets

CPUID_OBJ= 



# Set BN_ASM to bn_asm.o if you want to use the C version

BN_ASM= bn_asm.o

#BN_ASM= bn_asm.o
@@ -95,10 +102,6 @@ BN_ASM= bn_asm.o 
#BN_ASM= asm/x86w16.o   # 16 bit code for Windows 3.1/DOS

#BN_ASM= asm/x86w32.o   # 32 bit code for Windows 3.1



# For x86 assembler: Set PROCESSOR to 386 if you want to support

# the 80386.

PROCESSOR=



# Set DES_ENC to des_enc.o if you want to use the C version

#There are 4 x86 assember options.

DES_ENC= asm/dx86-out.o asm/yx86-out.o
@@ -229,6 +232,7 @@ BUILDENV= PLATFORM='${PLATFORM}' PROCESSOR='${PROCESSOR}' \ 
		EXE_EXT='${EXE_EXT}' SHARED_LIBS='${SHARED_LIBS}'	\

		SHLIB_EXT='${SHLIB_EXT}' SHLIB_TARGET='${SHLIB_TARGET}'	\

		PEX_LIBS='${PEX_LIBS}' EX_LIBS='${EX_LIBS}'	\

		CPUID_OBJ='${CPUID_OBJ}'			\

		BN_ASM='${BN_ASM}' DES_ENC='${DES_ENC}' 	\

		AES_ASM_OBJ='${AES_ASM_OBJ}'			\

		BF_ENC='${BF_ENC}' CAST_ENC='${CAST_ENC}'	\

TABLE

+182 −4

File changed.

Preview size limit exceeded, changes collapsed.

crypto/Makefile.ssl

+10 −2
Original line number Diff line number Diff line
@@ -22,6 +22,7 @@ PEX_LIBS= 
EX_LIBS=

 

CFLAGS= $(INCLUDE) $(CFLAG)

ASFLAGS= $(INCLUDE) $(ASFLAG)





LIBS=
@@ -39,7 +40,7 @@ GENERAL=Makefile README crypto-lib.com install.com 
LIB= $(TOP)/libcrypto.a

SHARED_LIB= libcrypto$(SHLIB_EXT)

LIBSRC=	cryptlib.c mem.c mem_clr.c mem_dbg.c cversion.c ex_data.c tmdiff.c cpt_err.c ebcdic.c uid.c o_time.c o_str.c o_dir.c

LIBOBJ= cryptlib.o mem.o mem_clr.o mem_dbg.o cversion.o ex_data.o tmdiff.o cpt_err.o ebcdic.o uid.o o_time.o o_str.o o_dir.o

LIBOBJ= cryptlib.o mem.o mem_clr.o mem_dbg.o cversion.o ex_data.o tmdiff.o cpt_err.o ebcdic.o uid.o o_time.o o_str.o o_dir.o $(CPUID_OBJ)



SRC= $(LIBSRC)
@@ -62,6 +63,13 @@ buildinf.h: ../Makefile.ssl 
	echo "  #define DATE \"`LC_ALL=C LC_TIME=C date`\""; \

	echo '#endif' ) >buildinf.h



x86cpuid-elf.s:	x86cpuid.pl perlasm/x86asm.pl

	$(PERL) x86cpuid.pl elf $(CFLAGS) $(PROCESSOR) > $@

amd64cpuid.s: amd64cpuid.pl

	$(PERL) amd64cpuid.pl $@

ia64cpuid.s: ia64cpuid.S

	$(CC) $(CFLAGS) -E ia64cpuid.S > $@



testapps:

	if echo ${SDIRS} | fgrep ' des '; \

	then cd des && $(MAKE) CC='$(CC)' INCLUDES='${INCLUDES}' CFLAG='${CFLAG}' INSTALLTOP='${INSTALLTOP}' PEX_LIBS='${PEX_LIBS}' EX_LIBS='${EX_LIBS}' BN_ASM='${BN_ASM}' DES_ENC='${DES_ENC}' SHA1_ASM_OBJ='${SHA1_ASM_OBJ}' MD5_ASM_OBJ='${MD5_ASM_OBJ}' RMD160_ASM_OBJ='${RMD160_ASM_OBJ}' BF_ENC='${BF_ENC}' CAST_ENC='${CAST_ENC}' RC4_ENC='${RC4_ENC}' RC5_ENC='${RC5_ENC}' AR='${AR}' PROCESSOR='${PROCESSOR}' PERL='${PERL}' RANLIB='${RANLIB}' des; fi
@@ -148,7 +156,7 @@ depend: 
	done;



clean:

	rm -f buildinf.h *.o */*.o *.obj lib tags core .pure .nfs* *.old *.bak fluff

	rm -f buildinf.h *.s *.o */*.o *.obj lib tags core .pure .nfs* *.old *.bak fluff

	@for i in $(SDIRS) ;\

	do \

	(cd $$i && echo "making clean in crypto/$$i..." && \

crypto/amd64cpuid.pl

0 → 100644
+30 −0
Original line number Diff line number Diff line 
#!/usr/bin/env perl



$output=shift;

$win64a=1 if ($output =~ /win64a\.[s|asm]/);

open STDOUT,">$output" || die "can't open $output: $!";



print<<___ if(defined($win64a));

TEXT	SEGMENT

PUBLIC	OPENSSL_rdtsc

ALIGN	16

OPENSSL_rdtsc	PROC NEAR

	rdtsc

	shl	rdx,32

	or	rax,rdx

	ret

OPENSSL_rdtsc	ENDP

TEXT	ENDS

END

___

print<<___ if(!defined($win64a));

.text

.globl	OPENSSL_rdtsc

.align	16

OPENSSL_rdtsc:

	rdtsc

	shl	\$32,%rdx

	or	%rdx,%rax

	ret

.size	OPENSSL_rdtsc,.-OPENSSL_rdtsc

___