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

Calling to/from native works!

This commit is contained in:
Ben Vanik 2013-05-22 11:13:27 -07:00
parent 0c127828af
commit 37f93d2974
3 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/xenia/cpu/libjit/libjit_emitter.cc
View File

@ -186,6 +186,7 @@ int LibjitEmitter::MakeFunction(FunctionSymbol* symbol, jit_function_t gen_fn) {
} }
if (!result_code) { if (!result_code) {
// TODO(benvanik): flag
// pre // pre
jit_dump_function(stdout, gen_fn_, symbol->name()); jit_dump_function(stdout, gen_fn_, symbol->name());
jit_function_compile(gen_fn_); jit_function_compile(gen_fn_);

4
src/xenia/cpu/libjit/libjit_jit.cc
View File

@ -100,10 +100,10 @@ int LibjitJIT::Execute(xe_ppc_state_t* ppc_state, FunctionSymbol* fn_symbol) {
} }
// TODO(benvanik): replace generic apply with special trampoline. // TODO(benvanik): replace generic apply with special trampoline.
void* args[] = {&ppc_state, &ppc_state->lr}; intptr_t args[] = {(intptr_t)ppc_state, ppc_state->lr};
uint64_t return_value; uint64_t return_value;
int apply_result = jit_function_apply(jit_fn, (void**)&args, &return_value); int apply_result = jit_function_apply(jit_fn, (void**)&args, &return_value);
if (apply_result) { if (!apply_result) {
XELOGCPU("Execute(%.8X): apply failed with %d", XELOGCPU("Execute(%.8X): apply failed with %d",
fn_symbol->start_address, apply_result); fn_symbol->start_address, apply_result);
return 1; return 1;

2
third_party/libjit vendored

@ -1 +1 @@
Subproject commit bd2b2e2bf04ca423e23b67eaff92fc623f687e92 Subproject commit 61b04ce23f04165c6d3041927a4bc62b53e8b032