Skip to content

Commit 6a3cb93

Browse files
ycsinMaureenHelm
ycsin
authored and
MaureenHelm
committed
arch: remove the use of z_arch_esf_t completely from internal
Created `GEN_OFFSET_STRUCT` & `GEN_NAMED_OFFSET_STRUCT` that works for `struct`, and remove the use of `z_arch_esf_t` completely. Signed-off-by: Yong Cong Sin <[email protected]>
1 parent e54b27b commit 6a3cb93

File tree

12 files changed

+195
-190
lines changed

12 files changed

+195
-190
lines changed

‎arch/mips/core/isr.S‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
#include <mips/regdef.h>
1515
#include <mips/mipsregs.h>
1616

17-
#define ESF_O(FIELD) __z_arch_esf_t_##FIELD##_OFFSET
17+
#define ESF_O(FIELD) __struct_arch_esf_##FIELD##_OFFSET
1818
#define THREAD_O(FIELD) _thread_offset_to_##FIELD
1919

2020
/* Convenience macros for loading/storing register states. */
@@ -58,12 +58,12 @@
5858
op v1, ESF_O(v1)(sp) ;
5959

6060
#define STORE_CALLER_SAVED() \
61-
addi sp, sp, -__z_arch_esf_t_SIZEOF ;\
61+
addi sp, sp, -__struct_arch_esf_SIZEOF ;\
6262
DO_CALLER_SAVED(OP_STOREREG) ;
6363

6464
#define LOAD_CALLER_SAVED() \
6565
DO_CALLER_SAVED(OP_LOADREG) ;\
66-
addi sp, sp, __z_arch_esf_t_SIZEOF ;
66+
addi sp, sp, __struct_arch_esf_SIZEOF ;
6767

6868
/* imports */
6969
GTEXT(_Fault)

‎arch/mips/core/offsets/offsets.c‎

Lines changed: 26 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -23,32 +23,32 @@ GEN_OFFSET_SYM(_callee_saved_t, s6);
2323
GEN_OFFSET_SYM(_callee_saved_t, s7);
2424
GEN_OFFSET_SYM(_callee_saved_t, s8);
2525

26-
GEN_OFFSET_SYM(z_arch_esf_t, ra);
27-
GEN_OFFSET_SYM(z_arch_esf_t, gp);
28-
GEN_OFFSET_SYM(z_arch_esf_t, t0);
29-
GEN_OFFSET_SYM(z_arch_esf_t, t1);
30-
GEN_OFFSET_SYM(z_arch_esf_t, t2);
31-
GEN_OFFSET_SYM(z_arch_esf_t, t3);
32-
GEN_OFFSET_SYM(z_arch_esf_t, t4);
33-
GEN_OFFSET_SYM(z_arch_esf_t, t5);
34-
GEN_OFFSET_SYM(z_arch_esf_t, t6);
35-
GEN_OFFSET_SYM(z_arch_esf_t, t7);
36-
GEN_OFFSET_SYM(z_arch_esf_t, t8);
37-
GEN_OFFSET_SYM(z_arch_esf_t, t9);
38-
GEN_OFFSET_SYM(z_arch_esf_t, a0);
39-
GEN_OFFSET_SYM(z_arch_esf_t, a1);
40-
GEN_OFFSET_SYM(z_arch_esf_t, a2);
41-
GEN_OFFSET_SYM(z_arch_esf_t, a3);
42-
GEN_OFFSET_SYM(z_arch_esf_t, v0);
43-
GEN_OFFSET_SYM(z_arch_esf_t, v1);
44-
GEN_OFFSET_SYM(z_arch_esf_t, at);
45-
GEN_OFFSET_SYM(z_arch_esf_t, epc);
46-
GEN_OFFSET_SYM(z_arch_esf_t, badvaddr);
47-
GEN_OFFSET_SYM(z_arch_esf_t, hi);
48-
GEN_OFFSET_SYM(z_arch_esf_t, lo);
49-
GEN_OFFSET_SYM(z_arch_esf_t, status);
50-
GEN_OFFSET_SYM(z_arch_esf_t, cause);
26+
GEN_OFFSET_STRUCT(arch_esf, ra);
27+
GEN_OFFSET_STRUCT(arch_esf, gp);
28+
GEN_OFFSET_STRUCT(arch_esf, t0);
29+
GEN_OFFSET_STRUCT(arch_esf, t1);
30+
GEN_OFFSET_STRUCT(arch_esf, t2);
31+
GEN_OFFSET_STRUCT(arch_esf, t3);
32+
GEN_OFFSET_STRUCT(arch_esf, t4);
33+
GEN_OFFSET_STRUCT(arch_esf, t5);
34+
GEN_OFFSET_STRUCT(arch_esf, t6);
35+
GEN_OFFSET_STRUCT(arch_esf, t7);
36+
GEN_OFFSET_STRUCT(arch_esf, t8);
37+
GEN_OFFSET_STRUCT(arch_esf, t9);
38+
GEN_OFFSET_STRUCT(arch_esf, a0);
39+
GEN_OFFSET_STRUCT(arch_esf, a1);
40+
GEN_OFFSET_STRUCT(arch_esf, a2);
41+
GEN_OFFSET_STRUCT(arch_esf, a3);
42+
GEN_OFFSET_STRUCT(arch_esf, v0);
43+
GEN_OFFSET_STRUCT(arch_esf, v1);
44+
GEN_OFFSET_STRUCT(arch_esf, at);
45+
GEN_OFFSET_STRUCT(arch_esf, epc);
46+
GEN_OFFSET_STRUCT(arch_esf, badvaddr);
47+
GEN_OFFSET_STRUCT(arch_esf, hi);
48+
GEN_OFFSET_STRUCT(arch_esf, lo);
49+
GEN_OFFSET_STRUCT(arch_esf, status);
50+
GEN_OFFSET_STRUCT(arch_esf, cause);
5151

