script.ld/Makefile: Use the maximum ram size available for the stack

LedgerHQ · Oct 20, 2023 · bf0dbda · bf0dbda
1 parent ef27df1
commit bf0dbda
Show file tree

Hide file tree

Showing 5 changed files with 21 additions and 22 deletions.
diff --git a/Makefile.rules_generic b/Makefile.rules_generic
@@ -150,8 +150,8 @@ debug/app.map debug/app.asm: debug/app.%: $(DBG_DIR)/app.%
 
 # link_cmdline(objects,dest)		Macro that is used to format arguments for the linker
 link_cmdline = $(LD) $(LDFLAGS) -o $(2) $(1)
-ifneq ($(APP_STACK_SIZE),)
-link_cmdline += -Wl,--defsym=stack_size=$(APP_STACK_SIZE)
+ifneq ($(APP_STACK_MIN_SIZE),)
+link_cmdline += -Wl,--defsym=stack_min_size=$(APP_STACK_MIN_SIZE)
 endif
 
 # cc_cmdline(include,defines,src,dest)	Macro that is used to format arguments for the compiler

diff --git a/target/nanos/script.ld b/target/nanos/script.ld
@@ -29,7 +29,7 @@ MEMORY
 }
 
 PAGE_SIZE  = 64;
-STACK_SIZE = DEFINED(stack_size) ? stack_size : 1024;
+STACK_MIN_SIZE = DEFINED(stack_min_size) ? stack_min_size : 1024;
 END_STACK  = ORIGIN(SRAM) + LENGTH(SRAM);
 
 /*
@@ -125,15 +125,14 @@ SECTIONS
     app_stack_canary = .;
     PROVIDE(app_stack_canary = .);
     . += 4;
-    _stack_validation = .;
-    . = _stack_validation + STACK_SIZE;
-    _stack = ABSOLUTE(END_STACK) - STACK_SIZE;
-    PROVIDE( _stack = ABSOLUTE(END_STACK) - STACK_SIZE);
+    _stack = .;
+    PROVIDE( _stack = .);
     _estack = ABSOLUTE(END_STACK);
     PROVIDE( _estack = ABSOLUTE(END_STACK) );
 
   } > SRAM = 0x00
 
+  ASSERT( (_estack - _stack) >= STACK_MIN_SIZE, "stack section too small" )
 
 
   /****************************************************************/

diff --git a/target/nanos2/script.ld b/target/nanos2/script.ld
@@ -30,7 +30,7 @@ MEMORY
 }
 
 PAGE_SIZE  = 512;
-STACK_SIZE = 1500;
+STACK_MIN_SIZE = DEFINED(stack_min_size) ? stack_min_size : 1500;
 END_STACK  = ORIGIN(SRAM) + LENGTH(SRAM);
 
 ENTRY(main);
@@ -113,15 +113,15 @@ SECTIONS
     app_stack_canary = .;
     PROVIDE(app_stack_canary = .);
     . += 4;
-    _stack_validation = .;
-    . = _stack_validation + STACK_SIZE;
-    _stack = ABSOLUTE(END_STACK) - STACK_SIZE;
-    PROVIDE( _stack = ABSOLUTE(END_STACK) - STACK_SIZE);
+    _stack = .;
+    PROVIDE( _stack = .);
     _estack = ABSOLUTE(END_STACK);
     PROVIDE( _estack = ABSOLUTE(END_STACK) );
 
   } > SRAM = 0x00
 
+  ASSERT( (_estack - _stack) >= STACK_MIN_SIZE, "stack section too small" )
+
   /****************************************************************/
   /* DEBUG                                                        */
   /****************************************************************/

diff --git a/target/nanox/script.ld b/target/nanox/script.ld
@@ -30,7 +30,7 @@ MEMORY
 }
 
 PAGE_SIZE  = 256;
-STACK_SIZE = 1500;
+STACK_MIN_SIZE = DEFINED(stack_min_size) ? stack_min_size : 1500;
 END_STACK  = ORIGIN(SRAM) + LENGTH(SRAM);
 
 ENTRY(main);
@@ -124,15 +124,15 @@ SECTIONS
     app_stack_canary = .;
     PROVIDE(app_stack_canary = .);
     . += 4;
-    _stack_validation = .;
-    . = _stack_validation + STACK_SIZE;
-    _stack = ABSOLUTE(END_STACK) - STACK_SIZE;
-    PROVIDE( _stack = ABSOLUTE(END_STACK) - STACK_SIZE);
+    _stack = .;
+    PROVIDE( _stack = .);
     _estack = ABSOLUTE(END_STACK);
     PROVIDE( _estack = ABSOLUTE(END_STACK) );
 
   } > SRAM
 
+  ASSERT( (_estack - _stack) >= STACK_MIN_SIZE, "stack section too small" )
+
   /****************************************************************/
   /* DEBUG                                                        */
   /****************************************************************/

diff --git a/target/stax/script.ld b/target/stax/script.ld
@@ -30,7 +30,7 @@ MEMORY
 }
 
 PAGE_SIZE  = 512;
-STACK_SIZE = 1500;
+STACK_MIN_SIZE = DEFINED(stack_min_size) ? stack_min_size : 1500;
 END_STACK  = ORIGIN(SRAM) + LENGTH(SRAM);
 
 ENTRY(main);
@@ -114,15 +114,15 @@ SECTIONS
     app_stack_canary = .;
     PROVIDE(app_stack_canary = .);
     . += 4;
-    _stack_validation = .;
-    . = _stack_validation + STACK_SIZE;
-    _stack = ABSOLUTE(END_STACK) - STACK_SIZE;
-    PROVIDE( _stack = ABSOLUTE(END_STACK) - STACK_SIZE);
+    _stack = .;
+    PROVIDE( _stack = .);
     _estack = ABSOLUTE(END_STACK);
     PROVIDE( _estack = ABSOLUTE(END_STACK) );
 
   } > SRAM = 0x00
 
+  ASSERT( (_estack - _stack) >= STACK_MIN_SIZE, "stack section too small" )
+
   /****************************************************************/
   /* DEBUG                                                        */
   /****************************************************************/