--- hatari/src/convert/low640x8.c 2019/04/01 07:09:16 1.1 +++ hatari/src/convert/low640x8.c 2019/04/09 08:47:30 1.1.1.6 @@ -1,138 +1,121 @@ -// Screen Conversion, Low Res to 640x8Bit +/* + Hatari - low640x8.c -void ConvertLowRes_640x8Bit_YLoop(void); -void Line_ConvertLowRes_640x8Bit(void); + 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. -void ConvertLowRes_640x8Bit(void) -{ -fprintf(stderr,"FIXME: Screen Conversion, Low Res to 640x8Bit\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_640x8Bit_YLoop - } + Screen conversion function, Low Res to 640x8Bit */ -} -/* -NAKED void ConvertLowRes_640x8Bit_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! - test eax,0x00030000 - jne Line_ConvertMediumRes_640x8Bit // resolution change(MUST be first) - jmp Line_ConvertLowRes_640x8Bit // 0 palette same, can do check tests - } +static void Line_ConvertLowRes_640x8Bit(Uint32 *edi, Uint32 *ebp, Uint32 *esi, Uint32 eax) +{ + Uint32 edx; + Uint32 ebx, ecx, ebpp; + int x, update, Screen4BytesPerLine; + + x = STScreenWidthBytes>>3; /* Amount to draw across in 16-pixels (8 bytes) */ + Screen4BytesPerLine = PCScreenBytesPerLine/4; + update = ScrUpdateFlag & PALETTEMASK_UPDATEMASK; + + do /* x-loop */ + { + /* Do 16 pixels at one time */ + ebx = *edi; + ecx = *(edi+1); + + if (update || ebx!=*ebp || ecx!=*(ebp+1)) /* Does differ? */ + { + /* copy word */ + + bScreenContentsChanged = true; + +#if SDL_BYTEORDER == SDL_BIG_ENDIAN + /* Plot in 'right-order' on big endian systems */ + if (!bScrDoubleY) /* Double on Y? */ + { + /* Plot pixels */ + LOW_BUILD_PIXELS_0 ; /* Generate 'ecx' as pixels [4,5,6,7] */ + PLOT_LOW_640_8BIT(6) ; + LOW_BUILD_PIXELS_1 ; /* Generate 'ecx' as pixels [12,13,14,15] */ + PLOT_LOW_640_8BIT(2) ; + LOW_BUILD_PIXELS_2 ; /* Generate 'ecx' as pixels [0,1,2,3] */ + PLOT_LOW_640_8BIT(4) ; + LOW_BUILD_PIXELS_3 ; /* Generate 'ecx' as pixels [8,9,10,11] */ + PLOT_LOW_640_8BIT(0) ; + } + else + { + /* Plot pixels */ + LOW_BUILD_PIXELS_0 ; /* Generate 'ecx' as pixels [4,5,6,7] */ + PLOT_LOW_640_8BIT_DOUBLE_Y(6) ; + LOW_BUILD_PIXELS_1 ; /* Generate 'ecx' as pixels [12,13,14,15] */ + PLOT_LOW_640_8BIT_DOUBLE_Y(2) ; + LOW_BUILD_PIXELS_2 ; /* Generate 'ecx' as pixels [0,1,2,3] */ + PLOT_LOW_640_8BIT_DOUBLE_Y(4) ; + LOW_BUILD_PIXELS_3 ; /* Generate 'ecx' as pixels [8,9,10,11] */ + PLOT_LOW_640_8BIT_DOUBLE_Y(0) + } +#else + /* Plot in 'wrong-order', as ebx is 68000 endian */ + if (!bScrDoubleY) /* Double on Y? */ + { + /* Plot pixels */ + LOW_BUILD_PIXELS_0 ; /* Generate 'ecx' as pixels [4,5,6,7] */ + PLOT_LOW_640_8BIT(2) ; + LOW_BUILD_PIXELS_1 ; /* Generate 'ecx' as pixels [12,13,14,15] */ + PLOT_LOW_640_8BIT(6) ; + LOW_BUILD_PIXELS_2 ; /* Generate 'ecx' as pixels [0,1,2,3] */ + PLOT_LOW_640_8BIT(0) ; + LOW_BUILD_PIXELS_3 ; /* Generate 'ecx' as pixels [8,9,10,11] */ + PLOT_LOW_640_8BIT(4) ; + } + else + { + /* Plot pixels */ + LOW_BUILD_PIXELS_0 ; /* Generate 'ecx' as pixels [4,5,6,7] */ + PLOT_LOW_640_8BIT_DOUBLE_Y(2) ; + LOW_BUILD_PIXELS_1 ; /* Generate 'ecx' as pixels [12,13,14,15] */ + PLOT_LOW_640_8BIT_DOUBLE_Y(6) ; + LOW_BUILD_PIXELS_2 ; /* Generate 'ecx' as pixels [0,1,2,3] */ + PLOT_LOW_640_8BIT_DOUBLE_Y(0) ; + LOW_BUILD_PIXELS_3 ; /* Generate 'ecx' as pixels [8,9,10,11] */ + PLOT_LOW_640_8BIT_DOUBLE_Y(4) + } +#endif + + } + + esi += 8; /* Next PC pixels */ + edi += 2; /* Next ST pixels */ + ebp += 2; /* Next ST copy pixels */ + } + while (--x); /* Loop on X */ } -NAKED void Line_ConvertLowRes_640x8Bit(void) + + +static void ConvertLowRes_640x8Bit(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 WORD PTR [esi+0],0 - mov WORD PTR [esi+4],0 - mov WORD PTR [esi+8],0 - mov WORD PTR [esi+12],0 - mov WORD PTR [esi+16],0 - mov WORD PTR [esi+20],0 - mov WORD PTR [esi+24],0 - mov WORD PTR [esi+28],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 in 'wrong-order', as ebx is 68000 endian - cmp [bScrDoubleY],TRUE // Double on Y? - je double_y - - // Plot pixels - push ebp - LOW_BUILD_PIXELS_0 // Generate 'ecx' as pixels [4,5,6,7] - PLOT_LOW_640_8BIT(8) - LOW_BUILD_PIXELS_1 // Generate 'ecx' as pixels [12,13,14,15] - PLOT_LOW_640_8BIT(24) - LOW_BUILD_PIXELS_2 // Generate 'ecx' as pixels [0,1,2,3] - PLOT_LOW_640_8BIT(0) - LOW_BUILD_PIXELS_3 // Generate 'ecx' as pixels [8,9,10,11] - PLOT_LOW_640_8BIT(16) - pop ebp - - jmp done_word - -double_y: - push ebp - // Plot pixels - LOW_BUILD_PIXELS_0 // Generate 'ecx' as pixels [4,5,6,7] - PLOT_LOW_640_8BIT_DOUBLE_Y(8) - LOW_BUILD_PIXELS_1 // Generate 'ecx' as pixels [12,13,14,15] - PLOT_LOW_640_8BIT_DOUBLE_Y(24) - LOW_BUILD_PIXELS_2 // Generate 'ecx' as pixels [0,1,2,3] - PLOT_LOW_640_8BIT_DOUBLE_Y(0) - LOW_BUILD_PIXELS_3 // Generate 'ecx' as pixels [8,9,10,11] - PLOT_LOW_640_8BIT_DOUBLE_Y(16) - pop ebp -done_word: - -next_word: - add esi,16*2 // 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 - add eax,[PCScreenBytesPerLine] - mov [pPCScreenDest],eax - - inc [ScrY] - mov eax,[STScreenEndHorizLine] - cmp [ScrY],eax - jne ConvertLowRes_640x8Bit_YLoop // And on Y - - pop ebx - pop esi - pop edi - pop ebp + Uint32 *edi, *ebp; + Uint32 *esi; + Uint32 eax; + int y; + + Convert_StartFrame(); /* Start frame, track palettes */ + + for (y = STScreenStartHorizLine; y < STScreenEndHorizLine; y++) + { + + /* Get screen addresses */ + eax = STScreenLineOffset[y] + STScreenLeftSkipBytes; /* Offset for this line + Amount to skip on left hand side */ + edi = (Uint32 *)((Uint8 *)pSTScreen + eax); /* ST format screen 4-plane 16 colors */ + ebp = (Uint32 *)((Uint8 *)pSTScreenCopy + eax); /* Previous ST format screen */ + esi = (Uint32 *)pPCScreenDest; /* PC format screen */ + + if (AdjustLinePaletteRemap(y) & 0x00030000) /* Change palette table */ + Line_ConvertMediumRes_640x8Bit(edi, ebp, esi, eax); + else + Line_ConvertLowRes_640x8Bit(edi, ebp, esi, eax); - ret - } + pPCScreenDest = (((Uint8 *)pPCScreenDest)+PCScreenBytesPerLine*2); /* Offset to next line */ + } } -*/