52-
GEN_ABSOLUTE_SYM(__z_arch_esf_t_SIZEOF, STACK_ROUND_UP(sizeof(z_arch_esf_t)));
52+
GEN_ABSOLUTE_SYM(__struct_arch_esf_SIZEOF, STACK_ROUND_UP(sizeof(struct arch_esf)));
5353

5454
GEN_ABS_SYM_END

‎arch/nios2/core/exception.S‎

Lines changed: 39 additions & 39 deletions
Original file line numberDiff line numberDiff line change
@@ -35,35 +35,35 @@ GTEXT(_offload_routine)
3535
*/
3636
SECTION_FUNC(exception.entry, _exception)
3737
/* Reserve thread stack space for saving context */
38-
subi sp, sp, __z_arch_esf_t_SIZEOF
38+
subi sp, sp, __struct_arch_esf_SIZEOF
3939

4040
/* Preserve all caller-saved registers onto the thread's stack */
41-
stw ra, __z_arch_esf_t_ra_OFFSET(sp)
42-
stw r1, __z_arch_esf_t_r1_OFFSET(sp)
43-
stw r2, __z_arch_esf_t_r2_OFFSET(sp)
44-
stw r3, __z_arch_esf_t_r3_OFFSET(sp)
45-
stw r4, __z_arch_esf_t_r4_OFFSET(sp)
46-
stw r5, __z_arch_esf_t_r5_OFFSET(sp)
47-
stw r6, __z_arch_esf_t_r6_OFFSET(sp)
48-
stw r7, __z_arch_esf_t_r7_OFFSET(sp)
49-
stw r8, __z_arch_esf_t_r8_OFFSET(sp)
50-
stw r9, __z_arch_esf_t_r9_OFFSET(sp)
51-
stw r10, __z_arch_esf_t_r10_OFFSET(sp)
52-
stw r11, __z_arch_esf_t_r11_OFFSET(sp)
53-
stw r12, __z_arch_esf_t_r12_OFFSET(sp)
54-
stw r13, __z_arch_esf_t_r13_OFFSET(sp)
55-
stw r14, __z_arch_esf_t_r14_OFFSET(sp)
56-
stw r15, __z_arch_esf_t_r15_OFFSET(sp)
41+
stw ra, __struct_arch_esf_ra_OFFSET(sp)
42+
stw r1, __struct_arch_esf_r1_OFFSET(sp)
43+
stw r2, __struct_arch_esf_r2_OFFSET(sp)
44+
stw r3, __struct_arch_esf_r3_OFFSET(sp)
45+
stw r4, __struct_arch_esf_r4_OFFSET(sp)
46+
stw r5, __struct_arch_esf_r5_OFFSET(sp)
47+
stw r6, __struct_arch_esf_r6_OFFSET(sp)
48+
stw r7, __struct_arch_esf_r7_OFFSET(sp)
49+
stw r8, __struct_arch_esf_r8_OFFSET(sp)
50+
stw r9, __struct_arch_esf_r9_OFFSET(sp)
51+
stw r10, __struct_arch_esf_r10_OFFSET(sp)
52+
stw r11, __struct_arch_esf_r11_OFFSET(sp)
53+
stw r12, __struct_arch_esf_r12_OFFSET(sp)
54+
stw r13, __struct_arch_esf_r13_OFFSET(sp)
55+
stw r14, __struct_arch_esf_r14_OFFSET(sp)
56+
stw r15, __struct_arch_esf_r15_OFFSET(sp)
5757

