Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(724)

Unified Diff: simd/jdmerge-sse2.asm

Issue 1934113002: Update libjpeg_turbo to 1.4.90 from https://github.com/libjpeg-turbo/ (Closed) Base URL: https://chromium.googlesource.com/chromium/deps/libjpeg_turbo.git@master
Patch Set: Created 4 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: simd/jdmerge-sse2.asm
diff --git a/simd/jdmerss2-64.asm b/simd/jdmerge-sse2.asm
similarity index 74%
copy from simd/jdmerss2-64.asm
copy to simd/jdmerge-sse2.asm
index 02dd6da5bd32c82674ef9ec0a414046f30d2d9ee..d22e828151e9cf848195265579c96443bb2bfdf5 100644
--- a/simd/jdmerss2-64.asm
+++ b/simd/jdmerge-sse2.asm
@@ -1,5 +1,5 @@
;
-; jdmerss2-64.asm - merged upsampling/color conversion (64-bit SSE2)
+; jdmerge.asm - merged upsampling/color conversion (SSE2)
;
; Copyright 2009 Pierre Ossman <ossman@cendio.se> for Cendio AB
; Copyright 2009 D. R. Commander
@@ -21,37 +21,37 @@
; --------------------------------------------------------------------------
-%define SCALEBITS 16
+%define SCALEBITS 16
-F_0_344 equ 22554 ; FIX(0.34414)
-F_0_714 equ 46802 ; FIX(0.71414)
-F_1_402 equ 91881 ; FIX(1.40200)
-F_1_772 equ 116130 ; FIX(1.77200)
-F_0_402 equ (F_1_402 - 65536) ; FIX(1.40200) - FIX(1)
-F_0_285 equ ( 65536 - F_0_714) ; FIX(1) - FIX(0.71414)
-F_0_228 equ (131072 - F_1_772) ; FIX(2) - FIX(1.77200)
+F_0_344 equ 22554 ; FIX(0.34414)
+F_0_714 equ 46802 ; FIX(0.71414)
+F_1_402 equ 91881 ; FIX(1.40200)
+F_1_772 equ 116130 ; FIX(1.77200)
+F_0_402 equ (F_1_402 - 65536) ; FIX(1.40200) - FIX(1)
+F_0_285 equ ( 65536 - F_0_714) ; FIX(1) - FIX(0.71414)
+F_0_228 equ (131072 - F_1_772) ; FIX(2) - FIX(1.77200)
; --------------------------------------------------------------------------
- SECTION SEG_CONST
+ SECTION SEG_CONST
- alignz 16
- global EXTN(jconst_merged_upsample_sse2) PRIVATE
+ alignz 16
+ global EXTN(jconst_merged_upsample_sse2)
EXTN(jconst_merged_upsample_sse2):
-PW_F0402 times 8 dw F_0_402
-PW_MF0228 times 8 dw -F_0_228
-PW_MF0344_F0285 times 4 dw -F_0_344, F_0_285
-PW_ONE times 8 dw 1
-PD_ONEHALF times 4 dd 1 << (SCALEBITS-1)
+PW_F0402 times 8 dw F_0_402
+PW_MF0228 times 8 dw -F_0_228
+PW_MF0344_F0285 times 4 dw -F_0_344, F_0_285
+PW_ONE times 8 dw 1
+PD_ONEHALF times 4 dd 1 << (SCALEBITS-1)
- alignz 16
+ alignz 16
; --------------------------------------------------------------------------
- SECTION SEG_TEXT
- BITS 64
+ SECTION SEG_TEXT
+ BITS 32
-%include "jdmrgss2-64.asm"
+%include "jdmrgext-sse2.asm"
%undef RGB_RED
%undef RGB_GREEN
@@ -63,7 +63,7 @@ PD_ONEHALF times 4 dd 1 << (SCALEBITS-1)
%define RGB_PIXELSIZE EXT_RGB_PIXELSIZE
%define jsimd_h2v1_merged_upsample_sse2 jsimd_h2v1_extrgb_merged_upsample_sse2
%define jsimd_h2v2_merged_upsample_sse2 jsimd_h2v2_extrgb_merged_upsample_sse2
-%include "jdmrgss2-64.asm"
+%include "jdmrgext-sse2.asm"
%undef RGB_RED
%undef RGB_GREEN
@@ -75,7 +75,7 @@ PD_ONEHALF times 4 dd 1 << (SCALEBITS-1)
%define RGB_PIXELSIZE EXT_RGBX_PIXELSIZE
%define jsimd_h2v1_merged_upsample_sse2 jsimd_h2v1_extrgbx_merged_upsample_sse2
%define jsimd_h2v2_merged_upsample_sse2 jsimd_h2v2_extrgbx_merged_upsample_sse2
-%include "jdmrgss2-64.asm"
+%include "jdmrgext-sse2.asm"
%undef RGB_RED
%undef RGB_GREEN
@@ -87,7 +87,7 @@ PD_ONEHALF times 4 dd 1 << (SCALEBITS-1)
%define RGB_PIXELSIZE EXT_BGR_PIXELSIZE
%define jsimd_h2v1_merged_upsample_sse2 jsimd_h2v1_extbgr_merged_upsample_sse2
%define jsimd_h2v2_merged_upsample_sse2 jsimd_h2v2_extbgr_merged_upsample_sse2
-%include "jdmrgss2-64.asm"
+%include "jdmrgext-sse2.asm"
%undef RGB_RED
%undef RGB_GREEN
@@ -99,7 +99,7 @@ PD_ONEHALF times 4 dd 1 << (SCALEBITS-1)
%define RGB_PIXELSIZE EXT_BGRX_PIXELSIZE
%define jsimd_h2v1_merged_upsample_sse2 jsimd_h2v1_extbgrx_merged_upsample_sse2
%define jsimd_h2v2_merged_upsample_sse2 jsimd_h2v2_extbgrx_merged_upsample_sse2
-%include "jdmrgss2-64.asm"
+%include "jdmrgext-sse2.asm"
%undef RGB_RED
%undef RGB_GREEN
@@ -111,7 +111,7 @@ PD_ONEHALF times 4 dd 1 << (SCALEBITS-1)
%define RGB_PIXELSIZE EXT_XBGR_PIXELSIZE
%define jsimd_h2v1_merged_upsample_sse2 jsimd_h2v1_extxbgr_merged_upsample_sse2
%define jsimd_h2v2_merged_upsample_sse2 jsimd_h2v2_extxbgr_merged_upsample_sse2
-%include "jdmrgss2-64.asm"
+%include "jdmrgext-sse2.asm"
%undef RGB_RED
%undef RGB_GREEN
@@ -123,4 +123,4 @@ PD_ONEHALF times 4 dd 1 << (SCALEBITS-1)
%define RGB_PIXELSIZE EXT_XRGB_PIXELSIZE
%define jsimd_h2v1_merged_upsample_sse2 jsimd_h2v1_extxrgb_merged_upsample_sse2
%define jsimd_h2v2_merged_upsample_sse2 jsimd_h2v2_extxrgb_merged_upsample_sse2
-%include "jdmrgss2-64.asm"
+%include "jdmrgext-sse2.asm"
« simd/jccolext-sse2-64.asm ('K') | « simd/jdmerge-mmx.asm ('k') | simd/jdmerge-sse2-64.asm » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698