--- hatari/src/convert/spec320x16.c 2019/04/01 07:09:31 1.1.1.2 +++ hatari/src/convert/spec320x16.c 2019/04/01 07:10:26 1.1.1.4 @@ -11,21 +11,6 @@ void ConvertSpec512_320x16Bit(void) edx = 0; /* Clear index for loop */ ScrY = STScreenStartHorizLine; /* Starting line in ST screen */ -/* - - 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 - } -} -/* -NAKED void ConvertSpec512_320x16Bit_YLoop(void) -{ -*/ do /* y-loop */ { @@ -37,45 +22,16 @@ NAKED void ConvertSpec512_320x16Bit_YLoo 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 = (Uint16 *)pPCScreenDest; /* PC format screen */ -/* + esi = (Uint16 *)pPCScreenDest; /* PC format screen */ - // 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) -{ -*/ - -/* - mov eax,[STScreenWidthBytes] // Amount to draw across - shr eax,3 // in 16-pixels(8 bytes) - mov [ScrX],eax -*/ ScrX=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); -/* -x_loop: - // Do 16 pixels at one time - mov ebx,[edi] - mov ecx,4[edi] -*/ + +#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] */ @@ -87,36 +43,59 @@ x_loop: LOW_BUILD_PIXELS_3 ; /* Generate 'ecx' as pixels [8,9,10,11] */ PixelWorkspace[2] = 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) */ - ecx = PixelWorkspace[0]; - PLOT_SPEC512_LEFT_LOW_320_16BIT(0) ; - Spec512_UpdatePaletteSpan(); - /*mov ecx,[PixelWorkspace+1]*/ - ecx = *(Uint32 *)( ((Uint8 *)PixelWorkspace)+1 ); /* FIXME: I guess this will not work on some non-Intel architectures - Thothy */ - PLOT_SPEC512_MID_320_16BIT(1) ; - Spec512_UpdatePaletteSpan(); - /*mov ecx,[PixelWorkspace+5]*/ - ecx = *(Uint32 *)( ((Uint8 *)PixelWorkspace)+5 ); - PLOT_SPEC512_MID_320_16BIT(5) ; - Spec512_UpdatePaletteSpan(); - /*mov ecx,[PixelWorkspace+9]*/ - ecx = *(Uint32 *)( ((Uint8 *)PixelWorkspace)+9 ); - PLOT_SPEC512_MID_320_16BIT(9) ; - Spec512_UpdatePaletteSpan(); - /*mov ecx,[PixelWorkspace+13]*/ - ecx = *(Uint32 *)( ((Uint8 *)PixelWorkspace)+13 ); - PLOT_SPEC512_END_LOW_320_16BIT(13) ; - -/* - 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 -*/ + /* 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 = PixelWorkspace[0]; + PLOT_SPEC512_LEFT_LOW_320_16BIT(0) ; + Spec512_UpdatePaletteSpan(); + + ecx = *(Uint32 *)( ((Uint8 *)PixelWorkspace)+1 ); + PLOT_SPEC512_MID_320_16BIT(1) ; + Spec512_UpdatePaletteSpan(); + + ecx = *(Uint32 *)( ((Uint8 *)PixelWorkspace)+5 ); + PLOT_SPEC512_MID_320_16BIT(5) ; + Spec512_UpdatePaletteSpan(); + + ecx = *(Uint32 *)( ((Uint8 *)PixelWorkspace)+9 ); + PLOT_SPEC512_MID_320_16BIT(9) ; + Spec512_UpdatePaletteSpan(); + + ecx = *(Uint32 *)( ((Uint8 *)PixelWorkspace)+13 ); + PLOT_SPEC512_END_LOW_320_16BIT(13) ; + +#else + /* Well, I didn't get the code above working on big-endian machines, too, + But I hope the following lines are good enough to also do the job... - THH */ + + LOW_BUILD_PIXELS_0 ; + PixelWorkspace[3] = ecx; + LOW_BUILD_PIXELS_1 ; + PixelWorkspace[1] = ecx; + LOW_BUILD_PIXELS_2 ; + PixelWorkspace[2] = ecx; + LOW_BUILD_PIXELS_3 ; + PixelWorkspace[0] = ecx; + + ecx = PixelWorkspace[0]; + PLOT_SPEC512_MID_320_16BIT(0) ; + Spec512_UpdatePaletteSpan(); + + ecx = PixelWorkspace[1]; + PLOT_SPEC512_MID_320_16BIT(4) ; + Spec512_UpdatePaletteSpan(); + + ecx = PixelWorkspace[2]; + PLOT_SPEC512_MID_320_16BIT(8) ; + Spec512_UpdatePaletteSpan(); + + ecx = PixelWorkspace[3]; + PLOT_SPEC512_MID_320_16BIT(12) ; + Spec512_UpdatePaletteSpan(); + +#endif + esi += 16; /* Next PC pixels */ edi += 2; /* Next ST pixels */ ebp += 2; /* Next ST copy pixels */ @@ -131,18 +110,6 @@ x_loop: while( ScrY < STScreenEndHorizLine ); /* Loop on Y */ bScreenContentsChanged = TRUE; -/* - 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 -*/ }