Grokbase Groups PHP php-cvs July 2013
FAQ
Commit: c652cc93ec5ce8f1833d023159804ebd56e1a94e
Author: Nuno Lopes <nlopess@php.net> Wed, 3 Jul 2013 17:53:46 -0400
Parents: 7549beb1022c6821a279df03e0dfcbf0df5eef97
Branches: PHP-5.4

Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=c652cc93ec5ce8f1833d023159804ebd56e1a94e

Log:
fix assembly of safe_address() for x86 and x86_64

Changed paths:
   M Zend/zend_alloc.c


Diff:
diff --git a/Zend/zend_alloc.c b/Zend/zend_alloc.c
index 0bbd59a..596c249 100644
--- a/Zend/zend_alloc.c
+++ b/Zend/zend_alloc.c
@@ -2461,7 +2461,7 @@ static inline size_t safe_address(size_t nmemb, size_t size, size_t offset)
   size_t res = nmemb;
   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)
        : "%0"(res),
          "rm"(size),
@@ -2489,7 +2489,7 @@ static inline size_t safe_address(size_t nmemb, size_t size, size_t offset)

          __asm__ ("mul" LP_SUFF " %3\n\t"
                   "add %4,%0\n\t"
- "adc %1,%1"
+ "adc $0,%1"
               : "=&a"(res), "=&d" (overflow)
               : "%0"(res),
                 "rm"(size),

Search Discussions

Discussion Posts

Previous

Follow ups

Related Discussions

Discussion Navigation
viewthread | post
posts ‹ prev | 3 of 4 | next ›
Discussion Overview
groupphp-cvs @
categoriesphp
postedJul 3, '13 at 9:54p
activeJul 3, '13 at 10:02p
posts4
users1
websitephp.net

1 user in discussion

Nuno Lopes: 4 posts

People

Translate

site design / logo © 2017 Grokbase