[VM][WIP] Pre-process to apply new state framework.Still not buildable.

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

diff --git a/source/src/vm/mz5500/sysport.cpp b/source/src/vm/mz5500/sysport.cpp
index 69ce764..5aca551 100644 (file)
--- a/source/src/vm/mz5500/sysport.cpp
+++ b/source/src/vm/mz5500/sysport.cpp
@@ -8,7 +8,6 @@
 */
 
 #include "sysport.h"
-#include "../../fileio.h"
 
 void SYSPORT::initialize()
 {
@@ -16,7 +15,7 @@ void SYSPORT::initialize()
        register_frame_event(this);
 }
 
-void SYSPORT::write_io8(uint32 addr, uint32 data)
+void SYSPORT::write_io8(uint32_t addr, uint32_t data)
 {
        switch(addr & 0x3f0) {
        case 0x70:
@@ -31,13 +30,13 @@ void SYSPORT::write_io8(uint32 addr, uint32 data)
        case 0x260:
                // z80ctc reti
                if(data == 0x4d) {
-                       d_ctc->intr_reti();
+                       d_ctc->notify_intr_reti();
                }
                break;
        }
 }
 
-uint32 SYSPORT::read_io8(uint32 addr)
+uint32_t SYSPORT::read_io8(uint32_t addr)
 {
        switch(addr & 0x3ff) {
        case 0x60:
@@ -49,10 +48,10 @@ uint32 SYSPORT::read_io8(uint32 addr)
 #endif
        case 0x240:
                // z80ctc vector
-               return d_ctc->intr_ack();
+               return d_ctc->get_intr_ack();
        case 0x250:
                // z80sio vector
-               return d_sio->intr_ack();
+               return d_sio->get_intr_ack();
        case 0x270:
                // port-b
                return 0xff;
@@ -69,25 +68,60 @@ void SYSPORT::event_frame()
 
 #define STATE_VERSION  1
 
+#include "../../statesub.h"
+
+void SYSPORT::decl_state()
+{
+
+       enter_decl_state(STATE_VERSION);
+       
+       DECL_STATE_ENTRY_INT32(rst);
+       DECL_STATE_ENTRY_INT32(highden);
+
+       leave_decl_state();
+}
+
 void SYSPORT::save_state(FILEIO* state_fio)
 {
-       state_fio->FputUint32(STATE_VERSION);
-       state_fio->FputInt32(this_device_id);
+       if(state_entry != NULL) {
+               state_entry->save_state(state_fio);
+       }
+//     state_fio->FputUint32(STATE_VERSION);
+//     state_fio->FputInt32(this_device_id);
        
-       state_fio->FputInt32(rst);
-       state_fio->FputInt32(highden);
+//     state_fio->FputInt32(rst);
+//     state_fio->FputInt32(highden);
 }
 
 bool SYSPORT::load_state(FILEIO* state_fio)
 {
-       if(state_fio->FgetUint32() != STATE_VERSION) {
-               return false;
+       bool mb = false;
+       if(state_entry != NULL) {
+               mb = state_entry->load_state(state_fio);
        }
-       if(state_fio->FgetInt32() != this_device_id) {
+       if(!mb) {
                return false;
        }
-       rst = state_fio->FgetInt32();
-       highden = state_fio->FgetInt32();
+//     if(state_fio->FgetUint32() != STATE_VERSION) {
+//             return false;
+//     }
+//     if(state_fio->FgetInt32() != this_device_id) {
+//             return false;
+//     }
+//     rst = state_fio->FgetInt32();
+//     highden = state_fio->FgetInt32();
        return true;
 }
 
+bool SYSPORT::process_state(FILEIO* state_fio, bool loading)
+{
+       if(!state_fio->StateCheckUint32(STATE_VERSION)) {
+               return false;
+       }
+       if(!state_fio->StateCheckInt32(this_device_id)) {
+               return false;
+       }
+       state_fio->StateInt32(rst);
+       state_fio->StateInt32(highden);
+       return true;
+}