Skip to content

Commit 522c5aa

Browse files
alpsayinalpsayin
committed
zephyr-3.7 migration: deprecate z_arch_esf_t
Follows 3998e18 #73593 Signed-off-by: Alp Sayin <[email protected]>
1 parent 5bf240b commit 522c5aa

File tree

10 files changed

+51
-53
lines changed

10 files changed

+51
-53
lines changed

‎arch/microblaze/core/exception.S‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@
2828
_exception_handler_entry:
2929

3030
/* Make room for the context on the stack. */
31-
STACK_ALLOC(__z_arch_esf_t_SIZEOF)
31+
STACK_ALLOC(__struct_arch_esf_SIZEOF)
3232
ASSERT_GT_ZERO(r1, _asm_stack_failed)
3333

3434
/* Take a copy of the stack pointer at the moment w/ context stored,

‎arch/microblaze/core/fatal.c‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -139,13 +139,13 @@ FUNC_NORETURN void _Fault(uint32_t esr, uint32_t ear, uint32_t edr)
139139
*/
140140

141141
__ASSERT_NO_MSG(stack_pointer_on_exception_entry);
142-
z_arch_esf_t *sp_ptr = (z_arch_esf_t *)stack_pointer_on_exception_entry;
142+
struct arch_esf *sp_ptr = (struct arch_esf *)stack_pointer_on_exception_entry;
143143

144144
/* Obtain the values of registers that were stacked prior to this function
145145
* being called, and may have changed since they were stacked.
146146
*/
147147
microblaze_register_dump.esf = *sp_ptr;
148-
microblaze_register_dump.esf.r1 = ((uint32_t)sp_ptr) + sizeof(z_arch_esf_t);
148+
microblaze_register_dump.esf.r1 = ((uint32_t)sp_ptr) + sizeof(struct arch_esf);
149149
microblaze_register_dump.esr = esr;
150150
microblaze_register_dump.ear = ear;
151151
microblaze_register_dump.edr = edr;

‎arch/microblaze/core/isr.S‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
.global _interrupt_handler
2020

2121
/* The context is oversized to allow functions called from the ISR to write
22-
* back into the caller stack. The size is defined as __z_arch_esf_t_SIZEOF in offsets.c
22+
* back into the caller stack. The size is defined as __struct_arch_esf_SIZEOF in offsets.c
2323
*/
2424

2525
/* Offsets from the stack pointer at which saved registers are placed.
@@ -31,7 +31,7 @@
3131

3232
_interrupt_handler:
3333
/* Make room for the context on the stack. */
34-
STACK_ALLOC(__z_arch_esf_t_SIZEOF)
34+
STACK_ALLOC(__struct_arch_esf_SIZEOF)
3535
ASSERT_GT_ZERO(r1, _asm_stack_failed)
3636

3737
PUSH_CONTEXT_TO_STACK(r31)
@@ -229,4 +229,4 @@ _isr_interrupt_exit:
229229
/* Put the stack pointer back where it was when we entered
230230
* exception state i.e. remove the stack frame.
231231
*/
232-
STACK_FREE(__z_arch_esf_t_SIZEOF)
232+
STACK_FREE(__struct_arch_esf_SIZEOF)

‎arch/microblaze/core/offsets/offsets.c‎

Lines changed: 35 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -15,43 +15,43 @@ GEN_OFFSET_SYM(_callee_saved_t, key);
1515
GEN_OFFSET_SYM(_callee_saved_t, retval);
1616
GEN_OFFSET_SYM(_callee_saved_t, preempted);
1717

