Skip to content

Commit 0ecaab7

Browse files
jkrechjkrech
authored
Update RteTarget.cpp using 0x0 instead of 0 (#2069)
addressing #2068
1 parent d100d30 commit 0ecaab7

File tree

7 files changed

+62
-62
lines changed

7 files changed

+62
-62
lines changed

‎libs/rtemodel/src/RteTarget.cpp‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1781,10 +1781,10 @@ std::string RteTarget::GenerateMemoryRegionContent(const std::vector<RteItem*> m
17811781
if (id == "__RAM0") {
17821782
oss << "// <i> Contains uninitialized RAM, Stack, and Heap" << RteUtils::LF_STRING;
17831783
}
1784-
oss << "#define " << id << "_BASE " << (unused ? "0" : start) << RteUtils::LF_STRING;
1784+
oss << "#define " << id << "_BASE " << (unused ? "0x0" : start) << RteUtils::LF_STRING;
17851785
oss << "// <o> Region size [bytes] <0x0-0xFFFFFFFF:8>" << RteUtils::LF_STRING;
17861786
oss << "// <i> Defines size of memory region." << (unused ? "" : " Default: " + size) << RteUtils::LF_STRING;
1787-
oss << "#define " << id << "_SIZE " << (unused ? "0" : size) << RteUtils::LF_STRING;
1787+
oss << "#define " << id << "_SIZE " << (unused ? "0x0" : size) << RteUtils::LF_STRING;
17881788
oss << "// </h>" << RteUtils::LF_STRING;
17891789
oss << RteUtils::LF_STRING;
17901790
return oss.str();

‎test/projects/RteTestM4/regions_RteTest_ARMCM4_FP_ref.h‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -23,28 +23,28 @@
2323
// <h> __ROM1 (unused)
2424
// <o> Base address <0x0-0xFFFFFFFF:8>
2525
// <i> Defines base address of memory region.
26-
#define __ROM1_BASE 0
26+
#define __ROM1_BASE 0x0
2727
// <o> Region size [bytes] <0x0-0xFFFFFFFF:8>
2828
// <i> Defines size of memory region.
29-
#define __ROM1_SIZE 0
29+
#define __ROM1_SIZE 0x0
3030
// </h>
3131

3232
// <h> __ROM2 (unused)
3333
// <o> Base address <0x0-0xFFFFFFFF:8>
3434
// <i> Defines base address of memory region.
35-
#define __ROM2_BASE 0
35+
#define __ROM2_BASE 0x0
3636
// <o> Region size [bytes] <0x0-0xFFFFFFFF:8>
3737
// <i> Defines size of memory region.
38-
#define __ROM2_SIZE 0
38+
#define __ROM2_SIZE 0x0
3939
// </h>
4040

4141
// <h> __ROM3 (unused)
4242
// <o> Base address <0x0-0xFFFFFFFF:8>
4343
// <i> Defines base address of memory region.
44-
#define __ROM3_BASE 0
44+
#define __ROM3_BASE 0x0
4545
// <o> Region size [bytes] <0x0-0xFFFFFFFF:8>
4646
// <i> Defines size of memory region.
47-
#define __ROM3_SIZE 0
47+
#define __ROM3_SIZE 0x0
4848
// </h>
4949

5050
// </h>
@@ -64,28 +64,28 @@
6464
// <h> __RAM1 (unused)
6565
// <o> Base address <0x0-0xFFFFFFFF:8>
6666
// <i> Defines base address of memory region.
67-
#define __RAM1_BASE 0
67+
#define __RAM1_BASE 0x0
6868
// <o> Region size [bytes] <0x0-0xFFFFFFFF:8>
6969
// <i> Defines size of memory region.
70-
#define __RAM1_SIZE 0
70+
#define __RAM1_SIZE 0x0
7171
// </h>
7272

7373
// <h> __RAM2 (unused)
7474
// <o> Base address <0x0-0xFFFFFFFF:8>
7575
// <i> Defines base address of memory region.
76-
#define __RAM2_BASE 0
76+
#define __RAM2_BASE 0x0
7777
// <o> Region size [bytes] <0x0-0xFFFFFFFF:8>
7878
// <i> Defines size of memory region.
79-
#define __RAM2_SIZE 0
79+
#define __RAM2_SIZE 0x0
8080
// </h>
8181

8282
// <h> __RAM3 (unused)
8383
// <o> Base address <0x0-0xFFFFFFFF:8>
8484
// <i> Defines base address of memory region.
85-
#define __RAM3_BASE 0
85+
#define __RAM3_BASE 0x0
8686
// <o> Region size [bytes] <0x0-0xFFFFFFFF:8>
8787
// <i> Defines size of memory region.
88-
#define __RAM3_SIZE 0
88+
#define __RAM3_SIZE 0x0
8989
// </h>
9090

9191
// </h>

‎test/projects/RteTestM4/regions_RteTest_CM4_board_ref.h‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -33,19 +33,19 @@
3333
// <h> __ROM2 (unused)
3434
// <o> Base address <0x0-0xFFFFFFFF:8>
3535
// <i> Defines base address of memory region.
36-
#define __ROM2_BASE 0
36+
#define __ROM2_BASE 0x0
3737
// <o> Region size [bytes] <0x0-0xFFFFFFFF:8>
3838
// <i> Defines size of memory region.
39-
#define __ROM2_SIZE 0
39+
#define __ROM2_SIZE 0x0
4040
// </h>
4141

4242
// <h> __ROM3 (unused)
4343
// <o> Base address <0x0-0xFFFFFFFF:8>
4444
// <i> Defines base address of memory region.
45-
#define __ROM3_BASE 0
45+
#define __ROM3_BASE 0x0
4646
// <o> Region size [bytes] <0x0-0xFFFFFFFF:8>
4747
// <i> Defines size of memory region.
48-
#define __ROM3_SIZE 0
48+
#define __ROM3_SIZE 0x0
4949
// </h>
5050

5151
// </h>
@@ -74,19 +74,19 @@
7474
// <h> __RAM2 (unused)
7575
// <o> Base address <0x0-0xFFFFFFFF:8>
7676
// <i> Defines base address of memory region.
77-
#define __RAM2_BASE 0
77+
#define __RAM2_BASE 0x0
7878
// <o> Region size [bytes] <0x0-0xFFFFFFFF:8>
7979
// <i> Defines size of memory region.
80-
#define __RAM2_SIZE 0
80+
#define __RAM2_SIZE 0x0
8181
// </h>
8282

8383
// <h> __RAM3 (unused)
8484
// <o> Base address <0x0-0xFFFFFFFF:8>
8585
// <i> Defines base address of memory region.
86-
#define __RAM3_BASE 0
86+
#define __RAM3_BASE 0x0
8787
// <o> Region size [bytes] <0x0-0xFFFFFFFF:8>
8888
// <i> Defines size of memory region.
89-
#define __RAM3_SIZE 0
89+
#define __RAM3_SIZE 0x0
9090
// </h>
9191

9292
// </h>

‎tools/projmgr/test/data/TestMemoryRegions/ref/RteTestDevice1/regions_RteTestBoard1.h‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -42,10 +42,10 @@
4242
// <h> __ROM3 (unused)
4343
// <o> Base address <0x0-0xFFFFFFFF:8>
4444
// <i> Defines base address of memory region.
45-
#define __ROM3_BASE 0
45+
#define __ROM3_BASE 0x0
4646
// <o> Region size [bytes] <0x0-0xFFFFFFFF:8>
4747
// <i> Defines size of memory region.
48-
#define __ROM3_SIZE 0
48+
#define __ROM3_SIZE 0x0
4949
// </h>
5050

5151
// </h>
@@ -83,10 +83,10 @@
8383
// <h> __RAM3 (unused)
8484
// <o> Base address <0x0-0xFFFFFFFF:8>
8585
// <i> Defines base address of memory region.
86-
#define __RAM3_BASE 0
86+
#define __RAM3_BASE 0x0
8787
// <o> Region size [bytes] <0x0-0xFFFFFFFF:8>
8888
// <i> Defines size of memory region.
89-
#define __RAM3_SIZE 0
89+
#define __RAM3_SIZE 0x0
9090
// </h>
9191

9292
// </h>

‎tools/projmgr/test/data/TestMemoryRegions/ref/RteTestDevice_Dual_cm0_core1/regions_RteTestDevice_Dual_cm0_core1.h‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -23,28 +23,28 @@
2323
// <h> __ROM1 (unused)
2424
// <o> Base address <0x0-0xFFFFFFFF:8>
2525
// <i> Defines base address of memory region.
26-
#define __ROM1_BASE 0
26+
#define __ROM1_BASE 0x0
2727
// <o> Region size [bytes] <0x0-0xFFFFFFFF:8>
2828
// <i> Defines size of memory region.
29-
#define __ROM1_SIZE 0
29+
#define __ROM1_SIZE 0x0
3030
// </h>
3131

3232
// <h> __ROM2 (unused)
3333
// <o> Base address <0x0-0xFFFFFFFF:8>
3434
// <i> Defines base address of memory region.
35-
#define __ROM2_BASE 0
35+
#define __ROM2_BASE 0x0
3636
// <o> Region size [bytes] <0x0-0xFFFFFFFF:8>
3737
// <i> Defines size of memory region.
38-
#define __ROM2_SIZE 0
38+
#define __ROM2_SIZE 0x0
3939
// </h>
4040

4141
// <h> __ROM3 (unused)
4242
// <o> Base address <0x0-0xFFFFFFFF:8>
4343
// <i> Defines base address of memory region.
44-
#define __ROM3_BASE 0
44+
#define __ROM3_BASE 0x0
4545
// <o> Region size [bytes] <0x0-0xFFFFFFFF:8>
4646
// <i> Defines size of memory region.
47-
#define __ROM3_SIZE 0
47+
#define __ROM3_SIZE 0x0
4848
// </h>
4949

5050
// </h>
@@ -64,28 +64,28 @@
6464
// <h> __RAM1 (unused)
6565
// <o> Base address <0x0-0xFFFFFFFF:8>
6666
// <i> Defines base address of memory region.
67-
#define __RAM1_BASE 0
67+
#define __RAM1_BASE 0x0
6868
// <o> Region size [bytes] <0x0-0xFFFFFFFF:8>
6969
// <i> Defines size of memory region.
70-
#define __RAM1_SIZE 0
70+
#define __RAM1_SIZE 0x0
7171
// </h>
7272

7373
// <h> __RAM2 (unused)
7474
// <o> Base address <0x0-0xFFFFFFFF:8>
7575
// <i> Defines base address of memory region.
76-
#define __RAM2_BASE 0
76+
#define __RAM2_BASE 0x0
7777
// <o> Region size [bytes] <0x0-0xFFFFFFFF:8>
7878
// <i> Defines size of memory region.
79-
#define __RAM2_SIZE 0
79+
#define __RAM2_SIZE 0x0
8080
// </h>
8181

8282
// <h> __RAM3 (unused)
8383
// <o> Base address <0x0-0xFFFFFFFF:8>
8484
// <i> Defines base address of memory region.
85-
#define __RAM3_BASE 0
85+
#define __RAM3_BASE 0x0
8686
// <o> Region size [bytes] <0x0-0xFFFFFFFF:8>
8787
// <i> Defines size of memory region.
88-
#define __RAM3_SIZE 0
88+
#define __RAM3_SIZE 0x0
8989
// </h>
9090

9191
// </h>

‎tools/projmgr/test/data/TestSolution/LinkerOptions/ref/regions_RteTest-Test-board_With.Memory.h‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -24,28 +24,28 @@
2424
// <h> __ROM1 (unused)
2525
// <o> Base address <0x0-0xFFFFFFFF:8>
2626
// <i> Defines base address of memory region.
27-
#define __ROM1_BASE 0
27+
#define __ROM1_BASE 0x0
2828
// <o> Region size [bytes] <0x0-0xFFFFFFFF:8>
2929
// <i> Defines size of memory region.
30-
#define __ROM1_SIZE 0
30+
#define __ROM1_SIZE 0x0
3131
// </h>
3232

3333
// <h> __ROM2 (unused)
3434
// <o> Base address <0x0-0xFFFFFFFF:8>
3535
// <i> Defines base address of memory region.
36-
#define __ROM2_BASE 0
36+
#define __ROM2_BASE 0x0
3737
// <o> Region size [bytes] <0x0-0xFFFFFFFF:8>
3838
// <i> Defines size of memory region.
39-
#define __ROM2_SIZE 0
39+
#define __ROM2_SIZE 0x0
4040
// </h>
4141

4242
// <h> __ROM3 (unused)
4343
// <o> Base address <0x0-0xFFFFFFFF:8>
4444
// <i> Defines base address of memory region.
45-
#define __ROM3_BASE 0
45+
#define __ROM3_BASE 0x0
4646
// <o> Region size [bytes] <0x0-0xFFFFFFFF:8>
4747
// <i> Defines size of memory region.
48-
#define __ROM3_SIZE 0
48+
#define __ROM3_SIZE 0x0
4949
// </h>
5050

5151
// </h>
@@ -65,28 +65,28 @@
6565
// <h> __RAM1 (unused)
6666
// <o> Base address <0x0-0xFFFFFFFF:8>
6767
// <i> Defines base address of memory region.
68-
#define __RAM1_BASE 0
68+
#define __RAM1_BASE 0x0
6969
// <o> Region size [bytes] <0x0-0xFFFFFFFF:8>
7070
// <i> Defines size of memory region.
71-
#define __RAM1_SIZE 0
71+
#define __RAM1_SIZE 0x0
7272
// </h>
7373

7474
// <h> __RAM2 (unused)
7575
// <o> Base address <0x0-0xFFFFFFFF:8>
7676
// <i> Defines base address of memory region.
77-
#define __RAM2_BASE 0
77+
#define __RAM2_BASE 0x0
7878
// <o> Region size [bytes] <0x0-0xFFFFFFFF:8>
7979
// <i> Defines size of memory region.
80-
#define __RAM2_SIZE 0
80+
#define __RAM2_SIZE 0x0
8181
// </h>
8282

8383
// <h> __RAM3 (unused)
8484
// <o> Base address <0x0-0xFFFFFFFF:8>
8585
// <i> Defines base address of memory region.
86-
#define __RAM3_BASE 0
86+
#define __RAM3_BASE 0x0
8787
// <o> Region size [bytes] <0x0-0xFFFFFFFF:8>
8888
// <i> Defines size of memory region.
89-
#define __RAM3_SIZE 0
89+
#define __RAM3_SIZE 0x0
9090
// </h>
9191

9292
// </h>

‎tools/projmgr/test/data/TestSolution/LinkerOptions/ref/regions_RteTest_ARMCM3.h‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -23,28 +23,28 @@
2323
// <h> __ROM1 (unused)
2424
// <o> Base address <0x0-0xFFFFFFFF:8>
2525
// <i> Defines base address of memory region.
26-
#define __ROM1_BASE 0
26+
#define __ROM1_BASE 0x0
2727
// <o> Region size [bytes] <0x0-0xFFFFFFFF:8>
2828
// <i> Defines size of memory region.
29-
#define __ROM1_SIZE 0
29+
#define __ROM1_SIZE 0x0
3030
// </h>
3131

3232
// <h> __ROM2 (unused)
3333
// <o> Base address <0x0-0xFFFFFFFF:8>
3434
// <i> Defines base address of memory region.
35-
#define __ROM2_BASE 0
35+
#define __ROM2_BASE 0x0
3636
// <o> Region size [bytes] <0x0-0xFFFFFFFF:8>
3737
// <i> Defines size of memory region.
38-
#define __ROM2_SIZE 0
38+
#define __ROM2_SIZE 0x0
3939
// </h>
4040

4141
// <h> __ROM3 (unused)
4242
// <o> Base address <0x0-0xFFFFFFFF:8>
4343
// <i> Defines base address of memory region.
44-
#define __ROM3_BASE 0
44+
#define __ROM3_BASE 0x0
4545
// <o> Region size [bytes] <0x0-0xFFFFFFFF:8>
4646
// <i> Defines size of memory region.
47-
#define __ROM3_SIZE 0
47+
#define __ROM3_SIZE 0x0
4848
// </h>
4949

5050
// </h>
@@ -64,28 +64,28 @@
6464
// <h> __RAM1 (unused)
6565
// <o> Base address <0x0-0xFFFFFFFF:8>
6666
// <i> Defines base address of memory region.
67-
#define __RAM1_BASE 0
67+
#define __RAM1_BASE 0x0
6868
// <o> Region size [bytes] <0x0-0xFFFFFFFF:8>
6969
// <i> Defines size of memory region.
70-
#define __RAM1_SIZE 0
70+
#define __RAM1_SIZE 0x0
7171
// </h>
7272

7373
// <h> __RAM2 (unused)
7474
// <o> Base address <0x0-0xFFFFFFFF:8>
7575
// <i> Defines base address of memory region.
76-
#define __RAM2_BASE 0
76+
#define __RAM2_BASE 0x0
7777
// <o> Region size [bytes] <0x0-0xFFFFFFFF:8>
7878
// <i> Defines size of memory region.
79-
#define __RAM2_SIZE 0
79+
#define __RAM2_SIZE 0x0
8080
// </h>
8181

8282
// <h> __RAM3 (unused)
8383
// <o> Base address <0x0-0xFFFFFFFF:8>
8484
// <i> Defines base address of memory region.
85-
#define __RAM3_BASE 0
85+
#define __RAM3_BASE 0x0
8686
// <o> Region size [bytes] <0x0-0xFFFFFFFF:8>
8787
// <i> Defines size of memory region.
88-
#define __RAM3_SIZE 0
88+
#define __RAM3_SIZE 0x0
8989
// </h>
9090

9191
// </h>

0 commit comments

Comments
 (0)