5858
/* Store value of estatus control register */
5959
rdctl et, estatus
60-
stw et, __z_arch_esf_t_estatus_OFFSET(sp)
60+
stw et, __struct_arch_esf_estatus_OFFSET(sp)
6161

6262
/* ea-4 is the address of the instruction when the exception happened,
6363
* put this in the stack frame as well
6464
*/
6565
addi r15, ea, -4
66-
stw r15, __z_arch_esf_t_instr_OFFSET(sp)
66+
stw r15, __struct_arch_esf_instr_OFFSET(sp)
6767

6868
/* Figure out whether we are here because of an interrupt or an
6969
* exception. If an interrupt, switch stacks and enter IRQ handling
@@ -157,7 +157,7 @@ not_interrupt:
157157
*
158158
* We earlier put ea - 4 in the stack frame, replace it with just ea
159159
*/
160-
stw ea, __z_arch_esf_t_instr_OFFSET(sp)
160+
stw ea, __struct_arch_esf_instr_OFFSET(sp)
161161

162162
#ifdef CONFIG_IRQ_OFFLOAD
163163
/* Check the contents of _offload_routine. If non-NULL, jump into
@@ -193,35 +193,35 @@ _exception_exit:
193193
* and return to the interrupted context */
194194

195195
/* Return address from the exception */
196-
ldw ea, __z_arch_esf_t_instr_OFFSET(sp)
196+
ldw ea, __struct_arch_esf_instr_OFFSET(sp)
197197

198198
/* Restore estatus
199199
* XXX is this right??? */
200-
ldw r5, __z_arch_esf_t_estatus_OFFSET(sp)
200+
ldw r5, __struct_arch_esf_estatus_OFFSET(sp)
201201
wrctl estatus, r5
202202

203203
/* Restore caller-saved registers */
204-
ldw ra, __z_arch_esf_t_ra_OFFSET(sp)
205-
ldw r1, __z_arch_esf_t_r1_OFFSET(sp)
206-
ldw r2, __z_arch_esf_t_r2_OFFSET(sp)
207-
ldw r3, __z_arch_esf_t_r3_OFFSET(sp)
208-
ldw r4, __z_arch_esf_t_r4_OFFSET(sp)
209-
ldw r5, __z_arch_esf_t_r5_OFFSET(sp)
210-
ldw r6, __z_arch_esf_t_r6_OFFSET(sp)
211-
ldw r7, __z_arch_esf_t_r7_OFFSET(sp)
212-
ldw r8, __z_arch_esf_t_r8_OFFSET(sp)
213-
ldw r9, __z_arch_esf_t_r9_OFFSET(sp)
214-
ldw r10, __z_arch_esf_t_r10_OFFSET(sp)
215-
ldw r11, __z_arch_esf_t_r11_OFFSET(sp)
216-
ldw r12, __z_arch_esf_t_r12_OFFSET(sp)
217-
ldw r13, __z_arch_esf_t_r13_OFFSET(sp)
218-
ldw r14, __z_arch_esf_t_r14_OFFSET(sp)
219-
ldw r15, __z_arch_esf_t_r15_OFFSET(sp)
204+
ldw ra, __struct_arch_esf_ra_OFFSET(sp)
205+
ldw r1, __struct_arch_esf_r1_OFFSET(sp)
206+
ldw r2, __struct_arch_esf_r2_OFFSET(sp)
207+
ldw r3, __struct_arch_esf_r3_OFFSET(sp)
208+
ldw r4, __struct_arch_esf_r4_OFFSET(sp)
209+
ldw r5, __struct_arch_esf_r5_OFFSET(sp)
210+
ldw r6, __struct_arch_esf_r6_OFFSET(sp)
211+
ldw r7, __struct_arch_esf_r7_OFFSET(sp)
212+
ldw r8, __struct_arch_esf_r8_OFFSET(sp)
213+
ldw r9, __struct_arch_esf_r9_OFFSET(sp)
214+
ldw r10, __struct_arch_esf_r10_OFFSET(sp)
215+
ldw r11, __struct_arch_esf_r11_OFFSET(sp)
216+
ldw r12, __struct_arch_esf_r12_OFFSET(sp)
217+
ldw r13, __struct_arch_esf_r13_OFFSET(sp)
218+
ldw r14, __struct_arch_esf_r14_OFFSET(sp)
219+
ldw r15, __struct_arch_esf_r15_OFFSET(sp)
220220

