From e1e71184d0ae05a9b68aaca30ce490075e530ced Mon Sep 17 00:00:00 2001 From: red031000 Date: Wed, 13 May 2020 20:01:58 +0100 Subject: libcp -> CP_context.s --- arm9/arm9.lcf | 2 +- arm9/asm/CP_context.s | 42 ++++++++++++++++++++++++++++++++++++++++++ arm9/asm/libcp.s | 42 ------------------------------------------ 3 files changed, 43 insertions(+), 43 deletions(-) create mode 100644 arm9/asm/CP_context.s delete mode 100644 arm9/asm/libcp.s diff --git a/arm9/arm9.lcf b/arm9/arm9.lcf index 851d2493..f0de195d 100644 --- a/arm9/arm9.lcf +++ b/arm9/arm9.lcf @@ -213,7 +213,7 @@ SECTIONS { DGT_hash1.o (.text) DGT_hash2.o (.text) DGT_sha1s_arm4cw.o (.text) - libcp.o (.text) + CP_context.o (.text) libspi.o (.text) libpm.o (.text) librtc.o (.text) diff --git a/arm9/asm/CP_context.s b/arm9/asm/CP_context.s new file mode 100644 index 00000000..c756e8e2 --- /dev/null +++ b/arm9/asm/CP_context.s @@ -0,0 +1,42 @@ + .include "asm/macros.inc" + .include "global.inc" + .section .text + + arm_func_start CP_SaveContext +CP_SaveContext: ; 0x020D3648 + ldr r1, _020D3684 ; =0x04000290 + stmdb sp!, {r4} + ldmia r1, {r2-r4,r12} + stmia r0!, {r2-r4,r12} + ldrh r12, [r1, #-0x10] + add r1, r1, #0x28 + ldmia r1, {r2-r3} + stmia r0!, {r2-r3} + and r12, r12, #0x3 + ldrh r2, [r1, #-0x8] + strh r12, [r0, #0x0] + and r2, r2, #0x1 + strh r2, [r0, #0x2] + ldmia sp!, {r4} + bx lr + .balign 4 +_020D3684: .word 0x04000290 + + arm_func_start CP_RestoreContext +CP_RestoreContext: ; 0x020D3688 + stmdb sp!, {r4} + ldr r1, _020D36C0 ; =0x04000290 + ldmia r0, {r2-r4,r12} + stmia r1, {r2-r4,r12} + ldrh r2, [r0, #0x18] + ldrh r3, [r0, #0x1a] + strh r2, [r1, #-0x10] + strh r3, [r1, #0x20] + add r0, r0, #0x10 + add r1, r1, #0x28 + ldmia r0, {r2-r3} + stmia r1, {r2-r3} + ldmia sp!, {r4} + bx lr + .balign 4 +_020D36C0: .word 0x04000290 diff --git a/arm9/asm/libcp.s b/arm9/asm/libcp.s deleted file mode 100644 index c756e8e2..00000000 --- a/arm9/asm/libcp.s +++ /dev/null @@ -1,42 +0,0 @@ - .include "asm/macros.inc" - .include "global.inc" - .section .text - - arm_func_start CP_SaveContext -CP_SaveContext: ; 0x020D3648 - ldr r1, _020D3684 ; =0x04000290 - stmdb sp!, {r4} - ldmia r1, {r2-r4,r12} - stmia r0!, {r2-r4,r12} - ldrh r12, [r1, #-0x10] - add r1, r1, #0x28 - ldmia r1, {r2-r3} - stmia r0!, {r2-r3} - and r12, r12, #0x3 - ldrh r2, [r1, #-0x8] - strh r12, [r0, #0x0] - and r2, r2, #0x1 - strh r2, [r0, #0x2] - ldmia sp!, {r4} - bx lr - .balign 4 -_020D3684: .word 0x04000290 - - arm_func_start CP_RestoreContext -CP_RestoreContext: ; 0x020D3688 - stmdb sp!, {r4} - ldr r1, _020D36C0 ; =0x04000290 - ldmia r0, {r2-r4,r12} - stmia r1, {r2-r4,r12} - ldrh r2, [r0, #0x18] - ldrh r3, [r0, #0x1a] - strh r2, [r1, #-0x10] - strh r3, [r1, #0x20] - add r0, r0, #0x10 - add r1, r1, #0x28 - ldmia r0, {r2-r3} - stmia r1, {r2-r3} - ldmia sp!, {r4} - bx lr - .balign 4 -_020D36C0: .word 0x04000290 -- cgit v1.2.3