[VM][UPD7810] Fix FTBFS.

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

diff --git a/source/src/vm/i386.h b/source/src/vm/i386.h
index e1511c0..5cb1b50 100644 (file)
--- a/source/src/vm/i386.h
+++ b/source/src/vm/i386.h
@@ -10,7 +10,10 @@
 
 #ifndef _I386_H_ 
 #define _I386_H_
-
+#if defined(USE_SHARED_DLL)
+//#if 0
+#include "libcpu_newdev/i386.h"
+#else
 #include "vm.h"
 #include "../emu.h"
 #include "device.h"
@@ -37,7 +40,7 @@ private:
        void *opaque;
        
 public:
-       I386(VM* parent_vm, EMU* parent_emu) : DEVICE(parent_vm, parent_emu)
+       I386(VM_TEMPLATE* parent_vm, EMU* parent_emu) : DEVICE(parent_vm, parent_emu)
        {
 #ifdef I386_PSEUDO_BIOS
                d_bios = NULL;
@@ -64,6 +67,25 @@ public:
 #elif defined(HAS_PENTIUM4)
                set_device_name(_T("Pentium4 CPU"));
 #endif
+#if defined(HAS_I386)
+               set_device_name(_T("80386 CPU"));
+#elif defined(HAS_I486)
+               set_device_name(_T("80486 CPU"));
+#elif defined(HAS_PENTIUM)
+               set_device_name(_T("Pentium CPU"));
+#elif defined(HAS_MEDIAGX)
+               set_device_name(_T("Media GX CPU"));
+#elif defined(HAS_PENTIUM_PRO)
+               set_device_name(_T("Pentium Pro CPU"));
+#elif defined(HAS_PENTIUM_MMX)
+               set_device_name(_T("Pentium MMX CPU"));
+#elif defined(HAS_PENTIUM2)
+               set_device_name(_T("Pentium2 CPU"));
+#elif defined(HAS_PENTIUM3)
+               set_device_name(_T("Pentium3 CPU"));
+#elif defined(HAS_PENTIUM4)
+               set_device_name(_T("Pentium4 CPU"));
+#endif
        }
        ~I386() {}
        
@@ -104,11 +126,11 @@ public:
        void write_debug_io32(uint32_t addr, uint32_t data);
        uint32_t read_debug_io16(uint32_t addr);
        bool write_debug_reg(const _TCHAR *reg, uint32_t data);
+       uint32_t read_debug_reg(const _TCHAR *reg);
        void get_debug_regs_info(_TCHAR *buffer, size_t buffer_len);
        int debug_dasm(uint32_t pc, _TCHAR *buffer, size_t buffer_len);
 #endif
-       void save_state(FILEIO* state_fio);
-       bool load_state(FILEIO* state_fio);
+       bool process_state(FILEIO* state_fio, bool loading);
        
        // unique function
        void set_context_mem(DEVICE* device)
@@ -146,5 +168,5 @@ public:
        void set_shutdown_flag(int shutdown);
        int get_shutdown_flag();
 };
-
+#endif // USE_SHARED_DLL
 #endif