diff options
| author | Bertrand Augereau | 2007-12-06 21:01:54 +0000 |
|---|---|---|
| committer | Bertrand Augereau | 2007-12-06 21:01:54 +0000 |
| commit | 4806a5f673648b29c36b9a1f4f985bd7666da102 (patch) | |
| tree | 0e6e92147572a7e5fce2c23bf4d84c3e4dddcbe4 /backends/platform/ds/arm9 | |
| parent | f41fa7b428a263efd0dc2bcfd3595603b7ee018a (diff) | |
| download | scummvm-rg350-4806a5f673648b29c36b9a1f4f985bd7666da102.tar.gz scummvm-rg350-4806a5f673648b29c36b9a1f4f985bd7666da102.tar.bz2 scummvm-rg350-4806a5f673648b29c36b9a1f4f985bd7666da102.zip | |
NDS : ASM cpu scalers fixed, USING_ARM_BLITTERS back
svn-id: r29740
Diffstat (limited to 'backends/platform/ds/arm9')
| -rw-r--r-- | backends/platform/ds/arm9/makefile | 2 | ||||
| -rw-r--r-- | backends/platform/ds/arm9/source/blitters.h | 2 | ||||
| -rw-r--r-- | backends/platform/ds/arm9/source/blitters_arm.s | 4 |
3 files changed, 4 insertions, 4 deletions
diff --git a/backends/platform/ds/arm9/makefile b/backends/platform/ds/arm9/makefile index 6422ae24b5..e10711d2ef 100644 --- a/backends/platform/ds/arm9/makefile +++ b/backends/platform/ds/arm9/makefile @@ -266,7 +266,7 @@ PRE_OBJS_FLAGS = -Wl,--whole-archive POST_OBJS_FLAGS = -Wl,--no-whole-archive endif -PORT_OBJS := $(portdir)/source/blitters.o $(portdir)/source/cdaudio.o $(portdir)/source/dsmain.o \ +PORT_OBJS := $(portdir)/source/blitters_arm.o $(portdir)/source/cdaudio.o $(portdir)/source/dsmain.o \ $(portdir)/../../../fs/ds/ds-fs.o $(portdir)/source/gbampsave.o $(portdir)/source/scummhelp.o\ $(portdir)/source/osystem_ds.o $(portdir)/source/portdefs.o $(portdir)/source/ramsave.o\ $(portdir)/source/scummconsole.o $(portdir)/source/touchkeyboard.o $(portdir)/source/zipreader.o\ diff --git a/backends/platform/ds/arm9/source/blitters.h b/backends/platform/ds/arm9/source/blitters.h index a5bfcac617..f8c65ed167 100644 --- a/backends/platform/ds/arm9/source/blitters.h +++ b/backends/platform/ds/arm9/source/blitters.h @@ -23,7 +23,7 @@ #ifndef _BLITTERS_H_ #define _BLITTERS_H_ -//#define USING_ARM_BLITTERS +#define USING_ARM_BLITTERS #ifndef USING_ARM_BLITTERS diff --git a/backends/platform/ds/arm9/source/blitters_arm.s b/backends/platform/ds/arm9/source/blitters_arm.s index f473f4ccac..12dd2c2b0f 100644 --- a/backends/platform/ds/arm9/source/blitters_arm.s +++ b/backends/platform/ds/arm9/source/blitters_arm.s @@ -237,7 +237,7 @@ xLoop3: BGT xLoop3 ADD r0,r0,r2,LSL #1 - ADD r1,r2,r3,LSL #1 + ADD r1,r1,r3,LSL #1 SUBS r5,r5,#1 BGT yLoop3 @@ -326,7 +326,7 @@ xLoop4: BGT xLoop4 ADD r0,r0,r2,LSL #1 - ADD r1,r2,r3 + ADD r1,r1,r3 SUBS r5,r5,#1 BGT yLoop4 |