fabi/Xenia-Canary
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fixing Windows build.

Browse Source
This commit is contained in:
Ben Vanik
2015-08-18 14:45:49 -07:00
parent 8b0d4fb51c
commit a668556d7f
4 changed files with 29 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/xenia/cpu/thread_state.cc
View File

@@ -84,9 +84,15 @@ ThreadState::ThreadState(Processor* processor, uint32_t thread_id,
}
assert_not_zero(stack_address_);
// Allocate with 64b alignment.
context_ =
reinterpret_cast<PPCContext*>(aligned_alloc(64, sizeof(PPCContext)));
// Allocate with 64b alignment.
#if __STDC_VERSION__ >= 201112L
void* context_ptr = aligned_alloc(64, sizeof(PPCContext));
#elif XE_COMPILER_MSVC
void* context_ptr = _aligned_malloc(sizeof(PPCContext), 64);
#else
#error No aligned alloc.
#endif
context_ = reinterpret_cast<PPCContext*>(context_ptr);
assert_true(((uint64_t)context_ & 0x3F) == 0);
std::memset(context_, 0, sizeof(PPCContext));
@@ -111,7 +117,13 @@ ThreadState::~ThreadState() {
thread_state_ = nullptr;
}
#if __STDC_VERSION__ >= 201112L
free(context_);
#elif XE_COMPILER_MSVC
_aligned_free(context_);
#else
#error No aligned alloc.
#endif
if (stack_allocated_) {
memory()->LookupHeap(stack_address_)->Decommit(stack_address_, stack_size_);
}