]>
Commit | Line | Data |
---|---|---|
137e3565 JR |
1 | From 514afd67b651bea834bdb84b7685b48e9e56ac21 Mon Sep 17 00:00:00 2001 |
2 | From: Gustavo Lopes <glopes@nebm.ist.utl.pt> | |
3 | Date: Tue, 30 Apr 2013 19:00:31 +0200 | |
4 | Subject: [PATCH] Fix bug #64729: compilation failure on x32 | |
5 | ||
6 | --- | |
7 | Zend/zend_alloc.c | 18 ++++++++++++++---- | |
8 | Zend/zend_multiply.h | 4 ++-- | |
9 | 2 files changed, 16 insertions(+), 6 deletions(-) | |
10 | ||
11 | diff --git a/Zend/zend_alloc.c b/Zend/zend_alloc.c | |
12 | index 605e396..0bbd59a 100644 | |
13 | --- a/Zend/zend_alloc_canary.c | |
14 | +++ b/Zend/zend_alloc_canary.c | |
15 | @@ -720,7 +720,7 @@ static inline unsigned int zend_mm_high_bit(size_t _size) | |
16 | #elif defined(__GNUC__) && defined(__x86_64__) | |
17 | unsigned long n; | |
18 | ||
19 | - __asm__("bsrq %1,%0\n\t" : "=r" (n) : "rm" (_size)); | |
20 | + __asm__("bsr %1,%0\n\t" : "=r" (n) : "rm" (_size)); | |
21 | return (unsigned int)n; | |
22 | #elif defined(_MSC_VER) && defined(_M_IX86) | |
23 | __asm { | |
24 | @@ -746,12 +746,12 @@ static inline unsigned int zend_mm_low_bit(size_t _size) | |
25 | #elif defined(__GNUC__) && defined(__x86_64__) | |
26 | unsigned long n; | |
27 | ||
28 | - __asm__("bsfq %1,%0\n\t" : "=r" (n) : "rm" (_size)); | |
29 | + __asm__("bsf %1,%0\n\t" : "=r" (n) : "rm" (_size)); | |
30 | return (unsigned int)n; | |
31 | #elif defined(_MSC_VER) && defined(_M_IX86) | |
32 | __asm { | |
33 | bsf eax, _size | |
34 | - } | |
35 | + } | |
36 | #else | |
37 | static const int offset[16] = {4,0,1,0,2,0,1,0,3,0,1,0,2,0,1,0}; | |
38 | unsigned int n; | |
39 | @@ -2481,12 +2481,22 @@ static inline size_t safe_address(size_t nmemb, size_t size, size_t offset) | |
40 | size_t res = nmemb; | |
41 | unsigned long overflow = 0; | |
42 | ||
43 | - __asm__ ("mulq %3\n\taddq %4,%0\n\tadcq %1,%1" | |
44 | +#ifdef __ILP32__ /* x32 */ | |
45 | +# define LP_SUFF "l" | |
46 | +#else /* amd64 */ | |
47 | +# define LP_SUFF "q" | |
48 | +#endif | |
49 | + | |
50 | + __asm__ ("mul" LP_SUFF " %3\n\t" | |
51 | + "add %4,%0\n\t" | |
52 | + "adc %1,%1" | |
53 | : "=&a"(res), "=&d" (overflow) | |
54 | : "%0"(res), | |
55 | "rm"(size), | |
56 | "rm"(offset)); | |
57 | ||
58 | +#undef LP_SUFF | |
59 | + | |
60 | if (UNEXPECTED(overflow)) { | |
61 | zend_error_noreturn(E_ERROR, "Possible integer overflow in memory allocation (%zu * %zu + %zu)", nmemb, size, offset); | |
62 | return 0; |