Some cleanups in asm code
Drop DO_MMX_ASM and DO_AMD64_ASM compile guards, handled by make. Whitespace cleanups.
This commit is contained in:
parent
af97c7c08e
commit
e9a89df496
|
@ -1,8 +1,6 @@
|
||||||
#include <config.h>
|
#include <config.h>
|
||||||
#include "asm.h"
|
#include "asm.h"
|
||||||
|
|
||||||
#ifdef DO_AMD64_ASM
|
|
||||||
|
|
||||||
/*\
|
/*\
|
||||||
|*| AMD64 SSE2 assembly blending routines for Imlib2
|
|*| AMD64 SSE2 assembly blending routines for Imlib2
|
||||||
|*| Written by John Slaten <zartheenumerator@comcast.net>
|
|*| Written by John Slaten <zartheenumerator@comcast.net>
|
||||||
|
@ -98,9 +96,6 @@ FN_(imlib_amd64_reshade_copy_rgb_to_rgba)
|
||||||
\*/
|
\*/
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
#define ENTER \
|
#define ENTER \
|
||||||
pushq %rbp ; \
|
pushq %rbp ; \
|
||||||
movq %rsp, %rbp ; \
|
movq %rsp, %rbp ; \
|
||||||
|
@ -5521,8 +5516,6 @@ PR_(imlib_amd64_reshade_copy_rgb_to_rgba):
|
||||||
LEAVE
|
LEAVE
|
||||||
SIZE(imlib_amd64_reshade_copy_rgb_to_rgba)
|
SIZE(imlib_amd64_reshade_copy_rgb_to_rgba)
|
||||||
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#ifdef __ELF__
|
#ifdef __ELF__
|
||||||
.section .note.GNU-stack,"",@progbits
|
.section .note.GNU-stack,"",@progbits
|
||||||
#endif
|
#endif
|
||||||
|
|
|
@ -1,8 +1,6 @@
|
||||||
#include <config.h>
|
#include <config.h>
|
||||||
#include "asm.h"
|
#include "asm.h"
|
||||||
|
|
||||||
#ifdef DO_AMD64_ASM
|
|
||||||
|
|
||||||
/*\
|
/*\
|
||||||
|*| AMD64 SSE2 assembly blending routines for Imlib2
|
|*| AMD64 SSE2 assembly blending routines for Imlib2
|
||||||
|*| Written by John Slaten <zartheenumerator@comcast.net>
|
|*| Written by John Slaten <zartheenumerator@comcast.net>
|
||||||
|
@ -106,13 +104,6 @@ FN_(imlib_amd64_reshade_copy_rgb_to_rgba_cmod)
|
||||||
\*/
|
\*/
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
#define ENTER \
|
#define ENTER \
|
||||||
pushq %rbp ; \
|
pushq %rbp ; \
|
||||||
movq %rsp, %rbp ; \
|
movq %rsp, %rbp ; \
|
||||||
|
@ -16778,8 +16769,6 @@ PR_(imlib_amd64_reshade_copy_rgb_to_rgba_cmod):
|
||||||
LEAVE
|
LEAVE
|
||||||
SIZE(imlib_amd64_reshade_copy_rgb_to_rgba_cmod)
|
SIZE(imlib_amd64_reshade_copy_rgb_to_rgba_cmod)
|
||||||
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#ifdef __ELF__
|
#ifdef __ELF__
|
||||||
.section .note.GNU-stack,"",@progbits
|
.section .note.GNU-stack,"",@progbits
|
||||||
#endif
|
#endif
|
||||||
|
|
|
@ -1,8 +1,6 @@
|
||||||
#include <config.h>
|
#include <config.h>
|
||||||
#include "asm.h"
|
#include "asm.h"
|
||||||
|
|
||||||
#ifdef DO_MMX_ASM
|
|
||||||
|
|
||||||
/*\
|
/*\
|
||||||
|*| MMX assembly blending routines for Imlib2
|
|*| MMX assembly blending routines for Imlib2
|
||||||
|*| Written by Willem Monsuwe <willem@stack.nl>
|
|*| Written by Willem Monsuwe <willem@stack.nl>
|
||||||
|
@ -95,7 +93,6 @@ FN_(imlib_mmx_reshade_copy_rgb_to_rgba)
|
||||||
decl %edx ;\
|
decl %edx ;\
|
||||||
jns 8b
|
jns 8b
|
||||||
|
|
||||||
|
|
||||||
/*\ Unset MMX mode, reset registers, return \*/
|
/*\ Unset MMX mode, reset registers, return \*/
|
||||||
#define LEAVE \
|
#define LEAVE \
|
||||||
9: ;\
|
9: ;\
|
||||||
|
@ -1024,8 +1021,6 @@ PR_(imlib_mmx_reshade_copy_rgb_to_rgba):
|
||||||
|
|
||||||
SIZE(imlib_mmx_reshade_copy_rgb_to_rgba)
|
SIZE(imlib_mmx_reshade_copy_rgb_to_rgba)
|
||||||
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#ifdef __ELF__
|
#ifdef __ELF__
|
||||||
.section .note.GNU-stack,"",@progbits
|
.section .note.GNU-stack,"",@progbits
|
||||||
#endif
|
#endif
|
||||||
|
|
|
@ -1,8 +1,6 @@
|
||||||
#include <config.h>
|
#include <config.h>
|
||||||
#include "asm.h"
|
#include "asm.h"
|
||||||
|
|
||||||
#ifdef DO_MMX_ASM
|
|
||||||
|
|
||||||
/*\
|
/*\
|
||||||
|*| MMX assembly blending routines, with colour modding, for Imlib2
|
|*| MMX assembly blending routines, with colour modding, for Imlib2
|
||||||
|*| Written by Willem Monsuwe <willem@stack.nl>
|
|*| Written by Willem Monsuwe <willem@stack.nl>
|
||||||
|
@ -113,7 +111,6 @@ FN_(imlib_mmx_reshade_copy_rgb_to_rgba_cmod)
|
||||||
decl %edx ;\
|
decl %edx ;\
|
||||||
jns 8b
|
jns 8b
|
||||||
|
|
||||||
|
|
||||||
/*\ Unset MMX mode, reset registers, return \*/
|
/*\ Unset MMX mode, reset registers, return \*/
|
||||||
#define LEAVE \
|
#define LEAVE \
|
||||||
9: ;\
|
9: ;\
|
||||||
|
@ -1563,8 +1560,6 @@ PR_(imlib_mmx_reshade_copy_rgb_to_rgba_cmod):
|
||||||
|
|
||||||
SIZE(imlib_mmx_reshade_copy_rgb_to_rgba_cmod)
|
SIZE(imlib_mmx_reshade_copy_rgb_to_rgba_cmod)
|
||||||
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#ifdef __ELF__
|
#ifdef __ELF__
|
||||||
.section .note.GNU-stack,"",@progbits
|
.section .note.GNU-stack,"",@progbits
|
||||||
#endif
|
#endif
|
||||||
|
|
|
@ -1,8 +1,6 @@
|
||||||
#include <config.h>
|
#include <config.h>
|
||||||
#include "asm.h"
|
#include "asm.h"
|
||||||
|
|
||||||
#ifdef DO_MMX_ASM
|
|
||||||
|
|
||||||
/*\
|
/*\
|
||||||
|*| MMX assembly rgba rendering routines for Imlib2
|
|*| MMX assembly rgba rendering routines for Imlib2
|
||||||
|*| Written by Willem Monsuwe <willem@stack.nl>
|
|*| Written by Willem Monsuwe <willem@stack.nl>
|
||||||
|
@ -81,7 +79,6 @@ FN_(imlib_get_cpuid)
|
||||||
ret
|
ret
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
PR_(imlib_mmx_bgr565_fast):
|
PR_(imlib_mmx_bgr565_fast):
|
||||||
LOAD_IMMQ(mul_bgr565, %mm7) /*\ This constant is the only difference \*/
|
LOAD_IMMQ(mul_bgr565, %mm7) /*\ This constant is the only difference \*/
|
||||||
CLEANUP_IMMQ_LOADS(1)
|
CLEANUP_IMMQ_LOADS(1)
|
||||||
|
@ -273,8 +270,6 @@ PR_(imlib_get_cpuid):
|
||||||
|
|
||||||
SIZE(imlib_get_cpuid)
|
SIZE(imlib_get_cpuid)
|
||||||
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#ifdef __ELF__
|
#ifdef __ELF__
|
||||||
.section .note.GNU-stack,"",@progbits
|
.section .note.GNU-stack,"",@progbits
|
||||||
#endif
|
#endif
|
||||||
|
|
|
@ -1,8 +1,6 @@
|
||||||
#include <config.h>
|
#include <config.h>
|
||||||
#include "asm.h"
|
#include "asm.h"
|
||||||
|
|
||||||
#ifdef DO_MMX_ASM
|
|
||||||
|
|
||||||
/*\
|
/*\
|
||||||
|*| MMX assembly rotation routine for Imlib2
|
|*| MMX assembly rotation routine for Imlib2
|
||||||
|*| Written by Willem Monsuwe <willem@stack.nl>
|
|*| Written by Willem Monsuwe <willem@stack.nl>
|
||||||
|
@ -447,8 +445,6 @@ PR_(imlib_mmx_RotateAA):
|
||||||
|
|
||||||
SIZE(imlib_mmx_RotateAA)
|
SIZE(imlib_mmx_RotateAA)
|
||||||
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#ifdef __ELF__
|
#ifdef __ELF__
|
||||||
.section .note.GNU-stack,"",@progbits
|
.section .note.GNU-stack,"",@progbits
|
||||||
#endif
|
#endif
|
||||||
|
|
|
@ -1,8 +1,6 @@
|
||||||
#include <config.h>
|
#include <config.h>
|
||||||
#include "asm.h"
|
#include "asm.h"
|
||||||
|
|
||||||
#ifdef DO_MMX_ASM
|
|
||||||
|
|
||||||
/*\
|
/*\
|
||||||
|*| MMX assembly scaling routine for Imlib2
|
|*| MMX assembly scaling routine for Imlib2
|
||||||
|*| Written by Willem Monsuwe <willem@stack.nl>
|
|*| Written by Willem Monsuwe <willem@stack.nl>
|
||||||
|
@ -788,8 +786,6 @@ PR_(imlib_Scale_mmx_AARGBA):
|
||||||
|
|
||||||
SIZE(imlib_Scale_mmx_AARGBA)
|
SIZE(imlib_Scale_mmx_AARGBA)
|
||||||
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#ifdef __ELF__
|
#ifdef __ELF__
|
||||||
.section .note.GNU-stack,"",@progbits
|
.section .note.GNU-stack,"",@progbits
|
||||||
#endif
|
#endif
|
||||||
|
|
Loading…
Reference in New Issue