--- hatari/src/convert/spec320x16.c 2019/04/01 07:09:16 1.1 +++ hatari/src/convert/spec320x16.c 2019/04/09 08:48:54 1.1.1.10 @@ -1,114 +1,101 @@ -// Screen Conversion, Spec512 to 320x16Bit +/* + Hatari - spec320x16.c -void ConvertSpec512_320x16Bit_YLoop(void); -void Line_ConvertSpec512_320x16Bit(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 ConvertSpec512_320x16Bit(void) -{ -fprintf(stderr,"FIXME: Screen Conversion, Spec512 to 320x16Bit\n"); -/* FIXME */ -/* - __asm { - push ebp - push edi - push esi - push ebx - - call Spec512_StartFrame // Start frame, track palettes - - xor edx,edx // Clear index for loop - - mov eax,[STScreenStartHorizLine] - mov [ScrY],eax // Starting line in ST screen - jmp ConvertSpec512_320x16Bit_YLoop - } + Screen Conversion, Spec512 to 320x16Bit */ -} -/* -NAKED void ConvertSpec512_320x16Bit_YLoop(void) -{ - __asm { - call Spec512_StartScanLine // Build up palettes for every 4 pixels, store in 'ScanLinePalettes' - xor edx,edx // Clear index for loop - - // 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 - - jmp Line_ConvertSpec512_320x16Bit - } -} -NAKED void Line_ConvertSpec512_320x16Bit(void) +static void ConvertSpec512_320x16Bit(void) { - __asm { - mov eax,[STScreenWidthBytes] // Amount to draw across - shr eax,3 // in 16-pixels(8 bytes) - mov [ScrX],eax -x_loop: - // Do 16 pixels at one time - mov ebx,[edi] - mov ecx,4[edi] - - // Convert planes to byte indices - as works in wrong order store to workspace so can read back in order! - LOW_BUILD_PIXELS_0 // Generate 'ecx' as pixels [4,5,6,7] - mov [PixelWorkspace+4],ecx - LOW_BUILD_PIXELS_1 // Generate 'ecx' as pixels [12,13,14,15] - mov [PixelWorkspace+12],ecx - LOW_BUILD_PIXELS_2 // Generate 'ecx' as pixels [0,1,2,3] - mov [PixelWorkspace],ecx - LOW_BUILD_PIXELS_3 // Generate 'ecx' as pixels [8,9,10,11] - mov [PixelWorkspace+8],ecx - - // And plot, the Spec512 is offset by 1 pixel and works on 'chunks' of 4 pixels - // So, we plot 1_4_4_3 to give 16 pixels, changing palette between(last one is used for first of next 16-pixels) - mov ecx,[PixelWorkspace] - PLOT_SPEC512_LEFT_LOW_320_16BIT(0) - call Spec512_UpdatePaletteSpan - mov ecx,[PixelWorkspace+1] - PLOT_SPEC512_MID_320_16BIT(2) - call Spec512_UpdatePaletteSpan - mov ecx,[PixelWorkspace+5] - PLOT_SPEC512_MID_320_16BIT(10) - call Spec512_UpdatePaletteSpan - mov ecx,[PixelWorkspace+9] - PLOT_SPEC512_MID_320_16BIT(18) - call Spec512_UpdatePaletteSpan - mov ecx,[PixelWorkspace+13] - PLOT_SPEC512_END_LOW_320_16BIT(26) - - 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 - - call Spec512_EndScanLine - - mov eax,[pPCScreenDest] - add eax,[PCScreenBytesPerLine] // Offset to next line - mov [pPCScreenDest],eax - - inc [ScrY] - mov eax,[STScreenEndHorizLine] - cmp [ScrY],eax - jne ConvertSpec512_320x16Bit_YLoop // And on Y - - mov [bScreenContentsChanged],TRUE - - pop ebx - pop esi - pop edi - pop ebp + Uint32 *edi, *ebp; + Uint16 *esi; + Uint32 eax, ebx, ecx, edx; + Uint32 pixelspace[5]; /* Workspace to store pixels to so can print in right order for Spec512 */ + int y, x; + + /* on x86, unaligned access macro touches also + * next byte, zero it for code checkers + */ + pixelspace[4] = 0; + + Spec512_StartFrame(); /* Start frame, track palettes */ + + edx = 0; /* Clear index for loop */ + + for (y = STScreenStartHorizLine; y < STScreenEndHorizLine; y++) + { + + Spec512_StartScanLine(); /* Build up palettes for every 4 pixels, store in 'ScanLinePalettes' */ + edx = 0; /* Clear index for loop */ + + /* Get screen addresses, 'edi'-ST screen, 'ebp'-Previous ST screen, 'esi'-PC screen */ + 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 = (Uint16 *)pPCScreenDest; /* PC format screen */ + + x = STScreenWidthBytes >> 3; /* Amount to draw across in 16-pixels (8 bytes) */ + + do /* x-loop */ + { + ebx = *edi; /* Do 16 pixels at one time */ + ecx = *(edi+1); + +#if SDL_BYTEORDER == SDL_LIL_ENDIAN + /* Convert planes to byte indices - as works in wrong order store to workspace so can read back in order! */ + LOW_BUILD_PIXELS_0 ; /* Generate 'ecx' as pixels [4,5,6,7] */ + pixelspace[1] = ecx; + LOW_BUILD_PIXELS_1 ; /* Generate 'ecx' as pixels [12,13,14,15] */ + pixelspace[3] = ecx; + LOW_BUILD_PIXELS_2 ; /* Generate 'ecx' as pixels [0,1,2,3] */ + pixelspace[0] = ecx; + LOW_BUILD_PIXELS_3 ; /* Generate 'ecx' as pixels [8,9,10,11] */ + pixelspace[2] = ecx; +#else + LOW_BUILD_PIXELS_0 ; + pixelspace[3] = ecx; + LOW_BUILD_PIXELS_1 ; + pixelspace[1] = ecx; + LOW_BUILD_PIXELS_2 ; + pixelspace[2] = ecx; + LOW_BUILD_PIXELS_3 ; + pixelspace[0] = ecx; +#endif + /* And plot, the Spec512 is offset by 1 pixel and works on 'chunks' of 4 pixels */ + /* So, we plot 1_4_4_3 to give 16 pixels, changing palette between */ + /* (last one is used for first of next 16-pixels) */ + ecx = pixelspace[0]; + PLOT_SPEC512_LEFT_LOW_320_16BIT(0); + Spec512_UpdatePaletteSpan(); + + ecx = GET_SPEC512_OFFSET_PIXELS(pixelspace, 1); + PLOT_SPEC512_MID_320_16BIT(1); + Spec512_UpdatePaletteSpan(); + + ecx = GET_SPEC512_OFFSET_PIXELS(pixelspace, 5); + PLOT_SPEC512_MID_320_16BIT(5); + Spec512_UpdatePaletteSpan(); + + ecx = GET_SPEC512_OFFSET_PIXELS(pixelspace, 9); + PLOT_SPEC512_MID_320_16BIT(9); + Spec512_UpdatePaletteSpan(); + + ecx = GET_SPEC512_OFFSET_FINAL_PIXELS(pixelspace); + PLOT_SPEC512_END_LOW_320_16BIT(13); + + esi += 16; /* Next PC pixels */ + edi += 2; /* Next ST pixels */ + ebp += 2; /* Next ST copy pixels */ + } + while (--x); /* Loop on X */ + + Spec512_EndScanLine(); + + /* Offset to next line */ + pPCScreenDest = (((Uint8 *)pPCScreenDest) + PCScreenBytesPerLine); + } - ret - } + bScreenContentsChanged = true; } -*/