ryan/mozjpeg
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Lay the groundwork for 32-bit AVX2 SIMD support

Browse Source
This commit is contained in:
DRC
2016-07-05 16:19:26 -05:00
parent b5426c52c0
commit 7ee3ce9ada
45 changed files with 196 additions and 164 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
simd/jccolext-mmx.asm
View File

@@ -2,6 +2,7 @@
; jccolext.asm - colorspace conversion (MMX) ; jccolext.asm - colorspace conversion (MMX)
; ;
; Copyright 2009 Pierre Ossman <ossman@cendio.se> for Cendio AB ; Copyright 2009 Pierre Ossman <ossman@cendio.se> for Cendio AB
; Copyright (C) 2016, D. R. Commander.
; ;
; Based on the x86 SIMD extension for IJG JPEG library ; Based on the x86 SIMD extension for IJG JPEG library
; Copyright (C) 1999-2006, MIYASAKA Masaru. ; Copyright (C) 1999-2006, MIYASAKA Masaru.
@@ -38,7 +39,7 @@
%define WK_NUM 8 %define WK_NUM 8
%define gotptr wk(0)-SIZEOF_POINTER ; void * gotptr %define gotptr wk(0)-SIZEOF_POINTER ; void * gotptr
align 16 align 32
global EXTN(jsimd_rgb_ycc_convert_mmx) global EXTN(jsimd_rgb_ycc_convert_mmx)
EXTN(jsimd_rgb_ycc_convert_mmx): EXTN(jsimd_rgb_ycc_convert_mmx):
@@ -473,4 +474,4 @@ EXTN(jsimd_rgb_ycc_convert_mmx):
; For some reason, the OS X linker does not honor the request to align the ; For some reason, the OS X linker does not honor the request to align the
; segment unless we do this. ; segment unless we do this.
align 16 align 32

8
simd/jccolext-sse2.asm
View File

@@ -1,7 +1,9 @@
; ;
; jccolext.asm - colorspace conversion (SSE2) ; jccolext.asm - colorspace conversion (SSE2)
; ;
; x86 SIMD extension for IJG JPEG library ; Copyright (C) 2016, D. R. Commander.
;
; Based on the x86 SIMD extension for IJG JPEG library
; Copyright (C) 1999-2006, MIYASAKA Masaru. ; Copyright (C) 1999-2006, MIYASAKA Masaru.
; For conditions of distribution and use, see copyright notice in jsimdext.inc ; For conditions of distribution and use, see copyright notice in jsimdext.inc
; ;
@@ -36,7 +38,7 @@
%define WK_NUM 8 %define WK_NUM 8
%define gotptr wk(0)-SIZEOF_POINTER ; void * gotptr %define gotptr wk(0)-SIZEOF_POINTER ; void * gotptr
align 16 align 32
global EXTN(jsimd_rgb_ycc_convert_sse2) global EXTN(jsimd_rgb_ycc_convert_sse2)
@@ -500,4 +502,4 @@ EXTN(jsimd_rgb_ycc_convert_sse2):
; For some reason, the OS X linker does not honor the request to align the ; For some reason, the OS X linker does not honor the request to align the
; segment unless we do this. ; segment unless we do this.
align 16 align 32

6
simd/jccolor-mmx.asm
View File

@@ -2,7 +2,7 @@
; jccolor.asm - colorspace conversion (MMX) ; jccolor.asm - colorspace conversion (MMX)
; ;
; Copyright 2009 Pierre Ossman <ossman@cendio.se> for Cendio AB ; Copyright 2009 Pierre Ossman <ossman@cendio.se> for Cendio AB
; Copyright (C) 2009, D. R. Commander. ; Copyright (C) 2009, 2016, D. R. Commander.
; ;
; Based on the x86 SIMD extension for IJG JPEG library ; Based on the x86 SIMD extension for IJG JPEG library
; Copyright (C) 1999-2006, MIYASAKA Masaru. ; Copyright (C) 1999-2006, MIYASAKA Masaru.
@@ -35,7 +35,7 @@ F_0_337 equ (F_0_587 - F_0_250) ; FIX(0.58700) - FIX(0.25000)
; -------------------------------------------------------------------------- ; --------------------------------------------------------------------------
SECTION SEG_CONST SECTION SEG_CONST
alignz 16 alignz 32
global EXTN(jconst_rgb_ycc_convert_mmx) global EXTN(jconst_rgb_ycc_convert_mmx)
EXTN(jconst_rgb_ycc_convert_mmx): EXTN(jconst_rgb_ycc_convert_mmx):
@@ -47,7 +47,7 @@ PW_MF008_MF041 times 2 dw -F_0_081,-F_0_418
PD_ONEHALFM1_CJ times 2 dd (1 << (SCALEBITS-1)) - 1 + (CENTERJSAMPLE << SCALEBITS) PD_ONEHALFM1_CJ times 2 dd (1 << (SCALEBITS-1)) - 1 + (CENTERJSAMPLE << SCALEBITS)
PD_ONEHALF times 2 dd (1 << (SCALEBITS-1)) PD_ONEHALF times 2 dd (1 << (SCALEBITS-1))
alignz 16 alignz 32
; -------------------------------------------------------------------------- ; --------------------------------------------------------------------------
SECTION SEG_TEXT SECTION SEG_TEXT

6
simd/jccolor-sse2.asm
View File

@@ -1,7 +1,7 @@
; ;
; jccolor.asm - colorspace conversion (SSE2) ; jccolor.asm - colorspace conversion (SSE2)
; ;
; Copyright (C) 2009, D. R. Commander. ; Copyright (C) 2009, 2016, D. R. Commander.
; ;
; Based on the x86 SIMD extension for IJG JPEG library ; Based on the x86 SIMD extension for IJG JPEG library
; Copyright (C) 1999-2006, MIYASAKA Masaru. ; Copyright (C) 1999-2006, MIYASAKA Masaru.
@@ -34,7 +34,7 @@ F_0_337 equ (F_0_587 - F_0_250) ; FIX(0.58700) - FIX(0.25000)
; -------------------------------------------------------------------------- ; --------------------------------------------------------------------------
SECTION SEG_CONST SECTION SEG_CONST
alignz 16 alignz 32
global EXTN(jconst_rgb_ycc_convert_sse2) global EXTN(jconst_rgb_ycc_convert_sse2)
EXTN(jconst_rgb_ycc_convert_sse2): EXTN(jconst_rgb_ycc_convert_sse2):
@@ -46,7 +46,7 @@ PW_MF008_MF041 times 4 dw -F_0_081,-F_0_418
PD_ONEHALFM1_CJ times 4 dd (1 << (SCALEBITS-1)) - 1 + (CENTERJSAMPLE << SCALEBITS) PD_ONEHALFM1_CJ times 4 dd (1 << (SCALEBITS-1)) - 1 + (CENTERJSAMPLE << SCALEBITS)
PD_ONEHALF times 4 dd (1 << (SCALEBITS-1)) PD_ONEHALF times 4 dd (1 << (SCALEBITS-1))
alignz 16 alignz 32
; -------------------------------------------------------------------------- ; --------------------------------------------------------------------------
SECTION SEG_TEXT SECTION SEG_TEXT

6
simd/jcgray-mmx.asm
View File

@@ -2,7 +2,7 @@
; jcgray.asm - grayscale colorspace conversion (MMX) ; jcgray.asm - grayscale colorspace conversion (MMX)
; ;
; Copyright 2009 Pierre Ossman <ossman@cendio.se> for Cendio AB ; Copyright 2009 Pierre Ossman <ossman@cendio.se> for Cendio AB
; Copyright (C) 2011, D. R. Commander. ; Copyright (C) 2011, 2016, D. R. Commander.
; ;
; Based on the x86 SIMD extension for IJG JPEG library ; Based on the x86 SIMD extension for IJG JPEG library
; Copyright (C) 1999-2006, MIYASAKA Masaru. ; Copyright (C) 1999-2006, MIYASAKA Masaru.
@@ -31,7 +31,7 @@ F_0_337 equ (F_0_587 - F_0_250) ; FIX(0.58700) - FIX(0.25000)
; -------------------------------------------------------------------------- ; --------------------------------------------------------------------------
SECTION SEG_CONST SECTION SEG_CONST
alignz 16 alignz 32
global EXTN(jconst_rgb_gray_convert_mmx) global EXTN(jconst_rgb_gray_convert_mmx)
EXTN(jconst_rgb_gray_convert_mmx): EXTN(jconst_rgb_gray_convert_mmx):
@@ -40,7 +40,7 @@ PW_F0299_F0337 times 2 dw F_0_299, F_0_337
PW_F0114_F0250 times 2 dw F_0_114, F_0_250 PW_F0114_F0250 times 2 dw F_0_114, F_0_250
PD_ONEHALF times 2 dd (1 << (SCALEBITS-1)) PD_ONEHALF times 2 dd (1 << (SCALEBITS-1))
alignz 16 alignz 32
; -------------------------------------------------------------------------- ; --------------------------------------------------------------------------
SECTION SEG_TEXT SECTION SEG_TEXT

6
simd/jcgray-sse2.asm
View File

@@ -1,7 +1,7 @@
; ;
; jcgray.asm - grayscale colorspace conversion (SSE2) ; jcgray.asm - grayscale colorspace conversion (SSE2)
; ;
; Copyright (C) 2011, D. R. Commander. ; Copyright (C) 2011, 2016, D. R. Commander.
; ;
; Based on the x86 SIMD extension for IJG JPEG library ; Based on the x86 SIMD extension for IJG JPEG library
; Copyright (C) 1999-2006, MIYASAKA Masaru. ; Copyright (C) 1999-2006, MIYASAKA Masaru.
@@ -30,7 +30,7 @@ F_0_337 equ (F_0_587 - F_0_250) ; FIX(0.58700) - FIX(0.25000)
; -------------------------------------------------------------------------- ; --------------------------------------------------------------------------
SECTION SEG_CONST SECTION SEG_CONST
alignz 16 alignz 32
global EXTN(jconst_rgb_gray_convert_sse2) global EXTN(jconst_rgb_gray_convert_sse2)
EXTN(jconst_rgb_gray_convert_sse2): EXTN(jconst_rgb_gray_convert_sse2):
@@ -39,7 +39,7 @@ PW_F0299_F0337 times 4 dw F_0_299, F_0_337
PW_F0114_F0250 times 4 dw F_0_114, F_0_250 PW_F0114_F0250 times 4 dw F_0_114, F_0_250
PD_ONEHALF times 4 dd (1 << (SCALEBITS-1)) PD_ONEHALF times 4 dd (1 << (SCALEBITS-1))
alignz 16 alignz 32
; -------------------------------------------------------------------------- ; --------------------------------------------------------------------------
SECTION SEG_TEXT SECTION SEG_TEXT

6
simd/jcgryext-mmx.asm
View File

@@ -2,7 +2,7 @@
; jcgryext.asm - grayscale colorspace conversion (MMX) ; jcgryext.asm - grayscale colorspace conversion (MMX)
; ;
; Copyright 2009 Pierre Ossman <ossman@cendio.se> for Cendio AB ; Copyright 2009 Pierre Ossman <ossman@cendio.se> for Cendio AB
; Copyright (C) 2011, D. R. Commander. ; Copyright (C) 2011, 2016, D. R. Commander.
; ;
; Based on the x86 SIMD extension for IJG JPEG library ; Based on the x86 SIMD extension for IJG JPEG library
; Copyright (C) 1999-2006, MIYASAKA Masaru. ; Copyright (C) 1999-2006, MIYASAKA Masaru.
@@ -39,7 +39,7 @@
%define WK_NUM 2 %define WK_NUM 2
%define gotptr wk(0)-SIZEOF_POINTER ; void * gotptr %define gotptr wk(0)-SIZEOF_POINTER ; void * gotptr
align 16 align 32
global EXTN(jsimd_rgb_gray_convert_mmx) global EXTN(jsimd_rgb_gray_convert_mmx)
EXTN(jsimd_rgb_gray_convert_mmx): EXTN(jsimd_rgb_gray_convert_mmx):
@@ -353,4 +353,4 @@ EXTN(jsimd_rgb_gray_convert_mmx):
; For some reason, the OS X linker does not honor the request to align the ; For some reason, the OS X linker does not honor the request to align the
; segment unless we do this. ; segment unless we do this.
align 16 align 32

6
simd/jcgryext-sse2.asm
View File

@@ -1,7 +1,7 @@
; ;
; jcgryext.asm - grayscale colorspace conversion (SSE2) ; jcgryext.asm - grayscale colorspace conversion (SSE2)
; ;
; Copyright (C) 2011, D. R. Commander. ; Copyright (C) 2011, 2016, D. R. Commander.
; ;
; Based on the x86 SIMD extension for IJG JPEG library ; Based on the x86 SIMD extension for IJG JPEG library
; Copyright (C) 1999-2006, MIYASAKA Masaru. ; Copyright (C) 1999-2006, MIYASAKA Masaru.
@@ -38,7 +38,7 @@
%define WK_NUM 2 %define WK_NUM 2
%define gotptr wk(0)-SIZEOF_POINTER ; void * gotptr %define gotptr wk(0)-SIZEOF_POINTER ; void * gotptr
align 16 align 32
global EXTN(jsimd_rgb_gray_convert_sse2) global EXTN(jsimd_rgb_gray_convert_sse2)
@@ -381,4 +381,4 @@ EXTN(jsimd_rgb_gray_convert_sse2):
; For some reason, the OS X linker does not honor the request to align the ; For some reason, the OS X linker does not honor the request to align the
; segment unless we do this. ; segment unless we do this.
align 16 align 32

