feat(multi-cores): allocate seperate stack for each hart

OpenXiangShan · Dec 8, 2024 · 9ff1bd0 · 9ff1bd0
1 parent c030f21
commit 9ff1bd0
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 3 deletions.
diff --git a/am/src/nemu/isa/riscv/boot/start.S b/am/src/nemu/isa/riscv/boot/start.S
@@ -32,12 +32,17 @@
 _start:
   init_regs
 
-  mv s0, zero
-  la sp, _stack_pointer
   li a0, MSTATUS_FS & (MSTATUS_FS >> 1)
   csrs mstatus, a0
   csrwi fcsr, 0
 
   init_fregs # init fregs after fp enable
 
+  la t0, _stack_top
+  la t1, _stack_pointer
+  sub t3, t1, t0
+  csrr t4, mhartid
+  mul t5, t3, t4
+  add sp, t5, t1
+
   jal _trm_init
diff --git a/am/src/nemu/isa/riscv/boot/start_flash.S b/am/src/nemu/isa/riscv/boot/start_flash.S
@@ -10,7 +10,6 @@
 
 _start:
   mv s0, zero
-  la sp, _stack_pointer
   li a0, MSTATUS_FS & (MSTATUS_FS >> 1)
   csrs mstatus, a0
   csrwi fcsr, 0
@@ -25,4 +24,11 @@ _start:
   # or    a0, a0, a1
   # csrw  pmpcfg0, a0
 
+  la t0, _stack_top
+  la t1, _stack_pointer
+  sub t3, t1, t0
+  csrr t4, mhartid
+  mul t5, t3, t4
+  add sp, t5, t1
+
   jal _trm_init
diff --git a/am/src/nemu/ldscript/section.ld b/am/src/nemu/ldscript/section.ld
@@ -25,6 +25,7 @@ SECTIONS {
   _stack_top = ALIGN(0x1000);
   . = _stack_top + 0x8000;
   _stack_pointer = .;
+  . = _stack_top + 0x320000;
   end = .;
   _end = .;
   _heap_start = ALIGN(0x1000);