[VM][STATE] Apply new framework to some VMs.

[csp-qt/common_source_project-fm7.git] / source / src / vm / mz3500 / sub.cpp

diff --git a/source/src/vm/mz3500/sub.cpp b/source/src/vm/mz3500/sub.cpp
index 94facc7..fd7de6e 100644 (file)
--- a/source/src/vm/mz3500/sub.cpp
+++ b/source/src/vm/mz3500/sub.cpp
@@ -97,7 +97,7 @@ void SUB::write_io8(uint32_t addr, uint32_t data)
 {
        switch(addr & 0xf0) {
        case 0x00:      // mz3500sm p.18,77
-//             emu->out_debug_log(_T("SUB->MAIN\tINT0=1\n"));
+//             this->out_debug_log(_T("SUB->MAIN\tINT0=1\n"));
                d_main->write_signal(SIG_MAIN_INT0, 1, 1);
                break;
        case 0x50:      // mz3500sm p.28
@@ -195,7 +195,7 @@ void SUB::draw_screen()
                        if(config.scan_line) {
                                memset(dest1, 0, 640 * sizeof(scrntype_t));
                        } else {
-                               memcpy(dest1, dest0, 640 * sizeof(scrntype_t));
+                               my_memcpy(dest1, dest0, 640 * sizeof(scrntype_t));
                        }
                }
                emu->screen_skip_line(true);
@@ -569,33 +569,19 @@ void SUB::draw_gfx_200line_8bit()
 
 #define STATE_VERSION  3
 
-void SUB::save_state(FILEIO* state_fio)
+bool SUB::process_state(FILEIO* state_fio, bool loading)
 {
-       state_fio->FputUint32(STATE_VERSION);
-       state_fio->FputInt32(this_device_id);
-       
-       state_fio->Fwrite(ram, sizeof(ram), 1);
-       state_fio->Fwrite(vram_chr, sizeof(vram_chr), 1);
-       state_fio->Fwrite(vram_gfx, sizeof(vram_gfx), 1);
-       state_fio->Fwrite(disp, sizeof(disp), 1);
-       state_fio->FputInt32(cblink);
-       state_fio->FputBool(crt_400line);
-}
-
-bool SUB::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, sizeof(ram), 1);
-       state_fio->Fread(vram_chr, sizeof(vram_chr), 1);
-       state_fio->Fread(vram_gfx, sizeof(vram_gfx), 1);
-       state_fio->Fread(disp, sizeof(disp), 1);
-       cblink = state_fio->FgetInt32();
-       crt_400line = state_fio->FgetBool();
+       state_fio->StateBuffer(ram, sizeof(ram), 1);
+       state_fio->StateBuffer(vram_chr, sizeof(vram_chr), 1);
+       state_fio->StateBuffer(vram_gfx, sizeof(vram_gfx), 1);
+       state_fio->StateBuffer(disp, sizeof(disp), 1);
+       state_fio->StateInt32(cblink);
+       state_fio->StateBool(crt_400line);
        return true;
 }
-