8
simd/jchuff-sse2.asm
View File

@@ -25,14 +25,14 @@
; -------------------------------------------------------------------------- ; --------------------------------------------------------------------------
SECTION SEG_CONST SECTION SEG_CONST
alignz 16 alignz 32
global EXTN(jconst_huff_encode_one_block) global EXTN(jconst_huff_encode_one_block)
EXTN(jconst_huff_encode_one_block): EXTN(jconst_huff_encode_one_block):
%include "jpeg_nbits_table.inc" %include "jpeg_nbits_table.inc"
alignz 16 alignz 32
; -------------------------------------------------------------------------- ; --------------------------------------------------------------------------
SECTION SEG_TEXT SECTION SEG_TEXT
@@ -178,7 +178,7 @@ EXTN(jconst_huff_encode_one_block):
%define put_buffer ebx %define put_buffer ebx
%define put_bits edi %define put_bits edi
align 16 align 32
global EXTN(jsimd_huff_encode_one_block_sse2) global EXTN(jsimd_huff_encode_one_block_sse2)
EXTN(jsimd_huff_encode_one_block_sse2): EXTN(jsimd_huff_encode_one_block_sse2):
@@ -423,4 +423,4 @@ EXTN(jsimd_huff_encode_one_block_sse2):
; For some reason, the OS X linker does not honor the request to align the ; For some reason, the OS X linker does not honor the request to align the
; segment unless we do this. ; segment unless we do this.
align 16 align 32

7
simd/jcsample-mmx.asm
View File

@@ -2,6 +2,7 @@
; jcsample.asm - downsampling (MMX) ; jcsample.asm - downsampling (MMX)
; ;
; Copyright 2009 Pierre Ossman <ossman@cendio.se> for Cendio AB ; Copyright 2009 Pierre Ossman <ossman@cendio.se> for Cendio AB
; Copyright (C) 2016, D. R. Commander.
; ;
; Based on the x86 SIMD extension for IJG JPEG library ; Based on the x86 SIMD extension for IJG JPEG library
; Copyright (C) 1999-2006, MIYASAKA Masaru. ; Copyright (C) 1999-2006, MIYASAKA Masaru.
@@ -38,7 +39,7 @@
%define input_data(b) (b)+24 ; JSAMPARRAY input_data %define input_data(b) (b)+24 ; JSAMPARRAY input_data
%define output_data(b) (b)+28 ; JSAMPARRAY output_data %define output_data(b) (b)+28 ; JSAMPARRAY output_data
align 16 align 32
global EXTN(jsimd_h2v1_downsample_mmx) global EXTN(jsimd_h2v1_downsample_mmx)
EXTN(jsimd_h2v1_downsample_mmx): EXTN(jsimd_h2v1_downsample_mmx):
@@ -180,7 +181,7 @@ EXTN(jsimd_h2v1_downsample_mmx):
%define input_data(b) (b)+24 ; JSAMPARRAY input_data %define input_data(b) (b)+24 ; JSAMPARRAY input_data
%define output_data(b) (b)+28 ; JSAMPARRAY output_data %define output_data(b) (b)+28 ; JSAMPARRAY output_data
align 16 align 32
global EXTN(jsimd_h2v2_downsample_mmx) global EXTN(jsimd_h2v2_downsample_mmx)
EXTN(jsimd_h2v2_downsample_mmx): EXTN(jsimd_h2v2_downsample_mmx):
@@ -320,4 +321,4 @@ EXTN(jsimd_h2v2_downsample_mmx):
; For some reason, the OS X linker does not honor the request to align the ; For some reason, the OS X linker does not honor the request to align the
; segment unless we do this. ; segment unless we do this.
align 16 align 32

7
simd/jcsample-sse2.asm
View File

@@ -2,6 +2,7 @@
; jcsample.asm - downsampling (SSE2) ; jcsample.asm - downsampling (SSE2)
; ;
; Copyright 2009 Pierre Ossman <ossman@cendio.se> for Cendio AB ; Copyright 2009 Pierre Ossman <ossman@cendio.se> for Cendio AB
; Copyright (C) 2016, D. R. Commander.
; ;
; Based on the x86 SIMD extension for IJG JPEG library ; Based on the x86 SIMD extension for IJG JPEG library
; Copyright (C) 1999-2006, MIYASAKA Masaru. ; Copyright (C) 1999-2006, MIYASAKA Masaru.
@@ -38,7 +39,7 @@
%define input_data(b) (b)+24 ; JSAMPARRAY input_data %define input_data(b) (b)+24 ; JSAMPARRAY input_data
%define output_data(b) (b)+28 ; JSAMPARRAY output_data %define output_data(b) (b)+28 ; JSAMPARRAY output_data
align 16 align 32
global EXTN(jsimd_h2v1_downsample_sse2) global EXTN(jsimd_h2v1_downsample_sse2)
EXTN(jsimd_h2v1_downsample_sse2): EXTN(jsimd_h2v1_downsample_sse2):
@@ -193,7 +194,7 @@ EXTN(jsimd_h2v1_downsample_sse2):
%define input_data(b) (b)+24 ; JSAMPARRAY input_data %define input_data(b) (b)+24 ; JSAMPARRAY input_data
%define output_data(b) (b)+28 ; JSAMPARRAY output_data %define output_data(b) (b)+28 ; JSAMPARRAY output_data
align 16 align 32
global EXTN(jsimd_h2v2_downsample_sse2) global EXTN(jsimd_h2v2_downsample_sse2)
EXTN(jsimd_h2v2_downsample_sse2): EXTN(jsimd_h2v2_downsample_sse2):
@@ -347,4 +348,4 @@ EXTN(jsimd_h2v2_downsample_sse2):
; For some reason, the OS X linker does not honor the request to align the ; For some reason, the OS X linker does not honor the request to align the
; segment unless we do this. ; segment unless we do this.
align 16 align 32

5
simd/jdcolext-mmx.asm
View File

@@ -2,6 +2,7 @@
; jdcolext.asm - colorspace conversion (MMX) ; jdcolext.asm - colorspace conversion (MMX)
; ;
; Copyright 2009 Pierre Ossman <ossman@cendio.se> for Cendio AB ; Copyright 2009 Pierre Ossman <ossman@cendio.se> for Cendio AB
; Copyright (C) 2016, D. R. Commander.
; ;
; Based on the x86 SIMD extension for IJG JPEG library ; Based on the x86 SIMD extension for IJG JPEG library
; Copyright (C) 1999-2006, MIYASAKA Masaru. ; Copyright (C) 1999-2006, MIYASAKA Masaru.
@@ -38,7 +39,7 @@
%define WK_NUM 2 %define WK_NUM 2
%define gotptr wk(0)-SIZEOF_POINTER ; void * gotptr %define gotptr wk(0)-SIZEOF_POINTER ; void * gotptr
align 16 align 32
global EXTN(jsimd_ycc_rgb_convert_mmx) global EXTN(jsimd_ycc_rgb_convert_mmx)
EXTN(jsimd_ycc_rgb_convert_mmx): EXTN(jsimd_ycc_rgb_convert_mmx):
@@ -401,4 +402,4 @@ EXTN(jsimd_ycc_rgb_convert_mmx):
; For some reason, the OS X linker does not honor the request to align the ; For some reason, the OS X linker does not honor the request to align the
; segment unless we do this. ; segment unless we do this.
align 16 align 32

6
simd/jdcolext-sse2.asm
View File

@@ -2,7 +2,7 @@
; jdcolext.asm - colorspace conversion (SSE2) ; jdcolext.asm - colorspace conversion (SSE2)
; ;
; Copyright 2009, 2012 Pierre Ossman <ossman@cendio.se> for Cendio AB ; Copyright 2009, 2012 Pierre Ossman <ossman@cendio.se> for Cendio AB
; Copyright (C) 2012, D. R. Commander. ; Copyright (C) 2012, 2016, D. R. Commander.
; ;
; Based on the x86 SIMD extension for IJG JPEG library ; Based on the x86 SIMD extension for IJG JPEG library
; Copyright (C) 1999-2006, MIYASAKA Masaru. ; Copyright (C) 1999-2006, MIYASAKA Masaru.
@@ -39,7 +39,7 @@
%define WK_NUM 2 %define WK_NUM 2
%define gotptr wk(0)-SIZEOF_POINTER ; void * gotptr %define gotptr wk(0)-SIZEOF_POINTER ; void * gotptr
align 16 align 32
global EXTN(jsimd_ycc_rgb_convert_sse2) global EXTN(jsimd_ycc_rgb_convert_sse2)
EXTN(jsimd_ycc_rgb_convert_sse2): EXTN(jsimd_ycc_rgb_convert_sse2):
@@ -456,4 +456,4 @@ EXTN(jsimd_ycc_rgb_convert_sse2):
; For some reason, the OS X linker does not honor the request to align the ; For some reason, the OS X linker does not honor the request to align the
; segment unless we do this. ; segment unless we do this.
align 16 align 32

6
simd/jdcolor-mmx.asm
View File

@@ -2,7 +2,7 @@
; jdcolor.asm - colorspace conversion (MMX) ; jdcolor.asm - colorspace conversion (MMX)
; ;
; Copyright 2009 Pierre Ossman <ossman@cendio.se> for Cendio AB ; Copyright 2009 Pierre Ossman <ossman@cendio.se> for Cendio AB
; Copyright (C) 2009, D. R. Commander. ; Copyright (C) 2009, 2016, D. R. Commander.
; ;
; Based on the x86 SIMD extension for IJG JPEG library ; Based on the x86 SIMD extension for IJG JPEG library
; Copyright (C) 1999-2006, MIYASAKA Masaru. ; Copyright (C) 1999-2006, MIYASAKA Masaru.
@@ -33,7 +33,7 @@ F_0_228 equ (131072 - F_1_772) ; FIX(2) - FIX(1.77200)
; -------------------------------------------------------------------------- ; --------------------------------------------------------------------------
SECTION SEG_CONST SECTION SEG_CONST
alignz 16 alignz 32
global EXTN(jconst_ycc_rgb_convert_mmx) global EXTN(jconst_ycc_rgb_convert_mmx)
EXTN(jconst_ycc_rgb_convert_mmx): EXTN(jconst_ycc_rgb_convert_mmx):
@@ -44,7 +44,7 @@ PW_MF0344_F0285 times 2 dw -F_0_344, F_0_285
PW_ONE times 4 dw 1 PW_ONE times 4 dw 1
PD_ONEHALF times 2 dd 1 << (SCALEBITS-1) PD_ONEHALF times 2 dd 1 << (SCALEBITS-1)
alignz 16 alignz 32
; -------------------------------------------------------------------------- ; --------------------------------------------------------------------------
SECTION SEG_TEXT SECTION SEG_TEXT

6
simd/jdcolor-sse2.asm
View File

@@ -2,7 +2,7 @@
; jdcolor.asm - colorspace conversion (SSE2) ; jdcolor.asm - colorspace conversion (SSE2)
; ;
; Copyright 2009 Pierre Ossman <ossman@cendio.se> for Cendio AB ; Copyright 2009 Pierre Ossman <ossman@cendio.se> for Cendio AB
; Copyright (C) 2009, D. R. Commander. ; Copyright (C) 2009, 2016, D. R. Commander.
; ;
; Based on the x86 SIMD extension for IJG JPEG library ; Based on the x86 SIMD extension for IJG JPEG library
; Copyright (C) 1999-2006, MIYASAKA Masaru. ; Copyright (C) 1999-2006, MIYASAKA Masaru.
@@ -33,7 +33,7 @@ F_0_228 equ (131072 - F_1_772) ; FIX(2) - FIX(1.77200)
; -------------------------------------------------------------------------- ; --------------------------------------------------------------------------
SECTION SEG_CONST SECTION SEG_CONST
alignz 16 alignz 32
global EXTN(jconst_ycc_rgb_convert_sse2) global EXTN(jconst_ycc_rgb_convert_sse2)
EXTN(jconst_ycc_rgb_convert_sse2): EXTN(jconst_ycc_rgb_convert_sse2):
@@ -44,7 +44,7 @@ PW_MF0344_F0285 times 4 dw -F_0_344, F_0_285
PW_ONE times 8 dw 1 PW_ONE times 8 dw 1
PD_ONEHALF times 4 dd 1 << (SCALEBITS-1) PD_ONEHALF times 4 dd 1 << (SCALEBITS-1)
alignz 16 alignz 32
; -------------------------------------------------------------------------- ; --------------------------------------------------------------------------
SECTION SEG_TEXT SECTION SEG_TEXT

6
simd/jdmerge-mmx.asm
View File

