[VM][WIP] Use namespace to devices per VMs.

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

diff --git a/source/src/vm/mz700/mz700.cpp b/source/src/vm/mz700/mz700.cpp
index 7282f95..2015793 100644 (file)
--- a/source/src/vm/mz700/mz700.cpp
+++ b/source/src/vm/mz700/mz700.cpp
@@ -31,7 +31,7 @@
 #include "emm.h"
 #include "kanji.h"
 #include "keyboard.h"
-#include "memory.h"
+#include "./memory.h"
 #include "ramfile.h"
 
 #if defined(_MZ800) || defined(_MZ1500)
@@ -50,6 +50,19 @@
 #include "quickdisk.h"
 #endif
 
+//using        MZ700::CMOS* cmos;
+using MZ700::EMM;
+using MZ700::KANJI;
+using MZ700::KEYBOARD;
+using MZ700::MEMORY;
+using MZ700::RAMFILE;
+#if defined(_MZ800) || defined(_MZ1500)
+using MZ700::FLOPPY;
+  #if defined(_MZ1500)
+using MZ700::PSG;
+  #endif
+using MZ700::QUICKDISK;
+#endif
 // ----------------------------------------------------------------------------
 // initialize
 // ----------------------------------------------------------------------------
@@ -399,7 +412,6 @@ VM::VM(EMU* parent_emu) : VM_TEMPLATE(parent_emu)
 //             }
        }
 #endif
-       decl_state();
 }
 
 VM::~VM()
@@ -699,69 +711,38 @@ void VM::update_config()
 
 #define STATE_VERSION  3
 
-#include "../../statesub.h"
-#include "../../qt/gui/csp_logger.h"
-extern CSP_Logger DLL_PREFIX_I *csp_logger;
-
-void VM::decl_state(void)
-{
-       state_entry = new csp_state_utils(STATE_VERSION, 0, (_TCHAR *)(_T("CSP::MZ700_SERIES_HEAD")), csp_logger);
-#if defined(_MZ800)
-       DECL_STATE_ENTRY_INT32(boot_mode);
-#endif
-       for(DEVICE* device = first_device; device; device = device->next_device) {
-               device->decl_state();
-       }
-}
-
-void VM::save_state(FILEIO* state_fio)
-{
-       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);
-       }
-}
-
-bool VM::load_state(FILEIO* state_fio)
-{
-       bool mb = false;
-       if(state_entry != NULL) {
-               mb = state_entry->load_state(state_fio);
-       }
-       if(!mb) {
-               printf("INFO: HEADER DATA ERROR\n");
-               return false;
-       }
-       for(DEVICE* device = first_device; device; device = device->next_device) {
-               if(!device->load_state(state_fio)) {
-                       printf("INFO: DATA ERROR at DEVID=%d\n", device->this_device_id);
-                       return false;
-               }
-       }
-       return true;
-}
 
 bool VM::process_state(FILEIO* state_fio, bool loading)
 {
        if(!state_fio->StateCheckUint32(STATE_VERSION)) {
                return false;
        }
-       for(DEVICE* device = first_device; device; device = device->next_device) {
-               const char *name = typeid(*device).name() + 6; // skip "class "
+       for(DEVICE* device = first_device; device; device = device->next_device) {
+               // Note: typeid(foo).name is fixed by recent ABI.Not dec 6.
+               // const char *name = typeid(*device).name();
+               //       But, using get_device_name() instead of typeid(foo).name() 20181008 K.O
+               const char *name = device->get_device_name();
                int len = strlen(name);
                
                if(!state_fio->StateCheckInt32(len)) {
+                       if(loading) {
+                               printf("Class name len Error: DEVID=%d EXPECT=%s\n", device->this_device_id, name);
+                       }
                        return false;
                }
                if(!state_fio->StateCheckBuffer(name, len, 1)) {
-                       return false;
-               }
+                       if(loading) {
+                               printf("Class name Error: DEVID=%d EXPECT=%s\n", device->this_device_id, name);
+                       }
+                       return false;
+               }
                if(!device->process_state(state_fio, loading)) {
-                       return false;
-               }
-       }
+                       if(loading) {
+                               printf("Data loading Error: DEVID=%d\n", device->this_device_id);
+                       }
+                       return false;
+               }
+       }
 #if defined(_MZ800)
        state_fio->StateInt32(boot_mode);
 #endif