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

SH-1 updates

Browse Source 
git-svn-id: svn://svn.code.sf.net/p/nuttx/code/trunk@1142 42af7a65-404d-4744-a932-0658087f49c3
This commit is contained in:
patacongo 2008-11-06 18:51:14 +00:00
parent bfd069ad6f
commit a2bfaf9384
2 changed files with 11 additions and 58 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

67
arch/sh/include/irq.h
View File

@ -51,17 +51,7 @@
* Definitions * Definitions
****************************************************************************/ ****************************************************************************/
/* IRQ Stack Frame Format: /* IRQ Stack Frame Format: */
*
* Context is always saved/restored in the same way:
*
* (1) stmia rx, {r0-r14}
* (2) then the PC and CPSR
*
* This results in the following set of indices that
* can be used to access individual registers in the
* xcp.regs array:
*/
#define REG_R0 (0) #define REG_R0 (0)
#define REG_R1 (1) #define REG_R1 (1)
@ -79,71 +69,34 @@
#define REG_R13 (13) #define REG_R13 (13)
#define REG_R14 (14) #define REG_R14 (14)
#define REG_R15 (15) #define REG_R15 (15)
#define REG_CPSR (16) #define REG_SP REG_R15
#define REG_SR (16)
#define REG_PC (17)
#define XCPTCONTEXT_REGS (17) #define XCPTCONTEXT_REGS (18)
#define XCPTCONTEXT_SIZE (4 * XCPTCONTEXT_REGS) #define XCPTCONTEXT_SIZE (4 * XCPTCONTEXT_REGS)
#define REG_A1 REG_R0
#define REG_A2 REG_R1
#define REG_A3 REG_R2
#define REG_A4 REG_R3
#define REG_V1 REG_R4
#define REG_V2 REG_R5
#define REG_V3 REG_R6
#define REG_V4 REG_R7
#define REG_V5 REG_R8
#define REG_V6 REG_R9
#define REG_V7 REG_R10
#define REG_SB REG_R9
#define REG_SL REG_R10
#define REG_FP REG_R11
#define REG_IP REG_R12
#define REG_SP REG_R13
#define REG_LR REG_R14
#define REG_PC REG_R15
/**************************************************************************** /****************************************************************************
* Public Types * Public Types
****************************************************************************/ ****************************************************************************/
/* This struct defines the way the registers are stored. We /* This struct defines the way the registers are stored. We need to save: */
* need to save:
*
* 1 CPSR
* 7 Static registers, v1-v7 (aka r4-r10)
* 1 Frame pointer, fp (aka r11)
* 1 Stack pointer, sp (aka r13)
* 1 Return address, lr (aka r14)
* ---
* 11 (XCPTCONTEXT_USER_REG)
*
* On interrupts, we also need to save:
* 4 Volatile registers, a1-a4 (aka r0-r3)
* 1 Scratch Register, ip (aka r12)
*---
* 5 (XCPTCONTEXT_IRQ_REGS)
*
* For a total of 17 (XCPTCONTEXT_REGS)
*/
#ifndef __ASSEMBLY__ #ifndef __ASSEMBLY__
struct xcptcontext struct xcptcontext
{ {
/* The following function pointer is non-zero if there /* The following function pointer is non-zero if there are pending signals
* are pending signals to be processed. * to be processed.
*/ */
#ifndef CONFIG_DISABLE_SIGNALS #ifndef CONFIG_DISABLE_SIGNALS
void *sigdeliver; /* Actual type is sig_deliver_t */ void *sigdeliver; /* Actual type is sig_deliver_t */
#endif #endif
/* These are saved copies of LR and CPSR used during /* These are saved copies of LR and SR used during signal processing. */
* signal processing.
*/
uint32 saved_pc; uint32 saved_pc;
uint32 saved_cpsr; uint32 saved_sr;
/* Register save area */ /* Register save area */

2
arch/sh/include/types.h
View File

@ -71,7 +71,7 @@ typedef unsigned long long uint64;
* irqsave() * irqsave()
*/ */
typedef unsigned int irqstate_t; typedef unsigned long irqstate_t;
#endif /* __ASSEMBLY__ */ #endif /* __ASSEMBLY__ */