[VM] Merge Upstream 2019-02-19.Only for DEVICES, not MACHINES YET.

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

diff --git a/source/src/vm/i8080_base.h b/source/src/vm/i8080_base.h
index b5c44f1..8c53385 100644 (file)
--- a/source/src/vm/i8080_base.h
+++ b/source/src/vm/i8080_base.h
@@ -50,7 +50,7 @@ protected:
        --------------------------------------------------------------------------- */
        
        int count;
-       pair_t regs[4];
+       pair32_t regs[4];
        uint16_t SP, PC, prevPC;
        uint16_t IM, RIM_IEN;
        bool afterHALT, BUSREQ, SID, afterEI;
@@ -98,7 +98,7 @@ protected:
        virtual uint16_t FETCH16()  { return 0xffff; }
        virtual uint16_t POP16() { return 0xff;}
        virtual void PUSH16(uint16_t val) {}
-       virtual uint32_t ACK_INTR() {}
+       virtual uint32_t ACK_INTR() {return 0xffffffff; }
        
        void DSUB();
 
@@ -110,7 +110,7 @@ protected:
        uint64_t total_count;
        uint64_t prev_total_count;
 public:
-       I8080_BASE(VM* parent_vm, EMU* parent_emu) : DEVICE(parent_vm, parent_emu)
+       I8080_BASE(VM_TEMPLATE* parent_vm, EMU* parent_emu) : DEVICE(parent_vm, parent_emu)
        {
                BUSREQ = false;
                SID = true;
@@ -138,6 +138,14 @@ public:
                return PC;
        }
 //#ifdef USE_DEBUGGER
+       bool is_cpu()
+       {
+               return true;
+       }
+       bool is_debugger_available()
+       {
+               return true;
+       }
        void *get_debugger()
        {
                return d_debugger;
@@ -155,7 +163,7 @@ public:
        void write_debug_io8(uint32_t addr, uint32_t data);
        uint32_t read_debug_io8(uint32_t addr);
        bool write_debug_reg(const _TCHAR *reg, uint32_t data);
-       void get_debug_regs_info(_TCHAR *buffer, size_t buffer_len);
+       bool get_debug_regs_info(_TCHAR *buffer, size_t buffer_len);
        int debug_dasm(uint32_t pc, _TCHAR *buffer, size_t buffer_len);
 //#endif
        // unique function