Skip to content

Commit 641fc4a

Browse files
nashifcfriedt
authored andcommitted
arch: init: rename z_early_memset -> arch_early_memset
Do not use private API prefix and move to architecture interface as those functions are primarily used across arches and can be defined by the architecture. Signed-off-by: Anas Nashif <[email protected]>
1 parent 06b1792 commit 641fc4a

File tree

7 files changed

+18
-18
lines changed

7 files changed

+18
-18
lines changed

arch/arc/core/prep_c.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ extern char __device_states_end[];
6868
*/
6969
static void dev_state_zero(void)
7070
{
71-
z_early_memset(__device_states_start, 0, __device_states_end - __device_states_start);
71+
arch_early_memset(__device_states_start, 0, __device_states_end - __device_states_start);
7272
}
7373
#endif
7474

arch/arm/core/cortex_m/reset.S

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
_ASM_FILE_PROLOGUE
2020

2121
GTEXT(z_arm_reset)
22-
GTEXT(z_early_memset)
22+
GTEXT(arch_early_memset)
2323
GDATA(z_interrupt_stacks)
2424
GDATA(z_main_stack)
2525
#if defined(CONFIG_DEBUG_THREAD_INFO)
@@ -177,7 +177,7 @@ SECTION_SUBSEC_FUNC(TEXT,_reset_section,__start)
177177
ldr r0, =z_interrupt_stacks
178178
ldr r1, =0xaa
179179
ldr r2, =CONFIG_ISR_STACK_SIZE + MPU_GUARD_ALIGN_AND_SIZE
180-
bl z_early_memset
180+
bl arch_early_memset
181181
#endif
182182

183183
/*

arch/arm64/core/early_mem_funcs.S

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,9 +18,9 @@ _ASM_FILE_PROLOGUE
1818
* to memset or memcpy on its own.
1919
*/
2020

21-
/* void z_early_memset(void *dst, int c, size_t n) */
22-
GTEXT(z_early_memset)
23-
SECTION_FUNC(TEXT, z_early_memset)
21+
/* void arch_early_memset(void *dst, int c, size_t n) */
22+
GTEXT(arch_early_memset)
23+
SECTION_FUNC(TEXT, arch_early_memset)
2424

2525
/* is dst pointer 8-bytes aligned? */
2626
tst x0, #0x7

arch/common/init.c

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
* may override this with their own safe implementation.
2525
*/
2626
__boot_func
27-
void __weak z_early_memset(void *dst, int c, size_t n)
27+
void __weak arch_early_memset(void *dst, int c, size_t n)
2828
{
2929
(void) memset(dst, c, n);
3030
}
@@ -54,19 +54,19 @@ void z_bss_zero(void)
5454
return;
5555
}
5656

57-
z_early_memset(__bss_start, 0, __bss_end - __bss_start);
57+
arch_early_memset(__bss_start, 0, __bss_end - __bss_start);
5858
#if DT_NODE_HAS_STATUS_OKAY(DT_CHOSEN(zephyr_ccm))
59-
z_early_memset(&__ccm_bss_start, 0,
59+
arch_early_memset(&__ccm_bss_start, 0,
6060
(uintptr_t) &__ccm_bss_end
6161
- (uintptr_t) &__ccm_bss_start);
6262
#endif
6363
#if DT_NODE_HAS_STATUS_OKAY(DT_CHOSEN(zephyr_dtcm))
64-
z_early_memset(&__dtcm_bss_start, 0,
64+
arch_early_memset(&__dtcm_bss_start, 0,
6565
(uintptr_t) &__dtcm_bss_end
6666
- (uintptr_t) &__dtcm_bss_start);
6767
#endif
6868
#if DT_NODE_HAS_STATUS_OKAY(DT_CHOSEN(zephyr_ocm))
69-
z_early_memset(&__ocm_bss_start, 0,
69+
arch_early_memset(&__ocm_bss_start, 0,
7070
(uintptr_t) &__ocm_bss_end
7171
- (uintptr_t) &__ocm_bss_start);
7272
#endif
@@ -76,11 +76,11 @@ void z_bss_zero(void)
7676
bss_zeroing_relocation();
7777
#endif /* CONFIG_CODE_DATA_RELOCATION */
7878
#ifdef CONFIG_COVERAGE_GCOV
79-
z_early_memset(&__gcov_bss_start, 0,
79+
arch_early_memset(&__gcov_bss_start, 0,
8080
((uintptr_t) &__gcov_bss_end - (uintptr_t) &__gcov_bss_start));
8181
#endif /* CONFIG_COVERAGE_GCOV */
8282
#ifdef CONFIG_NOCACHE_MEMORY
83-
z_early_memset(&_nocache_ram_start, 0,
83+
arch_early_memset(&_nocache_ram_start, 0,
8484
(uintptr_t) &_nocache_ram_end - (uintptr_t) &_nocache_ram_start);
8585
#endif
8686
}
@@ -97,7 +97,7 @@ void z_bss_zero(void)
9797
__boot_func
9898
void z_bss_zero_boot(void)
9999
{
100-
z_early_memset(&lnkr_boot_bss_start, 0,
100+
arch_early_memset(&lnkr_boot_bss_start, 0,
101101
(uintptr_t)&lnkr_boot_bss_end
102102
- (uintptr_t)&lnkr_boot_bss_start);
103103
}
@@ -119,7 +119,7 @@ __pinned_func
119119
#endif /* CONFIG_LINKER_USE_BOOT_SECTION */
120120
void z_bss_zero_pinned(void)
121121
{
122-
z_early_memset(&lnkr_pinned_bss_start, 0,
122+
arch_early_memset(&lnkr_pinned_bss_start, 0,
123123
(uintptr_t)&lnkr_pinned_bss_end
124124
- (uintptr_t)&lnkr_pinned_bss_start);
125125
}

include/zephyr/arch/common/init.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
FUNC_NORETURN void z_cstart(void);
1010

1111
/* Early boot functions */
12-
void z_early_memset(void *dst, int c, size_t n);
12+
void arch_early_memset(void *dst, int c, size_t n);
1313
void z_early_memcpy(void *dst, const void *src, size_t n);
1414

1515
void z_bss_zero(void);

scripts/build/gen_relocate_app.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -211,7 +211,7 @@ class OutputSection(NamedTuple):
211211
"""
212212

213213
MEMSET_TEMPLATE = """
214-
z_early_memset(&__{mem}_bss_reloc_start, 0,
214+
arch_early_memset(&__{mem}_bss_reloc_start, 0,
215215
(size_t) &__{mem}_bss_reloc_size);
216216
"""
217217

tests/application_development/code_relocation/src/main.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ void z_early_memcpy(void *dst, const void *src, size_t n)
5656
}
5757

5858
__boot_func
59-
void z_early_memset(void *dst, int c, size_t n)
59+
void arch_early_memset(void *dst, int c, size_t n)
6060
{
6161
/* do byte-sized initialization until word-aligned or finished */
6262

0 commit comments

Comments
 (0)