[openMSX-commits] CVS: openMSX/src/cpu MSXCPU.cc,1.13,1.14 MSXCPU.hh,1.10,1.11

[Wouter V. <m97...@us...>]

Update of /cvsroot/openmsx/openMSX/src/cpu
In directory sc8-pr-cvs1:/tmp/cvs-serv10228/src/cpu

Modified Files:
	MSXCPU.cc MSXCPU.hh 
Log Message:
Fixed Z80/R800 switching


Index: MSXCPU.cc
===================================================================
RCS file: /cvsroot/openmsx/openMSX/src/cpu/MSXCPU.cc,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -d -r1.13 -r1.14
--- MSXCPU.cc	25 Jan 2003 10:29:55 -0000	1.13
+++ MSXCPU.cc	26 Jan 2003 21:00:24 -0000	1.14
@@ -66,6 +66,7 @@
 	if (newCPU != activeCPU) {
 		const EmuTime &currentTime = activeCPU->getCurrentTime();
 		const EmuTime &targetTime  = activeCPU->getTargetTime();
+		activeCPU->setTargetTime(currentTime);	// stop current CPU
 		newCPU->setCurrentTime(currentTime);
 		newCPU->setTargetTime(targetTime);
 		newCPU->invalidateCache(0x0000, 0x10000/CPU::CACHE_LINE_SIZE);
@@ -81,6 +82,11 @@
 void MSXCPU::setTargetTime(const EmuTime &time)
 {
 	activeCPU->setTargetTime(time);
+}
+
+const EmuTime &MSXCPU::getTargetTime() const
+{
+	return activeCPU->getTargetTime();
 }
 
 const EmuTime &MSXCPU::getCurrentTime() const

Index: MSXCPU.hh
===================================================================
RCS file: /cvsroot/openmsx/openMSX/src/cpu/MSXCPU.hh,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -d -r1.10 -r1.11
--- MSXCPU.hh	15 Jan 2003 22:12:51 -0000	1.10
+++ MSXCPU.hh	26 Jan 2003 21:00:24 -0000	1.11
@@ -66,6 +66,7 @@
 		// only for Scheduler
 		void executeUntilTarget(const EmuTime &time);
 		void setTargetTime(const EmuTime &time);
+		const EmuTime &getTargetTime() const;
 		friend class Scheduler;
 
 		static MSXCPU *oneInstance;