Google Git
Sign in
pigweed/third_party/github/zephyrproject-rtos/zephyr/efe30749de24b0778cdcf0fcb2b9a313aa43f5e1^!/.
commit
efe30749de24b0778cdcf0fcb2b9a313aa43f5e1
[log]
author
Daniel Leung <daniel.leung@intel.com>
Fri Mar 22 13:27:56 2024 -0700
committer
Anas Nashif <anas.nashif@intel.com>
Wed Mar 27 19:27:10 2024 -0400
tree
e39d5fa8d47f2ed47227090662782df8d23a78db
parent
b69d2486fee67e932c59ccb81ebd191972e77d0b [diff]
kernel: rename Z_THREAD_STACK_BUFFER to K_THREAD_STACK_BUFFER

Simple rename to align the kernel naming scheme. This is being
used throughout the tree, especially in the architecture code.
As this is not a private API internal to kernel, prefix it
appropriately with K_.

Signed-off-by: Daniel Leung <daniel.leung@intel.com>

diff --git a/arch/arc/core/thread.c b/arch/arc/core/thread.c
index fd3f86c..1c85a41 100644
--- a/arch/arc/core/thread.c
+++ b/arch/arc/core/thread.c

@@ -286,7 +286,7 @@
 	_kernel.cpus[0].irq_stack = (K_KERNEL_STACK_BUFFER(z_interrupt_stacks[0]) +
 				     K_KERNEL_STACK_SIZEOF(z_interrupt_stacks[0]));
 
-	void *main_stack = (Z_THREAD_STACK_BUFFER(z_main_stack) +
+	void *main_stack = (K_THREAD_STACK_BUFFER(z_main_stack) +
 			    K_THREAD_STACK_SIZEOF(z_main_stack));
 
 	arch_irq_unlock(_ARC_V2_INIT_IRQ_LOCK_KEY);

diff --git a/arch/arm/core/cortex_a_r/thread.c b/arch/arm/core/cortex_a_r/thread.c
index e134fa7..d5ccab7 100644
--- a/arch/arm/core/cortex_a_r/thread.c
+++ b/arch/arm/core/cortex_a_r/thread.c

@@ -361,7 +361,7 @@
 			guard_len,
 			fault_addr, psp)) {
 		/* Thread stack corruption */
-		return (uint32_t)Z_THREAD_STACK_BUFFER(z_main_stack);
+		return (uint32_t)K_THREAD_STACK_BUFFER(z_main_stack);
 	}
 #endif
 #endif /* CONFIG_USERSPACE */

diff --git a/arch/arm/core/cortex_m/thread.c b/arch/arm/core/cortex_m/thread.c
index 1eb8df9..980f355 100644
--- a/arch/arm/core/cortex_m/thread.c
+++ b/arch/arm/core/cortex_m/thread.c

@@ -439,7 +439,7 @@
 			guard_len,
 			fault_addr, psp)) {
 		/* Thread stack corruption */
-		return (uint32_t)Z_THREAD_STACK_BUFFER(z_main_stack);
+		return (uint32_t)K_THREAD_STACK_BUFFER(z_main_stack);
 	}
 #endif
 #endif /* CONFIG_USERSPACE */
@@ -595,11 +595,11 @@
 	z_arm_prepare_switch_to_main();
 
 	/* Set PSP to the highest address of the main stack. */
-	char *psp =	Z_THREAD_STACK_BUFFER(z_main_stack) +
+	char *psp =	K_THREAD_STACK_BUFFER(z_main_stack) +
 		K_THREAD_STACK_SIZEOF(z_main_stack);
 
 #if defined(CONFIG_BUILTIN_STACK_GUARD)
-	char *psplim = (Z_THREAD_STACK_BUFFER(z_main_stack));
+	char *psplim = (K_THREAD_STACK_BUFFER(z_main_stack));
 	/* Clear PSPLIM before setting it to guard the main stack area. */
 	__set_PSPLIM(0);
 #endif

diff --git a/arch/riscv/core/thread.c b/arch/riscv/core/thread.c
index 20ef9f4..38d5dbd 100644
--- a/arch/riscv/core/thread.c
+++ b/arch/riscv/core/thread.c

@@ -209,7 +209,7 @@
 	_kernel.cpus[0].irq_stack = (K_KERNEL_STACK_BUFFER(z_interrupt_stacks[0]) +
 				     K_KERNEL_STACK_SIZEOF(z_interrupt_stacks[0]));
 
