[Scummvm-cvs-logs] SF.net SVN: scummvm:[34849] scummvm/trunk/backends/platform/ds/arm9/source/ blitters.h

robinwatts at users.sourceforge.net robinwatts at users.sourceforge.net
Sun Oct 26 11:33:04 CET 2008


Revision: 34849
          http://scummvm.svn.sourceforge.net/scummvm/?rev=34849&view=rev
Author:   robinwatts
Date:     2008-10-26 10:33:04 +0000 (Sun, 26 Oct 2008)

Log Message:
-----------
DS port: Declare ARM blitters as being ITCM_CODE, so that we avoid the dreaded
"relocation truncated to fit" error in thumb builds. 

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

Modified: scummvm/trunk/backends/platform/ds/arm9/source/blitters.h
===================================================================
--- scummvm/trunk/backends/platform/ds/arm9/source/blitters.h	2008-10-26 09:15:57 UTC (rev 34848)
+++ scummvm/trunk/backends/platform/ds/arm9/source/blitters.h	2008-10-26 10:33:04 UTC (rev 34849)
@@ -19,7 +19,7 @@
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
  *
  */
- 
+
  #ifndef _BLITTERS_H_
  #define _BLITTERS_H_
 
@@ -29,23 +29,23 @@
 
 namespace DS {
 
-void asmDrawStripToScreen(int height, int width, byte const* text, byte const* src, byte* dst, 
+void asmDrawStripToScreen(int height, int width, byte const* text, byte const* src, byte* dst,
 	int vsPitch, int vmScreenWidth, int textSurfacePitch);
 void asmCopy8Col(byte* dst, int dstPitch, const byte* src, int height);
 void Rescale_320x256xPAL8_To_256x256x1555(u16* dest, const u8* src, int destStride, int srcStride, const u16* palette);
 void Rescale_320x256x1555_To_256x256x1555(u16* dest, const u16* src, int destStride, int srcStride);
 
 }
-	
+
 #else
 
 extern "C" {
 
-void asmDrawStripToScreen(int height, int width, byte const* text, byte const* src, byte* dst, 
+void ITCM_CODE asmDrawStripToScreen(int height, int width, byte const* text, byte const* src, byte* dst,
 	int vsPitch, int vmScreenWidth, int textSurfacePitch);
-void asmCopy8Col(byte* dst, int dstPitch, const byte* src, int height);
-void Rescale_320x256xPAL8_To_256x256x1555(u16* dest, const u8* src, int destStride, int srcStride, const u16* palette, u32 numLines);
-void Rescale_320x256x1555_To_256x256x1555(u16* dest, const u16* src, int destStride, int srcStride);
+void ITCM_CODE asmCopy8Col(byte* dst, int dstPitch, const byte* src, int height);
+void ITCM_CODE Rescale_320x256xPAL8_To_256x256x1555(u16* dest, const u8* src, int destStride, int srcStride, const u16* palette, u32 numLines);
+void ITCM_CODE Rescale_320x256x1555_To_256x256x1555(u16* dest, const u16* src, int destStride, int srcStride);
 
 }
 


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




More information about the Scummvm-git-logs mailing list