From 42004654a2ce97dd8d31cbf3d5e2a133e05d7dd8 Mon Sep 17 00:00:00 2001 From: ergo720 <45463469+ergo720@users.noreply.github.com> Date: Sat, 15 Dec 2018 17:47:08 +0100 Subject: [PATCH] Created memory-manager folder --- build/win32/Cxbx.vcxproj | 12 ++++++------ build/win32/Cxbx.vcxproj.filters | 12 ++++++------ src/CxbxKrnl/CxbxKrnl.cpp | 2 +- src/CxbxKrnl/EmuFS.cpp | 2 +- src/CxbxKrnl/EmuFile.cpp | 2 +- src/CxbxKrnl/EmuKrnlEx.cpp | 2 +- src/CxbxKrnl/EmuKrnlMm.cpp | 2 +- src/CxbxKrnl/EmuKrnlNt.cpp | 2 +- src/CxbxKrnl/EmuKrnlXe.cpp | 2 +- src/core/HLE/D3D8/Direct3D9/Direct3D9.cpp | 2 +- src/core/HLE/D3D8/XbVertexBuffer.cpp | 2 +- src/core/HLE/XACTENG/XactEng.cpp | 2 +- .../kernel/memory-manager}/PhysicalMemory.cpp | 2 +- .../kernel/memory-manager}/PhysicalMemory.h | 4 ++-- .../kernel/memory-manager}/PoolManager.cpp | 2 +- .../kernel/memory-manager}/PoolManager.h | 2 +- .../kernel/memory-manager}/VMManager.cpp | 2 +- .../kernel/memory-manager}/VMManager.h | 0 18 files changed, 28 insertions(+), 28 deletions(-) rename src/{CxbxKrnl => core/kernel/memory-manager}/PhysicalMemory.cpp (99%) rename src/{CxbxKrnl => core/kernel/memory-manager}/PhysicalMemory.h (99%) rename src/{CxbxKrnl => core/kernel/memory-manager}/PoolManager.cpp (99%) rename src/{CxbxKrnl => core/kernel/memory-manager}/PoolManager.h (98%) rename src/{CxbxKrnl => core/kernel/memory-manager}/VMManager.cpp (99%) rename src/{CxbxKrnl => core/kernel/memory-manager}/VMManager.h (100%) diff --git a/build/win32/Cxbx.vcxproj b/build/win32/Cxbx.vcxproj index 8f101f75a..fc1ef028f 100644 --- a/build/win32/Cxbx.vcxproj +++ b/build/win32/Cxbx.vcxproj @@ -250,12 +250,12 @@ - - + + - + @@ -454,8 +454,8 @@ %(PreprocessorDefinitions) - - + + %(AdditionalIncludeDirectories) %(AdditionalIncludeDirectories) @@ -463,7 +463,7 @@ %(PreprocessorDefinitions) - + diff --git a/build/win32/Cxbx.vcxproj.filters b/build/win32/Cxbx.vcxproj.filters index dba356ee1..255284fb6 100644 --- a/build/win32/Cxbx.vcxproj.filters +++ b/build/win32/Cxbx.vcxproj.filters @@ -178,10 +178,10 @@ GUI - + Emulator - + Emulator @@ -269,7 +269,7 @@ GUI - + Emulator @@ -470,10 +470,10 @@ GUI - + Emulator - + Emulator @@ -578,7 +578,7 @@ GUI - + Emulator diff --git a/src/CxbxKrnl/CxbxKrnl.cpp b/src/CxbxKrnl/CxbxKrnl.cpp index caf856884..8f5907bfa 100644 --- a/src/CxbxKrnl/CxbxKrnl.cpp +++ b/src/CxbxKrnl/CxbxKrnl.cpp @@ -58,7 +58,7 @@ namespace xboxkrnl #include "EmuXTL.h" #include "core/HLE/Intercept.hpp" #include "ReservedMemory.h" // For virtual_memory_placeholder -#include "VMManager.h" +#include "core\kernel\memory-manager\VMManager.h" #include "CxbxDebugger.h" #include diff --git a/src/CxbxKrnl/EmuFS.cpp b/src/CxbxKrnl/EmuFS.cpp index ec97c4884..3ed980c71 100644 --- a/src/CxbxKrnl/EmuFS.cpp +++ b/src/CxbxKrnl/EmuFS.cpp @@ -46,7 +46,7 @@ namespace xboxkrnl #include "EmuKrnl.h" // For InitializeListHead(), etc. #include "EmuFS.h" #include "CxbxKrnl.h" -#include "VMManager.h" +#include "core\kernel\memory-manager\VMManager.h" #include "Logging.h" #undef FIELD_OFFSET // prevent macro redefinition warnings diff --git a/src/CxbxKrnl/EmuFile.cpp b/src/CxbxKrnl/EmuFile.cpp index 484a037a0..3e99c70ff 100644 --- a/src/CxbxKrnl/EmuFile.cpp +++ b/src/CxbxKrnl/EmuFile.cpp @@ -48,7 +48,7 @@ #include #pragma warning(default:4005) #include "CxbxKrnl.h" -#include "VMManager.h" +#include "core\kernel\memory-manager\VMManager.h" #include "Logging.h" #include diff --git a/src/CxbxKrnl/EmuKrnlEx.cpp b/src/CxbxKrnl/EmuKrnlEx.cpp index 98be0d98d..67a6426a5 100644 --- a/src/CxbxKrnl/EmuKrnlEx.cpp +++ b/src/CxbxKrnl/EmuKrnlEx.cpp @@ -47,7 +47,7 @@ namespace xboxkrnl #include "Logging.h" // For LOG_FUNC() #include "EmuEEPROM.h" // For EmuFindEEPROMInfo, EEPROM, XboxFactoryGameRegion #include "EmuKrnlLogging.h" -#include "PoolManager.h" +#include "core\kernel\memory-manager\PoolManager.h" // prevent name collisions namespace NtDll diff --git a/src/CxbxKrnl/EmuKrnlMm.cpp b/src/CxbxKrnl/EmuKrnlMm.cpp index edb4e8c9f..f242cc557 100644 --- a/src/CxbxKrnl/EmuKrnlMm.cpp +++ b/src/CxbxKrnl/EmuKrnlMm.cpp @@ -50,7 +50,7 @@ namespace xboxkrnl #include "EmuKrnlLogging.h" #include "CxbxKrnl.h" // For CxbxKrnlCleanup #include "Emu.h" // For EmuLog(LOG_LEVEL::WARNING, ) -#include "VMManager.h" +#include "core\kernel\memory-manager\VMManager.h" #include "EmuShared.h" #include diff --git a/src/CxbxKrnl/EmuKrnlNt.cpp b/src/CxbxKrnl/EmuKrnlNt.cpp index 53be3a782..81b00da60 100644 --- a/src/CxbxKrnl/EmuKrnlNt.cpp +++ b/src/CxbxKrnl/EmuKrnlNt.cpp @@ -56,7 +56,7 @@ namespace NtDll #include "CxbxKrnl.h" // For CxbxKrnlCleanup #include "Emu.h" // For EmuLog(LOG_LEVEL::WARNING, ) #include "EmuFile.h" // For EmuNtSymbolicLinkObject, NtStatusToString(), etc. -#include "VMManager.h" // For g_VMManager +#include "core\kernel\memory-manager\VMManager.h" // For g_VMManager #include "CxbxDebugger.h" #pragma warning(disable:4005) // Ignore redefined status values diff --git a/src/CxbxKrnl/EmuKrnlXe.cpp b/src/CxbxKrnl/EmuKrnlXe.cpp index fee84f190..a9c7af5c4 100644 --- a/src/CxbxKrnl/EmuKrnlXe.cpp +++ b/src/CxbxKrnl/EmuKrnlXe.cpp @@ -47,7 +47,7 @@ namespace xboxkrnl #include "CxbxKrnl.h" // For CxbxKrnl_Xbe #include "Logging.h" // For LOG_FUNC() #include "EmuKrnlLogging.h" -#include "VMManager.h" +#include "core\kernel\memory-manager\VMManager.h" // ****************************************************************** // * 0x0146 - XeImageFileName diff --git a/src/core/HLE/D3D8/Direct3D9/Direct3D9.cpp b/src/core/HLE/D3D8/Direct3D9/Direct3D9.cpp index 315a7b89f..85bef0c3d 100644 --- a/src/core/HLE/D3D8/Direct3D9/Direct3D9.cpp +++ b/src/core/HLE/D3D8/Direct3D9/Direct3D9.cpp @@ -53,7 +53,7 @@ namespace xboxkrnl #include "EmuShared.h" #include "gui/DbgConsole.h" #include "CxbxKrnl/ResourceTracker.h" -#include "CxbxKrnl/VMManager.h" // for g_VMManager +#include "core\kernel\memory-manager\VMManager.h" // for g_VMManager #include "CxbxKrnl/EmuXTL.h" #include "Logging.h" #include "../XbD3D8Logging.h" diff --git a/src/core/HLE/D3D8/XbVertexBuffer.cpp b/src/core/HLE/D3D8/XbVertexBuffer.cpp index 97a9efa67..1d27e9498 100644 --- a/src/core/HLE/D3D8/XbVertexBuffer.cpp +++ b/src/core/HLE/D3D8/XbVertexBuffer.cpp @@ -37,7 +37,7 @@ #define _XBOXKRNL_DEFEXTRN_ #define LOG_PREFIX CXBXR_MODULE::VTXB -#include "CxbxKrnl/VMManager.h" +#include "core\kernel\memory-manager\VMManager.h" #include "common\util\xxhash32.h" // For XXHash32::hash() #include "CxbxKrnl/Emu.h" #include "CxbxKrnl/EmuXTL.h" diff --git a/src/core/HLE/XACTENG/XactEng.cpp b/src/core/HLE/XACTENG/XactEng.cpp index 196ebdd1c..7faf8ba9e 100644 --- a/src/core/HLE/XACTENG/XactEng.cpp +++ b/src/core/HLE/XACTENG/XactEng.cpp @@ -49,7 +49,7 @@ namespace xboxkrnl #include "CxbxKrnl/EmuFS.h" #include "EmuShared.h" #include "CxbxKrnl/EmuXTL.h" -#include "CxbxKrnl/VMManager.h" +#include "core\kernel\memory-manager\VMManager.h" #include #include diff --git a/src/CxbxKrnl/PhysicalMemory.cpp b/src/core/kernel/memory-manager/PhysicalMemory.cpp similarity index 99% rename from src/CxbxKrnl/PhysicalMemory.cpp rename to src/core/kernel/memory-manager/PhysicalMemory.cpp index a69258138..372e7b800 100644 --- a/src/CxbxKrnl/PhysicalMemory.cpp +++ b/src/core/kernel/memory-manager/PhysicalMemory.cpp @@ -39,7 +39,7 @@ #include "PhysicalMemory.h" #include "Logging.h" -#include "EmuKrnl.h" // For InitializeListHead(), etc. +#include "CxbxKrnl\EmuKrnl.h" // For InitializeListHead(), etc. #include // See the links below for the details about the kernel structure LIST_ENTRY and the related functions diff --git a/src/CxbxKrnl/PhysicalMemory.h b/src/core/kernel/memory-manager/PhysicalMemory.h similarity index 99% rename from src/CxbxKrnl/PhysicalMemory.h rename to src/core/kernel/memory-manager/PhysicalMemory.h index 72b6e9db4..fa574a4af 100644 --- a/src/CxbxKrnl/PhysicalMemory.h +++ b/src/core/kernel/memory-manager/PhysicalMemory.h @@ -44,8 +44,8 @@ namespace xboxkrnl #include }; -#include "Emu.h" -#include "CxbxKrnl.h" +#include "CxbxKrnl\Emu.h" +#include "CxbxKrnl\CxbxKrnl.h" #include #include diff --git a/src/CxbxKrnl/PoolManager.cpp b/src/core/kernel/memory-manager/PoolManager.cpp similarity index 99% rename from src/CxbxKrnl/PoolManager.cpp rename to src/core/kernel/memory-manager/PoolManager.cpp index 955197991..0b1c4ede3 100644 --- a/src/CxbxKrnl/PoolManager.cpp +++ b/src/core/kernel/memory-manager/PoolManager.cpp @@ -38,7 +38,7 @@ #include "PoolManager.h" #include "Logging.h" -#include "EmuKrnl.h" // For InitializeListHead(), etc. +#include "CxbxKrnl\EmuKrnl.h" // For InitializeListHead(), etc. #include diff --git a/src/CxbxKrnl/PoolManager.h b/src/core/kernel/memory-manager/PoolManager.h similarity index 98% rename from src/CxbxKrnl/PoolManager.h rename to src/core/kernel/memory-manager/PoolManager.h index 988f7f2c1..9ac61f1ca 100644 --- a/src/CxbxKrnl/PoolManager.h +++ b/src/core/kernel/memory-manager/PoolManager.h @@ -38,7 +38,7 @@ #define POOL_MANAGER_H -#include "VMManager.h" +#include "core\kernel\memory-manager\VMManager.h" #define POOL_BLOCK_SHIFT 5 #define POOL_LIST_HEADS (PAGE_SIZE / (1 << POOL_BLOCK_SHIFT)) // 0x80 diff --git a/src/CxbxKrnl/VMManager.cpp b/src/core/kernel/memory-manager/VMManager.cpp similarity index 99% rename from src/CxbxKrnl/VMManager.cpp rename to src/core/kernel/memory-manager/VMManager.cpp index 167ddcdd1..b02c2504c 100644 --- a/src/CxbxKrnl/VMManager.cpp +++ b/src/core/kernel/memory-manager/VMManager.cpp @@ -45,7 +45,7 @@ #include "PoolManager.h" #include "Logging.h" #include "EmuShared.h" -#include "EmuKrnl.h" // For InitializeListHead(), etc. +#include "CxbxKrnl\EmuKrnl.h" // For InitializeListHead(), etc. #include diff --git a/src/CxbxKrnl/VMManager.h b/src/core/kernel/memory-manager/VMManager.h similarity index 100% rename from src/CxbxKrnl/VMManager.h rename to src/core/kernel/memory-manager/VMManager.h