--- hatari/src/convert/med640x16.c 2019/04/01 07:09:50 1.1.1.3 +++ hatari/src/convert/med640x16.c 2019/04/09 08:49:45 1.1.1.9 @@ -1,106 +1,116 @@ -/* Screen Conversion, Medium Res to 640x16Bit */ +/* + 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. -void ConvertMediumRes_640x16Bit(void) -{ - Uint32 *edi, *ebp; - Uint16 *esi; - Uint32 eax, ebx, ecx; - - Convert_StartFrame(); /* Start frame, track palettes */ - ScrY = STScreenStartHorizLine; /* Starting line in ST screen */ - - do /* y-loop */ - { - 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 */ - - if( (AdjustLinePaletteRemap()&0x00030000)==0 ) /* Change palette table */ - Line_ConvertLowRes_640x16Bit(edi, ebp, (Uint32 *)esi, eax, ebx, ecx); - else - Line_ConvertMediumRes_640x16Bit(edi, ebp, esi, eax, ebx, ecx); - - pPCScreenDest = (void *)(((Uint8 *)pPCScreenDest)+PCScreenBytesPerLine*2); /* Offset to next line */ - ScrY += 1; - } - while( ScrY < STScreenEndHorizLine ); /* Loop on Y */ + Screen Conversion, Medium Res to 640x16Bit +*/ +static void ConvertMediumRes_640x16Bit(void) +{ + Uint32 *edi, *ebp; + Uint16 *esi; + Uint32 eax; + int y; + + Convert_StartFrame(); /* Start frame, track palettes */ + + for (y = STScreenStartHorizLine; y < STScreenEndHorizLine; y++) + { + + 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 */ + + if (AdjustLinePaletteRemap(y) & 0x00030000) /* Change palette table */ + Line_ConvertMediumRes_640x16Bit(edi, ebp, esi, eax); + else + Line_ConvertLowRes_640x16Bit(edi, ebp, (Uint32 *)esi, eax); + + /* Offset to next line */ + pPCScreenDest = (((Uint8 *)pPCScreenDest) + PCScreenBytesPerLine * 2); + } } -void Line_ConvertMediumRes_640x16Bit(Uint32 *edi, Uint32 *ebp, Uint16 *esi, Uint32 eax, Uint32 ebx, Uint32 ecx) +static void Line_ConvertMediumRes_640x16Bit(Uint32 *edi, Uint32 *ebp, Uint16 *esi, Uint32 eax) { + Uint32 ebx, ecx; + int x, update, Screen2BytesPerLine; - ScrX=STScreenWidthBytes>>2; /* Amount to draw across in 16-pixels (4 bytes) */ + x = STScreenWidthBytes >> 2; /* Amount to draw across in 16-pixels (4 bytes) */ + Screen2BytesPerLine = PCScreenBytesPerLine/2; + update = ScrUpdateFlag & PALETTEMASK_UPDATEMASK; - do /* x-loop */ - { + do /* x-loop */ + { - /* Do 16 pixels at one time */ - ebx=*edi; + /* Do 16 pixels at one time */ + ebx = *edi; - if( (ScrUpdateFlag&0xe0000000) || ebx!=*ebp ) /* Does differ? */ - { /* copy word */ + if (update || ebx != *ebp) /* Does differ? */ + { + /* copy word */ - bScreenContentsChanged=TRUE; + bScreenContentsChanged = true; #if SDL_BYTEORDER == SDL_BIG_ENDIAN - /* Plot in 'right-order' on big endian systems */ - if( !bScrDoubleY ) /* Double on Y? */ - { - MED_BUILD_PIXELS_0 ; /* Generate 'ecx' as pixels [4,5,6,7] */ - PLOT_MED_640_16BIT(12) ; - MED_BUILD_PIXELS_1 ; /* Generate 'ecx' as pixels [12,13,14,15] */ - PLOT_MED_640_16BIT(4) ; - MED_BUILD_PIXELS_2 ; /* Generate 'ecx' as pixels [0,1,2,3] */ - PLOT_MED_640_16BIT(8) ; - MED_BUILD_PIXELS_3 ; /* Generate 'ecx' as pixels [8,9,10,11] */ - PLOT_MED_640_16BIT(0) ; - } - else - { - MED_BUILD_PIXELS_0 ; /* Generate 'ecx' as pixels [4,5,6,7] */ - PLOT_MED_640_16BIT_DOUBLE_Y(12) ; - MED_BUILD_PIXELS_1 ; /* Generate 'ecx' as pixels [12,13,14,15] */ - PLOT_MED_640_16BIT_DOUBLE_Y(4) ; - MED_BUILD_PIXELS_2 ; /* Generate 'ecx' as pixels [0,1,2,3] */ - PLOT_MED_640_16BIT_DOUBLE_Y(8) ; - MED_BUILD_PIXELS_3 ; /* Generate 'ecx' as pixels [8,9,10,11] */ - PLOT_MED_640_16BIT_DOUBLE_Y(0) ; - } + /* Plot in 'right-order' on big endian systems */ + if (!bScrDoubleY) /* Double on Y? */ + { + MED_BUILD_PIXELS_0 ; /* Generate 'ecx' as pixels [12,13,14,15] */ + PLOT_MED_640_16BIT(12) ; + MED_BUILD_PIXELS_1 ; /* Generate 'ecx' as pixels [4,5,6,7] */ + PLOT_MED_640_16BIT(4) ; + MED_BUILD_PIXELS_2 ; /* Generate 'ecx' as pixels [8,9,10,11] */ + PLOT_MED_640_16BIT(8) ; + MED_BUILD_PIXELS_3 ; /* Generate 'ecx' as pixels [0,1,2,3] */ + PLOT_MED_640_16BIT(0) ; + } + else + { + MED_BUILD_PIXELS_0 ; /* Generate 'ecx' as pixels [12,13,14,15] */ + PLOT_MED_640_16BIT_DOUBLE_Y(12) ; + MED_BUILD_PIXELS_1 ; /* Generate 'ecx' as pixels [4,5,6,7] */ + PLOT_MED_640_16BIT_DOUBLE_Y(4) ; + MED_BUILD_PIXELS_2 ; /* Generate 'ecx' as pixels [8,9,10,11] */ + PLOT_MED_640_16BIT_DOUBLE_Y(8) ; + MED_BUILD_PIXELS_3 ; /* Generate 'ecx' as pixels [0,1,2,3] */ + PLOT_MED_640_16BIT_DOUBLE_Y(0) ; + } #else - /* Plot in 'wrong-order', as ebx is 68000 endian */ - if( !bScrDoubleY ) /* Double on Y? */ - { - MED_BUILD_PIXELS_0 ; /* Generate 'ecx' as pixels [4,5,6,7] */ - PLOT_MED_640_16BIT(4) ; - MED_BUILD_PIXELS_1 ; /* Generate 'ecx' as pixels [12,13,14,15] */ - PLOT_MED_640_16BIT(12) ; - MED_BUILD_PIXELS_2 ; /* Generate 'ecx' as pixels [0,1,2,3] */ - PLOT_MED_640_16BIT(0) ; - MED_BUILD_PIXELS_3 ; /* Generate 'ecx' as pixels [8,9,10,11] */ - PLOT_MED_640_16BIT(8) ; - } - else - { - MED_BUILD_PIXELS_0 ; /* Generate 'ecx' as pixels [4,5,6,7] */ - PLOT_MED_640_16BIT_DOUBLE_Y(4) ; - MED_BUILD_PIXELS_1 ; /* Generate 'ecx' as pixels [12,13,14,15] */ - PLOT_MED_640_16BIT_DOUBLE_Y(12) ; - MED_BUILD_PIXELS_2 ; /* Generate 'ecx' as pixels [0,1,2,3] */ - PLOT_MED_640_16BIT_DOUBLE_Y(0) ; - MED_BUILD_PIXELS_3 ; /* Generate 'ecx' as pixels [8,9,10,11] */ - PLOT_MED_640_16BIT_DOUBLE_Y(8) ; - } + /* Plot in 'wrong-order', as ebx is 68000 endian */ + if (!bScrDoubleY) /* Double on Y? */ + { + MED_BUILD_PIXELS_0 ; /* Generate 'ecx' as pixels [4,5,6,7] */ + PLOT_MED_640_16BIT(4) ; + MED_BUILD_PIXELS_1 ; /* Generate 'ecx' as pixels [12,13,14,15] */ + PLOT_MED_640_16BIT(12) ; + MED_BUILD_PIXELS_2 ; /* Generate 'ecx' as pixels [0,1,2,3] */ + PLOT_MED_640_16BIT(0) ; + MED_BUILD_PIXELS_3 ; /* Generate 'ecx' as pixels [8,9,10,11] */ + PLOT_MED_640_16BIT(8) ; + } + else + { + MED_BUILD_PIXELS_0 ; /* Generate 'ecx' as pixels [4,5,6,7] */ + PLOT_MED_640_16BIT_DOUBLE_Y(4) ; + MED_BUILD_PIXELS_1 ; /* Generate 'ecx' as pixels [12,13,14,15] */ + PLOT_MED_640_16BIT_DOUBLE_Y(12) ; + MED_BUILD_PIXELS_2 ; /* Generate 'ecx' as pixels [0,1,2,3] */ + PLOT_MED_640_16BIT_DOUBLE_Y(0) ; + MED_BUILD_PIXELS_3 ; /* Generate 'ecx' as pixels [8,9,10,11] */ + PLOT_MED_640_16BIT_DOUBLE_Y(8) ; + } #endif - } + } - esi += 16; /* Next PC pixels */ - edi += 1; /* Next ST pixels */ - ebp += 1; /* Next ST copy pixels */ - } - while( --ScrX ); /* Loop on X */ + esi += 16; /* Next PC pixels */ + edi += 1; /* Next ST pixels */ + ebp += 1; /* Next ST copy pixels */ + } + while (--x); /* Loop on X */ }