diff options
| author | Gregory Nutt <gnutt@nuttx.org> | 2014-10-03 08:44:42 -0600 |
|---|---|---|
| committer | Gregory Nutt <gnutt@nuttx.org> | 2014-10-03 08:44:42 -0600 |
| commit | 54d8dbca18876b27bb6c112850f32232dff906b6 (patch) | |
| tree | 6b5d65059511c600f9e6b1e1cb001a93e37d65f3 /nuttx/arch/sim | |
| parent | 6cce7ea0ab8f3b30a642cd4345b67f547bc91b09 (diff) | |
| download | px4-nuttx-54d8dbca18876b27bb6c112850f32232dff906b6.tar.gz px4-nuttx-54d8dbca18876b27bb6c112850f32232dff906b6.tar.bz2 px4-nuttx-54d8dbca18876b27bb6c112850f32232dff906b6.zip | |
configs/sim/nsh/defconfig -- refresh, enable wall-time, dow builds natively in 64-bit mode
Diffstat (limited to 'nuttx/arch/sim')
| -rw-r--r-- | nuttx/arch/sim/include/irq.h | 5 | ||||
| -rw-r--r-- | nuttx/arch/sim/src/up_internal.h | 4 |
2 files changed, 5 insertions, 4 deletions
diff --git a/nuttx/arch/sim/include/irq.h b/nuttx/arch/sim/include/irq.h index 41c9446eb..efe57f650 100644 --- a/nuttx/arch/sim/include/irq.h +++ b/nuttx/arch/sim/include/irq.h @@ -82,7 +82,7 @@ struct xcptcontext { void *sigdeliver; /* Actual type is sig_deliver_t */ - xcpt_reg_t regs[6]; + xcpt_reg_t regs[XCPTCONTEXT_REGS]; }; #endif @@ -111,7 +111,8 @@ static inline void irqrestore(irqstate_t flags) #ifdef __cplusplus #define EXTERN extern "C" -extern "C" { +extern "C" +{ #else #define EXTERN extern #endif diff --git a/nuttx/arch/sim/src/up_internal.h b/nuttx/arch/sim/src/up_internal.h index dd6b36071..ea20934fc 100644 --- a/nuttx/arch/sim/src/up_internal.h +++ b/nuttx/arch/sim/src/up_internal.h @@ -118,8 +118,8 @@ /* Compatibility definitions */ -# define JB_SP JB_RSI -# define JB_PC JB_RSP +# define JB_SP JB_RSP +# define JB_PC JB_RSI #else /* Storage order: %ebx, $esi, %edi, %ebp, sp, and return PC */ |