Skip to content

Commit

Permalink
h8300: show_stack cleanup
Browse files Browse the repository at this point in the history
- fix stack limit. h8300's stack not aligned 4byte.
- pritty output form.

Signed-off-by: Yoshinori Sato <ysato@users.sourceforge.jp>
  • Loading branch information
Yoshinori Sato committed Jan 20, 2016
1 parent db903b4 commit bf24eec
Show file tree
Hide file tree
Showing 2 changed files with 9 additions and 13 deletions.
2 changes: 1 addition & 1 deletion arch/h8300/include/asm/traps.h
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,6 @@ extern unsigned long *_interrupt_redirect_table;
extern char _start, _etext;
#define check_kernel_text(addr) \
((addr >= (unsigned long)(&_start)) && \
(addr < (unsigned long)(&_etext)))
(addr < (unsigned long)(&_etext)) && !(addr & 1))

#endif /* _H8300_TRAPS_H */
20 changes: 8 additions & 12 deletions arch/h8300/kernel/traps.c
Original file line number Diff line number Diff line change
Expand Up @@ -125,17 +125,18 @@ void show_stack(struct task_struct *task, unsigned long *esp)

pr_info("Stack from %08lx:", (unsigned long)stack);
for (i = 0; i < kstack_depth_to_print; i++) {
if (((unsigned long)stack & (THREAD_SIZE - 1)) == 0)
if (((unsigned long)stack & (THREAD_SIZE - 1)) >=
THREAD_SIZE-4)
break;
if (i % 8 == 0)
pr_info("\n ");
pr_info(" %08lx", *stack++);
pr_info(" ");
pr_cont(" %08lx", *stack++);
}

pr_info("\nCall Trace:");
pr_info("\nCall Trace:\n");
i = 0;
stack = esp;
while (((unsigned long)stack & (THREAD_SIZE - 1)) != 0) {
while (((unsigned long)stack & (THREAD_SIZE - 1)) < THREAD_SIZE-4) {
addr = *stack++;
/*
* If the address is either in the text segment of the
Expand All @@ -147,15 +148,10 @@ void show_stack(struct task_struct *task, unsigned long *esp)
*/
if (check_kernel_text(addr)) {
if (i % 4 == 0)
pr_info("\n ");
pr_info(" [<%08lx>]", addr);
pr_info(" ");
pr_cont(" [<%08lx>]", addr);
i++;
}
}
pr_info("\n");
}

void show_trace_task(struct task_struct *tsk)
{
show_stack(tsk, (unsigned long *)tsk->thread.esp0);
}

0 comments on commit bf24eec

Please sign in to comment.