18-
GEN_OFFSET_SYM(z_arch_esf_t, r31);
19-
GEN_OFFSET_SYM(z_arch_esf_t, r30);
20-
GEN_OFFSET_SYM(z_arch_esf_t, r29);
21-
GEN_OFFSET_SYM(z_arch_esf_t, r28);
22-
GEN_OFFSET_SYM(z_arch_esf_t, r27);
23-
GEN_OFFSET_SYM(z_arch_esf_t, r26);
24-
GEN_OFFSET_SYM(z_arch_esf_t, r25);
25-
GEN_OFFSET_SYM(z_arch_esf_t, r24);
26-
GEN_OFFSET_SYM(z_arch_esf_t, r23);
27-
GEN_OFFSET_SYM(z_arch_esf_t, r22);
28-
GEN_OFFSET_SYM(z_arch_esf_t, r21);
29-
GEN_OFFSET_SYM(z_arch_esf_t, r20);
30-
GEN_OFFSET_SYM(z_arch_esf_t, r19);
31-
GEN_OFFSET_SYM(z_arch_esf_t, r18);
32-
GEN_OFFSET_SYM(z_arch_esf_t, r17);
33-
GEN_OFFSET_SYM(z_arch_esf_t, r16);
34-
GEN_OFFSET_SYM(z_arch_esf_t, r15);
35-
GEN_OFFSET_SYM(z_arch_esf_t, r14);
36-
GEN_OFFSET_SYM(z_arch_esf_t, r13);
37-
GEN_OFFSET_SYM(z_arch_esf_t, r12);
38-
GEN_OFFSET_SYM(z_arch_esf_t, r11);
39-
GEN_OFFSET_SYM(z_arch_esf_t, r10);
40-
GEN_OFFSET_SYM(z_arch_esf_t, r11);
41-
GEN_OFFSET_SYM(z_arch_esf_t, r10);
42-
GEN_OFFSET_SYM(z_arch_esf_t, r9);
43-
GEN_OFFSET_SYM(z_arch_esf_t, r8);
44-
GEN_OFFSET_SYM(z_arch_esf_t, r7);
45-
GEN_OFFSET_SYM(z_arch_esf_t, r6);
46-
GEN_OFFSET_SYM(z_arch_esf_t, r5);
47-
GEN_OFFSET_SYM(z_arch_esf_t, r4);
48-
GEN_OFFSET_SYM(z_arch_esf_t, r3);
49-
GEN_OFFSET_SYM(z_arch_esf_t, r2);
50-
GEN_OFFSET_SYM(z_arch_esf_t, msr);
18+
GEN_OFFSET_STRUCT(arch_esf, r31);
19+
GEN_OFFSET_STRUCT(arch_esf, r30);
20+
GEN_OFFSET_STRUCT(arch_esf, r29);
21+
GEN_OFFSET_STRUCT(arch_esf, r28);
22+
GEN_OFFSET_STRUCT(arch_esf, r27);
23+
GEN_OFFSET_STRUCT(arch_esf, r26);
24+
GEN_OFFSET_STRUCT(arch_esf, r25);
25+
GEN_OFFSET_STRUCT(arch_esf, r24);
26+
GEN_OFFSET_STRUCT(arch_esf, r23);
27+
GEN_OFFSET_STRUCT(arch_esf, r22);
28+
GEN_OFFSET_STRUCT(arch_esf, r21);
29+
GEN_OFFSET_STRUCT(arch_esf, r20);
30+
GEN_OFFSET_STRUCT(arch_esf, r19);
31+
GEN_OFFSET_STRUCT(arch_esf, r18);
32+
GEN_OFFSET_STRUCT(arch_esf, r17);
33+
GEN_OFFSET_STRUCT(arch_esf, r16);
34+
GEN_OFFSET_STRUCT(arch_esf, r15);
35+
GEN_OFFSET_STRUCT(arch_esf, r14);
36+
GEN_OFFSET_STRUCT(arch_esf, r13);
37+
GEN_OFFSET_STRUCT(arch_esf, r12);
38+
GEN_OFFSET_STRUCT(arch_esf, r11);
39+
GEN_OFFSET_STRUCT(arch_esf, r10);
40+
GEN_OFFSET_STRUCT(arch_esf, r11);
41+
GEN_OFFSET_STRUCT(arch_esf, r10);
42+
GEN_OFFSET_STRUCT(arch_esf, r9);
43+
GEN_OFFSET_STRUCT(arch_esf, r8);
44+
GEN_OFFSET_STRUCT(arch_esf, r7);
45+
GEN_OFFSET_STRUCT(arch_esf, r6);
46+
GEN_OFFSET_STRUCT(arch_esf, r5);
47+
GEN_OFFSET_STRUCT(arch_esf, r4);
48+
GEN_OFFSET_STRUCT(arch_esf, r3);
49+
GEN_OFFSET_STRUCT(arch_esf, r2);
50+
GEN_OFFSET_STRUCT(arch_esf, msr);
5151
#if defined(CONFIG_MICROBLAZE_USE_HARDWARE_FLOAT_INSTR)
52-
GEN_OFFSET_SYM(z_arch_esf_t, fsr);
52+
GEN_OFFSET_STRUCT(arch_esf, fsr);
5353
#endif
5454

55-
GEN_ABSOLUTE_SYM(__z_arch_esf_t_SIZEOF, STACK_ROUND_UP(sizeof(z_arch_esf_t)));
55+
GEN_ABSOLUTE_SYM(__struct_arch_esf_SIZEOF, STACK_ROUND_UP(sizeof(struct arch_esf)));
5656

5757
GEN_ABS_SYM_END

‎arch/microblaze/core/swap.S‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@
2828
SECTION_FUNC(exception.other, arch_swap)
2929

