--- np2/i286c/memory.c 2005/02/08 14:38:56 1.25 +++ np2/i286c/memory.c 2005/03/16 03:53:45 1.29 @@ -76,321 +76,6 @@ static void MEMCALL memnc_wr16(UINT32 ad } - - - -// ---- write byte - -static void MEMCALL grcg_rmw0(UINT32 address, REG8 value) { // VRAM - - REG8 mask; - UINT8 *vram; - - CPU_REMCLOCK -= MEMWAIT_GRCG; - mask = ~value; - address = LOW15(address); - vramupdate[address] |= 1; - gdcs.grphdisp |= 1; - vram = mem + address; - if (!(grcg.modereg & 1)) { - vram[VRAM0_B] &= mask; - vram[VRAM0_B] |= (value & grcg.tile[0].b[0]); - } - if (!(grcg.modereg & 2)) { - vram[VRAM0_R] &= mask; - vram[VRAM0_R] |= (value & grcg.tile[1].b[0]); - } - if (!(grcg.modereg & 4)) { - vram[VRAM0_G] &= mask; - vram[VRAM0_G] |= (value & grcg.tile[2].b[0]); - } - if (!(grcg.modereg & 8)) { - vram[VRAM0_E] &= mask; - vram[VRAM0_E] |= (value & grcg.tile[3].b[0]); - } -} - -static void MEMCALL grcg_rmw1(UINT32 address, REG8 value) { // VRAM - - REG8 mask; - UINT8 *vram; - - CPU_REMCLOCK -= MEMWAIT_GRCG; - mask = ~value; - address = LOW15(address); - vramupdate[address] |= 2; - gdcs.grphdisp |= 2; - vram = mem + address; - if (!(grcg.modereg & 1)) { - vram[VRAM1_B] &= mask; - vram[VRAM1_B] |= (value & grcg.tile[0].b[0]); - } - if (!(grcg.modereg & 2)) { - vram[VRAM1_R] &= mask; - vram[VRAM1_R] |= (value & grcg.tile[1].b[0]); - } - if (!(grcg.modereg & 4)) { - vram[VRAM1_G] &= mask; - vram[VRAM1_G] |= (value & grcg.tile[2].b[0]); - } - if (!(grcg.modereg & 8)) { - vram[VRAM1_E] &= mask; - vram[VRAM1_E] |= (value & grcg.tile[3].b[0]); - } -} - -static void MEMCALL grcg_tdw0(UINT32 address, REG8 value) { // VRAM - - UINT8 *vram; - - CPU_REMCLOCK -= MEMWAIT_GRCG; - address = LOW15(address); - vramupdate[address] |= 1; - gdcs.grphdisp |= 1; - vram = mem + address; - if (!(grcg.modereg & 1)) { - vram[VRAM0_B] = grcg.tile[0].b[0]; - } - if (!(grcg.modereg & 2)) { - vram[VRAM0_R] = grcg.tile[1].b[0]; - } - if (!(grcg.modereg & 4)) { - vram[VRAM0_G] = grcg.tile[2].b[0]; - } - if (!(grcg.modereg & 8)) { - vram[VRAM0_E] = grcg.tile[3].b[0]; - } - (void)value; -} - -static void MEMCALL grcg_tdw1(UINT32 address, REG8 value) { // VRAM - - UINT8 *vram; - - CPU_REMCLOCK -= MEMWAIT_GRCG; - address = LOW15(address); - vramupdate[address] |= 2; - gdcs.grphdisp |= 2; - vram = mem + address; - if (!(grcg.modereg & 1)) { - vram[VRAM1_B] = grcg.tile[0].b[0]; - } - if (!(grcg.modereg & 2)) { - vram[VRAM1_R] = grcg.tile[1].b[0]; - } - if (!(grcg.modereg & 4)) { - vram[VRAM1_G] = grcg.tile[2].b[0]; - } - if (!(grcg.modereg & 8)) { - vram[VRAM1_E] = grcg.tile[3].b[0]; - } - (void)value; -} - -static void MEMCALL egc_wt(UINT32 address, REG8 value) { // VRAM - - CPU_REMCLOCK -= MEMWAIT_GRCG; - memegc_wr8(address, value); -} - - -// ---- read byte - -static REG8 MEMCALL grcg_tcr0(UINT32 address) { // VRAM - -const UINT8 *vram; - REG8 ret; - - CPU_REMCLOCK -= MEMWAIT_GRCG; - vram = mem + LOW15(address); - ret = 0; - if (!(grcg.modereg & 1)) { - ret |= vram[VRAM0_B] ^ grcg.tile[0].b[0]; - } - if (!(grcg.modereg & 2)) { - ret |= vram[VRAM0_R] ^ grcg.tile[1].b[0]; - } - if (!(grcg.modereg & 4)) { - ret |= vram[VRAM0_G] ^ grcg.tile[2].b[0]; - } - if (!(grcg.modereg & 8)) { - ret |= vram[VRAM0_E] ^ grcg.tile[3].b[0]; - } - return(ret ^ 0xff); -} - -static REG8 MEMCALL grcg_tcr1(UINT32 address) { // VRAM - -const UINT8 *vram; - REG8 ret; - - CPU_REMCLOCK -= MEMWAIT_GRCG; - ret = 0; - vram = mem + LOW15(address); - if (!(grcg.modereg & 1)) { - ret |= vram[VRAM1_B] ^ grcg.tile[0].b[0]; - } - if (!(grcg.modereg & 2)) { - ret |= vram[VRAM1_R] ^ grcg.tile[1].b[0]; - } - if (!(grcg.modereg & 4)) { - ret |= vram[VRAM1_G] ^ grcg.tile[2].b[0]; - } - if (!(grcg.modereg & 8)) { - ret |= vram[VRAM1_E] ^ grcg.tile[3].b[0]; - } - return(ret ^ 0xff); -} - -static REG8 MEMCALL egc_rd(UINT32 address) { // VRAM - - CPU_REMCLOCK -= MEMWAIT_GRCG; - return(memegc_rd8(address)); -} - - -// ---- write word - -#define GRCGW_RMW(page) { \ - UINT8 *vram; \ - CPU_REMCLOCK -= MEMWAIT_GRCG; \ - address = LOW15(address); \ - vramupdate[address] |= (1 << page); \ - vramupdate[address + 1] |= (1 << page); \ - gdcs.grphdisp |= (1 << page); \ - vram = mem + address + (VRAM_STEP * (page)); \ - if (!(grcg.modereg & 1)) { \ - UINT8 tmp; \ - tmp = (UINT8)value; \ - vram[VRAM0_B+0] &= (~tmp); \ - vram[VRAM0_B+0] |= (tmp & grcg.tile[0].b[0]); \ - tmp = (UINT8)(value >> 8); \ - vram[VRAM0_B+1] &= (~tmp); \ - vram[VRAM0_B+1] |= (tmp & grcg.tile[0].b[0]); \ - } \ - if (!(grcg.modereg & 2)) { \ - UINT8 tmp; \ - tmp = (UINT8)value; \ - vram[VRAM0_R+0] &= (~tmp); \ - vram[VRAM0_R+0] |= (tmp & grcg.tile[1].b[0]); \ - tmp = (UINT8)(value >> 8); \ - vram[VRAM0_R+1] &= (~tmp); \ - vram[VRAM0_R+1] |= (tmp & grcg.tile[1].b[0]); \ - } \ - if (!(grcg.modereg & 4)) { \ - UINT8 tmp; \ - tmp = (UINT8)value; \ - vram[VRAM0_G+0] &= (~tmp); \ - vram[VRAM0_G+0] |= (tmp & grcg.tile[2].b[0]); \ - tmp = (UINT8)(value >> 8); \ - vram[VRAM0_G+1] &= (~tmp); \ - vram[VRAM0_G+1] |= (tmp & grcg.tile[2].b[0]); \ - } \ - if (!(grcg.modereg & 8)) { \ - UINT8 tmp; \ - tmp = (UINT8)value; \ - vram[VRAM0_E+0] &= (~tmp); \ - vram[VRAM0_E+0] |= (tmp & grcg.tile[3].b[0]); \ - tmp = (UINT8)(value >> 8); \ - vram[VRAM0_E+1] &= (~tmp); \ - vram[VRAM0_E+1] |= (tmp & grcg.tile[3].b[0]); \ - } \ -} - -#define GRCGW_TDW(page) { \ - UINT8 *vram; \ - CPU_REMCLOCK -= MEMWAIT_GRCG; \ - address = LOW15(address); \ - vramupdate[address] |= (1 << page); \ - vramupdate[address + 1] |= (1 << page); \ - gdcs.grphdisp |= (1 << page); \ - vram = mem + address + (VRAM_STEP * (page)); \ - if (!(grcg.modereg & 1)) { \ - vram[VRAM0_B+0] = grcg.tile[0].b[0]; \ - vram[VRAM0_B+1] = grcg.tile[0].b[0]; \ - } \ - if (!(grcg.modereg & 2)) { \ - vram[VRAM0_R+0] = grcg.tile[1].b[0]; \ - vram[VRAM0_R+1] = grcg.tile[1].b[0]; \ - } \ - if (!(grcg.modereg & 4)) { \ - vram[VRAM0_G+0] = grcg.tile[2].b[0]; \ - vram[VRAM0_G+1] = grcg.tile[2].b[0]; \ - } \ - if (!(grcg.modereg & 8)) { \ - vram[VRAM0_E+0] = grcg.tile[3].b[0]; \ - vram[VRAM0_E+1] = grcg.tile[3].b[0]; \ - } \ - (void)value; \ -} - -static void MEMCALL grcgw_rmw0(UINT32 address, REG16 value) GRCGW_RMW(0) -static void MEMCALL grcgw_rmw1(UINT32 address, REG16 value) GRCGW_RMW(1) -static void MEMCALL grcgw_tdw0(UINT32 address, REG16 value) GRCGW_TDW(0) -static void MEMCALL grcgw_tdw1(UINT32 address, REG16 value) GRCGW_TDW(1) - -static void MEMCALL egcw_wt(UINT32 address, REG16 value) { - - CPU_REMCLOCK -= MEMWAIT_GRCG; - memegc_wr16(address, value); -} - - -// ---- read word - -static REG16 MEMCALL grcgw_tcr0(UINT32 address) { - - UINT8 *vram; - REG16 ret; - - CPU_REMCLOCK -= MEMWAIT_GRCG; - ret = 0; - vram = mem + LOW15(address); - if (!(grcg.modereg & 1)) { - ret |= LOADINTELWORD(vram + VRAM0_B) ^ grcg.tile[0].w; - } - if (!(grcg.modereg & 2)) { - ret |= LOADINTELWORD(vram + VRAM0_R) ^ grcg.tile[1].w; - } - if (!(grcg.modereg & 4)) { - ret |= LOADINTELWORD(vram + VRAM0_G) ^ grcg.tile[2].w; - } - if (!(grcg.modereg & 8)) { - ret |= LOADINTELWORD(vram + VRAM0_E) ^ grcg.tile[3].w; - } - return((UINT16)~ret); -} - -static REG16 MEMCALL grcgw_tcr1(UINT32 address) { - - UINT8 *vram; - REG16 ret; - - CPU_REMCLOCK -= MEMWAIT_GRCG; - ret = 0; - vram = mem + LOW15(address); - if (!(grcg.modereg & 1)) { - ret |= LOADINTELWORD(vram + VRAM1_B) ^ grcg.tile[0].w; - } - if (!(grcg.modereg & 2)) { - ret |= LOADINTELWORD(vram + VRAM1_R) ^ grcg.tile[1].w; - } - if (!(grcg.modereg & 4)) { - ret |= LOADINTELWORD(vram + VRAM1_G) ^ grcg.tile[2].w; - } - if (!(grcg.modereg & 8)) { - ret |= LOADINTELWORD(vram + VRAM1_E) ^ grcg.tile[3].w; - } - return((UINT16)(~ret)); -} - -static REG16 MEMCALL egcw_rd(UINT32 address) { - - CPU_REMCLOCK -= MEMWAIT_GRCG; - return(memegc_rd16(address)); -} - - // ---- table typedef void (MEMCALL * MEM8WRITE)(UINT32 address, REG8 value); @@ -403,7 +88,7 @@ typedef struct { MEM8WRITE wr8[0x20]; MEM16READ rd16[0x20]; MEM16WRITE wr16[0x20]; -} MEMFN; +} MEMFN0; typedef struct { MEM8READ brd8; // E8000-F7FFF byte read @@ -421,7 +106,7 @@ typedef struct { MEM16WRITE wr16; } VACCTBL; -static MEMFN memfn = { +static MEMFN0 memfn0 = { {memmain_rd8, memmain_rd8, memmain_rd8, memmain_rd8, // 00 memmain_rd8, memmain_rd8, memmain_rd8, memmain_rd8, // 20 memmain_rd8, memmain_rd8, memmain_rd8, memmain_rd8, // 40 @@ -473,14 +158,14 @@ static const VACCTBL vacctbl[0x10] = { {memvram1_rd8, memvram1_wr8, memvram1_rd16, memvram1_wr16}, {memvram0_rd8, memvram0_wr8, memvram0_rd16, memvram0_wr16}, {memvram1_rd8, memvram1_wr8, memvram1_rd16, memvram1_wr16}, - {grcg_tcr0, grcg_tdw0, grcgw_tcr0, grcgw_tdw0}, // 80 - {grcg_tcr1, grcg_tdw1, grcgw_tcr1, grcgw_tdw1}, - {egc_rd, egc_wt, egcw_rd, egcw_wt}, - {egc_rd, egc_wt, egcw_rd, egcw_wt}, - {memvram0_rd8, grcg_rmw0, memvram0_rd16, grcgw_rmw0}, // c0 - {memvram1_rd8, grcg_rmw1, memvram1_rd16, grcgw_rmw1}, - {egc_rd, egc_wt, egcw_rd, egcw_wt}, - {egc_rd, egc_wt, egcw_rd, egcw_wt}}; + {memtcr0_rd8, memtdw0_wr8, memtcr0_rd16, memtdw0_wr16}, // 80 + {memtcr1_rd8, memtdw1_wr8, memtcr1_rd16, memtdw1_wr16}, + {memegc_rd8, memegc_wr8, memegc_rd16, memegc_wr16}, + {memegc_rd8, memegc_wr8, memegc_rd16, memegc_wr16}, + {memvram0_rd8, memrmw0_wr8, memvram0_rd16, memrmw0_wr16}, // c0 + {memvram1_rd8, memrmw1_wr8, memvram1_rd16, memrmw1_wr16}, + {memegc_rd8, memegc_wr8, memegc_rd16, memegc_wr16}, + {memegc_rd8, memegc_wr8, memegc_rd16, memegc_wr16}}; void MEMCALL i286_memorymap(UINT type) { @@ -489,19 +174,19 @@ const MMAPTBL *mm; mm = mmaptbl + (type & 1); - memfn.rd8[0xe8000 >> 15] = mm->brd8; - memfn.rd8[0xf0000 >> 15] = mm->brd8; - memfn.rd8[0xf8000 >> 15] = mm->ird8; - memfn.wr8[0xe8000 >> 15] = mm->bwr8; - memfn.wr8[0xf0000 >> 15] = mm->bwr8; - memfn.wr8[0xf8000 >> 15] = mm->bwr8; - - memfn.rd16[0xe8000 >> 15] = mm->brd16; - memfn.rd16[0xf0000 >> 15] = mm->brd16; - memfn.rd16[0xf8000 >> 15] = mm->ird16; - memfn.wr16[0xe8000 >> 15] = mm->bwr16; - memfn.wr16[0xf0000 >> 15] = mm->bwr16; - memfn.wr16[0xf8000 >> 15] = mm->bwr16; + memfn0.rd8[0xe8000 >> 15] = mm->brd8; + memfn0.rd8[0xf0000 >> 15] = mm->brd8; + memfn0.rd8[0xf8000 >> 15] = mm->ird8; + memfn0.wr8[0xe8000 >> 15] = mm->bwr8; + memfn0.wr8[0xf0000 >> 15] = mm->bwr8; + memfn0.wr8[0xf8000 >> 15] = mm->bwr8; + + memfn0.rd16[0xe8000 >> 15] = mm->brd16; + memfn0.rd16[0xf0000 >> 15] = mm->brd16; + memfn0.rd16[0xf8000 >> 15] = mm->ird16; + memfn0.wr16[0xe8000 >> 15] = mm->bwr16; + memfn0.wr16[0xf0000 >> 15] = mm->bwr16; + memfn0.wr16[0xf8000 >> 15] = mm->bwr16; } void MEMCALL i286_vram_dispatch(UINT func) { @@ -510,31 +195,31 @@ const VACCTBL *vacc; vacc = vacctbl + (func & 0x0f); - memfn.rd8[0xa8000 >> 15] = vacc->rd8; - memfn.rd8[0xb0000 >> 15] = vacc->rd8; - memfn.rd8[0xb8000 >> 15] = vacc->rd8; - memfn.rd8[0xe0000 >> 15] = vacc->rd8; - - memfn.wr8[0xa8000 >> 15] = vacc->wr8; - memfn.wr8[0xb0000 >> 15] = vacc->wr8; - memfn.wr8[0xb8000 >> 15] = vacc->wr8; - memfn.wr8[0xe0000 >> 15] = vacc->wr8; - - memfn.rd16[0xa8000 >> 15] = vacc->rd16; - memfn.rd16[0xb0000 >> 15] = vacc->rd16; - memfn.rd16[0xb8000 >> 15] = vacc->rd16; - memfn.rd16[0xe0000 >> 15] = vacc->rd16; - - memfn.wr16[0xa8000 >> 15] = vacc->wr16; - memfn.wr16[0xb0000 >> 15] = vacc->wr16; - memfn.wr16[0xb8000 >> 15] = vacc->wr16; - memfn.wr16[0xe0000 >> 15] = vacc->wr16; - - if (!(func & 0x10)) { // digital - memfn.rd8[0xe0000 >> 15] = memnc_rd8; - memfn.wr8[0xe0000 >> 15] = memnc_wr8; - memfn.rd16[0xe0000 >> 15] = memnc_rd16; - memfn.wr16[0xe0000 >> 15] = memnc_wr16; + memfn0.rd8[0xa8000 >> 15] = vacc->rd8; + memfn0.rd8[0xb0000 >> 15] = vacc->rd8; + memfn0.rd8[0xb8000 >> 15] = vacc->rd8; + memfn0.rd8[0xe0000 >> 15] = vacc->rd8; + + memfn0.wr8[0xa8000 >> 15] = vacc->wr8; + memfn0.wr8[0xb0000 >> 15] = vacc->wr8; + memfn0.wr8[0xb8000 >> 15] = vacc->wr8; + memfn0.wr8[0xe0000 >> 15] = vacc->wr8; + + memfn0.rd16[0xa8000 >> 15] = vacc->rd16; + memfn0.rd16[0xb0000 >> 15] = vacc->rd16; + memfn0.rd16[0xb8000 >> 15] = vacc->rd16; + memfn0.rd16[0xe0000 >> 15] = vacc->rd16; + + memfn0.wr16[0xa8000 >> 15] = vacc->wr16; + memfn0.wr16[0xb0000 >> 15] = vacc->wr16; + memfn0.wr16[0xb8000 >> 15] = vacc->wr16; + memfn0.wr16[0xe0000 >> 15] = vacc->wr16; + + if (!(func & (1 << VOPBIT_ANALOG))) { // digital + memfn0.rd8[0xe0000 >> 15] = memnc_rd8; + memfn0.wr8[0xe0000 >> 15] = memnc_wr8; + memfn0.rd16[0xe0000 >> 15] = memnc_rd16; + memfn0.wr16[0xe0000 >> 15] = memnc_wr16; } } @@ -555,7 +240,7 @@ REG8 MEMCALL i286_memoryread(UINT32 addr } #endif else { - return(memfn.rd8[(address >> 15) & 0x1f](address)); + return(memfn0.rd8[(address >> 15) & 0x1f](address)); } } @@ -589,12 +274,12 @@ REG16 MEMCALL i286_memoryread_w(UINT32 a } #endif else if ((address & 0x7fff) != 0x7fff) { - return(memfn.rd16[(address >> 15) & 0x1f](address)); + return(memfn0.rd16[(address >> 15) & 0x1f](address)); } else { - ret = memfn.rd8[(address >> 15) & 0x1f](address); + ret = memfn0.rd8[(address >> 15) & 0x1f](address); address++; - ret += memfn.rd8[(address >> 15) & 0x1f](address) << 8; + ret += memfn0.rd8[(address >> 15) & 0x1f](address) << 8; return(ret); } } @@ -613,7 +298,7 @@ void MEMCALL i286_memorywrite(UINT32 add } #endif else { - memfn.wr8[(address >> 15) & 0x1f](address, value); + memfn0.wr8[(address >> 15) & 0x1f](address, value); } } @@ -638,12 +323,12 @@ void MEMCALL i286_memorywrite_w(UINT32 a } #endif else if ((address & 0x7fff) != 0x7fff) { - memfn.wr16[(address >> 15) & 0x1f](address, value); + memfn0.wr16[(address >> 15) & 0x1f](address, value); } else { - memfn.wr8[(address >> 15) & 0x1f](address, (UINT8)value); + memfn0.wr8[(address >> 15) & 0x1f](address, (UINT8)value); address++; - memfn.wr8[(address >> 15) & 0x1f](address, (UINT8)(value >> 8)); + memfn0.wr8[(address >> 15) & 0x1f](address, (UINT8)(value >> 8)); } }