Skip to content

Commit f1c4e29

Browse files
committed
Added missing stack protection offsets.
1 parent a8c9d35 commit f1c4e29

1 file changed

Lines changed: 38 additions & 10 deletions

File tree

portable/GCC/MicroBlazeV9/portasm.S

Lines changed: 38 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -38,19 +38,49 @@
3838
back into the caller stack. */
3939
#if defined (__arch64__)
4040
#if( XPAR_MICROBLAZE_USE_FPU != 0 )
41-
#define portCONTEXT_SIZE 272
42-
#define portMINUS_CONTEXT_SIZE -272
41+
#define portFSR_OFFSET 264
42+
#if( XPAR_MICROBLAZE_USE_STACK_PROTECTION )
43+
#define portSLR_OFFSET 272
44+
#define portSHR_OFFSET 280
45+
#define portCONTEXT_SIZE 288
46+
#define portMINUS_CONTEXT_SIZE -288
47+
#else
48+
#define portCONTEXT_SIZE 272
49+
#define portMINUS_CONTEXT_SIZE -272
50+
#endif
4351
#else
44-
#define portCONTEXT_SIZE 264
45-
#define portMINUS_CONTEXT_SIZE -264
52+
#if( XPAR_MICROBLAZE_USE_STACK_PROTECTION )
53+
#define portSLR_OFFSET 264
54+
#define portSHR_OFFSET 272
55+
#define portCONTEXT_SIZE 280
56+
#define portMINUS_CONTEXT_SIZE -280
57+
#else
58+
#define portCONTEXT_SIZE 264
59+
#define portMINUS_CONTEXT_SIZE -264
60+
#endif
4661
#endif
4762
#else
4863
#if( XPAR_MICROBLAZE_USE_FPU != 0 )
49-
#define portCONTEXT_SIZE 136
50-
#define portMINUS_CONTEXT_SIZE -136
64+
#define portFSR_OFFSET 132
65+
#if( XPAR_MICROBLAZE_USE_STACK_PROTECTION )
66+
#define portSLR_OFFSET 136
67+
#define portSHR_OFFSET 140
68+
#define portCONTEXT_SIZE 144
69+
#define portMINUS_CONTEXT_SIZE -144
70+
#else
71+
#define portCONTEXT_SIZE 136
72+
#define portMINUS_CONTEXT_SIZE -136
73+
#endif
5174
#else
52-
#define portCONTEXT_SIZE 132
53-
#define portMINUS_CONTEXT_SIZE -132
75+
#if( XPAR_MICROBLAZE_USE_STACK_PROTECTION )
76+
#define portSLR_OFFSET 132
77+
#define portSHR_OFFSET 136
78+
#define portCONTEXT_SIZE 140
79+
#define portMINUS_CONTEXT_SIZE -140
80+
#else
81+
#define portCONTEXT_SIZE 132
82+
#define portMINUS_CONTEXT_SIZE -132
83+
#endif
5484
#endif
5585
#endif
5686

@@ -88,7 +118,6 @@ back into the caller stack. */
88118
#define portR2_OFFSET 240
89119
#define portCRITICAL_NESTING_OFFSET 248
90120
#define portMSR_OFFSET 256
91-
#define portFSR_OFFSET 264
92121
#else
93122
#define portR31_OFFSET 4
94123
#define portR30_OFFSET 8
@@ -122,7 +151,6 @@ back into the caller stack. */
122151
#define portR2_OFFSET 120
123152
#define portCRITICAL_NESTING_OFFSET 124
124153
#define portMSR_OFFSET 128
125-
#define portFSR_OFFSET 132
126154

127155
#endif
128156

0 commit comments

Comments
 (0)