--- np2/i286c/memory.c 2004/03/29 05:50:29 1.20 +++ np2/i286c/memory.c 2005/02/08 09:18:59 1.24 @@ -1,37 +1,33 @@ #include "compiler.h" #include "cpucore.h" -#include "egcmem.h" #include "pccore.h" #include "iocore.h" +#include "memegc.h" #include "vram.h" #include "font.h" - BYTE mem[0x200000]; + UINT8 mem[0x200000]; -#if defined(TRACE) -#define MEMORY_DEBUG -#endif - // ---- write byte -static void MEMCALL i286_wt(UINT32 address, REG8 value) { +static void MEMCALL i286_wt(UINT32 address, REG8 value) { // MAIN - mem[address & CPU_ADRSMASK] = (BYTE)value; + mem[address & CPU_ADRSMASK] = (UINT8)value; } -static void MEMCALL tram_wt(UINT32 address, REG8 value) { +static void MEMCALL tram_wt(UINT32 address, REG8 value) { // TRAM CPU_REMCLOCK -= MEMWAIT_TRAM; if (address < 0xa2000) { - mem[address] = (BYTE)value; + mem[address] = (UINT8)value; tramupdate[LOW12(address >> 1)] = 1; gdcs.textdisp |= 1; } else if (address < 0xa3fe0) { if (!(address & 1)) { - mem[address] = (BYTE)value; + mem[address] = (UINT8)value; tramupdate[LOW12(address >> 1)] = 1; gdcs.textdisp |= 1; } @@ -39,7 +35,7 @@ static void MEMCALL tram_wt(UINT32 addre else if (address < 0xa4000) { if (!(address & 1)) { if ((!(address & 2)) || (gdcs.msw_accessable)) { - mem[address] = (BYTE)value; + mem[address] = (UINT8)value; tramupdate[LOW12(address >> 1)] = 1; gdcs.textdisp |= 1; } @@ -48,31 +44,31 @@ static void MEMCALL tram_wt(UINT32 addre else if (address < 0xa5000) { if ((address & 1) && (cgwindow.writable & 1)) { cgwindow.writable |= 0x80; - fontrom[cgwindow.high + ((address >> 1) & 0x0f)] = (BYTE)value; + fontrom[cgwindow.high + ((address >> 1) & 0x0f)] = (UINT8)value; } } } -static void MEMCALL vram_w0(UINT32 address, REG8 value) { +static void MEMCALL vram_w0(UINT32 address, REG8 value) { // VRAM CPU_REMCLOCK -= MEMWAIT_VRAM; - mem[address] = (BYTE)value; + mem[address] = (UINT8)value; vramupdate[LOW15(address)] |= 1; gdcs.grphdisp |= 1; } -static void MEMCALL vram_w1(UINT32 address, REG8 value) { +static void MEMCALL vram_w1(UINT32 address, REG8 value) { // VRAM CPU_REMCLOCK -= MEMWAIT_VRAM; - mem[address + VRAM_STEP] = (BYTE)value; + mem[address + VRAM_STEP] = (UINT8)value; vramupdate[LOW15(address)] |= 2; gdcs.grphdisp |= 2; } -static void MEMCALL grcg_rmw0(UINT32 address, REG8 value) { +static void MEMCALL grcg_rmw0(UINT32 address, REG8 value) { // VRAM REG8 mask; - BYTE *vram; + UINT8 *vram; CPU_REMCLOCK -= MEMWAIT_GRCG; mask = ~value; @@ -98,10 +94,10 @@ static void MEMCALL grcg_rmw0(UINT32 add } } -static void MEMCALL grcg_rmw1(UINT32 address, REG8 value) { +static void MEMCALL grcg_rmw1(UINT32 address, REG8 value) { // VRAM REG8 mask; - BYTE *vram; + UINT8 *vram; CPU_REMCLOCK -= MEMWAIT_GRCG; mask = ~value; @@ -127,9 +123,9 @@ static void MEMCALL grcg_rmw1(UINT32 add } } -static void MEMCALL grcg_tdw0(UINT32 address, REG8 value) { +static void MEMCALL grcg_tdw0(UINT32 address, REG8 value) { // VRAM - BYTE *vram; + UINT8 *vram; CPU_REMCLOCK -= MEMWAIT_GRCG; address = LOW15(address); @@ -151,9 +147,9 @@ static void MEMCALL grcg_tdw0(UINT32 add (void)value; } -static void MEMCALL grcg_tdw1(UINT32 address, REG8 value) { +static void MEMCALL grcg_tdw1(UINT32 address, REG8 value) { // VRAM - BYTE *vram; + UINT8 *vram; CPU_REMCLOCK -= MEMWAIT_GRCG; address = LOW15(address); @@ -175,23 +171,30 @@ static void MEMCALL grcg_tdw1(UINT32 add (void)value; } -static void MEMCALL egc_wt(UINT32 address, REG8 value) { +static void MEMCALL egc_wt(UINT32 address, REG8 value) { // VRAM CPU_REMCLOCK -= MEMWAIT_GRCG; - egc_write(address, value); + memegc_wr8(address, value); +} + +static void MEMCALL emmc_wt(UINT32 address, REG8 value) { // EMS + + CPU_EMSPTR[(address >> 14) & 3][LOW14(address)] = (UINT8)value; } -static void MEMCALL emmc_wt(UINT32 address, REG8 value) { +static void MEMCALL i286_wd(UINT32 address, REG8 value) { // D000¡ÁDFFF - i286core.e.ems[(address >> 14) & 3][LOW14(address)] = (BYTE)value; + if (CPU_RAM_D000 & (1 << ((address >> 12) & 15))) { + mem[address] = (UINT8)value; + } } -static void MEMCALL i286_wb(UINT32 address, REG8 value) { +static void MEMCALL i286_wb(UINT32 address, REG8 value) { // F800¡ÁFFFF - mem[address + 0x1c8000 - 0xe8000] = (BYTE)value; + mem[address + 0x1c8000 - 0xe8000] = (UINT8)value; } -static void MEMCALL i286_wn(UINT32 address, REG8 value) { +static void MEMCALL i286_wn(UINT32 address, REG8 value) { // NONE (void)address; (void)value; @@ -200,12 +203,12 @@ static void MEMCALL i286_wn(UINT32 addre // ---- read byte -static REG8 MEMCALL i286_rd(UINT32 address) { +static REG8 MEMCALL i286_rd(UINT32 address) { // MAIN return(mem[address & CPU_ADRSMASK]); } -static REG8 MEMCALL tram_rd(UINT32 address) { +static REG8 MEMCALL tram_rd(UINT32 address) { // TRAM CPU_REMCLOCK -= MEMWAIT_TRAM; if (address < 0xa4000) { @@ -222,21 +225,21 @@ static REG8 MEMCALL tram_rd(UINT32 addre return(mem[address]); } -static REG8 MEMCALL vram_r0(UINT32 address) { +static REG8 MEMCALL vram_r0(UINT32 address) { // VRAM CPU_REMCLOCK -= MEMWAIT_VRAM; return(mem[address]); } -static REG8 MEMCALL vram_r1(UINT32 address) { +static REG8 MEMCALL vram_r1(UINT32 address) { // VRAM CPU_REMCLOCK -= MEMWAIT_VRAM; return(mem[address + VRAM_STEP]); } -static REG8 MEMCALL grcg_tcr0(UINT32 address) { +static REG8 MEMCALL grcg_tcr0(UINT32 address) { // VRAM -const BYTE *vram; +const UINT8 *vram; REG8 ret; CPU_REMCLOCK -= MEMWAIT_GRCG; @@ -257,9 +260,9 @@ const BYTE *vram; return(ret ^ 0xff); } -static REG8 MEMCALL grcg_tcr1(UINT32 address) { +static REG8 MEMCALL grcg_tcr1(UINT32 address) { // VRAM -const BYTE *vram; +const UINT8 *vram; REG8 ret; CPU_REMCLOCK -= MEMWAIT_GRCG; @@ -280,18 +283,18 @@ const BYTE *vram; return(ret ^ 0xff); } -static REG8 MEMCALL egc_rd(UINT32 address) { +static REG8 MEMCALL egc_rd(UINT32 address) { // VRAM CPU_REMCLOCK -= MEMWAIT_GRCG; - return(egc_read(address)); + return(memegc_rd8(address)); } -static REG8 MEMCALL emmc_rd(UINT32 address) { +static REG8 MEMCALL emmc_rd(UINT32 address) { // EMS - return(i286core.e.ems[(address >> 14) & 3][LOW14(address)]); + return(CPU_EMSPTR[(address >> 14) & 3][LOW14(address)]); } -static REG8 MEMCALL i286_rb(UINT32 address) { +static REG8 MEMCALL i286_rb(UINT32 address) { // F800-FFFF if (CPU_ITFBANK) { address += VRAM_STEP; @@ -304,7 +307,7 @@ static REG8 MEMCALL i286_rb(UINT32 addre static void MEMCALL i286w_wt(UINT32 address, REG16 value) { - BYTE *ptr; + UINT8 *ptr; ptr = mem + (address & CPU_ADRSMASK); STOREINTELWORD(ptr, value); @@ -330,7 +333,7 @@ static void MEMCALL tramw_wt(UINT32 addr address++; value >>= 8; } - mem[address] = (BYTE)value; + mem[address] = (UINT8)value; tramupdate[LOW12(address >> 1)] = 1; gdcs.textdisp |= 1; } @@ -340,18 +343,18 @@ static void MEMCALL tramw_wt(UINT32 addr value >>= 8; } if ((!(address & 2)) || (gdcs.msw_accessable)) { - mem[address] = (BYTE)value; + mem[address] = (UINT8)value; tramupdate[LOW12(address >> 1)] = 1; gdcs.textdisp |= 1; } } else if (address < 0xa5000) { - if (address & 1) { + if (!(address & 1)) { value >>= 8; } if (cgwindow.writable & 1) { cgwindow.writable |= 0x80; - fontrom[cgwindow.high + ((address >> 1) & 0x0f)] = (BYTE)value; + fontrom[cgwindow.high + ((address >> 1) & 0x0f)] = (UINT8)value; } } } @@ -366,7 +369,7 @@ static void MEMCALL tramw_wt(UINT32 addr } #define GRCGW_RMW(page) { \ - BYTE *vram; \ + UINT8 *vram; \ CPU_REMCLOCK -= MEMWAIT_GRCG; \ address = LOW15(address); \ vramupdate[address] |= (1 << page); \ @@ -374,45 +377,45 @@ static void MEMCALL tramw_wt(UINT32 addr gdcs.grphdisp |= (1 << page); \ vram = mem + address + (VRAM_STEP * (page)); \ if (!(grcg.modereg & 1)) { \ - BYTE tmp; \ - tmp = (BYTE)value; \ + UINT8 tmp; \ + tmp = (UINT8)value; \ vram[VRAM0_B+0] &= (~tmp); \ vram[VRAM0_B+0] |= (tmp & grcg.tile[0].b[0]); \ - tmp = (BYTE)(value >> 8); \ + tmp = (UINT8)(value >> 8); \ vram[VRAM0_B+1] &= (~tmp); \ vram[VRAM0_B+1] |= (tmp & grcg.tile[0].b[0]); \ } \ if (!(grcg.modereg & 2)) { \ - BYTE tmp; \ - tmp = (BYTE)value; \ + UINT8 tmp; \ + tmp = (UINT8)value; \ vram[VRAM0_R+0] &= (~tmp); \ vram[VRAM0_R+0] |= (tmp & grcg.tile[1].b[0]); \ - tmp = (BYTE)(value >> 8); \ + tmp = (UINT8)(value >> 8); \ vram[VRAM0_R+1] &= (~tmp); \ vram[VRAM0_R+1] |= (tmp & grcg.tile[1].b[0]); \ } \ if (!(grcg.modereg & 4)) { \ - BYTE tmp; \ - tmp = (BYTE)value; \ + UINT8 tmp; \ + tmp = (UINT8)value; \ vram[VRAM0_G+0] &= (~tmp); \ vram[VRAM0_G+0] |= (tmp & grcg.tile[2].b[0]); \ - tmp = (BYTE)(value >> 8); \ + tmp = (UINT8)(value >> 8); \ vram[VRAM0_G+1] &= (~tmp); \ vram[VRAM0_G+1] |= (tmp & grcg.tile[2].b[0]); \ } \ if (!(grcg.modereg & 8)) { \ - BYTE tmp; \ - tmp = (BYTE)value; \ + UINT8 tmp; \ + tmp = (UINT8)value; \ vram[VRAM0_E+0] &= (~tmp); \ vram[VRAM0_E+0] |= (tmp & grcg.tile[3].b[0]); \ - tmp = (BYTE)(value >> 8); \ + tmp = (UINT8)(value >> 8); \ vram[VRAM0_E+1] &= (~tmp); \ vram[VRAM0_E+1] |= (tmp & grcg.tile[3].b[0]); \ } \ } #define GRCGW_TDW(page) { \ - BYTE *vram; \ + UINT8 *vram; \ CPU_REMCLOCK -= MEMWAIT_GRCG; \ address = LOW15(address); \ vramupdate[address] |= (1 << page); \ @@ -448,27 +451,51 @@ static void MEMCALL grcgw_tdw1(UINT32 ad static void MEMCALL egcw_wt(UINT32 address, REG16 value) { CPU_REMCLOCK -= MEMWAIT_GRCG; - egc_write_w(address, value); + memegc_wr16(address, value); } static void MEMCALL emmcw_wt(UINT32 address, REG16 value) { - BYTE *ptr; + UINT8 *ptr; if ((address & 0x3fff) != 0x3fff) { - ptr = i286core.e.ems[(address >> 14) & 3] + LOW14(address); + ptr = CPU_EMSPTR[(address >> 14) & 3] + LOW14(address); STOREINTELWORD(ptr, value); } else { - i286core.e.ems[(address >> 14) & 3][0x3fff] = (BYTE)value; - i286core.e.ems[((address + 1) >> 14) & 3][0] = (BYTE)(value >> 8); + CPU_EMSPTR[(address >> 14) & 3][0x3fff] = (UINT8)value; + CPU_EMSPTR[((address + 1) >> 14) & 3][0] = (UINT8)(value >> 8); + } +} + +static void MEMCALL i286w_wd(UINT32 address, REG16 value) { + + UINT8 *ptr; + UINT16 bit; + + ptr = mem + address; + bit = 1 << ((address >> 12) & 15); + if ((address + 1) & 0xfff) { + if (CPU_RAM_D000 & bit) { + STOREINTELWORD(ptr, value); + } + } + else { + if (CPU_RAM_D000 & bit) { + ptr[0] = (UINT8)value; + } + if (CPU_RAM_D000 & (bit << 1)) { + ptr[1] = (UINT8)(value >> 8); + } } } static void MEMCALL i286w_wb(UINT32 address, REG16 value) { - mem[address + 0x1c8000 - 0xe8000] = (BYTE)value; - mem[address + 0x1c8001 - 0xe8000] = (BYTE)(value >> 8); + UINT8 *ptr; + + ptr = mem + (address + 0x1c8000 - 0xe8000); + STOREINTELWORD(ptr, value); } static void MEMCALL i286w_wn(UINT32 address, REG16 value) { @@ -482,7 +509,7 @@ static void MEMCALL i286w_wn(UINT32 addr static REG16 MEMCALL i286w_rd(UINT32 address) { - BYTE *ptr; + UINT8 *ptr; ptr = mem + (address & CPU_ADRSMASK); return(LOADINTELWORD(ptr)); @@ -531,7 +558,7 @@ static REG16 MEMCALL vramw_r1(UINT32 add static REG16 MEMCALL grcgw_tcr0(UINT32 address) { - BYTE *vram; + UINT8 *vram; REG16 ret; CPU_REMCLOCK -= MEMWAIT_GRCG; @@ -554,7 +581,7 @@ static REG16 MEMCALL grcgw_tcr0(UINT32 a static REG16 MEMCALL grcgw_tcr1(UINT32 address) { - BYTE *vram; + UINT8 *vram; REG16 ret; CPU_REMCLOCK -= MEMWAIT_GRCG; @@ -578,21 +605,21 @@ static REG16 MEMCALL grcgw_tcr1(UINT32 a static REG16 MEMCALL egcw_rd(UINT32 address) { CPU_REMCLOCK -= MEMWAIT_GRCG; - return(egc_read_w(address)); + return(memegc_rd16(address)); } static REG16 MEMCALL emmcw_rd(UINT32 address) { -const BYTE *ptr; +const UINT8 *ptr; REG16 ret; if ((address & 0x3fff) != 0x3fff) { - ptr = i286core.e.ems[(address >> 14) & 3] + LOW14(address); + ptr = CPU_EMSPTR[(address >> 14) & 3] + LOW14(address); return(LOADINTELWORD(ptr)); } else { - ret = i286core.e.ems[(address >> 14) & 3][0x3fff]; - ret += i286core.e.ems[((address + 1) >> 14) & 3][0] << 8; + ret = CPU_EMSPTR[(address >> 14) & 3][0x3fff]; + ret += CPU_EMSPTR[((address + 1) >> 14) & 3][0] << 8; return(ret); } } @@ -621,14 +648,12 @@ typedef struct { } MEMFN; typedef struct { - MEM8READ brd8; - MEM8READ ird8; - MEM8WRITE ewr8; - MEM8WRITE bwr8; - MEM16READ brd16; - MEM16READ ird16; - MEM16WRITE ewr16; - MEM16WRITE bwr16; + MEM8READ brd8; // E8000-F7FFF byte read + MEM8READ ird8; // F8000-FFFFF byte read + MEM8WRITE bwr8; // E8000-FFFFF byte write + MEM16READ brd16; // E8000-F7FFF word read + MEM16READ ird16; // F8000-FFFFF word read + MEM16WRITE bwr16; // F8000-FFFFF word write } MMAPTBL; typedef struct { @@ -654,7 +679,7 @@ static MEMFN memfn = { i286_wt, i286_wt, i286_wt, i286_wt, // 60 i286_wt, i286_wt, i286_wt, i286_wt, // 80 tram_wt, vram_w0, vram_w0, vram_w0, // a0 - emmc_wt, emmc_wt, i286_wn, i286_wn, // c0 + emmc_wt, emmc_wt, i286_wd, i286_wd, // c0 vram_w0, i286_wn, i286_wn, i286_wn}, // e0 {i286w_rd, i286w_rd, i286w_rd, i286w_rd, // 00 @@ -672,14 +697,14 @@ static MEMFN memfn = { i286w_wt, i286w_wt, i286w_wt, i286w_wt, // 60 i286w_wt, i286w_wt, i286w_wt, i286w_wt, // 80 tramw_wt, vramw_w0, vramw_w0, vramw_w0, // a0 - emmcw_wt, emmcw_wt, i286w_wn, i286w_wn, // c0 + emmcw_wt, emmcw_wt, i286w_wd, i286w_wd, // c0 vramw_w0, i286w_wn, i286w_wn, i286w_wn}}; // e0 static const MMAPTBL mmaptbl[2] = { - {i286_rd, i286_rb, i286_wn, i286_wn, - i286w_rd, i286w_rb, i286w_wn, i286w_wn}, - {i286_rb, i286_rb, i286_wt, i286_wb, - i286w_rb, i286w_rb, i286w_wt, i286w_wb}}; + {i286_rd, i286_rb, i286_wn, + i286w_rd, i286w_rb, i286w_wn}, + {i286_rb, i286_rb, i286_wb, + i286w_rb, i286w_rb, i286w_wb}}; static const VACCTBL vacctbl[0x10] = { {vram_r0, vram_w0, vramw_r0, vramw_w0}, // 00 @@ -722,9 +747,6 @@ const MMAPTBL *mm; memfn.rd8[0xe8000 >> 15] = mm->brd8; memfn.rd8[0xf0000 >> 15] = mm->brd8; memfn.rd8[0xf8000 >> 15] = mm->ird8; - - memfn.wr8[0xd0000 >> 15] = mm->ewr8; - memfn.wr8[0xd8000 >> 15] = mm->ewr8; memfn.wr8[0xe8000 >> 15] = mm->bwr8; memfn.wr8[0xf0000 >> 15] = mm->bwr8; memfn.wr8[0xf8000 >> 15] = mm->bwr8; @@ -732,9 +754,6 @@ const MMAPTBL *mm; memfn.rd16[0xe8000 >> 15] = mm->brd16; memfn.rd16[0xf0000 >> 15] = mm->brd16; memfn.rd16[0xf8000 >> 15] = mm->ird16; - - memfn.wr16[0xd0000 >> 15] = mm->ewr16; - memfn.wr16[0xd8000 >> 15] = mm->ewr16; memfn.wr16[0xe8000 >> 15] = mm->bwr16; memfn.wr16[0xf0000 >> 15] = mm->bwr16; memfn.wr16[0xf8000 >> 15] = mm->bwr16; @@ -766,7 +785,7 @@ const VACCTBL *vacc; memfn.wr16[0xb8000 >> 15] = vacc->wr16; memfn.wr16[0xe0000 >> 15] = vacc->wr16; - if (!(func & 0x10)) { // degital + if (!(func & 0x10)) { // digital memfn.wr8[0xe0000 >> 15] = i286_wn; memfn.wr16[0xe0000 >> 15] = i286w_wn; memfn.rd8[0xe0000 >> 15] = i286_nonram_r; @@ -774,90 +793,6 @@ const VACCTBL *vacc; } } -#if defined(MEMORY_DEBUG) -static REG8 MEMCALL _i286_memoryread(UINT32 address) { - - if (address < I286_MEMREADMAX) { - return(mem[address]); - } -#if defined(USE_HIMEM) - else if (address >= USE_HIMEM) { - address -= 0x100000; - if (address < CPU_EXTMEMSIZE) { - return(CPU_EXTMEM[address]); - } - else { - return(0xff); - } - } -#endif - else { - return(memfn.rd8[(address >> 15) & 0x1f](address)); - } -} - -static REG16 MEMCALL _i286_memoryread_w(UINT32 address) { - - REG16 ret; - - if (address < (I286_MEMREADMAX - 1)) { - return(LOADINTELWORD(mem + address)); - } -#if defined(USE_HIMEM) - else if (address >= (USE_HIMEM - 1)) { - address -= 0x100000; - if (address == (USE_HIMEM - 0x100000 - 1)) { - ret = mem[0x100000 + address]; - } - else if (address < CPU_EXTMEMSIZE) { - ret = CPU_EXTMEM[address]; - } - else { - ret = 0xff; - } - address++; - if (address < CPU_EXTMEMSIZE) { - ret += CPU_EXTMEM[address] << 8; - } - else { - ret += 0xff00; - } - return(ret); - } -#endif - else if ((address & 0x7fff) != 0x7fff) { - return(memfn.rd16[(address >> 15) & 0x1f](address)); - } - else { - ret = memfn.rd8[(address >> 15) & 0x1f](address); - address++; - ret += memfn.rd8[(address >> 15) & 0x1f](address) << 8; - return(ret); - } -} - -REG8 MEMCALL i286_memoryread(UINT32 address) { - - REG8 r; - - r = _i286_memoryread(address); - if (r & 0xffffff00) { - TRACEOUT(("error i286_memoryread %x %x", address, r)); - } - return(r); -} - -REG16 MEMCALL i286_memoryread_w(UINT32 address) { - - REG16 r; - - r = _i286_memoryread_w(address); - if (r & 0xffff0000) { - TRACEOUT(("error i286_memoryread_w %x %x", address, r)); - } - return(r); -} -#else REG8 MEMCALL i286_memoryread(UINT32 address) { if (address < I286_MEMREADMAX) { @@ -918,18 +853,17 @@ REG16 MEMCALL i286_memoryread_w(UINT32 a return(ret); } } -#endif void MEMCALL i286_memorywrite(UINT32 address, REG8 value) { if (address < I286_MEMWRITEMAX) { - mem[address] = (BYTE)value; + mem[address] = (UINT8)value; } #if defined(USE_HIMEM) else if (address >= USE_HIMEM) { address -= 0x100000; if (address < CPU_EXTMEMSIZE) { - CPU_EXTMEM[address] = (BYTE)value; + CPU_EXTMEM[address] = (UINT8)value; } } #endif @@ -947,14 +881,14 @@ void MEMCALL i286_memorywrite_w(UINT32 a else if (address >= (USE_HIMEM - 1)) { address -= 0x100000; if (address == (USE_HIMEM - 0x100000 - 1)) { - mem[address] = (BYTE)value; + mem[address] = (UINT8)value; } else if (address < CPU_EXTMEMSIZE) { - CPU_EXTMEM[address] = (BYTE)value; + CPU_EXTMEM[address] = (UINT8)value; } address++; if (address < CPU_EXTMEMSIZE) { - CPU_EXTMEM[address] = (BYTE)(value >> 8); + CPU_EXTMEM[address] = (UINT8)(value >> 8); } } #endif @@ -962,9 +896,9 @@ void MEMCALL i286_memorywrite_w(UINT32 a memfn.wr16[(address >> 15) & 0x1f](address, value); } else { - memfn.wr8[(address >> 15) & 0x1f](address, (BYTE)value); + memfn.wr8[(address >> 15) & 0x1f](address, (UINT8)value); address++; - memfn.wr8[(address >> 15) & 0x1f](address, (BYTE)(value >> 8)); + memfn.wr8[(address >> 15) & 0x1f](address, (UINT8)(value >> 8)); } } @@ -1000,7 +934,7 @@ void MEMCALL meml_write8(UINT seg, UINT address = (seg << 4) + LOW16(off); if (address < I286_MEMWRITEMAX) { - mem[address] = (BYTE)value; + mem[address] = (UINT8)value; } else { i286_memorywrite(address, value); @@ -1022,11 +956,11 @@ void MEMCALL meml_write16(UINT seg, UINT void MEMCALL meml_readstr(UINT seg, UINT off, void *dat, UINT leng) { - BYTE *out; + UINT8 *out; UINT32 adrs; UINT size; - out = (BYTE *)dat; + out = (UINT8 *)dat; adrs = seg << 4; off = LOW16(off); if ((I286_MEMREADMAX >= 0x10000) && @@ -1060,11 +994,11 @@ void MEMCALL meml_readstr(UINT seg, UINT void MEMCALL meml_writestr(UINT seg, UINT off, const void *dat, UINT leng) { - BYTE *out; + UINT8 *out; UINT32 adrs; UINT size; - out = (BYTE *)dat; + out = (UINT8 *)dat; adrs = seg << 4; off = LOW16(off); if ((I286_MEMWRITEMAX >= 0x10000) && @@ -1102,7 +1036,7 @@ void MEMCALL meml_read(UINT32 address, v CopyMemory(dat, mem + address, leng); } else { - BYTE *out = (BYTE *)dat; + UINT8 *out = (UINT8 *)dat; if (address < I286_MEMREADMAX) { CopyMemory(out, mem + address, I286_MEMREADMAX - address); out += I286_MEMREADMAX - address; @@ -1117,13 +1051,13 @@ void MEMCALL meml_read(UINT32 address, v void MEMCALL meml_write(UINT32 address, const void *dat, UINT leng) { -const BYTE *out; +const UINT8 *out; if ((address + leng) < I286_MEMWRITEMAX) { CopyMemory(mem + address, dat, leng); } else { - out = (BYTE *)dat; + out = (UINT8 *)dat; if (address < I286_MEMWRITEMAX) { CopyMemory(mem + address, out, I286_MEMWRITEMAX - address); out += I286_MEMWRITEMAX - address;