3030
/* Make room for the context on the stack. */
31-
STACK_ALLOC(__z_arch_esf_t_SIZEOF)
31+
STACK_ALLOC(__struct_arch_esf_SIZEOF)
3232
ASSERT_GT_ZERO(r1, _asm_stack_failed)
3333

3434
/* Populate default return value */
@@ -200,7 +200,7 @@ _arch_swap_check_key:
200200

201201
_arch_swap_unlock_irq:
202202
POP_CONTEXT_FROM_STACK(TEMP_DATA_REG)
203-
STACK_FREE(__z_arch_esf_t_SIZEOF)
203+
STACK_FREE(__struct_arch_esf_SIZEOF)
204204
/* BEGIN microblaze_enable_interrupts() */
205205
#if CONFIG_MICROBLAZE_USE_MSR_INSTR == 1
206206
/* r10 was being used as a temporary. Now restore its true value from the stack. */
@@ -225,4 +225,4 @@ _arch_swap_exit:
225225
/* r10 was being used as a temporary. Now restore its true value from the stack. */
226226
POP_CONTEXT_FROM_STACK(TEMP_DATA_REG)
227227
rtsd r14, 0
228-
STACK_FREE(__z_arch_esf_t_SIZEOF)
228+
STACK_FREE(__struct_arch_esf_SIZEOF)

‎arch/microblaze/core/thread.c‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,11 +14,11 @@ void z_thread_entry(k_thread_entry_t thread, void *arg1, void *arg2, void *arg3)
1414
void arch_new_thread(struct k_thread *thread, k_thread_stack_t *stack, char *stack_ptr,
1515
k_thread_entry_t entry, void *arg1, void *arg2, void *arg3)
1616
{
17-
struct __esf *stack_init;
17+
struct arch_esf *stack_init;
1818

1919
/* Initial stack frame for thread */
2020
stack_init =
21-
(struct __esf *)Z_STACK_PTR_ALIGN(Z_STACK_PTR_TO_FRAME(struct __esf, stack_ptr));
21+
(struct arch_esf *)Z_STACK_PTR_ALIGN(Z_STACK_PTR_TO_FRAME(struct arch_esf, stack_ptr));
2222

2323
/* Setup the initial stack frame */
2424
stack_init->r5 = (uint32_t)entry;

‎arch/microblaze/include/kernel_arch_func.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ static ALWAYS_INLINE void arch_thread_return_value_set(struct k_thread *thread,
3333
thread->callee_saved.retval = value;
3434
}
3535

36-
FUNC_NORETURN void z_microblaze_fatal_error(unsigned int reason, const z_arch_esf_t *esf);
36+
FUNC_NORETURN void z_microblaze_fatal_error(unsigned int reason, const struct arch_esf *esf);
3737

3838
static inline bool arch_is_in_isr(void)
3939
{

‎arch/microblaze/include/microblaze/microblaze_regs.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
#define MSR_BIP_BIT (31 - 28)
2525
#define MSR_BIP_MASK (1 << MSR_BIP_BIT)
2626

27-
#define ESF_OFFSET(rx) __z_arch_esf_t_##rx##_OFFSET
27+
#define ESF_OFFSET(rx) __struct_arch_esf_##rx##_OFFSET
2828

2929
#define XIL_EXCEPTION_ID_FIRST 0U
3030
#define XIL_EXCEPTION_ID_FSL 0U

‎include/zephyr/arch/microblaze/arch.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
#define ZEPHYR_INCLUDE_ARCH_MICROBLAZE_ARCH_H_
1212

1313
#include <zephyr/arch/common/ffs.h>
14-
#include <zephyr/arch/microblaze/exp.h>
14+
#include <zephyr/arch/microblaze/exception.h>
1515
#include <zephyr/arch/microblaze/sys_bitops.h>
1616
#include <zephyr/arch/microblaze/sys_io.h>
1717
#include <zephyr/arch/microblaze/thread.h>

‎include/zephyr/arch/microblaze/exp.h‎ renamed to ‎include/zephyr/arch/microblaze/exception.h‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
extern "C" {
1919
#endif
2020

21-
struct __esf {
21+
struct arch_esf {
2222

2323
uint32_t r31; /* Must be saved across function calls. Callee-save. */
2424
uint32_t r30; /* Must be saved across function calls. Callee-save. */
@@ -62,12 +62,10 @@ struct __esf {
6262
#endif
6363
};
6464

65-
typedef struct __esf z_arch_esf_t;
66-
6765
typedef struct __microblaze_register_dump {
6866

6967
_callee_saved_t callee_saved;
70-
z_arch_esf_t esf;
68+
struct arch_esf esf;
7169

7270
/* Other SFRs */
7371
uint32_t pc;

0 commit comments

Comments
 (0)