Author: jmb Date: Mon Oct 12 09:58:07 2009 New Revision: 9624 URL: http://source.netsurf-browser.org?rev=9624&view=rev Log: Fix the multitude of failure. Modified: trunk/tools/trace/src/Makefile trunk/tools/trace/src/trace.c Modified: trunk/tools/trace/src/Makefile URL: http://source.netsurf-browser.org/trunk/tools/trace/src/Makefile?rev=9624... ============================================================================== --- trunk/tools/trace/src/Makefile (original) +++ trunk/tools/trace/src/Makefile Mon Oct 12 09:58:07 2009 @@ -1,4 +1,4 @@ # Sources -DIR_SOURCES := shim.s trace.s +DIR_SOURCES := shim.s trace.c include build/makefiles/Makefile.subdir Modified: trunk/tools/trace/src/trace.c URL: http://source.netsurf-browser.org/trunk/tools/trace/src/trace.c?rev=9624&... ============================================================================== --- trunk/tools/trace/src/trace.c (original) +++ trunk/tools/trace/src/trace.c Mon Oct 12 09:58:07 2009 @@ -1,14 +1,17 @@ #include <stdint.h> #include <stdio.h> -extern uint32_t image__ro__base; -extern uint32_t image__ro__limit; +extern void __cyg_profile_enter(void *, void *); +extern void __cyg_profile_exit(void *, void *); + +extern void *image__ro__base; +extern void *image__ro__limit; static uint32_t depth; -static void print_function_name(uint32_t fn_address) +static void print_function_name(void *fn_address) { - uint32_t *offaddr = ((uint32_t *) address) - 1; + uint32_t *offaddr = ((uint32_t *) fn_address) - 1; uint32_t offset = *offaddr; if ((offset >> 24) == 0xff) { @@ -19,9 +22,11 @@ } } -void __cyg_profile_enter(uint32_t fn_address, uint32_t call_site) +void __cyg_profile_enter(void *fn_address, void *call_site) { uint32_t i = depth; + + (void) call_site; /* Ignore if address is out of bounds */ if (fn_address < image__ro__base || image__ro__limit < fn_address) @@ -36,9 +41,11 @@ depth++; } -void __cyg_profile_exit(uint32_t fn_address, uint32_t call_site) +void __cyg_profile_exit(void *fn_address, void *call_site) { uint32_t i = depth; + + (void) call_site; /* Ignore if address is out of bounds */ if (fn_address < image__ro__base || image__ro__limit < fn_address)