--- np2/statsave.c 2003/11/14 07:37:28 1.16 +++ np2/statsave.c 2004/01/05 09:31:24 1.25 @@ -4,8 +4,7 @@ #include "scrnmng.h" #include "soundmng.h" #include "timemng.h" -#include "i286.h" -#include "memory.h" +#include "cpucore.h" #include "pccore.h" #include "iocore.h" #include "cbuscore.h" @@ -56,15 +55,20 @@ typedef struct { enum { NP2FLAG_BIN = 0, NP2FLAG_TERM, +#if defined(CGWND_FONTPTR) + NP2FLAG_CGW, +#endif NP2FLAG_CLOCK, + NP2FLAG_COM, + NP2FLAG_DISK, NP2FLAG_DMA, NP2FLAG_EGC, - NP2FLAG_EXT, + NP2FLAG_EPSON, NP2FLAG_EVT, - NP2FLAG_GIJ, + NP2FLAG_EXT, NP2FLAG_FM, - NP2FLAG_COM, - NP2FLAG_DISK + NP2FLAG_GIJ, + NP2FLAG_MEM }; typedef struct { @@ -337,7 +341,7 @@ static int flagsave_term(NP2FFILE f, con } -// ---- +// ---- common static int flagsave_common(NP2FFILE f, const STENTRY *t) { @@ -357,7 +361,7 @@ static int flagload_common(NP2FFILE f, c } -// ----- +// ----- clock static int flagload_clock(NP2FFILE f, const STENTRY *t) { @@ -370,7 +374,118 @@ static int flagload_clock(NP2FFILE f, co } -// ----- +// ---- memory + +static int flagsave_mem(NP2FFILE f, const STENTRY *t) { + + int ret; + + ret = flagsave_create(f, t); + if (ret != NP2FLAG_FAILURE) { + ret |= flagsave_save(f, mem, 0x110000); + ret |= flagsave_save(f, mem + VRAM1_B, 0x18000); + ret |= flagsave_save(f, mem + VRAM1_E, 0x8000); + ret |= flagsave_close(f); + } + return(ret); +} + +static int flagload_mem(NP2FFILE f, const STENTRY *t) { + + int ret; + + ret = flagload_load(f, mem, 0x110000); + ret |= flagload_load(f, mem + VRAM1_B, 0x18000); + ret |= flagload_load(f, mem + VRAM1_E, 0x8000); + (void)t; + return(ret); +} + + +// ---- ext memory + +static int flagsave_ext(NP2FFILE f, const STENTRY *t) { + + int ret; + + ret = flagsave_create(f, t); + if (ret != NP2FLAG_FAILURE) { + ret |= flagsave_save(f, &extmem, sizeof(extmem)); + if (CPU_EXTMEM) { + ret |= flagsave_save(f, CPU_EXTMEM, CPU_EXTMEMSIZE); + } + ret |= flagsave_close(f); + } + return(ret); +} + +static int flagload_ext(NP2FFILE f, const STENTRY *t) { + + int ret; + int i; + UINT pagemax = 0; + + ret = flagload_load(f, &extmem, sizeof(extmem)); + if (extmem.maxmem) { + if (extmem.maxmem > (13+1)) { + extmem.maxmem = (13+1); + } + if (!extmemmng_realloc(extmem.maxmem - 1)) { + pagemax = (extmem.maxmem - 1) << 8; + if (CPU_EXTMEM) { + ret |= flagload_load(f, CPU_EXTMEM, CPU_EXTMEMSIZE); + } + } + else { + extmem.maxmem = 0; + } + } + for (i=0; i<4; i++) { + if (extmem.page[i] < pagemax) { + extmem.pageptr[i] = CPU_EXTMEM + (extmem.page[i] << 12); + } + else { + extmem.pageptr[i] = mem + 0xc0000 + (i << 14); + } + } + (void)t; + return(ret); +} + + +// ---- cg window + +#if defined(CGWND_FONTPTR) +static int flagsave_cgwnd(NP2FFILE f, const STENTRY *t) { + + int ret; + _CGWINDOW cgwnd; + + cgwnd = cgwindow; + cgwnd.fontlow -= (long)fontrom; + cgwnd.fonthigh -= (long)fontrom; + ret = flagsave_create(f, t); + if (ret != NP2FLAG_FAILURE) { + ret |= flagsave_save(f, &cgwindow, sizeof(cgwindow)); + ret |= flagsave_close(f); + } + return(ret); +} + +static int flagload_cgwnd(NP2FFILE f, const STENTRY *t) { + + int ret; + + ret = flagload_load(f, &cgwindow, sizeof(cgwindow)); + cgwindow.fontlow += (long)fontrom; + cgwindow.fonthigh += (long)fontrom; + (void)t; + return(ret); +} +#endif + + +// ---- dma static int flagsave_dma(NP2FFILE f, const STENTRY *t) { @@ -380,9 +495,9 @@ static int flagsave_dma(NP2FFILE f, cons dmabak = dmac; for (i=0; i<4; i++) { - if ((PROC2NUM(dmabak.dmach[i].outproc, dmaproc)) || - (PROC2NUM(dmabak.dmach[i].inproc, dmaproc)) || - (PROC2NUM(dmabak.dmach[i].extproc, dmaproc))) { + if ((PROC2NUM(dmabak.dmach[i].proc.outproc, dmaproc)) || + (PROC2NUM(dmabak.dmach[i].proc.inproc, dmaproc)) || + (PROC2NUM(dmabak.dmach[i].proc.extproc, dmaproc))) { return(NP2FLAG_FAILURE); } } @@ -402,16 +517,16 @@ static int flagload_dma(NP2FFILE f, cons ret = flagload_load(f, &dmac, sizeof(dmac)); for (i=0; i<4; i++) { - if (NUM2PROC(dmac.dmach[i].outproc, dmaproc)) { - dmac.dmach[i].outproc = dma_dummyout; + if (NUM2PROC(dmac.dmach[i].proc.outproc, dmaproc)) { + dmac.dmach[i].proc.outproc = dma_dummyout; ret |= NP2FLAG_WARNING; } - if (NUM2PROC(dmac.dmach[i].inproc, dmaproc)) { - dmac.dmach[i].inproc = dma_dummyin; + if (NUM2PROC(dmac.dmach[i].proc.inproc, dmaproc)) { + dmac.dmach[i].proc.inproc = dma_dummyin; ret |= NP2FLAG_WARNING; } - if (NUM2PROC(dmac.dmach[i].extproc, dmaproc)) { - dmac.dmach[i].extproc = dma_dummyproc; + if (NUM2PROC(dmac.dmach[i].proc.extproc, dmaproc)) { + dmac.dmach[i].proc.extproc = dma_dummyproc; ret |= NP2FLAG_WARNING; } } @@ -420,7 +535,7 @@ static int flagload_dma(NP2FFILE f, cons } -// ----- +// ---- egc static int flagsave_egc(NP2FFILE f, const STENTRY *t) { @@ -451,58 +566,38 @@ static int flagload_egc(NP2FFILE f, cons } -// ----- +// ---- epson -static int flagsave_ext(NP2FFILE f, const STENTRY *t) { +static int flagsave_epson(NP2FFILE f, const STENTRY *t) { int ret; + if (!(pc.model & PCMODEL_EPSON)) { + return(NP2FLAG_SUCCESS); + } ret = flagsave_create(f, t); if (ret != NP2FLAG_FAILURE) { - ret |= flagsave_save(f, &extmem, sizeof(extmem)); - if (extmemmng_size) { - ret |= flagsave_save(f, extmemmng_ptr, extmemmng_size); - } + ret |= flagsave_save(f, &epsonio, sizeof(epsonio)); + ret |= flagsave_save(f, mem + 0x1c0000, 0x8000); + ret |= flagsave_save(f, mem + 0x1e8000, 0x18000); ret |= flagsave_close(f); } return(ret); } -static int flagload_ext(NP2FFILE f, const STENTRY *t) { +static int flagload_epson(NP2FFILE f, const STENTRY *t) { int ret; - int i; - UINT pagemax = 0; - ret = flagload_load(f, &extmem, sizeof(extmem)); - if (extmem.maxmem) { - if (extmem.maxmem > (13+1)) { - extmem.maxmem = (13+1); - } - if (!extmemmng_realloc(extmem.maxmem - 1)) { - pagemax = (extmem.maxmem - 1) << 8; - if (extmemmng_size) { - ret |= flagload_load(f, extmemmng_ptr, extmemmng_size); - } - } - else { - extmem.maxmem = 0; - } - } - for (i=0; i<4; i++) { - if (extmem.page[i] < pagemax) { - extmem.pageptr[i] = extmemmng_ptr + (extmem.page[i] << 12); - } - else { - extmem.pageptr[i] = mem + 0xc0000 + (i << 14); - } - } + ret = flagload_load(f, &epsonio, sizeof(epsonio)); + ret |= flagload_load(f, mem + 0x1c0000, 0x8000); + ret |= flagload_load(f, mem + 0x1e8000, 0x18000); (void)t; return(ret); } -// ----- +// ---- event typedef struct { UINT readyevents; @@ -615,7 +710,7 @@ static int flagload_evt(NP2FFILE f, cons } -// ---- +// ---- gaiji static int flagsave_gij(NP2FFILE f, const STENTRY *t) { @@ -627,7 +722,7 @@ static int flagsave_gij(NP2FFILE f, cons ret = flagsave_create(f, t); if (ret != NP2FLAG_FAILURE) { for (i=0; i<2; i++) { - fnt = font + ((0x56 + (i << 7)) << 4); + fnt = fontrom + ((0x56 + (i << 7)) << 4); for (j=0; j<0x80; j++) { ret |= flagsave_save(f, fnt, 32); fnt += 0x1000; @@ -647,7 +742,7 @@ static int flagload_gij(NP2FFILE f, cons ret = 0; for (i=0; i<2; i++) { - fnt = font + ((0x56 + (i << 7)) << 4); + fnt = fontrom + ((0x56 + (i << 7)) << 4); for (j=0; j<0x80; j++) { ret |= flagload_load(f, fnt, 32); fnt += 0x1000; @@ -658,7 +753,7 @@ static int flagload_gij(NP2FFILE f, cons } -// ----- +// ---- FM enum { FLAG_MG = 0x0001, @@ -1092,7 +1187,7 @@ static int flagload_disk(NP2FFILE f, con } -// ----- +// ---- com static int flagsave_com(NP2FFILE f, const STENTRY *t) { @@ -1218,55 +1313,73 @@ int statsave_save(const char *filename) _NP2FFILE f; int ret; - UINT i; +const STENTRY *tbl; +const STENTRY *tblterm; ret = flagcreate(&f, filename); if (ret == NP2FLAG_FAILURE) { return(ret); } - for (i=0; itype) { case NP2FLAG_BIN: case NP2FLAG_CLOCK: - ret |= flagsave_common(&f, &np2tbl[i]); + ret |= flagsave_common(&f, tbl); break; case NP2FLAG_TERM: - ret |= flagsave_term(&f, &np2tbl[i]); + ret |= flagsave_term(&f, tbl); + break; + +#if defined(CGWND_FONTPTR) + case NP2FLAG_CGW: + ret |= flagsave_cgwnd(&f, tbl); + break; +#endif + + case NP2FLAG_COM: + ret |= flagsave_com(&f, tbl); + break; + + case NP2FLAG_DISK: + ret |= flagsave_disk(&f, tbl); break; case NP2FLAG_DMA: - ret |= flagsave_dma(&f, &np2tbl[i]); + ret |= flagsave_dma(&f, tbl); break; case NP2FLAG_EGC: - ret |= flagsave_egc(&f, &np2tbl[i]); + ret |= flagsave_egc(&f, tbl); break; - case NP2FLAG_EXT: - ret |= flagsave_ext(&f, &np2tbl[i]); + case NP2FLAG_EPSON: + ret |= flagsave_epson(&f, tbl); break; case NP2FLAG_EVT: - ret |= flagsave_evt(&f, &np2tbl[i]); + ret |= flagsave_evt(&f, tbl); break; - case NP2FLAG_GIJ: - ret |= flagsave_gij(&f, &np2tbl[i]); + case NP2FLAG_EXT: + ret |= flagsave_ext(&f, tbl); break; case NP2FLAG_FM: - ret |= flagsave_fm(&f, &np2tbl[i]); + ret |= flagsave_fm(&f, tbl); break; - case NP2FLAG_DISK: - ret |= flagsave_disk(&f, &np2tbl[i]); + case NP2FLAG_GIJ: + ret |= flagsave_gij(&f, tbl); break; - case NP2FLAG_COM: - ret |= flagsave_com(&f, &np2tbl[i]); + case NP2FLAG_MEM: + ret |= flagsave_mem(&f, tbl); break; } + tbl++; } flagclose(&f); return(ret); @@ -1274,11 +1387,12 @@ int statsave_save(const char *filename) int statsave_check(const char *filename, char *buf, int size) { + ERR_BUF e; _NP2FFILE f; int ret; - UINT i; BOOL done; - ERR_BUF e; +const STENTRY *tbl; +const STENTRY *tblterm; e.buf = buf; e.remain = size; @@ -1300,36 +1414,42 @@ int statsave_check(const char *filename, ret |= flagload_create(&f); CopyMemory(index, f.p.index, sizeof(f.p.index)); index[10] = 0; - for (i=0; iindex)) { break; } + tbl++; } - if (i < (sizeof(np2tbl)/sizeof(STENTRY))) { - switch(np2tbl[i].type) { + if (tbl < tblterm) { + switch(tbl->type) { case NP2FLAG_BIN: +#if defined(CGWND_FONTPTR) + case NP2FLAG_CGW: +#endif case NP2FLAG_CLOCK: - ret |= flagcheck_versize(&f, &np2tbl[i], &e); + case NP2FLAG_MEM: + ret |= flagcheck_versize(&f, tbl, &e); break; case NP2FLAG_TERM: done = TRUE; break; + case NP2FLAG_COM: case NP2FLAG_DMA: case NP2FLAG_EGC: - case NP2FLAG_EXT: + case NP2FLAG_EPSON: case NP2FLAG_EVT: + case NP2FLAG_EXT: case NP2FLAG_GIJ: - case NP2FLAG_COM: - ret |= flagcheck_veronly(&f, &np2tbl[i], &e); + case NP2FLAG_FM: + ret |= flagcheck_veronly(&f, tbl, &e); break; case NP2FLAG_DISK: - ret |= flagcheck_disk(&f, &np2tbl[i], &e); - break; - - case NP2FLAG_FM: // ver0.31 + ret |= flagcheck_disk(&f, tbl, &e); break; default: @@ -1354,8 +1474,9 @@ int statsave_load(const char *filename) _NP2FFILE f; int ret; - UINT i; BOOL done; +const STENTRY *tbl; +const STENTRY *tblterm; ret = flagopen(&f, filename, NULL); if (ret == NP2FLAG_FAILURE) { @@ -1375,55 +1496,72 @@ int statsave_load(const char *filename) ret |= flagload_create(&f); CopyMemory(index, f.p.index, sizeof(f.p.index)); index[10] = 0; - for (i=0; iindex)) { break; } + tbl++; } - if (i < (sizeof(np2tbl)/sizeof(STENTRY))) { - switch(np2tbl[i].type) { + if (tbl < tblterm) { + switch(tbl->type) { case NP2FLAG_BIN: - ret |= flagload_common(&f, &np2tbl[i]); + ret |= flagload_common(&f, tbl); break; case NP2FLAG_TERM: done = TRUE; break; +#if defined(CGWND_FONTPTR) + case NP2FLAG_CGW: + ret |= flagload_cgwnd(&f, tbl); + break; +#endif + case NP2FLAG_CLOCK: - ret |= flagload_clock(&f, &np2tbl[i]); + ret |= flagload_clock(&f, tbl); + break; + + case NP2FLAG_COM: + ret |= flagload_com(&f, tbl); + break; + + case NP2FLAG_DISK: + ret |= flagload_disk(&f, tbl); break; case NP2FLAG_DMA: - ret |= flagload_dma(&f, &np2tbl[i]); + ret |= flagload_dma(&f, tbl); break; case NP2FLAG_EGC: - ret |= flagload_egc(&f, &np2tbl[i]); + ret |= flagload_egc(&f, tbl); break; - case NP2FLAG_EXT: - ret |= flagload_ext(&f, &np2tbl[i]); + case NP2FLAG_EPSON: + ret |= flagload_epson(&f, tbl); break; case NP2FLAG_EVT: - ret |= flagload_evt(&f, &np2tbl[i]); + ret |= flagload_evt(&f, tbl); break; - case NP2FLAG_GIJ: - ret |= flagload_gij(&f, &np2tbl[i]); + case NP2FLAG_EXT: + ret |= flagload_ext(&f, tbl); break; case NP2FLAG_FM: - ret |= flagload_fm(&f, &np2tbl[i]); + ret |= flagload_fm(&f, tbl); break; - case NP2FLAG_DISK: - ret |= flagload_disk(&f, &np2tbl[i]); + case NP2FLAG_GIJ: + ret |= flagload_gij(&f, tbl); break; - case NP2FLAG_COM: - ret |= flagload_com(&f, &np2tbl[i]); + case NP2FLAG_MEM: + ret |= flagload_mem(&f, tbl); break; default: @@ -1439,6 +1577,7 @@ int statsave_load(const char *filename) flagclose(&f); // I/Oºî¤êľ¤· + i286_memorymap((pc.model & PCMODEL_EPSON)?1:0); iocore_build(); iocore_bind(); cbuscore_bind(); @@ -1451,6 +1590,10 @@ int statsave_load(const char *filename) gdcs.palchange = GDCSCRN_REDRAW; tramflag.renewal = 1; cgwindow.writable |= 0x80; +#if defined(CPUSTRUC_FONTPTR) + FONTPTR_LOW = fontrom + cgwindow.low; + FONTPTR_HIGH = fontrom + cgwindow.high; +#endif i286_vram_dispatch(vramop.operate); soundmng_play();