php/archived-php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2026-04-03 14:12:38 +02:00
Code Issues Packages Projects Releases Wiki Activity

Fix bug #64729: compilation failure on x32

Browse Source
This commit is contained in:
Gustavo Lopes
2013-04-30 19:00:31 +02:00
parent 4a92ae3401
commit 514afd67b6
2 changed files with 16 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
Zend/zend_alloc.c
View File

@@ -672,7 +672,7 @@ static inline unsigned int zend_mm_high_bit(size_t _size)
#elif defined(__GNUC__) && defined(__x86_64__) #elif defined(__GNUC__) && defined(__x86_64__)
unsigned long n; unsigned long n;
__asm__("bsrq %1,%0\n\t" : "=r" (n) : "rm" (_size)); __asm__("bsr %1,%0\n\t" : "=r" (n) : "rm" (_size));
return (unsigned int)n; return (unsigned int)n;
#elif defined(_MSC_VER) && defined(_M_IX86) #elif defined(_MSC_VER) && defined(_M_IX86)
__asm { __asm {
@@ -698,12 +698,12 @@ static inline unsigned int zend_mm_low_bit(size_t _size)
#elif defined(__GNUC__) && defined(__x86_64__) #elif defined(__GNUC__) && defined(__x86_64__)
unsigned long n; unsigned long n;
__asm__("bsfq %1,%0\n\t" : "=r" (n) : "rm" (_size)); __asm__("bsf %1,%0\n\t" : "=r" (n) : "rm" (_size));
return (unsigned int)n; return (unsigned int)n;
#elif defined(_MSC_VER) && defined(_M_IX86) #elif defined(_MSC_VER) && defined(_M_IX86)
__asm { __asm {
bsf eax, _size bsf eax, _size
} }
#else #else
static const int offset[16] = {4,0,1,0,2,0,1,0,3,0,1,0,2,0,1,0}; static const int offset[16] = {4,0,1,0,2,0,1,0,3,0,1,0,2,0,1,0};
unsigned int n; unsigned int n;
@@ -2481,12 +2481,22 @@ static inline size_t safe_address(size_t nmemb, size_t size, size_t offset)
size_t res = nmemb; size_t res = nmemb;
unsigned long overflow = 0; unsigned long overflow = 0;
__asm__ ("mulq %3\n\taddq %4,%0\n\tadcq %1,%1" #ifdef __ILP32__ /* x32 */
# define LP_SUFF "l"
#else /* amd64 */
# define LP_SUFF "q"
#endif
__asm__ ("mul" LP_SUFF " %3\n\t"
"add %4,%0\n\t"
"adc %1,%1"
: "=&a"(res), "=&d" (overflow) : "=&a"(res), "=&d" (overflow)
: "%0"(res), : "%0"(res),
"rm"(size), "rm"(size),
"rm"(offset)); "rm"(offset));
#undef LP_SUFF
if (UNEXPECTED(overflow)) { if (UNEXPECTED(overflow)) {
zend_error_noreturn(E_ERROR, "Possible integer overflow in memory allocation (%zu * %zu + %zu)", nmemb, size, offset); zend_error_noreturn(E_ERROR, "Possible integer overflow in memory allocation (%zu * %zu + %zu)", nmemb, size, offset);
return 0; return 0;

4
Zend/zend_multiply.h
View File

@@ -35,8 +35,8 @@
#define ZEND_SIGNED_MULTIPLY_LONG(a, b, lval, dval, usedval) do { \ #define ZEND_SIGNED_MULTIPLY_LONG(a, b, lval, dval, usedval) do { \
long __tmpvar; \ long __tmpvar; \
__asm__ ("imulq %3,%0\n" \ __asm__ ("imul %3,%0\n" \
"adcq $0,%1" \ "adc $0,%1" \
: "=r"(__tmpvar),"=r"(usedval) \ : "=r"(__tmpvar),"=r"(usedval) \
: "0"(a), "r"(b), "1"(0)); \ : "0"(a), "r"(b), "1"(0)); \
if (usedval) (dval) = (double) (a) * (double) (b); \ if (usedval) (dval) = (double) (a) * (double) (b); \