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

memory alloc alignment

This commit is contained in:
Aaron Robinson 2003-11-04 05:45:53 +00:00
parent 86f018b19b
commit 11d164132b
3 changed files with 41 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
Cxbx.opt
View File

Binary file not shown.

2
Source/Win32/CxbxKrnl/EmuD3D8.cpp
View File

@ -785,6 +785,8 @@ static DWORD WINAPI EmuCreateDeviceProxy(LPVOID)
Sleep(1);
}
return 0;
}
// check if a resource has been registered yet (if not, register it)

42
Source/Win32/CxbxKrnl/EmuKrnl.cpp
View File

@ -729,7 +729,27 @@ XBSYSAPI EXPORTNUM(165) xboxkrnl::PVOID NTAPI xboxkrnl::MmAllocateContiguousMemo
}
#endif
PVOID pRet = VirtualAlloc(NULL, NumberOfBytes, MEM_COMMIT, PAGE_EXECUTE_READWRITE);
//
// NOTE: Kludgey (but necessary) solution:
//
// Since this memory must be aligned on a page boundary, we must allocate an extra page
// so that we can return a valid page aligned pointer
//
PVOID pRet = malloc(NumberOfBytes + 0x1000);
// align to page boundary
{
DWORD dwRet = (DWORD)pRet;
dwRet += 0x1000 - dwRet%0x1000;
pRet = (PVOID)dwRet;
}
#ifdef _DEBUG_TRACE
printf("EmuKrnl (0x%X): MmAllocateContiguous returned 0x%.08X\n", GetCurrentThreadId(), pRet);
#endif
EmuSwapFS(); // Xbox FS
@ -766,7 +786,23 @@ XBSYSAPI EXPORTNUM(166) xboxkrnl::PVOID NTAPI xboxkrnl::MmAllocateContiguousMemo
}
#endif
PVOID pRet = malloc(NumberOfBytes);
//
// NOTE: Kludgey (but necessary) solution:
//
// Since this memory must be aligned on a page boundary, we must allocate an extra page
// so that we can return a valid page aligned pointer
//
PVOID pRet = malloc(NumberOfBytes + 0x1000);
// align to page boundary
{
DWORD dwRet = (DWORD)pRet;
dwRet += 0x1000 - dwRet%0x1000;
pRet = (PVOID)dwRet;
}
static int count = 0;
@ -774,7 +810,7 @@ XBSYSAPI EXPORTNUM(166) xboxkrnl::PVOID NTAPI xboxkrnl::MmAllocateContiguousMemo
g_HaloHack[count-1] = (uint32)pRet;
#ifdef _DEBUG_TRACE
printf("EmuKrnl (0x%X): MmAllocateContiguous returned 0x%.08X\n", GetCurrentThreadId(), pRet);
printf("EmuKrnl (0x%X): MmAllocateContiguousEx returned 0x%.08X\n", GetCurrentThreadId(), pRet);
#endif
EmuSwapFS(); // Xbox FS