[VM][J3100][MZ5500][PC9801] Use I86:: class when using i8086 or V30 at real machine...

diff --git a/source/src/vm/j3100/j3100.cpp b/source/src/vm/j3100/j3100.cpp
index 27a89ab..907926b 100644 (file)
--- a/source/src/vm/j3100/j3100.cpp
+++ b/source/src/vm/j3100/j3100.cpp
@@ -18,7 +18,11 @@
 //#include "../i8250.h"
 #include "../i8253.h"
 #include "../i8259.h"
+#if defined(HAS_I286)
+#include "../i286.h"
+#else
 #include "../i86.h"
+#endif
 #include "../io.h"
 #include "../pcm1bit.h"
 #include "../upd765a.h"
@@ -74,7 +78,11 @@ VM::VM(EMU* parent_emu) : emu(parent_emu)
 //     sio = new I8250(this, emu);
        pit = new I8253(this, emu);     // i8254
        pic = new I8259(this, emu);
+#if defined(HAS_I286)
+       cpu = new I286(this, emu);
+#else
        cpu = new I86(this, emu);
+#endif
        io = new IO(this, emu);
        pcm = new PCM1BIT(this, emu);
        fdc = new UPD765A(this, emu);

diff --git a/source/src/vm/j3100/j3100.h b/source/src/vm/j3100/j3100.h
index 5f924fc..c605750 100644 (file)
--- a/source/src/vm/j3100/j3100.h
+++ b/source/src/vm/j3100/j3100.h
@@ -85,7 +85,11 @@ class I8237;
 //class I8250;
 class I8253;
 class I8259;
+#if defined(HAS_I286)
+class I286;
+#else
 class I86;
+#endif
 class IO;
 class PCM1BIT;
 class UPD765A;
@@ -116,7 +120,11 @@ protected:
 //     I8250* sio;
        I8253* pit;
        I8259* pic;
+#if defined(HAS_I286)
+       I286* cpu;
+#else
        I86* cpu;
+#endif
        IO* io;
        PCM1BIT* pcm;
        UPD765A* fdc;

diff --git a/source/src/vm/mz5500/mz5500.cpp b/source/src/vm/mz5500/mz5500.cpp
index e7bc16b..03ff3c2 100644 (file)
--- a/source/src/vm/mz5500/mz5500.cpp
+++ b/source/src/vm/mz5500/mz5500.cpp
@@ -16,7 +16,11 @@
 #include "../i8237.h"
 #include "../i8255.h"
 #include "../i8259.h"
+#if defined(HAS_I286) || defined(HAS_I186)
 #include "../i286.h"
+#else
+#include "../i86.h"
+#endif
 #include "../io.h"
 #include "../ls393.h"
 #include "../mz1p17.h"
@@ -63,7 +67,11 @@ VM::VM(EMU* parent_emu) : emu(parent_emu)
        dma = new I8237(this, emu);
        pio = new I8255(this, emu);
        pic = new I8259(this, emu);
+#if defined(HAS_I286) || defined(HAS_I186)
        cpu = new I286(this, emu);
+#else
+       cpu = new I86(this, emu);
+#endif
        io = new IO(this, emu);
        div = new LS393(this, emu);
 #if defined(_USE_QT)

diff --git a/source/src/vm/mz5500/mz5500.h b/source/src/vm/mz5500/mz5500.h
index 1a2b939..ff6b819 100644 (file)
--- a/source/src/vm/mz5500/mz5500.h
+++ b/source/src/vm/mz5500/mz5500.h
@@ -93,7 +93,11 @@ class EVENT;
 class I8237;
 class I8255;
 class I8259;
+#if defined(HAS_I286) || defined(HAS_I186)
 class I286;
+#else
+class I86;
+#endif
 class IO;
 class LS393;
 class NOT;
@@ -121,7 +125,11 @@ protected:
        I8237* dma;
        I8255* pio;
        I8259* pic;     // includes 2chips
+#if defined(HAS_I286) || defined(HAS_I186)
        I286* cpu;
+#else
+       I86* cpu;
+#endif
        IO* io;
        LS393* div;
        NOT* not_data1;

diff --git a/source/src/vm/pc9801/pc9801.cpp b/source/src/vm/pc9801/pc9801.cpp
index 9cc4a72..7ccf15c 100644 (file)
--- a/source/src/vm/pc9801/pc9801.cpp
+++ b/source/src/vm/pc9801/pc9801.cpp
@@ -23,7 +23,11 @@
 #include "../i8253.h"
 #include "../i8255.h"
 #include "../i8259.h"
+#if defined(HAS_I86) || defined(HAS_V30)
+#include "../i86.h"
+#else
 #include "../i286.h"
+#endif
 #include "../io.h"
 #include "../ls244.h"
 #include "../memory.h"
@@ -142,7 +146,11 @@ VM::VM(EMU* parent_emu) : emu(parent_emu)
        pio_sys->set_device_name(_T("i8255 PIO(SYSTEM)"));
 #endif 
        pic = new I8259(this, emu);
+#if defined(HAS_I86) || defined(HAS_V30)
+       cpu = new I86(this, emu);
+#else
        cpu = new I286(this, emu);
+#endif 
 #if defined(_USE_QT)
   #if defined(HAS_I86)
        cpu->set_device_name(_T("CPU(i8086)"));

diff --git a/source/src/vm/pc9801/pc9801.h b/source/src/vm/pc9801/pc9801.h
index 49e0c1b..28e56d3 100644 (file)
--- a/source/src/vm/pc9801/pc9801.h
+++ b/source/src/vm/pc9801/pc9801.h
@@ -260,7 +260,11 @@ class I8251;
 class I8253;
 class I8255;
 class I8259;
+#if defined(HAS_I86) || defined(HAS_V30)
+class I86;
+#else
 class I286;
+#endif
 class IO;
 class LS244;
 class MEMORY;
@@ -330,7 +334,11 @@ protected:
        I8255* pio_sys;
        I8255* pio_prn;
        I8259* pic;
+#if defined(HAS_I86) || defined(HAS_V30)
+       I86 *cpu;
+#else
        I286* cpu;
+#endif
        IO* io;
        LS244* dmareg1;
        LS244* dmareg2;