6502/CLK
1
0
Fork 0
mirror of https://github.com/TomHarte/CLK.git synced 2024-11-23 03:32:32 +00:00
Code Issues Projects Releases Wiki Activity

Shifted responsibility for byte shifts, probably to a more logical place.

Browse Source
This commit is contained in:
Thomas Harte 2016-04-05 22:19:14 -04:00
parent 2248769df9
commit 5aa6da221f
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Machines/Electron/Electron.cpp
View File

@ -604,6 +604,7 @@ inline void Machine::output_pixels(unsigned int number_of_cycles)
case 4: case 6: case 4: case 6:
if(_current_pixel_column&1) if(_current_pixel_column&1)
{ {
_last_pixel_byte <<= 4;
*(uint16_t *)_current_output_target = _paletteTables.forty1bpp[_last_pixel_byte]; *(uint16_t *)_current_output_target = _paletteTables.forty1bpp[_last_pixel_byte];
_current_output_target += 2; _current_output_target += 2;
@ -615,8 +616,8 @@ inline void Machine::output_pixels(unsigned int number_of_cycles)
get_pixel(); get_pixel();
*(uint16_t *)_current_output_target = _paletteTables.forty1bpp[_last_pixel_byte]; *(uint16_t *)_current_output_target = _paletteTables.forty1bpp[_last_pixel_byte];
_current_output_target += 2; _current_output_target += 2;
_last_pixel_byte <<= 4;
_last_pixel_byte <<= 4;
*(uint16_t *)_current_output_target = _paletteTables.forty1bpp[_last_pixel_byte]; *(uint16_t *)_current_output_target = _paletteTables.forty1bpp[_last_pixel_byte];
_current_output_target += 2; _current_output_target += 2;
@ -628,7 +629,6 @@ inline void Machine::output_pixels(unsigned int number_of_cycles)
get_pixel(); get_pixel();
*(uint16_t *)_current_output_target = _paletteTables.forty1bpp[_last_pixel_byte]; *(uint16_t *)_current_output_target = _paletteTables.forty1bpp[_last_pixel_byte];
_current_output_target += 2; _current_output_target += 2;
_last_pixel_byte <<= 4;
_current_pixel_column++; _current_pixel_column++;
} }
break; break;
@ -636,6 +636,7 @@ inline void Machine::output_pixels(unsigned int number_of_cycles)
case 5: case 5:
if(_current_pixel_column&1) if(_current_pixel_column&1)
{ {
_last_pixel_byte <<= 2;
*_current_output_target = _paletteTables.forty2bpp[_last_pixel_byte]; *_current_output_target = _paletteTables.forty2bpp[_last_pixel_byte];
_current_output_target += 1; _current_output_target += 1;
@ -646,9 +647,9 @@ inline void Machine::output_pixels(unsigned int number_of_cycles)
{ {
get_pixel(); get_pixel();
*_current_output_target = _paletteTables.forty2bpp[_last_pixel_byte]; *_current_output_target = _paletteTables.forty2bpp[_last_pixel_byte];
_last_pixel_byte <<= 2;
_current_output_target += 1; _current_output_target += 1;
_last_pixel_byte <<= 2;
*_current_output_target = _paletteTables.forty2bpp[_last_pixel_byte]; *_current_output_target = _paletteTables.forty2bpp[_last_pixel_byte];
_current_output_target += 1; _current_output_target += 1;
@ -659,7 +660,6 @@ inline void Machine::output_pixels(unsigned int number_of_cycles)
{ {
get_pixel(); get_pixel();
*_current_output_target = _paletteTables.forty2bpp[_last_pixel_byte]; *_current_output_target = _paletteTables.forty2bpp[_last_pixel_byte];
_last_pixel_byte <<= 2;
_current_output_target += 1; _current_output_target += 1;
_current_pixel_column++; _current_pixel_column++;
} }