SHARP X1 Emulator 'eX1'
SHARP X1twin Emulator 'eX1twin'
SHARP X1turbo Emulator 'eX1turbo'
+ SHARP X1turboZ Emulator 'eX1turboZ'
Origin : X1EMU by KM (kanji rom)
- X-millenium by Yui (ank16 patch)
+ X-millenium by Yui (ank16 patch)
Author : Takeda.Toshiya
Date : 2009.03.14-
- [ display ]
+ [ display ]
*/
#include "display.h"
#include "../hd46505.h"
#include "../i8255.h"
+#ifdef _X1TURBO_FEATURE
+#define EVENT_AFTER_BLANK 0
+#endif
+
+namespace X1 {
+
#ifdef _X1TURBOZ
#define AEN ((zmode1 & 0x80) != 0)
#define C64 ((zmode1 & 0x10) != 0)
palette_pc[i ] = RGB_COLOR((i & 2) ? 255 : 0, (i & 4) ? 255 : 0, (i & 1) ? 255 : 0); // text
palette_pc[i + 8] = RGB_COLOR((i & 2) ? 255 : 0, (i & 4) ? 255 : 0, (i & 1) ? 255 : 0); // cg
}
+#ifdef _X1TURBOZ
+ for(int i = 0; i < 8; i++) {
+ ztpal[i] = ((i & 1) ? 0x03 : 0) | ((i & 2) ? 0x0c : 0) | ((i & 4) ? 0x30 : 0);
+ zpalette_pc[i ] = RGB_COLOR((i & 2) ? 255 : 0, (i & 4) ? 255 : 0, (i & 1) ? 255 : 0); // text
+ zpalette_pc[i + 8] = RGB_COLOR((i & 2) ? 255 : 0, (i & 4) ? 255 : 0, (i & 1) ? 255 : 0); // digital
+ }
+ for(int g = 0; g < 16; g++) {
+ for(int r = 0; r < 16; r++) {
+ for(int b = 0; b < 16; b++) {
+ int num = b + r * 16 + g * 256;
+ zpal[num].b = b;
+ zpal[num].r = r;
+ zpal[num].g = g;
+ zpalette_pc[num + 16] = RGB_COLOR((r * 255) / 15, (g * 255) / 15, (b * 255) / 15);
+ }
+ }
+ }
+#endif
// initialize regs
pal[0] = 0xaa;
// register event
register_frame_event(this);
register_vline_event(this);
+
+ // Copy images to draw buffers.
+ my_memcpy(dr_text, text, sizeof(dr_text));
+ my_memcpy(dr_cg, cg, sizeof(dr_cg));
+ my_memcpy(dr_pri_line, pri_line, sizeof(dr_pri_line));
+ my_memcpy(dr_palette_pc, palette_pc, sizeof(dr_palette_pc));
+ dr_priority = priority;
+#ifdef _X1TURBOZ
+ dr_zpriority = zpriority;
+ my_memcpy(dr_zcg, zcg, sizeof(dr_zcg));
+ my_memcpy(dr_aen_line, aen_line, sizeof(dr_aen_line));
+ my_memcpy(dr_zpalette_pc, zpalette_pc, sizeof(zpalette_pc));
+ zpalette_pc[8 + 0] = zpalette_pc[16 + 0x000];
+ zpalette_pc[8 + 1] = zpalette_pc[16 + 0x00f];
+ zpalette_pc[8 + 2] = zpalette_pc[16 + 0x0f0];
+ zpalette_pc[8 + 3] = zpalette_pc[16 + 0x0ff];
+ zpalette_pc[8 + 4] = zpalette_pc[16 + 0xf00];
+ zpalette_pc[8 + 5] = zpalette_pc[16 + 0xf0f];
+ zpalette_pc[8 + 6] = zpalette_pc[16 + 0xff0];
+ zpalette_pc[8 + 7] = zpalette_pc[16 + 0xfff];
+#endif
}
void DISPLAY::reset()
hireso = true;
#endif
#ifdef _X1TURBOZ
- for(int i = 0; i < 8; i++) {
- ztpal[i] = ((i & 1) ? 0x03 : 0) | ((i & 2) ? 0x0c : 0) | ((i & 4) ? 0x30 : 0);
- zpalette_pc[i ] = RGB_COLOR((i & 2) ? 255 : 0, (i & 4) ? 255 : 0, (i & 1) ? 255 : 0); // text
- zpalette_pc[i + 8] = RGB_COLOR((i & 2) ? 255 : 0, (i & 4) ? 255 : 0, (i & 1) ? 255 : 0); // digital
- }
- for(int g = 0; g < 16; g++) {
- for(int r = 0; r < 16; r++) {
- for(int b = 0; b < 16; b++) {
- int num = b + r * 16 + g * 256;
- zpal[num].b = b;
- zpal[num].r = r;
- zpal[num].g = g;
- zpalette_pc[num + 16] = RGB_COLOR((r * 255) / 15, (g * 255) / 15, (b * 255) / 15);
- }
- }
- }
zmode1 = 0;
zpriority = 0;
zadjust = 0;
#endif
cur_line = cur_code = 0;
vblank_clock = 0;
+ cur_vline = 0;
+ cur_blank = true;
kaddr = kofs = kflag = 0;
kanji_ptr = &kanji[0];
-}
+ // Copy images to draw buffers.
+ my_memcpy(dr_text, text, sizeof(dr_text));
+ my_memcpy(dr_cg, cg, sizeof(dr_cg));
+ my_memcpy(dr_pri_line, pri_line, sizeof(dr_pri_line));
+ my_memcpy(dr_palette_pc, palette_pc, sizeof(dr_palette_pc));
+ dr_priority = priority;
#ifdef _X1TURBOZ
-int DISPLAY::get_zpal_num(uint32_t addr, uint32_t data)
-{
- int num = ((data >> 4) & 0x0f) | ((addr << 4) & 0xff0);
-
- if(hireso && !column40) {
- // 8 colors
-// num = ((num & 0x00f) ? 0x00f : 0) | ((num & 0x0f0) ? 0x0f0 : 0) | ((num & 0xf00) ? 0xf00 : 0);
- num &= 0x888;
- num |= num >> 1;
- num |= num >> 2;
- } else
- if(!(!C64 && !hireso && column40)) {
- // 64 colors
- num &= 0xccc;
- num |= num >> 2;
- }
- return num;
+ dr_zpriority = zpriority;
+ my_memcpy(dr_zcg, zcg, sizeof(dr_zcg));
+ my_memcpy(dr_aen_line, aen_line, sizeof(dr_aen_line));
+ my_memcpy(dr_zpalette_pc, zpalette_pc, sizeof(zpalette_pc));
+ zpalette_pc[8 + 0] = zpalette_pc[16 + 0x000];
+ zpalette_pc[8 + 1] = zpalette_pc[16 + 0x00f];
+ zpalette_pc[8 + 2] = zpalette_pc[16 + 0x0f0];
+ zpalette_pc[8 + 3] = zpalette_pc[16 + 0x0ff];
+ zpalette_pc[8 + 4] = zpalette_pc[16 + 0xf00];
+ zpalette_pc[8 + 5] = zpalette_pc[16 + 0xf0f];
+ zpalette_pc[8 + 6] = zpalette_pc[16 + 0xff0];
+ zpalette_pc[8 + 7] = zpalette_pc[16 + 0xfff];
+#endif
}
-#endif
void DISPLAY::write_io8(uint32_t addr, uint32_t data)
{
#ifdef _X1TURBOZ
if(AEN) {
if(APEN && !APRD) {
+ if(!cur_blank) {
+ // wait next blank
+ d_cpu->write_signal(SIG_CPU_BUSREQ, 1, 1);
+ }
int num = get_zpal_num(addr, data);
zpal[num].b = data & 0x0f;
zpalette_pc[num + 16] = RGB_COLOR((zpal[num].r * 255) / 15, (zpal[num].g * 255) / 15, (zpal[num].b * 255) / 15);
#ifdef _X1TURBOZ
if(AEN) {
if(APEN && !APRD) {
+ if(!cur_blank) {
+ // wait next blank
+ d_cpu->write_signal(SIG_CPU_BUSREQ, 1, 1);
+ }
int num = get_zpal_num(addr, data);
zpal[num].r = data & 0x0f;
zpalette_pc[num + 16] = RGB_COLOR((zpal[num].r * 255) / 15, (zpal[num].g * 255) / 15, (zpal[num].b * 255) / 15);
#ifdef _X1TURBOZ
if(AEN) {
if(APEN && !APRD) {
+ if(!cur_blank) {
+ // wait next blank
+ d_cpu->write_signal(SIG_CPU_BUSREQ, 1, 1);
+ }
int num = get_zpal_num(addr, data);
zpal[num].g = data & 0x0f;
zpalette_pc[num + 16] = RGB_COLOR((zpal[num].r * 255) / 15, (zpal[num].g * 255) / 15, (zpal[num].b * 255) / 15);
} else if(id == SIG_DISPLAY_DETECT_VBLANK) {
// hack: cpu detects vblank
vblank_clock = get_current_clock();
+ } else if(id == SIG_DISPLAY_DISP) {
+ bool prev = cur_blank;
+ cur_blank = ((data & mask) == 0); // blank = not disp
+ if(!prev && cur_blank) {
+ // draw line at start of hblank
+#ifdef _X1TURBO_FEATURE
+ if(hireso) {
+ if(cur_vline < 400) {
+ draw_line(cur_vline);
+ }
+ } else {
+#endif
+ if(cur_vline < 200) {
+ draw_line(cur_vline);
+ }
+#ifdef _X1TURBO_FEATURE
+ }
+ // restart cpu after pcg/cgrom/zpal is accessed
+// d_cpu->write_signal(SIG_CPU_BUSREQ, 0, 0);
+ register_event_by_clock(this, EVENT_AFTER_BLANK, 24, false, NULL);
+#endif
+ }
}
}
int vt_total = ((regs[4] & 0x7f) + 1) * ch_height + (regs[5] & 0x1f);
hireso = (vt_total > 400);
#endif
+ int vlen;
+#ifdef _X1TURBO_FEATURE
+ vlen = (hireso) ? 400 : 200;
+#else
+ vlen = 200;
+#endif
+ if(vlen > 0) {
+ // Copy images to draw buffers.
+ my_memcpy(dr_text, text, sizeof(uint8_t) * vlen * (640 + 8));
+ my_memcpy(dr_cg, cg, sizeof(uint8_t) * vlen * 640);
+ my_memcpy(dr_pri_line, pri_line, sizeof(uint8_t) * vlen * 8 * 8);
+ }
+ my_memcpy(dr_palette_pc, palette_pc, sizeof(dr_palette_pc));
+ dr_priority = priority;
+ // initialize draw screen
+ memset(text, 0, sizeof(text));
+ memset(cg, 0, sizeof(cg));
+ memset(pri_line, 0, sizeof(pri_line));
+#ifdef _X1TURBOZ
+ if(vlen > 0) {
+ // Copy images to draw buffers.
+ my_memcpy(&(dr_zcg[0][0][0]), &(zcg[0][0][0]), sizeof(uint8_t) * vlen * 640);
+ //my_memcpy(dr_aen_line, aen_line, sizeof(bool) * vlen);
+ }
+ my_memcpy(dr_aen_line, aen_line, sizeof(aen_line));
+ dr_zpriority = zpriority;
+ my_memcpy(dr_zpalette_pc, zpalette_pc, sizeof(zpalette_pc));
+ zpalette_pc[8 + 0] = zpalette_pc[16 + 0x000];
+ zpalette_pc[8 + 1] = zpalette_pc[16 + 0x00f];
+ zpalette_pc[8 + 2] = zpalette_pc[16 + 0x0f0];
+ zpalette_pc[8 + 3] = zpalette_pc[16 + 0x0ff];
+ zpalette_pc[8 + 4] = zpalette_pc[16 + 0xf00];
+ zpalette_pc[8 + 5] = zpalette_pc[16 + 0xf0f];
+ zpalette_pc[8 + 6] = zpalette_pc[16 + 0xff0];
+ zpalette_pc[8 + 7] = zpalette_pc[16 + 0xfff];
+
+ memset(zcg, 0, sizeof(zcg));
+ memset(aen_line, 0, sizeof(aen_line));
+#endif
+ prev_vert_double = false;
+ raster = 0;
}
void DISPLAY::event_vline(int v, int clock)
{
+ cur_vline = v;
+
+#if 0
+ // Copy images to draw buffers.
+ int vlimit;
#ifdef _X1TURBO_FEATURE
- if(hireso) {
- if(v < 400) {
- draw_line(v);
- }
- } else {
+ vlimit = (hireso) ? 400 : 200;
+#else
+ vlimit = 200;
#endif
- if(v < 200) {
- draw_line(v);
- }
-#ifdef _X1TURBO_FEATURE
+ if((v > vlimit) || (v < 0)) return;
+
+ if(v == vlimit) {
+ my_memcpy(dr_palette_pc, palette_pc, sizeof(palette_pc));
+#ifdef _X1TURBOZ
+ my_memcpy(dr_zpalette_pc, zpalette_pc, sizeof(zpalette_pc));
+#endif
+ // Copy images to draw buffers.
+ //my_memcpy(&(dr_text[v][0]), &(text[v][0]), sizeof(uint8_t) * (640 + 8));
+ //my_memcpy(&(dr_cg[v][0]), &(cg[v][0]), sizeof(uint8_t) * 640);
+ //my_memcpy(&(dr_pri_line[v][0][0]), &(pri_line[v][0][0]), sizeof(uint8_t) * 8 * 8);
+#ifdef _X1TURBOZ
+ //my_memcpy(&(dr_zcg[0][v][0]), &(zcg[0][v][0]), sizeof(uint8_t) * 640);
+ //my_memcpy(&(dr_zcg[1][v][0]), &(zcg[1][v][0]), sizeof(uint8_t) * 640);
+ //dr_aen_line[v] = aen_line[v];
+#endif
+ } else if(v == 0) {
+ return;
}
- // restart cpu after pcg/cgrom is accessed
- d_cpu->write_signal(SIG_CPU_BUSREQ, 0, 0);
+ // Copy images to draw buffers.
+ my_memcpy(&(dr_text[v - 1][0]), &(text[v - 1][0]), sizeof(uint8_t) * (640 + 8));
+ my_memcpy(&(dr_cg[v - 1][0]), &(cg[v -1 ][0]), sizeof(uint8_t) * 640);
+ my_memcpy(&(dr_pri_line[v - 1][0][0]), &(pri_line[v - 1][0][0]), sizeof(uint8_t) * 8 * 8);
+ dr_priority = priority;
+#ifdef _X1TURBOZ
+ my_memcpy(&(dr_zcg[0][v - 1 ][0]), &(zcg[0][v - 1][0]), sizeof(uint8_t) * 640);
+ my_memcpy(&(dr_zcg[1][v - 1][0]), &(zcg[1][v - 1][0]), sizeof(uint8_t) * 640);
+ dr_zpriority = zpriority;
+ dr_aen_line[v - 1] = aen_line[v - 1];
+#endif
#endif
}
+#ifdef _X1TURBO_FEATURE
+void DISPLAY::event_callback(int event_id, int err)
+{
+ if(event_id == EVENT_AFTER_BLANK) {
+ // restart cpu after pcg/cgrom/zpal is accessed
+ d_cpu->write_signal(SIG_CPU_BUSREQ, 0, 0);
+ }
+}
+#endif
+
void DISPLAY::update_crtc()
{
#ifdef _X1TURBO_FEATURE
- if (column40) {
+ if(column40) {
d_crtc->set_char_clock((mode1 & 1) ? VDP_CLOCK * 1.5 / 32.0 : VDP_CLOCK / 32.0);
} else {
d_crtc->set_char_clock((mode1 & 1) ? VDP_CLOCK * 1.5 / 16.0 : VDP_CLOCK / 16.0);
}
#else
- if (column40) {
+ if(column40) {
d_crtc->set_char_clock(VDP_CLOCK / 32.0);
} else {
d_crtc->set_char_clock(VDP_CLOCK / 16.0);
{
#ifdef _X1TURBO_FEATURE
if(mode1 & 0x20) {
- // wait next raster
+ // wait next blank
d_cpu->write_signal(SIG_CPU_BUSREQ, 1, 1);
// from X1EMU
{
#ifdef _X1TURBO_FEATURE
if(mode1 & 0x20) {
- // wait next raster
+ // wait next blank
d_cpu->write_signal(SIG_CPU_BUSREQ, 1, 1);
// from X1EMU
}
} else
#endif
- get_cur_code_line();
+ get_cur_code_line();
}
void DISPLAY::get_cur_code_line()
//#ifdef _X1TURBO_FEATURE
// int ht_clock = hireso ? 161 : 250;
//#else
- #define ht_clock 250
+#define ht_clock 250
//#endif
int clock = get_passed_clock(vblank_clock);
int vt_line = vt_disp * ch_height + (int)(clock / ht_clock);
void DISPLAY::draw_line(int v)
{
- if(v == 0) {
- memset(text, 0, sizeof(text));
- memset(cg, 0, sizeof(cg));
-#ifdef _X1TURBOZ
- memset(zcg, 0, sizeof(zcg));
-#endif
- prev_vert_double = false;
- raster = 0;
- }
if((regs[8] & 0x30) != 0x30) {
if((v % ch_height) == 0) {
draw_text(v / ch_height);
}
#ifdef _X1TURBOZ
- if(AEN) {
- if(!hireso && column40) {
- draw_cg(v, 1);
- }
- zpri_line[v] = zpriority;
+ if(AEN && !hireso && column40) {
+ draw_cg(v, 1);
}
#endif
draw_cg(v, 0);
memcpy(&pri_line[v][0][0], &pri[0][0], sizeof(pri));
- } else {
- memset(&pri_line[v][0][0], 0, sizeof(pri));
+// } else {
+// memset(&pri_line[v][0][0], 0, sizeof(pri));
}
-}
-
#ifdef _X1TURBOZ
-scrntype_t DISPLAY::get_zpriority(uint8_t zpri, uint16_t text, uint16_t cg0, uint16_t cg1)
-{
- uint16_t fore = ((zpri & 0x18) != 0x18) ? cg0 : cg1;
- uint16_t back = ((zpri & 0x18) != 0x18) ? cg1 : cg0;
- uint16_t value;
-
- switch(zpri & 0x13) {
- case 0x00:
- case 0x02:
- value = text ? text : (fore + 16);
- break;
- case 0x01:
- case 0x03:
- value = fore ? (fore + 16) : text;
- break;
- case 0x10:
- value = text ? text : fore ? (fore + 16) : (back + 16);
- break;
- case 0x11:
- value = fore ? (fore + 16) : back ? (back + 16) : text;
- break;
- case 0x12:
- value = fore ? (fore + 16) : text ? text : (back + 16);
- break;
- default: // undefined case :-(
- value = text ? text : fore ? (fore + 16) : (back + 16);
- break;
- }
-// if((mode2 & 0x10) && value == (0x000 + 16)) {
-// return 0;
-// }
-// if((mode2 & 0x20) && value == (0x00f + 16)) {
-// return 0;
-// }
- return zpalette_pc[value];
-}
+ aen_line[v] = AEN;
#endif
-
-#define A2D(a) ((((a) >> 9) & 4) | (((a) >> 6) & 2) | (((a) >> 3) & 1))
+}
void DISPLAY::draw_screen()
{
// copy to real screen
#ifdef _X1TURBOZ
- zpalette_pc[8 + 0] = zpalette_pc[16 + 0x000];
- zpalette_pc[8 + 1] = zpalette_pc[16 + 0x00f];
- zpalette_pc[8 + 2] = zpalette_pc[16 + 0x0f0];
- zpalette_pc[8 + 3] = zpalette_pc[16 + 0x0ff];
- zpalette_pc[8 + 4] = zpalette_pc[16 + 0xf00];
- zpalette_pc[8 + 5] = zpalette_pc[16 + 0xf0f];
- zpalette_pc[8 + 6] = zpalette_pc[16 + 0xff0];
- zpalette_pc[8 + 7] = zpalette_pc[16 + 0xfff];
-
- if(AEN) {
- if(hireso) {
- // 400 lines
- if(column40) {
- // 40 columns
- for(int y = 0; y < 400; y++) {
- scrntype_t* dest = emu->get_screen_buffer(y);
- uint8_t* src_text = text[y];
- uint16_t* src_cg0 = zcg[0][y];
+ dr_zpalette_pc[8 + 0] = dr_zpalette_pc[16 + 0x000];
+ dr_zpalette_pc[8 + 1] = dr_zpalette_pc[16 + 0x00f];
+ dr_zpalette_pc[8 + 2] = dr_zpalette_pc[16 + 0x0f0];
+ dr_zpalette_pc[8 + 3] = dr_zpalette_pc[16 + 0x0ff];
+ dr_zpalette_pc[8 + 4] = dr_zpalette_pc[16 + 0xf00];
+ dr_zpalette_pc[8 + 5] = dr_zpalette_pc[16 + 0xf0f];
+ dr_zpalette_pc[8 + 6] = dr_zpalette_pc[16 + 0xff0];
+ dr_zpalette_pc[8 + 7] = dr_zpalette_pc[16 + 0xfff];
+#endif
+#ifdef _X1TURBO_FEATURE
+ if(hireso) {
+ // 400 lines
+ emu->set_vm_screen_lines(400);
+ if(column40) {
+ // 40 columns
+ for(int y = 0; y < 400; y++) {
+ scrntype_t* dest = emu->get_screen_buffer(y);
+ uint8_t* src_text = dr_text[y];
+#ifdef _X1TURBOZ
+ if(dr_aen_line[y]) {
+ uint16_t* src_cg0 = dr_zcg[0][y];
for(int x = 0, x2 = 0; x < 320; x++, x2 += 2) {
- uint16_t text = src_text[x];
uint16_t cg00 = src_cg0[x] | (src_cg0[x] >> 2);
- if((mode2 & 8) && (src_text[x] == (mode2 & 7)) && !(priority & (1 << A2D(src_cg0[x])))) {
- dest[x2] = dest[x2 + 1] = 0;
- } else {
- dest[x2] = dest[x2 + 1] = get_zpriority(zpri_line[y], text, cg00, cg00);
- }
+ dest[x2] = dest[x2 + 1] = get_zpriority(src_text[x], cg00, cg00);
}
- }
- } else {
- // 80 columns
- for(int y = 0; y < 400; y++) {
- scrntype_t* dest = emu->get_screen_buffer(y);
- uint8_t* src_text = text[y];
- uint16_t* src_cg0 = zcg[0][y];
+ } else {
+#endif
+ uint8_t* src_cg = dr_cg[y];
- for(int x = 0; x < 640; x++) {
- uint16_t text = src_text[x];
- uint16_t cg00 = src_cg0[x] | (src_cg0[x] >> 2);
-
- if((mode2 & 8) && (src_text[x] == (mode2 & 7)) && !(priority & (1 << A2D(src_cg0[x])))) {
- dest[x] = 0;
- } else {
- dest[x] = get_zpriority(zpri_line[y], text, cg00, cg00);
- }
+ for(int x = 0, x2 = 0; x < 320; x++, x2 += 2) {
+#ifdef _X1TURBOZ
+ dest[x2] = dest[x2 + 1] = dr_zpalette_pc[dr_pri_line[y][src_cg[x]][src_text[x]]];
+#else
+ dest[x2] = dest[x2 + 1] = dr_palette_pc[dr_pri_line[y][src_cg[x]][src_text[x]]];
+#endif
}
+#ifdef _X1TURBOZ
}
+#endif
}
- emu->screen_skip_line(false);
} else {
- // 200 lines
- if(column40) {
- // 40 columns
- for(int y = 0; y < 200; y++) {
- scrntype_t* dest0 = emu->get_screen_buffer(y * 2 + 0);
- scrntype_t* dest1 = emu->get_screen_buffer(y * 2 + 1);
- uint8_t* src_text = text[y];
- uint16_t* src_cg0 = zcg[0][y];
- uint16_t* src_cg1 = zcg[1][y];
-
- if(C64) {
- for(int x = 0, x2 = 0; x < 320; x++, x2 += 2) {
- uint16_t text = src_text[x];
- uint16_t cg00 = src_cg0[x] | (src_cg0[x] >> 2);
- uint16_t cg11 = src_cg1[x] | (src_cg1[x] >> 2);
-
- if((mode2 & 8) && (src_text[x] == (mode2 & 7)) && !(priority & (1 << A2D(src_cg0[x])))) {
- dest0[x2] = dest0[x2 + 1] = 0;
- } else {
- dest0[x2] = dest0[x2 + 1] = get_zpriority(zpri_line[y], text, cg00, cg11);
- }
- }
- } else {
- for(int x = 0, x2 = 0; x < 320; x++, x2 += 2) {
- uint16_t text = src_text[x];
- uint16_t cg01 = src_cg0[x] | (src_cg1[x] >> 2);
-
- if((mode2 & 8) && (src_text[x] == (mode2 & 7)) && !(priority & (1 << A2D(src_cg0[x])))) {
- dest0[x2] = dest0[x2 + 1] = 0;
- } else {
- dest0[x2] = dest0[x2 + 1] = get_zpriority(zpri_line[y], text, cg01, cg01);
- }
- }
- }
- if(!config.scan_line) {
- memcpy(dest1, dest0, 640 * sizeof(scrntype_t));
- } else {
- memset(dest1, 0, 640 * sizeof(scrntype_t));
- }
- }
- } else {
- // 80 columns
- for(int y = 0; y < 200; y++) {
- scrntype_t* dest0 = emu->get_screen_buffer(y * 2 + 0);
- scrntype_t* dest1 = emu->get_screen_buffer(y * 2 + 1);
- uint8_t* src_text = text[y];
- uint16_t* src_cg0 = zcg[0][y];
+ // 80 columns
+ for(int y = 0; y < 400; y++) {
+ scrntype_t* dest = emu->get_screen_buffer(y);
+ uint8_t* src_text = dr_text[y];
+#ifdef _X1TURBOZ
+ if(dr_aen_line[y]) {
+ uint16_t* src_cg0 = dr_zcg[0][y];
for(int x = 0; x < 640; x++) {
- uint16_t text = src_text[x];
uint16_t cg00 = src_cg0[x] | (src_cg0[x] >> 2);
- if((mode2 & 8) && (src_text[x] == (mode2 & 7)) && !(priority & (1 << A2D(src_cg0[x])))) {
- dest0[x] = 0;
- } else {
- dest0[x] = get_zpriority(zpri_line[y], text, cg00, cg00);
- }
+ dest[x] = get_zpriority(src_text[x], cg00, cg00);
}
- if(!config.scan_line) {
- memcpy(dest1, dest0, 640 * sizeof(scrntype_t));
- } else {
- memset(dest1, 0, 640 * sizeof(scrntype_t));
- }
- }
- }
- emu->screen_skip_line(true);
- }
- } else
+ } else {
#endif
-#ifdef _X1TURBO_FEATURE
- if(hireso) {
- // 400 lines
- if(column40) {
- // 40 columns
- for(int y = 0; y < 400; y++) {
- scrntype_t* dest = emu->get_screen_buffer(y);
- uint8_t* src_text = text[y];
- uint8_t* src_cg = cg[y];
-
- for(int x = 0, x2 = 0; x < 320; x++, x2 += 2) {
+ uint8_t* src_cg = dr_cg[y];
+
+ for(int x = 0; x < 640; x++) {
#ifdef _X1TURBOZ
- dest[x2] = dest[x2 + 1] = zpalette_pc[pri_line[y][src_cg[x]][src_text[x]]];
+ dest[x] = dr_zpalette_pc[dr_pri_line[y][src_cg[x]][src_text[x]]];
#else
- dest[x2] = dest[x2 + 1] = palette_pc[pri_line[y][src_cg[x]][src_text[x]]];
+ dest[x] = dr_palette_pc[dr_pri_line[y][src_cg[x]][src_text[x]]];
#endif
+ }
+#ifdef _X1TURBOZ
}
- }
- } else {
- // 80 columns
- for(int y = 0; y < 400; y++) {
- scrntype_t* dest = emu->get_screen_buffer(y);
- uint8_t* src_text = text[y];
- uint8_t* src_cg = cg[y];
-
- for(int x = 0; x < 640; x++) {
-//#ifdef _X1TURBOZ
-// dest[x] = zpalette_pc[pri_line[y][src_cg[x]][src_text[x]]];
-//#else
- dest[x] = palette_pc[pri_line[y][src_cg[x]][src_text[x]]];
-//#endif
- }
+#endif
}
}
emu->screen_skip_line(false);
- } else
+ } else {
#endif
- {
+ emu->set_vm_screen_lines(200);
// 200 lines
+ emu->set_vm_screen_lines(200);
+
if(column40) {
// 40 columns
for(int y = 0; y < 200; y++) {
scrntype_t* dest0 = emu->get_screen_buffer(y * 2 + 0);
scrntype_t* dest1 = emu->get_screen_buffer(y * 2 + 1);
- uint8_t* src_text = text[y];
- uint8_t* src_cg = cg[y];
+ uint8_t* src_text = dr_text[y];
+#ifdef _X1TURBOZ
+ if(dr_aen_line[y]) {
+ uint16_t* src_cg0 = dr_zcg[0][y];
+ uint16_t* src_cg1 = dr_zcg[1][y];
+
+ if(C64) {
+ for(int x = 0, x2 = 0; x < 320; x++, x2 += 2) {
+ uint16_t cg00 = src_cg0[x] | (src_cg0[x] >> 2);
+ uint16_t cg11 = src_cg1[x] | (src_cg1[x] >> 2);
+
+ dest0[x2] = dest0[x2 + 1] = get_zpriority(src_text[x], cg00, cg11);
+ }
+ } else {
+ for(int x = 0, x2 = 0; x < 320; x++, x2 += 2) {
+ uint16_t cg01 = src_cg0[x] | (src_cg1[x] >> 2);
+
+ dest0[x2] = dest0[x2 + 1] = get_zpriority(src_text[x], cg01, cg01);
+ }
+ }
+ } else {
+#endif
+ scrntype_t* dest = emu->get_screen_buffer(y);
+ uint8_t* src_cg = dr_cg[y];
- for(int x = 0, x2 = 0; x < 320; x++, x2 += 2) {
+ for(int x = 0, x2 = 0; x < 320; x++, x2 += 2) {
#ifdef _X1TURBOZ
- dest0[x2] = dest0[x2 + 1] = zpalette_pc[pri_line[y][src_cg[x]][src_text[x]]];
+ dest0[x2] = dest0[x2 + 1] = dr_zpalette_pc[dr_pri_line[y][src_cg[x]][src_text[x]]];
#else
- dest0[x2] = dest0[x2 + 1] = palette_pc[pri_line[y][src_cg[x]][src_text[x]]];
+ dest0[x2] = dest0[x2 + 1] = dr_palette_pc[dr_pri_line[y][src_cg[x]][src_text[x]]];
#endif
+ }
+#ifdef _X1TURBOZ
}
+#endif
if(!config.scan_line) {
- memcpy(dest1, dest0, 640 * sizeof(scrntype_t));
+ my_memcpy(dest1, dest0, 640 * sizeof(scrntype_t));
} else {
memset(dest1, 0, 640 * sizeof(scrntype_t));
}
for(int y = 0; y < 200; y++) {
scrntype_t* dest0 = emu->get_screen_buffer(y * 2 + 0);
scrntype_t* dest1 = emu->get_screen_buffer(y * 2 + 1);
- uint8_t* src_text = text[y];
- uint8_t* src_cg = cg[y];
-
- for(int x = 0; x < 640; x++) {
+ uint8_t* src_text = dr_text[y];
+#ifdef _X1TURBOZ
+ if(aen_line[y]) {
+ uint16_t* src_cg0 = dr_zcg[0][y];
+
+ for(int x = 0; x < 640; x++) {
+ uint16_t cg00 = src_cg0[x] | (src_cg0[x] >> 2);
+
+ dest0[x] = get_zpriority(src_text[x], cg00, cg00);
+ }
+ } else {
+#endif
+ uint8_t* src_cg = dr_cg[y];
+
+ for(int x = 0; x < 640; x++) {
#ifdef _X1TURBOZ
- dest0[x] = zpalette_pc[pri_line[y][src_cg[x]][src_text[x]]];
+ dest0[x] = dr_zpalette_pc[dr_pri_line[y][src_cg[x]][src_text[x]]];
#else
- dest0[x] = palette_pc[pri_line[y][src_cg[x]][src_text[x]]];
+ dest0[x] = dr_palette_pc[dr_pri_line[y][src_cg[x]][src_text[x]]];
#endif
+ }
+#ifdef _X1TURBOZ
}
+#endif
if(!config.scan_line) {
- memcpy(dest1, dest0, 640 * sizeof(scrntype_t));
+ my_memcpy(dest1, dest0, 640 * sizeof(scrntype_t));
} else {
memset(dest1, 0, 640 * sizeof(scrntype_t));
}
}
}
emu->screen_skip_line(true);
+#ifdef _X1TURBO_FEATURE
}
+#endif
+
}
void DISPLAY::draw_text(int y)
int shift = 0;
int max_line = 8;
#else
- #define max_line 8
+#define max_line 8
#endif
if(attr & 0x20) {
// pcg
break;
}
uint8_t* d = &text[yy][x << 3];
-
+
if(attr & 0x80) {
// horizontal doubled char
d[ 0] = d[ 1] = ((b & 0x80) >> 7) | ((r & 0x80) >> 6) | ((g & 0x80) >> 5);
d[6] = ((b & 0x02) >> 1) | ((r & 0x02) >> 0) | ((g & 0x02) << 1);
d[7] = ((b & 0x01) >> 0) | ((r & 0x01) << 1) | ((g & 0x01) << 2);
}
+ prev_attr = attr;
}
- prev_attr = attr;
}
if(cur_vert_double && !prev_vert_double) {
prev_vert_double = true;
int ll = hireso ? (l >> 1) : l;
if(mode1 & 4) {
- ofs = (0x400 * (ll & 15)) + (page ? 0xc000 : 0);
+ ofs = (0x400 * (ll & 15));// + (page ? 0xc000 : 0);
} else {
- ofs = (0x800 * (ll & 7)) + (page ? 0xc000 : 0);
+ ofs = (0x800 * (ll & 7));// + (page ? 0xc000 : 0);
}
#else
ofs = 0x800 * (l & 7);
#ifdef _X1TURBOZ
if(AEN) {
/*
- HIRESO=0, WIDTH=40, C64=0: 320x200, 4096 PAGE0:(ADDR 000h-3FFh) + PAGE0:(ADDR 400h-7FFh) + PAGE1:(ADDR 000h-3FFh) + PAGE1:(ADDR 400h-7FFh)
- HIRESO=0, WIDTH=40, C64=1: 320x200, 64,64 PAGE0:(ADDR 000h-3FFh) + PAGE0:(ADDR 400h-7FFh) + PAGE1:(ADDR 000h-3FFh) + PAGE1:(ADDR 400h-7FFh)
- HIRESO=1, WIDTH=40, C64=*: 320x200, 64 PAGE*:(ADDR 000h-3FFh) + PAGE*:(ADDR 400h-7FFh)
- HIRESO=0, WIDTH=80, C64=*: 640x200, 64 PAGE0:(ADDR 000h-7FFh) + PAGE1:(ADDR 000h-7FFh)
- HIRESO=1, WIDTH=80, C64=*: 640x200, 8 PAGE0:(ADDR 000h-7FFh) + PAGE0:(ADDR 000h-7FFh)
+ HIRESO=0, WIDTH=40, C64=0: 320x200, 4096 PAGE0:(ADDR 000h-3FFh) + PAGE0:(ADDR 400h-7FFh) + PAGE1:(ADDR 000h-3FFh) + PAGE1:(ADDR 400h-7FFh)
+ HIRESO=0, WIDTH=40, C64=1: 320x200, 64x2 PAGE0:(ADDR 000h-3FFh) + PAGE0:(ADDR 400h-7FFh) / PAGE1:(ADDR 000h-3FFh) + PAGE1:(ADDR 400h-7FFh)
+ HIRESO=1, WIDTH=40, C64=*: 320x200, 64 PAGE*:(ADDR 000h-3FFh) + PAGE*:(ADDR 400h-7FFh)
+ HIRESO=0, WIDTH=80, C64=*: 640x200, 64 PAGE0:(ADDR 000h-7FFh) + PAGE1:(ADDR 000h-7FFh)
+ HIRESO=1, WIDTH=80, C64=*: 640x200, 8 PAGE0:(ADDR 000h-7FFh) + PAGE0:(ADDR 000h-7FFh)
+
+ HIRESO=0, WIDTH=40, C64=1: 320x200, 64x2
+ mode1 zpriority
+ SCREEN 0 00 00 PAGE0
+ SCREEM 2 18 08 PAGE1
+ SCREEN 4 00 10 PAGE0 > PAGE1
+ SCREEN 6 18 18 PAGE0 < PAGE1
*/
- if(!hireso && column40 && plane) {
- ofs = (ofs < 0xc000) ? (ofs + 0xc000) : (ofs - 0xc000);
+ if(!hireso) {
+ if(column40) {
+ if(C64 && !(zpriority & 0x10)) {
+ if(plane) {
+ my_memcpy(zcg[plane][1], zcg[plane][0], sizeof(uint16_t) * 640);
+ return;
+ }
+ } else {
+ page = plane;
+ }
+ } else {
+ page = 0;
+ }
+ }
+ if(page) {
+ ofs += 0xc000;
}
int ofs_b0 = ofs + 0x0000;
int ofs_r0 = ofs + 0x4000;
int ofs_g0 = ofs + 0x8000;
- int ofs_b1 = column40 ? (ofs_b0 ^ 0x400) : hireso ? ofs_b0 : ((ofs_b0 < 0xc000) ? (ofs_b0 + 0xc000) : (ofs_b0 - 0xc000));
- int ofs_r1 = column40 ? (ofs_r0 ^ 0x400) : hireso ? ofs_r0 : ((ofs_r0 < 0xc000) ? (ofs_r0 + 0xc000) : (ofs_r0 - 0xc000));
- int ofs_g1 = column40 ? (ofs_g0 ^ 0x400) : hireso ? ofs_g0 : ((ofs_g0 < 0xc000) ? (ofs_g0 + 0xc000) : (ofs_g0 - 0xc000));
+ int ofs_b1 = column40 ? (ofs_b0 ^ 0x400) : hireso ? ofs_b0 : (ofs_b0 + 0xc000);
+ int ofs_r1 = column40 ? (ofs_r0 ^ 0x400) : hireso ? ofs_r0 : (ofs_r0 + 0xc000);
+ int ofs_g1 = column40 ? (ofs_g0 ^ 0x400) : hireso ? ofs_g0 : (ofs_g0 + 0xc000);
for(int x = 0; x < hz_disp && x < width; x++) {
src &= column40 ? 0x3ff : 0x7ff;
uint16_t* d = &zcg[plane][line][x << 3];
// MSB <- G0,G1,0,0, R0,R1,0,0, B0,B1,0,0 -> LSB
- d[0] = ((b0 & 0x80) >> 4) | ((b1 & 0x80) >> 5) | ((r0 & 0x80) >> 0) | ((r1 & 0x80) >> 1) | ((g0 & 0x80) << 4) | ((g0 & 0x80) << 3);
- d[1] = ((b0 & 0x40) >> 3) | ((b1 & 0x40) >> 4) | ((r0 & 0x40) << 1) | ((r1 & 0x40) >> 0) | ((g0 & 0x40) << 5) | ((g0 & 0x40) << 4);
- d[2] = ((b0 & 0x20) >> 2) | ((b1 & 0x20) >> 3) | ((r0 & 0x20) << 2) | ((r1 & 0x20) << 1) | ((g0 & 0x20) << 6) | ((g0 & 0x20) << 5);
- d[3] = ((b0 & 0x10) >> 1) | ((b1 & 0x10) >> 2) | ((r0 & 0x10) << 3) | ((r1 & 0x10) << 2) | ((g0 & 0x10) << 7) | ((g0 & 0x10) << 6);
- d[4] = ((b0 & 0x08) >> 0) | ((b1 & 0x08) >> 1) | ((r0 & 0x08) << 4) | ((r1 & 0x08) << 3) | ((g0 & 0x08) << 8) | ((g0 & 0x08) << 7);
- d[5] = ((b0 & 0x04) << 1) | ((b1 & 0x04) >> 0) | ((r0 & 0x04) << 5) | ((r1 & 0x04) << 4) | ((g0 & 0x04) << 9) | ((g0 & 0x04) << 8);
- d[6] = ((b0 & 0x02) << 2) | ((b1 & 0x02) << 1) | ((r0 & 0x02) << 6) | ((r1 & 0x02) << 5) | ((g0 & 0x02) << 10) | ((g0 & 0x02) << 9);
- d[7] = ((b0 & 0x01) << 3) | ((b1 & 0x01) << 2) | ((r0 & 0x01) << 7) | ((r1 & 0x01) << 6) | ((g0 & 0x01) << 11) | ((g0 & 0x01) << 10);
+ d[0] = ((b0 & 0x80) >> 4) | ((b1 & 0x80) >> 5) | ((r0 & 0x80) >> 0) | ((r1 & 0x80) >> 1) | ((g0 & 0x80) << 4) | ((g1 & 0x80) << 3);
+ d[1] = ((b0 & 0x40) >> 3) | ((b1 & 0x40) >> 4) | ((r0 & 0x40) << 1) | ((r1 & 0x40) >> 0) | ((g0 & 0x40) << 5) | ((g1 & 0x40) << 4);
+ d[2] = ((b0 & 0x20) >> 2) | ((b1 & 0x20) >> 3) | ((r0 & 0x20) << 2) | ((r1 & 0x20) << 1) | ((g0 & 0x20) << 6) | ((g1 & 0x20) << 5);
+ d[3] = ((b0 & 0x10) >> 1) | ((b1 & 0x10) >> 2) | ((r0 & 0x10) << 3) | ((r1 & 0x10) << 2) | ((g0 & 0x10) << 7) | ((g1 & 0x10) << 6);
+ d[4] = ((b0 & 0x08) >> 0) | ((b1 & 0x08) >> 1) | ((r0 & 0x08) << 4) | ((r1 & 0x08) << 3) | ((g0 & 0x08) << 8) | ((g1 & 0x08) << 7);
+ d[5] = ((b0 & 0x04) << 1) | ((b1 & 0x04) >> 0) | ((r0 & 0x04) << 5) | ((r1 & 0x04) << 4) | ((g0 & 0x04) << 9) | ((g1 & 0x04) << 8);
+ d[6] = ((b0 & 0x02) << 2) | ((b1 & 0x02) << 1) | ((r0 & 0x02) << 6) | ((r1 & 0x02) << 5) | ((g0 & 0x02) << 10) | ((g1 & 0x02) << 9);
+ d[7] = ((b0 & 0x01) << 3) | ((b1 & 0x01) << 2) | ((r0 & 0x01) << 7) | ((r1 & 0x01) << 6) | ((g0 & 0x01) << 11) | ((g1 & 0x01) << 10);
}
} else
#endif
{
+#ifdef _X1TURBO_FEATURE
+ if(page) {
+ ofs += 0xc000;
+ }
+#endif
int ofs_b = ofs + 0x0000;
int ofs_r = ofs + 0x4000;
int ofs_g = ofs + 0x8000;
}
}
+#ifdef _X1TURBOZ
+int DISPLAY::get_zpal_num(uint32_t addr, uint32_t data)
+{
+ int num = ((data >> 4) & 0x0f) | ((addr << 4) & 0xff0);
+
+ if(hireso && !column40) {
+ // 8 colors
+ num &= 0x888;
+ num |= num >> 1;
+ num |= num >> 2;
+ } else if(!(!hireso && column40 && !C64)) {
+ // 64 colors
+ num &= 0xccc;
+ num |= num >> 2;
+ }
+ return num;
+}
+
+scrntype_t DISPLAY::get_zpriority(uint8_t text, uint16_t cg0, uint16_t cg1)
+{
+ if((mode2 & 8) && (text == (mode2 & 7))) {
+ int digital = ((cg0 >> 9) & 4) | ((cg0 >> 6) & 2) | ((cg0 >> 3) & 1);
+ if(!(dr_priority & (1 << digital))) {
+ return 0;
+ }
+ }
+ uint16_t fore = ((dr_zpriority & 0x18) != 0x18) ? cg0 : cg1;
+ uint16_t back = ((dr_zpriority & 0x18) != 0x18) ? cg1 : cg0;
+ uint16_t disp;
+
+ switch(dr_zpriority & 0x13) {
+ case 0x00:
+ case 0x02:
+ disp = text ? text : (fore + 16);
+ break;
+ case 0x01:
+ case 0x03:
+ disp = fore ? (fore + 16) : text;
+ break;
+ case 0x10:
+ disp = text ? text : fore ? (fore + 16) : (back + 16);
+ break;
+ case 0x11:
+ disp = fore ? (fore + 16) : back ? (back + 16) : text;
+ break;
+ case 0x12:
+ disp = fore ? (fore + 16) : text ? text : (back + 16);
+ break;
+ default: // undefined case :-(
+ disp = text ? text : fore ? (fore + 16) : (back + 16);
+ break;
+ }
+// if((mode2 & 0x10) && disp == (0x000 + 16)) {
+// return 0;
+// }
+// if((mode2 & 0x20) && disp == (0x00f + 16)) {
+// return 0;
+// }
+ return dr_zpalette_pc[disp];
+}
+#endif
+
// kanji rom (from X1EMU by KM)
void DISPLAY::write_kanji(uint32_t addr, uint32_t data)
return (c1 << 8) | c2;
}
-#define STATE_VERSION 3
+#define STATE_VERSION 5
-void DISPLAY::save_state(FILEIO* state_fio)
+bool DISPLAY::process_state(FILEIO* state_fio, bool loading)
{
- state_fio->FputUint32(STATE_VERSION);
- state_fio->FputInt32(this_device_id);
-
- state_fio->Fwrite(vram_t, sizeof(vram_t), 1);
- state_fio->Fwrite(vram_a, sizeof(vram_a), 1);
+ if(!state_fio->StateCheckUint32(STATE_VERSION)) {
+ return false;
+ }
+ if(!state_fio->StateCheckInt32(this_device_id)) {
+ return false;
+ }
+ state_fio->StateArray(vram_t, sizeof(vram_t), 1);
+ state_fio->StateArray(vram_a, sizeof(vram_a), 1);
#ifdef _X1TURBO_FEATURE
- state_fio->Fwrite(vram_k, sizeof(vram_k), 1);
+ state_fio->StateArray(vram_k, sizeof(vram_k), 1);
#endif
- state_fio->Fwrite(pcg_b, sizeof(pcg_b), 1);
- state_fio->Fwrite(pcg_r, sizeof(pcg_r), 1);
- state_fio->Fwrite(pcg_g, sizeof(pcg_g), 1);
+ state_fio->StateArray(&pcg_b[0][0], sizeof(pcg_b), 1);
+ state_fio->StateArray(&pcg_r[0][0], sizeof(pcg_r), 1);
+ state_fio->StateArray(&pcg_g[0][0], sizeof(pcg_g), 1);
#ifdef _X1TURBO_FEATURE
- state_fio->Fwrite(gaiji_b, sizeof(gaiji_b), 1);
- state_fio->Fwrite(gaiji_r, sizeof(gaiji_r), 1);
- state_fio->Fwrite(gaiji_g, sizeof(gaiji_g), 1);
-#endif
- state_fio->FputUint8(cur_code);
- state_fio->FputUint8(cur_line);
- state_fio->FputInt32(kaddr);
- state_fio->FputInt32(kofs);
- state_fio->FputInt32(kflag);
- state_fio->FputInt32((int)(kanji_ptr - &kanji[0]));
- state_fio->Fwrite(pal, sizeof(pal), 1);
- state_fio->FputUint8(priority);
- state_fio->Fwrite(pri, sizeof(pri), 1);
- state_fio->FputBool(column40);
+ state_fio->StateArray(&gaiji_b[0][0], sizeof(gaiji_b), 1);
+ state_fio->StateArray(&gaiji_r[0][0], sizeof(gaiji_r), 1);
+ state_fio->StateArray(&gaiji_g[0][0], sizeof(gaiji_g), 1);
+#endif
+ state_fio->StateValue(cur_code);
+ state_fio->StateValue(cur_line);
+ state_fio->StateValue(kaddr);
+ state_fio->StateValue(kofs);
+ state_fio->StateValue(kflag);
+ if(loading) {
+ intptr_t p = (intptr_t)(&kanji[0]);
+ kanji_ptr = (uint8_t*)(p + state_fio->FgetInt32_LE());
+ } else {
+ intptr_t p = (intptr_t)(&kanji[0]);
+ intptr_t q = (intptr_t)kanji_ptr;
+ state_fio->FputInt32_LE((int)(q - p));
+ }
+ state_fio->StateArray(pal, sizeof(pal), 1);
+ state_fio->StateValue(priority);
+ state_fio->StateArray(&pri[0][0], sizeof(pri), 1);
+ state_fio->StateValue(column40);
#ifdef _X1TURBO_FEATURE
- state_fio->FputUint8(mode1);
- state_fio->FputUint8(mode2);
- state_fio->FputBool(hireso);
+ state_fio->StateValue(mode1);
+ state_fio->StateValue(mode2);
+ state_fio->StateValue(hireso);
#endif
#ifdef _X1TURBOZ
- state_fio->FputUint8(zmode1);
- state_fio->FputUint8(zpriority);
- state_fio->FputUint8(zadjust);
- state_fio->FputUint8(zmosaic);
- state_fio->FputUint8(zchromakey);
- state_fio->FputUint8(zscroll);
- state_fio->FputUint8(zmode2);
- state_fio->Fwrite(ztpal, sizeof(ztpal), 1);
- state_fio->Fwrite(zpal, sizeof(zpal), 1);
- state_fio->FputInt32(zpal_num);
- state_fio->Fwrite(zpalette_pc, sizeof(zpalette_pc), 1);
-#endif
- state_fio->FputBool(prev_vert_double);
- state_fio->FputInt32(raster);
- state_fio->FputInt32(cblink);
- state_fio->FputInt32(ch_height);
- state_fio->FputInt32(hz_total);
- state_fio->FputInt32(hz_disp);
- state_fio->FputInt32(vt_disp);
- state_fio->FputInt32(st_addr);
- state_fio->FputUint32(vblank_clock);
-}
-
-bool DISPLAY::load_state(FILEIO* state_fio)
-{
- if(state_fio->FgetUint32() != STATE_VERSION) {
- return false;
- }
- if(state_fio->FgetInt32() != this_device_id) {
- return false;
+ state_fio->StateValue(zmode1);
+ state_fio->StateValue(zpriority);
+ state_fio->StateValue(zadjust);
+ state_fio->StateValue(zmosaic);
+ state_fio->StateValue(zchromakey);
+ state_fio->StateValue(zscroll);
+ state_fio->StateValue(zmode2);
+ state_fio->StateArray(ztpal, sizeof(ztpal), 1);
+ for(int i = 0; i < array_length(zpal); i++){
+ state_fio->StateValue(zpal[i].r);
+ state_fio->StateValue(zpal[i].g);
+ state_fio->StateValue(zpal[i].b);
}
- state_fio->Fread(vram_t, sizeof(vram_t), 1);
- state_fio->Fread(vram_a, sizeof(vram_a), 1);
-#ifdef _X1TURBO_FEATURE
- state_fio->Fread(vram_k, sizeof(vram_k), 1);
+ state_fio->StateValue(zpal_num);
+ state_fio->StateArrayScrnType_t(zpalette_pc, sizeof(zpalette_pc), 1);
#endif
- state_fio->Fread(pcg_b, sizeof(pcg_b), 1);
- state_fio->Fread(pcg_r, sizeof(pcg_r), 1);
- state_fio->Fread(pcg_g, sizeof(pcg_g), 1);
-#ifdef _X1TURBO_FEATURE
- state_fio->Fread(gaiji_b, sizeof(gaiji_b), 1);
- state_fio->Fread(gaiji_r, sizeof(gaiji_r), 1);
- state_fio->Fread(gaiji_g, sizeof(gaiji_g), 1);
-#endif
- cur_code = state_fio->FgetUint8();
- cur_line = state_fio->FgetUint8();
- kaddr = state_fio->FgetInt32();
- kofs = state_fio->FgetInt32();
- kflag = state_fio->FgetInt32();
- kanji_ptr = &kanji[0] + state_fio->FgetInt32();
- state_fio->Fread(pal, sizeof(pal), 1);
- priority = state_fio->FgetUint8();
- state_fio->Fread(pri, sizeof(pri), 1);
- column40 = state_fio->FgetBool();
+ state_fio->StateValue(prev_vert_double);
+ state_fio->StateValue(raster);
+ state_fio->StateValue(cblink);
+ state_fio->StateValue(ch_height);
+ state_fio->StateValue(hz_total);
+ state_fio->StateValue(hz_disp);
+ state_fio->StateValue(vt_disp);
+ state_fio->StateValue(st_addr);
+ state_fio->StateValue(vblank_clock);
+ state_fio->StateValue(cur_blank);
+
+ // post process
+ if(loading) {
+ for(int i = 0; i < 8; i++) {
+ palette_pc[i ] = RGB_COLOR((i & 2) ? 255 : 0, (i & 4) ? 255 : 0, (i & 1) ? 255 : 0); // text
+ palette_pc[i + 8] = RGB_COLOR((i & 2) ? 255 : 0, (i & 4) ? 255 : 0, (i & 1) ? 255 : 0); // cg
+ }
+ // Copy images to draw buffers.
+ my_memcpy(dr_text, text, sizeof(dr_text));
+ my_memcpy(dr_cg, cg, sizeof(dr_cg));
#ifdef _X1TURBO_FEATURE
- mode1 = state_fio->FgetUint8();
- mode2 = state_fio->FgetUint8();
- hireso = state_fio->FgetBool();
+ for(int v = 0; v < 400; v++) {
+ memcpy(&pri_line[v][0][0], &pri[0][0], sizeof(pri));
+ }
+#else
+ for(int v = 0; v < 200; v++) {
+ memcpy(&pri_line[v][0][0], &pri[0][0], sizeof(pri));
+ }
#endif
+ my_memcpy(dr_pri_line, pri_line, sizeof(dr_pri_line));
+ my_memcpy(dr_palette_pc, palette_pc, sizeof(dr_palette_pc));
+ dr_priority = priority;
#ifdef _X1TURBOZ
- zmode1 = state_fio->FgetUint8();
- zpriority = state_fio->FgetUint8();
- zadjust = state_fio->FgetUint8();
- zmosaic = state_fio->FgetUint8();
- zchromakey = state_fio->FgetUint8();
- zscroll = state_fio->FgetUint8();
- zmode2 = state_fio->FgetUint8();
- state_fio->Fread(ztpal, sizeof(ztpal), 1);
- state_fio->Fread(zpal, sizeof(zpal), 1);
- zpal_num = state_fio->FgetInt32();
- state_fio->Fread(zpalette_pc, sizeof(zpalette_pc), 1);
-#endif
- prev_vert_double = state_fio->FgetBool();
- raster = state_fio->FgetInt32();
- cblink = state_fio->FgetInt32();
- ch_height = state_fio->FgetInt32();
- hz_total = state_fio->FgetInt32();
- hz_disp = state_fio->FgetInt32();
- vt_disp = state_fio->FgetInt32();
- st_addr = state_fio->FgetInt32();
- vblank_clock = state_fio->FgetUint32();
- return true;
+ dr_zpriority = zpriority;
+ my_memcpy(dr_zcg, zcg, sizeof(dr_zcg));
+ my_memcpy(dr_aen_line, aen_line, sizeof(dr_aen_line));
+ my_memcpy(dr_zpalette_pc, zpalette_pc, sizeof(zpalette_pc));
+ zpalette_pc[8 + 0] = zpalette_pc[16 + 0x000];
+ zpalette_pc[8 + 1] = zpalette_pc[16 + 0x00f];
+ zpalette_pc[8 + 2] = zpalette_pc[16 + 0x0f0];
+ zpalette_pc[8 + 3] = zpalette_pc[16 + 0x0ff];
+ zpalette_pc[8 + 4] = zpalette_pc[16 + 0xf00];
+ zpalette_pc[8 + 5] = zpalette_pc[16 + 0xf0f];
+ zpalette_pc[8 + 6] = zpalette_pc[16 + 0xff0];
+ zpalette_pc[8 + 7] = zpalette_pc[16 + 0xfff];
+#endif
+ update_crtc(); // force update timing
+ }
+ return true;
}
+}
OSDN Git Service