@@ -2,7 +2,7 @@
; jdmerge.asm - merged upsampling/color conversion (MMX) ; jdmerge.asm - merged upsampling/color conversion (MMX)
; ;
; Copyright 2009 Pierre Ossman <ossman@cendio.se> for Cendio AB ; Copyright 2009 Pierre Ossman <ossman@cendio.se> for Cendio AB
; Copyright (C) 2009, D. R. Commander. ; Copyright (C) 2009, 2016, D. R. Commander.
; ;
; Based on the x86 SIMD extension for IJG JPEG library ; Based on the x86 SIMD extension for IJG JPEG library
; Copyright (C) 1999-2006, MIYASAKA Masaru. ; Copyright (C) 1999-2006, MIYASAKA Masaru.
@@ -33,7 +33,7 @@ F_0_228 equ (131072 - F_1_772) ; FIX(2) - FIX(1.77200)
; -------------------------------------------------------------------------- ; --------------------------------------------------------------------------
SECTION SEG_CONST SECTION SEG_CONST
alignz 16 alignz 32
global EXTN(jconst_merged_upsample_mmx) global EXTN(jconst_merged_upsample_mmx)
EXTN(jconst_merged_upsample_mmx): EXTN(jconst_merged_upsample_mmx):
@@ -44,7 +44,7 @@ PW_MF0344_F0285 times 2 dw -F_0_344, F_0_285
PW_ONE times 4 dw 1 PW_ONE times 4 dw 1
PD_ONEHALF times 2 dd 1 << (SCALEBITS-1) PD_ONEHALF times 2 dd 1 << (SCALEBITS-1)
alignz 16 alignz 32
; -------------------------------------------------------------------------- ; --------------------------------------------------------------------------
SECTION SEG_TEXT SECTION SEG_TEXT

6
simd/jdmerge-sse2.asm
View File

@@ -2,7 +2,7 @@
; jdmerge.asm - merged upsampling/color conversion (SSE2) ; jdmerge.asm - merged upsampling/color conversion (SSE2)
; ;
; Copyright 2009 Pierre Ossman <ossman@cendio.se> for Cendio AB ; Copyright 2009 Pierre Ossman <ossman@cendio.se> for Cendio AB
; Copyright (C) 2009, D. R. Commander. ; Copyright (C) 2009, 2016, D. R. Commander.
; ;
; Based on the x86 SIMD extension for IJG JPEG library ; Based on the x86 SIMD extension for IJG JPEG library
; Copyright (C) 1999-2006, MIYASAKA Masaru. ; Copyright (C) 1999-2006, MIYASAKA Masaru.
@@ -33,7 +33,7 @@ F_0_228 equ (131072 - F_1_772) ; FIX(2) - FIX(1.77200)
; -------------------------------------------------------------------------- ; --------------------------------------------------------------------------
SECTION SEG_CONST SECTION SEG_CONST
alignz 16 alignz 32
global EXTN(jconst_merged_upsample_sse2) global EXTN(jconst_merged_upsample_sse2)
EXTN(jconst_merged_upsample_sse2): EXTN(jconst_merged_upsample_sse2):
@@ -44,7 +44,7 @@ PW_MF0344_F0285 times 4 dw -F_0_344, F_0_285
PW_ONE times 8 dw 1 PW_ONE times 8 dw 1
PD_ONEHALF times 4 dd 1 << (SCALEBITS-1) PD_ONEHALF times 4 dd 1 << (SCALEBITS-1)
alignz 16 alignz 32
; -------------------------------------------------------------------------- ; --------------------------------------------------------------------------
SECTION SEG_TEXT SECTION SEG_TEXT

7
simd/jdmrgext-mmx.asm
View File

@@ -2,6 +2,7 @@
; jdmrgext.asm - merged upsampling/color conversion (MMX) ; jdmrgext.asm - merged upsampling/color conversion (MMX)
; ;
; Copyright 2009 Pierre Ossman <ossman@cendio.se> for Cendio AB ; Copyright 2009 Pierre Ossman <ossman@cendio.se> for Cendio AB
; Copyright (C) 2016, D. R. Commander.
; ;
; Based on the x86 SIMD extension for IJG JPEG library ; Based on the x86 SIMD extension for IJG JPEG library
; Copyright (C) 1999-2006, MIYASAKA Masaru. ; Copyright (C) 1999-2006, MIYASAKA Masaru.
@@ -38,7 +39,7 @@
%define WK_NUM 3 %define WK_NUM 3
%define gotptr wk(0)-SIZEOF_POINTER ; void * gotptr %define gotptr wk(0)-SIZEOF_POINTER ; void * gotptr
align 16 align 32
global EXTN(jsimd_h2v1_merged_upsample_mmx) global EXTN(jsimd_h2v1_merged_upsample_mmx)
EXTN(jsimd_h2v1_merged_upsample_mmx): EXTN(jsimd_h2v1_merged_upsample_mmx):
@@ -407,7 +408,7 @@ EXTN(jsimd_h2v1_merged_upsample_mmx):
%define in_row_group_ctr(b) (b)+16 ; JDIMENSION in_row_group_ctr %define in_row_group_ctr(b) (b)+16 ; JDIMENSION in_row_group_ctr
%define output_buf(b) (b)+20 ; JSAMPARRAY output_buf %define output_buf(b) (b)+20 ; JSAMPARRAY output_buf
align 16 align 32
global EXTN(jsimd_h2v2_merged_upsample_mmx) global EXTN(jsimd_h2v2_merged_upsample_mmx)
EXTN(jsimd_h2v2_merged_upsample_mmx): EXTN(jsimd_h2v2_merged_upsample_mmx):
@@ -460,4 +461,4 @@ EXTN(jsimd_h2v2_merged_upsample_mmx):
; For some reason, the OS X linker does not honor the request to align the ; For some reason, the OS X linker does not honor the request to align the
; segment unless we do this. ; segment unless we do this.
align 16 align 32

8
simd/jdmrgext-sse2.asm
View File

@@ -2,7 +2,7 @@
; jdmrgext.asm - merged upsampling/color conversion (SSE2) ; jdmrgext.asm - merged upsampling/color conversion (SSE2)
; ;
; Copyright 2009, 2012 Pierre Ossman <ossman@cendio.se> for Cendio AB ; Copyright 2009, 2012 Pierre Ossman <ossman@cendio.se> for Cendio AB
; Copyright (C) 2012, D. R. Commander. ; Copyright (C) 2012, 2016, D. R. Commander.
; ;
; Based on the x86 SIMD extension for IJG JPEG library ; Based on the x86 SIMD extension for IJG JPEG library
; Copyright (C) 1999-2006, MIYASAKA Masaru. ; Copyright (C) 1999-2006, MIYASAKA Masaru.
@@ -39,7 +39,7 @@
%define WK_NUM 3 %define WK_NUM 3
%define gotptr wk(0)-SIZEOF_POINTER ; void * gotptr %define gotptr wk(0)-SIZEOF_POINTER ; void * gotptr
align 16 align 32
global EXTN(jsimd_h2v1_merged_upsample_sse2) global EXTN(jsimd_h2v1_merged_upsample_sse2)
EXTN(jsimd_h2v1_merged_upsample_sse2): EXTN(jsimd_h2v1_merged_upsample_sse2):
@@ -462,7 +462,7 @@ EXTN(jsimd_h2v1_merged_upsample_sse2):
%define in_row_group_ctr(b) (b)+16 ; JDIMENSION in_row_group_ctr %define in_row_group_ctr(b) (b)+16 ; JDIMENSION in_row_group_ctr
%define output_buf(b) (b)+20 ; JSAMPARRAY output_buf %define output_buf(b) (b)+20 ; JSAMPARRAY output_buf
align 16 align 32
global EXTN(jsimd_h2v2_merged_upsample_sse2) global EXTN(jsimd_h2v2_merged_upsample_sse2)
EXTN(jsimd_h2v2_merged_upsample_sse2): EXTN(jsimd_h2v2_merged_upsample_sse2):
@@ -515,4 +515,4 @@ EXTN(jsimd_h2v2_merged_upsample_sse2):
; For some reason, the OS X linker does not honor the request to align the ; For some reason, the OS X linker does not honor the request to align the
; segment unless we do this. ; segment unless we do this.
align 16 align 32

15
simd/jdsample-mmx.asm
View File

@@ -2,6 +2,7 @@
; jdsample.asm - upsampling (MMX) ; jdsample.asm - upsampling (MMX)
; ;
; Copyright 2009 Pierre Ossman <ossman@cendio.se> for Cendio AB ; Copyright 2009 Pierre Ossman <ossman@cendio.se> for Cendio AB
; Copyright (C) 2016, D. R. Commander.
; ;
; Based on the x86 SIMD extension for IJG JPEG library ; Based on the x86 SIMD extension for IJG JPEG library
; Copyright (C) 1999-2006, MIYASAKA Masaru. ; Copyright (C) 1999-2006, MIYASAKA Masaru.
@@ -20,7 +21,7 @@
; -------------------------------------------------------------------------- ; --------------------------------------------------------------------------
SECTION SEG_CONST SECTION SEG_CONST
alignz 16 alignz 32
global EXTN(jconst_fancy_upsample_mmx) global EXTN(jconst_fancy_upsample_mmx)
EXTN(jconst_fancy_upsample_mmx): EXTN(jconst_fancy_upsample_mmx):
@@ -31,7 +32,7 @@ PW_THREE times 4 dw 3
PW_SEVEN times 4 dw 7 PW_SEVEN times 4 dw 7
PW_EIGHT times 4 dw 8 PW_EIGHT times 4 dw 8
alignz 16 alignz 32
; -------------------------------------------------------------------------- ; --------------------------------------------------------------------------
SECTION SEG_TEXT SECTION SEG_TEXT
@@ -56,7 +57,7 @@ PW_EIGHT times 4 dw 8
%define input_data(b) (b)+16 ; JSAMPARRAY input_data %define input_data(b) (b)+16 ; JSAMPARRAY input_data
%define output_data_ptr(b) (b)+20 ; JSAMPARRAY *output_data_ptr %define output_data_ptr(b) (b)+20 ; JSAMPARRAY *output_data_ptr
align 16 align 32
global EXTN(jsimd_h2v1_fancy_upsample_mmx) global EXTN(jsimd_h2v1_fancy_upsample_mmx)
EXTN(jsimd_h2v1_fancy_upsample_mmx): EXTN(jsimd_h2v1_fancy_upsample_mmx):
@@ -214,7 +215,7 @@ EXTN(jsimd_h2v1_fancy_upsample_mmx):
%define WK_NUM 4 %define WK_NUM 4
%define gotptr wk(0)-SIZEOF_POINTER ; void *gotptr %define gotptr wk(0)-SIZEOF_POINTER ; void *gotptr
align 16 align 32
global EXTN(jsimd_h2v2_fancy_upsample_mmx) global EXTN(jsimd_h2v2_fancy_upsample_mmx)
EXTN(jsimd_h2v2_fancy_upsample_mmx): EXTN(jsimd_h2v2_fancy_upsample_mmx):
@@ -540,7 +541,7 @@ EXTN(jsimd_h2v2_fancy_upsample_mmx):
%define input_data(b) (b)+16 ; JSAMPARRAY input_data %define input_data(b) (b)+16 ; JSAMPARRAY input_data
%define output_data_ptr(b) (b)+20 ; JSAMPARRAY *output_data_ptr %define output_data_ptr(b) (b)+20 ; JSAMPARRAY *output_data_ptr
align 16 align 32
global EXTN(jsimd_h2v1_upsample_mmx) global EXTN(jsimd_h2v1_upsample_mmx)
EXTN(jsimd_h2v1_upsample_mmx): EXTN(jsimd_h2v1_upsample_mmx):
@@ -641,7 +642,7 @@ EXTN(jsimd_h2v1_upsample_mmx):
%define input_data(b) (b)+16 ; JSAMPARRAY input_data %define input_data(b) (b)+16 ; JSAMPARRAY input_data
%define output_data_ptr(b) (b)+20 ; JSAMPARRAY *output_data_ptr %define output_data_ptr(b) (b)+20 ; JSAMPARRAY *output_data_ptr
align 16 align 32
global EXTN(jsimd_h2v2_upsample_mmx) global EXTN(jsimd_h2v2_upsample_mmx)
EXTN(jsimd_h2v2_upsample_mmx): EXTN(jsimd_h2v2_upsample_mmx):
@@ -733,4 +734,4 @@ EXTN(jsimd_h2v2_upsample_mmx):
; For some reason, the OS X linker does not honor the request to align the ; For some reason, the OS X linker does not honor the request to align the
; segment unless we do this. ; segment unless we do this.
align 16 align 32

15
simd/jdsample-sse2.asm
View File

