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

Return address handling. Not happy with the design, but it (sorta) works.

Browse Source
This commit is contained in:
Ben Vanik
2013-12-08 13:58:57 -08:00
parent dc0848f7ba
commit 2549292a57
13 changed files with 60 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/alloy/runtime/function.cc
View File

@@ -23,12 +23,12 @@ Function::Function(Type type, uint64_t address) :
Function::~Function() {
}
int Function::Call(ThreadState* thread_state) {
int Function::Call(ThreadState* thread_state, uint64_t return_address) {
ThreadState* original_thread_state = ThreadState::Get();
if (original_thread_state != thread_state) {
ThreadState::Bind(thread_state);
}
int result = CallImpl(thread_state);
int result = CallImpl(thread_state, return_address);
if (original_thread_state != thread_state) {
ThreadState::Bind(original_thread_state);
}
@@ -44,7 +44,8 @@ ExternFunction::ExternFunction(
ExternFunction::~ExternFunction() {
}
int ExternFunction::CallImpl(ThreadState* thread_state) {
int ExternFunction::CallImpl(ThreadState* thread_state,
uint64_t return_address) {
if (!handler_) {
XELOGW("undefined extern call to %.8X", address());
return 0;

6
src/alloy/runtime/function.h
View File

@@ -34,10 +34,10 @@ public:
Type type() const { return type_; }
uint64_t address() const { return address_; }
int Call(ThreadState* thread_state);
int Call(ThreadState* thread_state, uint64_t return_address);
protected:
virtual int CallImpl(ThreadState* thread_state) = 0;
virtual int CallImpl(ThreadState* thread_state, uint64_t return_address) = 0;
protected:
Type type_;
@@ -57,7 +57,7 @@ public:
void* arg1() const { return arg1_; }
protected:
virtual int CallImpl(ThreadState* thread_state);
virtual int CallImpl(ThreadState* thread_state, uint64_t return_address);
protected:
Handler handler_;