Add ARM code implementation of Scaler2x, and enable it for the WinCE
port. svn-id: r42645
This commit is contained in:
Robin Watts
parent
3a3e7acf51
commit
64ebb586cd
5 changed files with 204 additions and 0 deletions
|
|
@ -76,6 +76,7 @@ USE_ARM_SOUND_ASM = 1
|
|||
USE_ARM_SMUSH_ASM = 1
|
||||
USE_ARM_GFX_ASM = 1
|
||||
USE_ARM_COSTUME_ASM = 1
|
||||
USE_ARM_SCALER_ASM = 1
|
||||
|
||||
########################################################################
|
||||
## Hopefully you shouldn't need to change anything below here. ##
|
||||
|
|
@ -167,6 +168,10 @@ ifdef USE_ARM_COSTUME_ASM
|
|||
DEFINES += -DUSE_ARM_COSTUME_ASM
|
||||
endif
|
||||
|
||||
ifdef USE_ARM_SCALER_ASM
|
||||
DEFINES += -DUSE_ARM_SCALER_ASM
|
||||
endif
|
||||
|
||||
########################################################################
|
||||
# Targets follow here
|
||||
|
||||
|
|
|
|||
|
|
@ -35,6 +35,11 @@ MODULE_OBJS += \
|
|||
scaler/scale3x.o \
|
||||
scaler/scalebit.o
|
||||
|
||||
ifdef USE_ARM_SCALER_ASM
|
||||
MODULE_OBJS += \
|
||||
scaler/scale2xARM.o
|
||||
endif
|
||||
|
||||
ifndef DISABLE_HQ_SCALERS
|
||||
MODULE_OBJS += \
|
||||
scaler/hq2x.o \
|
||||
|
|
|
|||
|
|
@ -52,5 +52,13 @@ static inline void scale2x_mmx_emms(void)
|
|||
|
||||
#endif
|
||||
|
||||
#if defined(USE_ARM_SCALER_ASM)
|
||||
|
||||
extern "C" void scale2x_8_arm(scale2x_uint8* dst0, scale2x_uint8* dst1, const scale2x_uint8* src0, const scale2x_uint8* src1, const scale2x_uint8* src2, unsigned count);
|
||||
extern "C" void scale2x_16_arm(scale2x_uint16* dst0, scale2x_uint16* dst1, const scale2x_uint16* src0, const scale2x_uint16* src1, const scale2x_uint16* src2, unsigned count);
|
||||
extern "C" void scale2x_32_arm(scale2x_uint32* dst0, scale2x_uint32* dst1, const scale2x_uint32* src0, const scale2x_uint32* src1, const scale2x_uint32* src2, unsigned count);
|
||||
|
||||
#endif
|
||||
|
||||
#endif
|
||||
|
||||
|
|
|
|||
182
graphics/scaler/scale2xARM.s
Executable file
182
graphics/scaler/scale2xARM.s
Executable file
|
|
@ -0,0 +1,182 @@
|
|||
@ ScummVM Scumm Interpreter
|
||||
@ Copyright (C) 2009 The ScummVM project
|
||||
@
|
||||
@ This program is free software@ you can redistribute it and/or
|
||||
@ modify it under the terms of the GNU General Public License
|
||||
@ as published by the Free Software Foundation@ either version 2
|
||||
@ of the License, or (at your option) any later version.
|
||||
@
|
||||
@ This program is distributed in the hope that it will be useful,
|
||||
@ but WITHOUT ANY WARRANTY@ without even the implied warranty of
|
||||
@ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
@ GNU General Public License for more details.
|
||||
@
|
||||
@ You should have received a copy of the GNU General Public License
|
||||
@ along with this program@ if not, write to the Free Software
|
||||
@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
|
||||
@
|
||||
@ $URL$
|
||||
@ $Id$
|
||||
@
|
||||
@ @author Robin Watts (robin@wss.co.uk)
|
||||
|
||||
.text
|
||||
|
||||
.global scale2x_8_arm
|
||||
.global scale2x_16_arm
|
||||
.global scale2x_32_arm
|
||||
|
||||
@ r0 = dst0
|
||||
@ r1 = dst1
|
||||
@ r2 = src
|
||||
@ r3 = src_prev
|
||||
@ r4 = src_next
|
||||
@ r5 = len
|
||||
|
||||
|
||||
@ We hold: r10 B
|
||||
@ r8 r14 r7 D E F
|
||||
@ r12 H
|
||||
scale2x_8_arm:
|
||||
STMFD r13!,{r4-r5,r7-r8,r10-r11,r14}
|
||||
LDR r4, [r13,#4*7]
|
||||
LDR r5, [r13,#4*8]
|
||||
|
||||
LDRB r14,[r2], #1
|
||||
CMP r3, #0 @ Set NE
|
||||
@ Stall on Xscale
|
||||
MOV r8, r14
|
||||
B loop8
|
||||
same8:
|
||||
STRB r14,[r0], #1
|
||||
STRB r14,[r0], #1
|
||||
STRB r14,[r1], #1
|
||||
STRB r14,[r1], #1
|
||||
SUBS r5, r5, #1
|
||||
MOV r8, r14
|
||||
MOV r14,r7
|
||||
BLT end8
|
||||
loop8:
|
||||
LDRNEB r7, [r3], #1 @ As long as we aren't on the last pixel
|
||||
LDRB r10,[r2], #1
|
||||
LDRB r12,[r4], #1
|
||||
@ Stall on Xscale
|
||||
CMP r7, r8
|
||||
CMPNE r10,r12
|
||||
BEQ same8
|
||||
CMP r8, r10
|
||||
STREQB r8, [r0], #1
|
||||
STRNEB r14,[r0], #1
|
||||
CMP r10,r7
|
||||
STREQB r7, [r0], #1
|
||||
STRNEB r14,[r0], #1
|
||||
CMP r8, r12
|
||||
STREQB r8, [r1], #1
|
||||
STRNEB r14,[r1], #1
|
||||
CMP r12,r7
|
||||
STREQB r7, [r1], #1
|
||||
STRNEB r14,[r1], #1
|
||||
|
||||
SUBS r5, r5, #1
|
||||
MOV r8, r14
|
||||
MOV r14,r7
|
||||
BGE loop8
|
||||
end8:
|
||||
|
||||
LDMFD r13!,{r4-r5,r7-r8,r10-r11,PC}
|
||||
|
||||
scale2x_16_arm:
|
||||
STMFD r13!,{r4-r5,r7-r8,r10-r11,r14}
|
||||
LDR r4, [r13,#4*7]
|
||||
LDR r5, [r13,#4*8]
|
||||
|
||||
LDRH r14,[r3], #2
|
||||
CMP r3, #0 @ Set NE
|
||||
@ Stall on Xscale
|
||||
MOV r8, r14
|
||||
B loop16
|
||||
same16:
|
||||
STRH r14,[r0], #2
|
||||
STRH r14,[r0], #2
|
||||
STRH r14,[r1], #2
|
||||
STRH r14,[r1], #2
|
||||
SUBS r5, r5, #1
|
||||
MOV r8, r14
|
||||
MOV r14,r7
|
||||
BLT end16
|
||||
loop16:
|
||||
LDRNEH r7, [r3], #2 @ As long as we aren't on the last pixel
|
||||
LDRH r10,[r2], #2
|
||||
LDRH r12,[r4], #2
|
||||
@ Stall on Xscale
|
||||
CMP r7, r8
|
||||
CMPNE r10,r12
|
||||
BEQ same16
|
||||
CMP r8, r10
|
||||
STREQH r8, [r0], #2
|
||||
STRNEH r14,[r0], #2
|
||||
CMP r10,r7
|
||||
STREQH r7, [r0], #2
|
||||
STRNEH r14,[r0], #2
|
||||
CMP r8, r12
|
||||
STREQH r8, [r1], #2
|
||||
STRNEH r14,[r1], #2
|
||||
CMP r12,r7
|
||||
STREQH r7, [r1], #2
|
||||
STRNEH r14,[r1], #2
|
||||
|
||||
SUBS r5, r5, #1
|
||||
MOV r8, r14
|
||||
MOV r14,r7
|
||||
BGE loop16
|
||||
end16:
|
||||
|
||||
LDMFD r13!,{r4-r5,r7-r8,r10-r11,PC}
|
||||
|
||||
scale2x_32_arm:
|
||||
STMFD r13!,{r4-r5,r7-r8,r10-r11,r14}
|
||||
LDR r4, [r13,#4*7]
|
||||
LDR r5, [r13,#4*8]
|
||||
|
||||
LDR r14,[r3], #4
|
||||
CMP r3, #0 @ Set NE
|
||||
@ Stall on Xscale
|
||||
MOV r8, r14
|
||||
B loop32
|
||||
same32:
|
||||
STR r14,[r0], #4
|
||||
STR r14,[r0], #4
|
||||
STR r14,[r1], #4
|
||||
STR r14,[r1], #4
|
||||
SUBS r5, r5, #1
|
||||
MOV r8, r14
|
||||
MOV r14,r7
|
||||
BLT end32
|
||||
loop32:
|
||||
LDRNE r7, [r3], #4 @ As long as we aren't on the last pixel
|
||||
LDR r10,[r2], #4
|
||||
LDR r12,[r4], #4
|
||||
@ Stall on Xscale
|
||||
CMP r7, r8
|
||||
CMPNE r10,r12
|
||||
BEQ same32
|
||||
CMP r8, r10
|
||||
STREQ r8, [r0], #4
|
||||
STRNE r14,[r0], #4
|
||||
CMP r10,r7
|
||||
STREQ r7, [r0], #4
|
||||
STRNE r14,[r0], #4
|
||||
CMP r8, r12
|
||||
STREQ r8, [r1], #4
|
||||
STRNE r14,[r1], #4
|
||||
CMP r12,r7
|
||||
STREQ r7, [r1], #4
|
||||
STRNE r14,[r1], #4
|
||||
|
||||
SUBS r5, r5, #1
|
||||
MOV r8, r14
|
||||
MOV r14,r7
|
||||
BGE loop32
|
||||
end32:
|
||||
|
||||
LDMFD r13!,{r4-r5,r7-r8,r10-r11,PC}
|
||||
|
|
@ -59,6 +59,10 @@ static inline void stage_scale2x(void* dst0, void* dst1, const void* src0, const
|
|||
case 1 : scale2x_8_mmx(DST(8,0), DST(8,1), SRC(8,0), SRC(8,1), SRC(8,2), pixel_per_row); break;
|
||||
case 2 : scale2x_16_mmx(DST(16,0), DST(16,1), SRC(16,0), SRC(16,1), SRC(16,2), pixel_per_row); break;
|
||||
case 4 : scale2x_32_mmx(DST(32,0), DST(32,1), SRC(32,0), SRC(32,1), SRC(32,2), pixel_per_row); break;
|
||||
#elif defined(USE_ARM_SCALER_ASM)
|
||||
case 1 : scale2x_8_arm(DST(8,0), DST(8,1), SRC(8,0), SRC(8,1), SRC(8,2), pixel_per_row); break;
|
||||
case 2 : scale2x_16_arm(DST(16,0), DST(16,1), SRC(16,0), SRC(16,1), SRC(16,2), pixel_per_row); break;
|
||||
case 4 : scale2x_32_arm(DST(32,0), DST(32,1), SRC(32,0), SRC(32,1), SRC(32,2), pixel_per_row); break;
|
||||
#else
|
||||
case 1 : scale2x_8_def(DST(8,0), DST(8,1), SRC(8,0), SRC(8,1), SRC(8,2), pixel_per_row); break;
|
||||
case 2 : scale2x_16_def(DST(16,0), DST(16,1), SRC(16,0), SRC(16,1), SRC(16,2), pixel_per_row); break;
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue