renames memory.h to cpumem.h

refs #65 svn merge -r 1625:1655 http://amethyst.yui.ne.jp/svn/pc98/np2/branches/yui/WORK_01 svn merge -r 1659:1661 http://amethyst.yui.ne.jp/svn/pc98/np2/branches/yui/WORK_01 svn merge -r 1662:1663 http://amethyst.yui.ne.jp/svn/pc98/np2/branches/yui/WORK_01 svn merge -r 1736:1741 http://amethyst.yui.ne.jp/svn/pc98/np2/branches/yui/WORK_01 svn merge -r 1756:1758 http://amethyst.yui.ne.jp/svn/pc98/np2/branches/yui/WORK_01 svn merge -r 1764:1783 http://amethyst.yui.ne.jp/svn/pc98/np2/branches/yui/WORK_01
nmlgc · Nov 9, 2015 · a07157b · a07157b
1 parent 0fec6fc
commit a07157b
Show file tree

Hide file tree

Showing 22 changed files with 304 additions and 34 deletions.
diff --git a/i286c/cpucore.h b/i286c/cpucore.h
@@ -6,7 +6,7 @@
 //
 //----------------------------------------------------------------------------
 
-#include "memory.h"
+#include "cpumem.h"
 
 #if defined(CPUCORE_IA32)
 #error : not support CPUCORE_IA32

diff --git a/i286c/memory.c → i286c/cpumem.c b/i286c/memory.c → i286c/cpumem.c
diff --git a/i286c/memory.h → i286c/cpumem.h b/i286c/memory.h → i286c/cpumem.h
diff --git a/i286x/cpucore.h b/i286x/cpucore.h
@@ -14,7 +14,7 @@
 #error : not support CPUSTRUC_MEMWAIT
 #endif
 
-#include	"memory.h"
+#include	"cpumem.h"
 
 
 #if !defined(CPUDEBUG)

diff --git a/i286x/memory.h → i286x/cpumem.h b/i286x/memory.h → i286x/cpumem.h
diff --git a/i286x/memory.x86 → i286x/cpumem.x86 b/i286x/memory.x86 → i286x/cpumem.x86
diff --git a/i386c/memory.c → i386c/cpumem.c b/i386c/memory.c → i386c/cpumem.c
diff --git a/i386c/memory.h → i386c/cpumem.h b/i386c/memory.h → i386c/cpumem.h
@@ -1,5 +1,5 @@
-#ifndef	NP2_I386C_MEMORY_H__
-#define	NP2_I386C_MEMORY_H__
+#ifndef	NP2_I386C_CPUMEM_H__
+#define	NP2_I386C_CPUMEM_H__
 
 #ifdef NP2_MEMORY_ASM			// アセンブラ版は 必ずfastcallで
 #undef	MEMCALL
@@ -143,4 +143,4 @@ void MEMCALL memr_writes(UINT seg, UINT off, const void *dat, UINT leng);
 #define MEMR_WRITES(seg, off, dat, leng)	\
 			memr_writes((seg), (off), (dat), (leng))
 
-#endif	/* !NP2_I386C_MEMORY_H__ */
+#endif	/* !NP2_I386C_CPUMEM_H__ */
diff --git a/i386c/ia32/cpu_io.c b/i386c/ia32/cpu_io.c
@@ -28,7 +28,7 @@
 #include "cpu.h"
 #include "pccore.h"
 #include "iocore.h"
-#include "memory.h"
+#include "cpumem.h"
 
 static void CPUCALL check_io(UINT port, UINT len);
 

diff --git a/i386c/ia32/cpu_mem.c b/i386c/ia32/cpu_mem.c
@@ -25,7 +25,7 @@
 
 #include "compiler.h"
 #include "cpu.h"
