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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: third_party/libjpeg_turbo/google.patch

Issue 7554002: Updates libjpeg-turbo to 1.1.90 (r677) (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/deps/
Patch Set: '' Created 9 years, 5 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
« no previous file with comments | « third_party/libjpeg_turbo/example.c ('k') | third_party/libjpeg_turbo/jaricom.c » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: third_party/libjpeg_turbo/google.patch
===================================================================
--- third_party/libjpeg_turbo/google.patch (revision 95020)
+++ third_party/libjpeg_turbo/google.patch (working copy)
@@ -1,39 +1,167 @@
-Index: jmorecfg.h
+Index: jdmarker.c
===================================================================
---- jmorecfg.h (revision 64575)
-+++ jmorecfg.h (working copy)
-@@ -159,8 +159,10 @@
- /* INT32 must hold at least signed 32-bit values. */
+--- jdmarker.c (revision 677)
++++ jdmarker.c (working copy)
+@@ -940,7 +940,144 @@
+ return TRUE;
+ }
- #ifndef XMD_H /* X11/xmd.h correctly defines INT32 */
-+#ifndef _BASETSD_H_ /* basetsd.h correctly defines INT32 */
- typedef long INT32;
- #endif
-+#endif
++#ifdef MOTION_JPEG_SUPPORTED
- /* Datatype used for image dimensions. The JPEG standard only supports
- * images up to 64K*64K due to 16-bit fields in SOF markers. Therefore
-@@ -210,11 +212,13 @@
- * explicit coding is needed; see uses of the NEED_FAR_POINTERS symbol.
- */
++/* The default Huffman tables used by motion JPEG frames. When a motion JPEG
++ * frame does not have DHT tables, we should use the huffman tables suggested by
++ * the JPEG standard. Each of these tables represents a member of the JHUFF_TBLS
++ * struct so we can just copy it to the according JHUFF_TBLS member.
++ */
++/* DC table 0 */
++LOCAL(const unsigned char) mjpg_dc0_bits[] = {
++ 0x00, 0x01, 0x05, 0x01, 0x01, 0x01, 0x01, 0x01,
++ 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
++};
++
++LOCAL(const unsigned char) mjpg_dc0_huffval[] = {
++ 0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07,
++ 0x08, 0x09, 0x0A, 0x0B
++};
++
++/* DC table 1 */
++LOCAL(const unsigned char) mjpg_dc1_bits[] = {
++ 0x00, 0x03, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01,
++ 0x01, 0x01, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00
++};
++
++LOCAL(const unsigned char) mjpg_dc1_huffval[] = {
++ 0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07,
++ 0x08, 0x09, 0x0A, 0x0B
++};
++
++/* AC table 0 */
++LOCAL(const unsigned char) mjpg_ac0_bits[] = {
++ 0x00, 0x02, 0x01, 0x03, 0x03, 0x02, 0x04, 0x03,
++ 0x05, 0x05, 0x04, 0x04, 0x00, 0x00, 0x01, 0x7D
++};
++
++LOCAL(const unsigned char) mjpg_ac0_huffval[] = {
++ 0x01, 0x02, 0x03, 0x00, 0x04, 0x11, 0x05, 0x12,
++ 0x21, 0x31, 0x41, 0x06, 0x13, 0x51, 0x61, 0x07,
++ 0x22, 0x71, 0x14, 0x32, 0x81, 0x91, 0xA1, 0x08,
++ 0x23, 0x42, 0xB1, 0xC1, 0x15, 0x52, 0xD1, 0xF0,
++ 0x24, 0x33, 0x62, 0x72, 0x82, 0x09, 0x0A, 0x16,
++ 0x17, 0x18, 0x19, 0x1A, 0x25, 0x26, 0x27, 0x28,
++ 0x29, 0x2A, 0x34, 0x35, 0x36, 0x37, 0x38, 0x39,
++ 0x3A, 0x43, 0x44, 0x45, 0x46, 0x47, 0x48, 0x49,
++ 0x4A, 0x53, 0x54, 0x55, 0x56, 0x57, 0x58, 0x59,
++ 0x5A, 0x63, 0x64, 0x65, 0x66, 0x67, 0x68, 0x69,
++ 0x6A, 0x73, 0x74, 0x75, 0x76, 0x77, 0x78, 0x79,
++ 0x7A, 0x83, 0x84, 0x85, 0x86, 0x87, 0x88, 0x89,
++ 0x8A, 0x92, 0x93, 0x94, 0x95, 0x96, 0x97, 0x98,
++ 0x99, 0x9A, 0xA2, 0xA3, 0xA4, 0xA5, 0xA6, 0xA7,
++ 0xA8, 0xA9, 0xAA, 0xB2, 0xB3, 0xB4, 0xB5, 0xB6,
++ 0xB7, 0xB8, 0xB9, 0xBA, 0xC2, 0xC3, 0xC4, 0xC5,
++ 0xC6, 0xC7, 0xC8, 0xC9, 0xCA, 0xD2, 0xD3, 0xD4,
++ 0xD5, 0xD6, 0xD7, 0xD8, 0xD9, 0xDA, 0xE1, 0xE2,
++ 0xE3, 0xE4, 0xE5, 0xE6, 0xE7, 0xE8, 0xE9, 0xEA,
++ 0xF1, 0xF2, 0xF3, 0xF4, 0xF5, 0xF6, 0xF7, 0xF8,
++ 0xF9, 0xFA
++};
++
++/* AC table 1 */
++LOCAL(const unsigned char) mjpg_ac1_bits[] = {
++ 0x00, 0x02, 0x01, 0x02, 0x04, 0x04, 0x03, 0x04,
++ 0x07, 0x05, 0x04, 0x04, 0x00, 0x01, 0x02, 0x77
++};
++
++LOCAL(const unsigned char) mjpg_ac1_huffval[] = {
++ 0x00, 0x01, 0x02, 0x03, 0x11, 0x04, 0x05, 0x21,
++ 0x31, 0x06, 0x12, 0x41, 0x51, 0x07, 0x61, 0x71,
++ 0x13, 0x22, 0x32, 0x81, 0x08, 0x14, 0x42, 0x91,
++ 0xA1, 0xB1, 0xC1, 0x09, 0x23, 0x33, 0x52, 0xF0,
++ 0x15, 0x62, 0x72, 0xD1, 0x0A, 0x16, 0x24, 0x34,
++ 0xE1, 0x25, 0xF1, 0x17, 0x18, 0x19, 0x1A, 0x26,
++ 0x27, 0x28, 0x29, 0x2A, 0x35, 0x36, 0x37, 0x38,
++ 0x39, 0x3A, 0x43, 0x44, 0x45, 0x46, 0x47, 0x48,
++ 0x49, 0x4A, 0x53, 0x54, 0x55, 0x56, 0x57, 0x58,
++ 0x59, 0x5A, 0x63, 0x64, 0x65, 0x66, 0x67, 0x68,
++ 0x69, 0x6A, 0x73, 0x74, 0x75, 0x76, 0x77, 0x78,
++ 0x79, 0x7A, 0x82, 0x83, 0x84, 0x85, 0x86, 0x87,
++ 0x88, 0x89, 0x8A, 0x92, 0x93, 0x94, 0x95, 0x96,
++ 0x97, 0x98, 0x99, 0x9A, 0xA2, 0xA3, 0xA4, 0xA5,
++ 0xA6, 0xA7, 0xA8, 0xA9, 0xAA, 0xB2, 0xB3, 0xB4,
++ 0xB5, 0xB6, 0xB7, 0xB8, 0xB9, 0xBA, 0xC2, 0xC3,
++ 0xC4, 0xC5, 0xC6, 0xC7, 0xC8, 0xC9, 0xCA, 0xD2,
++ 0xD3, 0xD4, 0xD5, 0xD6, 0xD7, 0xD8, 0xD9, 0xDA,
++ 0xE2, 0xE3, 0xE4, 0xE5, 0xE6, 0xE7, 0xE8, 0xE9,
++ 0xEA, 0xF2, 0xF3, 0xF4, 0xF5, 0xF6, 0xF7, 0xF8,
++ 0xF9, 0xFA
++};
++
++/* Loads the default Huffman tables used by motion JPEG frames. This function
++ * just copies the huffman tables suggested in the JPEG standard when we have
++ * not load them.
++ */
++LOCAL(void)
++mjpg_load_huff_tables (j_decompress_ptr cinfo)
++{
++ JHUFF_TBL *htblptr;
++
++ if (! cinfo->dc_huff_tbl_ptrs[0]) {
++ htblptr = jpeg_alloc_huff_table((j_common_ptr) cinfo);
++ MEMZERO(htblptr, SIZEOF(JHUFF_TBL));
++ MEMCOPY(&htblptr->bits[1], mjpg_dc0_bits, SIZEOF(mjpg_dc0_bits));
++ MEMCOPY(&htblptr->huffval[0], mjpg_dc0_huffval, SIZEOF(mjpg_dc0_huffval));
++ cinfo->dc_huff_tbl_ptrs[0] = htblptr;
++ }
++
++ if (! cinfo->dc_huff_tbl_ptrs[1]) {
++ htblptr = jpeg_alloc_huff_table((j_common_ptr) cinfo);
++ MEMZERO(htblptr, SIZEOF(JHUFF_TBL));
++ MEMCOPY(&htblptr->bits[1], mjpg_dc1_bits, SIZEOF(mjpg_dc1_bits));
++ MEMCOPY(&htblptr->huffval[0], mjpg_dc1_huffval, SIZEOF(mjpg_dc1_huffval));
++ cinfo->dc_huff_tbl_ptrs[1] = htblptr;
++ }
++
++ if (! cinfo->ac_huff_tbl_ptrs[0]) {
++ htblptr = jpeg_alloc_huff_table((j_common_ptr) cinfo);
++ MEMZERO(htblptr, SIZEOF(JHUFF_TBL));
++ MEMCOPY(&htblptr->bits[1], mjpg_ac0_bits, SIZEOF(mjpg_ac0_bits));
++ MEMCOPY(&htblptr->huffval[0], mjpg_ac0_huffval, SIZEOF(mjpg_ac0_huffval));
++ cinfo->ac_huff_tbl_ptrs[0] = htblptr;
++ }
++
++ if (! cinfo->ac_huff_tbl_ptrs[1]) {
++ htblptr = jpeg_alloc_huff_table((j_common_ptr) cinfo);
++ MEMZERO(htblptr, SIZEOF(JHUFF_TBL));
++ MEMCOPY(&htblptr->bits[1], mjpg_ac1_bits, SIZEOF(mjpg_ac1_bits));
++ MEMCOPY(&htblptr->huffval[0], mjpg_ac1_huffval, SIZEOF(mjpg_ac1_huffval));
++ cinfo->ac_huff_tbl_ptrs[1] = htblptr;
++ }
++}
++
++#else
++
++#define mjpg_load_huff_tables(cinfo)
++
++#endif /* MOTION_JPEG_SUPPORTED */
++
++
+ /*
+ * Read markers until SOS or EOI.
+ *
+@@ -1009,6 +1146,7 @@
+ break;
-+#ifndef FAR
- #ifdef NEED_FAR_POINTERS
- #define FAR far
- #else
- #define FAR
- #endif
-+#endif
-
-
- /*
+ case M_SOS:
++ mjpg_load_huff_tables(cinfo);
+ if (! get_sos(cinfo))
+ return JPEG_SUSPENDED;
+ cinfo->unread_marker = 0; /* processed the marker */
Index: jpeglib.h
===================================================================
---- jpeglib.h (revision 64575)
+--- jpeglib.h (revision 677)
+++ jpeglib.h (working copy)
-@@ -18,6 +18,10 @@
- extern "C" {
- #endif
+@@ -15,6 +15,10 @@
+ #ifndef JPEGLIB_H
+ #define JPEGLIB_H
+/* Begin chromium edits */
+#include "jpeglibmangler.h"
@@ -45,7 +173,7 @@
Index: jpeglibmangler.h
===================================================================
--- jpeglibmangler.h (revision 0)
-+++ jpeglibmangler.h (revision 78340)
++++ jpeglibmangler.h (revision 0)
@@ -0,0 +1,113 @@
+// Copyright (c) 2009 The Chromium Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
@@ -160,87 +288,22 @@
+#define jpeg_mem_term chromium_jpeg_mem_term
+
+#endif // THIRD_PARTY_LIBJPEG_TURBO_JPEGLIBMANGLER_H_
-Index: jdhuff.c
+Index: simd/jcgrass2-64.asm
===================================================================
---- jdhuff.c (revision 64575)
-+++ jdhuff.c (working copy)
-@@ -658,7 +658,7 @@
- symbol |= GET_BITS(1); \
- size++; \
- } \
-- symbol = htbl->pub->huffval[ (int) (symbol + htbl->valoffset[size]) ]; \
-+ symbol = htbl->pub->huffval[ (int) (symbol + htbl->valoffset[size]) & 0xFF ]; \
- } \
- }
-Index: simd/jcqntmmx.asm
-===================================================================
---- simd/jcqntmmx.asm (revision 64575)
-+++ simd/jcqntmmx.asm (working copy)
-@@ -35,7 +35,7 @@
- %define workspace ebp+16 ; DCTELEM * workspace
+--- simd/jcgrass2-64.asm (revision 677)
++++ simd/jcgrass2-64.asm (working copy)
+@@ -30,7 +30,7 @@
+ SECTION SEG_CONST
- align 16
-- global EXTN(jsimd_convsamp_mmx)
-+ global EXTN(jsimd_convsamp_mmx) PRIVATE
-
- EXTN(jsimd_convsamp_mmx):
- push ebp
-@@ -140,7 +140,7 @@
- %define workspace ebp+16 ; DCTELEM * workspace
-
- align 16
-- global EXTN(jsimd_quantize_mmx)
-+ global EXTN(jsimd_quantize_mmx) PRIVATE
-
- EXTN(jsimd_quantize_mmx):
- push ebp
-Index: simd/jimmxfst.asm
-===================================================================
---- simd/jimmxfst.asm (revision 64575)
-+++ simd/jimmxfst.asm (working copy)
-@@ -59,7 +59,7 @@
- %define CONST_SHIFT (16 - PRE_MULTIPLY_SCALE_BITS - CONST_BITS)
-
alignz 16
-- global EXTN(jconst_idct_ifast_mmx)
-+ global EXTN(jconst_idct_ifast_mmx) PRIVATE
+- global EXTN(jconst_rgb_gray_convert_sse2)
++ global EXTN(jconst_rgb_gray_convert_sse2) PRIVATE
- EXTN(jconst_idct_ifast_mmx):
+ EXTN(jconst_rgb_gray_convert_sse2):
-@@ -94,7 +94,7 @@
- ; JCOEF workspace[DCTSIZE2]
-
- align 16
-- global EXTN(jsimd_idct_ifast_mmx)
-+ global EXTN(jsimd_idct_ifast_mmx) PRIVATE
-
- EXTN(jsimd_idct_ifast_mmx):
- push ebp
-Index: simd/jfss2fst.asm
-===================================================================
---- simd/jfss2fst.asm (revision 64575)
-+++ simd/jfss2fst.asm (working copy)
-@@ -52,7 +52,7 @@
- %define CONST_SHIFT (16 - PRE_MULTIPLY_SCALE_BITS - CONST_BITS)
-
- alignz 16
-- global EXTN(jconst_fdct_ifast_sse2)
-+ global EXTN(jconst_fdct_ifast_sse2) PRIVATE
-
- EXTN(jconst_fdct_ifast_sse2):
-
-@@ -80,7 +80,7 @@
- %define WK_NUM 2
-
- align 16
-- global EXTN(jsimd_fdct_ifast_sse2)
-+ global EXTN(jsimd_fdct_ifast_sse2) PRIVATE
-
- EXTN(jsimd_fdct_ifast_sse2):
- push ebp
Index: simd/jiss2fst.asm
===================================================================
---- simd/jiss2fst.asm (revision 64575)
+--- simd/jiss2fst.asm (revision 677)
+++ simd/jiss2fst.asm (working copy)
@@ -59,7 +59,7 @@
%define CONST_SHIFT (16 - PRE_MULTIPLY_SCALE_BITS - CONST_BITS)
@@ -260,60 +323,12 @@
EXTN(jsimd_idct_ifast_sse2):
push ebp
-Index: simd/jdcolss2-64.asm
-===================================================================
---- simd/jdcolss2-64.asm (revision 64575)
-+++ simd/jdcolss2-64.asm (working copy)
-@@ -35,7 +35,7 @@
- SECTION SEG_CONST
-
- alignz 16
-- global EXTN(jconst_ycc_rgb_convert_sse2)
-+ global EXTN(jconst_ycc_rgb_convert_sse2) PRIVATE
-
- EXTN(jconst_ycc_rgb_convert_sse2):
-
-Index: simd/jf3dnflt.asm
-===================================================================
---- simd/jf3dnflt.asm (revision 64575)
-+++ simd/jf3dnflt.asm (working copy)
-@@ -27,7 +27,7 @@
- SECTION SEG_CONST
-
- alignz 16
-- global EXTN(jconst_fdct_float_3dnow)
-+ global EXTN(jconst_fdct_float_3dnow) PRIVATE
-
- EXTN(jconst_fdct_float_3dnow):
-
-@@ -55,7 +55,7 @@
- %define WK_NUM 2
-
- align 16
-- global EXTN(jsimd_fdct_float_3dnow)
-+ global EXTN(jsimd_fdct_float_3dnow) PRIVATE
-
- EXTN(jsimd_fdct_float_3dnow):
- push ebp
Index: simd/jcclrss2-64.asm
===================================================================
---- simd/jcclrss2-64.asm (revision 64575)
+--- simd/jcclrss2-64.asm (revision 677)
+++ simd/jcclrss2-64.asm (working copy)
-@@ -17,8 +17,12 @@
- %include "jcolsamp.inc"
+@@ -37,7 +37,7 @@
- ; --------------------------------------------------------------------------
-+%ifndef NEED_SECTION
-+%define NEED_SECTION
- SECTION SEG_TEXT
- BITS 64
-+%endif
-+
- ;
- ; Convert some rows of samples to the output colorspace.
- ;
-@@ -39,7 +43,7 @@
-
align 16
- global EXTN(jsimd_rgb_ycc_convert_sse2)
@@ -323,7 +338,7 @@
push rbp
Index: simd/jiss2red-64.asm
===================================================================
---- simd/jiss2red-64.asm (revision 64575)
+--- simd/jiss2red-64.asm (revision 677)
+++ simd/jiss2red-64.asm (working copy)
@@ -73,7 +73,7 @@
SECTION SEG_CONST
@@ -352,58 +367,9 @@
EXTN(jsimd_idct_2x2_sse2):
push rbp
-Index: simd/jdsamss2-64.asm
-===================================================================
---- simd/jdsamss2-64.asm (revision 64575)
-+++ simd/jdsamss2-64.asm (working copy)
-@@ -23,7 +23,7 @@
- SECTION SEG_CONST
-
- alignz 16
-- global EXTN(jconst_fancy_upsample_sse2)
-+ global EXTN(jconst_fancy_upsample_sse2) PRIVATE
-
- EXTN(jconst_fancy_upsample_sse2):
-
-@@ -59,7 +59,7 @@
- ; r13 = JSAMPARRAY * output_data_ptr
-
- align 16
-- global EXTN(jsimd_h2v1_fancy_upsample_sse2)
-+ global EXTN(jsimd_h2v1_fancy_upsample_sse2) PRIVATE
-
- EXTN(jsimd_h2v1_fancy_upsample_sse2):
- push rbp
-@@ -201,7 +201,7 @@
- %define WK_NUM 4
-
- align 16
-- global EXTN(jsimd_h2v2_fancy_upsample_sse2)
-+ global EXTN(jsimd_h2v2_fancy_upsample_sse2) PRIVATE
-
- EXTN(jsimd_h2v2_fancy_upsample_sse2):
- push rbp
-@@ -498,7 +498,7 @@
- ; r13 = JSAMPARRAY * output_data_ptr
-
- align 16
-- global EXTN(jsimd_h2v1_upsample_sse2)
-+ global EXTN(jsimd_h2v1_upsample_sse2) PRIVATE
-
- EXTN(jsimd_h2v1_upsample_sse2):
- push rbp
-@@ -587,7 +587,7 @@
- ; r13 = JSAMPARRAY * output_data_ptr
-
- align 16
-- global EXTN(jsimd_h2v2_upsample_sse2)
-+ global EXTN(jsimd_h2v2_upsample_sse2) PRIVATE
-
- EXTN(jsimd_h2v2_upsample_sse2):
- push rbp
Index: simd/ji3dnflt.asm
===================================================================
---- simd/ji3dnflt.asm (revision 64575)
+--- simd/ji3dnflt.asm (revision 677)
+++ simd/ji3dnflt.asm (working copy)
@@ -27,7 +27,7 @@
SECTION SEG_CONST
@@ -425,7 +391,7 @@
push ebp
Index: simd/jsimdcpu.asm
===================================================================
---- simd/jsimdcpu.asm (revision 64575)
+--- simd/jsimdcpu.asm (revision 677)
+++ simd/jsimdcpu.asm (working copy)
@@ -29,7 +29,7 @@
;
@@ -436,31 +402,22 @@
EXTN(jpeg_simd_cpu_support):
push ebx
-Index: simd/jcsammmx.asm
+Index: simd/jdmerss2-64.asm
===================================================================
---- simd/jcsammmx.asm (revision 64575)
-+++ simd/jcsammmx.asm (working copy)
-@@ -40,7 +40,7 @@
- %define output_data(b) (b)+28 ; JSAMPARRAY output_data
+--- simd/jdmerss2-64.asm (revision 677)
++++ simd/jdmerss2-64.asm (working copy)
+@@ -35,7 +35,7 @@
+ SECTION SEG_CONST
- align 16
-- global EXTN(jsimd_h2v1_downsample_mmx)
-+ global EXTN(jsimd_h2v1_downsample_mmx) PRIVATE
+ alignz 16
+- global EXTN(jconst_merged_upsample_sse2)
++ global EXTN(jconst_merged_upsample_sse2) PRIVATE
- EXTN(jsimd_h2v1_downsample_mmx):
- push ebp
-@@ -182,7 +182,7 @@
- %define output_data(b) (b)+28 ; JSAMPARRAY output_data
+ EXTN(jconst_merged_upsample_sse2):
- align 16
-- global EXTN(jsimd_h2v2_downsample_mmx)
-+ global EXTN(jsimd_h2v2_downsample_mmx) PRIVATE
-
- EXTN(jsimd_h2v2_downsample_mmx):
- push ebp
Index: simd/jdsammmx.asm
===================================================================
---- simd/jdsammmx.asm (revision 64575)
+--- simd/jdsammmx.asm (revision 677)
+++ simd/jdsammmx.asm (working copy)
@@ -22,7 +22,7 @@
SECTION SEG_CONST
@@ -507,103 +464,11 @@
EXTN(jsimd_h2v2_upsample_mmx):
push ebp
-Index: simd/jdmerss2-64.asm
-===================================================================
---- simd/jdmerss2-64.asm (revision 64575)
-+++ simd/jdmerss2-64.asm (working copy)
-@@ -35,7 +35,7 @@
- SECTION SEG_CONST
-
- alignz 16
-- global EXTN(jconst_merged_upsample_sse2)
-+ global EXTN(jconst_merged_upsample_sse2) PRIVATE
-
- EXTN(jconst_merged_upsample_sse2):
-
-Index: simd/jcqnts2f-64.asm
-===================================================================
---- simd/jcqnts2f-64.asm (revision 64575)
-+++ simd/jcqnts2f-64.asm (working copy)
-@@ -36,7 +36,7 @@
- ; r12 = FAST_FLOAT * workspace
-
- align 16
-- global EXTN(jsimd_convsamp_float_sse2)
-+ global EXTN(jsimd_convsamp_float_sse2) PRIVATE
-
- EXTN(jsimd_convsamp_float_sse2):
- push rbp
-@@ -110,7 +110,7 @@
- ; r12 = FAST_FLOAT * workspace
-
- align 16
-- global EXTN(jsimd_quantize_float_sse2)
-+ global EXTN(jsimd_quantize_float_sse2) PRIVATE
-
- EXTN(jsimd_quantize_float_sse2):
- push rbp
-Index: simd/jcqnt3dn.asm
-===================================================================
---- simd/jcqnt3dn.asm (revision 64575)
-+++ simd/jcqnt3dn.asm (working copy)
-@@ -35,7 +35,7 @@
- %define workspace ebp+16 ; FAST_FLOAT * workspace
-
- align 16
-- global EXTN(jsimd_convsamp_float_3dnow)
-+ global EXTN(jsimd_convsamp_float_3dnow) PRIVATE
-
- EXTN(jsimd_convsamp_float_3dnow):
- push ebp
-@@ -138,7 +138,7 @@
- %define workspace ebp+16 ; FAST_FLOAT * workspace
-
- align 16
-- global EXTN(jsimd_quantize_float_3dnow)
-+ global EXTN(jsimd_quantize_float_3dnow) PRIVATE
-
- EXTN(jsimd_quantize_float_3dnow):
- push ebp
-Index: simd/jcsamss2.asm
-===================================================================
---- simd/jcsamss2.asm (revision 64575)
-+++ simd/jcsamss2.asm (working copy)
-@@ -40,7 +40,7 @@
- %define output_data(b) (b)+28 ; JSAMPARRAY output_data
-
- align 16
-- global EXTN(jsimd_h2v1_downsample_sse2)
-+ global EXTN(jsimd_h2v1_downsample_sse2) PRIVATE
-
- EXTN(jsimd_h2v1_downsample_sse2):
- push ebp
-@@ -195,7 +195,7 @@
- %define output_data(b) (b)+28 ; JSAMPARRAY output_data
-
- align 16
-- global EXTN(jsimd_h2v2_downsample_sse2)
-+ global EXTN(jsimd_h2v2_downsample_sse2) PRIVATE
-
- EXTN(jsimd_h2v2_downsample_sse2):
- push ebp
Index: simd/jdmrgmmx.asm
===================================================================
---- simd/jdmrgmmx.asm (revision 64575)
+--- simd/jdmrgmmx.asm (revision 677)
+++ simd/jdmrgmmx.asm (working copy)
-@@ -19,8 +19,12 @@
- %include "jcolsamp.inc"
-
- ; --------------------------------------------------------------------------
-+%ifndef NEED_SECTION
-+%define NEED_SECTION
- SECTION SEG_TEXT
- BITS 32
-+%endif
-+
- ;
- ; Upsample and color convert for the case of 2:1 horizontal and 1:1 vertical.
- ;
-@@ -42,7 +46,7 @@
+@@ -40,7 +40,7 @@
%define gotptr wk(0)-SIZEOF_POINTER ; void * gotptr
align 16
@@ -612,7 +477,7 @@
EXTN(jsimd_h2v1_merged_upsample_mmx):
push ebp
-@@ -411,7 +415,7 @@
+@@ -409,7 +409,7 @@
%define output_buf(b) (b)+20 ; JSAMPARRAY output_buf
align 16
@@ -623,7 +488,7 @@
push ebp
Index: simd/jdsamss2.asm
===================================================================
---- simd/jdsamss2.asm (revision 64575)
+--- simd/jdsamss2.asm (revision 677)
+++ simd/jdsamss2.asm (working copy)
@@ -22,7 +22,7 @@
SECTION SEG_CONST
@@ -672,7 +537,7 @@
push ebp
Index: simd/jiss2flt-64.asm
===================================================================
---- simd/jiss2flt-64.asm (revision 64575)
+--- simd/jiss2flt-64.asm (revision 677)
+++ simd/jiss2flt-64.asm (working copy)
@@ -38,7 +38,7 @@
SECTION SEG_CONST
@@ -694,7 +559,7 @@
push rbp
Index: simd/jfss2int-64.asm
===================================================================
---- simd/jfss2int-64.asm (revision 64575)
+--- simd/jfss2int-64.asm (revision 677)
+++ simd/jfss2int-64.asm (working copy)
@@ -67,7 +67,7 @@
SECTION SEG_CONST
@@ -716,7 +581,7 @@
push rbp
Index: simd/jcqnts2f.asm
===================================================================
---- simd/jcqnts2f.asm (revision 64575)
+--- simd/jcqnts2f.asm (revision 677)
+++ simd/jcqnts2f.asm (working copy)
@@ -35,7 +35,7 @@
%define workspace ebp+16 ; FAST_FLOAT * workspace
@@ -738,22 +603,9 @@
push ebp
Index: simd/jdmrgss2.asm
===================================================================
---- simd/jdmrgss2.asm (revision 64575)
+--- simd/jdmrgss2.asm (revision 677)
+++ simd/jdmrgss2.asm (working copy)
-@@ -19,8 +19,12 @@
- %include "jcolsamp.inc"
-
- ; --------------------------------------------------------------------------
-+%ifndef NEED_SECTION
-+%define NEED_SECTION
- SECTION SEG_TEXT
- BITS 32
-+%endif
-+
- ;
- ; Upsample and color convert for the case of 2:1 horizontal and 1:1 vertical.
- ;
-@@ -42,7 +46,7 @@
+@@ -40,7 +40,7 @@
%define gotptr wk(0)-SIZEOF_POINTER ; void * gotptr
align 16
@@ -762,7 +614,7 @@
EXTN(jsimd_h2v1_merged_upsample_sse2):
push ebp
-@@ -309,6 +313,41 @@
+@@ -307,6 +307,41 @@
movdqa xmmA,xmmD
sub ecx, byte SIZEOF_XMMWORD
.column_st15:
@@ -804,7 +656,7 @@
mov eax,ecx
xor ecx, byte 0x0F
shl ecx, 2
-@@ -348,6 +387,7 @@
+@@ -346,6 +381,7 @@
por xmmE,xmmC
.adj0: ; ----------------
maskmovdqu xmmA,xmmE ; movntdqu XMMWORD [edi], xmmA
@@ -812,7 +664,7 @@
%else ; RGB_PIXELSIZE == 4 ; -----------
-@@ -436,6 +476,22 @@
+@@ -434,6 +470,22 @@
movdqa xmmA,xmmD
sub ecx, byte SIZEOF_XMMWORD/4
.column_st15:
@@ -835,7 +687,7 @@
cmp ecx, byte SIZEOF_XMMWORD/16
jb short .endcolumn
mov eax,ecx
-@@ -475,6 +531,7 @@
+@@ -473,6 +525,7 @@
por xmmE,xmmG
.adj0: ; ----------------
maskmovdqu xmmA,xmmE ; movntdqu XMMWORD [edi], xmmA
@@ -843,7 +695,7 @@
%endif ; RGB_PIXELSIZE ; ---------------
-@@ -509,7 +566,7 @@
+@@ -507,7 +560,7 @@
%define output_buf(b) (b)+20 ; JSAMPARRAY output_buf
align 16
@@ -854,7 +706,7 @@
push ebp
Index: simd/jfmmxint.asm
===================================================================
---- simd/jfmmxint.asm (revision 64575)
+--- simd/jfmmxint.asm (revision 677)
+++ simd/jfmmxint.asm (working copy)
@@ -66,7 +66,7 @@
SECTION SEG_CONST
@@ -874,9 +726,22 @@
EXTN(jsimd_fdct_islow_mmx):
push ebp
+Index: simd/jcgryss2-64.asm
+===================================================================
+--- simd/jcgryss2-64.asm (revision 677)
++++ simd/jcgryss2-64.asm (working copy)
+@@ -37,7 +37,7 @@
+
+ align 16
+
+- global EXTN(jsimd_rgb_gray_convert_sse2)
++ global EXTN(jsimd_rgb_gray_convert_sse2) PRIVATE
+
+ EXTN(jsimd_rgb_gray_convert_sse2):
+ push rbp
Index: simd/jcqnts2i.asm
===================================================================
---- simd/jcqnts2i.asm (revision 64575)
+--- simd/jcqnts2i.asm (revision 677)
+++ simd/jcqnts2i.asm (working copy)
@@ -35,7 +35,7 @@
%define workspace ebp+16 ; DCTELEM * workspace
@@ -898,7 +763,7 @@
push ebp
Index: simd/jiss2fst-64.asm
===================================================================
---- simd/jiss2fst-64.asm (revision 64575)
+--- simd/jiss2fst-64.asm (revision 677)
+++ simd/jiss2fst-64.asm (working copy)
@@ -60,7 +60,7 @@
%define CONST_SHIFT (16 - PRE_MULTIPLY_SCALE_BITS - CONST_BITS)
@@ -918,31 +783,9 @@
EXTN(jsimd_idct_ifast_sse2):
push rbp
-Index: simd/jimmxint.asm
-===================================================================
---- simd/jimmxint.asm (revision 64575)
-+++ simd/jimmxint.asm (working copy)
-@@ -66,7 +66,7 @@
- SECTION SEG_CONST
-
- alignz 16
-- global EXTN(jconst_idct_islow_mmx)
-+ global EXTN(jconst_idct_islow_mmx) PRIVATE
-
- EXTN(jconst_idct_islow_mmx):
-
-@@ -107,7 +107,7 @@
- ; JCOEF workspace[DCTSIZE2]
-
- align 16
-- global EXTN(jsimd_idct_islow_mmx)
-+ global EXTN(jsimd_idct_islow_mmx) PRIVATE
-
- EXTN(jsimd_idct_islow_mmx):
- push ebp
Index: simd/jiss2flt.asm
===================================================================
---- simd/jiss2flt.asm (revision 64575)
+--- simd/jiss2flt.asm (revision 677)
+++ simd/jiss2flt.asm (working copy)
@@ -37,7 +37,7 @@
SECTION SEG_CONST
@@ -962,31 +805,9 @@
EXTN(jsimd_idct_float_sse2):
push ebp
-Index: simd/jfss2int.asm
-===================================================================
---- simd/jfss2int.asm (revision 64575)
-+++ simd/jfss2int.asm (working copy)
-@@ -66,7 +66,7 @@
- SECTION SEG_CONST
-
- alignz 16
-- global EXTN(jconst_fdct_islow_sse2)
-+ global EXTN(jconst_fdct_islow_sse2) PRIVATE
-
- EXTN(jconst_fdct_islow_sse2):
-
-@@ -101,7 +101,7 @@
- %define WK_NUM 6
-
- align 16
-- global EXTN(jsimd_fdct_islow_sse2)
-+ global EXTN(jsimd_fdct_islow_sse2) PRIVATE
-
- EXTN(jsimd_fdct_islow_sse2):
- push ebp
Index: simd/jiss2int.asm
===================================================================
---- simd/jiss2int.asm (revision 64575)
+--- simd/jiss2int.asm (revision 677)
+++ simd/jiss2int.asm (working copy)
@@ -66,7 +66,7 @@
SECTION SEG_CONST
@@ -1008,7 +829,7 @@
push ebp
Index: simd/jfsseflt-64.asm
===================================================================
---- simd/jfsseflt-64.asm (revision 64575)
+--- simd/jfsseflt-64.asm (revision 677)
+++ simd/jfsseflt-64.asm (working copy)
@@ -38,7 +38,7 @@
SECTION SEG_CONST
@@ -1030,7 +851,7 @@
push rbp
Index: simd/jccolss2-64.asm
===================================================================
---- simd/jccolss2-64.asm (revision 64575)
+--- simd/jccolss2-64.asm (revision 677)
+++ simd/jccolss2-64.asm (working copy)
@@ -34,7 +34,7 @@
SECTION SEG_CONST
@@ -1041,22 +862,9 @@
EXTN(jconst_rgb_ycc_convert_sse2):
-Index: simd/jccolmmx.asm
-===================================================================
---- simd/jccolmmx.asm (revision 64575)
-+++ simd/jccolmmx.asm (working copy)
-@@ -37,7 +37,7 @@
- SECTION SEG_CONST
-
- alignz 16
-- global EXTN(jconst_rgb_ycc_convert_mmx)
-+ global EXTN(jconst_rgb_ycc_convert_mmx) PRIVATE
-
- EXTN(jconst_rgb_ycc_convert_mmx):
-
Index: simd/jcsamss2-64.asm
===================================================================
---- simd/jcsamss2-64.asm (revision 64575)
+--- simd/jcsamss2-64.asm (revision 677)
+++ simd/jcsamss2-64.asm (working copy)
@@ -41,7 +41,7 @@
; r15 = JSAMPARRAY output_data
@@ -1076,37 +884,11 @@
EXTN(jsimd_h2v2_downsample_sse2):
push rbp
-Index: simd/jdcolmmx.asm
-===================================================================
---- simd/jdcolmmx.asm (revision 64575)
-+++ simd/jdcolmmx.asm (working copy)
-@@ -35,7 +35,7 @@
- SECTION SEG_CONST
-
- alignz 16
-- global EXTN(jconst_ycc_rgb_convert_mmx)
-+ global EXTN(jconst_ycc_rgb_convert_mmx) PRIVATE
-
- EXTN(jconst_ycc_rgb_convert_mmx):
-
Index: simd/jdclrss2-64.asm
===================================================================
---- simd/jdclrss2-64.asm (revision 64575)
+--- simd/jdclrss2-64.asm (revision 677)
+++ simd/jdclrss2-64.asm (working copy)
-@@ -20,8 +20,12 @@
- %include "jcolsamp.inc"
-
- ; --------------------------------------------------------------------------
-+%ifndef NEED_SECTION
-+%define NEED_SECTION
- SECTION SEG_TEXT
- BITS 64
-+%endif
-+
- ;
- ; Convert some rows of samples to the output colorspace.
- ;
-@@ -41,7 +45,7 @@
+@@ -39,7 +39,7 @@
%define WK_NUM 2
align 16
@@ -1115,7 +897,7 @@
EXTN(jsimd_ycc_rgb_convert_sse2):
push rbp
-@@ -292,6 +296,41 @@
+@@ -290,6 +290,41 @@
movdqa xmmA,xmmD
sub rcx, byte SIZEOF_XMMWORD
.column_st15:
@@ -1157,7 +939,7 @@
mov rax,rcx
xor rcx, byte 0x0F
shl rcx, 2
-@@ -331,6 +370,7 @@
+@@ -329,6 +364,7 @@
por xmmE,xmmC
.adj0: ; ----------------
maskmovdqu xmmA,xmmE ; movntdqu XMMWORD [rdi], xmmA
@@ -1165,7 +947,7 @@
%else ; RGB_PIXELSIZE == 4 ; -----------
-@@ -415,6 +455,22 @@
+@@ -413,6 +449,22 @@
movdqa xmmA,xmmD
sub rcx, byte SIZEOF_XMMWORD/4
.column_st15:
@@ -1188,7 +970,7 @@
cmp rcx, byte SIZEOF_XMMWORD/16
jb near .nextrow
mov rax,rcx
-@@ -454,6 +510,7 @@
+@@ -452,6 +504,7 @@
por xmmE,xmmG
.adj0: ; ----------------
maskmovdqu xmmA,xmmE ; movntdqu XMMWORD [rdi], xmmA
@@ -1196,92 +978,35 @@
%endif ; RGB_PIXELSIZE ; ---------------
-Index: simd/jcclrmmx.asm
+Index: simd/jdcolmmx.asm
===================================================================
---- simd/jcclrmmx.asm (revision 64575)
-+++ simd/jcclrmmx.asm (working copy)
-@@ -19,8 +19,12 @@
- %include "jcolsamp.inc"
-
- ; --------------------------------------------------------------------------
-+%ifndef NEED_SECTION
-+%define NEED_SECTION
- SECTION SEG_TEXT
- BITS 32
-+%endif
-+
- ;
- ; Convert some rows of samples to the output colorspace.
- ;
-@@ -42,7 +46,7 @@
- %define gotptr wk(0)-SIZEOF_POINTER ; void * gotptr
-
- align 16
-- global EXTN(jsimd_rgb_ycc_convert_mmx)
-+ global EXTN(jsimd_rgb_ycc_convert_mmx) PRIVATE
-
- EXTN(jsimd_rgb_ycc_convert_mmx):
- push ebp
-Index: simd/jimmxred.asm
-===================================================================
---- simd/jimmxred.asm (revision 64575)
-+++ simd/jimmxred.asm (working copy)
-@@ -72,7 +72,7 @@
+--- simd/jdcolmmx.asm (revision 677)
++++ simd/jdcolmmx.asm (working copy)
+@@ -35,7 +35,7 @@
SECTION SEG_CONST
alignz 16
-- global EXTN(jconst_idct_red_mmx)
-+ global EXTN(jconst_idct_red_mmx) PRIVATE
+- global EXTN(jconst_ycc_rgb_convert_mmx)
++ global EXTN(jconst_ycc_rgb_convert_mmx) PRIVATE
- EXTN(jconst_idct_red_mmx):
+ EXTN(jconst_ycc_rgb_convert_mmx):
-@@ -115,7 +115,7 @@
- ; JCOEF workspace[DCTSIZE2]
-
- align 16
-- global EXTN(jsimd_idct_4x4_mmx)
-+ global EXTN(jsimd_idct_4x4_mmx) PRIVATE
-
- EXTN(jsimd_idct_4x4_mmx):
- push ebp
-@@ -503,7 +503,7 @@
- %define output_col(b) (b)+20 ; JDIMENSION output_col
-
- align 16
-- global EXTN(jsimd_idct_2x2_mmx)
-+ global EXTN(jsimd_idct_2x2_mmx) PRIVATE
-
- EXTN(jsimd_idct_2x2_mmx):
- push ebp
-Index: simd/jdclrmmx.asm
+Index: simd/jcclrmmx.asm
===================================================================
---- simd/jdclrmmx.asm (revision 64575)
-+++ simd/jdclrmmx.asm (working copy)
-@@ -19,8 +19,12 @@
- %include "jcolsamp.inc"
-
- ; --------------------------------------------------------------------------
-+%ifndef NEED_SECTION
-+%define NEED_SECTION
- SECTION SEG_TEXT
- BITS 32
-+%endif
-+
- ;
- ; Convert some rows of samples to the output colorspace.
- ;
-@@ -42,7 +46,7 @@
+--- simd/jcclrmmx.asm (revision 677)
++++ simd/jcclrmmx.asm (working copy)
+@@ -40,7 +40,7 @@
%define gotptr wk(0)-SIZEOF_POINTER ; void * gotptr
align 16
-- global EXTN(jsimd_ycc_rgb_convert_mmx)
-+ global EXTN(jsimd_ycc_rgb_convert_mmx) PRIVATE
+- global EXTN(jsimd_rgb_ycc_convert_mmx)
++ global EXTN(jsimd_rgb_ycc_convert_mmx) PRIVATE
- EXTN(jsimd_ycc_rgb_convert_mmx):
+ EXTN(jsimd_rgb_ycc_convert_mmx):
push ebp
Index: simd/jfsseflt.asm
===================================================================
---- simd/jfsseflt.asm (revision 64575)
+--- simd/jfsseflt.asm (revision 677)
+++ simd/jfsseflt.asm (working copy)
@@ -37,7 +37,7 @@
SECTION SEG_CONST
@@ -1301,64 +1026,11 @@
EXTN(jsimd_fdct_float_sse):
push ebp
-Index: simd/jsimdext.inc
-===================================================================
---- simd/jsimdext.inc (revision 64575)
-+++ simd/jsimdext.inc (working copy)
-@@ -38,16 +38,16 @@
-
- ; -- segment definition --
- ;
--%define SEG_TEXT .text align=16 public use32 class=CODE
--%define SEG_CONST .rdata align=16 public use32 class=CONST
-+%define SEG_TEXT .text align=16 ; public use32 class=CODE
-+%define SEG_CONST .rdata align=16 ; public use32 class=CONST
-
- %elifdef WIN64 ; ----(nasm -fwin64 -DWIN64 ...)--------
- ; * Microsoft Visual C++
-
- ; -- segment definition --
- ;
--%define SEG_TEXT .text align=16 public use64 class=CODE
--%define SEG_CONST .rdata align=16 public use64 class=CONST
-+%define SEG_TEXT .text align=16 ; public use64 class=CODE
-+%define SEG_CONST .rdata align=16 ; public use64 class=CONST
- %ifdef MSVC
- %define EXTN(name) name ; foo() -> foo
- %endif
-@@ -369,4 +369,14 @@
- ;
- %include "jsimdcfg.inc"
-
-+; Begin chromium edits
-+%ifdef MACHO ; ----(nasm -fmacho -DMACHO ...)--------
-+%define PRIVATE :private_extern
-+%elifdef ELF ; ----(nasm -felf[64] -DELF ...)------------
-+%define PRIVATE :hidden
-+%else
-+%define PRIVATE
-+%endif
-+; End chromium edits
-+
- ; --------------------------------------------------------------------------
Index: simd/jdmrgss2-64.asm
===================================================================
---- simd/jdmrgss2-64.asm (revision 64575)
+--- simd/jdmrgss2-64.asm (revision 677)
+++ simd/jdmrgss2-64.asm (working copy)
-@@ -20,8 +20,12 @@
- %include "jcolsamp.inc"
-
- ; --------------------------------------------------------------------------
-+%ifndef NEED_SECTION
-+%define NEED_SECTION
- SECTION SEG_TEXT
- BITS 64
-+%endif
-+
- ;
- ; Upsample and color convert for the case of 2:1 horizontal and 1:1 vertical.
- ;
-@@ -41,7 +45,7 @@
+@@ -39,7 +39,7 @@
%define WK_NUM 3
align 16
@@ -1367,7 +1039,7 @@
EXTN(jsimd_h2v1_merged_upsample_sse2):
push rbp
-@@ -296,6 +300,41 @@
+@@ -294,6 +294,41 @@
movdqa xmmA,xmmD
sub rcx, byte SIZEOF_XMMWORD
.column_st15:
@@ -1409,7 +1081,7 @@
mov rax,rcx
xor rcx, byte 0x0F
shl rcx, 2
-@@ -335,6 +374,7 @@
+@@ -333,6 +368,7 @@
por xmmE,xmmC
.adj0: ; ----------------
maskmovdqu xmmA,xmmE ; movntdqu XMMWORD [edi], xmmA
@@ -1417,7 +1089,7 @@
%else ; RGB_PIXELSIZE == 4 ; -----------
-@@ -422,6 +462,22 @@
+@@ -420,6 +456,22 @@
movdqa xmmA,xmmD
sub rcx, byte SIZEOF_XMMWORD/4
.column_st15:
@@ -1440,7 +1112,7 @@
cmp rcx, byte SIZEOF_XMMWORD/16
jb near .endcolumn
mov rax,rcx
-@@ -461,6 +517,7 @@
+@@ -459,6 +511,7 @@
por xmmE,xmmG
.adj0: ; ----------------
maskmovdqu xmmA,xmmE ; movntdqu XMMWORD [edi], xmmA
@@ -1448,7 +1120,7 @@
%endif ; RGB_PIXELSIZE ; ---------------
-@@ -492,7 +549,7 @@
+@@ -490,7 +543,7 @@
; r13 = JSAMPARRAY output_buf
align 16
@@ -1457,22 +1129,22 @@
EXTN(jsimd_h2v2_merged_upsample_sse2):
push rbp
-Index: simd/jccolss2.asm
+Index: simd/jdcolss2.asm
===================================================================
---- simd/jccolss2.asm (revision 64575)
-+++ simd/jccolss2.asm (working copy)
-@@ -34,7 +34,7 @@
+--- simd/jdcolss2.asm (revision 677)
++++ simd/jdcolss2.asm (working copy)
+@@ -35,7 +35,7 @@
SECTION SEG_CONST
alignz 16
-- global EXTN(jconst_rgb_ycc_convert_sse2)
-+ global EXTN(jconst_rgb_ycc_convert_sse2) PRIVATE
+- global EXTN(jconst_ycc_rgb_convert_sse2)
++ global EXTN(jconst_ycc_rgb_convert_sse2) PRIVATE
- EXTN(jconst_rgb_ycc_convert_sse2):
+ EXTN(jconst_ycc_rgb_convert_sse2):
Index: simd/jdmermmx.asm
===================================================================
---- simd/jdmermmx.asm (revision 64575)
+--- simd/jdmermmx.asm (revision 677)
+++ simd/jdmermmx.asm (working copy)
@@ -35,7 +35,7 @@
SECTION SEG_CONST
@@ -1483,147 +1155,566 @@
EXTN(jconst_merged_upsample_mmx):
-Index: simd/jdcolss2.asm
+Index: simd/jcclrss2.asm
===================================================================
---- simd/jdcolss2.asm (revision 64575)
-+++ simd/jdcolss2.asm (working copy)
+--- simd/jcclrss2.asm (revision 677)
++++ simd/jcclrss2.asm (working copy)
+@@ -38,7 +38,7 @@
+
+ align 16
+
+- global EXTN(jsimd_rgb_ycc_convert_sse2)
++ global EXTN(jsimd_rgb_ycc_convert_sse2) PRIVATE
+
+ EXTN(jsimd_rgb_ycc_convert_sse2):
+ push ebp
+Index: simd/jiss2red.asm
+===================================================================
+--- simd/jiss2red.asm (revision 677)
++++ simd/jiss2red.asm (working copy)
+@@ -72,7 +72,7 @@
+ SECTION SEG_CONST
+
+ alignz 16
+- global EXTN(jconst_idct_red_sse2)
++ global EXTN(jconst_idct_red_sse2) PRIVATE
+
+ EXTN(jconst_idct_red_sse2):
+
+@@ -113,7 +113,7 @@
+ %define WK_NUM 2
+
+ align 16
+- global EXTN(jsimd_idct_4x4_sse2)
++ global EXTN(jsimd_idct_4x4_sse2) PRIVATE
+
+ EXTN(jsimd_idct_4x4_sse2):
+ push ebp
+@@ -424,7 +424,7 @@
+ %define output_col(b) (b)+20 ; JDIMENSION output_col
+
+ align 16
+- global EXTN(jsimd_idct_2x2_sse2)
++ global EXTN(jsimd_idct_2x2_sse2) PRIVATE
+
+ EXTN(jsimd_idct_2x2_sse2):
+ push ebp
+Index: simd/jdmerss2.asm
+===================================================================
+--- simd/jdmerss2.asm (revision 677)
++++ simd/jdmerss2.asm (working copy)
@@ -35,7 +35,7 @@
SECTION SEG_CONST
alignz 16
+- global EXTN(jconst_merged_upsample_sse2)
++ global EXTN(jconst_merged_upsample_sse2) PRIVATE
+
+ EXTN(jconst_merged_upsample_sse2):
+
+Index: simd/jfss2fst-64.asm
+===================================================================
+--- simd/jfss2fst-64.asm (revision 677)
++++ simd/jfss2fst-64.asm (working copy)
+@@ -53,7 +53,7 @@
+ %define CONST_SHIFT (16 - PRE_MULTIPLY_SCALE_BITS - CONST_BITS)
+
+ alignz 16
+- global EXTN(jconst_fdct_ifast_sse2)
++ global EXTN(jconst_fdct_ifast_sse2) PRIVATE
+
+ EXTN(jconst_fdct_ifast_sse2):
+
+@@ -80,7 +80,7 @@
+ %define WK_NUM 2
+
+ align 16
+- global EXTN(jsimd_fdct_ifast_sse2)
++ global EXTN(jsimd_fdct_ifast_sse2) PRIVATE
+
+ EXTN(jsimd_fdct_ifast_sse2):
+ push rbp
+Index: simd/jcqntmmx.asm
+===================================================================
+--- simd/jcqntmmx.asm (revision 677)
++++ simd/jcqntmmx.asm (working copy)
+@@ -35,7 +35,7 @@
+ %define workspace ebp+16 ; DCTELEM * workspace
+
+ align 16
+- global EXTN(jsimd_convsamp_mmx)
++ global EXTN(jsimd_convsamp_mmx) PRIVATE
+
+ EXTN(jsimd_convsamp_mmx):
+ push ebp
+@@ -140,7 +140,7 @@
+ %define workspace ebp+16 ; DCTELEM * workspace
+
+ align 16
+- global EXTN(jsimd_quantize_mmx)
++ global EXTN(jsimd_quantize_mmx) PRIVATE
+
+ EXTN(jsimd_quantize_mmx):
+ push ebp
+Index: simd/jimmxfst.asm
+===================================================================
+--- simd/jimmxfst.asm (revision 677)
++++ simd/jimmxfst.asm (working copy)
+@@ -59,7 +59,7 @@
+ %define CONST_SHIFT (16 - PRE_MULTIPLY_SCALE_BITS - CONST_BITS)
+
+ alignz 16
+- global EXTN(jconst_idct_ifast_mmx)
++ global EXTN(jconst_idct_ifast_mmx) PRIVATE
+
+ EXTN(jconst_idct_ifast_mmx):
+
+@@ -94,7 +94,7 @@
+ ; JCOEF workspace[DCTSIZE2]
+
+ align 16
+- global EXTN(jsimd_idct_ifast_mmx)
++ global EXTN(jsimd_idct_ifast_mmx) PRIVATE
+
+ EXTN(jsimd_idct_ifast_mmx):
+ push ebp
+Index: simd/jfss2fst.asm
+===================================================================
+--- simd/jfss2fst.asm (revision 677)
++++ simd/jfss2fst.asm (working copy)
+@@ -52,7 +52,7 @@
+ %define CONST_SHIFT (16 - PRE_MULTIPLY_SCALE_BITS - CONST_BITS)
+
+ alignz 16
+- global EXTN(jconst_fdct_ifast_sse2)
++ global EXTN(jconst_fdct_ifast_sse2) PRIVATE
+
+ EXTN(jconst_fdct_ifast_sse2):
+
+@@ -80,7 +80,7 @@
+ %define WK_NUM 2
+
+ align 16
+- global EXTN(jsimd_fdct_ifast_sse2)
++ global EXTN(jsimd_fdct_ifast_sse2) PRIVATE
+
+ EXTN(jsimd_fdct_ifast_sse2):
+ push ebp
+Index: simd/jcgrammx.asm
+===================================================================
+--- simd/jcgrammx.asm (revision 677)
++++ simd/jcgrammx.asm (working copy)
+@@ -33,7 +33,7 @@
+ SECTION SEG_CONST
+
+ alignz 16
+- global EXTN(jconst_rgb_gray_convert_mmx)
++ global EXTN(jconst_rgb_gray_convert_mmx) PRIVATE
+
+ EXTN(jconst_rgb_gray_convert_mmx):
+
+Index: simd/jdcolss2-64.asm
+===================================================================
+--- simd/jdcolss2-64.asm (revision 677)
++++ simd/jdcolss2-64.asm (working copy)
+@@ -35,7 +35,7 @@
+ SECTION SEG_CONST
+
+ alignz 16
- global EXTN(jconst_ycc_rgb_convert_sse2)
+ global EXTN(jconst_ycc_rgb_convert_sse2) PRIVATE
EXTN(jconst_ycc_rgb_convert_sse2):
-Index: simd/jisseflt.asm
+Index: simd/jf3dnflt.asm
===================================================================
---- simd/jisseflt.asm (revision 64575)
-+++ simd/jisseflt.asm (working copy)
-@@ -37,7 +37,7 @@
+--- simd/jf3dnflt.asm (revision 677)
++++ simd/jf3dnflt.asm (working copy)
+@@ -27,7 +27,7 @@
SECTION SEG_CONST
alignz 16
-- global EXTN(jconst_idct_float_sse)
-+ global EXTN(jconst_idct_float_sse) PRIVATE
+- global EXTN(jconst_fdct_float_3dnow)
++ global EXTN(jconst_fdct_float_3dnow) PRIVATE
- EXTN(jconst_idct_float_sse):
+ EXTN(jconst_fdct_float_3dnow):
-@@ -73,7 +73,7 @@
- ; FAST_FLOAT workspace[DCTSIZE2]
+@@ -55,7 +55,7 @@
+ %define WK_NUM 2
align 16
-- global EXTN(jsimd_idct_float_sse)
-+ global EXTN(jsimd_idct_float_sse) PRIVATE
+- global EXTN(jsimd_fdct_float_3dnow)
++ global EXTN(jsimd_fdct_float_3dnow) PRIVATE
- EXTN(jsimd_idct_float_sse):
+ EXTN(jsimd_fdct_float_3dnow):
push ebp
-Index: simd/jcqnts2i-64.asm
+Index: simd/jdsamss2-64.asm
===================================================================
---- simd/jcqnts2i-64.asm (revision 64575)
-+++ simd/jcqnts2i-64.asm (working copy)
+--- simd/jdsamss2-64.asm (revision 677)
++++ simd/jdsamss2-64.asm (working copy)
+@@ -23,7 +23,7 @@
+ SECTION SEG_CONST
+
+ alignz 16
+- global EXTN(jconst_fancy_upsample_sse2)
++ global EXTN(jconst_fancy_upsample_sse2) PRIVATE
+
+ EXTN(jconst_fancy_upsample_sse2):
+
+@@ -59,7 +59,7 @@
+ ; r13 = JSAMPARRAY * output_data_ptr
+
+ align 16
+- global EXTN(jsimd_h2v1_fancy_upsample_sse2)
++ global EXTN(jsimd_h2v1_fancy_upsample_sse2) PRIVATE
+
+ EXTN(jsimd_h2v1_fancy_upsample_sse2):
+ push rbp
+@@ -201,7 +201,7 @@
+ %define WK_NUM 4
+
+ align 16
+- global EXTN(jsimd_h2v2_fancy_upsample_sse2)
++ global EXTN(jsimd_h2v2_fancy_upsample_sse2) PRIVATE
+
+ EXTN(jsimd_h2v2_fancy_upsample_sse2):
+ push rbp
+@@ -498,7 +498,7 @@
+ ; r13 = JSAMPARRAY * output_data_ptr
+
+ align 16
+- global EXTN(jsimd_h2v1_upsample_sse2)
++ global EXTN(jsimd_h2v1_upsample_sse2) PRIVATE
+
+ EXTN(jsimd_h2v1_upsample_sse2):
+ push rbp
+@@ -587,7 +587,7 @@
+ ; r13 = JSAMPARRAY * output_data_ptr
+
+ align 16
+- global EXTN(jsimd_h2v2_upsample_sse2)
++ global EXTN(jsimd_h2v2_upsample_sse2) PRIVATE
+
+ EXTN(jsimd_h2v2_upsample_sse2):
+ push rbp
+Index: simd/jcgrass2.asm
+===================================================================
+--- simd/jcgrass2.asm (revision 677)
++++ simd/jcgrass2.asm (working copy)
+@@ -30,7 +30,7 @@
+ SECTION SEG_CONST
+
+ alignz 16
+- global EXTN(jconst_rgb_gray_convert_sse2)
++ global EXTN(jconst_rgb_gray_convert_sse2) PRIVATE
+
+ EXTN(jconst_rgb_gray_convert_sse2):
+
+Index: simd/jcsammmx.asm
+===================================================================
+--- simd/jcsammmx.asm (revision 677)
++++ simd/jcsammmx.asm (working copy)
+@@ -40,7 +40,7 @@
+ %define output_data(b) (b)+28 ; JSAMPARRAY output_data
+
+ align 16
+- global EXTN(jsimd_h2v1_downsample_mmx)
++ global EXTN(jsimd_h2v1_downsample_mmx) PRIVATE
+
+ EXTN(jsimd_h2v1_downsample_mmx):
+ push ebp
+@@ -182,7 +182,7 @@
+ %define output_data(b) (b)+28 ; JSAMPARRAY output_data
+
+ align 16
+- global EXTN(jsimd_h2v2_downsample_mmx)
++ global EXTN(jsimd_h2v2_downsample_mmx) PRIVATE
+
+ EXTN(jsimd_h2v2_downsample_mmx):
+ push ebp
+Index: simd/jcqnts2f-64.asm
+===================================================================
+--- simd/jcqnts2f-64.asm (revision 677)
++++ simd/jcqnts2f-64.asm (working copy)
@@ -36,7 +36,7 @@
- ; r12 = DCTELEM * workspace
+ ; r12 = FAST_FLOAT * workspace
align 16
-- global EXTN(jsimd_convsamp_sse2)
-+ global EXTN(jsimd_convsamp_sse2) PRIVATE
+- global EXTN(jsimd_convsamp_float_sse2)
++ global EXTN(jsimd_convsamp_float_sse2) PRIVATE
- EXTN(jsimd_convsamp_sse2):
+ EXTN(jsimd_convsamp_float_sse2):
push rbp
-@@ -112,7 +112,7 @@
- ; r12 = DCTELEM * workspace
+@@ -110,7 +110,7 @@
+ ; r12 = FAST_FLOAT * workspace
align 16
-- global EXTN(jsimd_quantize_sse2)
-+ global EXTN(jsimd_quantize_sse2) PRIVATE
+- global EXTN(jsimd_quantize_float_sse2)
++ global EXTN(jsimd_quantize_float_sse2) PRIVATE
- EXTN(jsimd_quantize_sse2):
+ EXTN(jsimd_quantize_float_sse2):
push rbp
-Index: simd/jcclrss2.asm
+Index: simd/jcqnt3dn.asm
===================================================================
---- simd/jcclrss2.asm (revision 64575)
-+++ simd/jcclrss2.asm (working copy)
-@@ -16,8 +16,12 @@
- %include "jcolsamp.inc"
+--- simd/jcqnt3dn.asm (revision 677)
++++ simd/jcqnt3dn.asm (working copy)
+@@ -35,7 +35,7 @@
+ %define workspace ebp+16 ; FAST_FLOAT * workspace
- ; --------------------------------------------------------------------------
-+%ifndef NEED_SECTION
-+%define NEED_SECTION
- SECTION SEG_TEXT
- BITS 32
-+%endif
-+
- ;
- ; Convert some rows of samples to the output colorspace.
- ;
-@@ -40,7 +44,7 @@
+ align 16
+- global EXTN(jsimd_convsamp_float_3dnow)
++ global EXTN(jsimd_convsamp_float_3dnow) PRIVATE
+ EXTN(jsimd_convsamp_float_3dnow):
+ push ebp
+@@ -138,7 +138,7 @@
+ %define workspace ebp+16 ; FAST_FLOAT * workspace
+
align 16
+- global EXTN(jsimd_quantize_float_3dnow)
++ global EXTN(jsimd_quantize_float_3dnow) PRIVATE
-- global EXTN(jsimd_rgb_ycc_convert_sse2)
-+ global EXTN(jsimd_rgb_ycc_convert_sse2) PRIVATE
+ EXTN(jsimd_quantize_float_3dnow):
+ push ebp
+Index: simd/jcsamss2.asm
+===================================================================
+--- simd/jcsamss2.asm (revision 677)
++++ simd/jcsamss2.asm (working copy)
+@@ -40,7 +40,7 @@
+ %define output_data(b) (b)+28 ; JSAMPARRAY output_data
- EXTN(jsimd_rgb_ycc_convert_sse2):
+ align 16
+- global EXTN(jsimd_h2v1_downsample_sse2)
++ global EXTN(jsimd_h2v1_downsample_sse2) PRIVATE
+
+ EXTN(jsimd_h2v1_downsample_sse2):
push ebp
-Index: simd/jiss2red.asm
+@@ -195,7 +195,7 @@
+ %define output_data(b) (b)+28 ; JSAMPARRAY output_data
+
+ align 16
+- global EXTN(jsimd_h2v2_downsample_sse2)
++ global EXTN(jsimd_h2v2_downsample_sse2) PRIVATE
+
+ EXTN(jsimd_h2v2_downsample_sse2):
+ push ebp
+Index: simd/jimmxint.asm
===================================================================
---- simd/jiss2red.asm (revision 64575)
-+++ simd/jiss2red.asm (working copy)
+--- simd/jimmxint.asm (revision 677)
++++ simd/jimmxint.asm (working copy)
+@@ -66,7 +66,7 @@
+ SECTION SEG_CONST
+
+ alignz 16
+- global EXTN(jconst_idct_islow_mmx)
++ global EXTN(jconst_idct_islow_mmx) PRIVATE
+
+ EXTN(jconst_idct_islow_mmx):
+
+@@ -107,7 +107,7 @@
+ ; JCOEF workspace[DCTSIZE2]
+
+ align 16
+- global EXTN(jsimd_idct_islow_mmx)
++ global EXTN(jsimd_idct_islow_mmx) PRIVATE
+
+ EXTN(jsimd_idct_islow_mmx):
+ push ebp
+Index: simd/jcgrymmx.asm
+===================================================================
+--- simd/jcgrymmx.asm (revision 677)
++++ simd/jcgrymmx.asm (working copy)
+@@ -41,7 +41,7 @@
+ %define gotptr wk(0)-SIZEOF_POINTER ; void * gotptr
+
+ align 16
+- global EXTN(jsimd_rgb_gray_convert_mmx)
++ global EXTN(jsimd_rgb_gray_convert_mmx) PRIVATE
+
+ EXTN(jsimd_rgb_gray_convert_mmx):
+ push ebp
+Index: simd/jfss2int.asm
+===================================================================
+--- simd/jfss2int.asm (revision 677)
++++ simd/jfss2int.asm (working copy)
+@@ -66,7 +66,7 @@
+ SECTION SEG_CONST
+
+ alignz 16
+- global EXTN(jconst_fdct_islow_sse2)
++ global EXTN(jconst_fdct_islow_sse2) PRIVATE
+
+ EXTN(jconst_fdct_islow_sse2):
+
+@@ -101,7 +101,7 @@
+ %define WK_NUM 6
+
+ align 16
+- global EXTN(jsimd_fdct_islow_sse2)
++ global EXTN(jsimd_fdct_islow_sse2) PRIVATE
+
+ EXTN(jsimd_fdct_islow_sse2):
+ push ebp
+Index: simd/jcgryss2.asm
+===================================================================
+--- simd/jcgryss2.asm (revision 677)
++++ simd/jcgryss2.asm (working copy)
+@@ -39,7 +39,7 @@
+
+ align 16
+
+- global EXTN(jsimd_rgb_gray_convert_sse2)
++ global EXTN(jsimd_rgb_gray_convert_sse2) PRIVATE
+
+ EXTN(jsimd_rgb_gray_convert_sse2):
+ push ebp
+Index: simd/jccolmmx.asm
+===================================================================
+--- simd/jccolmmx.asm (revision 677)
++++ simd/jccolmmx.asm (working copy)
+@@ -37,7 +37,7 @@
+ SECTION SEG_CONST
+
+ alignz 16
+- global EXTN(jconst_rgb_ycc_convert_mmx)
++ global EXTN(jconst_rgb_ycc_convert_mmx) PRIVATE
+
+ EXTN(jconst_rgb_ycc_convert_mmx):
+
+Index: simd/jimmxred.asm
+===================================================================
+--- simd/jimmxred.asm (revision 677)
++++ simd/jimmxred.asm (working copy)
@@ -72,7 +72,7 @@
SECTION SEG_CONST
alignz 16
-- global EXTN(jconst_idct_red_sse2)
-+ global EXTN(jconst_idct_red_sse2) PRIVATE
+- global EXTN(jconst_idct_red_mmx)
++ global EXTN(jconst_idct_red_mmx) PRIVATE
- EXTN(jconst_idct_red_sse2):
+ EXTN(jconst_idct_red_mmx):
-@@ -113,7 +113,7 @@
- %define WK_NUM 2
+@@ -115,7 +115,7 @@
+ ; JCOEF workspace[DCTSIZE2]
align 16
-- global EXTN(jsimd_idct_4x4_sse2)
-+ global EXTN(jsimd_idct_4x4_sse2) PRIVATE
+- global EXTN(jsimd_idct_4x4_mmx)
++ global EXTN(jsimd_idct_4x4_mmx) PRIVATE
- EXTN(jsimd_idct_4x4_sse2):
+ EXTN(jsimd_idct_4x4_mmx):
push ebp
-@@ -424,7 +424,7 @@
+@@ -503,7 +503,7 @@
%define output_col(b) (b)+20 ; JDIMENSION output_col
align 16
-- global EXTN(jsimd_idct_2x2_sse2)
-+ global EXTN(jsimd_idct_2x2_sse2) PRIVATE
+- global EXTN(jsimd_idct_2x2_mmx)
++ global EXTN(jsimd_idct_2x2_mmx) PRIVATE
- EXTN(jsimd_idct_2x2_sse2):
+ EXTN(jsimd_idct_2x2_mmx):
push ebp
-Index: simd/jdclrss2.asm
+Index: simd/jsimdext.inc
===================================================================
---- simd/jdclrss2.asm (revision 64575)
-+++ simd/jdclrss2.asm (working copy)
-@@ -19,8 +19,12 @@
- %include "jcolsamp.inc"
-
- ; --------------------------------------------------------------------------
-+%ifndef NEED_SECTION
-+%define NEED_SECTION
- SECTION SEG_TEXT
- BITS 32
+--- simd/jsimdext.inc (revision 677)
++++ simd/jsimdext.inc (working copy)
+@@ -373,4 +373,14 @@
+ ;
+ %include "jsimdcfg.inc"
+
++; Begin chromium edits
++%ifdef MACHO ; ----(nasm -fmacho -DMACHO ...)--------
++%define PRIVATE :private_extern
++%elifdef ELF ; ----(nasm -felf[64] -DELF ...)------------
++%define PRIVATE :hidden
++%else
++%define PRIVATE
+%endif
++; End chromium edits
+
- ;
- ; Convert some rows of samples to the output colorspace.
- ;
-@@ -42,7 +46,7 @@
+ ; --------------------------------------------------------------------------
+Index: simd/jdclrmmx.asm
+===================================================================
+--- simd/jdclrmmx.asm (revision 677)
++++ simd/jdclrmmx.asm (working copy)
+@@ -40,7 +40,7 @@
%define gotptr wk(0)-SIZEOF_POINTER ; void * gotptr
align 16
+- global EXTN(jsimd_ycc_rgb_convert_mmx)
++ global EXTN(jsimd_ycc_rgb_convert_mmx) PRIVATE
+
+ EXTN(jsimd_ycc_rgb_convert_mmx):
+ push ebp
+Index: simd/jccolss2.asm
+===================================================================
+--- simd/jccolss2.asm (revision 677)
++++ simd/jccolss2.asm (working copy)
+@@ -34,7 +34,7 @@
+ SECTION SEG_CONST
+
+ alignz 16
+- global EXTN(jconst_rgb_ycc_convert_sse2)
++ global EXTN(jconst_rgb_ycc_convert_sse2) PRIVATE
+
+ EXTN(jconst_rgb_ycc_convert_sse2):
+
+Index: simd/jisseflt.asm
+===================================================================
+--- simd/jisseflt.asm (revision 677)
++++ simd/jisseflt.asm (working copy)
+@@ -37,7 +37,7 @@
+ SECTION SEG_CONST
+
+ alignz 16
+- global EXTN(jconst_idct_float_sse)
++ global EXTN(jconst_idct_float_sse) PRIVATE
+
+ EXTN(jconst_idct_float_sse):
+
+@@ -73,7 +73,7 @@
+ ; FAST_FLOAT workspace[DCTSIZE2]
+
+ align 16
+- global EXTN(jsimd_idct_float_sse)
++ global EXTN(jsimd_idct_float_sse) PRIVATE
+
+ EXTN(jsimd_idct_float_sse):
+ push ebp
+Index: simd/jcqnts2i-64.asm
+===================================================================
+--- simd/jcqnts2i-64.asm (revision 677)
++++ simd/jcqnts2i-64.asm (working copy)
+@@ -36,7 +36,7 @@
+ ; r12 = DCTELEM * workspace
+
+ align 16
+- global EXTN(jsimd_convsamp_sse2)
++ global EXTN(jsimd_convsamp_sse2) PRIVATE
+
+ EXTN(jsimd_convsamp_sse2):
+ push rbp
+@@ -112,7 +112,7 @@
+ ; r12 = DCTELEM * workspace
+
+ align 16
+- global EXTN(jsimd_quantize_sse2)
++ global EXTN(jsimd_quantize_sse2) PRIVATE
+
+ EXTN(jsimd_quantize_sse2):
+ push rbp
+Index: simd/jdclrss2.asm
+===================================================================
+--- simd/jdclrss2.asm (revision 677)
++++ simd/jdclrss2.asm (working copy)
+@@ -40,7 +40,7 @@
+ %define gotptr wk(0)-SIZEOF_POINTER ; void * gotptr
+
+ align 16
- global EXTN(jsimd_ycc_rgb_convert_sse2)
+ global EXTN(jsimd_ycc_rgb_convert_sse2) PRIVATE
EXTN(jsimd_ycc_rgb_convert_sse2):
push ebp
-@@ -304,6 +308,41 @@
+@@ -302,6 +302,41 @@
movdqa xmmA,xmmD
sub ecx, byte SIZEOF_XMMWORD
.column_st15:
@@ -1665,7 +1756,7 @@
mov eax,ecx
xor ecx, byte 0x0F
shl ecx, 2
-@@ -343,6 +382,7 @@
+@@ -341,6 +376,7 @@
por xmmE,xmmC
.adj0: ; ----------------
maskmovdqu xmmA,xmmE ; movntdqu XMMWORD [edi], xmmA
@@ -1673,7 +1764,7 @@
%else ; RGB_PIXELSIZE == 4 ; -----------
-@@ -428,6 +468,22 @@
+@@ -426,6 +462,22 @@
movdqa xmmA,xmmD
sub ecx, byte SIZEOF_XMMWORD/4
.column_st15:
@@ -1696,7 +1787,7 @@
cmp ecx, byte SIZEOF_XMMWORD/16
jb short .nextrow
mov eax,ecx
-@@ -467,6 +523,7 @@
+@@ -465,6 +517,7 @@
por xmmE,xmmG
.adj0: ; ----------------
maskmovdqu xmmA,xmmE ; movntdqu XMMWORD [edi], xmmA
@@ -1704,22 +1795,9 @@
%endif ; RGB_PIXELSIZE ; ---------------
-Index: simd/jdmerss2.asm
-===================================================================
---- simd/jdmerss2.asm (revision 64575)
-+++ simd/jdmerss2.asm (working copy)
-@@ -35,7 +35,7 @@
- SECTION SEG_CONST
-
- alignz 16
-- global EXTN(jconst_merged_upsample_sse2)
-+ global EXTN(jconst_merged_upsample_sse2) PRIVATE
-
- EXTN(jconst_merged_upsample_sse2):
-
Index: simd/jcqntsse.asm
===================================================================
---- simd/jcqntsse.asm (revision 64575)
+--- simd/jcqntsse.asm (revision 677)
+++ simd/jcqntsse.asm (working copy)
@@ -35,7 +35,7 @@
%define workspace ebp+16 ; FAST_FLOAT * workspace
@@ -1739,31 +1817,9 @@
EXTN(jsimd_quantize_float_sse):
push ebp
-Index: simd/jfss2fst-64.asm
-===================================================================
---- simd/jfss2fst-64.asm (revision 64575)
-+++ simd/jfss2fst-64.asm (working copy)
-@@ -53,7 +53,7 @@
- %define CONST_SHIFT (16 - PRE_MULTIPLY_SCALE_BITS - CONST_BITS)
-
- alignz 16
-- global EXTN(jconst_fdct_ifast_sse2)
-+ global EXTN(jconst_fdct_ifast_sse2) PRIVATE
-
- EXTN(jconst_fdct_ifast_sse2):
-
-@@ -80,7 +80,7 @@
- %define WK_NUM 2
-
- align 16
-- global EXTN(jsimd_fdct_ifast_sse2)
-+ global EXTN(jsimd_fdct_ifast_sse2) PRIVATE
-
- EXTN(jsimd_fdct_ifast_sse2):
- push rbp
Index: simd/jiss2int-64.asm
===================================================================
---- simd/jiss2int-64.asm (revision 64575)
+--- simd/jiss2int-64.asm (revision 677)
+++ simd/jiss2int-64.asm (working copy)
@@ -67,7 +67,7 @@
SECTION SEG_CONST
@@ -1785,7 +1841,7 @@
push rbp
Index: simd/jfmmxfst.asm
===================================================================
---- simd/jfmmxfst.asm (revision 64575)
+--- simd/jfmmxfst.asm (revision 677)
+++ simd/jfmmxfst.asm (working copy)
@@ -52,7 +52,7 @@
%define CONST_SHIFT (16 - PRE_MULTIPLY_SCALE_BITS - CONST_BITS)
« no previous file with comments | « third_party/libjpeg_turbo/example.c ('k') | third_party/libjpeg_turbo/jaricom.c » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698