From 361f61618a7c2c67229eb2bc285224620b1c8ea2 Mon Sep 17 00:00:00 2001 From: Christopher Snowhill Date: Sun, 6 Feb 2022 03:18:55 -0800 Subject: [PATCH] libFLAC: One more time Signed-off-by: Christopher Snowhill --- Frameworks/FLAC/flac-1.3.3/src/libFLAC/bitreader.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/Frameworks/FLAC/flac-1.3.3/src/libFLAC/bitreader.c b/Frameworks/FLAC/flac-1.3.3/src/libFLAC/bitreader.c index 2f23cb863..a39d7f600 100644 --- a/Frameworks/FLAC/flac-1.3.3/src/libFLAC/bitreader.c +++ b/Frameworks/FLAC/flac-1.3.3/src/libFLAC/bitreader.c @@ -990,18 +990,21 @@ extern FLAC__bool FLAC__bitreader_read_uint32_little_endian(FLAC__BitReader *br, * === LZCNT === */ +#define __LZCNT__ +#include + #undef COUNT_ZERO_MSBS #undef COUNT_ZERO_MSBS2 #if (ENABLE_64_BIT_WORDS == 0) -#define COUNT_ZERO_MSBS(word) __lzcnt(word) -#define COUNT_ZERO_MSBS2(word) __lzcnt(word) +#define COUNT_ZERO_MSBS(word) __lzcnt32(word) +#define COUNT_ZERO_MSBS2(word) __lzcnt32(word) #else #define COUNT_ZERO_MSBS(word) __lzcnt64(word) #define COUNT_ZERO_MSBS2(word) __lzcnt64(word) #endif - +#pragma clang attribute push (__attribute__((target("lzcnt"))), apply_to=function) FLAC__bool FLAC__bitreader_read_unary_unsigned__LZCNT(FLAC__BitReader* br, uint32_t* val) { uint32_t i; @@ -1061,7 +1064,6 @@ FLAC__bool FLAC__bitreader_read_unary_unsigned__LZCNT(FLAC__BitReader* br, uint3 /* this is by far the most heavily used reader call. it ain't pretty but it's fast */ -#pragma clang attribute push (__attribute__((target("lzcnt"))), apply_to=function) FLAC__bool FLAC__bitreader_read_rice_signed_block__LZCNT(FLAC__BitReader* br, int vals[], uint32_t nvals, uint32_t parameter) { /* try and get br->consumed_words and br->consumed_bits into register;