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

Base: Remove memory::DeallocationType::kDecommitRelease (an invalid combination)

This commit is contained in:
Dr. Chat 2017-05-14 00:59:52 -05:00
parent 66dbd86989
commit 16cff62d36
3 changed files with 3 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/xenia/base/memory.h
View File

@ -45,7 +45,6 @@ enum class AllocationType {
enum class DeallocationType { enum class DeallocationType {
kRelease = 1 << 0, kRelease = 1 << 0,
kDecommit = 1 << 1, kDecommit = 1 << 1,
kDecommitRelease = kRelease | kDecommit,
}; };
// Allocates a block of memory at the given page-aligned base address. // Allocates a block of memory at the given page-aligned base address.

4
src/xenia/base/memory_win.cc
View File

@ -97,13 +97,11 @@ bool DeallocFixed(void* base_address, size_t length,
switch (deallocation_type) { switch (deallocation_type) {
case DeallocationType::kRelease: case DeallocationType::kRelease:
free_type = MEM_RELEASE; free_type = MEM_RELEASE;
length = 0;
break; break;
case DeallocationType::kDecommit: case DeallocationType::kDecommit:
free_type = MEM_DECOMMIT; free_type = MEM_DECOMMIT;
break; break;
case DeallocationType::kDecommitRelease:
free_type = MEM_RELEASE | MEM_DECOMMIT;
break;
default: default:
assert_unhandled_case(deallocation_type); assert_unhandled_case(deallocation_type);
break; break;

4
src/xenia/cpu/backend/x64/x64_emitter.cc
View File

@ -684,7 +684,7 @@ static const uintptr_t kConstDataLocation = 0x20000000;
static const uintptr_t kConstDataSize = sizeof(xmm_consts); static const uintptr_t kConstDataSize = sizeof(xmm_consts);
// Increment the location by this amount for every allocation failure. // Increment the location by this amount for every allocation failure.
static const uintptr_t kConstDataIncrement = 0x00010000; static const uintptr_t kConstDataIncrement = 0x00001000;
// This function places constant data that is used by the emitter later on. // This function places constant data that is used by the emitter later on.
// Only called once and used by multiple instances of the emitter. // Only called once and used by multiple instances of the emitter.
@ -713,7 +713,7 @@ uintptr_t X64Emitter::PlaceConstData() {
void X64Emitter::FreeConstData(uintptr_t data) { void X64Emitter::FreeConstData(uintptr_t data) {
memory::DeallocFixed(reinterpret_cast<void*>(data), 0, memory::DeallocFixed(reinterpret_cast<void*>(data), 0,
memory::DeallocationType::kDecommitRelease); memory::DeallocationType::kRelease);
} }
Xbyak::Address X64Emitter::GetXmmConstPtr(XmmConst id) { Xbyak::Address X64Emitter::GetXmmConstPtr(XmmConst id) {