diff options
| author | lloyd <[email protected]> | 2009-07-07 20:37:27 +0000 |
|---|---|---|
| committer | lloyd <[email protected]> | 2009-07-07 20:37:27 +0000 |
| commit | 5dd07b73e4e5c8f88f9b64273e8e4ab0862a0db8 (patch) | |
| tree | 5416756616765df2f091905410724f3c66725caf | |
| parent | 431223161669026caf687c6fd69625546a4c46fa (diff) | |
CPU-specific engines are now only loaded if something depends on them,
and all CPU-specific implementations now depend on the appropriate engine
module.
The most common problem before with this was that the SSE2 module was built,
but the sole SSE2 code (SHA-1) was not (for instance, on an i686). This would
cause a compile warning about the unused request object.
Preventing unused engines from being built will also (very slightly) speed
up the lookup process on most system.
| -rw-r--r-- | src/block/serpent_ia32/info.txt | 1 | ||||
| -rw-r--r-- | src/engine/amd64_eng/info.txt | 6 | ||||
| -rw-r--r-- | src/engine/ia32_eng/info.txt | 6 | ||||
| -rw-r--r-- | src/engine/sse2_eng/info.txt | 2 | ||||
| -rw-r--r-- | src/hash/md4_ia32/info.txt | 1 | ||||
| -rw-r--r-- | src/hash/md5_ia32/info.txt | 1 | ||||
| -rw-r--r-- | src/hash/sha1_amd64/info.txt | 1 | ||||
| -rw-r--r-- | src/hash/sha1_ia32/info.txt | 1 | ||||
| -rw-r--r-- | src/hash/sha1_sse2/info.txt | 1 |
9 files changed, 9 insertions, 11 deletions
diff --git a/src/block/serpent_ia32/info.txt b/src/block/serpent_ia32/info.txt index d6a29229d..3a2fa12ff 100644 --- a/src/block/serpent_ia32/info.txt +++ b/src/block/serpent_ia32/info.txt @@ -11,6 +11,7 @@ serp_ia32.h </add> <requires> +ia32_eng asm_ia32 utils </requires> diff --git a/src/engine/amd64_eng/info.txt b/src/engine/amd64_eng/info.txt index 1d0283ad6..47f891445 100644 --- a/src/engine/amd64_eng/info.txt +++ b/src/engine/amd64_eng/info.txt @@ -2,13 +2,9 @@ realname "AMD64 Assembler Engine" define ENGINE_AMD64_ASSEMBLER -load_on auto +load_on dep <add> eng_amd64.cpp eng_amd64.h </add> - -<arch> -amd64 -</arch> diff --git a/src/engine/ia32_eng/info.txt b/src/engine/ia32_eng/info.txt index b9e3bddd5..3bf2a7f2b 100644 --- a/src/engine/ia32_eng/info.txt +++ b/src/engine/ia32_eng/info.txt @@ -2,13 +2,9 @@ realname "IA32 Assembler Engine" define ENGINE_IA32_ASSEMBLER -load_on auto +load_on dep <add> eng_ia32.cpp eng_ia32.h </add> - -<arch> -ia32 -</arch> diff --git a/src/engine/sse2_eng/info.txt b/src/engine/sse2_eng/info.txt index c44180ca4..6242c7fee 100644 --- a/src/engine/sse2_eng/info.txt +++ b/src/engine/sse2_eng/info.txt @@ -2,7 +2,7 @@ realname "SSE2 Assembler Engine" define ENGINE_SSE2_ASSEMBLER -load_on auto +load_on dep <add> eng_sse2.cpp diff --git a/src/hash/md4_ia32/info.txt b/src/hash/md4_ia32/info.txt index b2ad76ca3..e7249ad5f 100644 --- a/src/hash/md4_ia32/info.txt +++ b/src/hash/md4_ia32/info.txt @@ -11,6 +11,7 @@ md4_ia32.h </add> <requires> +ia32_eng asm_ia32 md4 </requires> diff --git a/src/hash/md5_ia32/info.txt b/src/hash/md5_ia32/info.txt index 652b50a16..7133e1ddd 100644 --- a/src/hash/md5_ia32/info.txt +++ b/src/hash/md5_ia32/info.txt @@ -11,6 +11,7 @@ md5_ia32.h </add> <requires> +ia32_eng asm_ia32 mdx_hash utils diff --git a/src/hash/sha1_amd64/info.txt b/src/hash/sha1_amd64/info.txt index ad473369a..99435ee7b 100644 --- a/src/hash/sha1_amd64/info.txt +++ b/src/hash/sha1_amd64/info.txt @@ -11,6 +11,7 @@ sha1_amd64.h </add> <requires> +amd64_eng asm_amd64 sha1 utils diff --git a/src/hash/sha1_ia32/info.txt b/src/hash/sha1_ia32/info.txt index 45903f2d6..a3e2e878a 100644 --- a/src/hash/sha1_ia32/info.txt +++ b/src/hash/sha1_ia32/info.txt @@ -11,6 +11,7 @@ sha1_ia32.h </add> <requires> +ia32_eng asm_ia32 sha1 utils diff --git a/src/hash/sha1_sse2/info.txt b/src/hash/sha1_sse2/info.txt index ac3a98c9f..e33bb1859 100644 --- a/src/hash/sha1_sse2/info.txt +++ b/src/hash/sha1_sse2/info.txt @@ -11,6 +11,7 @@ sha1_sse2.h </add> <requires> +sse2_eng sha1 utils </requires> |