com php-src: Fix aarch64 crc32 implementation: ext/standard/crc32.c
| From: | Nikita Popov | Date: | Wed, 23 Oct 2019 15:41:59 +0000 |
| Subject: | com php-src: Fix aarch64 crc32 implementation: ext/standard/crc32.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-109029@lists.php.net to get a copy of this message | ||
Commit: 5f13eff4a24a47446bf4c5c4e2d7a440f0cec460
Author: Nikita Popov <nikita.ppv@gmail.com> Wed, 23 Oct 2019 16:58:47 +0200
Parents: f8413887816c4cecda75e6ae59dc3d1a74bb4f77
Branches: PHP-7.4 master
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=5f13eff4a24a47446bf4c5c4e2d7a440f0cec460
Log:
Fix aarch64 crc32 implementation
RETVAL vs RETURN mixup resulted in the fallback implementation
running as well.
Changed paths:
M ext/standard/crc32.c
Diff:
diff --git a/ext/standard/crc32.c b/ext/standard/crc32.c
index 853c95ef54f..c3ca59036c9 100644
--- a/ext/standard/crc32.c
+++ b/ext/standard/crc32.c
@@ -88,13 +88,13 @@ PHP_NAMED_FUNCTION(php_if_crc32)
#if defined(__aarch64__)
if (has_crc32_insn()) {
crc = crc32_aarch64(crc, p, nr);
- RETVAL_LONG(crc^0xFFFFFFFF);
+ RETURN_LONG(crc^0xFFFFFFFF);
}
#endif
for (; nr--; ++p) {
crc = ((crc >> 8) & 0x00FFFFFF) ^ crc32tab[(crc ^ (*p)) & 0xFF ];
}
- RETVAL_LONG(crc^0xFFFFFFFF);
+ RETURN_LONG(crc^0xFFFFFFFF);
}
/* }}} */