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

[csp-qt/common_source_project-fm7.git] / source / src / vm / pasopia7 / memory.cpp

diff --git a/source/src/vm/pasopia7/memory.cpp b/source/src/vm/pasopia7/memory.cpp
index c0f2aa9..312dc75 100644 (file)
--- a/source/src/vm/pasopia7/memory.cpp
+++ b/source/src/vm/pasopia7/memory.cpp
@@ -7,7 +7,7 @@
        [ memory ]
 */
 
-#include "memory.h"
+#include "./memory.h"
 #include "iobus.h"
 #include "../i8255.h"
 
@@ -27,7 +27,7 @@
        } \
 }
 
-void MEMORY::initialize()
+void PASOPIA7_MEMORY::initialize()
 {
        memset(bios, 0xff, sizeof(bios));
        memset(basic, 0xff, sizeof(basic));
@@ -52,12 +52,12 @@ void MEMORY::initialize()
        vram_sel = pal_sel = attr_wrap = false;
 }
 
-void MEMORY::reset()
+void PASOPIA7_MEMORY::reset()
 {
        memset(vram, 0, sizeof(vram));
 }
 
-void MEMORY::write_data8(uint32_t addr, uint32_t data)
+void PASOPIA7_MEMORY::write_data8(uint32_t addr, uint32_t data)
 {
        addr &= 0xffff;
        if(vram_sel && (addr & 0xc000) == 0x8000) {
@@ -84,7 +84,7 @@ void MEMORY::write_data8(uint32_t addr, uint32_t data)
        wbank[addr >> 12][addr & 0xfff] = data;
 }
 
-uint32_t MEMORY::read_data8(uint32_t addr)
+uint32_t PASOPIA7_MEMORY::read_data8(uint32_t addr)
 {
        addr &= 0xffff;
        if(vram_sel && (addr & 0xc000) == 0x8000) {
@@ -109,7 +109,7 @@ uint32_t MEMORY::read_data8(uint32_t addr)
        return rbank[addr >> 12][addr & 0xfff];
 }
 
-void MEMORY::write_io8(uint32_t addr, uint32_t data)
+void PASOPIA7_MEMORY::write_io8(uint32_t addr, uint32_t data)
 {
        if(mem_map != (data & 7)) {
                mem_map = data & 7;
@@ -124,7 +124,7 @@ void MEMORY::write_io8(uint32_t addr, uint32_t data)
        d_pio2->write_signal(SIG_I8255_PORT_C, data, 3);
 }
 
-void MEMORY::write_signal(int id, uint32_t data, uint32_t mask)
+void PASOPIA7_MEMORY::write_signal(int id, uint32_t data, uint32_t mask)
 {
        if(id == SIG_MEMORY_I8255_1_A) {
                plane = data;
@@ -136,7 +136,7 @@ void MEMORY::write_signal(int id, uint32_t data, uint32_t mask)
        }
 }
 
-void MEMORY::update_memory_map()
+void PASOPIA7_MEMORY::update_memory_map()
 {
        if(mem_map == 0xff) {
                SET_BANK(0x0000, 0x3fff, wdmy, bios);
@@ -167,76 +167,7 @@ void MEMORY::update_memory_map()
 
 #define STATE_VERSION  1
 
-#include "../../statesub.h"
-
-void MEMORY::decl_state()
-{
-       enter_decl_state(STATE_VERSION);
-       
-       DECL_STATE_ENTRY_1D_ARRAY(ram, sizeof(ram));
-       DECL_STATE_ENTRY_1D_ARRAY(vram, sizeof(vram));
-       DECL_STATE_ENTRY_1D_ARRAY(pal, sizeof(pal));
-       DECL_STATE_ENTRY_UINT8(mem_map);
-       DECL_STATE_ENTRY_UINT8(plane);
-       DECL_STATE_ENTRY_UINT8(attr_data);
-       DECL_STATE_ENTRY_UINT8(attr_latch);
-       DECL_STATE_ENTRY_BOOL(vram_sel);
-       DECL_STATE_ENTRY_BOOL(pal_sel);
-       DECL_STATE_ENTRY_BOOL(attr_wrap);
-
-       leave_decl_state();
-}
-
-void MEMORY::save_state(FILEIO* state_fio)
-{
-       if(state_entry != NULL) {
-               state_entry->save_state(state_fio);
-       }
-//     state_fio->FputUint32(STATE_VERSION);
-//     state_fio->FputInt32(this_device_id);
-       
-//     state_fio->Fwrite(ram, sizeof(ram), 1);
-//     state_fio->Fwrite(vram, sizeof(vram), 1);
-//     state_fio->Fwrite(pal, sizeof(pal), 1);
-//     state_fio->FputUint8(mem_map);
-//     state_fio->FputUint8(plane);
-//     state_fio->FputUint8(attr_data);
-//     state_fio->FputUint8(attr_latch);
-//     state_fio->FputBool(vram_sel);
-//     state_fio->FputBool(pal_sel);
-//     state_fio->FputBool(attr_wrap);
-}
-
-bool MEMORY::load_state(FILEIO* state_fio)
-{
-       bool mb = false;
-       if(state_entry != NULL) {
-               mb = state_entry->load_state(state_fio);
-       }
-       if(!mb) return false;
-//     if(state_fio->FgetUint32() != STATE_VERSION) {
-//             return false;
-//     }
-//     if(state_fio->FgetInt32() != this_device_id) {
-//             return false;
-//     }
-//     state_fio->Fread(ram, sizeof(ram), 1);
-//     state_fio->Fread(vram, sizeof(vram), 1);
-//     state_fio->Fread(pal, sizeof(pal), 1);
-//     mem_map = state_fio->FgetUint8();
-//     plane = state_fio->FgetUint8();
-//     attr_data = state_fio->FgetUint8();
-//     attr_latch = state_fio->FgetUint8();
-//     vram_sel = state_fio->FgetBool();
-//     pal_sel = state_fio->FgetBool();
-//     attr_wrap = state_fio->FgetBool();
-       
-       // post process
-       update_memory_map();
-       return true;
-}
-
-bool MEMORY::process_state(FILEIO* state_fio, bool loading)
+bool PASOPIA7_MEMORY::process_state(FILEIO* state_fio, bool loading)
 {
        if(!state_fio->StateCheckUint32(STATE_VERSION)) {
                return false;