[VM][WIP][STATE] Updating state framework to upstream 2018-10-05.Still may cause...

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

diff --git a/source/src/vm/libcpu_newdev/i386.cpp b/source/src/vm/libcpu_newdev/i386.cpp
index b37b1f1..e3b23e2 100644 (file)
--- a/source/src/vm/libcpu_newdev/i386.cpp
+++ b/source/src/vm/libcpu_newdev/i386.cpp
@@ -185,6 +185,11 @@ bool I386::write_debug_reg(const _TCHAR *reg, uint32_t data)
        return cpucore->write_debug_reg(reg, data);
 }
 
+uint32_t I386::read_debug_reg(const _TCHAR *reg)
+{
+       return cpucore->read_debug_reg(reg);
+}
+
 void I386::get_debug_regs_info(_TCHAR *buffer, size_t buffer_len)
 {
        i386_state *cpustate = cpucore->get_cpu_state();
@@ -263,3 +268,59 @@ bool I386::load_state(FILEIO *state_fio)
        cpucore->set_shutdown_flag(0);
        return true;
 }
+
+void I386::cpu_table_call(void)
+{
+#if defined(HAS_I386)
+       cpucore->cpu_table_i386();
+#elif defined(HAS_I486)
+       cpucore->cpu_table_i486();
+#elif defined(HAS_PENTIUM)
+       cpucore->cpu_table_pentium();
+#elif defined(HAS_MEDIAGX)
+       cpucore->cpu_table_mediagx();
+#elif defined(HAS_PENTIUM_PRO)
+       cpucore->cpu_table_pentium_pro();
+#elif defined(HAS_PENTIUM_MMX)
+       cpucore->cpu_table_pentium_mmx();
+#elif defined(HAS_PENTIUM2)
+       cpucore->cpu_table_pentium2();
+#elif defined(HAS_PENTIUM3)
+       cpucore->cpu_table_pentium3();
+#elif defined(HAS_PENTIUM4)
+       cpucore->cpu_table_pentium4();
+#endif
+}
+
+
+bool I386::process_state(FILEIO* state_fio, bool loading)
+{
+       i386_state *cpustate = cpucore->get_cpu_state();
+       if(!(I386_BASE::process_state(state_fio, loading))) return false;
+//     if(save != NULL && save_size > 0) {
+//             state_fio->StateBuffer(save, save_size, 1);
+//     }
+
+       // post process
+       if(loading) {
+#ifdef I86_PSEUDO_BIOS
+               cpustate->bios = d_bios;
+#endif
+#ifdef SINGLE_MODE_DMA
+               cpustate->dma = d_dma;
+#endif
+#ifdef USE_DEBUGGER
+               cpustate->emu = emu;
+               cpustate->debugger = d_debugger;
+               cpustate->program_stored = d_mem;
+               cpustate->io_stored = d_io;
+               cpustate->prev_total_cycles = cpustate->total_cycles;
+#endif
+               cpu_table_call();
+               
+               cpucore->set_context_pic(d_pic);
+               cpucore->set_context_progmem(d_mem);
+               cpucore->set_context_io(d_io);
+       }
+       return true;
+}