X-Git-Url: http://git.osdn.net/view?a=blobdiff_plain;f=source%2Fsrc%2Fvm%2Fj3100%2Fj3100.cpp;h=bd0978b12d0ef1de72dc21b8f56f723edf7b47dd;hb=90a1d498c79c26d69c78435600856b152aa07291;hp=78cde071b1105b71bbda7cbe0e3f2cf587b4e9ba;hpb=5f6cf75c70fc5720b528fb655988b7b863700614;p=csp-qt%2Fcommon_source_project-fm7.git

diff --git a/source/src/vm/j3100/j3100.cpp b/source/src/vm/j3100/j3100.cpp
index 78cde071b..bd0978b12 100644
--- a/source/src/vm/j3100/j3100.cpp
+++ b/source/src/vm/j3100/j3100.cpp
@@ -18,11 +18,11 @@
 //#include "../i8250.h"
 #include "../i8253.h"
 #include "../i8259.h"
-#if defined(HAS_I286)
+//#if defined(HAS_I286)
 #include "../i286.h"
-#else
-#include "../i86.h"
-#endif
+//#else
+//#include "../i86.h"
+//#endif
 #include "../io.h"
 #include "../noise.h"
 #include "../pcm1bit.h"
@@ -33,6 +33,10 @@
 #include "../hd146818p.h"
 #endif
 
+#ifdef USE_DEBUGGER
+#include "../debugger.h"
+#endif
+
 #include "display.h"
 #include "dmareg.h"
 #include "floppy.h"
@@ -51,7 +55,7 @@
 // initialize
 // ----------------------------------------------------------------------------
 
-VM::VM(EMU* parent_emu) : emu(parent_emu)
+VM::VM(EMU* parent_emu) : VM_TEMPLATE(parent_emu)
 {
 	// create devices
 	first_device = last_device = NULL;
@@ -71,11 +75,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)
+//#if defined(HAS_I286)
 	cpu = new I286(this, emu);
-#else
-	cpu = new I86(this, emu);
-#endif
+//#else
+//	cpu = new I86(this, emu);
+//#endif
 	io = new IO(this, emu);
 	pcm = new PCM1BIT(this, emu);
 	fdc = new UPD765A(this, emu);
@@ -106,6 +110,9 @@ VM::VM(EMU* parent_emu) : emu(parent_emu)
 	cpu->set_context_mem(memory);
 	cpu->set_context_io(io);
 	cpu->set_context_intr(pic);
+#ifdef USE_DEBUGGER
+	cpu->set_context_debugger(new DEBUGGER(this, emu));
+#endif
 	
 	// dmac
 	io->set_iomap_range_rw(0x00, 0x0f, dma);
@@ -243,11 +250,14 @@ VM::VM(EMU* parent_emu) : emu(parent_emu)
 	}
 #endif
 	// initialize all devices
+#if defined(__GIT_REPO_VERSION)
+	strncpy(_git_revision, __GIT_REPO_VERSION, sizeof(_git_revision) - 1);
+#endif
 	for(DEVICE* device = first_device; device; device = device->next_device) {
 		device->initialize();
 	}
 #ifdef TYPE_SL
-	pcm->set_realtime_render(true);
+	//pcm->set_realtime_render(true);
 #endif
 }
 
@@ -290,6 +300,20 @@ void VM::run()
 }
 
 // ----------------------------------------------------------------------------
+// debugger
+// ----------------------------------------------------------------------------
+
+#ifdef USE_DEBUGGER
+DEVICE *VM::get_cpu(int index)
+{
+	if(index == 0) {
+		return cpu;
+	}
+	return NULL;
+}
+#endif
+
+// ----------------------------------------------------------------------------
 // draw screen
 // ----------------------------------------------------------------------------