From 95e0d5de198147dff223bb40fde7017c403a0e3f Mon Sep 17 00:00:00 2001 From: Jeffrey Walton Date: Mon, 27 Jul 2020 12:46:11 -0400 Subject: Update test programs --- TestPrograms/test_x86_via_aes.cxx | 6 +++--- TestPrograms/test_x86_via_rng.cxx | 6 +++--- TestPrograms/test_x86_via_sha.cxx | 6 +++--- 3 files changed, 9 insertions(+), 9 deletions(-) (limited to 'TestPrograms') diff --git a/TestPrograms/test_x86_via_aes.cxx b/TestPrograms/test_x86_via_aes.cxx index a6d80b01..2422b2ca 100644 --- a/TestPrograms/test_x86_via_aes.cxx +++ b/TestPrograms/test_x86_via_aes.cxx @@ -8,7 +8,7 @@ int main(int argc, char* argv[]) __asm__ __volatile__ ( -#if (CRYPTOPP_BOOL_X32 || CRYPTOPP_BOOL_X64) +#if defined(__x86_64__) || defined(__amd64__) "mov %1, %%rdi ;\n" "movl %2, %%edx ;\n" #else @@ -19,7 +19,7 @@ int main(int argc, char* argv[]) // xstore-rng ".byte 0x0f, 0xa7, 0xc0 ;\n" -#if (CRYPTOPP_BOOL_X32 || CRYPTOPP_BOOL_X64) +#if defined(__x86_64__) || defined(__amd64__) "andq %%rax, 0x1f ;\n" "movl %%eax, %0 ;\n" #else @@ -28,7 +28,7 @@ int main(int argc, char* argv[]) #endif : "=g" (msr) : "g" (buffer), "g" (divisor) -#if (CRYPTOPP_BOOL_X32 || CRYPTOPP_BOOL_X64) +#if defined(__x86_64__) || defined(__amd64__) : "rax", "rdx", "rdi", "cc" #else : "eax", "edx", "edi", "cc" diff --git a/TestPrograms/test_x86_via_rng.cxx b/TestPrograms/test_x86_via_rng.cxx index 0cbd52f2..b8964c80 100644 --- a/TestPrograms/test_x86_via_rng.cxx +++ b/TestPrograms/test_x86_via_rng.cxx @@ -7,7 +7,7 @@ int main(int argc, char* argv[]) __asm__ __volatile__ ( -#if (CRYPTOPP_BOOL_X32 || CRYPTOPP_BOOL_X64) +#if defined(__x86_64__) || defined(__amd64__) "mov %1, %%rdi ;\n" "movl %2, %%edx ;\n" #else @@ -18,7 +18,7 @@ int main(int argc, char* argv[]) // xstore-rng ".byte 0x0f, 0xa7, 0xc0 ;\n" -#if (CRYPTOPP_BOOL_X32 || CRYPTOPP_BOOL_X64) +#if defined(__x86_64__) || defined(__amd64__) "andq %%rax, 0x1f ;\n" "movl %%eax, %0 ;\n" #else @@ -27,7 +27,7 @@ int main(int argc, char* argv[]) #endif : "=g" (msr) : "g" (buffer), "g" (divisor) -#if (CRYPTOPP_BOOL_X32 || CRYPTOPP_BOOL_X64) +#if defined(__x86_64__) || defined(__amd64__) : "rax", "rdx", "rdi", "cc" #else : "eax", "edx", "edi", "cc" diff --git a/TestPrograms/test_x86_via_sha.cxx b/TestPrograms/test_x86_via_sha.cxx index 84809adc..4897cc13 100644 --- a/TestPrograms/test_x86_via_sha.cxx +++ b/TestPrograms/test_x86_via_sha.cxx @@ -8,7 +8,7 @@ int main(int argc, char* argv[]) __asm__ __volatile__ ( -#if (CRYPTOPP_BOOL_X32 || CRYPTOPP_BOOL_X64) +#if defined(__x86_64__) || defined(__amd64__) "mov %1, %%rdi ;\n" "movl %2, %%edx ;\n" #else @@ -19,7 +19,7 @@ int main(int argc, char* argv[]) // xstore-rng ".byte 0x0f, 0xa7, 0xc0 ;\n" -#if (CRYPTOPP_BOOL_X32 || CRYPTOPP_BOOL_X64) +#if defined(__x86_64__) || defined(__amd64__) "andq %%rax, 0x1f ;\n" "movl %%eax, %0 ;\n" #else @@ -28,7 +28,7 @@ int main(int argc, char* argv[]) #endif : "=g" (msr) : "g" (buffer), "g" (divisor) -#if (CRYPTOPP_BOOL_X32 || CRYPTOPP_BOOL_X64) +#if defined(__x86_64__) || defined(__amd64__) : "rax", "rdx", "rdi", "cc" #else : "eax", "edx", "edi", "cc" -- cgit v1.2.1