From eba3d6210944e27b2a3000e4380c8fc7670c42a2 Mon Sep 17 00:00:00 2001 From: patacongo Date: Fri, 20 May 2011 00:21:26 +0000 Subject: [PATCH] Add PIC32 exception handlers git-svn-id: svn://svn.code.sf.net/p/nuttx/code/trunk@3630 42af7a65-404d-4744-a932-0658087f49c3 --- arch/mips/src/common/up_internal.h | 4 +- arch/mips/src/mips32/up_bevhandler.S | 103 +++++++++++++++++ arch/mips/src/mips32/up_inthandler.S | 104 ++++++++++++++++++ arch/mips/src/pic32mx/Make.defs | 2 +- .../excptmacros.h} | 18 +-- arch/mips/src/pic32mx/pic32mx-head.S | 50 +-------- 6 files changed, 224 insertions(+), 57 deletions(-) create mode 100755 arch/mips/src/mips32/up_bevhandler.S create mode 100755 arch/mips/src/mips32/up_inthandler.S rename arch/mips/src/{mips32/mips32-excptmacros.h => pic32mx/excptmacros.h} (93%) diff --git a/arch/mips/src/common/up_internal.h b/arch/mips/src/common/up_internal.h index 0ec2da6985..df10ae9e61 100755 --- a/arch/mips/src/common/up_internal.h +++ b/arch/mips/src/common/up_internal.h @@ -160,7 +160,6 @@ extern uint32_t _bmxdupba_address; /* BMX register setting */ extern void up_boot(void); extern void up_copystate(uint32_t *dest, uint32_t *src); -extern void up_decodeirq(uint32_t *regs); extern void up_irqinitialize(void); #ifdef CONFIG_ARCH_DMA extern void weak_function up_dmainitialize(void); @@ -171,6 +170,9 @@ extern void up_lowputc(char ch); extern void up_puts(const char *str); extern void up_lowputs(const char *str); +/* Two alternative interrupt handling functions */ + +extern uint32_t *up_decodeirq(uint32_t *regs); extern uint32_t *up_doirq(int irq, uint32_t *regs); /* Defined in up_dumpstate.c */ diff --git a/arch/mips/src/mips32/up_bevhandler.S b/arch/mips/src/mips32/up_bevhandler.S new file mode 100755 index 0000000000..3fbe98d534 --- /dev/null +++ b/arch/mips/src/mips32/up_bevhandler.S @@ -0,0 +1,103 @@ +/**************************************************************************** + * arch/mips/src/mips32/up_bevexcptn.S + * + * Copyright (C) 2011 Gregory Nutt. All rights reserved. + * Author: Gregory Nutt + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in + * the documentation and/or other materials provided with the + * distribution. + * 3. Neither the name NuttX nor the names of its contributors may be + * used to endorse or promote products derived from this software + * without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS + * OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED + * AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. + * + ****************************************************************************/ + +/**************************************************************************** + * Included Files + ****************************************************************************/ + +#include + +#include + +#include "chip/excptmacros.h" + +/**************************************************************************** + * Pre-processor Definitions + ****************************************************************************/ + +/**************************************************************************** + * Global Symbols + ****************************************************************************/ + + .file "up_bevexcptn.S" + .global up_dobev + +/**************************************************************************** + * Public Functions + ****************************************************************************/ +/**************************************************************************** + * Name: _bev_exception + * + * Description: + * Boot Exception Vector Handler. Jumps to bev_handler + * + * Input Parameters: + * None + * + * Returned Value: + * Does not return + * + ****************************************************************************/ + + .section .bev_excpt,"ax",@progbits + .set noreorder + .ent _bev_exception +_bev_exception: + la k0, _bev_handler + jr k0 + nop + .end _bev_exception + +/**************************************************************************** + * Name: _bev_handler + * + * Description: + * BEV exception handler + * + ****************************************************************************/ + + .section .bev_handler, "ax", @progbits + .set noreorder + .ent _bev_handler +_bev_handler: + EXCPT_PROLOGUE t0 /* Save registers on stack, enable nested interrupts */ + move a0, sp /* Pass register save structure as the parameter 1 */ + USE_INTSTACK t0, t1, t2 /* Switch to the interrupt stack */ + la t0, up_dobev /* Call up_dobev(regs) */ + jalr t0, ra + di /* Disable interrupts */ + RESTORE_STACK t0, t1 /* Undo the operations of USE_STACK */ + EXCPT_EPILOGUE v0 /* Return to the context returned by up_dobev() */ + .end _bev_handler diff --git a/arch/mips/src/mips32/up_inthandler.S b/arch/mips/src/mips32/up_inthandler.S new file mode 100755 index 0000000000..bf43f5af92 --- /dev/null +++ b/arch/mips/src/mips32/up_inthandler.S @@ -0,0 +1,104 @@ +/**************************************************************************** + * arch/mips/src/mips32/up_genexcptn.S + * + * Copyright (C) 2011 Gregory Nutt. All rights reserved. + * Author: Gregory Nutt + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in + * the documentation and/or other materials provided with the + * distribution. + * 3. Neither the name NuttX nor the names of its contributors may be + * used to endorse or promote products derived from this software + * without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS + * OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED + * AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. + * + ****************************************************************************/ + +/**************************************************************************** + * Included Files + ****************************************************************************/ + +#include + +#include + +#include "chip/excptmacros.h" + +/**************************************************************************** + * Pre-processor Definitions + ****************************************************************************/ + +/**************************************************************************** + * Global Symbols + ****************************************************************************/ + + .file "up_genexcptn.S" + .global _int_handler + .global up_decodeirq + +/**************************************************************************** + * Public Functions + ****************************************************************************/ +/**************************************************************************** + * Name: _int_exception + * + * Description: + * Interrupt Exception Vector Handler. Jumps to _int_handler + * + * Input Parameters: + * None + * + * Returned Value: + * Does not return + * + ****************************************************************************/ + + .section .int_excpt,"ax",@progbits + .set noreorder + .ent _int_exception +_int_exception: + la k0, _int_handler + jr k0 + nop + .end _int_exception + +/**************************************************************************** + * Name: _int_handler + * + * Description: + * Interrupt exception handler + * + ****************************************************************************/ + + .section .int_handler, "ax", @progbits + .set noreorder + .ent _int_handler +_int_handler: + EXCPT_PROLOGUE t0 /* Save registers on stack, enable nested interrupts */ + move a0, sp /* Pass register save structure as the parameter 1 */ + USE_INTSTACK t0, t1, t2 /* Switch to the interrupt stack */ + la t0, up_decodeirq /* Call up_decodeirq(regs) */ + jalr t0, ra + di /* Disable interrupts */ + RESTORE_STACK t0, t1 /* Undo the operations of USE_STACK */ + EXCPT_EPILOGUE v0 /* Return to the context returned by up_decodeirq() */ + .end _int_handler diff --git a/arch/mips/src/pic32mx/Make.defs b/arch/mips/src/pic32mx/Make.defs index bcb267d33e..7555e9aaf4 100755 --- a/arch/mips/src/pic32mx/Make.defs +++ b/arch/mips/src/pic32mx/Make.defs @@ -39,7 +39,7 @@ HEAD_ASRC = pic32mx-head.S # Common MIPS files -CMN_ASRCS = up_syscall0.S +CMN_ASRCS = up_syscall0.S up_inthandler.S up_bevhandler.S CMN_CSRCS = up_allocateheap.c up_assert.c up_blocktask.c up_copystate.c \ up_createstack.c up_doirq.c up_exit.c up_idle.c up_initialize.c \ up_initialstate.c up_interruptcontext.c up_irq.c up_lowputs.c \ diff --git a/arch/mips/src/mips32/mips32-excptmacros.h b/arch/mips/src/pic32mx/excptmacros.h similarity index 93% rename from arch/mips/src/mips32/mips32-excptmacros.h rename to arch/mips/src/pic32mx/excptmacros.h index ed88f33e6e..fadc4dd803 100755 --- a/arch/mips/src/mips32/mips32-excptmacros.h +++ b/arch/mips/src/pic32mx/excptmacros.h @@ -1,5 +1,5 @@ /******************************************************************************************** - * arch/mips/src/mips32/mips32-excptmacros.h + * arch/mips/src/pic32mx/excptmacros.h * * Copyright (C) 2011 Gregory Nutt. All rights reserved. * Author: Gregory Nutt @@ -33,8 +33,8 @@ * ********************************************************************************************/ -#ifndef __ARCH_MIPS_SRC_MIPS32_MIPS32_EXCPTMACROS_H -#define __ARCH_MIPS_SRC_MIPS32_MIPS32_EXCPTMACROS_H +#ifndef __ARCH_MIPS_SRC_PIC32MX_EXCPTMACROS_H +#define __ARCH_MIPS_SRC_PIC32MX_EXCPTMACROS_H /******************************************************************************************** * Included Files @@ -43,7 +43,7 @@ #include #include -#include +#include #ifdef __ASSEMBLY__ @@ -70,7 +70,7 @@ * my_exception: * EXCPT_PROLOGUE t0 - Save registers on stack, enable nested interrupts * move a0, sp - Pass register save structure as the parameter 1 - * USE_INTSTACK, t0, t1, t2 - Switch to the interrupt stack + * USE_INTSTACK t0, t1, t2 - Switch to the interrupt stack * jal handler - Handle the exception IN=old regs OUT=new regs * di - Disable interrupts * RESTORE_STACK t0, t1 - Undo the operations of USE_STACK @@ -100,7 +100,8 @@ * ********************************************************************************************/ - .macro EXCPT_PROLOGUE, tmp + .macro EXCPT_PROLOGUE, tmp + .set noat /* Get the SP from the previous shadow set */ @@ -243,7 +244,8 @@ * ********************************************************************************************/ - .macro EXCPT_EXIT, regs + .macro EXCPT_EPILOGUE, regs + .set noat /* Since interrupts are disabled via di can now use k0 and k1 again. Use k1 as the * pointer to the register save array. @@ -407,4 +409,4 @@ .endm #endif /* __ASSEMBLY__ */ -#endif /* __ARCH_MIPS_SRC_MIPS32_MIPS32_EXCPTMACROS_H */ +#endif /* __ARCH_MIPS_SRC_PIC32MX_EXCPTMACROS_H */ diff --git a/arch/mips/src/pic32mx/pic32mx-head.S b/arch/mips/src/pic32mx/pic32mx-head.S index fa08804772..c9224e7aca 100644 --- a/arch/mips/src/pic32mx/pic32mx-head.S +++ b/arch/mips/src/pic32mx/pic32mx-head.S @@ -78,7 +78,9 @@ .global __start .global halt - .global __nmi_handler + .global nmi_handler + .global bev_handler + .global int_handler .global os_start /**************************************************************************** @@ -321,52 +323,6 @@ __start: nop .end __start -/**************************************************************************** - * Name: _bev_exception - * - * Description: - * Boot Exception Vector Handler. Jumps to _bootstrap_exception_handler - * - * Input Parameters: - * None - * - * Returned Value: - * Does not return - * - ****************************************************************************/ - - .section .bev_handler,"ax",@progbits - .set noreorder - .ent _bev_exception -_bev_exception: - la k0, _bootstrap_exception_handler - jr k0 - nop - .end _bev_exception - -/**************************************************************************** - * Name: _bev_exception - * - * Description: - * General Exception Vector Handler. Jumps to _general_exception_handler - * - * Input Parameters: - * None - * - * Returned Value: - * Does not return - * - ****************************************************************************/ - - .section .gen_handler,"ax",@progbits - .set noreorder - .ent _gen_exception -_gen_exception: - la k0, _general_exception_context - jr k0 - nop - .end _gen_exception - /**************************************************************************** * Name: __start_nuttx *