@@ -2,6 +2,7 @@
; jdsample.asm - upsampling (SSE2) ; jdsample.asm - upsampling (SSE2)
; ;
; Copyright 2009 Pierre Ossman <ossman@cendio.se> for Cendio AB ; Copyright 2009 Pierre Ossman <ossman@cendio.se> for Cendio AB
; Copyright (C) 2016, D. R. Commander.
; ;
; Based on the x86 SIMD extension for IJG JPEG library ; Based on the x86 SIMD extension for IJG JPEG library
; Copyright (C) 1999-2006, MIYASAKA Masaru. ; Copyright (C) 1999-2006, MIYASAKA Masaru.
@@ -20,7 +21,7 @@
; -------------------------------------------------------------------------- ; --------------------------------------------------------------------------
SECTION SEG_CONST SECTION SEG_CONST
alignz 16 alignz 32
global EXTN(jconst_fancy_upsample_sse2) global EXTN(jconst_fancy_upsample_sse2)
EXTN(jconst_fancy_upsample_sse2): EXTN(jconst_fancy_upsample_sse2):
@@ -31,7 +32,7 @@ PW_THREE times 8 dw 3
PW_SEVEN times 8 dw 7 PW_SEVEN times 8 dw 7
PW_EIGHT times 8 dw 8 PW_EIGHT times 8 dw 8
alignz 16 alignz 32
; -------------------------------------------------------------------------- ; --------------------------------------------------------------------------
SECTION SEG_TEXT SECTION SEG_TEXT
@@ -56,7 +57,7 @@ PW_EIGHT times 8 dw 8
%define input_data(b) (b)+16 ; JSAMPARRAY input_data %define input_data(b) (b)+16 ; JSAMPARRAY input_data
%define output_data_ptr(b) (b)+20 ; JSAMPARRAY *output_data_ptr %define output_data_ptr(b) (b)+20 ; JSAMPARRAY *output_data_ptr
align 16 align 32
global EXTN(jsimd_h2v1_fancy_upsample_sse2) global EXTN(jsimd_h2v1_fancy_upsample_sse2)
EXTN(jsimd_h2v1_fancy_upsample_sse2): EXTN(jsimd_h2v1_fancy_upsample_sse2):
@@ -212,7 +213,7 @@ EXTN(jsimd_h2v1_fancy_upsample_sse2):
%define WK_NUM 4 %define WK_NUM 4
%define gotptr wk(0)-SIZEOF_POINTER ; void *gotptr %define gotptr wk(0)-SIZEOF_POINTER ; void *gotptr
align 16 align 32
global EXTN(jsimd_h2v2_fancy_upsample_sse2) global EXTN(jsimd_h2v2_fancy_upsample_sse2)
EXTN(jsimd_h2v2_fancy_upsample_sse2): EXTN(jsimd_h2v2_fancy_upsample_sse2):
@@ -536,7 +537,7 @@ EXTN(jsimd_h2v2_fancy_upsample_sse2):
%define input_data(b) (b)+16 ; JSAMPARRAY input_data %define input_data(b) (b)+16 ; JSAMPARRAY input_data
%define output_data_ptr(b) (b)+20 ; JSAMPARRAY *output_data_ptr %define output_data_ptr(b) (b)+20 ; JSAMPARRAY *output_data_ptr
align 16 align 32
global EXTN(jsimd_h2v1_upsample_sse2) global EXTN(jsimd_h2v1_upsample_sse2)
EXTN(jsimd_h2v1_upsample_sse2): EXTN(jsimd_h2v1_upsample_sse2):
@@ -635,7 +636,7 @@ EXTN(jsimd_h2v1_upsample_sse2):
%define input_data(b) (b)+16 ; JSAMPARRAY input_data %define input_data(b) (b)+16 ; JSAMPARRAY input_data
%define output_data_ptr(b) (b)+20 ; JSAMPARRAY *output_data_ptr %define output_data_ptr(b) (b)+20 ; JSAMPARRAY *output_data_ptr
align 16 align 32
global EXTN(jsimd_h2v2_upsample_sse2) global EXTN(jsimd_h2v2_upsample_sse2)
EXTN(jsimd_h2v2_upsample_sse2): EXTN(jsimd_h2v2_upsample_sse2):
@@ -725,4 +726,4 @@ EXTN(jsimd_h2v2_upsample_sse2):
; For some reason, the OS X linker does not honor the request to align the ; For some reason, the OS X linker does not honor the request to align the
; segment unless we do this. ; segment unless we do this.
align 16 align 32

9
simd/jfdctflt-3dn.asm
View File

@@ -2,6 +2,7 @@
; jfdctflt.asm - floating-point FDCT (3DNow!) ; jfdctflt.asm - floating-point FDCT (3DNow!)
; ;
; Copyright 2009 Pierre Ossman <ossman@cendio.se> for Cendio AB ; Copyright 2009 Pierre Ossman <ossman@cendio.se> for Cendio AB
; Copyright (C) 2016, D. R. Commander.
; ;
; Based on the x86 SIMD extension for IJG JPEG library ; Based on the x86 SIMD extension for IJG JPEG library
; Copyright (C) 1999-2006, MIYASAKA Masaru. ; Copyright (C) 1999-2006, MIYASAKA Masaru.
@@ -25,7 +26,7 @@
; -------------------------------------------------------------------------- ; --------------------------------------------------------------------------
SECTION SEG_CONST SECTION SEG_CONST
alignz 16 alignz 32
global EXTN(jconst_fdct_float_3dnow) global EXTN(jconst_fdct_float_3dnow)
EXTN(jconst_fdct_float_3dnow): EXTN(jconst_fdct_float_3dnow):
@@ -35,7 +36,7 @@ PD_0_707 times 2 dd 0.707106781186547524400844
PD_0_541 times 2 dd 0.541196100146196984399723 PD_0_541 times 2 dd 0.541196100146196984399723
PD_1_306 times 2 dd 1.306562964876376527856643 PD_1_306 times 2 dd 1.306562964876376527856643
alignz 16 alignz 32
; -------------------------------------------------------------------------- ; --------------------------------------------------------------------------
SECTION SEG_TEXT SECTION SEG_TEXT
@@ -53,7 +54,7 @@ PD_1_306 times 2 dd 1.306562964876376527856643
%define wk(i) ebp-(WK_NUM-(i))*SIZEOF_MMWORD ; mmword wk[WK_NUM] %define wk(i) ebp-(WK_NUM-(i))*SIZEOF_MMWORD ; mmword wk[WK_NUM]
%define WK_NUM 2 %define WK_NUM 2
align 16 align 32
global EXTN(jsimd_fdct_float_3dnow) global EXTN(jsimd_fdct_float_3dnow)
EXTN(jsimd_fdct_float_3dnow): EXTN(jsimd_fdct_float_3dnow):
@@ -316,4 +317,4 @@ EXTN(jsimd_fdct_float_3dnow):
; For some reason, the OS X linker does not honor the request to align the ; For some reason, the OS X linker does not honor the request to align the
; segment unless we do this. ; segment unless we do this.
align 16 align 32

9
simd/jfdctflt-sse.asm
View File

@@ -2,6 +2,7 @@
; jfdctflt.asm - floating-point FDCT (SSE) ; jfdctflt.asm - floating-point FDCT (SSE)
; ;
; Copyright 2009 Pierre Ossman <ossman@cendio.se> for Cendio AB ; Copyright 2009 Pierre Ossman <ossman@cendio.se> for Cendio AB
; Copyright (C) 2016, D. R. Commander.
; ;
; Based on the x86 SIMD extension for IJG JPEG library ; Based on the x86 SIMD extension for IJG JPEG library
; Copyright (C) 1999-2006, MIYASAKA Masaru. ; Copyright (C) 1999-2006, MIYASAKA Masaru.
@@ -35,7 +36,7 @@
; -------------------------------------------------------------------------- ; --------------------------------------------------------------------------
SECTION SEG_CONST SECTION SEG_CONST
alignz 16 alignz 32
global EXTN(jconst_fdct_float_sse) global EXTN(jconst_fdct_float_sse)
EXTN(jconst_fdct_float_sse): EXTN(jconst_fdct_float_sse):
@@ -45,7 +46,7 @@ PD_0_707 times 4 dd 0.707106781186547524400844
PD_0_541 times 4 dd 0.541196100146196984399723 PD_0_541 times 4 dd 0.541196100146196984399723
PD_1_306 times 4 dd 1.306562964876376527856643 PD_1_306 times 4 dd 1.306562964876376527856643
alignz 16 alignz 32
; -------------------------------------------------------------------------- ; --------------------------------------------------------------------------
SECTION SEG_TEXT SECTION SEG_TEXT
@@ -63,7 +64,7 @@ PD_1_306 times 4 dd 1.306562964876376527856643
%define wk(i) ebp-(WK_NUM-(i))*SIZEOF_XMMWORD ; xmmword wk[WK_NUM] %define wk(i) ebp-(WK_NUM-(i))*SIZEOF_XMMWORD ; xmmword wk[WK_NUM]
%define WK_NUM 2 %define WK_NUM 2
align 16 align 32
global EXTN(jsimd_fdct_float_sse) global EXTN(jsimd_fdct_float_sse)
EXTN(jsimd_fdct_float_sse): EXTN(jsimd_fdct_float_sse):
@@ -366,4 +367,4 @@ EXTN(jsimd_fdct_float_sse):
; For some reason, the OS X linker does not honor the request to align the ; For some reason, the OS X linker does not honor the request to align the
; segment unless we do this. ; segment unless we do this.
align 16 align 32

9
simd/jfdctfst-mmx.asm
View File

@@ -2,6 +2,7 @@
; jfdctfst.asm - fast integer FDCT (MMX) ; jfdctfst.asm - fast integer FDCT (MMX)
; ;
; Copyright 2009 Pierre Ossman <ossman@cendio.se> for Cendio AB ; Copyright 2009 Pierre Ossman <ossman@cendio.se> for Cendio AB
; Copyright (C) 2016, D. R. Commander.
; ;
; Based on the x86 SIMD extension for IJG JPEG library ; Based on the x86 SIMD extension for IJG JPEG library
; Copyright (C) 1999-2006, MIYASAKA Masaru. ; Copyright (C) 1999-2006, MIYASAKA Masaru.
@@ -50,7 +51,7 @@ F_1_306 equ DESCALE(1402911301,30-CONST_BITS) ; FIX(1.306562965)
%define PRE_MULTIPLY_SCALE_BITS 2 %define PRE_MULTIPLY_SCALE_BITS 2
%define CONST_SHIFT (16 - PRE_MULTIPLY_SCALE_BITS - CONST_BITS) %define CONST_SHIFT (16 - PRE_MULTIPLY_SCALE_BITS - CONST_BITS)
alignz 16 alignz 32
global EXTN(jconst_fdct_ifast_mmx) global EXTN(jconst_fdct_ifast_mmx)
EXTN(jconst_fdct_ifast_mmx): EXTN(jconst_fdct_ifast_mmx):
@@ -60,7 +61,7 @@ PW_F0382 times 4 dw F_0_382 << CONST_SHIFT
PW_F0541 times 4 dw F_0_541 << CONST_SHIFT PW_F0541 times 4 dw F_0_541 << CONST_SHIFT
PW_F1306 times 4 dw F_1_306 << CONST_SHIFT PW_F1306 times 4 dw F_1_306 << CONST_SHIFT
alignz 16 alignz 32
; -------------------------------------------------------------------------- ; --------------------------------------------------------------------------
SECTION SEG_TEXT SECTION SEG_TEXT
@@ -78,7 +79,7 @@ PW_F1306 times 4 dw F_1_306 << CONST_SHIFT
%define wk(i) ebp-(WK_NUM-(i))*SIZEOF_MMWORD ; mmword wk[WK_NUM] %define wk(i) ebp-(WK_NUM-(i))*SIZEOF_MMWORD ; mmword wk[WK_NUM]
%define WK_NUM 2 %define WK_NUM 2
align 16 align 32
global EXTN(jsimd_fdct_ifast_mmx) global EXTN(jsimd_fdct_ifast_mmx)
EXTN(jsimd_fdct_ifast_mmx): EXTN(jsimd_fdct_ifast_mmx):
@@ -393,4 +394,4 @@ EXTN(jsimd_fdct_ifast_mmx):
; For some reason, the OS X linker does not honor the request to align the ; For some reason, the OS X linker does not honor the request to align the
; segment unless we do this. ; segment unless we do this.
align 16 align 32

9
simd/jfdctfst-sse2.asm
View File

