From 59b137e5888004266ec988f72ffe91de4d53bd97 Mon Sep 17 00:00:00 2001
From: Christian Cunningham <cc@localhost>
Date: Sun, 20 Feb 2022 16:33:09 -0700
Subject: Stack initialization macro

---
 include/macros.inc | 15 +++++++++++++++
 src/boot.S         | 54 +++++-------------------------------------------------
 2 files changed, 20 insertions(+), 49 deletions(-)

diff --git a/include/macros.inc b/include/macros.inc
index 7d2f10f..18573af 100644
--- a/include/macros.inc
+++ b/include/macros.inc
@@ -44,3 +44,18 @@
 	pop {r0-r12}
 	cps #0x13 // Svc mode
 .endm
+
+.macro core_stacks coreid
+	.space 4096
+undefined_stack_core\coreid:
+	.space 4096
+svc_stack_core\coreid:
+	.space 4096
+data_stack_core\coreid:
+	.space 4096
+irq_stack_core\coreid:
+	.space 4096
+fiq_stack_core\coreid:
+	.space 4096
+sys_stack_core\coreid:
+.endm
diff --git a/src/boot.S b/src/boot.S
index a3f7aa8..1b4b249 100644
--- a/src/boot.S
+++ b/src/boot.S
@@ -61,6 +61,7 @@ core2run:
 core3run:
 	init_core 3
 	b io_halt
+
 .globl io_halt
 io_halt:
 	wfi
@@ -93,52 +94,7 @@ mbox_core2: .word 0
 mbox_core3: .word 0
 
 .section .bss.estacks
-.align 4
-	.space 4096
-undefined_stack_core0:
-	.space 4096
-svc_stack_core0:
-	.space 4096
-data_stack_core0:
-	.space 4096
-irq_stack_core0:
-	.space 4096
-fiq_stack_core0:
-	.space 4096
-sys_stack_core0:
-	.space 4096
-undefined_stack_core1:
-	.space 4096
-svc_stack_core1:
-	.space 4096
-data_stack_core1:
-	.space 4096
-irq_stack_core1:
-	.space 4096
-fiq_stack_core1:
-	.space 4096
-sys_stack_core1:
-	.space 4096
-undefined_stack_core2:
-	.space 4096
-svc_stack_core2:
-	.space 4096
-data_stack_core2:
-	.space 4096
-irq_stack_core2:
-	.space 4096
-fiq_stack_core2:
-	.space 4096
-sys_stack_core2:
-	.space 4096
-undefined_stack_core3:
-	.space 4096
-svc_stack_core3:
-	.space 4096
-data_stack_core3:
-	.space 4096
-irq_stack_core3:
-	.space 4096
-fiq_stack_core3:
-	.space 4096
-sys_stack_core3:
+core_stacks 0
+core_stacks 1
+core_stacks 2
+core_stacks 3
-- 
cgit v1.2.1