sergiotarxz/nuttx
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Xtensa: Correct some compile issues

Browse Source
This commit is contained in:
Gregory Nutt 2016-10-23 16:25:55 -06:00
parent 2514ddec8b
commit 4cf60022ca
5 changed files with 3 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
arch/xtensa/include/xtensa/core.h
View File

@ -1130,7 +1130,7 @@
* Exit: any register a2-a15 (?) may have been clobbered.
*/
.macro xchal_cpi_store_funcbody
.macro xchal_cpi_store_funcbody
#if (XCHAL_CP_MASK & ~XCHAL_CP_PORT_MASK)
# if XCHAL_CP0_SA_SIZE
bnez a3, 99f
@ -1182,6 +1182,7 @@
# endif
90:
#endif
.endm
/* Macro that expands to the body of a function that loads the selected coprocessor's state
* (registers etc).

14
arch/xtensa/src/common/xtensa_inthandlers.S
View File

@ -126,20 +126,6 @@
and a2, a2, a4
beqz a2, 5f /* Nothing to do */
/* This bit of code provides a nice debug backtrace in the debugger.
* It does take a few more instructions, so undef XT_DEBUG_BACKTRACE
* if you want to save the cycles.
* /
#if XT_DEBUG_BACKTRACE
#ifndef CONFIG_XTENSA_CALL0_ABI
rsr a0, EPC_1 + \level - 1 /* Return address */
movi a4, 0xC0000000 /* Constant with top 2 bits set (call size) */
or a0, a0, a4 /* Set top 2 bits */
addx2 a0, a4, a0 /* Clear top bit -- simulating call4 size */
#endif
#endif
#ifdef XT_INTEXC_HOOKS
/* Call interrupt hook if present to (pre)handle interrupts. */

2
arch/xtensa/src/common/xtensa_nmihandler.S
View File

@ -59,12 +59,10 @@
#include <nuttx/config.h>
#include <arch/irq.h>
#include <arch/chip/core-isa.h>
#include <arch/xtensa/xtensa_specregs.h>
#include "xtensa_macros.h"
#include "xtensa_timer.h"
/****************************************************************************
* Assembly Language Macros

2
arch/xtensa/src/common/xtensa_timer.h
View File

@ -34,7 +34,7 @@
#define __ARCH_XTENSA_SRC_COMMON_XTENSA_TIMER_H
#ifdef __ASSEMBLER__
# include <xtensa/coreasm.h>
//# include <xtensa/coreasm.h>
#endif
#include <arch/xtensa/core.h>

18
arch/xtensa/src/esp32/esp32_irq.c
View File

@ -89,24 +89,6 @@ static void esp32_irq_dump(const char *msg, int irq)
# define esp32_irq_dump(msg, irq)
#endif
/****************************************************************************
* Name: esp32_nmi
*
* Description:
* Handlers for various execptions. None are handled and all are fatal
* error conditions. The only advantage these provided over the default
* unexpected interrupt handler is that they provide a diagnostic output.
*
****************************************************************************/
static int esp32_nmi(int irq, FAR void *context)
{
(void)up_irq_save();
_err("PANIC!!! NMI received\n");
PANIC();
return 0;
}
/****************************************************************************
* Public Functions
****************************************************************************/