From: Dmitry Stogov Date: Thu, 20 Dec 2007 13:11:35 +0000 (+0000) Subject: x86_64 assembler optimization (Brain Shire) X-Git-Tag: RELEASE_2_0_0a1~1128 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=20f9a64b546e9b28145f1e1fca78dd47f61f2e9a;p=php x86_64 assembler optimization (Brain Shire) --- diff --git a/Zend/zend_alloc.c b/Zend/zend_alloc.c index 492fae29e0..02df6c68e7 100644 --- a/Zend/zend_alloc.c +++ b/Zend/zend_alloc.c @@ -677,10 +677,15 @@ static void *_zend_mm_realloc_int(zend_mm_heap *heap, void *p, size_t size ZEND_ static inline unsigned int zend_mm_high_bit(size_t _size) /* {{{ */ { #if defined(__GNUC__) && defined(i386) - unsigned int n; + unsigned int n; __asm__("bsrl %1,%0\n\t" : "=r" (n) : "rm" (_size)); return n; +#elif defined(__GNUC__) && defined(__x86_64__) + unsigned long n; + + __asm__("bsrq %1,%0\n\t" : "=r" (n) : "rm" (_size)); + return (unsigned int)n; #elif defined(_MSC_VER) && defined(_M_IX86) __asm { bsr eax, _size @@ -699,10 +704,15 @@ static inline unsigned int zend_mm_high_bit(size_t _size) /* {{{ */ static inline unsigned int zend_mm_low_bit(size_t _size) /* {{{ */ { #if defined(__GNUC__) && defined(i386) - unsigned int n; + unsigned int n; __asm__("bsfl %1,%0\n\t" : "=r" (n) : "rm" (_size)); return n; +#elif defined(__GNUC__) && defined(__x86_64__) + unsigned long n; + + __asm__("bsfq %1,%0\n\t" : "=r" (n) : "rm" (_size)); + return (unsigned int)n; #elif defined(_MSC_VER) && defined(_M_IX86) __asm { bsf eax, _size @@ -2347,10 +2357,10 @@ ZEND_API size_t _zend_mem_block_size(void *ptr TSRMLS_DC ZEND_FILE_LINE_DC ZEND_ static inline size_t safe_address(size_t nmemb, size_t size, size_t offset) /* {{{ */ { size_t res = nmemb; - unsigned long overflow ; + unsigned long overflow = 0; - __asm__ ("mull %3\n\taddl %4,%0\n\tadcl $0,%1" - : "=a"(res), "=d" (overflow) + __asm__ ("mull %3\n\taddl %4,%0\n\tadcl %1,%1" + : "=&a"(res), "=&d" (overflow) : "%0"(res), "rm"(size), "rm"(offset)); @@ -2363,6 +2373,26 @@ static inline size_t safe_address(size_t nmemb, size_t size, size_t offset) /* { } /* }}} */ +#elif defined(__GNUC__) && defined(__x86_64__) + +static inline size_t safe_address(size_t nmemb, size_t size, size_t offset) +{ + size_t res = nmemb; + unsigned long overflow = 0; + + __asm__ ("mulq %3\n\taddq %4,%0\n\tadcq %1,%1" + : "=&a"(res), "=&d" (overflow) + : "%0"(res), + "rm"(size), + "rm"(offset)); + + if (UNEXPECTED(overflow)) { + zend_error_noreturn(E_ERROR, "Possible integer overflow in memory allocation (%zu * %zu + %zu)", nmemb, size, offset); + return 0; + } + return res; +} + #else static inline size_t safe_address(size_t nmemb, size_t size, size_t offset) /* {{{ */