devs/foxbox
1
0
Fork 0
forked from len0rd/rockbox
Code Pull requests Activity

Fix profiling on coldfire with newer Gcc.

Browse source 
In switch_thread, make the call to profile_thread_stopped from an inline asm block to make sure the sp is pointing to the right place before storing the context. This apparently worked by luck with the old Gcc.
The workaround used for coldfire in the codeclib's __cyg_profile_func_enter does not work with newer gcc, however the workaround isn't needed for those so enable it only for coldfire gcc version < 4.


git-svn-id: svn://svn.rockbox.org/rockbox/trunk@28908 a1c6a512-1295-4272-9138-f99709370657
This commit is contained in:
Nils Wallménius 2010-12-27 09:49:33 +00:00
parent bf897793d7
commit 479414facc
2 changed files with 14 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

4
apps/codecs/lib/codeclib.c
View file

@ -163,7 +163,9 @@ const uint8_t bs_clz_tab[256] ICONST_ATTR = {
#ifdef RB_PROFILE
void __cyg_profile_func_enter(void *this_fn, void *call_site) {
#ifdef CPU_COLDFIRE
/* This workaround is required for coldfire gcc 3.4 but is broken for 4.4
and 4.5, but for those the other way works. */
#if defined(CPU_COLDFIRE) && defined(__GNUC__) && __GNUC__ < 4
(void)call_site;
ci->profile_func_enter(this_fn, __builtin_return_address(1));
#else

11
firmware/thread.c
View file

@ -1149,7 +1149,18 @@ void switch_thread(void)
}
#ifdef RB_PROFILE
#ifdef CPU_COLDFIRE
/* Call this from asm to make sure the sp is pointing to the
correct place before the context is saved */
uint16_t id = thread->id & THREAD_ID_SLOT_MASK;
asm volatile ("move.l %[id], -(%%sp)\n\t"
"jsr profile_thread_stopped\n\t"
"addq.l #4, %%sp\n\t"
:: [id] "r" (id)
: "cc", "memory");
#else
profile_thread_stopped(thread->id & THREAD_ID_SLOT_MASK);
#endif
#endif
/* Begin task switching by saving our current context so that we can