[VM] Apply new APIs to all VMs.

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

diff --git a/source/src/vm/fp200/fp200.cpp b/source/src/vm/fp200/fp200.cpp
index a4a40a2..fb86999 100644 (file)
--- a/source/src/vm/fp200/fp200.cpp
+++ b/source/src/vm/fp200/fp200.cpp
@@ -88,11 +88,10 @@ VM::VM(EMU_TEMPLATE* parent_emu) : VM_TEMPLATE(parent_emu)
        
        // initialize all devices
 #if defined(__GIT_REPO_VERSION)
-       strncpy(_git_revision, __GIT_REPO_VERSION, sizeof(_git_revision) - 1);
+       set_git_repo_version(__GIT_REPO_VERSION);
 #endif
-       for(DEVICE* device = first_device; device; device = device->next_device) {
-               device->initialize();
-       }
+       initialize_devices();
+       
 }
 
 VM::~VM()
@@ -113,28 +112,9 @@ VM::~VM()
        }
 }
 
-DEVICE* VM::get_device(int id)
-{
-       for(DEVICE* device = first_device; device; device = device->next_device) {
-               if(device->this_device_id == id) {
-                       return device;
-               }
-       }
-       return NULL;
-}
-
 // ----------------------------------------------------------------------------
 // drive virtual machine
 // ----------------------------------------------------------------------------
-
-void VM::reset()
-{
-       // reset all devices
-       for(DEVICE* device = first_device; device; device = device->next_device) {
-               device->reset();
-       }
-}
-
 void VM::run()
 {
        event->drive();
@@ -327,58 +307,26 @@ bool VM::is_frame_skippable()
        return event->is_frame_skippable();
 }
 
-void VM::update_config()
-{
-       for(DEVICE* device = first_device; device; device = device->next_device) {
-               device->update_config();
-       }
-}
 
 double VM::get_current_usec()
 {
-       if(event == NULL) return 0.0;
+       __UNLIKELY_IF(event == NULL) return 0.0;
        return event->get_current_usec();
 }
 
 uint64_t VM::get_current_clock_uint64()
 {
-               if(event == NULL) return (uint64_t)0;
-               return event->get_current_clock_uint64();
+       __UNLIKELY_IF(event == NULL) return (uint64_t)0;
+       return event->get_current_clock_uint64();
 }
 
 #define STATE_VERSION  3
 
 bool VM::process_state(FILEIO* state_fio, bool loading)
 {
-       if(!state_fio->StateCheckUint32(STATE_VERSION)) {
+       if(!(VM_TEMPLATE::process_state_core(state_fio, loading, STATE_VERSION))) {
                return false;
        }
-       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 = (int)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)) {
-                       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;
-               }
-       }
        state_fio->StateArray(ram, sizeof(ram), 1);
        return true;
 }