[Scummvm-cvs-logs] SF.net SVN: scummvm: [29740] scummvm/trunk/backends/platform/ds/arm9

[Tramboi at users.sourceforge.net]

Revision: 29740
          http://scummvm.svn.sourceforge.net/scummvm/?rev=29740&view=rev
Author:   Tramboi
Date:     2007-12-06 13:01:54 -0800 (Thu, 06 Dec 2007)

Log Message:
-----------
NDS : ASM cpu scalers fixed, USING_ARM_BLITTERS back

Modified Paths:
--------------
    scummvm/trunk/backends/platform/ds/arm9/makefile
    scummvm/trunk/backends/platform/ds/arm9/source/blitters.h
    scummvm/trunk/backends/platform/ds/arm9/source/blitters_arm.s

Modified: scummvm/trunk/backends/platform/ds/arm9/makefile
===================================================================
--- scummvm/trunk/backends/platform/ds/arm9/makefile	2007-12-06 21:01:37 UTC (rev 29739)
+++ scummvm/trunk/backends/platform/ds/arm9/makefile	2007-12-06 21:01:54 UTC (rev 29740)
@@ -266,7 +266,7 @@
 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\

Modified: scummvm/trunk/backends/platform/ds/arm9/source/blitters.h
===================================================================
--- scummvm/trunk/backends/platform/ds/arm9/source/blitters.h	2007-12-06 21:01:37 UTC (rev 29739)
+++ scummvm/trunk/backends/platform/ds/arm9/source/blitters.h	2007-12-06 21:01:54 UTC (rev 29740)
@@ -23,7 +23,7 @@
  #ifndef _BLITTERS_H_
  #define _BLITTERS_H_
 
-//#define USING_ARM_BLITTERS
+#define USING_ARM_BLITTERS
 
 #ifndef USING_ARM_BLITTERS
 

Modified: scummvm/trunk/backends/platform/ds/arm9/source/blitters_arm.s
===================================================================
--- scummvm/trunk/backends/platform/ds/arm9/source/blitters_arm.s	2007-12-06 21:01:37 UTC (rev 29739)
+++ scummvm/trunk/backends/platform/ds/arm9/source/blitters_arm.s	2007-12-06 21:01:54 UTC (rev 29740)
@@ -237,7 +237,7 @@
 	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 @@
 	BGT	xLoop4
 
 	ADD	r0,r0,r2,LSL #1
-	ADD	r1,r2,r3
+	ADD	r1,r1,r3
 	SUBS	r5,r5,#1
 	BGT	yLoop4
 


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.