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

Sandbox getting close to running.

Browse Source
This commit is contained in:
Ben Vanik
2014-07-12 22:59:16 -07:00
parent 4a0531abc5
commit 48425da8ff
7 changed files with 11 additions and 61 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
src/xenia/cpu/xenon_thread_state.cc
View File

@@ -23,13 +23,12 @@ using namespace xe::cpu;
XenonThreadState::XenonThreadState(
XenonRuntime* runtime, uint32_t thread_id,
size_t stack_size, uint64_t thread_state_address) :
stack_size_(stack_size), thread_state_address_(thread_state_address),
ThreadState(runtime, thread_id) {
ThreadState(runtime, thread_id),
stack_size_(stack_size),
thread_state_address_(thread_state_address) {
stack_address_ = memory_->HeapAlloc(
0, stack_size, MEMORY_FLAG_ZERO);
debug_break_ = CreateEvent(NULL, FALSE, FALSE, NULL);
// Allocate with 64b alignment.
context_ = (PPCContext*)xe_malloc_aligned(sizeof(PPCContext));
assert_true(((uint64_t)context_ & 0xF) == 0);
@@ -60,40 +59,9 @@ XenonThreadState::XenonThreadState(
XenonThreadState::~XenonThreadState() {
runtime_->debugger()->OnThreadDestroyed(this);
CloseHandle(debug_break_);
alloy::tracing::WriteEvent(EventType::ThreadDeinit({
}));
xe_free_aligned(context_);
memory_->HeapFree(stack_address_, stack_size_);
}
volatile int* XenonThreadState::suspend_flag_address() const {
return &context_->suspend_flag;
}
int XenonThreadState::Suspend(uint32_t timeout_ms) {
// Set suspend flag.
// One of the checks should call in to OnSuspend() at some point.
poly::atomic_inc(&context_->suspend_flag);
return 0;
}
int XenonThreadState::Resume(bool force) {
if (context_->suspend_flag) {
if (force) {
context_->suspend_flag = 0;
SetEvent(debug_break_);
} else {
if (!poly::atomic_dec(&context_->suspend_flag)) {
SetEvent(debug_break_);
}
}
}
return 0;
}
void XenonThreadState::EnterSuspend() {
WaitForSingleObject(debug_break_, INFINITE);
}

7
src/xenia/cpu/xenon_thread_state.h
View File

@@ -34,11 +34,6 @@ public:
uint64_t thread_state_address() const { return thread_state_address_; }
PPCContext* context() const { return context_; }
virtual volatile int* suspend_flag_address() const;
virtual int Suspend(uint32_t timeout_ms = UINT_MAX);
virtual int Resume(bool force = false);
virtual void EnterSuspend();
private:
uint64_t stack_address_;
size_t stack_size_;
@@ -46,8 +41,6 @@ private:
// NOTE: must be 64b aligned for SSE ops.
PPCContext* context_;
HANDLE debug_break_;
};