OSDN Git Service

[VM][LIBNEWDEV][i86] Fix FTBFS.
authorK.Ohta <whatisthis.sowhat@gmail.com>
Fri, 11 Aug 2017 08:06:34 +0000 (17:06 +0900)
committerK.Ohta <whatisthis.sowhat@gmail.com>
Fri, 11 Aug 2017 08:06:34 +0000 (17:06 +0900)
source/src/vm/libcpu_newdev/i86.cpp

index b4800f6..6d56f19 100644 (file)
@@ -151,11 +151,11 @@ void I86::run_one_opecode_debugger()
                d_debugger->check_break_points(pc);
                if(d_debugger->now_suspended) {
                        emu->mute_sound();
-                       cpustate->debugger->now_waiting = true;
+                       d_debugger->now_waiting = true;
                        while(d_debugger->now_debugging && d_debugger->now_suspended) {
                                emu->sleep(10);
                        }
-                       cpustate->debugger->now_waiting = false;
+                       d_debugger->now_waiting = false;
                }
                if(d_debugger->now_debugging) {
                        d_mem = d_io = d_debugger;
@@ -195,6 +195,11 @@ void I86::run_one_opecode()
 #endif
 #endif
        instruction(FETCHOP);
+#ifdef SINGLE_MODE_DMA
+       if(d_dma) {
+               d_dma->do_dma();
+       }
+#endif
        if(int_state & NMI_REQ_BIT) {
                if(halted) {
                        pc++;
@@ -209,11 +214,6 @@ void I86::run_one_opecode()
                }
                interrupt(-1);
        }
-#ifdef SINGLE_MODE_DMA
-       if(d_dma) {
-               d_dma->do_dma();
-       }
-#endif
        icount -= extra_icount;
        extra_icount = 0;
 }