-	main_stack = (Z_THREAD_STACK_BUFFER(z_main_stack) +
+	main_stack = (K_THREAD_STACK_BUFFER(z_main_stack) +
 		      K_THREAD_STACK_SIZEOF(z_main_stack));
 
 	__asm__ volatile (

diff --git a/include/zephyr/kernel/thread_stack.h b/include/zephyr/kernel/thread_stack.h
index 941df22..7f0ec60 100644
--- a/include/zephyr/kernel/thread_stack.h
+++ b/include/zephyr/kernel/thread_stack.h

@@ -294,7 +294,7 @@
 #define K_THREAD_STACK_DEFINE		K_KERNEL_STACK_DEFINE
 #define K_THREAD_STACK_ARRAY_DEFINE	K_KERNEL_STACK_ARRAY_DEFINE
 #define K_THREAD_STACK_MEMBER		K_KERNEL_STACK_MEMBER
-#define Z_THREAD_STACK_BUFFER		K_KERNEL_STACK_BUFFER
+#define K_THREAD_STACK_BUFFER		K_KERNEL_STACK_BUFFER
 #define K_THREAD_STACK_DECLARE		K_KERNEL_STACK_DECLARE
 #define K_THREAD_STACK_ARRAY_DECLARE	K_KERNEL_STACK_ARRAY_DECLARE
 #define K_THREAD_PINNED_STACK_DEFINE	K_KERNEL_PINNED_STACK_DEFINE
@@ -650,7 +650,7 @@
  * @param sym defined stack symbol name
  * @return The buffer itself, a char *
  */
-static inline char *Z_THREAD_STACK_BUFFER(k_thread_stack_t *sym)
+static inline char *K_THREAD_STACK_BUFFER(k_thread_stack_t *sym)
 {
 	return (char *)sym + K_THREAD_STACK_RESERVED;
 }

diff --git a/kernel/thread.c b/kernel/thread.c
index ac76e44..8e3739e 100644
--- a/kernel/thread.c
+++ b/kernel/thread.c

@@ -385,7 +385,7 @@
 #ifdef CONFIG_USERSPACE
 	if (z_stack_is_user_capable(stack)) {
 		stack_obj_size = Z_THREAD_STACK_SIZE_ADJUST(stack_size);
-		stack_buf_start = Z_THREAD_STACK_BUFFER(stack);
+		stack_buf_start = K_THREAD_STACK_BUFFER(stack);
 		stack_buf_size = stack_obj_size - K_THREAD_STACK_RESERVED;
 	} else
 #endif /* CONFIG_USERSPACE */

diff --git a/tests/arch/arm/arm_no_multithreading/src/main.c b/tests/arch/arm/arm_no_multithreading/src/main.c
index d525470..a1b5c67 100644
--- a/tests/arch/arm/arm_no_multithreading/src/main.c
+++ b/tests/arch/arm/arm_no_multithreading/src/main.c

@@ -59,8 +59,8 @@
 	printk("ARM no-multithreading test\n");
 
 	uint32_t psp = (uint32_t)__get_PSP();
-	uint32_t main_stack_base = (uint32_t)Z_THREAD_STACK_BUFFER(z_main_stack);
-	uint32_t main_stack_top = (uint32_t)(Z_THREAD_STACK_BUFFER(z_main_stack) +
+	uint32_t main_stack_base = (uint32_t)K_THREAD_STACK_BUFFER(z_main_stack);
+	uint32_t main_stack_top = (uint32_t)(K_THREAD_STACK_BUFFER(z_main_stack) +
 		K_THREAD_STACK_SIZEOF(z_main_stack));
 
 	__ASSERT(

diff --git a/tests/kernel/threads/thread_stack/src/main.c b/tests/kernel/threads/thread_stack/src/main.c
index 272cad3..64651da 100644
--- a/tests/kernel/threads/thread_stack/src/main.c
+++ b/tests/kernel/threads/thread_stack/src/main.c

@@ -114,7 +114,7 @@
 #ifdef CONFIG_USERSPACE
 	if (scenario_data.is_user) {
 		reserved = K_THREAD_STACK_RESERVED;
-		stack_buf = Z_THREAD_STACK_BUFFER(stack_obj);
+		stack_buf = K_THREAD_STACK_BUFFER(stack_obj);
 		/* always use the original size here */
 		alignment = Z_THREAD_STACK_OBJ_ALIGN(STEST_STACKSIZE);
 	} else