[Guile-commits] GNU Guile branch, stable-2.0, updated. v2.0.9-54-gafa3c37

[Mark H Weaver]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "GNU Guile".

http://git.savannah.gnu.org/cgit/guile.git/commit/?id=afa3c37ddc3682939a793a4798f3b55fc8d658ec

The branch, stable-2.0 has been updated
       via  afa3c37ddc3682939a793a4798f3b55fc8d658ec (commit)
      from  f91a1864c365abef807714ed0b664849f099152c (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit afa3c37ddc3682939a793a4798f3b55fc8d658ec
Author: Mark H Weaver <address@hidden>
Date:   Sun Aug 4 18:01:52 2013 -0400

    VM: Define ASM_MUL on ARM only if SMULL instruction is supported.
    
    * libguile/vm-i-scheme.c (ASM_MUL): Define only if the target
      architecture is known to implement the SMULL instruction.

-----------------------------------------------------------------------

Summary of changes:
 libguile/vm-i-scheme.c |   18 +++++++++++++++++-
 1 files changed, 17 insertions(+), 1 deletions(-)

diff --git a/libguile/vm-i-scheme.c b/libguile/vm-i-scheme.c
index a703aed..4a68682 100644
--- a/libguile/vm-i-scheme.c
+++ b/libguile/vm-i-scheme.c
@@ -341,7 +341,21 @@ VM_DEFINE_FUNCTION (149, ge, "ge?", 2)
   slow_sub:                                                            \
     do { } while (0)
 
-# define ASM_MUL(x, y)                                                 \
+# if defined (__ARM_ARCH_3M__)  || defined (__ARM_ARCH_4__)            \
+  || defined (__ARM_ARCH_4T__)  || defined (__ARM_ARCH_5__)            \
+  || defined (__ARM_ARCH_5T__)  || defined (__ARM_ARCH_5E__)           \
+  || defined (__ARM_ARCH_5TE__) || defined (__ARM_ARCH_5TEJ__)         \
+  || defined (__ARM_ARCH_6__)   || defined (__ARM_ARCH_6J__)           \
+  || defined (__ARM_ARCH_6K__)  || defined (__ARM_ARCH_6Z__)           \
+  || defined (__ARM_ARCH_6ZK__) || defined (__ARM_ARCH_6T2__)          \
+  || defined (__ARM_ARCH_6M__)  || defined (__ARM_ARCH_7__)            \
+  || defined (__ARM_ARCH_7A__)  || defined (__ARM_ARCH_7R__)           \
+  || defined (__ARM_ARCH_7M__)  || defined (__ARM_ARCH_7EM__)          \
+  || defined (__ARM_ARCH_8A__)
+
+/* The ARM architectures listed above support the SMULL instruction */
+
+#  define ASM_MUL(x, y)                                                        
\
     if (SCM_LIKELY (SCM_I_INUMP (x) && SCM_I_INUMP (y)))               \
       {                                                                        
\
        scm_t_signed_bits rlo, rhi;                                     \
@@ -354,6 +368,8 @@ VM_DEFINE_FUNCTION (149, ge, "ge?", 2)
       }                                                                        
\
     do { } while (0)
 
+# endif
+
 #endif
 
 VM_DEFINE_FUNCTION (150, add, "add", 2)


hooks/post-receive
-- 
GNU Guile