Merge pull request #37 from cpq/dst

Fix #33 - nitpick, rename src/dst variables
cpq · Aug 19, 2023 · ce39532 · ce39532
2 parents c06642d + 0d4e831
commit ce39532
Show file tree

Hide file tree

Showing 12 changed files with 24 additions and 24 deletions.
diff --git a/README.md b/README.md
@@ -497,8 +497,8 @@ int main(void) {
 __attribute__((naked, noreturn)) void _reset(void) {
   // memset .bss to zero, and copy .data section to RAM region
   extern long _sbss, _ebss, _sdata, _edata, _sidata;
-  for (long *src = &_sbss; src < &_ebss; src++) *src = 0;
-  for (long *src = &_sdata, *dst = &_sidata; src < &_edata;) *src++ = *dst++;
+  for (long *dst = &_sbss; dst < &_ebss; dst++) *dst = 0;
+  for (long *dst = &_sdata, *src = &_sidata; dst < &_edata;) *dst++ = *src++;
 
   main();             // Call main()
   for (;;) (void) 0;  // Infinite loop in the case if main() returns

diff --git a/README_tr-TR.md b/README_tr-TR.md
@@ -474,8 +474,8 @@ int main(void) {
 __attribute__((naked, noreturn)) void _reset(void) {
   // .bss'e 0 ata ve .data'yı RAM'e kopyala
   extern long _sbss, _ebss, _sdata, _edata, _sidata;
-  for (long *src = &_sbss; src < &_ebss; src++) *src = 0;
-  for (long *src = &_sdata, *dst = &_sidata; src < &_edata;) *src++ = *dst++;
+  for (long *dst = &_sbss; dst < &_ebss; dst++) *dst = 0;
+  for (long *dst = &_sdata, *src = &_sidata; dst < &_edata;) *dst++ = *src++;
 
   main();             // main()' çağır
   for (;;) (void) 0;  // main'den return gelene kadar sonsuz döngü

diff --git a/README_zh-CN.md b/README_zh-CN.md
@@ -402,8 +402,8 @@ int main(void) {
 __attribute__((naked, noreturn)) void _reset(void) {
   // memset .bss to zero, and copy .data section to RAM region
   extern long _sbss, _ebss, _sdata, _edata, _sidata;
-  for (long *src = &_sbss; src < &_ebss; src++) *src = 0;
-  for (long *src = &_sdata, *dst = &_sidata; src < &_edata;) *src++ = *dst++;
+  for (long *dst = &_sbss; dst < &_ebss; dst++) *dst = 0;
+  for (long *dst = &_sdata, *src = &_sidata; dst < &_edata;) *dst++ = *src++;
 
   main();             // Call main()
   for (;;) (void) 0;  // Infinite loop in the case if main() returns

diff --git a/steps/step-0-minimal/main.c b/steps/step-0-minimal/main.c
@@ -9,8 +9,8 @@ int main(void) {
 __attribute__((naked, noreturn)) void _reset(void) {
   // memset .bss to zero, and copy .data section to RAM region
   extern long _sbss, _ebss, _sdata, _edata, _sidata;
-  for (long *src = &_sbss; src < &_ebss; src++) *src = 0;
-  for (long *src = &_sdata, *dst = &_sidata; src < &_edata;) *src++ = *dst++;
+  for (long *dst = &_sbss; dst < &_ebss; dst++) *dst = 0;
+  for (long *dst = &_sdata, *src = &_sidata; dst < &_edata;) *dst++ = *src++;
 
   main();             // Call main()
   for (;;) (void) 0;  // Infinite loop in the case if main() returns

diff --git a/steps/step-1-blinky/main.c b/steps/step-1-blinky/main.c
@@ -59,8 +59,8 @@ int main(void) {
 __attribute__((naked, noreturn)) void _reset(void) {
   // memset .bss to zero, and copy .data section to RAM region
   extern long _sbss, _ebss, _sdata, _edata, _sidata;
-  for (long *src = &_sbss; src < &_ebss; src++) *src = 0;
-  for (long *src = &_sdata, *dst = &_sidata; src < &_edata;) *src++ = *dst++;
+  for (long *dst = &_sbss; dst < &_ebss; dst++) *dst = 0;
+  for (long *dst = &_sdata, *src = &_sidata; dst < &_edata;) *dst++ = *src++;
 
   main();             // Call main()
   for (;;) (void) 0;  // Infinite loop in the case if main() returns

diff --git a/steps/step-2-systick/main.c b/steps/step-2-systick/main.c
@@ -90,8 +90,8 @@ int main(void) {
 __attribute__((naked, noreturn)) void _reset(void) {
   // Initialise memory
   extern long _sbss, _ebss, _sdata, _edata, _sidata;
-  for (long *src = &_sbss; src < &_ebss; src++) *src = 0;
-  for (long *src = &_sdata, *dst = &_sidata; src < &_edata;) *src++ = *dst++;
+  for (long *dst = &_sbss; dst < &_ebss; dst++) *dst = 0;
+  for (long *dst = &_sdata, *src = &_sidata; dst < &_edata;) *dst++ = *src++;
 
   // Call main()
   main();

diff --git a/steps/step-3-uart/main.c b/steps/step-3-uart/main.c
@@ -145,8 +145,8 @@ int main(void) {
 __attribute__((naked, noreturn)) void _reset(void) {
   // Initialise memory
   extern long _sbss, _ebss, _sdata, _edata, _sidata;
-  for (long *src = &_sbss; src < &_ebss; src++) *src = 0;
-  for (long *src = &_sdata, *dst = &_sidata; src < &_edata;) *src++ = *dst++;
+  for (long *dst = &_sbss; dst < &_ebss; dst++) *dst = 0;
+  for (long *dst = &_sdata, *src = &_sidata; dst < &_edata;) *dst++ = *src++;
 
   // Call main()
   main();

diff --git a/steps/step-4-printf/startup.c b/steps/step-4-printf/startup.c
@@ -5,8 +5,8 @@
 __attribute__((naked, noreturn)) void _reset(void) {
   // Initialise memory
   extern long _sbss, _ebss, _sdata, _edata, _sidata;
-  for (long *src = &_sbss; src < &_ebss; src++) *src = 0;
-  for (long *src = &_sdata, *dst = &_sidata; src < &_edata;) *src++ = *dst++;
+  for (long *dst = &_sbss; dst < &_ebss; dst++) *dst = 0;
+  for (long *dst = &_sdata, *src = &_sidata; dst < &_edata;) *dst++ = *src++;
 
   // Call main()
   extern void main(void);

diff --git a/steps/step-6-clock/startup.c b/steps/step-6-clock/startup.c
@@ -5,8 +5,8 @@
 __attribute__((naked, noreturn)) void _reset(void) {
   // Initialise memory
   extern long _sbss, _ebss, _sdata, _edata, _sidata;
-  for (long *src = &_sbss; src < &_ebss; src++) *src = 0;
-  for (long *src = &_sdata, *dst = &_sidata; src < &_edata;) *src++ = *dst++;
+  for (long *dst = &_sbss; dst < &_ebss; dst++) *dst = 0;
+  for (long *dst = &_sdata, *src = &_sidata; dst < &_edata;) *dst++ = *src++;
 
   // Call main()
   extern void main(void);

diff --git a/steps/step-7-webserver/ek-tm4c1294xl/startup.c b/steps/step-7-webserver/ek-tm4c1294xl/startup.c
@@ -5,8 +5,8 @@
 __attribute__((naked, noreturn)) void _reset(void) {
   // Initialise memory
   extern long _sbss, _ebss, _sdata, _edata, _sidata;
-  for (long *src = &_sbss; src < &_ebss; src++) *src = 0;
-  for (long *src = &_sdata, *dst = &_sidata; src < &_edata;) *src++ = *dst++;
+  for (long *dst = &_sbss; dst < &_ebss; dst++) *dst = 0;
+  for (long *dst = &_sdata, *src = &_sidata; dst < &_edata;) *dst++ = *src++;
 
   // Call main()
   extern void main(void);

diff --git a/steps/step-7-webserver/nucleo-f429zi/startup.c b/steps/step-7-webserver/nucleo-f429zi/startup.c
@@ -5,8 +5,8 @@
 __attribute__((naked, noreturn)) void _reset(void) {
   // Initialise memory
   extern long _sbss, _ebss, _sdata, _edata, _sidata;
-  for (long *src = &_sbss; src < &_ebss; src++) *src = 0;
-  for (long *src = &_sdata, *dst = &_sidata; src < &_edata;) *src++ = *dst++;
+  for (long *dst = &_sbss; dst < &_ebss; dst++) *dst = 0;
+  for (long *dst = &_sdata, *src = &_sidata; dst < &_edata;) *dst++ = *src++;
 
   // Call main()
   extern void main(void);

diff --git a/templates/blinky/same54-xplained/startup.c b/templates/blinky/same54-xplained/startup.c
@@ -43,8 +43,8 @@ __attribute__((section(".vectors"))) void (*const tab[16 + 138])(void) = {
 __attribute__((naked, noreturn)) void Reset_Handler(void) {
   // Clear BSS section, and copy data section from flash to RAM
   extern long _sbss, _ebss, _sdata, _edata, _sidata;
-  for (long *src = &_sbss; src < &_ebss; src++) *src = 0;
-  for (long *src = &_sdata, *dst = &_sidata; src < &_edata;) *src++ = *dst++;
+  for (long *dst = &_sbss; dst < &_ebss; dst++) *dst = 0;
+  for (long *dst = &_sdata, *src = &_sidata; dst < &_edata;) *dst++ = *src++;
 
   SCB->VTOR = (uint32_t) &tab;
   SystemInit();