Refactor definition of heap load region start

harrisonmutai-arm · harrisonmutai-arm · commit 1c671c43ffc2 · 2021-04-07T14:27:34.000+01:00
diff --git a/targets/TARGET_Maxim/TARGET_MAX32620C/device/TOOLCHAIN_ARM_STD/MAX32620.sct b/targets/TARGET_Maxim/TARGET_MAX32620C/device/TOOLCHAIN_ARM_STD/MAX32620.sct
@@ -35,16 +35,19 @@
 #define Stack_Size MBED_CONF_TARGET_BOOT_STACK_SIZE
 #define RAM_FIXED_SIZE  (Stack_Size + VECTOR_SIZE)
 
+#define MBED_RAM1_START (MBED_RAM_START+VECTOR_SIZE)
+#define MBED_RAM1_SIZE (MBED_RAM_SIZE-RAM_FIXED_SIZE)
+
 LR_IROM1 MBED_APP_START MBED_APP_SIZE  {    ; load region size_region
     ER_IROM1 MBED_APP_START MBED_APP_SIZE  {  ; load address = execution address 
         *.o (RESET, +First)
         *(InRoot$$Sections)
         .ANY (+RO)
     }
-    RW_IRAM1 (MBED_RAM_START+VECTOR_SIZE) (MBED_RAM_SIZE-RAM_FIXED_SIZE)  {  ; RW data
+    RW_IRAM1 MBED_RAM1_START MBED_RAM1_SIZE  {  ; RW data
         .ANY (+RW +ZI)
     }
-    ARM_LIB_HEAP AlignExpr(+0, +16) EMPTY (MBED_RAM_SIZE - RAM_FIXED_SIZE - (AlignExpr(ImageLimit(RW_IRAM1), 16) - MBED_RAM_START)){ ; heap region growing up
+    ARM_LIB_HEAP AlignExpr(+0, +16) EMPTY (MBED_RAM_SIZE - RAM_FIXED_SIZE - (AlignExpr(ImageLimit(RW_IRAM1), 16) - MBED_RAM1_START)){ ; heap region growing up
     }
     ARM_LIB_STACK (MBED_RAM_START+MBED_RAM_SIZE) EMPTY -Stack_Size { ; stack region growing down
     }
diff --git a/targets/TARGET_Maxim/TARGET_MAX32625/device/TOOLCHAIN_ARM_STD/TARGET_MAX32625_BOOT/MAX32625.sct b/targets/TARGET_Maxim/TARGET_MAX32625/device/TOOLCHAIN_ARM_STD/TARGET_MAX32625_BOOT/MAX32625.sct
@@ -32,18 +32,21 @@
 #define Stack_Size MBED_CONF_TARGET_BOOT_STACK_SIZE
 #define RAM_FIXED_SIZE  (Stack_Size + VECTOR_SIZE)
 
+#define MBED_RAM1_START (MBED_RAM_START+VECTOR_SIZE)
+#define MBED_RAM1_SIZE (MBED_RAM_SIZE-RAM_FIXED_SIZE)
+
 LR_IROM1 MBED_APP_START MBED_APP_SIZE  {    ; load region size_region
     ER_IROM1 MBED_APP_START MBED_APP_SIZE  {  ; load address = execution address
         *.o (RESET, +First)
         *(InRoot$$Sections)
         .ANY (+RO)
     }
 
-    RW_IRAM1 (MBED_RAM_START+VECTOR_SIZE) (MBED_RAM_SIZE-RAM_FIXED_SIZE)  {  ; RW data
+    RW_IRAM1 MBED_RAM1_START MBED_RAM1_SIZE  {  ; RW data
         .ANY (+RW +ZI)
     }
 
-    ARM_LIB_HEAP AlignExpr(+0, +16) EMPTY (MBED_RAM_SIZE - RAM_FIXED_SIZE - (AlignExpr(ImageLimit(RW_IRAM1), 16) - MBED_RAM_START)){ ; heap region growing up
+    ARM_LIB_HEAP AlignExpr(+0, +16) EMPTY (MBED_RAM_SIZE - RAM_FIXED_SIZE - (AlignExpr(ImageLimit(RW_IRAM1), 16) - MBED_RAM1_START)){ ; heap region growing up
     }
     ARM_LIB_STACK (MBED_RAM_START+MBED_RAM_SIZE) EMPTY -Stack_Size { ; stack region growing down
     }
diff --git a/targets/TARGET_Maxim/TARGET_MAX32625/device/TOOLCHAIN_ARM_STD/TARGET_MAX32625_NO_BOOT/MAX32625.sct b/targets/TARGET_Maxim/TARGET_MAX32625/device/TOOLCHAIN_ARM_STD/TARGET_MAX32625_NO_BOOT/MAX32625.sct
@@ -32,6 +32,9 @@
 #define Stack_Size MBED_CONF_TARGET_BOOT_STACK_SIZE
 #define RAM_FIXED_SIZE  (Stack_Size + VECTOR_SIZE)
 
+#define MBED_RAM1_START (MBED_RAM_START+VECTOR_SIZE)
+#define MBED_RAM1_SIZE (MBED_RAM_SIZE-RAM_FIXED_SIZE)
+
 LR_IROM1 MBED_APP_START MBED_APP_SIZE  {    ; load region size_region
     ER_IROM1 MBED_APP_START MBED_APP_SIZE  {  ; load address = execution address 
         *.o (RESET, +First)
@@ -40,10 +43,10 @@ LR_IROM1 MBED_APP_START MBED_APP_SIZE  {    ; load region size_region
     }
 
     ; [RAM] Vector table dynamic copy: 68 vectors * 4 bytes = 272 (0x110)
-    RW_IRAM1 (MBED_RAM_START+VECTOR_SIZE) (MBED_RAM_SIZE-RAM_FIXED_SIZE)  {  ; RW data
+    RW_IRAM1 MBED_RAM1_START MBED_RAM1_SIZE  {  ; RW data
         .ANY (+RW +ZI)
     }
-    ARM_LIB_HEAP AlignExpr(+0, +16) EMPTY (MBED_RAM_SIZE - RAM_FIXED_SIZE - (AlignExpr(ImageLimit(RW_IRAM1), 16) - MBED_RAM_START)){ ; heap region growing up
+    ARM_LIB_HEAP AlignExpr(+0, +16) EMPTY (MBED_RAM_SIZE - RAM_FIXED_SIZE - (AlignExpr(ImageLimit(RW_IRAM1), 16) - MBED_RAM1_START)){ ; heap region growing up
     }
     ARM_LIB_STACK (MBED_RAM_START+MBED_RAM_SIZE) EMPTY -Stack_Size { ; stack region growing down
     }
diff --git a/targets/TARGET_Maxim/TARGET_MAX32630/device/TOOLCHAIN_ARM_STD/MAX3263x.sct b/targets/TARGET_Maxim/TARGET_MAX32630/device/TOOLCHAIN_ARM_STD/MAX3263x.sct
@@ -33,6 +33,9 @@
 #define Stack_Size MBED_CONF_TARGET_BOOT_STACK_SIZE
 #define RAM_FIXED_SIZE  (Stack_Size + VECTOR_SIZE)
 
+#define MBED_RAM1_START (MBED_RAM_START+VECTOR_SIZE)
+#define MBED_RAM1_SIZE (MBED_RAM_SIZE-RAM_FIXED_SIZE)
+
 LR_IROM1 MBED_APP_START MBED_APP_SIZE  {    ; load region size_region
     ER_IROM1 MBED_APP_START MBED_APP_SIZE  {  ; load address = execution address 
         *.o (RESET, +First)
@@ -41,10 +44,10 @@ LR_IROM1 MBED_APP_START MBED_APP_SIZE  {    ; load region size_region
     }
 
     ; [RAM] Vector table dynamic copy: 68 vectors * 4 bytes = 272 (0x110)
-    RW_IRAM1 (MBED_RAM_START+VECTOR_SIZE) (MBED_RAM_SIZE-RAM_FIXED_SIZE)  {  ; RW data
+    RW_IRAM1 MBED_RAM1_START MBED_RAM1_SIZE  {  ; RW data
         .ANY (+RW +ZI)
     }
-    ARM_LIB_HEAP AlignExpr(+0, +16) EMPTY (MBED_RAM_SIZE - RAM_FIXED_SIZE - (AlignExpr(ImageLimit(RW_IRAM1), 16) - MBED_RAM_START)){ ; heap region growing up
+    ARM_LIB_HEAP AlignExpr(+0, +16) EMPTY (MBED_RAM_SIZE - RAM_FIXED_SIZE - (AlignExpr(ImageLimit(RW_IRAM1), 16) - MBED_RAM1_START)){ ; heap region growing up
     }
     ARM_LIB_STACK (MBED_RAM_START+MBED_RAM_SIZE) EMPTY -Stack_Size { ; stack region growing down
     }

Original file line number	Diff line number	Diff line change
`@@ -35,16 +35,19 @@`
`35`	`35`	`#define Stack_Size MBED_CONF_TARGET_BOOT_STACK_SIZE`
`36`	`36`	`#define RAM_FIXED_SIZE (Stack_Size + VECTOR_SIZE)`
`37`	`37`
	`38`	`+#define MBED_RAM1_START (MBED_RAM_START+VECTOR_SIZE)`
	`39`	`+#define MBED_RAM1_SIZE (MBED_RAM_SIZE-RAM_FIXED_SIZE)`
	`40`	`+`
`38`	`41`	`LR_IROM1 MBED_APP_START MBED_APP_SIZE { ; load region size_region`
`39`	`42`	`ER_IROM1 MBED_APP_START MBED_APP_SIZE { ; load address = execution address`
`40`	`43`	`*.o (RESET, +First)`
`41`	`44`	`*(InRoot$$Sections)`
`42`	`45`	`.ANY (+RO)`
`43`	`46`	`}`
`44`		`- RW_IRAM1 (MBED_RAM_START+VECTOR_SIZE) (MBED_RAM_SIZE-RAM_FIXED_SIZE) { ; RW data`
	`47`	`+ RW_IRAM1 MBED_RAM1_START MBED_RAM1_SIZE { ; RW data`
`45`	`48`	`.ANY (+RW +ZI)`
`46`	`49`	`}`
`47`		`- ARM_LIB_HEAP AlignExpr(+0, +16) EMPTY (MBED_RAM_SIZE - RAM_FIXED_SIZE - (AlignExpr(ImageLimit(RW_IRAM1), 16) - MBED_RAM_START)){ ; heap region growing up`
	`50`	`+ ARM_LIB_HEAP AlignExpr(+0, +16) EMPTY (MBED_RAM_SIZE - RAM_FIXED_SIZE - (AlignExpr(ImageLimit(RW_IRAM1), 16) - MBED_RAM1_START)){ ; heap region growing up`
`48`	`51`	`}`
`49`	`52`	`ARM_LIB_STACK (MBED_RAM_START+MBED_RAM_SIZE) EMPTY -Stack_Size { ; stack region growing down`
`50`	`53`	`}`
Original file line number	Diff line number	Diff line change
`@@ -32,18 +32,21 @@`
`32`	`32`	`#define Stack_Size MBED_CONF_TARGET_BOOT_STACK_SIZE`
`33`	`33`	`#define RAM_FIXED_SIZE (Stack_Size + VECTOR_SIZE)`
`34`	`34`
	`35`	`+#define MBED_RAM1_START (MBED_RAM_START+VECTOR_SIZE)`
	`36`	`+#define MBED_RAM1_SIZE (MBED_RAM_SIZE-RAM_FIXED_SIZE)`
	`37`	`+`
`35`	`38`	`LR_IROM1 MBED_APP_START MBED_APP_SIZE { ; load region size_region`
`36`	`39`	`ER_IROM1 MBED_APP_START MBED_APP_SIZE { ; load address = execution address`
`37`	`40`	`*.o (RESET, +First)`
`38`	`41`	`*(InRoot$$Sections)`
`39`	`42`	`.ANY (+RO)`
`40`	`43`	`}`
`41`	`44`
`42`		`- RW_IRAM1 (MBED_RAM_START+VECTOR_SIZE) (MBED_RAM_SIZE-RAM_FIXED_SIZE) { ; RW data`
	`45`	`+ RW_IRAM1 MBED_RAM1_START MBED_RAM1_SIZE { ; RW data`
`43`	`46`	`.ANY (+RW +ZI)`
`44`	`47`	`}`
`45`	`48`
`46`		`- ARM_LIB_HEAP AlignExpr(+0, +16) EMPTY (MBED_RAM_SIZE - RAM_FIXED_SIZE - (AlignExpr(ImageLimit(RW_IRAM1), 16) - MBED_RAM_START)){ ; heap region growing up`
	`49`	`+ ARM_LIB_HEAP AlignExpr(+0, +16) EMPTY (MBED_RAM_SIZE - RAM_FIXED_SIZE - (AlignExpr(ImageLimit(RW_IRAM1), 16) - MBED_RAM1_START)){ ; heap region growing up`
`47`	`50`	`}`
`48`	`51`	`ARM_LIB_STACK (MBED_RAM_START+MBED_RAM_SIZE) EMPTY -Stack_Size { ; stack region growing down`
`49`	`52`	`}`
Original file line number	Diff line number	Diff line change
`@@ -32,6 +32,9 @@`
`32`	`32`	`#define Stack_Size MBED_CONF_TARGET_BOOT_STACK_SIZE`
`33`	`33`	`#define RAM_FIXED_SIZE (Stack_Size + VECTOR_SIZE)`
`34`	`34`
	`35`	`+#define MBED_RAM1_START (MBED_RAM_START+VECTOR_SIZE)`
	`36`	`+#define MBED_RAM1_SIZE (MBED_RAM_SIZE-RAM_FIXED_SIZE)`
	`37`	`+`
`35`	`38`	`LR_IROM1 MBED_APP_START MBED_APP_SIZE { ; load region size_region`
`36`	`39`	`ER_IROM1 MBED_APP_START MBED_APP_SIZE { ; load address = execution address`
`37`	`40`	`*.o (RESET, +First)`
`@@ -40,10 +43,10 @@ LR_IROM1 MBED_APP_START MBED_APP_SIZE { ; load region size_region`
`40`	`43`	`}`
`41`	`44`
`42`	`45`	`; [RAM] Vector table dynamic copy: 68 vectors * 4 bytes = 272 (0x110)`
`43`		`- RW_IRAM1 (MBED_RAM_START+VECTOR_SIZE) (MBED_RAM_SIZE-RAM_FIXED_SIZE) { ; RW data`
	`46`	`+ RW_IRAM1 MBED_RAM1_START MBED_RAM1_SIZE { ; RW data`
`44`	`47`	`.ANY (+RW +ZI)`
`45`	`48`	`}`
`46`		`- ARM_LIB_HEAP AlignExpr(+0, +16) EMPTY (MBED_RAM_SIZE - RAM_FIXED_SIZE - (AlignExpr(ImageLimit(RW_IRAM1), 16) - MBED_RAM_START)){ ; heap region growing up`
	`49`	`+ ARM_LIB_HEAP AlignExpr(+0, +16) EMPTY (MBED_RAM_SIZE - RAM_FIXED_SIZE - (AlignExpr(ImageLimit(RW_IRAM1), 16) - MBED_RAM1_START)){ ; heap region growing up`
`47`	`50`	`}`
`48`	`51`	`ARM_LIB_STACK (MBED_RAM_START+MBED_RAM_SIZE) EMPTY -Stack_Size { ; stack region growing down`
`49`	`52`	`}`
Original file line number	Diff line number	Diff line change
`@@ -33,6 +33,9 @@`
`33`	`33`	`#define Stack_Size MBED_CONF_TARGET_BOOT_STACK_SIZE`
`34`	`34`	`#define RAM_FIXED_SIZE (Stack_Size + VECTOR_SIZE)`
`35`	`35`
	`36`	`+#define MBED_RAM1_START (MBED_RAM_START+VECTOR_SIZE)`
	`37`	`+#define MBED_RAM1_SIZE (MBED_RAM_SIZE-RAM_FIXED_SIZE)`
	`38`	`+`
`36`	`39`	`LR_IROM1 MBED_APP_START MBED_APP_SIZE { ; load region size_region`
`37`	`40`	`ER_IROM1 MBED_APP_START MBED_APP_SIZE { ; load address = execution address`
`38`	`41`	`*.o (RESET, +First)`
`@@ -41,10 +44,10 @@ LR_IROM1 MBED_APP_START MBED_APP_SIZE { ; load region size_region`
`41`	`44`	`}`
`42`	`45`
`43`	`46`	`; [RAM] Vector table dynamic copy: 68 vectors * 4 bytes = 272 (0x110)`
`44`		`- RW_IRAM1 (MBED_RAM_START+VECTOR_SIZE) (MBED_RAM_SIZE-RAM_FIXED_SIZE) { ; RW data`
	`47`	`+ RW_IRAM1 MBED_RAM1_START MBED_RAM1_SIZE { ; RW data`
`45`	`48`	`.ANY (+RW +ZI)`
`46`	`49`	`}`
`47`		`- ARM_LIB_HEAP AlignExpr(+0, +16) EMPTY (MBED_RAM_SIZE - RAM_FIXED_SIZE - (AlignExpr(ImageLimit(RW_IRAM1), 16) - MBED_RAM_START)){ ; heap region growing up`
	`50`	`+ ARM_LIB_HEAP AlignExpr(+0, +16) EMPTY (MBED_RAM_SIZE - RAM_FIXED_SIZE - (AlignExpr(ImageLimit(RW_IRAM1), 16) - MBED_RAM1_START)){ ; heap region growing up`
`48`	`51`	`}`
`49`	`52`	`ARM_LIB_STACK (MBED_RAM_START+MBED_RAM_SIZE) EMPTY -Stack_Size { ; stack region growing down`
`50`	`53`	`}`