[BACK]Return to zend_alloc.c CVS log [TXT] [DIR] Up to [ELWIX - Embedded LightWeight unIX -] / embedaddon / php / Zend

Diff for /embedaddon/php/Zend/zend_alloc.c between versions 1.1.1.3 and 1.1.1.5

version 1.1.1.3, 2013/07/22 01:32:15 version 1.1.1.5, 2014/06/15 20:04:03
Line 2 Line 2
    +----------------------------------------------------------------------+     +----------------------------------------------------------------------+
    | Zend Engine                                                          |     | Zend Engine                                                          |
    +----------------------------------------------------------------------+     +----------------------------------------------------------------------+
   | Copyright (c) 1998-2013 Zend Technologies Ltd. (http://www.zend.com) |   | Copyright (c) 1998-2014 Zend Technologies Ltd. (http://www.zend.com) |
    +----------------------------------------------------------------------+     +----------------------------------------------------------------------+
    | This source file is subject to version 2.00 of the Zend license,     |     | This source file is subject to version 2.00 of the Zend license,     |
    | that is bundled with this package in the file LICENSE, and is        |     | that is bundled with this package in the file LICENSE, and is        |
Line 2461  static inline size_t safe_address(size_t nmemb, size_t Line 2461  static inline size_t safe_address(size_t nmemb, size_t
         size_t res = nmemb;          size_t res = nmemb;
         unsigned long overflow = 0;          unsigned long overflow = 0;
   
        __asm__ ("mull %3\n\taddl %4,%0\n\tadcl %1,%1"        __asm__ ("mull %3\n\taddl %4,%0\n\tadcl $0,%1"
              : "=&a"(res), "=&d" (overflow)               : "=&a"(res), "=&d" (overflow)
              : "%0"(res),               : "%0"(res),
                "rm"(size),                 "rm"(size),
Line 2489  static inline size_t safe_address(size_t nmemb, size_t Line 2489  static inline size_t safe_address(size_t nmemb, size_t
   
         __asm__ ("mul" LP_SUFF  " %3\n\t"          __asm__ ("mul" LP_SUFF  " %3\n\t"
                  "add %4,%0\n\t"                   "add %4,%0\n\t"
                 "adc %1,%1"                 "adc $0,%1"
              : "=&a"(res), "=&d" (overflow)               : "=&a"(res), "=&d" (overflow)
              : "%0"(res),               : "%0"(res),
                "rm"(size),                 "rm"(size),
Removed from v.1.1.1.3  
changed lines
  Added in v.1.1.1.5

FreeBSD-CVSweb <freebsd-cvsweb@FreeBSD.org>