From d78f04512366795d1133a01d1c36d70bdbc9e315 Mon Sep 17 00:00:00 2001 From: Ben Vanik Date: Sun, 19 May 2013 17:23:24 -0700 Subject: [PATCH] libjit update. --- third_party/libjit | 2 +- tools/xenia-test/xenia-test.cc | 13 ++++++++----- 2 files changed, 9 insertions(+), 6 deletions(-) diff --git a/third_party/libjit b/third_party/libjit index d002b47f6..833b8e9d9 160000 --- a/third_party/libjit +++ b/third_party/libjit @@ -1 +1 @@ -Subproject commit d002b47f609617c4609ba4c3982ecb89223cb28c +Subproject commit 833b8e9d972cd410e800881e0e90a500c8541db0 diff --git a/tools/xenia-test/xenia-test.cc b/tools/xenia-test/xenia-test.cc index b30e4cd10..8308a8e59 100644 --- a/tools/xenia-test/xenia-test.cc +++ b/tools/xenia-test/xenia-test.cc @@ -107,22 +107,25 @@ int run_test(string& src_file_path) { bin_file_path.replace(dot - 1, 2, ".bin"); xe_memory_ref memory = NULL; + shared_ptr backend; shared_ptr processor; shared_ptr runtime; annotations_list_t annotations; ThreadState* thread_state = NULL; - XEEXPECTZERO(read_annotations(pal, src_file_path, annotations)); + XEEXPECTZERO(read_annotations(src_file_path, annotations)); xe_memory_options_t memory_options; xe_zero_struct(&memory_options, sizeof(memory_options)); - memory = xe_memory_create(pal, memory_options); + memory = xe_memory_create(memory_options); XEEXPECTNOTNULL(memory); - processor = shared_ptr(new Processor(pal, memory)); + //backend = shared_ptr(new xe::cpu::llvmbe::LLVMBackend()); + + processor = shared_ptr(new Processor(memory, backend)); XEEXPECTZERO(processor->Setup()); - runtime = shared_ptr(new Runtime(pal, processor, XT(""))); + runtime = shared_ptr(new Runtime(processor, XT(""))); // Load the binary module. XEEXPECTZERO(processor->LoadRawBinary(bin_file_path.c_str(), 0x82010000)); @@ -205,7 +208,7 @@ int run_tests(const xechar_t* test_name) { } printf("Running %s...\n", (*it).c_str()); - if (run_test(pal, *it)) { + if (run_test(*it)) { printf("TEST FAILED\n"); failed_count++; } else {