projects
/
riscv-tests.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Put debug test stack in data instead of text
[riscv-tests.git]
/
debug
/
programs
/
entry.S
diff --git
a/debug/programs/entry.S
b/debug/programs/entry.S
index c3be61108e4a129b0ab2b087754d78d9d0ed1972..3acd786cc226d367ddc109cb03a53e11f2601b45 100755
(executable)
--- a/
debug/programs/entry.S
+++ b/
debug/programs/entry.S
@@
-1,9
+1,6
@@
-#ifndef ENTRY_S
-#define ENTRY_S
-
#include "encoding.h"
#include "encoding.h"
-#define STACK_SIZE
512
+#define STACK_SIZE
(90 * XLEN / 8)
#if XLEN == 64
# define LREG ld
#if XLEN == 64
# define LREG ld
@@
-61,8
+58,15
@@
handle_reset:
la gp, __global_pointer$
.option pop
la gp, __global_pointer$
.option pop
- # initialize stack pointer
- la sp, stack_top
+ # Initialize stack pointer.
+ # Give each hart STACK_SIZE of stack.
+ # Assume hart IDs are contiguous and start at 0.
+ csrr t0, CSR_MHARTID
+ addi t0, t0, 1
+ li t1, STACK_SIZE
+ mul t0, t0, t1
+ la sp, stack_bottom
+ add sp, sp, t0
# Clear all hardware triggers
li t0, ~0
# Clear all hardware triggers
li t0, ~0
@@
-73,10
+77,36
@@
handle_reset:
csrr t1, CSR_TSELECT
beq t0, t1, 1b
csrr t1, CSR_TSELECT
beq t0, t1, 1b
+#ifdef MULTICORE
+ csrr t0, CSR_MHARTID
+ bnez t0, wait_until_initialized
+#endif
+
+ la t0, __bss_start
+ la t1, __bss_end
+1:
+ bge t0, t1, 2f
+ sb zero, 0(t0)
+ addi t0, t0, 1
+ j 1b
+2:
+#ifdef MULTICORE
+ la t0, initialized
+ li t1, 1
+ sw t1, 0(t0)
+
+wait_until_initialized: # Wait for hart 0 to perform initialization.
+ la t0, initialized
+1:
+ lw t1, 0(t0)
+ beqz t1, 1b
+#endif
+
# perform the rest of initialization in C
# perform the rest of initialization in C
- j _init
+ j
_init
+.align 2
trap_entry:
addi sp, sp, -32*REGBYTES
trap_entry:
addi sp, sp, -32*REGBYTES
@@
-161,12
+191,10
@@
loop_forever:
j loop_forever
// Fill the stack with data so we can see if it was overrun.
j loop_forever
// Fill the stack with data so we can see if it was overrun.
+ .section .data
.align 4
stack_bottom:
.align 4
stack_bottom:
- .fill STACK_SIZE/4, 4, 0x22446688
+ .fill
NHARTS *
STACK_SIZE/4, 4, 0x22446688
stack_top:
stack_top:
- // Prevent stack_top from being identical to next symbol, which may cause gdb
- // to report we're halted at stack_top which happens to be the same address
- // as main.
+initialized:
.word 0
.word 0
-#endif