-#include "memory.h"
+#include "cpumem.h"
 
 
 /*

diff --git a/i386c/ia32/cpu_mem.h b/i386c/ia32/cpu_mem.h
@@ -26,7 +26,7 @@
 #ifndef	IA32_CPU_CPU_MEM_H__
 #define	IA32_CPU_CPU_MEM_H__
 
-#include "memory.h"
+#include "cpumem.h"
 #include "segments.h"
 
 #ifdef __cplusplus

diff --git a/i386c/ia32/debug.c b/i386c/ia32/debug.c
@@ -26,7 +26,6 @@
 #include "compiler.h"
 
 #include "cpu.h"
-#include "memory.h"
 #if defined(USE_FPU)
 #include "instructions/fpu/fp.h"
 #endif

diff --git a/io/crtc.c b/io/crtc.c
@@ -1,5 +1,5 @@
 #include	"compiler.h"
-#include	"memory.h"
+#include	"cpumem.h"
 #include	"pccore.h"
 #include	"iocore.h"
 #include	"vram.h"

diff --git a/sdl2/MacOSX/np2sdl2.xcodeproj/project.pbxproj b/sdl2/MacOSX/np2sdl2.xcodeproj/project.pbxproj
@@ -122,7 +122,7 @@
 		BAF84DD7195AA10500183062 /* i286c_mn.c in Sources */ = {isa = PBXBuildFile; fileRef = BAF84C2F195AA10400183062 /* i286c_mn.c */; };
 		BAF84DD8195AA10500183062 /* i286c_rp.c in Sources */ = {isa = PBXBuildFile; fileRef = BAF84C30195AA10400183062 /* i286c_rp.c */; };
 		BAF84DD9195AA10500183062 /* i286c_sf.c in Sources */ = {isa = PBXBuildFile; fileRef = BAF84C31195AA10400183062 /* i286c_sf.c */; };
-		BAF84DDB195AA10500183062 /* memory.c in Sources */ = {isa = PBXBuildFile; fileRef = BAF84C33195AA10400183062 /* memory.c */; };
+		BAF84DDB195AA10500183062 /* cpumem.c in Sources */ = {isa = PBXBuildFile; fileRef = BAF84C33195AA10400183062 /* cpumem.c */; };
 		BAF84DDC195AA10500183062 /* v30patch.c in Sources */ = {isa = PBXBuildFile; fileRef = BAF84C35195AA10400183062 /* v30patch.c */; };
 		BAF84DDF195AA10500183062 /* artic.c in Sources */ = {isa = PBXBuildFile; fileRef = BAF84C3C195AA10400183062 /* artic.c */; };
 		BAF84DE0195AA10500183062 /* cgrom.c in Sources */ = {isa = PBXBuildFile; fileRef = BAF84C3E195AA10400183062 /* cgrom.c */; };
@@ -445,8 +445,8 @@
 		BAF84C2F195AA10400183062 /* i286c_mn.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = i286c_mn.c; sourceTree = "<group>"; };
 		BAF84C30195AA10400183062 /* i286c_rp.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = i286c_rp.c; sourceTree = "<group>"; };
 		BAF84C31195AA10400183062 /* i286c_sf.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = i286c_sf.c; sourceTree = "<group>"; };
-		BAF84C33195AA10400183062 /* memory.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = memory.c; sourceTree = "<group>"; };
-		BAF84C34195AA10400183062 /* memory.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = memory.h; sourceTree = "<group>"; };
+		BAF84C33195AA10400183062 /* cpumem.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = cpumem.c; sourceTree = "<group>"; };
+		BAF84C34195AA10400183062 /* cpumem.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = cpumem.h; sourceTree = "<group>"; };
 		BAF84C35195AA10400183062 /* v30patch.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = v30patch.c; sourceTree = "<group>"; };
 		BAF84C36195AA10400183062 /* v30patch.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = v30patch.h; sourceTree = "<group>"; };
 		BAF84C3C195AA10400183062 /* artic.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = artic.c; sourceTree = "<group>"; };
@@ -1029,6 +1029,8 @@
 			isa = PBXGroup;
 			children = (
 				BAF84C26195AA10400183062 /* cpucore.h */,
