Commit c55f142

authored

Make specialization of x64 zend_safe_address() for nmemb==1 (#19203)

1 parent e0c3f46 commit c55f142Copy full SHA for c55f142

File tree

+10

-1

lines changed

+10

-1

lines changed

Lines changed: 10 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -176,7 +176,7 @@ static zend_always_inline size_t zend_safe_address(size_t nmemb, size_t size, si`
`176`	`176`
`177`	`177`	`static zend_always_inline size_t zend_safe_address(size_t nmemb, size_t size, size_t offset, bool *overflow)`
`178`	`178`	`{`
`179`		`- size_t res=nmemb;`
	`179`	`+ size_t res;`
`180`	`180`	`zend_ulong m_overflow = 0;`
`181`	`181`
`182`	`182`	`#ifdef __ILP32__ /* x32 */`
`@@ -186,12 +186,21 @@ static zend_always_inline size_t zend_safe_address(size_t nmemb, size_t size, si`
`186`	`186`	`#endif`
`187`	`187`
`188`	`188`	`if (ZEND_CONST_COND(offset == 0, 0)) {`
	`189`	`+ res = nmemb;`
`189`	`190`	`__asm__ ("mul" LP_SUFF " %3\n\t"`
`190`	`191`	`"adc 0,ドル%1"`
`191`	`192`	`: "=&a"(res), "=&d" (m_overflow)`
`192`	`193`	`: "%0"(res),`
`193`	`194`	`"rm"(size));`
	`195`	`+ } else if (ZEND_CONST_COND(nmemb == 1, 0)) {`
	`196`	`+ res = size;`
	`197`	`+ __asm__ ("add %2, %0\n\t"`
	`198`	`+ "adc 0,ドル%1"`
	`199`	`+ : "+r"(res), "+r" (m_overflow)`
	`200`	`+ : "rm"(offset)`
	`201`	`+ : "cc");`
`194`	`202`	`} else {`
	`203`	`+ res = nmemb;`
`195`	`204`	`__asm__ ("mul" LP_SUFF " %3\n\t"`
`196`	`205`	`"add %4,%0\n\t"`
`197`	`206`	`"adc 0,ドル%1"`

Comments

(0)