secc
/
l4ka-pistachio
mirror of https://github.com/l4ka/pistachio.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

- Avoid TBUF_PMC_SEL_* and TBUF_RDPMC_* being undefined 

This could happen if CPU was not set to I686, P4, or K8
  (Thanks to Simon Kellner for a hint that helped finding this bug)
- Removed redundant "defined(CONFIG_CPU_X86_K8)"
- Fixed typo in comment
This commit is contained in:
Philipp Kupferschmied 2008-07-31 16:57:25 +02:00
parent 74428fb4b9
commit 30132e9248
1 changed files with 8 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
kernel/src/arch/x86/tracebuffer.h
View File

@ -115,10 +115,15 @@ INLINE tracebuffer_t * get_tracebuffer (void)
/*
* Access to performance monitoring counters
*/
# define TBUF_PMC_SEL_0
# define TBUF_PMC_SEL_1
# define TBUF_RDPMC_0
# define TBUF_RDPMC_1
#if defined(CONFIG_TBUF_PERFMON)
# if defined(CONFIG_CPU_X86_I686) || defined(CONFIG_CPU_X86_K8) || defined(CONFIG_CPU_X86_K8)
# if defined(CONFIG_CPU_X86_I686) || defined(CONFIG_CPU_X86_K8)
# define TBUF_PMC_SEL_0 " xor %1, %1 \n"
# define TBUF_PMC_SEL_1 " mov $1, %1 \n"
# elif defined(CONFIG_CPU_X86_P4)
@ -127,13 +132,6 @@ INLINE tracebuffer_t * get_tracebuffer (void)
# define TBUF_PMC_SEL_1 " add $ 2, %1 \n"
# endif
#else
# define TBUF_PMC_SEL_0
# define TBUF_PMC_SEL_1
# define TBUF_RDPMC_0
# define TBUF_RDPMC_1
#endif /* defined(CONFIG_TBUF_PERFMON) */
@ -159,7 +157,7 @@ INLINE tracebuffer_t * get_tracebuffer (void)
({ \
word_t dummy, addr; \
asm volatile ( \
/* Check wheter to filter the event */ \
/* Check whether to filter the event */ \
" mov %%fs:2*%c9, %3 \n" \
" and %1, %3 \n" \
" jz 2f \n" \
@ -183,7 +181,7 @@ INLINE tracebuffer_t * get_tracebuffer (void)
" shl $16, %%edx \n" \
" lea __idle_tcb, %3 \n" \
" movw "MKSTR(OFS_TCB_CPU)"(%3), %%dx \n" \
" movl %%edx, %%fs:1*%c9(%0) \n" \
" movl %%edx, %%fs:1*%c9(%0) \n" \
TBUF_PMC_SEL_0 \
TBUF_RDPMC_0 \
TBUF_PMC_SEL_1 \