[Xenomai-git] Gilles Chanteperdrix : testsuite: fix division routines unit test feature macro test (for nodiv_llimd).

[GIT version control]

Module: xenomai-head
Branch: master
Commit: 92b5f5055dfc402f92849b8b5b4c70707082c309
URL:    
http://git.xenomai.org/?p=xenomai-head.git;a=commit;h=92b5f5055dfc402f92849b8b5b4c70707082c309

Author: Gilles Chanteperdrix <gilles.chanteperd...@xenomai.org>
Date:   Thu Aug 13 23:16:20 2009 +0200

testsuite: fix division routines unit test feature macro test (for nodiv_llimd).

---

 src/testsuite/unit/arith-noinline.c |    2 +-
 src/testsuite/unit/arith.c          |   14 +++++++-------
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/src/testsuite/unit/arith-noinline.c 
b/src/testsuite/unit/arith-noinline.c
index 45494ea..43e2e6d 100644
--- a/src/testsuite/unit/arith-noinline.c
+++ b/src/testsuite/unit/arith-noinline.c
@@ -20,7 +20,7 @@ do_llmulshft(long long ll, unsigned m, unsigned s)
        return rthal_llmulshft(ll, m, s);
 }
 
-#ifdef XNARCH_WANT_NODIV_MULDIV
+#ifdef XNARCH_HAVE_NODIV_LLIMD
 long long
 do_nodiv_llimd(long long ll, unsigned long long frac, unsigned integ)
 {
diff --git a/src/testsuite/unit/arith.c b/src/testsuite/unit/arith.c
index d53b773..b5af8d0 100644
--- a/src/testsuite/unit/arith.c
+++ b/src/testsuite/unit/arith.c
@@ -44,7 +44,7 @@ int main(void)
 {
        unsigned mul, shft, rejected;
        long long avg, calib = 0;
-#ifdef XNARCH_WANT_NODIV_MULDIV
+#ifdef XNARCH_HAVE_NODIV_LLIMD
        rthal_u32frac_t frac;
 #endif
        int i;
@@ -52,20 +52,20 @@ int main(void)
        /* Prepare. */
        xnarch_init_llmulshft(nsec_per_sec, sample_freq, &mul, &shft);
        fprintf(stderr, "mul: 0x%08x, shft: %d\n", mul, shft);
-#ifdef XNARCH_WANT_NODIV_MULDIV
+#ifdef XNARCH_HAVE_NODIV_LLIMD
        xnarch_init_u32frac(&frac, nsec_per_sec, sample_freq);
        fprintf(stderr, "integ: %d, frac: 0x%08llx\n", frac.integ, frac.frac);
-#endif /* XNARCH_WANT_NODIV_MULDIV */
+#endif /* XNARCH_HAVE_NODIV_LLIMD */
        threshold = rt_timer_ns2tsc(threshold);
 
        bench("inline calibration", 0);
        calib = avg;
        bench("inlined llimd", rthal_llimd(arg, nsec_per_sec, sample_freq));
        bench("inlined llmulshft", rthal_llmulshft(arg, mul, shft));
-#ifdef XNARCH_WANT_NODIV_MULDIV
+#ifdef XNARCH_HAVE_NODIV_LLIMD
        bench("inlined nodiv_llimd",
              rthal_nodiv_llimd(arg, frac.frac, frac.integ));
-#endif /* XNARCH_WANT_NODIV_MULDIV */
+#endif /* XNARCH_HAVE_NODIV_LLIMD */
 
        calib = 0;
        bench("out of line calibration", dummy());
@@ -73,9 +73,9 @@ int main(void)
        bench("out of line llimd",
              do_llimd(arg, nsec_per_sec, sample_freq));
        bench("out of line llmulshft", do_llmulshft(arg, mul, shft));
-#ifdef XNARCH_WANT_NODIV_MULDIV
+#ifdef XNARCH_HAVE_NODIV_LLIMD
        bench("out of line nodiv_llimd",
              do_nodiv_llimd(arg, frac.frac, frac.integ));
-#endif /* XNARCH_WANT_NODIV_MULDIV */
+#endif /* XNARCH_HAVE_NODIV_LLIMD */
        return 0;
 }


_______________________________________________
Xenomai-git mailing list
Xenomai-git@gna.org
https://mail.gna.org/listinfo/xenomai-git