@@ -2,6 +2,7 @@
; jfdctfst.asm - fast integer FDCT (SSE2) ; jfdctfst.asm - fast integer FDCT (SSE2)
; ;
; Copyright 2009 Pierre Ossman <ossman@cendio.se> for Cendio AB ; Copyright 2009 Pierre Ossman <ossman@cendio.se> for Cendio AB
; Copyright (C) 2016, D. R. Commander.
; ;
; Based on the x86 SIMD extension for IJG JPEG library ; Based on the x86 SIMD extension for IJG JPEG library
; Copyright (C) 1999-2006, MIYASAKA Masaru. ; Copyright (C) 1999-2006, MIYASAKA Masaru.
@@ -50,7 +51,7 @@ F_1_306 equ DESCALE(1402911301, 30-CONST_BITS) ; FIX(1.306562965)
%define PRE_MULTIPLY_SCALE_BITS 2 %define PRE_MULTIPLY_SCALE_BITS 2
%define CONST_SHIFT (16 - PRE_MULTIPLY_SCALE_BITS - CONST_BITS) %define CONST_SHIFT (16 - PRE_MULTIPLY_SCALE_BITS - CONST_BITS)
alignz 16 alignz 32
global EXTN(jconst_fdct_ifast_sse2) global EXTN(jconst_fdct_ifast_sse2)
EXTN(jconst_fdct_ifast_sse2): EXTN(jconst_fdct_ifast_sse2):
@@ -60,7 +61,7 @@ PW_F0382 times 8 dw F_0_382 << CONST_SHIFT
PW_F0541 times 8 dw F_0_541 << CONST_SHIFT PW_F0541 times 8 dw F_0_541 << CONST_SHIFT
PW_F1306 times 8 dw F_1_306 << CONST_SHIFT PW_F1306 times 8 dw F_1_306 << CONST_SHIFT
alignz 16 alignz 32
; -------------------------------------------------------------------------- ; --------------------------------------------------------------------------
SECTION SEG_TEXT SECTION SEG_TEXT
@@ -78,7 +79,7 @@ PW_F1306 times 8 dw F_1_306 << CONST_SHIFT
%define wk(i) ebp-(WK_NUM-(i))*SIZEOF_XMMWORD ; xmmword wk[WK_NUM] %define wk(i) ebp-(WK_NUM-(i))*SIZEOF_XMMWORD ; xmmword wk[WK_NUM]
%define WK_NUM 2 %define WK_NUM 2
align 16 align 32
global EXTN(jsimd_fdct_ifast_sse2) global EXTN(jsimd_fdct_ifast_sse2)
EXTN(jsimd_fdct_ifast_sse2): EXTN(jsimd_fdct_ifast_sse2):
@@ -400,4 +401,4 @@ EXTN(jsimd_fdct_ifast_sse2):
; For some reason, the OS X linker does not honor the request to align the ; For some reason, the OS X linker does not honor the request to align the
; segment unless we do this. ; segment unless we do this.
align 16 align 32

9
simd/jfdctint-mmx.asm
View File

@@ -2,6 +2,7 @@
; jfdctint.asm - accurate integer FDCT (MMX) ; jfdctint.asm - accurate integer FDCT (MMX)
; ;
; Copyright 2009 Pierre Ossman <ossman@cendio.se> for Cendio AB ; Copyright 2009 Pierre Ossman <ossman@cendio.se> for Cendio AB
; Copyright (C) 2016, D. R. Commander.
; ;
; Based on the x86 SIMD extension for IJG JPEG library ; Based on the x86 SIMD extension for IJG JPEG library
; Copyright (C) 1999-2006, MIYASAKA Masaru. ; Copyright (C) 1999-2006, MIYASAKA Masaru.
@@ -64,7 +65,7 @@ F_3_072 equ DESCALE(3299298341,30-CONST_BITS) ; FIX(3.072711026)
; -------------------------------------------------------------------------- ; --------------------------------------------------------------------------
SECTION SEG_CONST SECTION SEG_CONST
alignz 16 alignz 32
global EXTN(jconst_fdct_islow_mmx) global EXTN(jconst_fdct_islow_mmx)
EXTN(jconst_fdct_islow_mmx): EXTN(jconst_fdct_islow_mmx):
@@ -81,7 +82,7 @@ PD_DESCALE_P1 times 2 dd 1 << (DESCALE_P1-1)
PD_DESCALE_P2 times 2 dd 1 << (DESCALE_P2-1) PD_DESCALE_P2 times 2 dd 1 << (DESCALE_P2-1)
PW_DESCALE_P2X times 4 dw 1 << (PASS1_BITS-1) PW_DESCALE_P2X times 4 dw 1 << (PASS1_BITS-1)
alignz 16 alignz 32
; -------------------------------------------------------------------------- ; --------------------------------------------------------------------------
SECTION SEG_TEXT SECTION SEG_TEXT
@@ -99,7 +100,7 @@ PW_DESCALE_P2X times 4 dw 1 << (PASS1_BITS-1)
%define wk(i) ebp-(WK_NUM-(i))*SIZEOF_MMWORD ; mmword wk[WK_NUM] %define wk(i) ebp-(WK_NUM-(i))*SIZEOF_MMWORD ; mmword wk[WK_NUM]
%define WK_NUM 2 %define WK_NUM 2
align 16 align 32
global EXTN(jsimd_fdct_islow_mmx) global EXTN(jsimd_fdct_islow_mmx)
EXTN(jsimd_fdct_islow_mmx): EXTN(jsimd_fdct_islow_mmx):
@@ -618,4 +619,4 @@ EXTN(jsimd_fdct_islow_mmx):
; For some reason, the OS X linker does not honor the request to align the ; For some reason, the OS X linker does not honor the request to align the
; segment unless we do this. ; segment unless we do this.
align 16 align 32

9
simd/jfdctint-sse2.asm
View File

@@ -2,6 +2,7 @@
; jfdctint.asm - accurate integer FDCT (SSE2) ; jfdctint.asm - accurate integer FDCT (SSE2)
; ;
; Copyright 2009 Pierre Ossman <ossman@cendio.se> for Cendio AB ; Copyright 2009 Pierre Ossman <ossman@cendio.se> for Cendio AB
; Copyright (C) 2016, D. R. Commander.
; ;
; Based on the x86 SIMD extension for IJG JPEG library ; Based on the x86 SIMD extension for IJG JPEG library
; Copyright (C) 1999-2006, MIYASAKA Masaru. ; Copyright (C) 1999-2006, MIYASAKA Masaru.
@@ -64,7 +65,7 @@ F_3_072 equ DESCALE(3299298341, 30-CONST_BITS) ; FIX(3.072711026)
; -------------------------------------------------------------------------- ; --------------------------------------------------------------------------
SECTION SEG_CONST SECTION SEG_CONST
alignz 16 alignz 32
global EXTN(jconst_fdct_islow_sse2) global EXTN(jconst_fdct_islow_sse2)
EXTN(jconst_fdct_islow_sse2): EXTN(jconst_fdct_islow_sse2):
@@ -81,7 +82,7 @@ PD_DESCALE_P1 times 4 dd 1 << (DESCALE_P1-1)
PD_DESCALE_P2 times 4 dd 1 << (DESCALE_P2-1) PD_DESCALE_P2 times 4 dd 1 << (DESCALE_P2-1)
PW_DESCALE_P2X times 8 dw 1 << (PASS1_BITS-1) PW_DESCALE_P2X times 8 dw 1 << (PASS1_BITS-1)
alignz 16 alignz 32
; -------------------------------------------------------------------------- ; --------------------------------------------------------------------------
SECTION SEG_TEXT SECTION SEG_TEXT
@@ -99,7 +100,7 @@ PW_DESCALE_P2X times 8 dw 1 << (PASS1_BITS-1)
%define wk(i) ebp-(WK_NUM-(i))*SIZEOF_XMMWORD ; xmmword wk[WK_NUM] %define wk(i) ebp-(WK_NUM-(i))*SIZEOF_XMMWORD ; xmmword wk[WK_NUM]
%define WK_NUM 6 %define WK_NUM 6
align 16 align 32
global EXTN(jsimd_fdct_islow_sse2) global EXTN(jsimd_fdct_islow_sse2)
EXTN(jsimd_fdct_islow_sse2): EXTN(jsimd_fdct_islow_sse2):
@@ -630,4 +631,4 @@ EXTN(jsimd_fdct_islow_sse2):
; For some reason, the OS X linker does not honor the request to align the ; For some reason, the OS X linker does not honor the request to align the
; segment unless we do this. ; segment unless we do this.
align 16 align 32

9
simd/jidctflt-3dn.asm
View File

@@ -2,6 +2,7 @@
; jidctflt.asm - floating-point IDCT (3DNow! & MMX) ; jidctflt.asm - floating-point IDCT (3DNow! & MMX)
; ;
; Copyright 2009 Pierre Ossman <ossman@cendio.se> for Cendio AB ; Copyright 2009 Pierre Ossman <ossman@cendio.se> for Cendio AB
; Copyright (C) 2016, D. R. Commander.
; ;
; Based on the x86 SIMD extension for IJG JPEG library ; Based on the x86 SIMD extension for IJG JPEG library
; Copyright (C) 1999-2006, MIYASAKA Masaru. ; Copyright (C) 1999-2006, MIYASAKA Masaru.
@@ -25,7 +26,7 @@
; -------------------------------------------------------------------------- ; --------------------------------------------------------------------------
SECTION SEG_CONST SECTION SEG_CONST
alignz 16 alignz 32
global EXTN(jconst_idct_float_3dnow) global EXTN(jconst_idct_float_3dnow)
EXTN(jconst_idct_float_3dnow): EXTN(jconst_idct_float_3dnow):
@@ -37,7 +38,7 @@ PD_2_613 times 2 dd 2.613125929752753055713286
PD_RNDINT_MAGIC times 2 dd 100663296.0 ; (float)(0x00C00000 << 3) PD_RNDINT_MAGIC times 2 dd 100663296.0 ; (float)(0x00C00000 << 3)
PB_CENTERJSAMP times 8 db CENTERJSAMPLE PB_CENTERJSAMP times 8 db CENTERJSAMPLE
alignz 16 alignz 32
; -------------------------------------------------------------------------- ; --------------------------------------------------------------------------
SECTION SEG_TEXT SECTION SEG_TEXT
@@ -61,7 +62,7 @@ PB_CENTERJSAMP times 8 db CENTERJSAMPLE
%define workspace wk(0)-DCTSIZE2*SIZEOF_FAST_FLOAT %define workspace wk(0)-DCTSIZE2*SIZEOF_FAST_FLOAT
; FAST_FLOAT workspace[DCTSIZE2] ; FAST_FLOAT workspace[DCTSIZE2]
align 16 align 32
global EXTN(jsimd_idct_float_3dnow) global EXTN(jsimd_idct_float_3dnow)
EXTN(jsimd_idct_float_3dnow): EXTN(jsimd_idct_float_3dnow):
@@ -448,4 +449,4 @@ EXTN(jsimd_idct_float_3dnow):
; For some reason, the OS X linker does not honor the request to align the ; For some reason, the OS X linker does not honor the request to align the
; segment unless we do this. ; segment unless we do this.
align 16 align 32

9
simd/jidctflt-sse.asm
View File

@@ -2,6 +2,7 @@
; jidctflt.asm - floating-point IDCT (SSE & MMX) ; jidctflt.asm - floating-point IDCT (SSE & MMX)
; ;
; Copyright 2009 Pierre Ossman <ossman@cendio.se> for Cendio AB ; Copyright 2009 Pierre Ossman <ossman@cendio.se> for Cendio AB
; Copyright (C) 2016, D. R. Commander.
; ;
; Based on the x86 SIMD extension for IJG JPEG library ; Based on the x86 SIMD extension for IJG JPEG library
; Copyright (C) 1999-2006, MIYASAKA Masaru. ; Copyright (C) 1999-2006, MIYASAKA Masaru.
@@ -35,7 +36,7 @@
; -------------------------------------------------------------------------- ; --------------------------------------------------------------------------
SECTION SEG_CONST SECTION SEG_CONST
alignz 16 alignz 32
global EXTN(jconst_idct_float_sse) global EXTN(jconst_idct_float_sse)
EXTN(jconst_idct_float_sse): EXTN(jconst_idct_float_sse):
@@ -47,7 +48,7 @@ PD_M2_613 times 4 dd -2.613125929752753055713286
PD_0_125 times 4 dd 0.125 ; 1/8 PD_0_125 times 4 dd 0.125 ; 1/8
PB_CENTERJSAMP times 8 db CENTERJSAMPLE PB_CENTERJSAMP times 8 db CENTERJSAMPLE
alignz 16 alignz 32
; -------------------------------------------------------------------------- ; --------------------------------------------------------------------------
SECTION SEG_TEXT SECTION SEG_TEXT
@@ -71,7 +72,7 @@ PB_CENTERJSAMP times 8 db CENTERJSAMPLE
%define workspace wk(0)-DCTSIZE2*SIZEOF_FAST_FLOAT %define workspace wk(0)-DCTSIZE2*SIZEOF_FAST_FLOAT
; FAST_FLOAT workspace[DCTSIZE2] ; FAST_FLOAT workspace[DCTSIZE2]
align 16 align 32
global EXTN(jsimd_idct_float_sse) global EXTN(jsimd_idct_float_sse)
EXTN(jsimd_idct_float_sse): EXTN(jsimd_idct_float_sse):
@@ -568,4 +569,4 @@ EXTN(jsimd_idct_float_sse):
; For some reason, the OS X linker does not honor the request to align the ; For some reason, the OS X linker does not honor the request to align the
; segment unless we do this. ; segment unless we do this.
align 16 align 32

9
simd/jidctflt-sse2.asm
View File

