X-Git-Url: http://git.osdn.net/view?a=blobdiff_plain;f=source%2Fsrc%2Fvm%2Fpc9801%2Fcpureg.cpp;h=f9186bd8c04c3557abc918a9ca04e1b02cf44476;hb=1a7386afa4c2ce25de158ba8285bc795446a8584;hp=2ee71198cff6c5707637a8f408ee108802da71bb;hpb=ffdfde3c8f0993be201a5a2d83a2d1dbe369776a;p=csp-qt%2Fcommon_source_project-fm7.git

diff --git a/source/src/vm/pc9801/cpureg.cpp b/source/src/vm/pc9801/cpureg.cpp
index 2ee71198c..f9186bd8c 100644
--- a/source/src/vm/pc9801/cpureg.cpp
+++ b/source/src/vm/pc9801/cpureg.cpp
@@ -1,6 +1,8 @@
 /*
 	NEC PC-9801VX Emulator 'ePC-9801VX'
 	NEC PC-9801RA Emulator 'ePC-9801RA'
+	NEC PC-98XA Emulator 'ePC-98XA'
+	NEC PC-98XL Emulator 'ePC-98XL'
 	NEC PC-98RL Emulator 'ePC-98RL'
 
 	Author : Takeda.Toshiya
@@ -16,30 +18,40 @@
 #include "../i286.h"
 #endif
 
+namespace PC9801 {
+
 void CPUREG::reset()
 {
 	d_cpu->set_address_mask(0x000fffff);
+	nmi_enabled = false;
 }
 
 void CPUREG::write_io8(uint32_t addr, uint32_t data)
 {
 	switch(addr) {
+	case 0x0050:
+		nmi_enabled = false;
+		break;
+	case 0x0052:
+		nmi_enabled = true;
+		break;
 	case 0x00f0:
 		d_cpu->reset();
 		d_cpu->set_address_mask(0x000fffff);
 		break;
 	case 0x00f2:
-#if defined(SUPPORT_32BIT_ADDRESS)
-		d_cpu->set_address_mask(0xffffffff);
-#else
+//#if defined(SUPPORT_32BIT_ADDRESS)
+//		d_cpu->set_address_mask(0xffffffff);
+//#else
 		d_cpu->set_address_mask(0x00ffffff);
-#endif
+//#endif
 		break;
 #if defined(SUPPORT_32BIT_ADDRESS)
 	case 0x00f6:
 		switch(data) {
 		case 0x02:
-			d_cpu->set_address_mask(0xffffffff);
+//			d_cpu->set_address_mask(0xffffffff);
+			d_cpu->set_address_mask(0x00ffffff);
 			break;
 		case 0x03:
 			d_cpu->set_address_mask(0x000fffff);
@@ -52,37 +64,61 @@ void CPUREG::write_io8(uint32_t addr, uint32_t data)
 
 uint32_t CPUREG::read_io8(uint32_t addr)
 {
+	uint32_t value;
+	
 	switch(addr) {
 	case 0x00f0:
-		return 0xe9;
+		value  = 0x00;
+//		value |= 0x80; // 1 = PC-9801NA, 0 = PC-9801NA/C
+//		value |= 0x80; // 1 = PC-9821modelS1, 0 = PC-9821modelS2
+//		value |= 0x80; // 1 = PC-9821CemodelS1, 0 = PC-9821CemodelS2
+//		value |= 0x80; // 1 = PC-9821Xt, 0 = PC-9821Xa
+//		value |= 0x80; // CPU MODE, 1 = High/Low, 0 = Middle (PC-9821Ap/As/Ae/Af)
+//		value |= 0x40; // ODP, 1 = Existing (PC-9821Ts)
+#if defined(SUPPORT_SCSI_IF)
+//		value |= 0x40; // Internal 55-type SCSI-HDD, 0 = Existing
+#endif
+#if defined(SUPPORT_SASI_IF)
+//		value |= 0x20; // Internal 27-type SASI-HDD, 0 = Existing
+#endif
+//		value |= 0x10; // Unknown
+		value |= 0x08; // RAM access, 1 = Internal-standard/External-enhanced RAM, 0 = Internal-enhanced RAM
+//		value |= 0x04; // Refresh mode, 1 = Standard, 0 = High speed
+#if defined(HAS_I86) || defined(HAS_V30)
+		value |= 0x02; // CPU mode, 1 = V30, 0 = 80286/80386
+#endif
+		value |= 0x01; // RAM access, 1 = Internal RAM, 0 = External-enhanced RAM
+		return value;
 	case 0x00f2:
-		return ((d_cpu->get_address_mask() & (1 << 20)) ? 0 : 1) | 0x2e;
+		return ((d_cpu->get_address_mask() & (1 << 20)) ? 0x00 : 0x01) | 0xfe;
 #if defined(SUPPORT_32BIT_ADDRESS)
 	case 0x00f6:
-		return ((d_cpu->get_address_mask() & (1 << 20)) ? 0 : 1) | 0x5e;
+		value  = 0x00;
+#if defined(SUPPORT_HIRESO) && !defined(_PC98RL)
+		value |= 0x10; // SASI-HDD, 1 = DMA ch0, 0 = DMA ch1
+#endif
+		if(nmi_enabled) {
+			value |= 0x02; // NMI, 1 = Enabled
+		}
+		return ((d_cpu->get_address_mask() & (1 << 20)) ? 0x00 : 0x01) | value;
 #endif
 	}
 	return 0xff;
 }
 
-/*
 #define STATE_VERSION	1
 
-void CPUREG::save_state(FILEIO* state_fio)
+bool CPUREG::process_state(FILEIO* state_fio, bool loading)
 {
-	state_fio->FputUint32(STATE_VERSION);
-	state_fio->FputInt32(this_device_id);
-	
+	if(!state_fio->StateCheckUint32(STATE_VERSION)) {
+ 		return false;
+ 	}
+	if(!state_fio->StateCheckInt32(this_device_id)) {
+ 		return false;
+ 	}
+	state_fio->StateBool(nmi_enabled);
+ 	return true;
 }
 
-bool CPUREG::load_state(FILEIO* state_fio)
-{
-	if(state_fio->FgetUint32() != STATE_VERSION) {
-		return false;
-	}
-	if(state_fio->FgetInt32() != this_device_id) {
-		return false;
-	}
-	return true;
 }
-*/
+