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

YASM support

Browse Source
This commit is contained in:
DRC
2011-05-03 06:32:41 +00:00
parent 6f78dc30c5
commit a399b5bbea
27 changed files with 49 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
ChangeLog.txt
View File

@@ -38,6 +38,8 @@ libjpeg BSD-style license, so the libjpeg-turbo library itself (libjpeg) is no
longer subject to the terms of the wxWindows Library License (libturbojpeg longer subject to the terms of the wxWindows Library License (libturbojpeg
still is-- see README-turbo.txt.) still is-- see README-turbo.txt.)
[11] libjpeg-turbo can now be built with YASM.
1.1.1 1.1.1
===== =====

2
acinclude.m4
View File

@@ -3,7 +3,7 @@
# Check that NASM exists and determine flags # Check that NASM exists and determine flags
AC_DEFUN([AC_PROG_NASM],[ AC_DEFUN([AC_PROG_NASM],[
AC_CHECK_PROGS(NASM, [nasm nasmw]) AC_CHECK_PROGS(NASM, [nasm nasmw yasm])
test -z "$NASM" && AC_MSG_ERROR([no nasm (Netwide Assembler) found]) test -z "$NASM" && AC_MSG_ERROR([no nasm (Netwide Assembler) found])
AC_MSG_CHECKING([for object file format of host system]) AC_MSG_CHECKING([for object file format of host system])

2
simd/jcclrmmx.asm
View File

@@ -19,8 +19,6 @@
%include "jcolsamp.inc" %include "jcolsamp.inc"
; -------------------------------------------------------------------------- ; --------------------------------------------------------------------------
SECTION SEG_TEXT
BITS 32
; ;
; Convert some rows of samples to the output colorspace. ; Convert some rows of samples to the output colorspace.
; ;

2
simd/jcclrss2-64.asm
View File

@@ -17,8 +17,6 @@
%include "jcolsamp.inc" %include "jcolsamp.inc"
; -------------------------------------------------------------------------- ; --------------------------------------------------------------------------
SECTION SEG_TEXT
BITS 64
; ;
; Convert some rows of samples to the output colorspace. ; Convert some rows of samples to the output colorspace.
; ;

2
simd/jcclrss2.asm
View File

@@ -16,8 +16,6 @@
%include "jcolsamp.inc" %include "jcolsamp.inc"
; -------------------------------------------------------------------------- ; --------------------------------------------------------------------------
SECTION SEG_TEXT
BITS 32
; ;
; Convert some rows of samples to the output colorspace. ; Convert some rows of samples to the output colorspace.
; ;

3
simd/jccolmmx.asm
View File

@@ -51,6 +51,9 @@ PD_ONEHALF times 2 dd (1 << (SCALEBITS-1))
alignz 16 alignz 16
; -------------------------------------------------------------------------- ; --------------------------------------------------------------------------
SECTION SEG_TEXT
BITS 32
%include "jcclrmmx.asm" %include "jcclrmmx.asm"
%undef RGB_RED %undef RGB_RED

3
simd/jccolss2-64.asm
View File

@@ -48,6 +48,9 @@ PD_ONEHALF times 4 dd (1 << (SCALEBITS-1))
alignz 16 alignz 16
; -------------------------------------------------------------------------- ; --------------------------------------------------------------------------
SECTION SEG_TEXT
BITS 64
%include "jcclrss2-64.asm" %include "jcclrss2-64.asm"
%undef RGB_RED %undef RGB_RED

3
simd/jccolss2.asm
View File

@@ -48,6 +48,9 @@ PD_ONEHALF times 4 dd (1 << (SCALEBITS-1))
alignz 16 alignz 16
; -------------------------------------------------------------------------- ; --------------------------------------------------------------------------
SECTION SEG_TEXT
BITS 32
%include "jcclrss2.asm" %include "jcclrss2.asm"
%undef RGB_RED %undef RGB_RED

3
simd/jcgrammx.asm
View File

@@ -44,6 +44,9 @@ PD_ONEHALF times 2 dd (1 << (SCALEBITS-1))
alignz 16 alignz 16
; -------------------------------------------------------------------------- ; --------------------------------------------------------------------------
SECTION SEG_TEXT
BITS 32
%include "jcgrymmx.asm" %include "jcgrymmx.asm"
%undef RGB_RED %undef RGB_RED

3
simd/jcgrass2-64.asm
View File

@@ -41,6 +41,9 @@ PD_ONEHALF times 4 dd (1 << (SCALEBITS-1))
alignz 16 alignz 16
; -------------------------------------------------------------------------- ; --------------------------------------------------------------------------
SECTION SEG_TEXT
BITS 64
%include "jcgryss2-64.asm" %include "jcgryss2-64.asm"
%undef RGB_RED %undef RGB_RED

3
simd/jcgrass2.asm
View File

@@ -41,6 +41,9 @@ PD_ONEHALF times 4 dd (1 << (SCALEBITS-1))
alignz 16 alignz 16
; -------------------------------------------------------------------------- ; --------------------------------------------------------------------------
SECTION SEG_TEXT
BITS 32
%include "jcgryss2.asm" %include "jcgryss2.asm"
%undef RGB_RED %undef RGB_RED

2
simd/jcgrymmx.asm
View File

@@ -20,8 +20,6 @@
%include "jcolsamp.inc" %include "jcolsamp.inc"
; -------------------------------------------------------------------------- ; --------------------------------------------------------------------------
SECTION SEG_TEXT
BITS 32
; ;
; Convert some rows of samples to the output colorspace. ; Convert some rows of samples to the output colorspace.
; ;

2
simd/jcgryss2-64.asm
View File

@@ -17,8 +17,6 @@
%include "jcolsamp.inc" %include "jcolsamp.inc"
; -------------------------------------------------------------------------- ; --------------------------------------------------------------------------
SECTION SEG_TEXT
BITS 64
; ;
; Convert some rows of samples to the output colorspace. ; Convert some rows of samples to the output colorspace.
; ;

2
simd/jcgryss2.asm
View File

@@ -17,8 +17,6 @@
%include "jcolsamp.inc" %include "jcolsamp.inc"
; -------------------------------------------------------------------------- ; --------------------------------------------------------------------------
SECTION SEG_TEXT
BITS 32
; ;
; Convert some rows of samples to the output colorspace. ; Convert some rows of samples to the output colorspace.
; ;

2
simd/jdclrmmx.asm
View File

@@ -19,8 +19,6 @@
%include "jcolsamp.inc" %include "jcolsamp.inc"
; -------------------------------------------------------------------------- ; --------------------------------------------------------------------------
SECTION SEG_TEXT
BITS 32
; ;
; Convert some rows of samples to the output colorspace. ; Convert some rows of samples to the output colorspace.
; ;

2
simd/jdclrss2-64.asm
View File

@@ -20,8 +20,6 @@
%include "jcolsamp.inc" %include "jcolsamp.inc"
; -------------------------------------------------------------------------- ; --------------------------------------------------------------------------
SECTION SEG_TEXT
BITS 64
; ;
; Convert some rows of samples to the output colorspace. ; Convert some rows of samples to the output colorspace.
; ;

2
simd/jdclrss2.asm
View File

@@ -19,8 +19,6 @@
%include "jcolsamp.inc" %include "jcolsamp.inc"
; -------------------------------------------------------------------------- ; --------------------------------------------------------------------------
SECTION SEG_TEXT
BITS 32
; ;
; Convert some rows of samples to the output colorspace. ; Convert some rows of samples to the output colorspace.
; ;

3
simd/jdcolmmx.asm
View File

@@ -48,6 +48,9 @@ PD_ONEHALF times 2 dd 1 << (SCALEBITS-1)
alignz 16 alignz 16
; -------------------------------------------------------------------------- ; --------------------------------------------------------------------------
SECTION SEG_TEXT
BITS 32
%include "jdclrmmx.asm" %include "jdclrmmx.asm"
%undef RGB_RED %undef RGB_RED

3
simd/jdcolss2-64.asm
View File

@@ -48,6 +48,9 @@ PD_ONEHALF times 4 dd 1 << (SCALEBITS-1)
alignz 16 alignz 16
; -------------------------------------------------------------------------- ; --------------------------------------------------------------------------
SECTION SEG_TEXT
BITS 64
%include "jdclrss2-64.asm" %include "jdclrss2-64.asm"
%undef RGB_RED %undef RGB_RED

3
simd/jdcolss2.asm
View File

@@ -48,6 +48,9 @@ PD_ONEHALF times 4 dd 1 << (SCALEBITS-1)
alignz 16 alignz 16
; -------------------------------------------------------------------------- ; --------------------------------------------------------------------------
SECTION SEG_TEXT
BITS 32
%include "jdclrss2.asm" %include "jdclrss2.asm"
%undef RGB_RED %undef RGB_RED

3
simd/jdmermmx.asm
View File

@@ -48,6 +48,9 @@ PD_ONEHALF times 2 dd 1 << (SCALEBITS-1)
alignz 16 alignz 16
; -------------------------------------------------------------------------- ; --------------------------------------------------------------------------
SECTION SEG_TEXT
BITS 32
%include "jdmrgmmx.asm" %include "jdmrgmmx.asm"
%undef RGB_RED %undef RGB_RED

3
simd/jdmerss2-64.asm
View File

@@ -48,6 +48,9 @@ PD_ONEHALF times 4 dd 1 << (SCALEBITS-1)
alignz 16 alignz 16
; -------------------------------------------------------------------------- ; --------------------------------------------------------------------------
SECTION SEG_TEXT
BITS 64
%include "jdmrgss2-64.asm" %include "jdmrgss2-64.asm"
%undef RGB_RED %undef RGB_RED

3
simd/jdmerss2.asm
View File

@@ -48,6 +48,9 @@ PD_ONEHALF times 4 dd 1 << (SCALEBITS-1)
alignz 16 alignz 16
; -------------------------------------------------------------------------- ; --------------------------------------------------------------------------
SECTION SEG_TEXT
BITS 32
%include "jdmrgss2.asm" %include "jdmrgss2.asm"
%undef RGB_RED %undef RGB_RED

2
simd/jdmrgmmx.asm
View File

@@ -19,8 +19,6 @@
%include "jcolsamp.inc" %include "jcolsamp.inc"
; -------------------------------------------------------------------------- ; --------------------------------------------------------------------------
SECTION SEG_TEXT
BITS 32
; ;
; Upsample and color convert for the case of 2:1 horizontal and 1:1 vertical. ; Upsample and color convert for the case of 2:1 horizontal and 1:1 vertical.
; ;

2
simd/jdmrgss2-64.asm
View File

@@ -20,8 +20,6 @@
%include "jcolsamp.inc" %include "jcolsamp.inc"
; -------------------------------------------------------------------------- ; --------------------------------------------------------------------------
SECTION SEG_TEXT
BITS 64
; ;
; Upsample and color convert for the case of 2:1 horizontal and 1:1 vertical. ; Upsample and color convert for the case of 2:1 horizontal and 1:1 vertical.
; ;

2
simd/jdmrgss2.asm
View File

@@ -19,8 +19,6 @@
%include "jcolsamp.inc" %include "jcolsamp.inc"
; -------------------------------------------------------------------------- ; --------------------------------------------------------------------------
SECTION SEG_TEXT
BITS 32
; ;
; Upsample and color convert for the case of 2:1 horizontal and 1:1 vertical. ; Upsample and color convert for the case of 2:1 horizontal and 1:1 vertical.
; ;

10
simd/jsimdext.inc
View File

@@ -38,16 +38,26 @@
; -- segment definition -- ; -- segment definition --
; ;
%ifdef __YASM_VER__
%define SEG_TEXT .text align=16
%define SEG_CONST .rdata align=16
%else
%define SEG_TEXT .text align=16 public use32 class=CODE %define SEG_TEXT .text align=16 public use32 class=CODE
%define SEG_CONST .rdata align=16 public use32 class=CONST %define SEG_CONST .rdata align=16 public use32 class=CONST
%endif
%elifdef WIN64 ; ----(nasm -fwin64 -DWIN64 ...)-------- %elifdef WIN64 ; ----(nasm -fwin64 -DWIN64 ...)--------
; * Microsoft Visual C++ ; * Microsoft Visual C++
; -- segment definition -- ; -- segment definition --
; ;
%ifdef __YASM_VER__
%define SEG_TEXT .text align=16
%define SEG_CONST .rdata align=16
%else
%define SEG_TEXT .text align=16 public use64 class=CODE %define SEG_TEXT .text align=16 public use64 class=CODE
%define SEG_CONST .rdata align=16 public use64 class=CONST %define SEG_CONST .rdata align=16 public use64 class=CONST
%endif
%define EXTN(name) name ; foo() -> foo %define EXTN(name) name ; foo() -> foo
%elifdef OBJ32 ; ----(nasm -fobj -DOBJ32 ...)---------- %elifdef OBJ32 ; ----(nasm -fobj -DOBJ32 ...)----------