Commit a4c886e4 authored by Dr. Stephen Henson's avatar Dr. Stephen Henson
Browse files

Add cpuid code to VC++ build.

parent 1291dfde

ms/do_masm.bat

+5 −0
Original line number Diff line number Diff line
@@ -58,6 +58,11 @@ cd crypto\whrlpool\asm 
perl wp-mmx.pl win32 > wp_win32.asm

cd ..\..\..



echo CPU-ID

cd crypto

perl x86cpuid.pl win32 > cpu_win32.asm

cd ..



echo on



perl util\mkfiles.pl >MINFO

ms/do_nasm.bat

+5 −0
Original line number Diff line number Diff line
@@ -59,6 +59,11 @@ cd crypto\whrlpool\asm 
perl wp-mmx.pl win32n > wp_win32.asm

cd ..\..\..



echo CPU-ID

cd crypto

perl x86cpuid.pl win32n > cpu_win32.asm

cd ..



echo on



perl util\mkfiles.pl >MINFO

util/mk1mf.pl

+8 −0
Original line number Diff line number Diff line
@@ -416,6 +416,8 @@ RMD160_ASM_OBJ=$rmd160_asm_obj 
RMD160_ASM_SRC=$rmd160_asm_src

WHIRLPOOL_ASM_OBJ=$whirlpool_asm_obj

WHIRLPOOL_ASM_SRC=$whirlpool_asm_src

CPUID_ASM_OBJ=$cpuid_asm_obj

CPUID_ASM_SRC=$cpuid_asm_src



# The output directory for everything intersting

OUT_D=$out_dir
@@ -664,6 +666,11 @@ foreach (values %lib_nam) 
		$lib_obj =~ s/\s(\S*\/wp_dgst\S*)/ $1 \$(WHIRLPOOL_ASM_OBJ)/;

		$rules.=&do_asm_rule($whirlpool_asm_obj,$whirlpool_asm_src);

		}

	if (($cpuid_asm_obj ne "") && ($_ eq "CRYPTO"))

		{

		$lib_obj =~ s/\s(\S*\/cversion\S*)/ $1 \$(CPUID_ASM_OBJ)/;

		$rules.=&do_asm_rule($cpuid_asm_obj,$cpuid_asm_src);

		}

	$defs.=&do_defs(${_}."OBJ",$lib_obj,"\$(OBJ_D)",$obj);

	$lib=($slib)?" \$(SHLIB_CFLAGS)".$shlib_ex_cflags{$_}:" \$(LIB_CFLAGS)";

	$rules.=&do_compile_rule("\$(OBJ_D)",$lib_obj{$_},$lib);
@@ -848,6 +855,7 @@ sub do_defs 
		elsif ($_ =~ /SHA1_ASM/){ $t="$_ "; }

		elsif ($_ =~ /RMD160_ASM/){ $t="$_ "; }

		elsif ($_ =~ /WHIRLPOOL_ASM/){ $t="$_ "; }

		elsif ($_ =~ /CPUID_ASM/){ $t="$_ "; }

		else	{ $t="$location${o}$_$pf "; }



		$Vars{$var}.="$t ";

util/pl/VC-32.pl

+2 −0
Original line number Diff line number Diff line
@@ -196,6 +196,8 @@ if (!$no_asm) 
	$rmd160_asm_src='crypto\ripemd\asm\rm_win32.asm';

	$whirlpool_asm_obj='crypto\whrlpool\asm\wp_win32.obj';

	$whirlpool_asm_src='crypto\whrlpool\asm\wp_win32.asm';

	$cpuid_asm_obj='crypto\cpu_win32.obj';

	$cpuid_asm_src='crypto\cpu_win32.asm';

	$cflags.=" -DBN_ASM -DMD5_ASM -DSHA1_ASM -DRMD160_ASM -DWHIRLPOOL_ASM";

	}