From 177af7ea712d5fe70e1e96b453361db60dfffdab Mon Sep 17 00:00:00 2001 From: Sadeep Madurange Date: Sat, 14 Sep 2024 14:59:30 +0800 Subject: Rename variables. --- main.c | 15 +++++---------- script.ld | 2 +- 2 files changed, 6 insertions(+), 11 deletions(-) diff --git a/main.c b/main.c index 1b0ca69..71df022 100644 --- a/main.c +++ b/main.c @@ -38,8 +38,7 @@ int main(void) return 0; } -static inline void mem_init(void) -{ +__attribute__((noreturn)) void _rst_handler(void) { unsigned long *dst, *src; extern unsigned long _sbss, _ebss, _sdata, _edata, _sidata; @@ -48,10 +47,6 @@ static inline void mem_init(void) for (dst = &_sdata, src = &_sidata; dst < &_edata;) *dst++ = *src++; -} - -__attribute__((noreturn)) void reset(void) { - mem_init(); main(); @@ -59,9 +54,9 @@ __attribute__((noreturn)) void reset(void) { ; } -extern const unsigned int sp; +extern const unsigned int _sp; -__attribute__ ((section(".vtor"))) const void* tab[] = { - &sp, - reset +__attribute__ ((section(".vtor"))) const void* _tab[] = { + &_sp, + _rst_handler }; diff --git a/script.ld b/script.ld index 64492fc..7a67dcf 100644 --- a/script.ld +++ b/script.ld @@ -4,7 +4,7 @@ MEMORY ram (rwx) : ORIGIN = 0x20000000, LENGTH = 96K } -sp = ORIGIN(ram) + LENGTH(ram); +_sp = ORIGIN(ram) + LENGTH(ram); SECTIONS { -- cgit v1.2.3