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

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

diff --git a/source/src/vm/phc25/memory.cpp b/source/src/vm/phc25/memory.cpp
index 966f9d6..7ae17e6 100644 (file)
--- a/source/src/vm/phc25/memory.cpp
+++ b/source/src/vm/phc25/memory.cpp
@@ -8,7 +8,7 @@
        [ memory ]
 */
 
-#include "memory.h"
+#include "./memory.h"
 
 #define SET_BANK(s, e, w, r) { \
        int sb = (s) >> 11, eb = (e) >> 11; \
@@ -26,7 +26,7 @@
        } \
 }
 
-void MEMORY::initialize()
+void PHC25_MEMORY::initialize()
 {
        memset(rom, 0xff, sizeof(rom));
        memset(rdmy, 0xff, sizeof(rdmy));
@@ -53,13 +53,13 @@ void MEMORY::initialize()
 #endif
 }
 
-void MEMORY::reset()
+void PHC25_MEMORY::reset()
 {
        memset(ram, 0, sizeof(ram));
        memset(vram, 0, sizeof(vram));
 }
 
-void MEMORY::write_data8(uint32_t addr, uint32_t data)
+void PHC25_MEMORY::write_data8(uint32_t addr, uint32_t data)
 {
        addr &= 0xffff;
 #ifdef _MAP1010
@@ -71,7 +71,7 @@ void MEMORY::write_data8(uint32_t addr, uint32_t data)
        wbank[addr >> 11][addr & 0x7ff] = data;
 }
 
-uint32_t MEMORY::read_data8(uint32_t addr)
+uint32_t PHC25_MEMORY::read_data8(uint32_t addr)
 {
        addr &= 0xffff;
 #ifdef _MAP1010
@@ -87,51 +87,7 @@ uint32_t MEMORY::read_data8(uint32_t addr)
 
 #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));
-       
-       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);
-}
-
-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);
-       return true;
-}
-
-bool MEMORY::process_state(FILEIO* state_fio, bool loading)
+bool PHC25_MEMORY::process_state(FILEIO* state_fio, bool loading)
 {
        if(!state_fio->StateCheckUint32(STATE_VERSION)) {
                return false;