callbacks: CallSVC returns void

This commit is contained in:
MerryMage 2016-09-05 19:15:45 +01:00
parent 1f61a3d7bc
commit 5c8bf5a15d
3 changed files with 3 additions and 3 deletions

View file

@ -32,7 +32,7 @@ struct UserCallbacks {
void (*InterpreterFallback)(std::uint32_t pc, Jit* jit, void* user_arg); void (*InterpreterFallback)(std::uint32_t pc, Jit* jit, void* user_arg);
void* user_arg = nullptr; void* user_arg = nullptr;
bool (*CallSVC)(std::uint32_t swi); void (*CallSVC)(std::uint32_t swi);
// Page Table // Page Table
static constexpr std::size_t PAGE_BITS = 12; static constexpr std::size_t PAGE_BITS = 12;

View file

@ -122,7 +122,7 @@ static void Fail() {
static Dynarmic::UserCallbacks GetUserCallbacks() { static Dynarmic::UserCallbacks GetUserCallbacks() {
Dynarmic::UserCallbacks user_callbacks{}; Dynarmic::UserCallbacks user_callbacks{};
user_callbacks.InterpreterFallback = &InterpreterFallback; user_callbacks.InterpreterFallback = &InterpreterFallback;
user_callbacks.CallSVC = (bool (*)(u32)) &Fail; user_callbacks.CallSVC = (void (*)(u32)) &Fail;
user_callbacks.IsReadOnlyMemory = &IsReadOnlyMemory; user_callbacks.IsReadOnlyMemory = &IsReadOnlyMemory;
user_callbacks.MemoryRead8 = &MemoryRead8; user_callbacks.MemoryRead8 = &MemoryRead8;
user_callbacks.MemoryRead16 = &MemoryRead16; user_callbacks.MemoryRead16 = &MemoryRead16;

View file

@ -110,7 +110,7 @@ static void Fail() {
static Dynarmic::UserCallbacks GetUserCallbacks() { static Dynarmic::UserCallbacks GetUserCallbacks() {
Dynarmic::UserCallbacks user_callbacks{}; Dynarmic::UserCallbacks user_callbacks{};
user_callbacks.InterpreterFallback = &InterpreterFallback; user_callbacks.InterpreterFallback = &InterpreterFallback;
user_callbacks.CallSVC = (bool (*)(u32)) &Fail; user_callbacks.CallSVC = (void (*)(u32)) &Fail;
user_callbacks.IsReadOnlyMemory = &IsReadOnlyMemory; user_callbacks.IsReadOnlyMemory = &IsReadOnlyMemory;
user_callbacks.MemoryRead8 = &MemoryRead8; user_callbacks.MemoryRead8 = &MemoryRead8;
user_callbacks.MemoryRead16 = &MemoryRead16; user_callbacks.MemoryRead16 = &MemoryRead16;