@@ -2,6 +2,7 @@
; jidctflt.asm - floating-point IDCT (SSE & SSE2) ; jidctflt.asm - floating-point IDCT (SSE & SSE2)
; ;
; Copyright 2009 Pierre Ossman <ossman@cendio.se> for Cendio AB ; Copyright 2009 Pierre Ossman <ossman@cendio.se> for Cendio AB
; Copyright (C) 2016, D. R. Commander.
; ;
; Based on the x86 SIMD extension for IJG JPEG library ; Based on the x86 SIMD extension for IJG JPEG library
; Copyright (C) 1999-2006, MIYASAKA Masaru. ; Copyright (C) 1999-2006, MIYASAKA Masaru.
@@ -35,7 +36,7 @@
; -------------------------------------------------------------------------- ; --------------------------------------------------------------------------
SECTION SEG_CONST SECTION SEG_CONST
alignz 16 alignz 32
global EXTN(jconst_idct_float_sse2) global EXTN(jconst_idct_float_sse2)
EXTN(jconst_idct_float_sse2): EXTN(jconst_idct_float_sse2):
@@ -47,7 +48,7 @@ PD_M2_613 times 4 dd -2.613125929752753055713286
PD_RNDINT_MAGIC times 4 dd 100663296.0 ; (float)(0x00C00000 << 3) PD_RNDINT_MAGIC times 4 dd 100663296.0 ; (float)(0x00C00000 << 3)
PB_CENTERJSAMP times 16 db CENTERJSAMPLE PB_CENTERJSAMP times 16 db CENTERJSAMPLE
alignz 16 alignz 32
; -------------------------------------------------------------------------- ; --------------------------------------------------------------------------
SECTION SEG_TEXT SECTION SEG_TEXT
@@ -71,7 +72,7 @@ PB_CENTERJSAMP times 16 db CENTERJSAMPLE
%define workspace wk(0)-DCTSIZE2*SIZEOF_FAST_FLOAT %define workspace wk(0)-DCTSIZE2*SIZEOF_FAST_FLOAT
; FAST_FLOAT workspace[DCTSIZE2] ; FAST_FLOAT workspace[DCTSIZE2]
align 16 align 32
global EXTN(jsimd_idct_float_sse2) global EXTN(jsimd_idct_float_sse2)
EXTN(jsimd_idct_float_sse2): EXTN(jsimd_idct_float_sse2):
@@ -494,4 +495,4 @@ EXTN(jsimd_idct_float_sse2):
; For some reason, the OS X linker does not honor the request to align the ; For some reason, the OS X linker does not honor the request to align the
; segment unless we do this. ; segment unless we do this.
align 16 align 32

9
simd/jidctfst-mmx.asm
View File

@@ -2,6 +2,7 @@
; jidctfst.asm - fast integer IDCT (MMX) ; jidctfst.asm - fast integer IDCT (MMX)
; ;
; Copyright 2009 Pierre Ossman <ossman@cendio.se> for Cendio AB ; Copyright 2009 Pierre Ossman <ossman@cendio.se> for Cendio AB
; Copyright (C) 2016, D. R. Commander.
; ;
; Based on the x86 SIMD extension for IJG JPEG library ; Based on the x86 SIMD extension for IJG JPEG library
; Copyright (C) 1999-2006, MIYASAKA Masaru. ; Copyright (C) 1999-2006, MIYASAKA Masaru.
@@ -57,7 +58,7 @@ F_1_613 equ (F_2_613 - (1 << CONST_BITS)) ; FIX(2.613125930) - FIX(1)
%define PRE_MULTIPLY_SCALE_BITS 2 %define PRE_MULTIPLY_SCALE_BITS 2
%define CONST_SHIFT (16 - PRE_MULTIPLY_SCALE_BITS - CONST_BITS) %define CONST_SHIFT (16 - PRE_MULTIPLY_SCALE_BITS - CONST_BITS)
alignz 16 alignz 32
global EXTN(jconst_idct_ifast_mmx) global EXTN(jconst_idct_ifast_mmx)
EXTN(jconst_idct_ifast_mmx): EXTN(jconst_idct_ifast_mmx):
@@ -68,7 +69,7 @@ PW_MF1613 times 4 dw -F_1_613 << CONST_SHIFT
PW_F1082 times 4 dw F_1_082 << CONST_SHIFT PW_F1082 times 4 dw F_1_082 << CONST_SHIFT
PB_CENTERJSAMP times 8 db CENTERJSAMPLE PB_CENTERJSAMP times 8 db CENTERJSAMPLE
alignz 16 alignz 32
; -------------------------------------------------------------------------- ; --------------------------------------------------------------------------
SECTION SEG_TEXT SECTION SEG_TEXT
@@ -92,7 +93,7 @@ PB_CENTERJSAMP times 8 db CENTERJSAMPLE
%define workspace wk(0)-DCTSIZE2*SIZEOF_JCOEF %define workspace wk(0)-DCTSIZE2*SIZEOF_JCOEF
; JCOEF workspace[DCTSIZE2] ; JCOEF workspace[DCTSIZE2]
align 16 align 32
global EXTN(jsimd_idct_ifast_mmx) global EXTN(jsimd_idct_ifast_mmx)
EXTN(jsimd_idct_ifast_mmx): EXTN(jsimd_idct_ifast_mmx):
@@ -496,4 +497,4 @@ EXTN(jsimd_idct_ifast_mmx):
; For some reason, the OS X linker does not honor the request to align the ; For some reason, the OS X linker does not honor the request to align the
; segment unless we do this. ; segment unless we do this.
align 16 align 32

9
simd/jidctfst-sse2.asm
View File

@@ -2,6 +2,7 @@
; jidctfst.asm - fast integer IDCT (SSE2) ; jidctfst.asm - fast integer IDCT (SSE2)
; ;
; Copyright 2009 Pierre Ossman <ossman@cendio.se> for Cendio AB ; Copyright 2009 Pierre Ossman <ossman@cendio.se> for Cendio AB
; Copyright (C) 2016, D. R. Commander.
; ;
; Based on the x86 SIMD extension for IJG JPEG library ; Based on the x86 SIMD extension for IJG JPEG library
; Copyright (C) 1999-2006, MIYASAKA Masaru. ; Copyright (C) 1999-2006, MIYASAKA Masaru.
@@ -57,7 +58,7 @@ F_1_613 equ (F_2_613 - (1 << CONST_BITS)) ; FIX(2.613125930) - FIX(1)
%define PRE_MULTIPLY_SCALE_BITS 2 %define PRE_MULTIPLY_SCALE_BITS 2
%define CONST_SHIFT (16 - PRE_MULTIPLY_SCALE_BITS - CONST_BITS) %define CONST_SHIFT (16 - PRE_MULTIPLY_SCALE_BITS - CONST_BITS)
alignz 16 alignz 32
global EXTN(jconst_idct_ifast_sse2) global EXTN(jconst_idct_ifast_sse2)
EXTN(jconst_idct_ifast_sse2): EXTN(jconst_idct_ifast_sse2):
@@ -68,7 +69,7 @@ PW_MF1613 times 8 dw -F_1_613 << CONST_SHIFT
PW_F1082 times 8 dw F_1_082 << CONST_SHIFT PW_F1082 times 8 dw F_1_082 << CONST_SHIFT
PB_CENTERJSAMP times 16 db CENTERJSAMPLE PB_CENTERJSAMP times 16 db CENTERJSAMPLE
alignz 16 alignz 32
; -------------------------------------------------------------------------- ; --------------------------------------------------------------------------
SECTION SEG_TEXT SECTION SEG_TEXT
@@ -90,7 +91,7 @@ PB_CENTERJSAMP times 16 db CENTERJSAMPLE
%define wk(i) ebp-(WK_NUM-(i))*SIZEOF_XMMWORD ; xmmword wk[WK_NUM] %define wk(i) ebp-(WK_NUM-(i))*SIZEOF_XMMWORD ; xmmword wk[WK_NUM]
%define WK_NUM 2 %define WK_NUM 2
align 16 align 32
global EXTN(jsimd_idct_ifast_sse2) global EXTN(jsimd_idct_ifast_sse2)
EXTN(jsimd_idct_ifast_sse2): EXTN(jsimd_idct_ifast_sse2):
@@ -498,4 +499,4 @@ EXTN(jsimd_idct_ifast_sse2):
; For some reason, the OS X linker does not honor the request to align the ; For some reason, the OS X linker does not honor the request to align the
; segment unless we do this. ; segment unless we do this.
align 16 align 32

9
simd/jidctint-mmx.asm
View File

@@ -2,6 +2,7 @@
; jidctint.asm - accurate integer IDCT (MMX) ; jidctint.asm - accurate integer IDCT (MMX)
; ;
; Copyright 2009 Pierre Ossman <ossman@cendio.se> for Cendio AB ; Copyright 2009 Pierre Ossman <ossman@cendio.se> for Cendio AB
; Copyright (C) 2016, D. R. Commander.
; ;
; Based on the x86 SIMD extension for IJG JPEG library ; Based on the x86 SIMD extension for IJG JPEG library
; Copyright (C) 1999-2006, MIYASAKA Masaru. ; Copyright (C) 1999-2006, MIYASAKA Masaru.
@@ -64,7 +65,7 @@ F_3_072 equ DESCALE(3299298341,30-CONST_BITS) ; FIX(3.072711026)
; -------------------------------------------------------------------------- ; --------------------------------------------------------------------------
SECTION SEG_CONST SECTION SEG_CONST
alignz 16 alignz 32
global EXTN(jconst_idct_islow_mmx) global EXTN(jconst_idct_islow_mmx)
EXTN(jconst_idct_islow_mmx): EXTN(jconst_idct_islow_mmx):
@@ -81,7 +82,7 @@ PD_DESCALE_P1 times 2 dd 1 << (DESCALE_P1-1)
PD_DESCALE_P2 times 2 dd 1 << (DESCALE_P2-1) PD_DESCALE_P2 times 2 dd 1 << (DESCALE_P2-1)
PB_CENTERJSAMP times 8 db CENTERJSAMPLE PB_CENTERJSAMP times 8 db CENTERJSAMPLE
alignz 16 alignz 32
; -------------------------------------------------------------------------- ; --------------------------------------------------------------------------
SECTION SEG_TEXT SECTION SEG_TEXT
@@ -105,7 +106,7 @@ PB_CENTERJSAMP times 8 db CENTERJSAMPLE
%define workspace wk(0)-DCTSIZE2*SIZEOF_JCOEF %define workspace wk(0)-DCTSIZE2*SIZEOF_JCOEF
; JCOEF workspace[DCTSIZE2] ; JCOEF workspace[DCTSIZE2]
align 16 align 32
global EXTN(jsimd_idct_islow_mmx) global EXTN(jsimd_idct_islow_mmx)
EXTN(jsimd_idct_islow_mmx): EXTN(jsimd_idct_islow_mmx):
@@ -848,4 +849,4 @@ EXTN(jsimd_idct_islow_mmx):
; For some reason, the OS X linker does not honor the request to align the ; For some reason, the OS X linker does not honor the request to align the
; segment unless we do this. ; segment unless we do this.
align 16 align 32

9
simd/jidctint-sse2.asm
View File

@@ -2,6 +2,7 @@
; jidctint.asm - accurate integer IDCT (SSE2) ; jidctint.asm - accurate integer IDCT (SSE2)
; ;
; Copyright 2009 Pierre Ossman <ossman@cendio.se> for Cendio AB ; Copyright 2009 Pierre Ossman <ossman@cendio.se> for Cendio AB
; Copyright (C) 2016, D. R. Commander.
; ;
; Based on the x86 SIMD extension for IJG JPEG library ; Based on the x86 SIMD extension for IJG JPEG library
; Copyright (C) 1999-2006, MIYASAKA Masaru. ; Copyright (C) 1999-2006, MIYASAKA Masaru.
@@ -64,7 +65,7 @@ F_3_072 equ DESCALE(3299298341, 30-CONST_BITS) ; FIX(3.072711026)
; -------------------------------------------------------------------------- ; --------------------------------------------------------------------------
SECTION SEG_CONST SECTION SEG_CONST
alignz 16 alignz 32
global EXTN(jconst_idct_islow_sse2) global EXTN(jconst_idct_islow_sse2)
EXTN(jconst_idct_islow_sse2): EXTN(jconst_idct_islow_sse2):
@@ -81,7 +82,7 @@ PD_DESCALE_P1 times 4 dd 1 << (DESCALE_P1-1)
PD_DESCALE_P2 times 4 dd 1 << (DESCALE_P2-1) PD_DESCALE_P2 times 4 dd 1 << (DESCALE_P2-1)
PB_CENTERJSAMP times 16 db CENTERJSAMPLE PB_CENTERJSAMP times 16 db CENTERJSAMPLE
alignz 16 alignz 32
; -------------------------------------------------------------------------- ; --------------------------------------------------------------------------
SECTION SEG_TEXT SECTION SEG_TEXT
@@ -103,7 +104,7 @@ PB_CENTERJSAMP times 16 db CENTERJSAMPLE
%define wk(i) ebp-(WK_NUM-(i))*SIZEOF_XMMWORD ; xmmword wk[WK_NUM] %define wk(i) ebp-(WK_NUM-(i))*SIZEOF_XMMWORD ; xmmword wk[WK_NUM]
%define WK_NUM 12 %define WK_NUM 12
align 16 align 32
global EXTN(jsimd_idct_islow_sse2) global EXTN(jsimd_idct_islow_sse2)
EXTN(jsimd_idct_islow_sse2): EXTN(jsimd_idct_islow_sse2):
@@ -855,4 +856,4 @@ EXTN(jsimd_idct_islow_sse2):
; For some reason, the OS X linker does not honor the request to align the ; For some reason, the OS X linker does not honor the request to align the
; segment unless we do this. ; segment unless we do this.
align 16 align 32

