[ memory ]
*/
-#include "memory.h"
+#include "./memory.h"
#include "timer.h"
#define RAM (MEMORY_BASE + RAM_BASE)
#define SYSTEMROM2 (MEMORY_BASE + SYSTEMROM2_BASE)
#define CGROM6 (MEMORY_BASE + CGROM6_BASE)
+namespace PC6001 {
+
void MEMORY::initialize()
{
FILEIO* fio = new FILEIO();
#if defined(_PC6001)
- if(fio->Fopen(emu->bios_path(_T("BASICROM.60")), FILEIO_READ_BINARY)) {
+ if(fio->Fopen(create_local_path(_T("BASICROM.60")), FILEIO_READ_BINARY)) {
fio->Fread(BASICROM, 0x4000, 1);
fio->Fclose();
}
- if(fio->Fopen(emu->bios_path(_T("CGROM60.60")), FILEIO_READ_BINARY)) {
+ if(fio->Fopen(create_local_path(_T("CGROM60.60")), FILEIO_READ_BINARY)) {
fio->Fread(CGROM1, 0x1000, 1);
fio->Fclose();
}
#elif defined(_PC6001MK2)
- if (fio->Fopen(emu->bios_path(_T("CGROM62.62")), FILEIO_READ_BINARY)) {
+ if (fio->Fopen(create_local_path(_T("CGROM62.62")), FILEIO_READ_BINARY)) {
fio->Fread(CGROM5, 0x2000, 1);
fio->Fclose();
}
- else if (fio->Fopen(emu->bios_path(_T("CGROM60m.62")), FILEIO_READ_BINARY)) {
+ else if (fio->Fopen(create_local_path(_T("CGROM60m.62")), FILEIO_READ_BINARY)) {
fio->Fread(CGROM5, 0x2000, 1);
fio->Fclose();
}
- if (fio->Fopen(emu->bios_path(_T("BASICROM.62")), FILEIO_READ_BINARY)) {
+ if (fio->Fopen(create_local_path(_T("BASICROM.62")), FILEIO_READ_BINARY)) {
fio->Fread(BASICROM, 0x8000, 1);
fio->Fclose();
}
- if (fio->Fopen(emu->bios_path(_T("CGROM60.62")), FILEIO_READ_BINARY)) {
+ if (fio->Fopen(create_local_path(_T("CGROM60.62")), FILEIO_READ_BINARY)) {
fio->Fread(CGROM1, 0x2000, 1);
fio->Fclose();
}
- if (fio->Fopen(emu->bios_path(_T("KANJIROM.62")), FILEIO_READ_BINARY)) {
+ if (fio->Fopen(create_local_path(_T("KANJIROM.62")), FILEIO_READ_BINARY)) {
fio->Fread(KANJIROM, 0x8000, 1);
fio->Fclose();
}
- if (fio->Fopen(emu->bios_path(_T("VOICEROM.62")), FILEIO_READ_BINARY)) {
+ if (fio->Fopen(create_local_path(_T("VOICEROM.62")), FILEIO_READ_BINARY)) {
fio->Fread(VOICEROM, 0x4000, 1);
fio->Fclose();
}
#elif defined(_PC6601)
- if (fio->Fopen(emu->bios_path(_T("CGROM66.66")), FILEIO_READ_BINARY)) {
+ if (fio->Fopen(create_local_path(_T("CGROM66.66")), FILEIO_READ_BINARY)) {
fio->Fread(CGROM5, 0x2000, 1);
fio->Fclose();
}
- if (fio->Fopen(emu->bios_path(_T("BASICROM.66")), FILEIO_READ_BINARY)) {
+ if (fio->Fopen(create_local_path(_T("BASICROM.66")), FILEIO_READ_BINARY)) {
fio->Fread(BASICROM, 0x8000, 1);
fio->Fclose();
}
- if (fio->Fopen(emu->bios_path(_T("CGROM60.66")), FILEIO_READ_BINARY)) {
+ if (fio->Fopen(create_local_path(_T("CGROM60.66")), FILEIO_READ_BINARY)) {
fio->Fread(CGROM1, 0x2000, 1);
fio->Fclose();
}
- if (fio->Fopen(emu->bios_path(_T("KANJIROM.66")), FILEIO_READ_BINARY)) {
+ if (fio->Fopen(create_local_path(_T("KANJIROM.66")), FILEIO_READ_BINARY)) {
fio->Fread(KANJIROM, 0x8000, 1);
fio->Fclose();
}
- if (fio->Fopen(emu->bios_path(_T("VOICEROM.66")), FILEIO_READ_BINARY)) {
+ if (fio->Fopen(create_local_path(_T("VOICEROM.66")), FILEIO_READ_BINARY)) {
fio->Fread(VOICEROM, 0x4000, 1);
fio->Fclose();
}
#elif defined(_PC6601SR) || defined(_PC6001MK2SR)
- if (fio->Fopen(emu->bios_path(_T("CGROM68.68")), FILEIO_READ_BINARY)) {
+ if (fio->Fopen(create_local_path(_T("CGROM68.68")), FILEIO_READ_BINARY)) {
fio->Fread(CGROM6, 0x4000, 1);
fio->Fclose();
}
memcpy(CGROM1, CGROM6, 0x2400);
memcpy(CGROM5, CGROM6+0x2000, 0x2000);
- if (fio->Fopen(emu->bios_path(_T("SYSTEMROM1.68")), FILEIO_READ_BINARY)) {
+ if (fio->Fopen(create_local_path(_T("SYSTEMROM1.68")), FILEIO_READ_BINARY)) {
fio->Fread(SYSTEMROM1, 0x10000, 1);
fio->Fclose();
}
memcpy(BASICROM, SYSTEMROM1, 0x8000);
- if (fio->Fopen(emu->bios_path(_T("SYSTEMROM2.68")), FILEIO_READ_BINARY)) {
+ if (fio->Fopen(create_local_path(_T("SYSTEMROM2.68")), FILEIO_READ_BINARY)) {
fio->Fread(SYSTEMROM2, 0x10000, 1);
fio->Fclose();
}
palette_pc[15] = RGB_COLOR(0xFF,0xFF,0xFF); // COL080 = FFFFFF ;mk2\81` \94\92
// register event
- register_vline_event(this);
#endif
+ register_vline_event(this);
}
void MEMORY::reset()
EXTROM1 = RAM + 0x4000;
EXTROM2 = RAM + 0x6000;
FILEIO* fio = new FILEIO();
- if (fio->Fopen(emu->bios_path(_T("EXTROM.60")), FILEIO_READ_BINARY)) {
+ if (fio->Fopen(create_local_path(_T("EXTROM.60")), FILEIO_READ_BINARY)) {
fio->Fread(EXTROM, 0x4000, 1);
fio->Fclose();
EXTROM1 = EXTROM;
EnWrite[0]=0; EnWrite[1]=EnWrite[2]=EnWrite[3]=1;
#else
int I, J;
- byte *addr=RAM;
+ uint8_t *addr=RAM;
memset(RAM ,0,0x10000);
memset(EmptyRAM, 0, 0x2000);
for(I=0; I<256; I++ ){
EXTROM1 = EXTROM2 = EmptyRAM;
}
#if defined(_PC6001MK2) || defined(_PC6601)
- vm->sr_mode=0;
+ static_cast<VM *>(vm)->sr_mode=0;
CGROM = CGROM1;
VRAM = RAM+0xE000;
for (I=0; I<0x200; I++ ) *(VRAM+I)=0xde;
for(J=4;J<8;J++) {RdMem[J]=RAM+0x2000*J;WrMem[J]=RAM+0x2000*J;};
EnWrite[0]=EnWrite[1]=0; EnWrite[2]=EnWrite[3]=1;
#elif defined(_PC6601SR) || defined(_PC6001MK2SR)
- vm->sr_mode=1;
+ static_cast<VM *>(vm)->sr_mode=1;
bitmap=1;
cols=40;
rows=20;
portF1 = 0xdd;
CRTMode1 = CRTMode2 = CRTMode3 = 0;
CSS3=CSS2=CSS1=0;
- CGSW93 = CRTKILL = 0;
CurKANJIROM = KANJIROM;
#endif
+ CGSW93 = CRTKILL = 0;
}
-void MEMORY::write_data8(uint32 addr, uint32 data)
+void MEMORY::write_data8(uint32_t addr, uint32_t data)
{
#if defined(_PC6601SR) || defined(_PC6001MK2SR)
/* Graphics Vram Write (SR basic) */
- if(vm->sr_mode && chk_gvram(addr ,8))
+ if(static_cast<VM *>(vm)->sr_mode && chk_gvram(addr ,8))
gvram_write(addr, data);
else
#endif
WrMem[addr >> 13][addr & 0x1FFF] = data;
}
-uint32 MEMORY::read_data8(uint32 addr)
+uint32_t MEMORY::read_data8(uint32_t addr)
{
#if defined(_PC6601SR) || defined(_PC6001MK2SR)
/* Graphics Vram Read (SR basic) */
- if(vm->sr_mode && chk_gvram(addr, 0))
+ if(static_cast<VM *>(vm)->sr_mode && chk_gvram(addr, 0))
return(gvram_read(addr));
#endif
return(RdMem[addr >> 13][addr & 0x1FFF]);
}
-void MEMORY::write_io8(uint32 addr, uint32 data)
+void MEMORY::write_data8w(uint32_t addr, uint32_t data, int *wait)
+{
+#ifdef _PC6001
+ *wait = addr < 0x8000 ? 1 : 0;
+#else
+ bool is_rom;
+ uint32_t portF3 = d_timer->read_io8(0xf3);
+#if defined(_PC6601SR) || defined(_PC6001MK2SR)
+ if (static_cast<VM *>(vm)->sr_mode) {
+ is_rom = (port60[8 + (addr >> 13)] & 0xf0) > 0x20 ? true: false;
+ } else
+#endif
+ {
+ is_rom = EnWrite[addr >> 14] ? false : true;
+ }
+ *wait = is_rom && (portF3 & 0x40) || !is_rom && (portF3 & 0x20) ? 1 : 0;
+#endif
+ write_data8(addr, data);
+}
+
+uint32_t MEMORY::read_data8w(uint32_t addr, int *wait)
+{
+#ifdef _PC6001
+ *wait = addr < 0x8000 ? 1 : 0;
+#else
+ bool is_rom;
+ uint32_t portF3 = d_timer->read_io8(0xf3);
+#if defined(_PC6601SR) || defined(_PC6001MK2SR)
+ if (static_cast<VM *>(vm)->sr_mode) {
+ is_rom = (port60[addr >> 13] & 0xf0) > 0x20 ? true : false;
+ } else
+#endif
+ {
+ if (CGSW93 && 0x6000 <= addr && addr < 0x8000) {
+ is_rom = true;
+ } else if (addr < 0x4000) {
+ is_rom = (portF0 & 0x0f) == 0x0d || (portF0 & 0x0f) == 0x0e ? false : true;
+ } else if (addr < 0x8000) {
+ is_rom = (portF0 & 0xf0) == 0xd0 || (portF0 & 0xf0) == 0xe0 ? false : true;
+ } else if (addr < 0xc000) {
+ is_rom = (portF1 & 0x0f) == 0x0d || (portF1 & 0x0f) == 0x0e ? false : true;
+ } else {
+ is_rom = (portF1 & 0xf0) == 0xd0 || (portF1 & 0xf0) == 0xe0 ? false : true;
+ }
+ }
+ *wait = is_rom && (portF3 & 0x40) || !is_rom && (portF3 & 0x20) ? 1 : 0;
+#endif
+ return read_data8(addr);
+}
+
+uint32_t MEMORY::fetch_op(uint32_t addr, int *wait)
+{
+#ifndef _PC6001
+ uint32_t portF3 = d_timer->read_io8(0xf3);
+ if ((portF3 & 0x80) == 0) {
+ return read_data8w(addr, wait);
+ }
+#endif
+ *wait = 1;
+ return read_data8(addr);
+}
+
+void MEMORY::write_io8(uint32_t addr, uint32_t data)
{
unsigned int VRAMHead[2][4] = {
{ 0xc000, 0xe000, 0x8000, 0xa000 },
{ 0x8000, 0xc000, 0x0000, 0x4000 }
};
- uint16 port=(addr & 0x00ff);
- uint8 Value=data;
+ uint16_t port=(addr & 0x00ff);
+ uint8_t Value=data;
switch(port)
{
#ifdef _PC6001
break;
#endif
case 0xB0:
- if (vm->sr_mode) {
+ if (static_cast<VM *>(vm)->sr_mode) {
d_timer->set_portB0(Value);
} else {
VRAM=(RAM+VRAMHead[CRTMode1][(data&0x06)>>1]);
CRTMode3=(Value&0x08) ? 0 : 1;
#if defined(_PC6601SR) || defined(_PC6001MK2SR)
portC1 = Value;
- if (vm->sr_mode)
+ if (static_cast<VM *>(vm)->sr_mode)
lines=(Value&0x01) ? 200 : 204;
- if (vm->sr_mode)
+ if (static_cast<VM *>(vm)->sr_mode)
CGROM = CGROM6; // N66SR BASIC use CGROM6
else
CGROM = ((CRTMode1 == 0) ? CGROM1 : CGROM5);
- if (vm->sr_mode) {
+ if (static_cast<VM *>(vm)->sr_mode) {
if (CRTMode1==1 && CRTMode2==0 && !bitmap) { /* width 80 */
cols=80;
} else if(CRTMode1==0 && CRTMode2==0 && !bitmap) { /* Width 40 */
#endif
break;
case 0xC2: // ROM swtich
- if (vm->sr_mode) return; /* sr_mode do nothing! */
+ if (static_cast<VM *>(vm)->sr_mode) return; /* sr_mode do nothing! */
if ((Value&0x02)==0x00) CurKANJIROM=KANJIROM;
else CurKANJIROM=KANJIROM+0x4000;
if ((Value&0x01)==0x00) {
bitmap = (Value & 8)? 0:1;
rows = (Value & 4)? 20:25;
/// busreq = (Value & 2)? 0:1;
- vm->sr_mode = ((Value & 1)==1) ? 0 : 1;
- if (bitmap && vm->sr_mode)
+ static_cast<VM *>(vm)->sr_mode = ((Value & 1)==1) ? 0 : 1;
+ if (bitmap && static_cast<VM *>(vm)->sr_mode)
{
VRAM = (Value & 0x10) ? RAM+0x8000:RAM+0x0000;
}
- if (vm->sr_mode) {
+ if (static_cast<VM *>(vm)->sr_mode) {
CGROM=CGROM6;
portF0=0x11;
}
break;
case 0xC9:
- if (vm->sr_mode && !bitmap )
+ if (static_cast<VM *>(vm)->sr_mode && !bitmap )
{
TEXTVRAM=RAM+(Value & 0xf)*0x1000;
}
case 0xCF: portCF=0; break;
#endif
case 0xF0: // read block set
- if (vm->sr_mode) return; /* sr_mode do nothing! */
+ if (static_cast<VM *>(vm)->sr_mode) return; /* sr_mode do nothing! */
portF0 = Value;
switch(data & 0x0f)
{
if (CGSW93) RdMem[3] = CGROM;
break;
case 0xF1: // read block set
- if (vm->sr_mode) return; /* sr_mode do nothing! */
+ if (static_cast<VM *>(vm)->sr_mode) return; /* sr_mode do nothing! */
portF1 = Value;
switch(data & 0x0f)
{
};
break;
case 0xF2: // write ram block set
- if (vm->sr_mode) return; /* sr_mode do nothing! */
+ if (static_cast<VM *>(vm)->sr_mode) return; /* sr_mode do nothing! */
if (data & 0x40) {EnWrite[3]=1;WrMem[6]=RAM+0xc000;WrMem[7]=RAM+0xe000;}
else EnWrite[3]=0;
if (data & 0x010) {EnWrite[2]=1;WrMem[4]=RAM+0x8000;WrMem[5]=RAM+0xa000;}
}
#ifndef _PC6001
-uint32 MEMORY::read_io8(uint32 addr)
+uint32_t MEMORY::read_io8(uint32_t addr)
{
- uint16 port=(addr & 0x00ff);
- byte Value=0xff;
+ uint16_t port=(addr & 0x00ff);
+ uint8_t Value=0xff;
switch(port)
{
case 0xC0: Value=0xff;break;
case 0xC2: Value=0xff;break;
#endif
- case 0xF0: if (!vm->sr_mode) Value=portF0;break;
- case 0xF1: if (!vm->sr_mode) Value=portF1;break;
+ case 0xF0: if (!static_cast<VM *>(vm)->sr_mode) Value=portF0;break;
+ case 0xF1: if (!static_cast<VM *>(vm)->sr_mode) Value=portF1;break;
}
return(Value);
}
+#endif
+
+void MEMORY::write_io8w(uint32_t addr, uint32_t data, int* wait)
+{
+ *wait = (addr & 0xf0) == 0xa0 ? 1 : 0;
+ write_io8(addr, data);
+}
+
+uint32_t MEMORY::read_io8w(uint32_t addr, int* wait)
+{
+ *wait = (addr & 0xf0) == 0xa0 ? 1 : 0;
+ return read_io8(addr);
+}
#define EVENT_HBLANK 1
void MEMORY::event_vline(int v, int clock)
{
#if defined(_PC6601SR) || defined(_PC6001MK2SR)
- if(vm->sr_mode) {
+ if(static_cast<VM *>(vm)->sr_mode) {
if(v == (CRTMode1 ? 200 : 192)) {
d_timer->write_signal(SIG_TIMER_IRQ_VRTC, 1, 1);
}
} else
#endif
{
- if(!CRTKILL) {
- if(v < (CRTMode1 ? 200 : 192)) {
+ if (!CRTKILL) {
+#ifdef _PC6001
+ if (v < 192) {
d_cpu->write_signal(SIG_CPU_BUSREQ, 1, 1);
- register_event_by_clock(this, EVENT_HBLANK, CPU_CLOCKS / FRAMES_PER_SEC / LINES_PER_FRAME * 368 / 456, false, NULL);
+ register_event_by_clock(this, EVENT_HBLANK, (uint64_t)((double)CPU_CLOCKS / FRAMES_PER_SEC / LINES_PER_FRAME * 296 / 455), false, NULL);
}
+#else
+ if (v < (CRTMode1 ? 200 : 192)) {
+ d_cpu->write_signal(SIG_CPU_BUSREQ, 1, 1);
+ register_event_by_clock(this, EVENT_HBLANK, (uint64_t)((double)CPU_CLOCKS / FRAMES_PER_SEC / LINES_PER_FRAME * (CRTMode1 ? 368 : 304) / 456), false, NULL);
+ }
+#endif
}
}
}
d_cpu->write_signal(SIG_CPU_BUSREQ, 0, 0);
}
}
-#endif
-void MEMORY::write_signal(int id, uint32 data, uint32 mask)
+void MEMORY::write_signal(int id, uint32_t data, uint32_t mask)
{
if(id == SIG_MEMORY_PIO_PORT_C) {
#ifdef _PC6001
}
#else
if(data & 4) {
- CGSW93=0; if (!vm->sr_mode) write_io8(0xf0, portF0);
+ CGSW93=0; if (!static_cast<VM *>(vm)->sr_mode) write_io8(0xf0, portF0);
} else {
CGSW93=1; RdMem[3]=CGROM;
}
- CRTKILL = (data & 2) ? 0 : 1;
#endif
+ CRTKILL = (data & 2) ? 0 : 1;
+ if (CRTKILL) {
+ d_cpu->write_signal(SIG_CPU_BUSREQ, 0, 0);
+ }
}
}
-void MEMORY::open_cart(_TCHAR* file_path)
+void MEMORY::open_cart(const _TCHAR* file_path)
{
FILEIO* fio = new FILEIO();
if(fio->Fopen(file_path, FILEIO_READ_BINARY)) {
#define STATE_VERSION 1
-void MEMORY::save_state(FILEIO* state_fio)
+bool MEMORY::process_state(FILEIO* state_fio, bool loading)
{
- state_fio->FputUint32(STATE_VERSION);
- state_fio->FputInt32(this_device_id);
-
- state_fio->Fwrite(RAM, RAM_SIZE, 1);
- state_fio->FputInt32((int)(CGROM - MEMORY_BASE));
- state_fio->FputInt32((int)(EXTROM1 - MEMORY_BASE));
- state_fio->FputInt32((int)(EXTROM2 - MEMORY_BASE));
- for(int i = 0; i < 8; i++) {
- state_fio->FputInt32((int)(RdMem[i] - MEMORY_BASE));
- state_fio->FputInt32((int)(WrMem[i] - MEMORY_BASE));
- }
- state_fio->FputInt32((int)(VRAM - MEMORY_BASE));
- state_fio->Fwrite(EnWrite, sizeof(EnWrite), 1);
- state_fio->FputUint8(CGSW93);
- state_fio->FputBool(inserted);
-#ifndef _PC6001
- state_fio->FputUint8(CRTKILL);
- state_fio->FputInt32((int)(CurKANJIROM - MEMORY_BASE));
- state_fio->FputUint8(CRTMode1);
- state_fio->FputUint8(CRTMode2);
- state_fio->FputUint8(CRTMode3);
- state_fio->FputUint8(CSS1);
- state_fio->FputUint8(CSS2);
- state_fio->FputUint8(CSS3);
- state_fio->FputUint8(portF0);
- state_fio->FputUint8(portF1);
-#if defined(_PC6601SR) || defined(_PC6001MK2SR)
- state_fio->FputInt32(bitmap);
- state_fio->FputInt32(cols);
- state_fio->FputInt32(rows);
- state_fio->FputInt32(lines);
- state_fio->FputInt32((int)(TEXTVRAM - MEMORY_BASE));
- state_fio->FputInt32((int)(SYSROM2 - MEMORY_BASE));
- state_fio->Fwrite(EXTRAM, EXTRAM_SIZE, 1);
- state_fio->Fwrite(port60, sizeof(port60), 1);
- state_fio->FputUint8(portC1);
- state_fio->FputUint8(portC8);
- state_fio->FputUint8(portCA);
- state_fio->FputUint8(portCB);
- state_fio->FputUint8(portCC);
- state_fio->FputUint8(portCE);
- state_fio->FputUint8(portCF);
- state_fio->Fwrite(palet, sizeof(palet), 1);
-#endif
-#endif
-}
-
-bool MEMORY::load_state(FILEIO* state_fio)
-{
- if(state_fio->FgetUint32() != STATE_VERSION) {
+ if(!state_fio->StateCheckUint32(STATE_VERSION)) {
return false;
}
- if(state_fio->FgetInt32() != this_device_id) {
+ if(!state_fio->StateCheckInt32(this_device_id)) {
return false;
}
- state_fio->Fread(RAM, RAM_SIZE, 1);
- CGROM = MEMORY_BASE + state_fio->FgetInt32();
- EXTROM1 = MEMORY_BASE + state_fio->FgetInt32();
- EXTROM2 = MEMORY_BASE + state_fio->FgetInt32();
- for(int i = 0; i < 8; i++) {
- RdMem[i] = MEMORY_BASE + state_fio->FgetInt32();
- WrMem[i] = MEMORY_BASE + state_fio->FgetInt32();
- }
- VRAM = MEMORY_BASE + state_fio->FgetInt32();
- state_fio->Fread(EnWrite, sizeof(EnWrite), 1);
- CGSW93 = state_fio->FgetUint8();
- inserted = state_fio->FgetBool();
+ state_fio->StateArray(RAM, RAM_SIZE, 1);
+ if(loading) {
+ CGROM = MEMORY_BASE + state_fio->FgetInt32_LE();
+ EXTROM1 = MEMORY_BASE + state_fio->FgetInt32_LE();
+ EXTROM2 = MEMORY_BASE + state_fio->FgetInt32_LE();
+ for(int i = 0; i < 8; i++) {
+ RdMem[i] = MEMORY_BASE + state_fio->FgetInt32_LE();
+ WrMem[i] = MEMORY_BASE + state_fio->FgetInt32_LE();
+ }
+ VRAM = MEMORY_BASE + state_fio->FgetInt32_LE();
+ } else {
+ state_fio->FputInt32_LE((int)(CGROM - MEMORY_BASE));
+ state_fio->FputInt32_LE((int)(EXTROM1 - MEMORY_BASE));
+ state_fio->FputInt32_LE((int)(EXTROM2 - MEMORY_BASE));
+ for(int i = 0; i < 8; i++) {
+ state_fio->FputInt32_LE((int)(RdMem[i] - MEMORY_BASE));
+ state_fio->FputInt32_LE((int)(WrMem[i] - MEMORY_BASE));
+ }
+ state_fio->FputInt32_LE((int)(VRAM - MEMORY_BASE));
+ }
+ state_fio->StateArray(EnWrite, sizeof(EnWrite), 1);
+ state_fio->StateValue(CGSW93);
+ state_fio->StateValue(inserted);
#ifndef _PC6001
- CRTKILL = state_fio->FgetUint8();
- CurKANJIROM = MEMORY_BASE + state_fio->FgetInt32();
- CRTMode1 = state_fio->FgetUint8();
- CRTMode2 = state_fio->FgetUint8();
- CRTMode3 = state_fio->FgetUint8();
- CSS1 = state_fio->FgetUint8();
- CSS2 = state_fio->FgetUint8();
- CSS3 = state_fio->FgetUint8();
- portF0 = state_fio->FgetUint8();
- portF1 = state_fio->FgetUint8();
+ state_fio->StateValue(CRTKILL);
+ if(loading) {
+ CurKANJIROM = MEMORY_BASE + state_fio->FgetInt32_LE();
+ } else {
+ state_fio->FputInt32_LE((int)(CurKANJIROM - MEMORY_BASE));
+ }
+ state_fio->StateValue(CRTMode1);
+ state_fio->StateValue(CRTMode2);
+ state_fio->StateValue(CRTMode3);
+ state_fio->StateValue(CSS1);
+ state_fio->StateValue(CSS2);
+ state_fio->StateValue(CSS3);
+ state_fio->StateValue(portF0);
+ state_fio->StateValue(portF1);
#if defined(_PC6601SR) || defined(_PC6001MK2SR)
- bitmap = state_fio->FgetInt32();
- cols = state_fio->FgetInt32();
- rows = state_fio->FgetInt32();
- lines = state_fio->FgetInt32();
- TEXTVRAM = MEMORY_BASE + state_fio->FgetInt32();
- SYSROM2 = MEMORY_BASE + state_fio->FgetInt32();
- state_fio->Fread(EXTRAM, EXTRAM_SIZE, 1);
- state_fio->Fread(port60, sizeof(port60), 1);
- portC1 = state_fio->FgetUint8();
- portC8 = state_fio->FgetUint8();
- portCA = state_fio->FgetUint8();
- portCB = state_fio->FgetUint8();
- portCC = state_fio->FgetUint8();
- portCE = state_fio->FgetUint8();
- portCF = state_fio->FgetUint8();
- state_fio->Fread(palet, sizeof(palet), 1);
+ state_fio->StateValue(bitmap);
+ state_fio->StateValue(cols);
+ state_fio->StateValue(rows);
+ state_fio->StateValue(lines);
+ if(loading) {
+ TEXTVRAM = MEMORY_BASE + state_fio->FgetInt32_LE();
+ SYSROM2 = MEMORY_BASE + state_fio->FgetInt32_LE();
+ } else {
+ state_fio->FputInt32_LE((int)(TEXTVRAM - MEMORY_BASE));
+ state_fio->FputInt32_LE((int)(SYSROM2 - MEMORY_BASE));
+ }
+ state_fio->StateArray(EXTRAM, EXTRAM_SIZE, 1);
+ state_fio->StateArray(port60, sizeof(port60), 1);
+ state_fio->StateValue(portC1);
+ state_fio->StateValue(portC8);
+ state_fio->StateValue(portCA);
+ state_fio->StateValue(portCB);
+ state_fio->StateValue(portCC);
+ state_fio->StateValue(portCE);
+ state_fio->StateValue(portCF);
+ state_fio->StateArray(palet, sizeof(palet), 1);
#endif
#endif
return true;
}
+}
OSDN Git Service
