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

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

diff --git a/source/src/vm/pc2001/pc2001.cpp b/source/src/vm/pc2001/pc2001.cpp
index 81dbc4e..a2c5b55 100644 (file)
--- a/source/src/vm/pc2001/pc2001.cpp
+++ b/source/src/vm/pc2001/pc2001.cpp
@@ -25,13 +25,13 @@
 #include "../debugger.h"
 #endif
 
-#include "io.h"
+#include "./io.h"
 
 // ----------------------------------------------------------------------------
 // initialize
 // ----------------------------------------------------------------------------
 
-VM::VM(EMU* parent_emu) : emu(parent_emu)
+VM::VM(EMU* parent_emu) : VM_TEMPLATE(parent_emu)
 {
        // create devices
        first_device = last_device = NULL;
@@ -55,7 +55,7 @@ VM::VM(EMU* parent_emu) : emu(parent_emu)
        rtc = new UPD1990A(this, emu);
        cpu = new UPD7810(this, emu);
        
-       io = new IO(this, emu);
+       io = new PC2001_IO(this, emu);
        
        // set contexts
        event->set_context_cpu(cpu);
@@ -98,10 +98,12 @@ VM::VM(EMU* parent_emu) : emu(parent_emu)
 #endif
        
        // initialize all devices
+#if defined(__GIT_REPO_VERSION)
+       strncpy(_git_revision, __GIT_REPO_VERSION, sizeof(_git_revision) - 1);
+#endif
        for(DEVICE* device = first_device; device; device = device->next_device) {
                device->initialize();
        }
-       decl_state();
 }
 
 VM::~VM()
@@ -291,49 +293,25 @@ void VM::update_config()
 
 #define STATE_VERSION  3
 
-#include "../../statesub.h"
-
-void VM::decl_state(void)
-{
-       state_entry = new csp_state_utils(STATE_VERSION, 0, (_TCHAR *)(_T("CSP::PC_2001_HEAD")));
-       DECL_STATE_ENTRY_MULTI(void, ram, sizeof(ram));
-       for(DEVICE* device = first_device; device; device = device->next_device) {
-               device->decl_state();
-       }
-}
-
-void VM::save_state(FILEIO* state_fio)
-{
-       //state_fio->FputUint32(STATE_VERSION);
-       
-       if(state_entry != NULL) {
-               state_entry->save_state(state_fio);
-       }
-       for(DEVICE* device = first_device; device; device = device->next_device) {
-               device->save_state(state_fio);
-       }
-       //state_fio->Fwrite(ram, sizeof(ram), 1);
-}
-
-bool VM::load_state(FILEIO* state_fio)
+bool VM::process_state(FILEIO* state_fio, bool loading)
 {
-       //if(state_fio->FgetUint32() != STATE_VERSION) {
-       //      return false;
-       //}
-       bool mb = false;
-       if(state_entry != NULL) {
-               mb = state_entry->load_state(state_fio);
-       }
-       if(!mb) {
-               emu->out_debug_log("INFO: HEADER DATA ERROR");
+       if(!state_fio->StateCheckUint32(STATE_VERSION)) {
                return false;
        }
        for(DEVICE* device = first_device; device; device = device->next_device) {
-               if(!device->load_state(state_fio)) {
+               const char *name = typeid(*device).name() + 6; // skip "class "
+               int len = strlen(name);
+               
+               if(!state_fio->StateCheckInt32(len)) {
+                       return false;
+               }
+               if(!state_fio->StateCheckBuffer(name, len, 1)) {
+                       return false;
+               }
+               if(!device->process_state(state_fio, loading)) {
                        return false;
                }
        }
-       //state_fio->Fread(ram, sizeof(ram), 1);
+       state_fio->StateBuffer(ram, sizeof(ram), 1);
        return true;
 }
-