11
simd/jidctred-mmx.asm
View File

@@ -2,6 +2,7 @@
; jidctred.asm - reduced-size IDCT (MMX) ; jidctred.asm - reduced-size IDCT (MMX)
; ;
; Copyright 2009 Pierre Ossman <ossman@cendio.se> for Cendio AB ; Copyright 2009 Pierre Ossman <ossman@cendio.se> for Cendio AB
; Copyright (C) 2016, D. R. Commander.
; ;
; Based on the x86 SIMD extension for IJG JPEG library ; Based on the x86 SIMD extension for IJG JPEG library
; Copyright (C) 1999-2006, MIYASAKA Masaru. ; Copyright (C) 1999-2006, MIYASAKA Masaru.
@@ -70,7 +71,7 @@ F_3_624 equ DESCALE(3891787747,30-CONST_BITS) ; FIX(3.624509785)
; -------------------------------------------------------------------------- ; --------------------------------------------------------------------------
SECTION SEG_CONST SECTION SEG_CONST
alignz 16 alignz 32
global EXTN(jconst_idct_red_mmx) global EXTN(jconst_idct_red_mmx)
EXTN(jconst_idct_red_mmx): EXTN(jconst_idct_red_mmx):
@@ -88,7 +89,7 @@ PD_DESCALE_P1_2 times 2 dd 1 << (DESCALE_P1_2-1)
PD_DESCALE_P2_2 times 2 dd 1 << (DESCALE_P2_2-1) PD_DESCALE_P2_2 times 2 dd 1 << (DESCALE_P2_2-1)
PB_CENTERJSAMP times 8 db CENTERJSAMPLE PB_CENTERJSAMP times 8 db CENTERJSAMPLE
alignz 16 alignz 32
; -------------------------------------------------------------------------- ; --------------------------------------------------------------------------
SECTION SEG_TEXT SECTION SEG_TEXT
@@ -113,7 +114,7 @@ PB_CENTERJSAMP times 8 db CENTERJSAMPLE
%define workspace wk(0)-DCTSIZE2*SIZEOF_JCOEF %define workspace wk(0)-DCTSIZE2*SIZEOF_JCOEF
; JCOEF workspace[DCTSIZE2] ; JCOEF workspace[DCTSIZE2]
align 16 align 32
global EXTN(jsimd_idct_4x4_mmx) global EXTN(jsimd_idct_4x4_mmx)
EXTN(jsimd_idct_4x4_mmx): EXTN(jsimd_idct_4x4_mmx):
@@ -501,7 +502,7 @@ EXTN(jsimd_idct_4x4_mmx):
%define output_buf(b) (b)+16 ; JSAMPARRAY output_buf %define output_buf(b) (b)+16 ; JSAMPARRAY output_buf
%define output_col(b) (b)+20 ; JDIMENSION output_col %define output_col(b) (b)+20 ; JDIMENSION output_col
align 16 align 32
global EXTN(jsimd_idct_2x2_mmx) global EXTN(jsimd_idct_2x2_mmx)
EXTN(jsimd_idct_2x2_mmx): EXTN(jsimd_idct_2x2_mmx):
@@ -702,4 +703,4 @@ EXTN(jsimd_idct_2x2_mmx):
; For some reason, the OS X linker does not honor the request to align the ; For some reason, the OS X linker does not honor the request to align the
; segment unless we do this. ; segment unless we do this.
align 16 align 32

11
simd/jidctred-sse2.asm
View File

@@ -2,6 +2,7 @@
; jidctred.asm - reduced-size IDCT (SSE2) ; jidctred.asm - reduced-size IDCT (SSE2)
; ;
; Copyright 2009 Pierre Ossman <ossman@cendio.se> for Cendio AB ; Copyright 2009 Pierre Ossman <ossman@cendio.se> for Cendio AB
; Copyright (C) 2016, D. R. Commander.
; ;
; Based on the x86 SIMD extension for IJG JPEG library ; Based on the x86 SIMD extension for IJG JPEG library
; Copyright (C) 1999-2006, MIYASAKA Masaru. ; Copyright (C) 1999-2006, MIYASAKA Masaru.
@@ -70,7 +71,7 @@ F_3_624 equ DESCALE(3891787747, 30-CONST_BITS) ; FIX(3.624509785)
; -------------------------------------------------------------------------- ; --------------------------------------------------------------------------
SECTION SEG_CONST SECTION SEG_CONST
alignz 16 alignz 32
global EXTN(jconst_idct_red_sse2) global EXTN(jconst_idct_red_sse2)
EXTN(jconst_idct_red_sse2): EXTN(jconst_idct_red_sse2):
@@ -88,7 +89,7 @@ PD_DESCALE_P1_2 times 4 dd 1 << (DESCALE_P1_2-1)
PD_DESCALE_P2_2 times 4 dd 1 << (DESCALE_P2_2-1) PD_DESCALE_P2_2 times 4 dd 1 << (DESCALE_P2_2-1)
PB_CENTERJSAMP times 16 db CENTERJSAMPLE PB_CENTERJSAMP times 16 db CENTERJSAMPLE
alignz 16 alignz 32
; -------------------------------------------------------------------------- ; --------------------------------------------------------------------------
SECTION SEG_TEXT SECTION SEG_TEXT
@@ -111,7 +112,7 @@ PB_CENTERJSAMP times 16 db CENTERJSAMPLE
%define wk(i) ebp-(WK_NUM-(i))*SIZEOF_XMMWORD ; xmmword wk[WK_NUM] %define wk(i) ebp-(WK_NUM-(i))*SIZEOF_XMMWORD ; xmmword wk[WK_NUM]
%define WK_NUM 2 %define WK_NUM 2
align 16 align 32
global EXTN(jsimd_idct_4x4_sse2) global EXTN(jsimd_idct_4x4_sse2)
EXTN(jsimd_idct_4x4_sse2): EXTN(jsimd_idct_4x4_sse2):
@@ -422,7 +423,7 @@ EXTN(jsimd_idct_4x4_sse2):
%define output_buf(b) (b)+16 ; JSAMPARRAY output_buf %define output_buf(b) (b)+16 ; JSAMPARRAY output_buf
%define output_col(b) (b)+20 ; JDIMENSION output_col %define output_col(b) (b)+20 ; JDIMENSION output_col
align 16 align 32
global EXTN(jsimd_idct_2x2_sse2) global EXTN(jsimd_idct_2x2_sse2)
EXTN(jsimd_idct_2x2_sse2): EXTN(jsimd_idct_2x2_sse2):
@@ -590,4 +591,4 @@ EXTN(jsimd_idct_2x2_sse2):
; For some reason, the OS X linker does not honor the request to align the ; For some reason, the OS X linker does not honor the request to align the
; segment unless we do this. ; segment unless we do this.
align 16 align 32

7
simd/jquant-3dn.asm
View File

@@ -2,6 +2,7 @@
; jquant.asm - sample data conversion and quantization (3DNow! & MMX) ; jquant.asm - sample data conversion and quantization (3DNow! & MMX)
; ;
; Copyright 2009 Pierre Ossman <ossman@cendio.se> for Cendio AB ; Copyright 2009 Pierre Ossman <ossman@cendio.se> for Cendio AB
; Copyright (C) 2016, D. R. Commander.
; ;
; Based on the x86 SIMD extension for IJG JPEG library ; Based on the x86 SIMD extension for IJG JPEG library
; Copyright (C) 1999-2006, MIYASAKA Masaru. ; Copyright (C) 1999-2006, MIYASAKA Masaru.
@@ -33,7 +34,7 @@
%define start_col ebp+12 ; JDIMENSION start_col %define start_col ebp+12 ; JDIMENSION start_col
%define workspace ebp+16 ; FAST_FLOAT *workspace %define workspace ebp+16 ; FAST_FLOAT *workspace
align 16 align 32
global EXTN(jsimd_convsamp_float_3dnow) global EXTN(jsimd_convsamp_float_3dnow)
EXTN(jsimd_convsamp_float_3dnow): EXTN(jsimd_convsamp_float_3dnow):
@@ -136,7 +137,7 @@ EXTN(jsimd_convsamp_float_3dnow):
%define divisors ebp+12 ; FAST_FLOAT *divisors %define divisors ebp+12 ; FAST_FLOAT *divisors
%define workspace ebp+16 ; FAST_FLOAT *workspace %define workspace ebp+16 ; FAST_FLOAT *workspace
align 16 align 32
global EXTN(jsimd_quantize_float_3dnow) global EXTN(jsimd_quantize_float_3dnow)
EXTN(jsimd_quantize_float_3dnow): EXTN(jsimd_quantize_float_3dnow):
@@ -229,4 +230,4 @@ EXTN(jsimd_quantize_float_3dnow):
; For some reason, the OS X linker does not honor the request to align the ; For some reason, the OS X linker does not honor the request to align the
; segment unless we do this. ; segment unless we do this.
align 16 align 32

7
simd/jquant-mmx.asm
View File

@@ -2,6 +2,7 @@
; jquant.asm - sample data conversion and quantization (MMX) ; jquant.asm - sample data conversion and quantization (MMX)
; ;
; Copyright 2009 Pierre Ossman <ossman@cendio.se> for Cendio AB ; Copyright 2009 Pierre Ossman <ossman@cendio.se> for Cendio AB
; Copyright (C) 2016, D. R. Commander.
; ;
; Based on the x86 SIMD extension for IJG JPEG library ; Based on the x86 SIMD extension for IJG JPEG library
; Copyright (C) 1999-2006, MIYASAKA Masaru. ; Copyright (C) 1999-2006, MIYASAKA Masaru.
@@ -33,7 +34,7 @@
%define start_col ebp+12 ; JDIMENSION start_col %define start_col ebp+12 ; JDIMENSION start_col
%define workspace ebp+16 ; DCTELEM *workspace %define workspace ebp+16 ; DCTELEM *workspace
align 16 align 32
global EXTN(jsimd_convsamp_mmx) global EXTN(jsimd_convsamp_mmx)
EXTN(jsimd_convsamp_mmx): EXTN(jsimd_convsamp_mmx):
@@ -138,7 +139,7 @@ EXTN(jsimd_convsamp_mmx):
%define divisors ebp+12 ; DCTELEM *divisors %define divisors ebp+12 ; DCTELEM *divisors
%define workspace ebp+16 ; DCTELEM *workspace %define workspace ebp+16 ; DCTELEM *workspace
align 16 align 32
global EXTN(jsimd_quantize_mmx) global EXTN(jsimd_quantize_mmx)
EXTN(jsimd_quantize_mmx): EXTN(jsimd_quantize_mmx):
@@ -270,4 +271,4 @@ EXTN(jsimd_quantize_mmx):
; For some reason, the OS X linker does not honor the request to align the ; For some reason, the OS X linker does not honor the request to align the
; segment unless we do this. ; segment unless we do this.
align 16 align 32

7
simd/jquant-sse.asm
View File

@@ -2,6 +2,7 @@
; jquant.asm - sample data conversion and quantization (SSE & MMX) ; jquant.asm - sample data conversion and quantization (SSE & MMX)
; ;
; Copyright 2009 Pierre Ossman <ossman@cendio.se> for Cendio AB ; Copyright 2009 Pierre Ossman <ossman@cendio.se> for Cendio AB
; Copyright (C) 2016, D. R. Commander.
; ;
; Based on the x86 SIMD extension for IJG JPEG library ; Based on the x86 SIMD extension for IJG JPEG library
; Copyright (C) 1999-2006, MIYASAKA Masaru. ; Copyright (C) 1999-2006, MIYASAKA Masaru.
@@ -33,7 +34,7 @@
%define start_col ebp+12 ; JDIMENSION start_col %define start_col ebp+12 ; JDIMENSION start_col
%define workspace ebp+16 ; FAST_FLOAT *workspace %define workspace ebp+16 ; FAST_FLOAT *workspace
align 16 align 32
global EXTN(jsimd_convsamp_float_sse) global EXTN(jsimd_convsamp_float_sse)
EXTN(jsimd_convsamp_float_sse): EXTN(jsimd_convsamp_float_sse):
@@ -136,7 +137,7 @@ EXTN(jsimd_convsamp_float_sse):
%define divisors ebp+12 ; FAST_FLOAT *divisors %define divisors ebp+12 ; FAST_FLOAT *divisors
%define workspace ebp+16 ; FAST_FLOAT *workspace %define workspace ebp+16 ; FAST_FLOAT *workspace
align 16 align 32
global EXTN(jsimd_quantize_float_sse) global EXTN(jsimd_quantize_float_sse)
EXTN(jsimd_quantize_float_sse): EXTN(jsimd_quantize_float_sse):
@@ -207,4 +208,4 @@ EXTN(jsimd_quantize_float_sse):
; For some reason, the OS X linker does not honor the request to align the ; For some reason, the OS X linker does not honor the request to align the
; segment unless we do this. ; segment unless we do this.
align 16 align 32

7
simd/jquantf-sse2.asm
View File

