linux 2.6.16.38 w/ vs2.0.3-rc1

[linux-2.6.git] / include / asm-arm / assembler.h

diff --git a/include/asm-arm/assembler.h b/include/asm-arm/assembler.h
index fce8328..f31ac92 100644 (file)
--- a/include/asm-arm/assembler.h
+++ b/include/asm-arm/assembler.h
@@ -55,34 +55,41 @@
 #define PLD(code...)
 #endif
 
+#define MODE_USR       USR_MODE
+#define MODE_FIQ       FIQ_MODE
+#define MODE_IRQ       IRQ_MODE
+#define MODE_SVC       SVC_MODE
+
+#define DEFAULT_FIQ    MODE_FIQ
+
 /*
- * Enable and disable interrupts
+ * LOADREGS - ldm with PC in register list (eg, ldmfd sp!, {pc})
  */
-#if __LINUX_ARM_ARCH__ >= 6
-       .macro  disable_irq
-       cpsid   i
-       .endm
-
-       .macro  enable_irq
-       cpsie   i
-       .endm
+#ifdef __STDC__
+#define LOADREGS(cond, base, reglist...)\
+       ldm##cond       base,reglist
 #else
-       .macro  disable_irq
-       msr     cpsr_c, #PSR_I_BIT | SVC_MODE
-       .endm
-
-       .macro  enable_irq
-       msr     cpsr_c, #SVC_MODE
-       .endm
+#define LOADREGS(cond, base, reglist...)\
+       ldm/**/cond     base,reglist
 #endif
 
+/*
+ * Build a return instruction for this processor type.
+ */
+#define RETINSTR(instr, regs...)\
+       instr   regs
+
 /*
  * Save the current IRQ state and disable IRQs.  Note that this macro
  * assumes FIQs are enabled, and that the processor is in SVC mode.
  */
        .macro  save_and_disable_irqs, oldcpsr
        mrs     \oldcpsr, cpsr
-       disable_irq
+#if __LINUX_ARM_ARCH__ >= 6
+       cpsid   i
+#else
+       msr     cpsr_c, #PSR_I_BIT | MODE_SVC
+#endif
        .endm
 
 /*
@@ -93,6 +100,18 @@
        msr     cpsr_c, \oldcpsr
        .endm
 
+/*
+ * These two are used to save LR/restore PC over a user-based access.
+ * The old 26-bit architecture requires that we do.  On 32-bit
+ * architecture, we can safely ignore this requirement.
+ */
+       .macro  save_lr
+       .endm
+
+       .macro  restore_pc
+       mov     pc, lr
+       .endm
+
 #define USER(x...)                             \
 9999:  x;                                      \
        .section __ex_table,"a";                \