Skip site navigation (1)Skip section navigation (2)
Date:      Thu, 21 Dec 2017 20:30:35 +0000 (UTC)
From:      Dimitry Andric <dim@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r456945 - head/graphics/rawstudio/files
Message-ID:  <201712212030.vBLKUZt9025450@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: dim (src committer)
Date: Thu Dec 21 20:30:35 2017
New Revision: 456945
URL: https://svnweb.freebsd.org/changeset/ports/456945

Log:
  Fix build of graphics/rawstudio with clang (or any recent optimizing
  compiler), by using anonymous labels in asm fragments.
  
  PR:		216771
  Approved by:	maintainer timeout (8 months)
  Approved by:	jbeich
  MFH:		2017Q4

Added:
  head/graphics/rawstudio/files/patch-plugins_denoise_fftwindow.cpp   (contents, props changed)

Added: head/graphics/rawstudio/files/patch-plugins_denoise_fftwindow.cpp
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/graphics/rawstudio/files/patch-plugins_denoise_fftwindow.cpp	Thu Dec 21 20:30:35 2017	(r456945)
@@ -0,0 +1,38 @@
+--- plugins/denoise/fftwindow.cpp.orig	2011-02-15 17:28:03 UTC
++++ plugins/denoise/fftwindow.cpp
+@@ -174,7 +174,7 @@ void FFTWindow::applyAnalysisWindowSSE( 
+     if ((uintptr_t)src1 & 15) {
+       asm volatile 
+       ( 
+-      "loop_analysis_sse_ua:\n"
++      "1:\n"
+       "prefetchnta (%4)\n"        // Prefetch next line (Used once only, so don't pollute cache)
+       "movups (%1), %%xmm0\n"       // src1 pt1
+       "movups 16(%1), %%xmm1\n"     // src1 pt2 
+@@ -193,7 +193,7 @@ void FFTWindow::applyAnalysisWindowSSE( 
+       "add $64, %2\n"
+       "add $64, %4\n"
+       "dec %3\n"
+-      "jnz loop_analysis_sse_ua\n"
++      "jnz 1b\n"
+ 
+       : /* no output registers */
+       : "r" (analysis.getLine(y)), "r" (src1),  "r" (dst->getLine(y)), "r" (sizew), "r" (&src1[image->pitch])
+@@ -202,7 +202,7 @@ void FFTWindow::applyAnalysisWindowSSE( 
+     } else {
+     asm volatile 
+       ( 
+-      "loop_analysis_sse_a:\n"
++      "1:\n"
+       "prefetchnta (%4)\n"        // Prefetch next line (Used once only, so don't pollute cache)
+       "movaps (%1), %%xmm0\n"       // src1 pt1
+       "movaps 16(%1), %%xmm1\n"     // src1 pt2 
+@@ -221,7 +221,7 @@ void FFTWindow::applyAnalysisWindowSSE( 
+       "add $64, %2\n"
+       "add $64, %4\n"
+       "dec %3\n"
+-      "jnz loop_analysis_sse_a\n"
++      "jnz 1b\n"
+ 
+       : /* no output registers */
+       : "r" (analysis.getLine(y)), "r" (src1),  "r" (dst->getLine(y)), "r" (sizew), "r" (&src1[image->pitch])



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201712212030.vBLKUZt9025450>