@@ -2,6 +2,7 @@
; jquantf.asm - sample data conversion and quantization (SSE & SSE2) ; jquantf.asm - sample data conversion and quantization (SSE & SSE2)
; ;
; Copyright 2009 Pierre Ossman <ossman@cendio.se> for Cendio AB ; Copyright 2009 Pierre Ossman <ossman@cendio.se> for Cendio AB
; Copyright (C) 2016, D. R. Commander.
; ;
; Based on the x86 SIMD extension for IJG JPEG library ; Based on the x86 SIMD extension for IJG JPEG library
; Copyright (C) 1999-2006, MIYASAKA Masaru. ; Copyright (C) 1999-2006, MIYASAKA Masaru.
@@ -33,7 +34,7 @@
%define start_col ebp+12 ; JDIMENSION start_col %define start_col ebp+12 ; JDIMENSION start_col
%define workspace ebp+16 ; FAST_FLOAT *workspace %define workspace ebp+16 ; FAST_FLOAT *workspace
align 16 align 32
global EXTN(jsimd_convsamp_float_sse2) global EXTN(jsimd_convsamp_float_sse2)
EXTN(jsimd_convsamp_float_sse2): EXTN(jsimd_convsamp_float_sse2):
@@ -113,7 +114,7 @@ EXTN(jsimd_convsamp_float_sse2):
%define divisors ebp+12 ; FAST_FLOAT *divisors %define divisors ebp+12 ; FAST_FLOAT *divisors
%define workspace ebp+16 ; FAST_FLOAT *workspace %define workspace ebp+16 ; FAST_FLOAT *workspace
align 16 align 32
global EXTN(jsimd_quantize_float_sse2) global EXTN(jsimd_quantize_float_sse2)
EXTN(jsimd_quantize_float_sse2): EXTN(jsimd_quantize_float_sse2):
@@ -167,4 +168,4 @@ EXTN(jsimd_quantize_float_sse2):
; For some reason, the OS X linker does not honor the request to align the ; For some reason, the OS X linker does not honor the request to align the
; segment unless we do this. ; segment unless we do this.
align 16 align 32

7
simd/jquanti-sse2.asm
View File

@@ -2,6 +2,7 @@
; jquanti.asm - sample data conversion and quantization (SSE2) ; jquanti.asm - sample data conversion and quantization (SSE2)
; ;
; Copyright 2009 Pierre Ossman <ossman@cendio.se> for Cendio AB ; Copyright 2009 Pierre Ossman <ossman@cendio.se> for Cendio AB
; Copyright (C) 2016, D. R. Commander.
; ;
; Based on the x86 SIMD extension for IJG JPEG library ; Based on the x86 SIMD extension for IJG JPEG library
; Copyright (C) 1999-2006, MIYASAKA Masaru. ; Copyright (C) 1999-2006, MIYASAKA Masaru.
@@ -33,7 +34,7 @@
%define start_col ebp+12 ; JDIMENSION start_col %define start_col ebp+12 ; JDIMENSION start_col
%define workspace ebp+16 ; DCTELEM *workspace %define workspace ebp+16 ; DCTELEM *workspace
align 16 align 32
global EXTN(jsimd_convsamp_sse2) global EXTN(jsimd_convsamp_sse2)
EXTN(jsimd_convsamp_sse2): EXTN(jsimd_convsamp_sse2):
@@ -115,7 +116,7 @@ EXTN(jsimd_convsamp_sse2):
%define divisors ebp+12 ; DCTELEM *divisors %define divisors ebp+12 ; DCTELEM *divisors
%define workspace ebp+16 ; DCTELEM *workspace %define workspace ebp+16 ; DCTELEM *workspace
align 16 align 32
global EXTN(jsimd_quantize_sse2) global EXTN(jsimd_quantize_sse2)
EXTN(jsimd_quantize_sse2): EXTN(jsimd_quantize_sse2):
@@ -196,4 +197,4 @@ EXTN(jsimd_quantize_sse2):
; For some reason, the OS X linker does not honor the request to align the ; For some reason, the OS X linker does not honor the request to align the
; segment unless we do this. ; segment unless we do this.
align 16 align 32

3
simd/jsimd_i386.c
View File

@@ -61,6 +61,9 @@ init_simd (void)
env = getenv("JSIMD_FORCESSE2"); env = getenv("JSIMD_FORCESSE2");
if ((env != NULL) && (strcmp(env, "1") == 0)) if ((env != NULL) && (strcmp(env, "1") == 0))
simd_support &= JSIMD_SSE2; simd_support &= JSIMD_SSE2;
env = getenv("JSIMD_FORCEAVX2");
if ((env != NULL) && (strcmp(env, "1") == 0))
simd_support &= JSIMD_AVX2;
env = getenv("JSIMD_FORCENONE"); env = getenv("JSIMD_FORCENONE");
if ((env != NULL) && (strcmp(env, "1") == 0)) if ((env != NULL) && (strcmp(env, "1") == 0))
simd_support = 0; simd_support = 0;

4
simd/jsimdcpu.asm
View File

@@ -28,7 +28,7 @@
; jpeg_simd_cpu_support (void) ; jpeg_simd_cpu_support (void)
; ;
align 16 align 32
global EXTN(jpeg_simd_cpu_support) global EXTN(jpeg_simd_cpu_support)
EXTN(jpeg_simd_cpu_support): EXTN(jpeg_simd_cpu_support):
@@ -112,4 +112,4 @@ EXTN(jpeg_simd_cpu_support):
; For some reason, the OS X linker does not honor the request to align the ; For some reason, the OS X linker does not honor the request to align the
; segment unless we do this. ; segment unless we do this.
align 16 align 32

6
simd/jsimdext.inc
View File

@@ -64,8 +64,8 @@
; -- segment definition -- ; -- segment definition --
; ;
%define SEG_TEXT _text align=16 public use32 class=CODE %define SEG_TEXT _text align=32 public use32 class=CODE
%define SEG_CONST _data align=16 public use32 class=DATA %define SEG_CONST _data align=32 public use32 class=DATA
%elifdef ELF ; ----(nasm -felf[64] -DELF ...)------------ %elifdef ELF ; ----(nasm -felf[64] -DELF ...)------------
; * Linux ; * Linux
@@ -108,7 +108,7 @@ section .note.GNU-stack noalloc noexec nowrite progbits
; -- segment definition -- ; -- segment definition --
; ;
%define SEG_TEXT .text ;align=32 ; nasm doesn't accept align=16. why? %define SEG_TEXT .text ;align=32 ; nasm doesn't accept align=32. why?
%define SEG_CONST .rodata align=32 %define SEG_CONST .rodata align=32
; The generation of position-independent code (PIC) is the default on Darwin. ; The generation of position-independent code (PIC) is the default on Darwin.

22
turbojpeg.c
View File

@@ -926,29 +926,29 @@ DLLEXPORT int DLLCALL tjEncodeYUVPlanes(tjhandle handle,
compptr=&cinfo->comp_info[i]; compptr=&cinfo->comp_info[i];
_tmpbuf[i]=(JSAMPLE *)malloc( _tmpbuf[i]=(JSAMPLE *)malloc(
PAD((compptr->width_in_blocks*cinfo->max_h_samp_factor*DCTSIZE) PAD((compptr->width_in_blocks*cinfo->max_h_samp_factor*DCTSIZE)
/compptr->h_samp_factor, 16) * cinfo->max_v_samp_factor + 16); /compptr->h_samp_factor, 32) * cinfo->max_v_samp_factor + 32);
if(!_tmpbuf[i]) _throw("tjEncodeYUVPlanes(): Memory allocation failure"); if(!_tmpbuf[i]) _throw("tjEncodeYUVPlanes(): Memory allocation failure");
tmpbuf[i]=(JSAMPROW *)malloc(sizeof(JSAMPROW)*cinfo->max_v_samp_factor); tmpbuf[i]=(JSAMPROW *)malloc(sizeof(JSAMPROW)*cinfo->max_v_samp_factor);
if(!tmpbuf[i]) _throw("tjEncodeYUVPlanes(): Memory allocation failure"); if(!tmpbuf[i]) _throw("tjEncodeYUVPlanes(): Memory allocation failure");
for(row=0; row<cinfo->max_v_samp_factor; row++) for(row=0; row<cinfo->max_v_samp_factor; row++)
{ {
unsigned char *_tmpbuf_aligned= unsigned char *_tmpbuf_aligned=
(unsigned char *)PAD((size_t)_tmpbuf[i], 16); (unsigned char *)PAD((size_t)_tmpbuf[i], 32);
tmpbuf[i][row]=&_tmpbuf_aligned[ tmpbuf[i][row]=&_tmpbuf_aligned[
PAD((compptr->width_in_blocks*cinfo->max_h_samp_factor*DCTSIZE) PAD((compptr->width_in_blocks*cinfo->max_h_samp_factor*DCTSIZE)
/compptr->h_samp_factor, 16) * row]; /compptr->h_samp_factor, 32) * row];
} }
_tmpbuf2[i]=(JSAMPLE *)malloc(PAD(compptr->width_in_blocks*DCTSIZE, 16) _tmpbuf2[i]=(JSAMPLE *)malloc(PAD(compptr->width_in_blocks*DCTSIZE, 32)
* compptr->v_samp_factor + 16); * compptr->v_samp_factor + 32);
if(!_tmpbuf2[i]) _throw("tjEncodeYUVPlanes(): Memory allocation failure"); if(!_tmpbuf2[i]) _throw("tjEncodeYUVPlanes(): Memory allocation failure");
tmpbuf2[i]=(JSAMPROW *)malloc(sizeof(JSAMPROW)*compptr->v_samp_factor); tmpbuf2[i]=(JSAMPROW *)malloc(sizeof(JSAMPROW)*compptr->v_samp_factor);
if(!tmpbuf2[i]) _throw("tjEncodeYUVPlanes(): Memory allocation failure"); if(!tmpbuf2[i]) _throw("tjEncodeYUVPlanes(): Memory allocation failure");
for(row=0; row<compptr->v_samp_factor; row++) for(row=0; row<compptr->v_samp_factor; row++)
{ {
unsigned char *_tmpbuf2_aligned= unsigned char *_tmpbuf2_aligned=
(unsigned char *)PAD((size_t)_tmpbuf2[i], 16); (unsigned char *)PAD((size_t)_tmpbuf2[i], 32);
tmpbuf2[i][row]=&_tmpbuf2_aligned[ tmpbuf2[i][row]=&_tmpbuf2_aligned[
PAD(compptr->width_in_blocks*DCTSIZE, 16) * row]; PAD(compptr->width_in_blocks*DCTSIZE, 32) * row];
} }
pw[i]=pw0*compptr->h_samp_factor/cinfo->max_h_samp_factor; pw[i]=pw0*compptr->h_samp_factor/cinfo->max_h_samp_factor;
ph[i]=ph0*compptr->v_samp_factor/cinfo->max_v_samp_factor; ph[i]=ph0*compptr->v_samp_factor/cinfo->max_v_samp_factor;
@@ -1611,17 +1611,17 @@ DLLEXPORT int DLLCALL tjDecodeYUVPlanes(tjhandle handle,
for(i=0; i<dinfo->num_components; i++) for(i=0; i<dinfo->num_components; i++)
{ {
compptr=&dinfo->comp_info[i]; compptr=&dinfo->comp_info[i];
_tmpbuf[i]=(JSAMPLE *)malloc(PAD(compptr->width_in_blocks*DCTSIZE, 16) _tmpbuf[i]=(JSAMPLE *)malloc(PAD(compptr->width_in_blocks*DCTSIZE, 32)
* compptr->v_samp_factor + 16); * compptr->v_samp_factor + 32);
if(!_tmpbuf[i]) _throw("tjDecodeYUVPlanes(): Memory allocation failure"); if(!_tmpbuf[i]) _throw("tjDecodeYUVPlanes(): Memory allocation failure");
tmpbuf[i]=(JSAMPROW *)malloc(sizeof(JSAMPROW)*compptr->v_samp_factor); tmpbuf[i]=(JSAMPROW *)malloc(sizeof(JSAMPROW)*compptr->v_samp_factor);
if(!tmpbuf[i]) _throw("tjDecodeYUVPlanes(): Memory allocation failure"); if(!tmpbuf[i]) _throw("tjDecodeYUVPlanes(): Memory allocation failure");
for(row=0; row<compptr->v_samp_factor; row++) for(row=0; row<compptr->v_samp_factor; row++)
{ {
unsigned char *_tmpbuf_aligned= unsigned char *_tmpbuf_aligned=
(unsigned char *)PAD((size_t)_tmpbuf[i], 16); (unsigned char *)PAD((size_t)_tmpbuf[i], 32);
tmpbuf[i][row]=&_tmpbuf_aligned[ tmpbuf[i][row]=&_tmpbuf_aligned[
PAD(compptr->width_in_blocks*DCTSIZE, 16) * row]; PAD(compptr->width_in_blocks*DCTSIZE, 32) * row];
} }
pw[i]=pw0*compptr->h_samp_factor/dinfo->max_h_samp_factor; pw[i]=pw0*compptr->h_samp_factor/dinfo->max_h_samp_factor;
ph[i]=ph0*compptr->v_samp_factor/dinfo->max_v_samp_factor; ph[i]=ph0*compptr->v_samp_factor/dinfo->max_v_samp_factor;