diff options
author | lloyd <lloyd@randombit.net> | 2011-04-22 13:08:05 +0000 |
---|---|---|
committer | lloyd <lloyd@randombit.net> | 2011-04-22 13:08:05 +0000 |
commit | 8b40f974e65b7cc7d21a8e72b5f18f6e14208e57 (patch) | |
tree | 1192bdf14dbab29218db64abbef9ec0217ce30c8 | |
parent | 7b96a4844bf97b9c04a18565334e21dc89b8ba0b (diff) |
Rename all references of ia32 to x86-32 and amd64 to x86-64.
Back the reported version from 1.10.0 to 1.9.17 for the time
being. Still on the fence if this will be 1.10.0 or another release
candidate instead.
-rw-r--r-- | botan_version.py | 4 | ||||
-rw-r--r-- | doc/log.txt | 26 | ||||
-rw-r--r-- | readme.txt | 2 | ||||
-rw-r--r-- | src/block/serpent_x86_32/info.txt (renamed from src/block/serpent_ia32/info.txt) | 6 | ||||
-rw-r--r-- | src/block/serpent_x86_32/serp_x86_32.cpp (renamed from src/block/serpent_ia32/serp_ia32.cpp) | 22 | ||||
-rw-r--r-- | src/block/serpent_x86_32/serp_x86_32.h (renamed from src/block/serpent_ia32/serp_ia32.h) | 12 | ||||
-rw-r--r-- | src/block/serpent_x86_32/serp_x86_32_imp.S (renamed from src/block/serpent_ia32/serp_ia32_imp.S) | 18 | ||||
-rw-r--r-- | src/build-data/arch/x86_32.txt (renamed from src/build-data/arch/ia32.txt) | 1 | ||||
-rw-r--r-- | src/build-data/arch/x86_64.txt (renamed from src/build-data/arch/amd64.txt) | 2 | ||||
-rw-r--r-- | src/build-data/cc/clang.txt | 4 | ||||
-rw-r--r-- | src/build-data/cc/ekopath.txt | 4 | ||||
-rw-r--r-- | src/build-data/cc/gcc.txt | 26 | ||||
-rw-r--r-- | src/build-data/cc/open64.txt | 2 | ||||
-rw-r--r-- | src/build-data/cc/pgi.txt | 2 | ||||
-rw-r--r-- | src/build-data/cc/sunstudio.txt | 2 | ||||
-rw-r--r-- | src/engine/asm_engine/asm_engine.cpp | 44 | ||||
-rw-r--r-- | src/engine/asm_engine/asm_engine.h | 4 | ||||
-rw-r--r-- | src/hash/md4_x86_32/info.txt (renamed from src/hash/md4_ia32/info.txt) | 6 | ||||
-rw-r--r-- | src/hash/md4_x86_32/md4_x86_32.cpp (renamed from src/hash/md4_ia32/md4_ia32.cpp) | 12 | ||||
-rw-r--r-- | src/hash/md4_x86_32/md4_x86_32.h (renamed from src/hash/md4_ia32/md4_ia32.h) | 10 | ||||
-rw-r--r-- | src/hash/md4_x86_32/md4_x86_32_imp.S (renamed from src/hash/md4_ia32/md4_ia32_imp.S) | 10 | ||||
-rw-r--r-- | src/hash/md5_x86_32/info.txt (renamed from src/hash/md5_ia32/info.txt) | 6 | ||||
-rw-r--r-- | src/hash/md5_x86_32/md5_x86_32.cpp (renamed from src/hash/md5_ia32/md5_ia32.cpp) | 10 | ||||
-rw-r--r-- | src/hash/md5_x86_32/md5_x86_32.h (renamed from src/hash/md5_ia32/md5_ia32.h) | 10 | ||||
-rw-r--r-- | src/hash/md5_x86_32/md5_x86_32_imp.S (renamed from src/hash/md5_ia32/md5_ia32_imp.S) | 10 | ||||
-rw-r--r-- | src/hash/sha1_ia32/sha1_ia32.h | 31 | ||||
-rw-r--r-- | src/hash/sha1_x86_32/info.txt (renamed from src/hash/sha1_ia32/info.txt) | 6 | ||||
-rw-r--r-- | src/hash/sha1_x86_32/sha1_x86_32.cpp (renamed from src/hash/sha1_ia32/sha1_ia32.cpp) | 10 | ||||
-rw-r--r-- | src/hash/sha1_x86_32/sha1_x86_32.h | 31 | ||||
-rw-r--r-- | src/hash/sha1_x86_32/sha1_x86_32_imp.S (renamed from src/hash/sha1_ia32/sha1_ia32_imp.S) | 10 | ||||
-rw-r--r-- | src/hash/sha1_x86_64/info.txt (renamed from src/hash/sha1_amd64/info.txt) | 6 | ||||
-rw-r--r-- | src/hash/sha1_x86_64/sha1_x86_64.cpp (renamed from src/hash/sha1_amd64/sha1_amd64.cpp) | 8 | ||||
-rw-r--r-- | src/hash/sha1_x86_64/sha1_x86_64.h (renamed from src/hash/sha1_amd64/sha1_amd64.h) | 8 | ||||
-rw-r--r-- | src/hash/sha1_x86_64/sha1_x86_64_imp.S (renamed from src/hash/sha1_amd64/sha1_amd64_imp.S) | 8 | ||||
-rw-r--r-- | src/math/mp/info.txt | 2 | ||||
-rw-r--r-- | src/math/mp/mp_asm64/info.txt | 1 | ||||
-rw-r--r-- | src/math/mp/mp_msvc64/info.txt | 2 | ||||
-rw-r--r-- | src/math/mp/mp_x86_32/info.txt (renamed from src/math/mp/mp_ia32/info.txt) | 2 | ||||
-rw-r--r-- | src/math/mp/mp_x86_32/mp_asm.h (renamed from src/math/mp/mp_ia32/mp_asm.h) | 2 | ||||
-rw-r--r-- | src/math/mp/mp_x86_32/mp_asmi.h (renamed from src/math/mp/mp_ia32/mp_asmi.h) | 0 | ||||
-rw-r--r-- | src/math/mp/mp_x86_32_msvc/info.txt (renamed from src/math/mp/mp_ia32_msvc/info.txt) | 2 | ||||
-rw-r--r-- | src/math/mp/mp_x86_32_msvc/mp_asmi.h (renamed from src/math/mp/mp_ia32_msvc/mp_asmi.h) | 0 | ||||
-rw-r--r-- | src/math/mp/mp_x86_64/info.txt (renamed from src/math/mp/mp_amd64/info.txt) | 2 | ||||
-rw-r--r-- | src/math/mp/mp_x86_64/mp_asm.h (renamed from src/math/mp/mp_amd64/mp_asm.h) | 4 | ||||
-rw-r--r-- | src/math/mp/mp_x86_64/mp_asmi.h (renamed from src/math/mp/mp_amd64/mp_asmi.h) | 2 | ||||
-rw-r--r-- | src/utils/asm_x86_32/asm_x86_32.h (renamed from src/utils/asm_ia32/asm_macr_ia32.h) | 6 | ||||
-rw-r--r-- | src/utils/asm_x86_32/info.txt (renamed from src/utils/asm_ia32/info.txt) | 4 | ||||
-rw-r--r-- | src/utils/asm_x86_64/asm_x86_64.h (renamed from src/utils/asm_amd64/asm_macr_amd64.h) | 6 | ||||
-rw-r--r-- | src/utils/asm_x86_64/info.txt (renamed from src/utils/asm_amd64/info.txt) | 4 | ||||
-rw-r--r-- | src/utils/bswap.h | 4 | ||||
-rw-r--r-- | src/utils/cpuid.cpp | 2 |
51 files changed, 213 insertions, 205 deletions
diff --git a/botan_version.py b/botan_version.py index 491cdc204..1d82cb588 100644 --- a/botan_version.py +++ b/botan_version.py @@ -1,6 +1,6 @@ release_major = 1 -release_minor = 10 -release_patch = 0 +release_minor = 9 +release_patch = 17 release_datestamp = 0 diff --git a/doc/log.txt b/doc/log.txt index ccb672e25..d90d5c0eb 100644 --- a/doc/log.txt +++ b/doc/log.txt @@ -7,11 +7,9 @@ Release Notes 2011 ---------------------------------------- -Version 1.10.0, Not Yet Released +Version 1.9.17, Not Yet Released ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ -* Further updates to the documentation - * The format preserving encryption method currently available was presented in the header ``fpe.h`` and the functions ``fpe_encrypt`` and ``fpe_decrypt``. These were renamed as it is likely that other @@ -19,12 +17,6 @@ Version 1.10.0, Not Yet Released ``fpe_fe1.h``, and the functions are named ``fe1_encrypt`` and ``fe1_decrypt``. See :ref:`fpe` for more information. -* Some minor fixes for compiling botan under the BeOS - clone/continuation `Haiku <http://haiku-os.org>`_. - -* A bug in 1.9.16 effectively disabled support for runtime CPU feature - detection on x86 under GCC in that release. - * New options to ``configure.py`` control what tools are used for documentation generation. The ``--with-sphinx`` option enables using Sphinx to convert ReST into HTML; otherwise the ReST sources are @@ -33,6 +25,22 @@ Version 1.10.0, Not Yet Released target in the makefile; it will also be installed by the install target on Unix. +* A bug in 1.9.16 effectively disabled support for runtime CPU feature + detection on x86 under GCC in that release. + +* A mostly internal change, all references to "ia32" and "amd64" have + been changed to the vendor neutral and probably easier to understand + "x86-32" and "x86-64". For instance, the "mp_amd64" module has been + renamed "mp_x86_64", and the macro indicating x86-32 has changed + from ``BOTAN_TARGET_ARCH_IS_IA32`` to + ``BOTAN_TARGET_ARCH_IS_X86_32``. The classes calling assembly have + also been renamed. + +* Some minor fixes for compiling botan under the BeOS + clone/continuation `Haiku <http://haiku-os.org>`_. + +* Further updates to the documentation + Version 1.9.16, 2011-04-11 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ diff --git a/readme.txt b/readme.txt index ef6f2c77d..35eedfc17 100644 --- a/readme.txt +++ b/readme.txt @@ -1,4 +1,4 @@ -Botan 1.10.0, Not Yet Released +Botan 1.9.17, Not Yet Released http://botan.randombit.net/ Botan is a C++ class library for performing a wide variety of diff --git a/src/block/serpent_ia32/info.txt b/src/block/serpent_x86_32/info.txt index 3a1dd5919..b9c993546 100644 --- a/src/block/serpent_ia32/info.txt +++ b/src/block/serpent_x86_32/info.txt @@ -1,12 +1,12 @@ -define SERPENT_IA32 +define SERPENT_X86_32 load_on asm_ok <arch> -ia32 +x86_32 </arch> <requires> -asm_ia32 +asm_x86_32 serpent </requires> diff --git a/src/block/serpent_ia32/serp_ia32.cpp b/src/block/serpent_x86_32/serp_x86_32.cpp index d2f8adb62..4cefe1d65 100644 --- a/src/block/serpent_ia32/serp_ia32.cpp +++ b/src/block/serpent_x86_32/serp_x86_32.cpp @@ -1,11 +1,11 @@ /* -* IA-32 Serpent +* Serpent in x86-32 * (C) 1999-2007 Jack Lloyd * * Distributed under the terms of the Botan license */ -#include <botan/serp_ia32.h> +#include <botan/serp_x86_32.h> #include <botan/loadstor.h> namespace Botan { @@ -18,7 +18,7 @@ extern "C" { * @param out the output block * @param ks the key schedule */ -void botan_serpent_ia32_encrypt(const byte in[16], +void botan_serpent_x86_32_encrypt(const byte in[16], byte out[16], const u32bit ks[132]); @@ -28,7 +28,7 @@ void botan_serpent_ia32_encrypt(const byte in[16], * @param out the output block * @param ks the key schedule */ -void botan_serpent_ia32_decrypt(const byte in[16], +void botan_serpent_x86_32_decrypt(const byte in[16], byte out[16], const u32bit ks[132]); @@ -37,18 +37,18 @@ void botan_serpent_ia32_decrypt(const byte in[16], * @param ks holds the initial working key (padded), and is set to the final key schedule */ -void botan_serpent_ia32_key_schedule(u32bit ks[140]); +void botan_serpent_x86_32_key_schedule(u32bit ks[140]); } /* * Serpent Encryption */ -void Serpent_IA32::encrypt_n(const byte in[], byte out[], size_t blocks) const +void Serpent_X86_32::encrypt_n(const byte in[], byte out[], size_t blocks) const { for(size_t i = 0; i != blocks; ++i) { - botan_serpent_ia32_encrypt(in, out, this->get_round_keys()); + botan_serpent_x86_32_encrypt(in, out, this->get_round_keys()); in += BLOCK_SIZE; out += BLOCK_SIZE; } @@ -57,11 +57,11 @@ void Serpent_IA32::encrypt_n(const byte in[], byte out[], size_t blocks) const /* * Serpent Decryption */ -void Serpent_IA32::decrypt_n(const byte in[], byte out[], size_t blocks) const +void Serpent_X86_32::decrypt_n(const byte in[], byte out[], size_t blocks) const { for(size_t i = 0; i != blocks; ++i) { - botan_serpent_ia32_decrypt(in, out, this->get_round_keys()); + botan_serpent_x86_32_decrypt(in, out, this->get_round_keys()); in += BLOCK_SIZE; out += BLOCK_SIZE; } @@ -70,14 +70,14 @@ void Serpent_IA32::decrypt_n(const byte in[], byte out[], size_t blocks) const /* * Serpent Key Schedule */ -void Serpent_IA32::key_schedule(const byte key[], size_t length) +void Serpent_X86_32::key_schedule(const byte key[], size_t length) { SecureVector<u32bit> W(140); for(size_t i = 0; i != length / 4; ++i) W[i] = load_le<u32bit>(key, i); W[length / 4] |= u32bit(1) << ((length%4)*8); - botan_serpent_ia32_key_schedule(W); + botan_serpent_x86_32_key_schedule(W); this->set_round_keys(W + 8); } diff --git a/src/block/serpent_ia32/serp_ia32.h b/src/block/serpent_x86_32/serp_x86_32.h index d7b5bedc7..f6c4d564a 100644 --- a/src/block/serpent_ia32/serp_ia32.h +++ b/src/block/serpent_x86_32/serp_x86_32.h @@ -1,27 +1,27 @@ /* -* Serpent (IA-32) +* Serpent in x86-32 asm * (C) 1999-2007 Jack Lloyd * * Distributed under the terms of the Botan license */ -#ifndef BOTAN_SERPENT_IA32_H__ -#define BOTAN_SERPENT_IA32_H__ +#ifndef BOTAN_SERPENT_X86_32_H__ +#define BOTAN_SERPENT_X86_32_H__ #include <botan/serpent.h> namespace Botan { /** -* Serpent implementation in x86 assembly +* Serpent implementation in x86-32 assembly */ -class BOTAN_DLL Serpent_IA32 : public Serpent +class BOTAN_DLL Serpent_X86_32 : public Serpent { public: void encrypt_n(const byte in[], byte out[], size_t blocks) const; void decrypt_n(const byte in[], byte out[], size_t blocks) const; - BlockCipher* clone() const { return new Serpent_IA32; } + BlockCipher* clone() const { return new Serpent_X86_32; } private: void key_schedule(const byte[], size_t); }; diff --git a/src/block/serpent_ia32/serp_ia32_imp.S b/src/block/serpent_x86_32/serp_x86_32_imp.S index 5308173bf..e2549a099 100644 --- a/src/block/serpent_ia32/serp_ia32_imp.S +++ b/src/block/serpent_x86_32/serp_x86_32_imp.S @@ -1,13 +1,13 @@ /* -* Serpent in IA-32 assembler +* Serpent in x86-32 assembler * (C) 1999-2007 Jack Lloyd * * Distributed under the terms of the Botan license */ -#include <botan/internal/asm_macr_ia32.h> +#include <botan/internal/asm_x86_32.h> -START_LISTING(serp_ia32.S) +START_LISTING(serp_x86_32.S) #define SBOX_E1(A, B, C, D, T) \ XOR(D, A) ; \ @@ -441,7 +441,7 @@ START_LISTING(serp_ia32.S) /* * Serpent Encryption */ -START_FUNCTION(botan_serpent_ia32_encrypt) +START_FUNCTION(botan_serpent_x86_32_encrypt) SPILL_REGS() #define PUSHED 4 @@ -507,12 +507,12 @@ START_FUNCTION(botan_serpent_ia32_encrypt) RESTORE_REGS() #undef PUSHED -END_FUNCTION(botan_serpent_ia32_encrypt) +END_FUNCTION(botan_serpent_x86_32_encrypt) /* * Serpent Decryption */ -START_FUNCTION(botan_serpent_ia32_decrypt) +START_FUNCTION(botan_serpent_x86_32_decrypt) SPILL_REGS() #define PUSHED 4 @@ -578,12 +578,12 @@ START_FUNCTION(botan_serpent_ia32_decrypt) RESTORE_REGS() #undef PUSHED -END_FUNCTION(botan_serpent_ia32_decrypt) +END_FUNCTION(botan_serpent_x86_32_decrypt) /* * Serpent Key Schedule */ -START_FUNCTION(botan_serpent_ia32_key_schedule) +START_FUNCTION(botan_serpent_x86_32_key_schedule) SPILL_REGS() #define PUSHED 4 @@ -666,4 +666,4 @@ LOOP_UNTIL_EQ(ESI, 140, .L_SERP_EXPANSION) RESTORE_REGS() #undef PUSHED -END_FUNCTION(botan_serpent_ia32_key_schedule) +END_FUNCTION(botan_serpent_x86_32_key_schedule) diff --git a/src/build-data/arch/ia32.txt b/src/build-data/arch/x86_32.txt index f21f8a551..9289f1b2e 100644 --- a/src/build-data/arch/ia32.txt +++ b/src/build-data/arch/x86_32.txt @@ -4,6 +4,7 @@ unaligned ok family x86 <aliases> +ia32 x86 ix86 80x86 diff --git a/src/build-data/arch/amd64.txt b/src/build-data/arch/x86_64.txt index b3b9879d2..59e48329a 100644 --- a/src/build-data/arch/amd64.txt +++ b/src/build-data/arch/x86_64.txt @@ -4,8 +4,8 @@ unaligned ok family x86 <aliases> +amd64 x86-64 -x86_64 # for RPM em64t x64 </aliases> diff --git a/src/build-data/cc/clang.txt b/src/build-data/cc/clang.txt index 14c51349c..5f522cdb6 100644 --- a/src/build-data/cc/clang.txt +++ b/src/build-data/cc/clang.txt @@ -29,12 +29,12 @@ default -> "$(CXX) -shared -fPIC -Wl,-soname,$(SONAME)" </so_link_flags> <mach_opt> -amd64 -> "-march=SUBMODEL" +x86_64 -> "-march=SUBMODEL" nehalem -> "-march=core2 -mssse3 -msse4.1" </mach_opt> <mach_abi_linking> -amd64 -> "-m64" +x86_64 -> "-m64" mips64 -> "-mabi=64" s390 -> "-m31" s390x -> "-m64" diff --git a/src/build-data/cc/ekopath.txt b/src/build-data/cc/ekopath.txt index ac514261e..101f6babb 100644 --- a/src/build-data/cc/ekopath.txt +++ b/src/build-data/cc/ekopath.txt @@ -32,6 +32,6 @@ opteron -> "-mcpu=opteron" em64t -> "-mcpu=em64t" core2 -> "-mcpu=core" -ia32 -> "-mcpu=anyx86" -amd64 -> "-mcpu=athlon64" +x86 -> "-mcpu=anyx86" +x86_64 -> "-mcpu=athlon64" </mach_opt> diff --git a/src/build-data/cc/gcc.txt b/src/build-data/cc/gcc.txt index 3eaa79e01..fde33cde2 100644 --- a/src/build-data/cc/gcc.txt +++ b/src/build-data/cc/gcc.txt @@ -54,24 +54,24 @@ alpha-ev7 -> "-mcpu=ev6" # Anything after the quotes is what should be *removed* from the submodel name # before it's put into SUBMODEL. alpha -> "-mcpu=SUBMODEL" alpha- -amd64 -> "-march=SUBMODEL -momit-leaf-frame-pointer" arm -> "-march=SUBMODEL" -ia32 -> "-march=SUBMODEL -momit-leaf-frame-pointer" -ia64 -> "-mtune=SUBMODEL" +hitachi-sh -> "-mSUBMODEL" hitachi-sh hppa -> "-march=SUBMODEL" hppa +ia64 -> "-mtune=SUBMODEL" m68k -> "-mSUBMODEL" -hitachi-sh -> "-mSUBMODEL" hitachi-sh -sparc32 -> "-mcpu=SUBMODEL -Wa,-xarch=v8plus" sparc32- -sparc64 -> "-mcpu=v9 -mtune=SUBMODEL" mips32 -> "-mips1 -mcpu=SUBMODEL" mips32- mips64 -> "-mips3 -mcpu=SUBMODEL" mips64- ppc -> "-mcpu=SUBMODEL" ppc ppc64 -> "-mcpu=SUBMODEL" ppc +sparc32 -> "-mcpu=SUBMODEL -Wa,-xarch=v8plus" sparc32- +sparc64 -> "-mcpu=v9 -mtune=SUBMODEL" +x86_32 -> "-march=SUBMODEL -momit-leaf-frame-pointer" +x86_64 -> "-march=SUBMODEL -momit-leaf-frame-pointer" </mach_opt> -# Note that the 'linking' bit means "use this for both compiling *and* linking" +# The 'linking' bit means "use this for both compiling *and* linking" <mach_abi_linking> -amd64 -> "-m64" +x86_64 -> "-m64" mips64 -> "-mabi=64" s390 -> "-m31" s390x -> "-m64" @@ -79,10 +79,10 @@ sparc32 -> "-m32 -mno-app-regs" sparc64 -> "-m64 -mno-app-regs" ppc64 -> "-m64" -# This should probably be used on most/all targets, but the docs are incomplete -openbsd -> "-pthread" -freebsd -> "-pthread" +# This should probably be used on most/all targets, but the docs are unclear +openbsd -> "-pthread" +freebsd -> "-pthread" dragonfly -> "-pthread" -netbsd -> "-pthread -D_NETBSD_SOURCE" -qnx -> "-fexceptions -D_QNX_SOURCE" +netbsd -> "-pthread -D_NETBSD_SOURCE" +qnx -> "-fexceptions -D_QNX_SOURCE" </mach_abi_linking> diff --git a/src/build-data/cc/open64.txt b/src/build-data/cc/open64.txt index 34359ef63..52f35a7e8 100644 --- a/src/build-data/cc/open64.txt +++ b/src/build-data/cc/open64.txt @@ -23,5 +23,5 @@ default -> "$(CXX) -shared -Wl,-soname,$(SONAME)" </so_link_flags> <mach_abi_linking> -amd64 -> "-m64" +x86_64 -> "-m64" </mach_abi_linking> diff --git a/src/build-data/cc/pgi.txt b/src/build-data/cc/pgi.txt index 0e4f8baf2..985c534b9 100644 --- a/src/build-data/cc/pgi.txt +++ b/src/build-data/cc/pgi.txt @@ -24,5 +24,5 @@ i586 -> "-tp p5" i686 -> "-tp p6" athlon -> "-tp k7" pentium4 -> "-tp p6" -ia32 -> "-tp px" +x86_32 -> "-tp px" </mach_opt> diff --git a/src/build-data/cc/sunstudio.txt b/src/build-data/cc/sunstudio.txt index d0b25d144..5fb4c6bb8 100644 --- a/src/build-data/cc/sunstudio.txt +++ b/src/build-data/cc/sunstudio.txt @@ -49,5 +49,5 @@ sparc64 -> "-xchip=SUBMODEL" sparc64- #linux -> "-library=stlport4" sparc64 -> "-xarch=v9" -amd64 -> "-m64" +x86_64 -> "-m64" </mach_abi_linking> diff --git a/src/engine/asm_engine/asm_engine.cpp b/src/engine/asm_engine/asm_engine.cpp index 747e8c00f..6d475136f 100644 --- a/src/engine/asm_engine/asm_engine.cpp +++ b/src/engine/asm_engine/asm_engine.cpp @@ -7,24 +7,24 @@ #include <botan/internal/asm_engine.h> -#if defined(BOTAN_HAS_SERPENT_IA32) - #include <botan/serp_ia32.h> +#if defined(BOTAN_HAS_SERPENT_X86_32) + #include <botan/serp_x86_32.h> #endif -#if defined(BOTAN_HAS_MD4_IA32) - #include <botan/md4_ia32.h> +#if defined(BOTAN_HAS_MD4_X86_32) + #include <botan/md4_x86_32.h> #endif -#if defined(BOTAN_HAS_MD5_IA32) - #include <botan/md5_ia32.h> +#if defined(BOTAN_HAS_MD5_X86_32) + #include <botan/md5_x86_32.h> #endif -#if defined(BOTAN_HAS_SHA1_AMD64) - #include <botan/sha1_amd64.h> +#if defined(BOTAN_HAS_SHA1_X86_64) + #include <botan/sha1_x86_64.h> #endif -#if defined(BOTAN_HAS_SHA1_IA32) - #include <botan/sha1_ia32.h> +#if defined(BOTAN_HAS_SHA1_X86_32) + #include <botan/sha1_x86_32.h> #endif namespace Botan { @@ -35,8 +35,8 @@ Assembler_Engine::find_block_cipher(const SCAN_Name& request, { if(request.algo_name() == "Serpent") { -#if defined(BOTAN_HAS_SERPENT_IA32) - return new Serpent_IA32; +#if defined(BOTAN_HAS_SERPENT_X86_32) + return new Serpent_X86_32; #endif } @@ -47,24 +47,24 @@ HashFunction* Assembler_Engine::find_hash(const SCAN_Name& request, Algorithm_Factory&) const { -#if defined(BOTAN_HAS_MD4_IA32) +#if defined(BOTAN_HAS_MD4_X86_32) if(request.algo_name() == "MD4") - return new MD4_IA32; + return new MD4_X86_32; #endif -#if defined(BOTAN_HAS_MD5_IA32) +#if defined(BOTAN_HAS_MD5_X86_32) if(request.algo_name() == "MD5") - return new MD5_IA32; + return new MD5_X86_32; #endif if(request.algo_name() == "SHA-160") - { -#if defined(BOTAN_HAS_SHA1_AMD64) - return new SHA_160_AMD64; -#elif defined(BOTAN_HAS_SHA1_IA32) - return new SHA_160_IA32; + { +#if defined(BOTAN_HAS_SHA1_X86_64) + return new SHA_160_X86_64; +#elif defined(BOTAN_HAS_SHA1_X86_32) + return new SHA_160_X86_32; #endif - } + } return 0; } diff --git a/src/engine/asm_engine/asm_engine.h b/src/engine/asm_engine/asm_engine.h index e3e9a546c..bd82566d3 100644 --- a/src/engine/asm_engine/asm_engine.h +++ b/src/engine/asm_engine/asm_engine.h @@ -5,8 +5,8 @@ * Distributed under the terms of the Botan license */ -#ifndef BOTAN_IA32_ASM_ENGINE_H__ -#define BOTAN_IA32_ASM_ENGINE_H__ +#ifndef BOTAN_X86_32_ASM_ENGINE_H__ +#define BOTAN_X86_32_ASM_ENGINE_H__ #include <botan/engine.h> diff --git a/src/hash/md4_ia32/info.txt b/src/hash/md4_x86_32/info.txt index 5d14188f2..fdc534df4 100644 --- a/src/hash/md4_ia32/info.txt +++ b/src/hash/md4_x86_32/info.txt @@ -1,12 +1,12 @@ -define MD4_IA32 +define MD4_X86_32 load_on asm_ok <arch> -ia32 +x86_32 </arch> <requires> -asm_ia32 +asm_x86_32 md4 </requires> diff --git a/src/hash/md4_ia32/md4_ia32.cpp b/src/hash/md4_x86_32/md4_x86_32.cpp index 98d3c7a19..750e65a95 100644 --- a/src/hash/md4_ia32/md4_ia32.cpp +++ b/src/hash/md4_x86_32/md4_x86_32.cpp @@ -1,32 +1,32 @@ /* -* MD4 (IA-32) +* MD4 (x86-32) * (C) 1999-2007 Jack Lloyd * * Distributed under the terms of the Botan license */ -#include <botan/md4_ia32.h> +#include <botan/md4_x86_32.h> namespace Botan { /** -* MD4 compression function in IA-32 asm +* MD4 compression function in x86-32 asm * @param digest the current digest * @param input the input block * @param M the message buffer */ -extern "C" void botan_md4_ia32_compress(u32bit digest[4], +extern "C" void botan_md4_x86_32_compress(u32bit digest[4], const byte input[64], u32bit M[16]); /* * MD4 Compression Function */ -void MD4_IA32::compress_n(const byte input[], size_t blocks) +void MD4_X86_32::compress_n(const byte input[], size_t blocks) { for(size_t i = 0; i != blocks; ++i) { - botan_md4_ia32_compress(digest, input, M); + botan_md4_x86_32_compress(digest, input, M); input += hash_block_size(); } } diff --git a/src/hash/md4_ia32/md4_ia32.h b/src/hash/md4_x86_32/md4_x86_32.h index 4bb8f1add..a9f23e94f 100644 --- a/src/hash/md4_ia32/md4_ia32.h +++ b/src/hash/md4_x86_32/md4_x86_32.h @@ -1,12 +1,12 @@ /* -* MD4 (IA-32) +* MD4 (x86-32) * (C) 1999-2007 Jack Lloyd * * Distributed under the terms of the Botan license */ -#ifndef BOTAN_MD4_IA32_H__ -#define BOTAN_MD4_IA32_H__ +#ifndef BOTAN_MD4_X86_32_H__ +#define BOTAN_MD4_X86_32_H__ #include <botan/md4.h> @@ -15,10 +15,10 @@ namespace Botan { /** * MD4 using x86 assembly */ -class BOTAN_DLL MD4_IA32 : public MD4 +class BOTAN_DLL MD4_X86_32 : public MD4 { public: - HashFunction* clone() const { return new MD4_IA32; } + HashFunction* clone() const { return new MD4_X86_32; } private: void compress_n(const byte[], size_t blocks); }; diff --git a/src/hash/md4_ia32/md4_ia32_imp.S b/src/hash/md4_x86_32/md4_x86_32_imp.S index c7e108147..192751166 100644 --- a/src/hash/md4_ia32/md4_ia32_imp.S +++ b/src/hash/md4_x86_32/md4_x86_32_imp.S @@ -1,15 +1,15 @@ /* -* MD4 in IA-32 assembler +* MD4 in x86-32 assembler * (C) 1999-2007 Jack Lloyd * * Distributed under the terms of the Botan license */ -#include <botan/internal/asm_macr_ia32.h> +#include <botan/internal/asm_x86_32.h> -START_LISTING(md4_ia32.S) +START_LISTING(md4_x86_32_imp.S) -START_FUNCTION(botan_md4_ia32_compress) +START_FUNCTION(botan_md4_x86_32_compress) SPILL_REGS() #define PUSHED 4 @@ -134,4 +134,4 @@ LOOP_UNTIL_EQ(ESI, 16, .LOAD_INPUT) ADD(ARRAY4(EBP, 3), EDX) RESTORE_REGS() -END_FUNCTION(botan_md4_ia32_compress) +END_FUNCTION(botan_md4_x86_32_compress) diff --git a/src/hash/md5_ia32/info.txt b/src/hash/md5_x86_32/info.txt index 9be698a3f..adec65f81 100644 --- a/src/hash/md5_ia32/info.txt +++ b/src/hash/md5_x86_32/info.txt @@ -1,12 +1,12 @@ -define MD5_IA32 +define MD5_X86_32 load_on asm_ok <arch> -ia32 +x86_32 </arch> <requires> -asm_ia32 +asm_x86_32 md5 </requires> diff --git a/src/hash/md5_ia32/md5_ia32.cpp b/src/hash/md5_x86_32/md5_x86_32.cpp index 6ae235d2b..123fcff77 100644 --- a/src/hash/md5_ia32/md5_ia32.cpp +++ b/src/hash/md5_x86_32/md5_x86_32.cpp @@ -1,29 +1,29 @@ /* -* MD5 (IA-32) +* MD5 (x86-32) * (C) 1999-2007 Jack Lloyd * * Distributed under the terms of the Botan license */ -#include <botan/md5_ia32.h> +#include <botan/md5_x86_32.h> namespace Botan { namespace { extern "C" -void botan_md5_ia32_compress(u32bit[4], const byte[64], u32bit[16]); +void botan_md5_x86_32_compress(u32bit[4], const byte[64], u32bit[16]); } /* * MD5 Compression Function */ -void MD5_IA32::compress_n(const byte input[], size_t blocks) +void MD5_X86_32::compress_n(const byte input[], size_t blocks) { for(size_t i = 0; i != blocks; ++i) { - botan_md5_ia32_compress(digest, input, M); + botan_md5_x86_32_compress(digest, input, M); input += hash_block_size(); } } diff --git a/src/hash/md5_ia32/md5_ia32.h b/src/hash/md5_x86_32/md5_x86_32.h index bf4b4c505..0150249ae 100644 --- a/src/hash/md5_ia32/md5_ia32.h +++ b/src/hash/md5_x86_32/md5_x86_32.h @@ -1,12 +1,12 @@ /* -* MD5 (IA-32) +* MD5 (x86-32) * (C) 1999-2007 Jack Lloyd * * Distributed under the terms of the Botan license */ -#ifndef BOTAN_MD5_IA32_H__ -#define BOTAN_MD5_IA32_H__ +#ifndef BOTAN_MD5_X86_32_H__ +#define BOTAN_MD5_X86_32_H__ #include <botan/md5.h> @@ -15,10 +15,10 @@ namespace Botan { /** * MD5 in x86 assembly */ -class BOTAN_DLL MD5_IA32 : public MD5 +class BOTAN_DLL MD5_X86_32 : public MD5 { public: - HashFunction* clone() const { return new MD5_IA32; } + HashFunction* clone() const { return new MD5_X86_32; } private: void compress_n(const byte[], size_t blocks); }; diff --git a/src/hash/md5_ia32/md5_ia32_imp.S b/src/hash/md5_x86_32/md5_x86_32_imp.S index e77836353..f41aaccbf 100644 --- a/src/hash/md5_ia32/md5_ia32_imp.S +++ b/src/hash/md5_x86_32/md5_x86_32_imp.S @@ -1,15 +1,15 @@ /* -* MD5 in IA-32 assembler +* MD5 in x86-32 assembler * (C) 1999-2007 Jack Lloyd * * Distributed under the terms of the Botan license */ -#include <botan/internal/asm_macr_ia32.h> +#include <botan/internal/asm_x86_32.h> -START_LISTING(md5_ia32.S) +START_LISTING(md5_x86_32.S) -START_FUNCTION(botan_md5_ia32_compress) +START_FUNCTION(botan_md5_x86_32_compress) SPILL_REGS() #define PUSHED 4 @@ -163,4 +163,4 @@ LOOP_UNTIL_EQ(ESI, 16, .LOAD_INPUT) ADD(ARRAY4(EBP, 3), EDX) RESTORE_REGS() -END_FUNCTION(botan_md5_ia32_compress) +END_FUNCTION(botan_md5_x86_32_compress) diff --git a/src/hash/sha1_ia32/sha1_ia32.h b/src/hash/sha1_ia32/sha1_ia32.h deleted file mode 100644 index 5cff03016..000000000 --- a/src/hash/sha1_ia32/sha1_ia32.h +++ /dev/null @@ -1,31 +0,0 @@ -/* -* SHA-160 (IA-32) -* (C) 1999-2007 Jack Lloyd -* -* Distributed under the terms of the Botan license -*/ - -#ifndef BOTAN_SHA_160_IA32_H__ -#define BOTAN_SHA_160_IA32_H__ - -#include <botan/sha160.h> - -namespace Botan { - -/** -* SHA-160 in x86 assembly -*/ -class BOTAN_DLL SHA_160_IA32 : public SHA_160 - { - public: - HashFunction* clone() const { return new SHA_160_IA32; } - - // Note 81 instead of normal 80: IA-32 asm needs an extra temp - SHA_160_IA32() : SHA_160(81) {} - private: - void compress_n(const byte[], size_t blocks); - }; - -} - -#endif diff --git a/src/hash/sha1_ia32/info.txt b/src/hash/sha1_x86_32/info.txt index 47d8e753e..7359a6754 100644 --- a/src/hash/sha1_ia32/info.txt +++ b/src/hash/sha1_x86_32/info.txt @@ -1,12 +1,12 @@ -define SHA1_IA32 +define SHA1_X86_32 load_on asm_ok <arch> -ia32 +x86_32 </arch> <requires> -asm_ia32 +asm_x86_32 sha1 </requires> diff --git a/src/hash/sha1_ia32/sha1_ia32.cpp b/src/hash/sha1_x86_32/sha1_x86_32.cpp index 3e9cff047..6a4dc2a1d 100644 --- a/src/hash/sha1_ia32/sha1_ia32.cpp +++ b/src/hash/sha1_x86_32/sha1_x86_32.cpp @@ -1,29 +1,29 @@ /* -* SHA-160 (IA-32) +* SHA-160 in x86-32 * (C) 1999-2007 Jack Lloyd * * Distributed under the terms of the Botan license */ -#include <botan/sha1_ia32.h> +#include <botan/sha1_x86_32.h> namespace Botan { namespace { extern "C" -void botan_sha160_ia32_compress(u32bit[5], const byte[64], u32bit[81]); +void botan_sha160_x86_32_compress(u32bit[5], const byte[64], u32bit[81]); } /* * SHA-160 Compression Function */ -void SHA_160_IA32::compress_n(const byte input[], size_t blocks) +void SHA_160_X86_32::compress_n(const byte input[], size_t blocks) { for(size_t i = 0; i != blocks; ++i) { - botan_sha160_ia32_compress(&digest[0], input, &W[0]); + botan_sha160_x86_32_compress(&digest[0], input, &W[0]); input += hash_block_size(); } } diff --git a/src/hash/sha1_x86_32/sha1_x86_32.h b/src/hash/sha1_x86_32/sha1_x86_32.h new file mode 100644 index 000000000..b344d4ae2 --- /dev/null +++ b/src/hash/sha1_x86_32/sha1_x86_32.h @@ -0,0 +1,31 @@ +/* +* SHA-160 in x86-32 asm +* (C) 1999-2007 Jack Lloyd +* +* Distributed under the terms of the Botan license +*/ + +#ifndef BOTAN_SHA_160_X86_32_H__ +#define BOTAN_SHA_160_X86_32_H__ + +#include <botan/sha160.h> + +namespace Botan { + +/** +* SHA-160 in x86 assembly +*/ +class BOTAN_DLL SHA_160_X86_32 : public SHA_160 + { + public: + HashFunction* clone() const { return new SHA_160_X86_32; } + + // Note 81 instead of normal 80: x86-32 asm needs an extra temp + SHA_160_X86_32() : SHA_160(81) {} + private: + void compress_n(const byte[], size_t blocks); + }; + +} + +#endif diff --git a/src/hash/sha1_ia32/sha1_ia32_imp.S b/src/hash/sha1_x86_32/sha1_x86_32_imp.S index 0aed8015b..775ef6854 100644 --- a/src/hash/sha1_ia32/sha1_ia32_imp.S +++ b/src/hash/sha1_x86_32/sha1_x86_32_imp.S @@ -1,15 +1,15 @@ /* -* SHA-1 in IA-32 assembler +* SHA-1 in x86-32 asm * (C) 1999-2007 Jack Lloyd * * Distributed under the terms of the Botan license */ -#include <botan/internal/asm_macr_ia32.h> +#include <botan/internal/asm_x86_32.h> -START_LISTING(sha1_ia32.S) +START_LISTING(sha1_x86_32_imp.S) -START_FUNCTION(botan_sha160_ia32_compress) +START_FUNCTION(botan_sha160_x86_32_compress) SPILL_REGS() #define PUSHED 4 @@ -241,4 +241,4 @@ LOOP_UNTIL_EQ(ESI, 80, .L_SHA_EXPANSION) ADD(ARRAY4(EBP, 4), ECX) RESTORE_REGS() -END_FUNCTION(botan_sha160_ia32_compress) +END_FUNCTION(botan_sha160_x86_32_compress) diff --git a/src/hash/sha1_amd64/info.txt b/src/hash/sha1_x86_64/info.txt index 78eaa23c2..3d54c0baa 100644 --- a/src/hash/sha1_amd64/info.txt +++ b/src/hash/sha1_x86_64/info.txt @@ -1,13 +1,13 @@ -define SHA1_AMD64 +define SHA1_X86_64 load_on asm_ok <arch> -amd64 +x86_64 </arch> <requires> asm_engine -asm_amd64 +asm_x86_64 sha1 </requires> diff --git a/src/hash/sha1_amd64/sha1_amd64.cpp b/src/hash/sha1_x86_64/sha1_x86_64.cpp index d32b44901..a3e92e313 100644 --- a/src/hash/sha1_amd64/sha1_amd64.cpp +++ b/src/hash/sha1_x86_64/sha1_x86_64.cpp @@ -5,25 +5,25 @@ * Distributed under the terms of the Botan license */ -#include <botan/sha1_amd64.h> +#include <botan/sha1_x86_64.h> namespace Botan { namespace { extern "C" -void botan_sha160_amd64_compress(u32bit[5], const byte[64], u32bit[80]); +void botan_sha160_x86_64_compress(u32bit[5], const byte[64], u32bit[80]); } /* * SHA-160 Compression Function */ -void SHA_160_AMD64::compress_n(const byte input[], size_t blocks) +void SHA_160_X86_64::compress_n(const byte input[], size_t blocks) { for(size_t i = 0; i != blocks; ++i) { - botan_sha160_amd64_compress(&digest[0], input, &W[0]); + botan_sha160_x86_64_compress(&digest[0], input, &W[0]); input += hash_block_size(); } } diff --git a/src/hash/sha1_amd64/sha1_amd64.h b/src/hash/sha1_x86_64/sha1_x86_64.h index 6b741184d..068a94595 100644 --- a/src/hash/sha1_amd64/sha1_amd64.h +++ b/src/hash/sha1_x86_64/sha1_x86_64.h @@ -5,8 +5,8 @@ * Distributed under the terms of the Botan license */ -#ifndef BOTAN_SHA_160_AMD64_H__ -#define BOTAN_SHA_160_AMD64_H__ +#ifndef BOTAN_SHA_160_X86_64_H__ +#define BOTAN_SHA_160_X86_64_H__ #include <botan/sha160.h> @@ -15,10 +15,10 @@ namespace Botan { /** * SHA-160 in x86-64 assembly */ -class BOTAN_DLL SHA_160_AMD64 : public SHA_160 +class BOTAN_DLL SHA_160_X86_64 : public SHA_160 { public: - HashFunction* clone() const { return new SHA_160_AMD64; } + HashFunction* clone() const { return new SHA_160_X86_64; } private: void compress_n(const byte[], size_t blocks); }; diff --git a/src/hash/sha1_amd64/sha1_amd64_imp.S b/src/hash/sha1_x86_64/sha1_x86_64_imp.S index 4eea75f11..ee35f0d85 100644 --- a/src/hash/sha1_amd64/sha1_amd64_imp.S +++ b/src/hash/sha1_x86_64/sha1_x86_64_imp.S @@ -5,11 +5,11 @@ * Distributed under the terms of the Botan license */ -#include <botan/internal/asm_macr_amd64.h> +#include <botan/internal/asm_x86_64.h> -START_LISTING(sha1_amd64.S) +START_LISTING(sha1_x86_64_imp.S) -START_FUNCTION(botan_sha160_amd64_compress) +START_FUNCTION(botan_sha160_x86_64_compress) #define DIGEST_ARR %rdi #define INPUT %rsi @@ -263,4 +263,4 @@ ALIGN; ADD(ARRAY4(DIGEST_ARR, 3), B) ADD(ARRAY4(DIGEST_ARR, 4), C) -END_FUNCTION(botan_sha160_amd64_compress) +END_FUNCTION(botan_sha160_x86_64_compress) diff --git a/src/math/mp/info.txt b/src/math/mp/info.txt index a3c994d8b..911093699 100644 --- a/src/math/mp/info.txt +++ b/src/math/mp/info.txt @@ -17,7 +17,7 @@ mp_core.h </header:internal> <requires> -mp_amd64|mp_msvc64|mp_asm64|mp_ia32|mp_ia32_msvc|mp_generic +mp_x86_64|mp_msvc64|mp_asm64|mp_x86_32|mp_x86_32_msvc|mp_generic monty_generic mulop_generic </requires> diff --git a/src/math/mp/mp_asm64/info.txt b/src/math/mp/mp_asm64/info.txt index fd0242a7a..42363e8b0 100644 --- a/src/math/mp/mp_asm64/info.txt +++ b/src/math/mp/mp_asm64/info.txt @@ -8,7 +8,6 @@ mp_generic:mp_asmi.h </header:internal> <arch> -#amd64 alpha ia64 mips64 diff --git a/src/math/mp/mp_msvc64/info.txt b/src/math/mp/mp_msvc64/info.txt index 56ae05927..fa7d90fed 100644 --- a/src/math/mp/mp_msvc64/info.txt +++ b/src/math/mp/mp_msvc64/info.txt @@ -8,7 +8,7 @@ mp_generic:mp_asmi.h </header:internal> <arch> -amd64 +x86_64 ia64 </arch> diff --git a/src/math/mp/mp_ia32/info.txt b/src/math/mp/mp_x86_32/info.txt index 1659f74cf..432f909f8 100644 --- a/src/math/mp/mp_ia32/info.txt +++ b/src/math/mp/mp_x86_32/info.txt @@ -8,7 +8,7 @@ mp_asmi.h </header:internal> <arch> -ia32 +x86_32 </arch> <cc> diff --git a/src/math/mp/mp_ia32/mp_asm.h b/src/math/mp/mp_x86_32/mp_asm.h index 4d3afc992..9be5680f8 100644 --- a/src/math/mp/mp_ia32/mp_asm.h +++ b/src/math/mp/mp_x86_32/mp_asm.h @@ -12,7 +12,7 @@ #include <botan/mp_types.h> #if (BOTAN_MP_WORD_BITS != 32) - #error The mp_ia32 module requires that BOTAN_MP_WORD_BITS == 32 + #error The mp_x86_32 module requires that BOTAN_MP_WORD_BITS == 32 #endif namespace Botan { diff --git a/src/math/mp/mp_ia32/mp_asmi.h b/src/math/mp/mp_x86_32/mp_asmi.h index c7b679e80..c7b679e80 100644 --- a/src/math/mp/mp_ia32/mp_asmi.h +++ b/src/math/mp/mp_x86_32/mp_asmi.h diff --git a/src/math/mp/mp_ia32_msvc/info.txt b/src/math/mp/mp_x86_32_msvc/info.txt index 55a42c310..8d35c02e7 100644 --- a/src/math/mp/mp_ia32_msvc/info.txt +++ b/src/math/mp/mp_x86_32_msvc/info.txt @@ -8,7 +8,7 @@ mp_asmi.h </header:internal> <arch> -ia32 +x86_32 </arch> <cc> diff --git a/src/math/mp/mp_ia32_msvc/mp_asmi.h b/src/math/mp/mp_x86_32_msvc/mp_asmi.h index aee457d65..aee457d65 100644 --- a/src/math/mp/mp_ia32_msvc/mp_asmi.h +++ b/src/math/mp/mp_x86_32_msvc/mp_asmi.h diff --git a/src/math/mp/mp_amd64/info.txt b/src/math/mp/mp_x86_64/info.txt index 11cc380e2..fdcc05dd6 100644 --- a/src/math/mp/mp_amd64/info.txt +++ b/src/math/mp/mp_x86_64/info.txt @@ -8,7 +8,7 @@ mp_asmi.h </header:internal> <arch> -amd64 +x86_64 </arch> <cc> diff --git a/src/math/mp/mp_amd64/mp_asm.h b/src/math/mp/mp_x86_64/mp_asm.h index fa66d04f3..edfaf6352 100644 --- a/src/math/mp/mp_amd64/mp_asm.h +++ b/src/math/mp/mp_x86_64/mp_asm.h @@ -12,7 +12,7 @@ #include <botan/mp_types.h> #if (BOTAN_MP_WORD_BITS != 64) - #error The mp_amd64 module requires that BOTAN_MP_WORD_BITS == 64 + #error The mp_x86_64 module requires that BOTAN_MP_WORD_BITS == 64 #endif namespace Botan { @@ -20,7 +20,7 @@ namespace Botan { extern "C" { /* -* Helper Macros for amd64 Assembly +* Helper Macros for x86-64 Assembly */ #define ASM(x) x "\n\t" diff --git a/src/math/mp/mp_amd64/mp_asmi.h b/src/math/mp/mp_x86_64/mp_asmi.h index adf7774ef..f14df0e89 100644 --- a/src/math/mp/mp_amd64/mp_asmi.h +++ b/src/math/mp/mp_x86_64/mp_asmi.h @@ -16,7 +16,7 @@ namespace Botan { extern "C" { /* -* Helper Macros for amd64 Assembly +* Helper Macros for x86-64 Assembly */ #ifndef ASM #define ASM(x) x "\n\t" diff --git a/src/utils/asm_ia32/asm_macr_ia32.h b/src/utils/asm_x86_32/asm_x86_32.h index 2ea69512b..d5482c419 100644 --- a/src/utils/asm_ia32/asm_macr_ia32.h +++ b/src/utils/asm_x86_32/asm_x86_32.h @@ -1,12 +1,12 @@ /* -* Assembly Macros +* Assembly Macros for 32-bit x86 * (C) 1999-2008 Jack Lloyd * * Distributed under the terms of the Botan license */ -#ifndef BOTAN_IA32_ASM_MACROS_H__ -#define BOTAN_IA32_ASM_MACROS_H__ +#ifndef BOTAN_ASM_MACROS_X86_32_H__ +#define BOTAN_ASM_MACROS_X86_32_H__ /* * General/Global Macros diff --git a/src/utils/asm_ia32/info.txt b/src/utils/asm_x86_32/info.txt index 997d51b8c..8534d9aef 100644 --- a/src/utils/asm_ia32/info.txt +++ b/src/utils/asm_x86_32/info.txt @@ -1,11 +1,11 @@ load_on dep <header:internal> -asm_macr_ia32.h +asm_x86_32.h </header:internal> <arch> -ia32 +x86_32 </arch> # ELF systems diff --git a/src/utils/asm_amd64/asm_macr_amd64.h b/src/utils/asm_x86_64/asm_x86_64.h index 287fa3e88..7abc1f392 100644 --- a/src/utils/asm_amd64/asm_macr_amd64.h +++ b/src/utils/asm_x86_64/asm_x86_64.h @@ -1,12 +1,12 @@ /* -* Assembly Macros +* Assembly Macros for 64-bit x86 * (C) 1999-2008 Jack Lloyd * * Distributed under the terms of the Botan license */ -#ifndef BOTAN_AMD64_ASM_MACROS_H__ -#define BOTAN_AMD64_ASM_MACROS_H__ +#ifndef BOTAN_ASM_MACROS_X86_64_H__ +#define BOTAN_ASM_MACROS_X86_64_H__ /* * General/Global Macros diff --git a/src/utils/asm_amd64/info.txt b/src/utils/asm_x86_64/info.txt index 404aeca7b..3173f3b14 100644 --- a/src/utils/asm_amd64/info.txt +++ b/src/utils/asm_x86_64/info.txt @@ -1,11 +1,11 @@ load_on dep <header:internal> -asm_macr_amd64.h +asm_x86_64.h </header:internal> <arch> -amd64 +x86_64 </arch> <cc> diff --git a/src/utils/bswap.h b/src/utils/bswap.h index 66a230d46..9d2c9bc28 100644 --- a/src/utils/bswap.h +++ b/src/utils/bswap.h @@ -59,7 +59,7 @@ inline u32bit reverse_bytes(u32bit val) return val; -#elif defined(_MSC_VER) && defined(BOTAN_TARGET_ARCH_IS_IA32) +#elif defined(_MSC_VER) && defined(BOTAN_TARGET_ARCH_IS_X86_32) // Visual C++ inline asm for 32-bit x86, by Yves Jerschow __asm mov eax, val; @@ -84,7 +84,7 @@ inline u64bit reverse_bytes(u64bit val) // GCC intrinsic added in 4.3, works for a number of CPUs return __builtin_bswap64(val); -#elif BOTAN_USE_GCC_INLINE_ASM && defined(BOTAN_TARGET_ARCH_IS_AMD64) +#elif BOTAN_USE_GCC_INLINE_ASM && defined(BOTAN_TARGET_ARCH_IS_X86_64) // GCC-style inline assembly for x86-64 asm("bswapq %0" : "=r" (val) : "0" (val)); return val; diff --git a/src/utils/cpuid.cpp b/src/utils/cpuid.cpp index 468ae9d3d..cb6fdaba5 100644 --- a/src/utils/cpuid.cpp +++ b/src/utils/cpuid.cpp @@ -164,7 +164,7 @@ void CPUID::initialize() x86_processor_flags = (static_cast<u64bit>(cpuid[2]) << 32) | cpuid[3]; -#if defined(BOTAN_TARGET_ARCH_IS_AMD64) +#if defined(BOTAN_TARGET_ARCH_IS_X86_64) /* * If we don't have access to CPUID, we can still safely assume that * any x86-64 processor has SSE2. |