Mercurial > flash_v2
changeset 1649:0a6e548604cc
* src/hal_misc.c: __mem_fault_handler: Only do this if we have
CYGDBG_HAL_DEBUG_GDB_INCLUDE_STUBS. This allows the HAL to be
compiled without stubs.
| author | asl |
|---|---|
| date | Mon, 24 May 2004 12:32:09 +0000 |
| parents | e1ee6283cd48 |
| children | 0e6a7d89dd0e |
| files | packages/hal/arm/arch/current/ChangeLog packages/hal/arm/arch/current/src/hal_misc.c |
| diffstat | 2 files changed, 10 insertions(+), 3 deletions(-) [+] |
line wrap: on
line diff
--- a/packages/hal/arm/arch/current/ChangeLog +++ b/packages/hal/arm/arch/current/ChangeLog @@ -1,3 +1,9 @@ +2004-05-24 Ian Campbell <icampbell@arcom.com> + + * src/hal_misc.c: __mem_fault_handler: Only do this if we have + CYGDBG_HAL_DEBUG_GDB_INCLUDE_STUBS. This allows the HAL to be + compiled without stubs. + 2004-04-22 Jani Monoses <jani@iv.ro> * cdl/hal_arm.cdl :
--- a/packages/hal/arm/arch/current/src/hal_misc.c +++ b/packages/hal/arm/arch/current/src/hal_misc.c @@ -76,10 +76,9 @@ externC void __handle_exception (void); externC HAL_SavedRegisters *_hal_registers; #ifdef CYGDBG_HAL_DEBUG_GDB_INCLUDE_STUBS -// Historical - this datum is defined by the GDB stubs if present -externC +externC void* volatile __mem_fault_handler; #endif - void* volatile __mem_fault_handler; + #ifdef CYGDBG_HAL_DEBUG_GDB_INCLUDE_STUBS /* Force exception handling into the GDB stubs. This is done by taking over @@ -126,11 +125,13 @@ exception_handler(HAL_SavedRegisters *re // This is common in discovery code, e.g. checking for a particular // device which may generate an exception when probing if the // device is not present +#ifdef CYGDBG_HAL_DEBUG_GDB_INCLUDE_STUBS if (__mem_fault_handler && regs->vector == CYGNUM_HAL_EXCEPTION_DATA_ACCESS) { regs->pc = (unsigned long)__mem_fault_handler; return; // Caught an exception inside stubs } +#endif #if defined(CYGDBG_HAL_DEBUG_GDB_INCLUDE_STUBS) && !defined(CYGPKG_CYGMON) if (++exception_level == 1) __take_over_debug_traps();