From 08eb85171fd55d8451db80ef4b6ed24ca3a7310d Mon Sep 17 00:00:00 2001 From: Gericom Date: Sun, 14 Apr 2024 10:17:52 +0200 Subject: [PATCH] Use the bios return from irq code again. Fixes #150 --- code/core/arm9/source/VirtualMachine/VMDtcm.s | 2 +- code/core/arm9/source/VirtualMachine/VMIrq.s | 5 ----- 2 files changed, 1 insertion(+), 6 deletions(-) diff --git a/code/core/arm9/source/VirtualMachine/VMDtcm.s b/code/core/arm9/source/VirtualMachine/VMDtcm.s index fe2aef0..ffc47ed 100644 --- a/code/core/arm9/source/VirtualMachine/VMDtcm.s +++ b/code/core/arm9/source/VirtualMachine/VMDtcm.s @@ -45,6 +45,6 @@ #endif .org vm_returnFromIrqAddress - VM_DTCM_BASE - .word vm_returnFromIrq + .word gGbaBios + 0x138 .end diff --git a/code/core/arm9/source/VirtualMachine/VMIrq.s b/code/core/arm9/source/VirtualMachine/VMIrq.s index 9d89f00..c302306 100644 --- a/code/core/arm9/source/VirtualMachine/VMIrq.s +++ b/code/core/arm9/source/VirtualMachine/VMIrq.s @@ -234,8 +234,3 @@ arm_func vm_jumpToIrqHandlerCommon mov lr, r4 ldr r4, DTCM(vm_irqSavedR4) movs pc, lr - -.text -arm_func vm_returnFromIrq - pop {r0-r3,r12,lr} - vmSUBS pc, lr, 4