michaelh/zephyr
1
0
Fork 0
Code Releases Activity

x86: arm: rename some functions

Browse source 
z_arch_ is only for those APIs in the arch interface.
Other stuff needs to be renamed.

Signed-off-by: Andrew Boie <andrew.p.boie@intel.com>
This commit is contained in:
Andrew Boie 2019-10-16 13:38:54 -07:00 • committed by Andrew Boie
commit 55cb961878
4 changed files with 16 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

4
arch/arm/core/cortex_m/fault.c
View file

@ -164,10 +164,10 @@ static void fault_show(const z_arch_esf_t *esf, int fault)
#endif /* FAULT_DUMP == 1 */ #endif /* FAULT_DUMP == 1 */
#ifdef CONFIG_USERSPACE #ifdef CONFIG_USERSPACE
Z_EXC_DECLARE(z_arch_user_string_nlen); Z_EXC_DECLARE(z_arm_user_string_nlen);
static const struct z_exc_handle exceptions[] = { static const struct z_exc_handle exceptions[] = {
Z_EXC_HANDLE(z_arch_user_string_nlen) Z_EXC_HANDLE(z_arm_user_string_nlen)
}; };
#endif #endif

12
arch/arm/core/userspace.S
View file

@ -17,9 +17,9 @@ _ASM_FILE_PROLOGUE
GTEXT(z_arm_userspace_enter) GTEXT(z_arm_userspace_enter)
GTEXT(z_arm_do_syscall) GTEXT(z_arm_do_syscall)
GTEXT(z_arch_user_string_nlen) GTEXT(z_arch_user_string_nlen)
GTEXT(z_arch_user_string_nlen_fault_start) GTEXT(z_arm_user_string_nlen_fault_start)
GTEXT(z_arch_user_string_nlen_fault_end) GTEXT(z_arm_user_string_nlen_fault_end)
GTEXT(z_arch_user_string_nlen_fixup) GTEXT(z_arm_user_string_nlen_fixup)
GDATA(_kernel) GDATA(_kernel)
/* Imports */ /* Imports */
@ -514,11 +514,11 @@ SECTION_FUNC(TEXT, z_arch_user_string_nlen)
movs r3, #0 /* r3 is the counter */ movs r3, #0 /* r3 is the counter */
strlen_loop: strlen_loop:
z_arch_user_string_nlen_fault_start: z_arm_user_string_nlen_fault_start:
/* r0 contains the string. r5 = *(r0 + r3]). This could fault. */ /* r0 contains the string. r5 = *(r0 + r3]). This could fault. */
ldrb r5, [r0, r3] ldrb r5, [r0, r3]
z_arch_user_string_nlen_fault_end: z_arm_user_string_nlen_fault_end:
#if defined(CONFIG_ARMV6_M_ARMV8_M_BASELINE) #if defined(CONFIG_ARMV6_M_ARMV8_M_BASELINE)
cmp r5, #0 cmp r5, #0
beq strlen_done beq strlen_done
@ -539,7 +539,7 @@ strlen_done:
movs r1, #0 movs r1, #0
str r1, [sp, #4] str r1, [sp, #4]
z_arch_user_string_nlen_fixup: z_arm_user_string_nlen_fixup:
/* Write error value to err pointer parameter */ /* Write error value to err pointer parameter */
ldr r1, [sp, #4] ldr r1, [sp, #4]
str r1, [r2, #0] str r1, [r2, #0]

4
arch/x86/core/ia32/fatal.c
View file

@ -327,10 +327,10 @@ static void dump_page_fault(z_arch_esf_t *esf)
#endif /* CONFIG_EXCEPTION_DEBUG */ #endif /* CONFIG_EXCEPTION_DEBUG */
#ifdef CONFIG_USERSPACE #ifdef CONFIG_USERSPACE
Z_EXC_DECLARE(z_arch_user_string_nlen); Z_EXC_DECLARE(z_x86_user_string_nlen);
static const struct z_exc_handle exceptions[] = { static const struct z_exc_handle exceptions[] = {
Z_EXC_HANDLE(z_arch_user_string_nlen) Z_EXC_HANDLE(z_x86_user_string_nlen)
}; };
#endif #endif

12
arch/x86/core/ia32/userspace.S
View file

@ -14,9 +14,9 @@
GTEXT(z_x86_syscall_entry_stub) GTEXT(z_x86_syscall_entry_stub)
GTEXT(z_x86_userspace_enter) GTEXT(z_x86_userspace_enter)
GTEXT(z_arch_user_string_nlen) GTEXT(z_arch_user_string_nlen)
GTEXT(z_arch_user_string_nlen_fault_start) GTEXT(z_x86_user_string_nlen_fault_start)
GTEXT(z_arch_user_string_nlen_fault_end) GTEXT(z_x86_user_string_nlen_fault_end)
GTEXT(z_arch_user_string_nlen_fixup) GTEXT(z_x86_user_string_nlen_fixup)
/* Imports */ /* Imports */
GDATA(_k_syscall_table) GDATA(_k_syscall_table)
@ -270,10 +270,10 @@ SECTION_FUNC(TEXT, z_arch_user_string_nlen)
/* This code might page fault */ /* This code might page fault */
strlen_loop: strlen_loop:
z_arch_user_string_nlen_fault_start: z_x86_user_string_nlen_fault_start:
cmpb $0x0, (%edx, %eax, 1) /* *(EDX + EAX) == 0? Could fault. */ cmpb $0x0, (%edx, %eax, 1) /* *(EDX + EAX) == 0? Could fault. */
z_arch_user_string_nlen_fault_end: z_x86_user_string_nlen_fault_end:
je strlen_done je strlen_done
cmp 0xc(%ebp), %eax /* Max length reached? */ cmp 0xc(%ebp), %eax /* Max length reached? */
je strlen_done je strlen_done
@ -284,7 +284,7 @@ strlen_done:
/* Set error value to 0 since we succeeded */ /* Set error value to 0 since we succeeded */
movl $0, -4(%ebp) movl $0, -4(%ebp)
z_arch_user_string_nlen_fixup: z_x86_user_string_nlen_fixup:
/* Write error value to err pointer parameter */ /* Write error value to err pointer parameter */
movl 0x10(%ebp), %ecx movl 0x10(%ebp), %ecx
pop %edx pop %edx