From 2d907550909027e097d740e3cf1f467b9e62ba28 Mon Sep 17 00:00:00 2001
From: Gwilym Kuiper <gw@ilym.me>
Date: Fri, 17 Jun 2022 00:29:32 +0100
Subject: [PATCH] Put everything in different sections

---
 agb/interrupt_handler.s     |  4 ++--
 agb/src/asm_include.s       |  2 +-
 agb/src/sound/mixer/mixer.s | 14 +++++++++-----
 3 files changed, 12 insertions(+), 8 deletions(-)

diff --git a/agb/interrupt_handler.s b/agb/interrupt_handler.s
index fbceea13..90f5272e 100644
--- a/agb/interrupt_handler.s
+++ b/agb/interrupt_handler.s
@@ -2,7 +2,7 @@
 @ An interrupt handler that simply acknowledges all interrupts
     .arm
     .global InterruptHandler
-    .section .iwram, "ax"
+    .section .iwram, "ax", %progbits
     .align
 InterruptHandler:
     mov r2, #0x04000000 @ interrupt enable register location
@@ -50,7 +50,7 @@ InterruptHandler:
 .pool
 
 
-.section .iwram
+.section .iwram.program_counter
     .global agb_rs__program_counter
     .balign 4
 agb_rs__program_counter:
diff --git a/agb/src/asm_include.s b/agb/src/asm_include.s
index c561d04e..5508e4fe 100644
--- a/agb/src/asm_include.s
+++ b/agb/src/asm_include.s
@@ -1,5 +1,5 @@
 .macro agb_arm_func functionName:req
-.section .iwram
+.section .iwram.\functionName, "ax", %progbits
 .arm
 .align 2
 .global \functionName
diff --git a/agb/src/sound/mixer/mixer.s b/agb/src/sound/mixer/mixer.s
index 8d4118cc..c8fa0b7e 100644
--- a/agb/src/sound/mixer/mixer.s
+++ b/agb/src/sound/mixer/mixer.s
@@ -1,6 +1,6 @@
 .include "src/asm_include.s"
 
-.section .iwram
+.section .iwram.buffer_size
     .global agb_rs__buffer_size
     .balign 4
 agb_rs__buffer_size:
@@ -26,7 +26,8 @@ modifications_fallback:
     orr r7, r7, r3, lsl #16   @ r7 now is the left channel followed by the right channel modifications.
 
     mov r5, #0                   @ current index we're reading from
-    ldr r8, agb_rs__buffer_size @ the number of steps left
+    ldr r8, =agb_rs__buffer_size @ the number of steps left
+    ldr r8, [r8]
 
 
 1:
@@ -64,7 +65,8 @@ same_modification:
     bne 1b
 
     mov r5, #0                   @ current index we're reading from
-    ldr r8, agb_rs__buffer_size @ the number of steps left
+    ldr r8, =agb_rs__buffer_size @ the number of steps left
+    ldr r8, [r8]
 
 1:
 .rept 4
@@ -99,7 +101,8 @@ agb_arm_func agb_rs__mixer_add_stereo
 
     ldr r5, =0x00000FFF
 
-    ldr r8, agb_rs__buffer_size
+    ldr r8, =agb_rs__buffer_size
+    ldr r8, [r8]
 1:
 .rept 4
     ldrsh r6, [r0], #2        @ load the current sound sample to r6
@@ -184,7 +187,8 @@ SWAP_SIGN .req r11
     ldr CONST_127, =127
     ldr SWAP_SIGN, =0x80808080
 
-    ldr r2, agb_rs__buffer_size @ loop counter
+    ldr r2, =agb_rs__buffer_size @ loop counter
+    ldr r2, [r2]
     mov r4, r2
 
 @ The idea for this solution came from pimpmobile: