Release 1.0.24

* Fixed build for x86 Clang.
lsp-plugins · May 22, 2024 · a60a256 · a60a256
2 parents 7826371 + 7d56512
commit a60a256
Show file tree

Hide file tree

Showing 6 changed files with 23 additions and 13 deletions.
diff --git a/CHANGELOG b/CHANGELOG
@@ -2,6 +2,9 @@
 * RECENT CHANGES
 *******************************************************************************
 
+=== 1.0.24 ===
+* Fixed build for x86 Clang.
+
 === 1.0.23 ===
 * Updated module versions in dependencies.
 

diff --git a/include/lsp-plug.in/dsp/version.h b/include/lsp-plug.in/dsp/version.h
@@ -25,7 +25,7 @@
 // Define version of headers
 #define LSP_DSP_LIB_MAJOR           1
 #define LSP_DSP_LIB_MINOR           0
-#define LSP_DSP_LIB_MICRO           23
+#define LSP_DSP_LIB_MICRO           24
 
 #if defined(__WINDOWS__) || defined(__WIN32__) || defined(__WIN64__) || defined(_WIN64) || defined(_WIN32) || defined(__WINNT) || defined(__WINNT__)
     #define LSP_DSP_LIB_EXPORT_MODIFIER     __declspec(dllexport)

diff --git a/include/private/dsp/arch/x86/avx/correlation.h b/include/private/dsp/arch/x86/avx/correlation.h
@@ -353,7 +353,8 @@ namespace lsp
                 __ASM_EMIT("jae             1b")
                 __ASM_EMIT("2:")
                 /* 4x block */
-                __ASM_EMIT("add             $4, %[count]")
+                __ASM_EMIT32("addl          $4, %[count]")
+                __ASM_EMIT64("add           $4, %[count]")
                 __ASM_EMIT("jl              4f")
                 __ASM_EMIT("vmovups         0x00(%[a_head]), %%xmm0")       /* xmm0 = ah */
                 __ASM_EMIT("vmovups         0x00(%[b_head]), %%xmm1")       /* xmm1 = bh */
@@ -425,7 +426,8 @@ namespace lsp
                 __ASM_EMIT("4:")
 
                 /* 1x blocks */
-                __ASM_EMIT("add             $3, %[count]")
+                __ASM_EMIT32("addl          $3, %[count]")
+                __ASM_EMIT64("add           $3, %[count]")
                 __ASM_EMIT("jl              6f")
                 __ASM_EMIT("5:")
                 __ASM_EMIT("vmovss          0x00(%[a_head]), %%xmm0")       /* xmm0 = ah */
@@ -486,7 +488,7 @@ namespace lsp
                     [corr] "+m" (corr), [dst] "+m" (dst),
                     [a_head] "+r" (a_head), [b_head] "+r" (b_head),
                     [a_tail] "+r" (a_tail), [b_tail] "+r" (b_tail),