221221
/* Put the stack pointer back where it was when we entered
222222
* exception state
223223
*/
224-
addi sp, sp, __z_arch_esf_t_SIZEOF
224+
addi sp, sp, __struct_arch_esf_SIZEOF
225225

226226
/* All done, copy estatus into status and transfer to ea */
227227
eret

‎arch/nios2/core/offsets/offsets.c‎

Lines changed: 19 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -44,24 +44,24 @@ GEN_OFFSET_SYM(_callee_saved_t, sp);
4444
GEN_OFFSET_SYM(_callee_saved_t, key);
4545
GEN_OFFSET_SYM(_callee_saved_t, retval);
4646

47-
GEN_OFFSET_SYM(z_arch_esf_t, ra);
48-
GEN_OFFSET_SYM(z_arch_esf_t, r1);
49-
GEN_OFFSET_SYM(z_arch_esf_t, r2);
50-
GEN_OFFSET_SYM(z_arch_esf_t, r3);
51-
GEN_OFFSET_SYM(z_arch_esf_t, r4);
52-
GEN_OFFSET_SYM(z_arch_esf_t, r5);
53-
GEN_OFFSET_SYM(z_arch_esf_t, r6);
54-
GEN_OFFSET_SYM(z_arch_esf_t, r7);
55-
GEN_OFFSET_SYM(z_arch_esf_t, r8);
56-
GEN_OFFSET_SYM(z_arch_esf_t, r9);
57-
GEN_OFFSET_SYM(z_arch_esf_t, r10);
58-
GEN_OFFSET_SYM(z_arch_esf_t, r11);
59-
GEN_OFFSET_SYM(z_arch_esf_t, r12);
60-
GEN_OFFSET_SYM(z_arch_esf_t, r13);
61-
GEN_OFFSET_SYM(z_arch_esf_t, r14);
62-
GEN_OFFSET_SYM(z_arch_esf_t, r15);
63-
GEN_OFFSET_SYM(z_arch_esf_t, estatus);
64-
GEN_OFFSET_SYM(z_arch_esf_t, instr);
65-
GEN_ABSOLUTE_SYM(__z_arch_esf_t_SIZEOF, sizeof(z_arch_esf_t));
47+
GEN_OFFSET_STRUCT(arch_esf, ra);
48+
GEN_OFFSET_STRUCT(arch_esf, r1);
49+
GEN_OFFSET_STRUCT(arch_esf, r2);
50+
GEN_OFFSET_STRUCT(arch_esf, r3);
51+
GEN_OFFSET_STRUCT(arch_esf, r4);
52+
GEN_OFFSET_STRUCT(arch_esf, r5);
53+
GEN_OFFSET_STRUCT(arch_esf, r6);
54+
GEN_OFFSET_STRUCT(arch_esf, r7);
55+
GEN_OFFSET_STRUCT(arch_esf, r8);
56+
GEN_OFFSET_STRUCT(arch_esf, r9);
57+
GEN_OFFSET_STRUCT(arch_esf, r10);
58+
GEN_OFFSET_STRUCT(arch_esf, r11);
59+
GEN_OFFSET_STRUCT(arch_esf, r12);
60+
GEN_OFFSET_STRUCT(arch_esf, r13);
61+
GEN_OFFSET_STRUCT(arch_esf, r14);
62+
GEN_OFFSET_STRUCT(arch_esf, r15);
63+
GEN_OFFSET_STRUCT(arch_esf, estatus);
64+
GEN_OFFSET_STRUCT(arch_esf, instr);
65+
GEN_ABSOLUTE_SYM(__struct_arch_esf_SIZEOF, sizeof(struct arch_esf));
6666

6767
GEN_ABS_SYM_END

0 commit comments

Comments
 (0)