@@ -159,15 +159,15 @@ void xtensa_dump_stack(const void *stack)
159
159
/* And high registers are always comes in 4 in a block. */
160
160
reg_blks_remaining = (int )num_high_regs / 4 ;
161
161
162
- LOG_ERR (" ** A0 %p SP %p A2 %p A3 %p" ,
162
+ EXCEPTION_DUMP (" ** A0 %p SP %p A2 %p A3 %p" ,
163
163
(void * )bsa -> a0 ,
164
164
(void * )((char * )bsa + sizeof (* bsa )),
165
165
(void * )bsa -> a2 , (void * )bsa -> a3 );
166
166
167
167
if (reg_blks_remaining > 0 ) {
168
168
reg_blks_remaining -- ;
169
169
170
- LOG_ERR (" ** A4 %p A5 %p A6 %p A7 %p" ,
170
+ EXCEPTION_DUMP (" ** A4 %p A5 %p A6 %p A7 %p" ,
171
171
(void * )frame -> blks [reg_blks_remaining ].r0 ,
172
172
(void * )frame -> blks [reg_blks_remaining ].r1 ,
173
173
(void * )frame -> blks [reg_blks_remaining ].r2 ,
@@ -177,7 +177,7 @@ void xtensa_dump_stack(const void *stack)
177
177
if (reg_blks_remaining > 0 ) {
178
178
reg_blks_remaining -- ;
179
179
180
- LOG_ERR (" ** A8 %p A9 %p A10 %p A11 %p" ,
180
+ EXCEPTION_DUMP (" ** A8 %p A9 %p A10 %p A11 %p" ,
181
181
(void * )frame -> blks [reg_blks_remaining ].r0 ,
182
182
(void * )frame -> blks [reg_blks_remaining ].r1 ,
183
183
(void * )frame -> blks [reg_blks_remaining ].r2 ,
@@ -187,24 +187,24 @@ void xtensa_dump_stack(const void *stack)
187
187
if (reg_blks_remaining > 0 ) {
188
188
reg_blks_remaining -- ;
189
189
190
- LOG_ERR (" ** A12 %p A13 %p A14 %p A15 %p" ,
190
+ EXCEPTION_DUMP (" ** A12 %p A13 %p A14 %p A15 %p" ,
191
191
(void * )frame -> blks [reg_blks_remaining ].r0 ,
192
192
(void * )frame -> blks [reg_blks_remaining ].r1 ,
193
193
(void * )frame -> blks [reg_blks_remaining ].r2 ,
194
194
(void * )frame -> blks [reg_blks_remaining ].r3 );
195
195
}
196
196
197
197
#if XCHAL_HAVE_LOOPS
198
- LOG_ERR (" ** LBEG %p LEND %p LCOUNT %p" ,
198
+ EXCEPTION_DUMP (" ** LBEG %p LEND %p LCOUNT %p" ,
199
199
(void * )bsa -> lbeg ,
200
200
(void * )bsa -> lend ,
201
201
(void * )bsa -> lcount );
202
202
#endif
203
203
204
- LOG_ERR (" ** SAR %p" , (void * )bsa -> sar );
204
+ EXCEPTION_DUMP (" ** SAR %p" , (void * )bsa -> sar );
205
205
206
206
#if XCHAL_HAVE_THREADPTR
207
- LOG_ERR (" ** THREADPTR %p" , (void * )bsa -> threadptr );
207
+ EXCEPTION_DUMP (" ** THREADPTR %p" , (void * )bsa -> threadptr );
208
208
#endif
209
209
}
210
210
@@ -227,12 +227,12 @@ static void print_fatal_exception(void *print_stack, int cause,
227
227
__asm__ volatile ("rsr.excvaddr %0" : "=r" (vaddr ));
228
228
229
229
if (is_dblexc ) {
230
- LOG_ERR (" ** FATAL EXCEPTION (DOUBLE)" );
230
+ EXCEPTION_DUMP (" ** FATAL EXCEPTION (DOUBLE)" );
231
231
} else {
232
- LOG_ERR (" ** FATAL EXCEPTION" );
232
+ EXCEPTION_DUMP (" ** FATAL EXCEPTION" );
233
233
}
234
234
235
- LOG_ERR (" ** CPU %d EXCCAUSE %d (%s)" ,
235
+ EXCEPTION_DUMP (" ** CPU %d EXCCAUSE %d (%s)" ,
236
236
arch_curr_cpu ()-> id , cause ,
237
237
xtensa_exccause (cause ));
238
238
@@ -241,21 +241,21 @@ static void print_fatal_exception(void *print_stack, int cause,
241
241
* Or worse, cause another access violation.
242
242
*/
243
243
if (xtensa_is_outside_stack_bounds ((uintptr_t )bsa , sizeof (* bsa ), UINT32_MAX )) {
244
- LOG_ERR (" ** VADDR %p Invalid SP %p" , (void * )vaddr , print_stack );
244
+ EXCEPTION_DUMP (" ** VADDR %p Invalid SP %p" , (void * )vaddr , print_stack );
245
245
return ;
246
246
}
247
247
248
248
ps = bsa -> ps ;
249
249
pc = (void * )bsa -> pc ;
250
250
251
- LOG_ERR (" ** PC %p VADDR %p" , pc , (void * )vaddr );
251
+ EXCEPTION_DUMP (" ** PC %p VADDR %p" , pc , (void * )vaddr );
252
252
253
253
if (is_dblexc ) {
254
- LOG_ERR (" ** DEPC %p" , (void * )depc );
254
+ EXCEPTION_DUMP (" ** DEPC %p" , (void * )depc );
255
255
}
256
256
257
- LOG_ERR (" ** PS %p" , (void * )bsa -> ps );
258
- LOG_ERR (" ** (INTLEVEL:%d EXCM: %d UM:%d RING:%d WOE:%d OWB:%d CALLINC:%d)" ,
257
+ EXCEPTION_DUMP (" ** PS %p" , (void * )bsa -> ps );
258
+ EXCEPTION_DUMP (" ** (INTLEVEL:%d EXCM: %d UM:%d RING:%d WOE:%d OWB:%d CALLINC:%d)" ,
259
259
get_bits (0 , 4 , ps ), get_bits (4 , 1 , ps ),
260
260
get_bits (5 , 1 , ps ), get_bits (6 , 2 , ps ),
261
261
get_bits (18 , 1 , ps ),
@@ -473,7 +473,7 @@ void *xtensa_excint1_c(void *esf)
473
473
*/
474
474
case EXCCAUSE_SYSCALL :
475
475
/* Just report it to the console for now */
476
- LOG_ERR (" ** SYSCALL PS %p PC %p" ,
476
+ EXCEPTION_DUMP (" ** SYSCALL PS %p PC %p" ,
477
477
(void * )bsa -> ps , (void * )bsa -> pc );
478
478
xtensa_dump_stack (interrupted_stack );
479
479
0 commit comments