+				BAF84C33195AA10400183062 /* cpumem.c */,
+				BAF84C34195AA10400183062 /* cpumem.h */,
 				BAF84C27195AA10400183062 /* i286c.c */,
 				BAF84C28195AA10400183062 /* i286c.h */,
 				BAF84C2A195AA10400183062 /* i286c_0f.c */,
@@ -1039,8 +1041,6 @@
 				BAF84C2F195AA10400183062 /* i286c_mn.c */,
 				BAF84C30195AA10400183062 /* i286c_rp.c */,
 				BAF84C31195AA10400183062 /* i286c_sf.c */,
-				BAF84C33195AA10400183062 /* memory.c */,
-				BAF84C34195AA10400183062 /* memory.h */,
 				BAF84C35195AA10400183062 /* v30patch.c */,
 				BAF84C36195AA10400183062 /* v30patch.h */,
 			);
@@ -1563,7 +1563,7 @@
 				BAF84D99195AA10500183062 /* menumbox.c in Sources */,
 				BAF84E23195AA10500183062 /* joymng.c in Sources */,
 				BAF84E29195AA10500183062 /* sdlkbd.c in Sources */,
-				BAF84DDB195AA10500183062 /* memory.c in Sources */,
+				BAF84DDB195AA10500183062 /* cpumem.c in Sources */,
 				BAF84D54195AA10500183062 /* bios13.c in Sources */,
 				BAF84DF1195AA10500183062 /* necio.c in Sources */,
 				BAF84DE6195AA10500183062 /* emsio.c in Sources */,

diff --git a/sdl2/iOS/np2sdl2.xcodeproj/project.pbxproj b/sdl2/iOS/np2sdl2.xcodeproj/project.pbxproj
@@ -119,7 +119,7 @@
 		BA7E841D19063AFB00041C04 /* i286c_mn.c in Sources */ = {isa = PBXBuildFile; fileRef = BA7E829019063AFA00041C04 /* i286c_mn.c */; };
 		BA7E841E19063AFB00041C04 /* i286c_rp.c in Sources */ = {isa = PBXBuildFile; fileRef = BA7E829119063AFA00041C04 /* i286c_rp.c */; };
 		BA7E841F19063AFB00041C04 /* i286c_sf.c in Sources */ = {isa = PBXBuildFile; fileRef = BA7E829219063AFA00041C04 /* i286c_sf.c */; };
-		BA7E842119063AFB00041C04 /* memory.c in Sources */ = {isa = PBXBuildFile; fileRef = BA7E829419063AFA00041C04 /* memory.c */; };
+		BA7E842119063AFB00041C04 /* cpumem.c in Sources */ = {isa = PBXBuildFile; fileRef = BA7E829419063AFA00041C04 /* cpumem.c */; };
 		BA7E842219063AFB00041C04 /* v30patch.c in Sources */ = {isa = PBXBuildFile; fileRef = BA7E829619063AFA00041C04 /* v30patch.c */; };
 		BA7E842519063AFB00041C04 /* artic.c in Sources */ = {isa = PBXBuildFile; fileRef = BA7E829D19063AFA00041C04 /* artic.c */; };
 		BA7E842619063AFB00041C04 /* cgrom.c in Sources */ = {isa = PBXBuildFile; fileRef = BA7E829F19063AFA00041C04 /* cgrom.c */; };
