[beast/devel: 10/77] BSE: use Rapicorn::CPUInfo

[Tim Janik <timj src gnome org>]

commit 3133c34ff49270c837fb6ef1db6c21dcb4b11d02
Author: Tim Janik <timj gnu org>
Date:   Thu Mar 28 19:03:10 2013 +0000

    BSE: use Rapicorn::CPUInfo

 bse/bsemain.cc              |    2 +-
 bse/bseplugin.cc            |    9 ++++++---
 bse/tests/Makefile.am       |    2 +-
 bse/tests/blocktests.cc     |    2 +-
 bse/tests/resamplehandle.cc |    2 +-
 5 files changed, 10 insertions(+), 7 deletions(-)
---
diff --git a/bse/bsemain.cc b/bse/bsemain.cc
index d305e79..792364f 100644
--- a/bse/bsemain.cc
+++ b/bse/bsemain.cc
@@ -306,7 +306,7 @@ bse_init_intern (gint           *argc,
     }
   if (as_test)
     {
-      SfiCPUInfo ci = sfi_cpu_info();
+      Bse::CPUInfo ci = Rapicorn::cpu_info();
       char *cname = g_strdup_printf ("%s+%s", ci.machine, bse_block_impl_name());
       treport_cpu_name (cname);
       g_free (cname);
diff --git a/bse/bseplugin.cc b/bse/bseplugin.cc
index efbd679..5e2bd79 100644
--- a/bse/bseplugin.cc
+++ b/bse/bseplugin.cc
@@ -11,7 +11,10 @@
 #include <errno.h>
 #include <unistd.h>
 static SFI_MSG_TYPE_DEFINE (debug_plugins, "plugins", SFI_MSG_DEBUG, NULL);
+
+#undef DEBUG    // FIXME
 #define DEBUG(...)      sfi_debug (debug_plugins, __VA_ARGS__)
+
 /* --- prototypes --- */
 static void        bse_plugin_init             (BsePlugin        *plugin);
 static void        bse_plugin_class_init       (BsePluginClass   *klass);
@@ -144,7 +147,7 @@ bse_plugin_init_builtins (void)
 static guint64
 runtime_export_config (void)
 {
-  SfiCPUInfo cinfo = sfi_cpu_info();
+  const Bse::CPUInfo cinfo = Rapicorn::cpu_info();
   guint64 emask = 0;
   if (cinfo.x86_mmx)
     emask |= BSE_EXPORT_FLAG_MMX;
@@ -160,7 +163,7 @@ runtime_export_config (void)
     emask |= BSE_EXPORT_FLAG_SSE2;
   if (cinfo.x86_sse3 && cinfo.x86_ssesys)
     emask |= BSE_EXPORT_FLAG_SSE3;
-  if (cinfo.x86_sse4 && cinfo.x86_ssesys)
+  if (cinfo.x86_sse4_2 && cinfo.x86_ssesys)
     emask |= BSE_EXPORT_FLAG_SSE4;
   return emask;
 }
@@ -701,7 +704,7 @@ bse_plugin_path_list_files (gboolean include_drivers,
     }
   if (true)
     {
-      const SfiCPUInfo cpu_info = sfi_cpu_info();
+      const Bse::CPUInfo cpu_info = Rapicorn::cpu_info();
       const char *exts[] = { ".FPU" PLUGIN_EXTENSION, ".FPU.la", PLUGIN_EXTENSION, ".la", };
       if (BSE_WITH_SSE_FLAGS && !bse_main_args->force_fpu &&
           cpu_info.x86_mmx && cpu_info.x86_sse && cpu_info.x86_ssesys)
diff --git a/bse/tests/Makefile.am b/bse/tests/Makefile.am
index 5f02b85..f570b14 100644
--- a/bse/tests/Makefile.am
+++ b/bse/tests/Makefile.am
@@ -10,7 +10,7 @@ AM_CXXFLAGS  = $(BSE_CFLAGS) $(SFI_CFLAGS) $(RAPICORN_CFLAGS) -DRAPICORN_CONVENI
 EXTRA_DIST += arrows.gp filter-defs.gp
 
 noinst_PROGRAMS = $(ALLTESTS)
-progs_ldadd     = $(top_builddir)/bse/libbse.la $(BSE_LIBS)
+progs_ldadd     = $(top_builddir)/bse/libbse.la $(RAPICORN_LIBS) $(BSE_LIBS)
 
 TESTS            += misctests
 misctests_SOURCES = misctests.cc
diff --git a/bse/tests/blocktests.cc b/bse/tests/blocktests.cc
index bbad126..2cfb7a9 100644
--- a/bse/tests/blocktests.cc
+++ b/bse/tests/blocktests.cc
@@ -497,7 +497,7 @@ main (int   argc,
   /* usually we'd call bse_init_test() here, but we have tests to rnu before plugins are loaded */
   sfi_init_test (&argc, &argv, NULL);
   { /* bse_init_test() usually does this for us */
-    SfiCPUInfo ci = sfi_cpu_info();
+    Bse::CPUInfo ci = Bse::cpu_info();
     char *cname = g_strdup_printf ("%s+%s", ci.machine, bse_block_impl_name());
     treport_cpu_name (cname);
     g_free (cname);
diff --git a/bse/tests/resamplehandle.cc b/bse/tests/resamplehandle.cc
index 5c4a2a7..beb5a7e 100644
--- a/bse/tests/resamplehandle.cc
+++ b/bse/tests/resamplehandle.cc
@@ -426,7 +426,7 @@ main (int   argc,
 {
   sfi_init_test (&argc, &argv, NULL);
   { /* bse_init_test() usually does this for us */
-    SfiCPUInfo ci = sfi_cpu_info();
+    Bse::CPUInfo ci = Bse::cpu_info();
     char *cname = g_strdup_printf ("%s+%s", ci.machine, bse_block_impl_name());
     treport_cpu_name (cname);
     g_free (cname);