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

Xtensa/ESP32: Fix some compilation issues

Browse Source
This commit is contained in:
Gregory Nutt 2016-10-30 12:24:22 -06:00
parent a4c3fef0b7
commit 2a17786f98
7 changed files with 19 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
arch/xtensa/src/common/xtensa_coproc.S
View File

@ -256,9 +256,9 @@ xtensa_coproc_savestate:
/* Restore a13-15 and return */
132i a13, sp, LOCAL_OFFSET(1)
132i a14, sp, LOCAL_OFFSET(2)
132i a15, sp, LOCAL_OFFSET(3)
l32i a13, sp, LOCAL_OFFSET(1)
l32i a14, sp, LOCAL_OFFSET(2)
l32i a15, sp, LOCAL_OFFSET(3)
RET(16)
@ -443,9 +443,9 @@ xtensa_coproc_restorestate:
/* Restore a13-15 and return */
132i a13, sp, LOCAL_OFFSET(1)
132i a14, sp, LOCAL_OFFSET(2)
132i a15, sp, LOCAL_OFFSET(3)
l32i a13, sp, LOCAL_OFFSET(1)
l32i a14, sp, LOCAL_OFFSET(2)
l32i a15, sp, LOCAL_OFFSET(3)
RET(16)

8
arch/xtensa/src/common/xtensa_dumpstate.c
View File

@ -68,7 +68,13 @@
static inline uint32_t xtensa_getsp(void)
{
register uint32_t sp;
#warning Missing logic
__asm__ __volatile__
(
"mov %0, sp\n"
: "=r" (sp)
);
return sp;
}

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

@ -284,7 +284,7 @@ _xtensa_level1_handler:
/* Restore only level-specific regs (the rest were already restored) */
l32i a0, sp, (4 * REG_PS) /* Retrieve interruptee's PS */
wsr a0, EPS_1
wsr a0, PS
l32i a0, sp, (4 * REG_PC) /* Retrieve interruptee's PC */
wsr a0, EPC_1
l32i a0, sp, (4 * REG_A0) /* Retrieve interruptee's A0 */

2
arch/xtensa/src/common/xtensa_irqdispatch.c
View File

@ -86,7 +86,7 @@ uint32_t *xtensa_irq_dispatch(int irq, uint32_t *regs)
irq_dispatch(irq, regs);
#if defined(CONFIG_ARCH_FPU) || defined(CONFIG_ARCH_ADDRENV)
#if XCHAL_CP_NUM > 0 || defined(CONFIG_ARCH_ADDRENV)
/* Check for a context switch. If a context switch occurred, then
* CURRENT_REGS will have a different value than it did on entry.
*/

5
arch/xtensa/src/common/xtensa_vectors.S
View File

@ -38,6 +38,7 @@
#include <nuttx/config.h>
#include <arch/irq.h>
#include <arch/chip/core-isa.h>
#include <arch/xtensa/xtensa_specregs.h>
@ -272,7 +273,7 @@ _double_exception_vector:
mov a0, sp /* sp == a1 */
addi sp, sp, -(4 * XCPTCONTEXT_SIZE) /* Allocate interrupt stack frame */
s32i a0, sp, (4 * REG_A1) /* Save pre-interrupt SP */
rsr a0, EPS_1 /* Save interruptee's PS -- REVISIT */
rsr a0, EPS /* Save interruptee's PS -- REVISIT */
s32i a0, sp, (4 * REG_PS)
rsr a0, DEPC /* Save interruptee's PC */
s32i a0, sp, (4 * REG_PC)
@ -309,7 +310,7 @@ _kernel_exception_vector:
mov a0, sp /* sp == a1 */
addi sp, sp, -(4 * XCPTCONTEXT_SIZE) /* Allocate interrupt stack frame */
s32i a0, sp, (4 * REG_A1) /* Save pre-interrupt SP */
rsr a0, EPS_1 /* Save interruptee's PS */
rsr a0, EPS /* Save interruptee's PS */
s32i a0, sp, (4 * REG_PS)
rsr a0, EPC_1 /* Save interruptee's PC */
s32i a0, sp, (4 * REG_PC)

2
configs/esp32-core/nsh/defconfig
View File

@ -75,7 +75,6 @@ CONFIG_ARCH_CHIP="esp32"
# CONFIG_SERIAL_TERMIOS is not set
CONFIG_ARCH_CHIP_ESP32=y
CONFIG_ARCH_FAMILY_LX6=y
CONFIG_XTENSA_CALL0_ABI=y
# CONFIG_XTENSA_USE_OVLY is not set
CONFIG_XTENSA_CP_INITSET=0x0001
CONFIG_ESP32_UART=y
@ -203,6 +202,7 @@ CONFIG_PREALLOC_TIMERS=4
#
# Tasks and Scheduling
#
# CONFIG_SMP is not set
# CONFIG_INIT_NONE is not set
CONFIG_INIT_ENTRYPOINT=y
# CONFIG_INIT_FILEPATH is not set

1
configs/esp32-core/smp/defconfig
View File

@ -75,7 +75,6 @@ CONFIG_ARCH_CHIP="esp32"
# CONFIG_SERIAL_TERMIOS is not set
CONFIG_ARCH_CHIP_ESP32=y
CONFIG_ARCH_FAMILY_LX6=y
CONFIG_XTENSA_CALL0_ABI=y
# CONFIG_XTENSA_USE_OVLY is not set
CONFIG_XTENSA_CP_INITSET=0x0001
CONFIG_ESP32_UART=y