com php-src: merge ZEND_SIGNED_MULTIPLY_LONG for i3 86 and x86_64: Zend/zend_multiply.h

From: Date: Fri, 27 Feb 2015 23:43:53 +0000
Subject: com php-src: merge ZEND_SIGNED_MULTIPLY_LONG for i3 86 and x86_64: Zend/zend_multiply.h
Groups: php.cvs 
Request: Send a blank email to php-cvs+get-85362@lists.php.net to get a copy of this message
Commit: ce73a47996ca2d5b9721336975c4ea8b9da9a7a1 Author: Elan Ruusamäe <glen@delfi.ee> Sat, 28 Feb 2015 01:43:53 +0200 Parents: ed102533116d7771bf2f8fd5d0e4f345b38b1da5 Branches: master Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=ce73a47996ca2d5b9721336975c4ea8b9da9a7a1 Log: merge ZEND_SIGNED_MULTIPLY_LONG for i386 and x86_64 as the definitions are identical refs b7eb3c1c5a858e98985adc2335df9b4a021ade51 Changed paths: M Zend/zend_multiply.h Diff: diff --git a/Zend/zend_multiply.h b/Zend/zend_multiply.h index ce77ce1..b12c1e2 100644 --- a/Zend/zend_multiply.h +++ b/Zend/zend_multiply.h @@ -22,19 +22,7 @@ #ifndef ZEND_MULTIPLY_H #define ZEND_MULTIPLY_H -#if defined(__i386__) && defined(__GNUC__) - -#define ZEND_SIGNED_MULTIPLY_LONG(a, b, lval, dval, usedval) do { \ - zend_long __tmpvar; \ - __asm__ ("imul %3,%0\n" \ - "adc $0,%1" \ - : "=r"(__tmpvar),"=r"(usedval) \ - : "0"(a), "r"(b), "1"(0)); \ - if (usedval) (dval) = (double) (a) * (double) (b); \ - else (lval) = __tmpvar; \ -} while (0) - -#elif defined(__x86_64__) && defined(__GNUC__) +#if (defined(__i386__) || defined(__x86_64__)) && defined(__GNUC__) #define ZEND_SIGNED_MULTIPLY_LONG(a, b, lval, dval, usedval) do { \ zend_long __tmpvar; \

« previous php.cvs (#85362) next »