Release 1.0.18

* Fixed compilation regression for 32-bit Clang compiler.

Author: sadko4u

CHANGELOG

@@ -2,6 +2,9 @@
 * RECENT CHANGES
 *******************************************************************************
 
+=== 1.0.18 ===
+* Fixed compilation regression for 32-bit Clang compiler.
+
 === 1.0.17 ===
 * Implemented SIMD-optimized 2-knee compressor curve and gain calculation functions.
 * Implemented several AVX-512 optimized packed complex functions.

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           17
+#define LSP_DSP_LIB_MICRO           18
 
 #if defined(__WINDOWS__) || defined(__WIN32__) || defined(__WIN64__) || defined(_WIN64) || defined(_WIN32) || defined(__WINNT) || defined(__WINNT__)
     #define LSP_DSP_LIB_EXPORT_MODIFIER     __declspec(dllexport)

include/private/dsp/arch/x86/sse/complex.h

@@ -261,7 +261,7 @@ namespace lsp
             (
                 COMPLEX_DIV2_CORE("dst_re", "dst_im", "dst_re", "dst_im", "src_re", "src_im")
                 : [off] "=&r" (off),
-                  [count] __ASM_ARG_RW(count)
+                  [count] X86_PGREG(count)
                 : [dst_re] "r" (dst_re), [dst_im] "r" (dst_im),
                   [src_re] "r" (src_re), [src_im] "r" (src_im),
                   [CC] "o" (complex_div_const)
@@ -278,7 +278,7 @@ namespace lsp
             (
                 COMPLEX_DIV2_CORE("dst_re", "dst_im", "src_re", "src_im", "dst_re", "dst_im")
                 : [off] "=&r" (off),
-                  [count] __ASM_ARG_RW(count)
+                  [count] X86_PGREG(count)
                 : [dst_re] "r" (dst_re), [dst_im] "r" (dst_im),
                   [src_re] "r" (src_re), [src_im] "r" (src_im),
                   [CC] "o" (complex_div_const)
@@ -298,7 +298,8 @@ namespace lsp
             (
                 __ASM_EMIT  ("xor           %[off], %[off]")
                 // x4 blocks
-                __ASM_EMIT  ("sub           $4, %[count]")
+                __ASM_EMIT32("subl          $4, %[count]") \
+                __ASM_EMIT64("sub           $4, %[count]") \
                 __ASM_EMIT  ("jb            2f")
                 __ASM_EMIT  ("1:")
                 __ASM_EMIT32("mov           %[t_re], %[ptr_re]")
@@ -333,11 +334,13 @@ namespace lsp
                 __ASM_EMIT64("movups        %%xmm0, 0x00(%[dst_re], %[off])")
                 __ASM_EMIT64("movups        %%xmm1, 0x00(%[dst_im], %[off])")
                 __ASM_EMIT  ("add           $0x10, %[off]")
-                __ASM_EMIT  ("sub           $4, %[count]")
+                __ASM_EMIT32("subl          $4, %[count]") \
+                __ASM_EMIT64("sub           $4, %[count]") \
                 __ASM_EMIT  ("jae           1b")
                 __ASM_EMIT  ("2:")
                 // x1 blocks
-                __ASM_EMIT  ("add           $3, %[count]")
+                __ASM_EMIT32("addl          $3, %[count]") \
+                __ASM_EMIT64("add           $3, %[count]") \
                 __ASM_EMIT  ("jl            4f")
                 __ASM_EMIT  ("3:")
                 __ASM_EMIT32("mov           %[t_re], %[ptr_re]")
@@ -372,15 +375,16 @@ namespace lsp
                 __ASM_EMIT64("movss         %%xmm0, 0x00(%[dst_re], %[off])")
                 __ASM_EMIT64("movss         %%xmm1, 0x00(%[dst_im], %[off])")
                 __ASM_EMIT  ("add           $0x04, %[off]")
-                __ASM_EMIT  ("dec           %[count]")
+                __ASM_EMIT32("decl          %[count]") \
+                __ASM_EMIT64("dec           %[count]") \
                 __ASM_EMIT  ("jge           3b")
                 __ASM_EMIT  ("4:")
                 /* end */
 
                 : __IF_32(
                     [ptr_re] "=&r" (ptr_re), [ptr_im] "=&r" (ptr_im),
                   )
-                  [count] "+r" (count), [off] "=&r" (off)
+                  [count] X86_PGREG(count), [off] "=&r" (off)
                 : [dst_re] X86_GREG (dst_re), [dst_im] X86_GREG (dst_im),
                   [t_re] X86_GREG (t_re), [t_im] X86_GREG (t_im),
                   [b_re] "r" (b_re), [b_im] "r" (b_im),

include/private/dsp/arch/x86/sse2/dynamics/compressor.h

@@ -197,6 +197,7 @@ namespace lsp
             IF_ARCH_X86(
                 comp_knee_t knee[2] __lsp_aligned16;
                 float mem[24] __lsp_aligned16;
+                float stub[4] __lsp_aligned16;
                 size_t mask;
             );
 
@@ -259,6 +260,7 @@ namespace lsp
                 : [comp] "r" (c),
                   [knee] "o" (knee),
                   [mem] "o" (mem),
+                  [stub] "o" (stub),
                   [C2C] "o" (compressor_const),
                   [L2C] "o" (LOG2_CONST),
                   [LOGC] "o" (LOGE_C),
@@ -275,22 +277,10 @@ namespace lsp
             IF_ARCH_X86(
                 comp_knee_t knee[2] __lsp_aligned16;
                 float mem[24] __lsp_aligned16;
+                float stub[4] __lsp_aligned16;
                 size_t mask;
             );
-//            for (size_t i=0; i<count; ++i)
-//            {
-//                float x     = fabsf(src[i]);
-//                float lx    = logf(x);
-//
-//                float g1    = (x <= c->k[0].start) ? c->k[0].gain :
-//                              (x >= c->k[0].end) ? expf(lx * c->k[0].tilt[0] + c->k[0].tilt[1]) :
-//                              expf((c->k[0].herm[0]*lx + c->k[0].herm[1])*lx + c->k[0].herm[2]);
-//                float g2    = (x <= c->k[1].start) ? c->k[1].gain :
-//                              (x >= c->k[1].end) ? expf(lx * c->k[1].tilt[0] + c->k[1].tilt[1]) :
-//                              expf((c->k[1].herm[0]*lx + c->k[1].herm[1])*lx + c->k[1].herm[2]);
-//
-//                dst[i]      = g1 * g2 * x;
-//            }
+
             ARCH_X86_ASM
             (
                 // Prepare stuff
@@ -358,6 +348,7 @@ namespace lsp
                 : [comp] "r" (c),
                   [knee] "o" (knee),
                   [mem] "o" (mem),
+                  [stub] "o" (stub),
                   [C2C] "o" (compressor_const),
                   [L2C] "o" (LOG2_CONST),
                   [LOGC] "o" (LOGE_C),

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.17
+ARTIFACT_VERSION            = 1.0.18