--- hatari/src/convert/low320x8.c 2019/04/01 07:09:16 1.1.1.1 +++ hatari/src/convert/low320x8.c 2019/04/01 07:10:44 1.1.1.2 @@ -1,112 +1,78 @@ -// Screen Conversion, Low Res to 320x8Bit - -void ConvertLowRes_320x8Bit_YLoop(void); -void Line_ConvertLowRes_320x8Bit(void); - -void ConvertLowRes_320x8Bit(void) -{ -fprintf(stderr,"FIXME: Screen Conversion, Low Res to 320x8Bit\n"); -/* FIXME */ /* - __asm { - push ebp - push edi - push esi - push ebx - - xor edx,edx // Clear index for loop - - call Convert_StartFrame // Start frame, track palettes - mov eax,[STScreenStartHorizLine] - mov [ScrY],eax // Starting line in ST screen - jmp ConvertLowRes_320x8Bit_YLoop - } + Hatari - low320x8.c + + This file is distributed under the GNU Public License, version 2 or at your + option any later version. Read the file gpl.txt for details. + + Screen conversion function, Low Res to 320x8Bit */ -} -/* -NAKED void ConvertLowRes_320x8Bit_YLoop(void) -{ - __asm { - // Get screen addresses, 'edi'-ST screen, 'ebp'-Previous ST screen, 'esi'-PC screen - mov eax,[ScrY] - mov eax,STScreenLineOffset[eax*4] // Offset for this line - add eax,[STScreenLeftSkipBytes] // Amount to skip on left hand side - mov edi,[pSTScreen] // ST format screen 4-plane 16 colours - add edi,eax - mov ebp,[pSTScreenCopy] // Previous ST format screen - add ebp,eax - mov esi,[pPCScreenDest] // PC format screen, byte per pixel 256 colours - call AdjustLinePaletteRemap // Change palette table, DO NOT corrupt edx,edi,esi or ebp! - jmp Line_ConvertLowRes_320x8Bit // 0 palette same, can do check tests - } -} -NAKED void Line_ConvertLowRes_320x8Bit(void) +void ConvertLowRes_320x8Bit(void) { - __asm { - mov eax,[STScreenWidthBytes] // Amount to draw across - shr eax,3 // in 16-pixels(8 bytes) - mov [ScrX],eax -x_loop: -#ifdef TEST_SCREEN_UPDATE - mov BYTE PTR [esi+0],0 - mov BYTE PTR [esi+2],0 - mov BYTE PTR [esi+4],0 - mov BYTE PTR [esi+6],0 - mov BYTE PTR [esi+8],0 - mov BYTE PTR [esi+10],0 - mov BYTE PTR [esi+12],0 - mov BYTE PTR [esi+14],0 -#endif //TEST_SCREEN_UPDATE - - // Do 16 pixels at one time - mov ebx,[edi] - mov ecx,4[edi] - // Full update? or just test changes? - test [ScrUpdateFlag],0xe0000000 - jne copy_word // Force - // Does differ? - cmp ebx,[ebp] - jne copy_word - cmp ecx,4[ebp] - je next_word // Pixels are same as last frame, so ignore - -copy_word: - mov [bScreenContentsChanged],TRUE - - // Plot pixels - LOW_BUILD_PIXELS_0 // Generate 'ecx' as pixels [4,5,6,7] - PLOT_LOW_320_8BIT(4) - LOW_BUILD_PIXELS_1 // Generate 'ecx' as pixels [12,13,14,15] - PLOT_LOW_320_8BIT(12) - LOW_BUILD_PIXELS_2 // Generate 'ecx' as pixels [0,1,2,3] - PLOT_LOW_320_8BIT(0) - LOW_BUILD_PIXELS_3 // Generate 'ecx' as pixels [8,9,10,11] - PLOT_LOW_320_8BIT(8) - -next_word: - add esi,16 // Next PC pixels - add edi,8 // Next ST pixels - add ebp,8 // Next ST copy pixels - - dec [ScrX] - jne x_loop // Loop on X - - mov eax,[pPCScreenDest] - add eax,[PCScreenBytesPerLine] // Offset to next line - mov [pPCScreenDest],eax - - inc [ScrY] - mov eax,[STScreenEndHorizLine] - cmp [ScrY],eax - jne ConvertLowRes_320x8Bit_YLoop // And on Y - - pop ebx - pop esi - pop edi - pop ebp + Uint32 *edi, *ebp; + Uint32 *esi; + Uint32 eax, edx; + register Uint32 ebx, ecx; + + edx = 0; + + Convert_StartFrame(); /* Start frame, track palettes */ + ScrY = STScreenStartHorizLine; /* Starting line in ST screen */ + + do /* y-loop */ + { + /* Get screen addresses, 'edi'-ST screen, 'ebp'-Previous ST screen, 'esi'-PC screen */ + eax = STScreenLineOffset[ScrY] + STScreenLeftSkipBytes; /* Offset for this line + Amount to skip on left hand side */ + edi = (Uint32 *)((Uint8 *)pSTScreen + eax); /* ST format screen 4-plane 16 colours */ + ebp = (Uint32 *)((Uint8 *)pSTScreenCopy + eax); /* Previous ST format screen */ + esi = (Uint32 *)pPCScreenDest; /* PC format screen, byte per pixel 256 colors */ + + AdjustLinePaletteRemap(); + + ScrX = STScreenWidthBytes>>3; /* Amount to draw across in 16-pixels(8 bytes) */ + + do /* x-loop */ + { + /* Do 16 pixels at one time */ + ebx = *edi; + ecx = *(edi+1); + + if((ScrUpdateFlag&0xe0000000) || ebx!=*ebp || ecx!=*(ebp+1)) /* Does differ? */ + { /* copy word */ + + bScreenContentsChanged = TRUE; + +#if SDL_BYTEORDER == SDL_BIG_ENDIAN + /* Plot pixels */ + LOW_BUILD_PIXELS_0 ; /* Generate 'ecx' as pixels [4,5,6,7] */ + PLOT_LOW_320_8BIT(3) ; + LOW_BUILD_PIXELS_1 ; /* Generate 'ecx' as pixels [12,13,14,15] */ + PLOT_LOW_320_8BIT(1) ; + LOW_BUILD_PIXELS_2 ; /* Generate 'ecx' as pixels [0,1,2,3] */ + PLOT_LOW_320_8BIT(2) ; + LOW_BUILD_PIXELS_3 ; /* Generate 'ecx' as pixels [8,9,10,11] */ + PLOT_LOW_320_8BIT(0) ; +#else + /* Plot pixels */ + LOW_BUILD_PIXELS_0 ; /* Generate 'ecx' as pixels [4,5,6,7] */ + PLOT_LOW_320_8BIT(1) ; + LOW_BUILD_PIXELS_1 ; /* Generate 'ecx' as pixels [12,13,14,15] */ + PLOT_LOW_320_8BIT(3) ; + LOW_BUILD_PIXELS_2 ; /* Generate 'ecx' as pixels [0,1,2,3] */ + PLOT_LOW_320_8BIT(0) ; + LOW_BUILD_PIXELS_3 ; /* Generate 'ecx' as pixels [8,9,10,11] */ + PLOT_LOW_320_8BIT(2) ; +#endif + } + + esi += 4; /* Next PC pixels */ + edi += 2; /* Next ST pixels */ + ebp += 2; /* Next ST copy pixels */ + } + while(--ScrX); /* Loop on X */ - ret + pPCScreenDest = (void *)(((Uint8 *)pPCScreenDest)+PCScreenBytesPerLine); /* Offset to next line */ + ScrY += 1; } + while(ScrY < STScreenEndHorizLine); /* Loop on Y */ } -*/