@@ -487,8 +487,8 @@
 		BA7E829019063AFA00041C04 /* i286c_mn.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = i286c_mn.c; sourceTree = "<group>"; };
 		BA7E829119063AFA00041C04 /* i286c_rp.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = i286c_rp.c; sourceTree = "<group>"; };
 		BA7E829219063AFA00041C04 /* i286c_sf.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = i286c_sf.c; sourceTree = "<group>"; };
-		BA7E829419063AFA00041C04 /* memory.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = memory.c; sourceTree = "<group>"; };
-		BA7E829519063AFA00041C04 /* memory.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = memory.h; sourceTree = "<group>"; };
+		BA7E829419063AFA00041C04 /* cpumem.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = cpumem.c; sourceTree = "<group>"; };
+		BA7E829519063AFA00041C04 /* cpumem.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = cpumem.h; sourceTree = "<group>"; };
 		BA7E829619063AFA00041C04 /* v30patch.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = v30patch.c; sourceTree = "<group>"; };
 		BA7E829719063AFA00041C04 /* v30patch.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = v30patch.h; sourceTree = "<group>"; };
 		BA7E829D19063AFA00041C04 /* artic.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = artic.c; sourceTree = "<group>"; };
@@ -1140,6 +1140,8 @@
 			isa = PBXGroup;
 			children = (
 				BA7E828719063AFA00041C04 /* cpucore.h */,
+				BA7E829419063AFA00041C04 /* cpumem.c */,
+				BA7E829519063AFA00041C04 /* cpumem.h */,
 				BA7E828819063AFA00041C04 /* i286c.c */,
 				BA7E828919063AFA00041C04 /* i286c.h */,
 				BA7E828B19063AFA00041C04 /* i286c_0f.c */,
@@ -1150,8 +1152,6 @@
 				BA7E829019063AFA00041C04 /* i286c_mn.c */,
 				BA7E829119063AFA00041C04 /* i286c_rp.c */,
 				BA7E829219063AFA00041C04 /* i286c_sf.c */,
-				BA7E829419063AFA00041C04 /* memory.c */,
-				BA7E829519063AFA00041C04 /* memory.h */,
 				BA7E829619063AFA00041C04 /* v30patch.c */,
 				BA7E829719063AFA00041C04 /* v30patch.h */,
 			);
@@ -1593,7 +1593,7 @@
 				BA7E83A919063AFB00041C04 /* board118.c in Sources */,
 				BA7E849319063AFB00041C04 /* midimod.c in Sources */,
 				BA7E849F19063AFB00041C04 /* maketgrp.c in Sources */,
-				BA7E842119063AFB00041C04 /* memory.c in Sources */,
+				BA7E842119063AFB00041C04 /* cpumem.c in Sources */,
 				BA7E842219063AFB00041C04 /* v30patch.c in Sources */,
 				BA7E848219063AFB00041C04 /* getsnd.c in Sources */,
 				BA7E847119063AFB00041C04 /* timemng.c in Sources */,

diff --git a/sdl2/win32/np2sdl2.sln b/sdl2/win32/np2sdl2.sln
@@ -6,13 +6,19 @@ EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Win32 = Debug|Win32
+		Debug|x64 = Debug|x64
 		Release|Win32 = Release|Win32
+		Release|x64 = Release|x64
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
 		{C06A88AB-EB80-471D-B316-6FB61A9D17C6}.Debug|Win32.ActiveCfg = Debug|Win32
 		{C06A88AB-EB80-471D-B316-6FB61A9D17C6}.Debug|Win32.Build.0 = Debug|Win32
+		{C06A88AB-EB80-471D-B316-6FB61A9D17C6}.Debug|x64.ActiveCfg = Debug|x64
+		{C06A88AB-EB80-471D-B316-6FB61A9D17C6}.Debug|x64.Build.0 = Debug|x64
 		{C06A88AB-EB80-471D-B316-6FB61A9D17C6}.Release|Win32.ActiveCfg = Release|Win32
 		{C06A88AB-EB80-471D-B316-6FB61A9D17C6}.Release|Win32.Build.0 = Release|Win32
+		{C06A88AB-EB80-471D-B316-6FB61A9D17C6}.Release|x64.ActiveCfg = Release|x64
+		{C06A88AB-EB80-471D-B316-6FB61A9D17C6}.Release|x64.Build.0 = Release|x64
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE