diff options
| author | lloyd <[email protected]> | 2010-07-13 17:32:24 +0000 |
|---|---|---|
| committer | lloyd <[email protected]> | 2010-07-13 17:32:24 +0000 |
| commit | e51e9aa6a6033710920f0934178ef770fd25498f (patch) | |
| tree | 8f753df6deac2531c6792e277102d95dda7a3bc5 /src/libstate/libstate.cpp | |
| parent | 2006b4d305039cb9ff18d21b65c37ba1f2c39819 (diff) | |
Consolidate the two engines that provided assembler implementations
(amd64_eng and ia32_eng) into a new asm_engine. This same engine could
also be used in the event that asm code for other CPUs was added later
on.
Diffstat (limited to 'src/libstate/libstate.cpp')
| -rw-r--r-- | src/libstate/libstate.cpp | 16 |
1 files changed, 4 insertions, 12 deletions
diff --git a/src/libstate/libstate.cpp b/src/libstate/libstate.cpp index c7d2bb161..83fb31406 100644 --- a/src/libstate/libstate.cpp +++ b/src/libstate/libstate.cpp @@ -32,12 +32,8 @@ #include <botan/internal/mmap_mem.h> #endif -#if defined(BOTAN_HAS_ENGINE_IA32_ASSEMBLER) - #include <botan/internal/ia32_engine.h> -#endif - -#if defined(BOTAN_HAS_ENGINE_AMD64_ASSEMBLER) - #include <botan/internal/amd64_engine.h> +#if defined(BOTAN_HAS_ENGINE_ASSEMBLER) + #include <botan/internal/asm_engine.h> #endif #if defined(BOTAN_HAS_ENGINE_AES_ISA) @@ -298,12 +294,8 @@ void Library_State::initialize(bool thread_safe) algorithm_factory().add_engine(new SIMD_Engine); #endif -#if defined(BOTAN_HAS_ENGINE_AMD64_ASSEMBLER) - algorithm_factory().add_engine(new AMD64_Assembler_Engine); -#endif - -#if defined(BOTAN_HAS_ENGINE_IA32_ASSEMBLER) - algorithm_factory().add_engine(new IA32_Assembler_Engine); +#if defined(BOTAN_HAS_ENGINE_ASSEMBLER) + algorithm_factory().add_engine(new Assembler_Engine); #endif algorithm_factory().add_engine(new Default_Engine); |