[VM][I286] Save cpustate without StateBuffer().

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

diff --git a/source/src/vm/m5/m5.cpp b/source/src/vm/m5/m5.cpp
index feb8af9..48fc4fe 100644 (file)
--- a/source/src/vm/m5/m5.cpp
+++ b/source/src/vm/m5/m5.cpp
@@ -32,7 +32,7 @@
 // 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;
@@ -105,6 +105,9 @@ 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();
        }
@@ -246,11 +249,13 @@ bool VM::is_cart_inserted(int drv)
 void VM::play_tape(int drv, const _TCHAR* file_path)
 {
        drec->play_tape(file_path);
+//     drec->set_remote(true);
 }
 
 void VM::rec_tape(int drv, const _TCHAR* file_path)
 {
        drec->rec_tape(file_path);
+//     drec->set_remote(true);
 }
 
 void VM::close_tape(int drv)
@@ -258,6 +263,7 @@ void VM::close_tape(int drv)
        emu->lock_vm();
        drec->close_tape();
        emu->unlock_vm();
+//     drec->set_remote(false);
 }
 
 bool VM::is_tape_inserted(int drv)
@@ -285,6 +291,29 @@ const _TCHAR* VM::get_tape_message(int drv)
        return drec->get_message();
 }
 
+void VM::push_play(int drv)
+{
+       drec->set_ff_rew(0);
+       drec->set_remote(true);
+}
+
+void VM::push_stop(int drv)
+{
+       drec->set_remote(false);
+}
+
+void VM::push_fast_forward(int drv)
+{
+       drec->set_ff_rew(1);
+       drec->set_remote(true);
+}
+
+void VM::push_fast_rewind(int drv)
+{
+       drec->set_ff_rew(-1);
+       drec->set_remote(true);
+}
+
 bool VM::is_frame_skippable()
 {
        return event->is_frame_skippable();
@@ -299,40 +328,40 @@ void VM::update_config()
 
 #define STATE_VERSION  3
 
-void VM::save_state(FILEIO* state_fio)
+bool VM::process_state(FILEIO* state_fio, bool loading)
 {
-       state_fio->FputUint32(STATE_VERSION);
-       
-       for(DEVICE* device = first_device; device; device = device->next_device) {
-               const char *name = typeid(*device).name() + 6; // skip "class "
-               
-               state_fio->FputInt32(strlen(name));
-               state_fio->Fwrite(name, strlen(name), 1);
-               device->save_state(state_fio);
-       }
-       state_fio->Fwrite(ram, sizeof(ram), 1);
-       state_fio->Fwrite(ext, sizeof(ext), 1);
-       state_fio->FputBool(inserted);
-}
-
-bool VM::load_state(FILEIO* state_fio)
-{
-       if(state_fio->FgetUint32() != STATE_VERSION) {
+       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->FgetInt32() == strlen(name) && state_fio->Fcompare(name, strlen(name)))) {
-                       return false;
-               }
-               if(!device->load_state(state_fio)) {
+               if(!state_fio->StateCheckInt32(len)) {
+                       if(loading) {
+                               printf("Class name len Error: DEVID=%d EXPECT=%s\n", device->this_device_id, name);
+                       }
                        return false;
                }
-       }
-       state_fio->Fread(ram, sizeof(ram), 1);
-       state_fio->Fread(ext, sizeof(ext), 1);
-       inserted = state_fio->FgetBool();
+               if(!state_fio->StateCheckBuffer(name, len, 1)) {
+                       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)) {
+                       if(loading) {
+                               printf("Data loading Error: DEVID=%d\n", device->this_device_id);
+                       }
+                       return false;
+               }
+       }
+       // Machine specified.
+       state_fio->StateBuffer(ram, sizeof(ram), 1);
+       state_fio->StateBuffer(ext, sizeof(ext), 1);
+       state_fio->StateBool(inserted);
        return true;
 }
-