ShuriZma
/
Cxbx-Reloaded
mirror of https://github.com/Cxbx-Reloaded/Cxbx-Reloaded.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Created memory-manager folder

This commit is contained in:
ergo720 2018-12-15 17:47:08 +01:00
parent e6e93a2d4a
commit 42004654a2
18 changed files with 28 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
build/win32/Cxbx.vcxproj
View File

@ -250,12 +250,12 @@
<ClInclude Include="..\..\src\core\HLE\Intercept.hpp" />
<ClInclude Include="..\..\src\core\HLE\Patches.hpp" />
<ClInclude Include="..\..\src\common\crypto\LibRc4.h" />
<ClInclude Include="..\..\src\CxbxKrnl\PhysicalMemory.h" />
<ClInclude Include="..\..\src\CxbxKrnl\PoolManager.h" />
<ClInclude Include="..\..\src\core\kernel\memory-manager\PhysicalMemory.h" />
<ClInclude Include="..\..\src\core\kernel\memory-manager\PoolManager.h" />
<ClInclude Include="..\..\src\CxbxKrnl\ReservedMemory.h" />
<ClInclude Include="..\..\src\CxbxKrnl\ResourceTracker.h" />
<ClInclude Include="..\..\src\devices\usb\Timer.h" />
<ClInclude Include="..\..\src\CxbxKrnl\VMManager.h" />
<ClInclude Include="..\..\src\core\kernel\memory-manager\VMManager.h" />
<ClInclude Include="..\..\src\CxbxVersion.h" />
<ClInclude Include="..\..\src\common\xbdm\CxbxXbdm.h" />
<ClInclude Include="..\..\src\gui\DlgAbout.h" />
@ -454,8 +454,8 @@
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
</ClCompile>
<ClCompile Include="..\..\src\common\crypto\LibRc4.cpp" />
<ClCompile Include="..\..\src\CxbxKrnl\PhysicalMemory.cpp" />
<ClCompile Include="..\..\src\CxbxKrnl\PoolManager.cpp" />
<ClCompile Include="..\..\src\core\kernel\memory-manager\PhysicalMemory.cpp" />
<ClCompile Include="..\..\src\core\kernel\memory-manager\PoolManager.cpp" />
<ClCompile Include="..\..\src\CxbxKrnl\ResourceTracker.cpp">
<AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
@ -463,7 +463,7 @@
<PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
</ClCompile>
<ClCompile Include="..\..\src\devices\usb\Timer.cpp" />
<ClCompile Include="..\..\src\CxbxKrnl\VMManager.cpp" />
<ClCompile Include="..\..\src\core\kernel\memory-manager\VMManager.cpp" />
<ClCompile Include="..\..\src\common\xbdm\CxbxXbdm.cpp" />
<ClCompile Include="..\..\src\gui\DlgAbout.cpp" />
<ClCompile Include="..\..\src\gui\DlgAudioConfig.cpp" />

12
build/win32/Cxbx.vcxproj.filters
View File

@ -178,10 +178,10 @@
<ClCompile Include="..\..\src\gui\DlgAudioConfig.cpp">
<Filter>GUI</Filter>
</ClCompile>
<ClCompile Include="..\..\src\CxbxKrnl\PhysicalMemory.cpp">
<ClCompile Include="..\..\src\core\kernel\memory-manager\PhysicalMemory.cpp">
<Filter>Emulator</Filter>
</ClCompile>
<ClCompile Include="..\..\src\CxbxKrnl\VMManager.cpp">
<ClCompile Include="..\..\src\core\kernel\memory-manager\VMManager.cpp">
<Filter>Emulator</Filter>
</ClCompile>
<ClCompile Include="..\..\src\devices\EEPROMDevice.cpp">
@ -269,7 +269,7 @@
<ClCompile Include="..\..\src\gui\DlgEepromConfig.cpp">
<Filter>GUI</Filter>
</ClCompile>
<ClCompile Include="..\..\src\CxbxKrnl\PoolManager.cpp">
<ClCompile Include="..\..\src\core\kernel\memory-manager\PoolManager.cpp">
<Filter>Emulator</Filter>
</ClCompile>
<ClCompile Include="..\..\src\devices\usb\Timer.cpp">
@ -470,10 +470,10 @@
<ClInclude Include="..\..\src\gui\DlgAudioConfig.h">
<Filter>GUI</Filter>
</ClInclude>
<ClInclude Include="..\..\src\CxbxKrnl\PhysicalMemory.h">
<ClInclude Include="..\..\src\core\kernel\memory-manager\PhysicalMemory.h">
<Filter>Emulator</Filter>
</ClInclude>
<ClInclude Include="..\..\src\CxbxKrnl\VMManager.h">
<ClInclude Include="..\..\src\core\kernel\memory-manager\VMManager.h">
<Filter>Emulator</Filter>
</ClInclude>
<ClInclude Include="..\..\src\devices\EEPROMDevice.h">
@ -578,7 +578,7 @@
<ClInclude Include="..\..\src\gui\DlgEepromConfig.h">
<Filter>GUI</Filter>
</ClInclude>
<ClInclude Include="..\..\src\CxbxKrnl\PoolManager.h">
<ClInclude Include="..\..\src\core\kernel\memory-manager\PoolManager.h">
<Filter>Emulator</Filter>
</ClInclude>
<ClInclude Include="..\..\src\devices\usb\Timer.h">

