--- np2/lio/lio.c 2003/12/08 00:55:33 1.3 +++ np2/lio/lio.c 2004/02/20 15:20:30 1.6 @@ -1,6 +1,5 @@ #include "compiler.h" #include "cpucore.h" -#include "memory.h" #include "pccore.h" #include "iocore.h" #include "bios.h" @@ -9,10 +8,10 @@ #include "lio.h" - LIO_TABLE lio; +static _LIOWORK liowork; -void lio_init(void) { +void lio_initialize(void) { UINT i; @@ -23,83 +22,46 @@ void lio_init(void) { SETBIOSMEM16(0xf9a00 + i*2, 0xcf90); } mem[0xf9944] = 0xce; - ZeroMemory(&lio, sizeof(lio)); } -void bios_lio(BYTE cmd) { +void bios_lio(REG8 cmd) { - UINT i; + LIOWORK lio; -// TRACE_("lio", cmd); + TRACEOUT(("lio command %.2x", cmd)); + lio = &liowork; switch(cmd) { case 0x00: // a0: GINIT - // GDCバッファを空に - if (gdc.s.cnt) { - gdc_work(GDCWORK_SLAVE); - } - gdc_forceready(&gdc.s); - - ZeroMemory(&gdc.s.para[GDC_SCROLL], 8); - gdc.mode1 |= 0x10; - gdc.s.para[GDC_CSRFORM] = 1; - screenupdate |= 2; - gdcs.access = gdcs.disp = 0; - vramop.operate &= VOP_ACCESSMASK; - i286_vram_dispatch(vramop.operate); - iocore_out8(0x006a, 0); - gdcs.grphdisp |= GDCSCRN_ENABLE; - gdc_paletteinit(); - - lio.scrn.top = 0; - lio.scrn.lines = 200; - lio.scrn.bank = 0; - lio.scrn.plane = 0x80; - - lio.gcolor1.palmax = 8; - lio.gcolor1.bgcolor = 0; - lio.gcolor1.bdcolor = 0; - lio.gcolor1.fgcolor = 7; - lio.gcolor1.palmode = 0; - - lio.gview.x1 = 0; - lio.gview.y1 = 0; - lio.gview.x2 = 639; - lio.gview.y2 = 399; - lio_makeviewmask(); - - for (i=0; i<8; i++) { - lio.degcol[i] = i; - } - CPU_AH = 0; + CPU_AH = lio_ginit(lio); break; case 0x01: // a1: GSCREEN - CPU_AH = lio_gscreen(); + CPU_AH = lio_gscreen(lio); break; case 0x02: // a2: GVIEW - CPU_AH = lio_gview(); + CPU_AH = lio_gview(lio); break; case 0x03: // a3: GCOLOR1 - CPU_AH = lio_gcolor1(); + CPU_AH = lio_gcolor1(lio); break; case 0x04: // a4: GCOLOR2 - CPU_AH = lio_gcolor2(); + CPU_AH = lio_gcolor2(lio); break; case 0x05: // a5: GCLS - CPU_AH = lio_gcls(); + CPU_AH = lio_gcls(lio); break; case 0x06: // a6: GPSET - CPU_AH = lio_gpset(); + CPU_AH = lio_gpset(lio); break; case 0x07: // a7: GLINE - CPU_AH = lio_gline(); + CPU_AH = lio_gline(lio); break; case 0x08: // a8: GCIRCLE @@ -115,10 +77,11 @@ void bios_lio(BYTE cmd) { break; case 0x0c: // ac: GPUT1 - CPU_AH = lio_gput1(); + CPU_AH = lio_gput1(lio); break; case 0x0d: // ad: GPUT2 + CPU_AH = lio_gput2(lio); break; case 0x0e: // ae: GROLL @@ -136,40 +99,52 @@ void bios_lio(BYTE cmd) { // ---- -static const UINT32 planeadrs[4] = {0xa8000, 0xb0000, 0xb8000, 0xe0000}; +const UINT32 lioplaneadrs[4] = {VRAM_B, VRAM_R, VRAM_G, VRAM_E}; + +void lio_updaterange(LIOWORK lio) { + + lio->range.x1 = max(lio->gview.x1, 0); + lio->range.y1 = max(lio->gview.y1, 0); + lio->range.x2 = min(lio->gview.x2, 639); + lio->range.y2 = min(lio->gview.x2, (lio->scrn.lines - 1)); +} + + +// ---- + static const BYTE bit_l[8] = {0xff, 0x7f, 0x3f, 0x1f, 0x0f, 0x07, 0x03, 0x01}; static const BYTE bit_r[8] = {0x00, 0x80, 0xc0, 0xe0, 0xf0, 0xf8, 0xfc, 0xfe}; -static void pixed8(UINT32 vadrs, BYTE bit, BYTE pal) { +static void pixed8(const _LIOWORK *lio, UINT32 vadrs, BYTE bit, REG8 pal) { - if (lio.scrn.plane & 0x80) { + if (lio->scrn.plane & 0x80) { if (pal & 1) { - mem[vadrs+0xa8000] |= bit; + mem[vadrs + VRAM_B] |= bit; } else { - mem[vadrs+0xa8000] &= ~bit; + mem[vadrs + VRAM_B] &= ~bit; } if (pal & 2) { - mem[vadrs+0xb0000] |= bit; + mem[vadrs + VRAM_R] |= bit; } else { - mem[vadrs+0xb0000] &= ~bit; + mem[vadrs + VRAM_R] &= ~bit; } if (pal & 4) { - mem[vadrs+0xb8000] |= bit; + mem[vadrs + VRAM_G] |= bit; } else { - mem[vadrs+0xb8000] &= ~bit; + mem[vadrs + VRAM_G] &= ~bit; } if (pal & 8) { - mem[vadrs+0xe0000] |= bit; + mem[vadrs + VRAM_E] |= bit; } else { - mem[vadrs+0xe0000] &= ~bit; + mem[vadrs + VRAM_E] &= ~bit; } } else { - vadrs += planeadrs[lio.scrn.plane & 3]; + vadrs += lioplaneadrs[lio->scrn.plane & 3]; if (pal) { mem[vadrs] |= bit; } @@ -179,46 +154,47 @@ static void pixed8(UINT32 vadrs, BYTE bi } } -void lio_pset(SINT16 x, SINT16 y, BYTE pal) { +void lio_pset(const _LIOWORK *lio, SINT16 x, SINT16 y, REG8 pal) { UINT32 adrs; BYTE bit; - if ((lio.x1 > x) || (lio.x2 < x) || (lio.y1 > y) || (lio.y2 < y)) { + if ((lio->range.x1 > x) || (lio->range.x2 < x) || + (lio->range.y1 > y) || (lio->range.y2 < y)) { return; } adrs = (y * 80) + (x >> 3); bit = 0x80 >> (x & 7); - if (lio.scrn.top) { + if (lio->scrn.top) { adrs += 16000; } - if (!lio.scrn.bank) { + if (!lio->scrn.bank) { vramupdate[adrs] |= 1; gdcs.grphdisp |= 1; } else { vramupdate[adrs] |= 2; gdcs.grphdisp |= 2; - adrs += 0x200000; + adrs += VRAM_STEP; } - pixed8(adrs, bit, pal); + pixed8(lio, adrs, bit, pal); } -void lio_line(SINT16 x1, SINT16 x2, SINT16 y, BYTE pal) { +void lio_line(const _LIOWORK *lio, SINT16 x1, SINT16 x2, SINT16 y, REG8 pal) { UINT adrs; UINT32 vadrs; BYTE bit, dbit, sbit; SINT16 width; - if ((lio.y1 > y) || (lio.y2 < y)) { + if ((lio->range.y1 > y) || (lio->range.y2 < y)) { return; } - if (lio.x1 > x1) { - x1 = lio.x1; + if (lio->range.x1 > x1) { + x1 = lio->range.x1; } - if (lio.x2 < x2) { - x2 = lio.x2; + if (lio->range.x2 < x2) { + x2 = lio->range.x2; } width = x2 - x1 + 1; if (width <= 0) { @@ -226,16 +202,16 @@ void lio_line(SINT16 x1, SINT16 x2, SINT } adrs = (y * 80) + (x1 >> 3); bit = 0x80 >> (x1 & 7); - if (lio.scrn.top) { + if (lio->scrn.top) { adrs += 16000; } - if (!lio.scrn.bank) { + if (!lio->scrn.bank) { vadrs = adrs; sbit = 1; gdcs.grphdisp |= 1; } else { - vadrs = adrs + 0x200000; + vadrs = adrs + VRAM_STEP; sbit = 2; gdcs.grphdisp |= 2; } @@ -245,11 +221,11 @@ void lio_line(SINT16 x1, SINT16 x2, SINT dbit |= bit; bit >>= 1; } - pixed8(vadrs++, dbit, pal); + pixed8(lio, vadrs++, dbit, pal); vramupdate[adrs++] |= sbit; while(width >= 8) { width -= 8; - pixed8(vadrs++, 0xff, pal); + pixed8(lio, vadrs++, 0xff, pal); vramupdate[adrs++] |= sbit; } dbit = 0; @@ -259,7 +235,7 @@ void lio_line(SINT16 x1, SINT16 x2, SINT bit >>= 1; } if (dbit) { - pixed8(vadrs, dbit, pal); + pixed8(lio, vadrs, dbit, pal); vramupdate[adrs] |= sbit; } }