Add a pile of debug output around the CPU dispatching machinery.

[catacomb] / symm / rijndael-base.c

diff --git a/symm/rijndael-base.c b/symm/rijndael-base.c
index 6e59130c4b20212be582c50a2b3a9d43eab1339d..3d2bb8ef24e7d9ee58e67cf0f4820b7609d6f06a 100644 (file)
--- a/symm/rijndael-base.c
+++ b/symm/rijndael-base.c
@@ -123,9 +123,10 @@ extern setup__functype rijndael_setup_x86_aesni;
 static setup__functype *pick_setup(void)
 {
 #ifdef CPUFAM_X86
-  if (cpu_feature_p(CPUFEAT_X86_AESNI)) return rijndael_setup_x86_aesni;
+  DISPATCH_PICK_COND(rijndael_setup, rijndael_setup_x86_aesni,
+                    cpu_feature_p(CPUFEAT_X86_AESNI));
 #endif
-  return simple_setup;
+  DISPATCH_PICK_FALLBACK(rijndael_setup, simple_setup);
 }
 
 void rijndael_setup(rijndael_ctx *k, unsigned nb, const void *buf, size_t sz)