2
src/CxbxKrnl/CxbxKrnl.cpp
View File

@ -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 <clocale>

2
src/CxbxKrnl/EmuFS.cpp
View File

@ -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

2
src/CxbxKrnl/EmuFile.cpp
View File

@ -48,7 +48,7 @@
#include <ntstatus.h>
#pragma warning(default:4005)
#include "CxbxKrnl.h"
#include "VMManager.h"
#include "core\kernel\memory-manager\VMManager.h"
#include "Logging.h"
#include <experimental/filesystem>

2
src/CxbxKrnl/EmuKrnlEx.cpp
View File

@ -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

2
src/CxbxKrnl/EmuKrnlMm.cpp
View File

@ -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 <assert.h>

2
src/CxbxKrnl/EmuKrnlNt.cpp
View File

@ -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

2
src/CxbxKrnl/EmuKrnlXe.cpp
View File

@ -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

2
src/core/HLE/D3D8/Direct3D9/Direct3D9.cpp
View File

@ -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"

2
src/core/HLE/D3D8/XbVertexBuffer.cpp
View File

@ -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"

2
src/core/HLE/XACTENG/XactEng.cpp
View File

@ -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 <mmreg.h>
#include <msacm.h>

2
src/CxbxKrnl/PhysicalMemory.cpp → src/core/kernel/memory-manager/PhysicalMemory.cpp
View File

@ -39,7 +39,7 @@
#include "PhysicalMemory.h"
#include "Logging.h"
#include "EmuKrnl.h" // For InitializeListHead(), etc.
#include "CxbxKrnl\EmuKrnl.h" // For InitializeListHead(), etc.
#include <assert.h>
// See the links below for the details about the kernel structure LIST_ENTRY and the related functions

4
src/CxbxKrnl/PhysicalMemory.h → src/core/kernel/memory-manager/PhysicalMemory.h
View File

@ -44,8 +44,8 @@ namespace xboxkrnl
#include <xboxkrnl/xboxkrnl.h>
};
#include "Emu.h"
#include "CxbxKrnl.h"
#include "CxbxKrnl\Emu.h"
#include "CxbxKrnl\CxbxKrnl.h"
#include <windows.h>
#include <map>

2
src/CxbxKrnl/PoolManager.cpp → src/core/kernel/memory-manager/PoolManager.cpp
View File

@ -38,7 +38,7 @@
#include "PoolManager.h"
#include "Logging.h"
#include "EmuKrnl.h" // For InitializeListHead(), etc.
#include "CxbxKrnl\EmuKrnl.h" // For InitializeListHead(), etc.
#include <assert.h>

2
src/CxbxKrnl/PoolManager.h → src/core/kernel/memory-manager/PoolManager.h
View File

@ -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

2
src/CxbxKrnl/VMManager.cpp → src/core/kernel/memory-manager/VMManager.cpp
View File

@ -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 <assert.h>

0
src/CxbxKrnl/VMManager.h → src/core/kernel/memory-manager/VMManager.h
View File