#include <stdlib.h>\r
#include <string.h>\r
\r
-#include "basetype.h"\r
-#include "getypes.h"\r
-#include "ram.h"\r
-\r
-#include "bitmap.h"\r
-#include "bitmap._h"\r
-#include "bitmap.__h"\r
-#include "bitmap_blitdata.h"\r
-\r
-#include "vfile.h"\r
+#include "BaseType.h"\r
+#include "GeTypes.h"\r
+#include "Ram.h"\r
+#include "Bitmap.h"\r
+#include "Bitmap._h"\r
+#include "Bitmap.__h"\r
+#include "BitmapBlitData.h"\r
+#include "VFile.h"\r
#include "ErrorLog.h"\r
-\r
-#include "palcreate.h"\r
-#include "palettize.h"\r
-\r
-#include "tsc.h"\r
+#include "PALCreate.h"\r
+#include "Palettize.h"\r
+#include "TSC.h"\r
\r
#ifdef DO_TIMER\r
#include "timer.h"\r
for(y=SizeY;y--;)\r
{\r
\r
- #ifdef DONT_USE_ASM\r
+ // FIXME: asm code\r
+ //#ifdef DONT_USE_ASM\r
\r
for(x=SizeX;x--;)\r
{\r
*DstPtr++ = PalData[pal];\r
}\r
\r
- #else\r
+ /*#else\r
\r
#pragma message("Bitmap_Blitdata :using assembly DePalettize code")\r
// {} is this minimal push safe in _fastcall ? aparently so!\r
SrcPtr += SizeX;\r
DstPtr += SizeX;\r
\r
- #endif\r
+ #endif*/\r
\r
SrcPtr += SrcXtra;\r
DstPtr += DstXtra;\r
\r
for(y=SizeY;y--;)\r
{\r
- #ifdef DONT_USE_ASM\r
+ // FIXME: asm code\r
+ //#ifdef DONT_USE_ASM\r
\r
for(x=SizeX;x--;)\r
{\r
*DstPtr++ = PalData[pal];\r
}\r
\r
- #else\r
+ /*#else\r
\r
#if 1 // {\r
if ( (SizeX&1) == 0 )\r
sub ecx,2\r
jnz moredata2_z\r
\r
-#if 0 //{ \r
- // the old bad way:\r
- // 0.000710 secs\r
- moredata2_z:\r
-\r
- //xor edx,edx //xor edx,0 ; sneaky trick?\r
-\r
- //mov al, BYTE PTR [esi]\r
- movzx eax, BYTE PTR [esi]\r
- inc esi\r
-\r
- movzx edx, WORD PTR [ebp + eax*2]\r
- //mov dx, WORD PTR [ebp + eax*2]\r
-\r
- movzx eax, BYTE PTR [esi]\r
- inc esi\r
-\r
- // make room fo a new dx\r
- //shl edx,16\r
- //mov dx, WORD PTR [ebp + eax*2] // !! STALL !! ; movzx eax, [] instead?\r
- // byte order is wrong; fix with rol; 1 clock\r
- //rol edx,16\r
-\r
- movzx eax, WORD PTR [ebp + eax*2] // can I do this?\r
- shl eax,16\r
- xor edx,eax\r
-\r
- mov DWORD PTR [edi], edx\r
- add edi,4\r
-\r
- sub ecx,2\r
- jnz moredata2_z\r
-#endif //}\r
-\r
pop ebp\r
//popa\r
}\r
SrcPtr += SizeX;\r
DstPtr += SizeX;\r
\r
- #endif\r
+ #endif */\r
\r
SrcPtr += SrcXtra;\r
DstPtr += DstXtra;\r
for(y=SizeY;y--;)\r
{\r
\r
- #ifdef DONT_USE_ASM\r
+ // FIXME: asm code\r
+ //#ifdef DONT_USE_ASM\r
{\r
uint8 *PalPtr;\r
\r
}\r
\r
}\r
- #else\r
+ /*#else\r
\r
__asm\r
{\r
SrcPtr += SizeX;\r
DstPtr += SizeX*3;\r
\r
- #endif\r
+ #endif */\r
\r
SrcPtr += SrcXtra;\r
DstPtr += DstXtra;\r
DstPtr = (uint32 *)DstData;\r
for(y=SizeY;y--;)\r
{\r
- #ifdef DONT_USE_ASM\r
+ // FIXME: asm code\r
+ //#ifdef DONT_USE_ASM\r
\r
for(x=SizeX;x--;)\r
{\r
*DstPtr++ = PalData[pal];\r
}\r
\r
- #else\r
+ /*#else\r
\r
assert( (((uint32)PalData)&3) == 0);\r
assert( (((uint32)DstPtr)&3) == 0);\r
SrcPtr += SizeX;\r
DstPtr += SizeX;\r
\r
- #endif\r
+ #endif*/\r
\r
SrcPtr += SrcXtra;\r
DstPtr += DstXtra;\r