-                    [count] "+g" (count)
+                    [count] "+m" (count)
                   )
                   __IF_64(
                     [dst] "+r" (dst),
@@ -600,7 +602,8 @@ namespace lsp
                 __ASM_EMIT("jae             1b")
                 __ASM_EMIT("2:")
                 /* 4x block */
-                __ASM_EMIT("add             $4, %[count]")
+                __ASM_EMIT32("addl          $4, %[count]")
+                __ASM_EMIT64("add           $4, %[count]")
                 __ASM_EMIT("jl              4f")
                 __ASM_EMIT("vmovups         0x00(%[a_head]), %%xmm0")       /* xmm0 = ah */
                 __ASM_EMIT("vmovups         0x00(%[b_head]), %%xmm1")       /* xmm1 = bh */
@@ -669,7 +672,8 @@ namespace lsp
                 __ASM_EMIT("4:")
 
                 /* 1x blocks */
-                __ASM_EMIT("add             $3, %[count]")
+                __ASM_EMIT32("addl          $3, %[count]")
+                __ASM_EMIT64("add           $3, %[count]")
                 __ASM_EMIT("jl              6f")
                 __ASM_EMIT("5:")
                 __ASM_EMIT("vmovss          0x00(%[a_head]), %%xmm0")       /* xmm0 = ah */
@@ -727,7 +731,7 @@ namespace lsp
                     [corr] "+m" (corr), [dst] "+m" (dst),
                     [a_head] "+r" (a_head), [b_head] "+r" (b_head),
                     [a_tail] "+r" (a_tail), [b_tail] "+r" (b_tail),
-                    [count] "+g" (count)
+                    [count] "+m" (count)
                   )
                   __IF_64(
                     [dst] "+r" (dst),

diff --git a/include/private/dsp/arch/x86/avx512/correlation.h b/include/private/dsp/arch/x86/avx512/correlation.h
@@ -353,7 +353,8 @@ namespace lsp
                 __ASM_EMIT64("sub           $8, %[count]")
                 __ASM_EMIT("4:")
                 /* 4x block */
-                __ASM_EMIT("add             $4, %[count]")
+                __ASM_EMIT32("addl          $4, %[count]")
+                __ASM_EMIT64("add           $4, %[count]")
                 __ASM_EMIT("jl              6f")
                 __ASM_EMIT("vmovups         0x00(%[a_head]), %%xmm0")           /* xmm0 = ah */
                 __ASM_EMIT("vmovups         0x00(%[b_head]), %%xmm1")           /* xmm1 = bh */
@@ -422,7 +423,8 @@ namespace lsp
                 __ASM_EMIT("6:")
 
                 /* 1x blocks */
-                __ASM_EMIT("add             $3, %[count]")
+                __ASM_EMIT32("addl          $3, %[count]")
+                __ASM_EMIT64("add           $3, %[count]")
                 __ASM_EMIT("jl              8f")
                 __ASM_EMIT("7:")
                 __ASM_EMIT("vmovss          0x00(%[a_head]), %%xmm0")           /* xmm0 = ah */
@@ -480,7 +482,7 @@ namespace lsp
                     [corr] "+m" (corr), [dst] "+m" (dst),
                     [a_head] "+r" (a_head), [b_head] "+r" (b_head),
                     [a_tail] "+r" (a_tail), [b_tail] "+r" (b_tail),
-                    [count] "+g" (count)
+                    [count] "+m" (count)
                   )
                   __IF_64(
                     [dst] "+r" (dst),

diff --git a/include/private/dsp/arch/x86/sse/correlation.h b/include/private/dsp/arch/x86/sse/correlation.h
@@ -236,7 +236,8 @@ namespace lsp
                 __ASM_EMIT("jae         1b")
                 __ASM_EMIT("2:")
                 /* 1x blocks */
-                __ASM_EMIT("add         $3, %[count]")
+                __ASM_EMIT32("addl      $3, %[count]")
+                __ASM_EMIT64("add       $3, %[count]")
                 __ASM_EMIT("jl          4f")
                 __ASM_EMIT("3:")
                 __ASM_EMIT("movss       0x00(%[a_head]), %%xmm0")       /* xmm0 = ah */
@@ -300,7 +301,7 @@ namespace lsp
                     [corr] "+m" (corr), [dst] "+m" (dst),
                     [a_head] "+r" (a_head), [b_head] "+r" (b_head),
                     [a_tail] "+r" (a_tail), [b_tail] "+r" (b_tail),
-                    [count] "+g" (count)
+                    [count] "+m" (count)
                   )
                   __IF_64(
                     [dst] "+r" (dst),

diff --git a/project.mk b/project.mk
@@ -23,4 +23,4 @@ ARTIFACT_ID                 = LSP_DSP_LIB
 ARTIFACT_NAME               = lsp-dsp-lib
 ARTIFACT_DESC               = DSP library for digital signal processing
 ARTIFACT_HEADERS            = lsp-plug.in
-ARTIFACT_VERSION            = 1.0.23
+ARTIFACT_VERSION            = 1.0.24