X-Git-Url: https://codewiz.org/gitweb?a=blobdiff_plain;f=cfg%2Fcpu.h;h=ff277d62faee5589b70f0d4422fc7b921e374a2d;hb=5f3952176a4e9a00ca8dd5ec4a6b994958f89e0a;hp=66ae5d731b891f7cbb3000ff1d04b0e14ba15e6e;hpb=bcf38f772b397e7a8ba781a69aacb9380e54b32a;p=bertos.git

diff --git a/cfg/cpu.h b/cfg/cpu.h
old mode 100755
new mode 100644
index 66ae5d73..ff277d62
--- a/cfg/cpu.h
+++ b/cfg/cpu.h
@@ -8,78 +8,10 @@
  *
  * \brief CPU-specific definitions
  *
- * \version $Id$
- *
  * \author Giovanni Bajo <rasky@develer.com>
  * \author Bernardo Innocenti <bernie@develer.com>
  * \author Stefano Fedrigo <aleph@develer.com>
  */
-
-/*#*
- *#* $Log$
- *#* Revision 1.15  2006/07/19 12:56:25  bernie
- *#* Convert to new Doxygen style.
- *#*
- *#* Revision 1.14  2006/07/19 12:54:12  bernie
- *#* Documentation fixes.
- *#*
- *#* Revision 1.13  2006/03/27 04:49:23  bernie
- *#* CPU_IDLE(): Fix for new emulator.
- *#*
- *#* Revision 1.12  2006/03/21 10:52:39  bernie
- *#* Update ARM support.
- *#*
- *#* Revision 1.11  2006/03/20 17:49:00  bernie
- *#* Spacing fix.
- *#*
- *#* Revision 1.10  2006/02/24 01:17:30  bernie
- *#* CPU_SAVED_REGS_CNT: Declare for x86/x86_64.
- *#*
- *#* Revision 1.9  2006/02/23 09:08:43  bernie
- *#* Add note for a frequently reported non-bug.
- *#*
- *#* Revision 1.8  2006/02/10 12:37:45  bernie
- *#* Add support for ARM on IAR.
- *#*
- *#* Revision 1.7  2005/11/27 03:04:38  bernie
- *#* Add POSIX emulation for IRQ_* macros; Add Qt support.
- *#*
- *#* Revision 1.6  2005/07/19 07:26:49  bernie
- *#* Add missing #endif.
- *#*
- *#* Revision 1.5  2005/06/27 21:24:17  bernie
- *#* CPU_CSOURCE(): New macro.
- *#*
- *#* Revision 1.4  2005/06/14 06:15:10  bernie
- *#* Add X86_64 support.
- *#*
- *#* Revision 1.3  2005/04/12 04:06:17  bernie
- *#* Catch missing CPU earlier.
- *#*
- *#* Revision 1.2  2005/04/11 19:10:27  bernie
- *#* Include top-level headers from cfg/ subdir.
- *#*
- *#* Revision 1.1  2005/04/11 19:04:13  bernie
- *#* Move top-level headers to cfg/ subdir.
- *#*
- *#* Revision 1.30  2005/03/15 00:20:09  bernie
- *#* BREAKPOINT, IRQ_RUNNING(), IRQ_GETSTATE(): New DSP56K macros.
- *#*
- *#* Revision 1.29  2005/02/16 20:33:24  bernie
- *#* Preliminary PPC support.
- *#*
- *#* Revision 1.28  2004/12/31 17:39:41  bernie
- *#* Fix documentation.
- *#*
- *#* Revision 1.27  2004/12/31 17:02:47  bernie
- *#* IRQ_SAVE_DISABLE(), IRQ_RESTORE(): Add null stubs for x86.
- *#*
- *#* Revision 1.26  2004/12/13 12:08:12  bernie
- *#* DISABLE_IRQSAVE, ENABLE_IRQRESTORE, DISABLE_INTS, ENABLE_INTS: Remove obsolete macros.
- *#*
- *#* Revision 1.25  2004/12/08 08:31:02  bernie
- *#* CPU_HARVARD: Define to 1 for AVR and DSP56K.
- *#*/
 #ifndef DEVLIB_CPU_H
 #define DEVLIB_CPU_H
 
@@ -162,8 +94,8 @@
 	#define CPU_REG_BITS           32
 	#define CPU_REGS_CNT           16
 	#define CPU_SAVED_REGS_CNT     FIXME
-	#define CPU_STACK_GROWS_UPWARD 0  //FIXME
-	#define CPU_SP_ON_EMPTY_SLOT   0  //FIXME
+	#define CPU_STACK_GROWS_UPWARD 0
+	#define CPU_SP_ON_EMPTY_SLOT   0
 	#define CPU_BYTE_ORDER         (__BIG_ENDIAN__ ? CPU_BIG_ENDIAN : CPU_LITTLE_ENDIAN)
 	#define CPU_HARVARD            0
 
@@ -203,6 +135,7 @@
 	#else /* !__IAR_SYSTEMS_ICC__ */
 
 		#warning "IRQ_ macros need testing!"
+		#warning "Test now or die :-)"
 
 		#define NOP         asm volatile ("mov r0,r0" ::)
 
@@ -210,9 +143,9 @@
 		do { \
 			asm volatile ( \
 				"mrs r0, cpsr\n\t" \
-				"orr r0, r0, #0xb0\n\t" \
-				"msr cpsr, r0" \
-				:: \
+				"orr r0, r0, #0xc0\n\t" \
+				"msr cpsr_c, r0" \
+				::: "r0" \
 			); \
 		} while (0)
 
@@ -220,19 +153,18 @@
 		do { \
 			asm volatile ( \
 				"mrs r0, cpsr\n\t" \
-				"bic r0, r0, #0xb0\n\t" \
-				"msr cpsr, r0" \
-				:: \
+				"bic r0, r0, #0xc0\n\t" \
+				"msr cpsr_c, r0" \
+				::: "r0" \
 			); \
 		} while (0)
 
 		#define IRQ_SAVE_DISABLE(x) \
 		do { \
 			asm volatile ( \
-				"mrs r0, cpsr\n\t" \
-				"mov %0, r0\n\t" \
-				"orr r0, r0, #0xb0\n\t" \
-				"msr cpsr, r0" \
+				"mrs %0, cpsr\n\t" \
+				"orr r0, %0, #0xc0\n\t" \
+				"msr cpsr_c, r0" \
 				: "=r" (x) \
 				: /* no inputs */ \
 				: "r0" \
@@ -242,11 +174,9 @@
 		#define IRQ_RESTORE(x) \
 		do { \
 			asm volatile ( \
-				"mov r0, %0\n\t" \
-				"msr cpsr, r0" \
+				"msr cpsr_c, %0" \
 				: /* no outputs */ \
 				: "r" (x) \
-				: "r0" \
 			); \
 		} while (0)
 
@@ -254,16 +184,14 @@
 		({ \
 			uint32_t sreg; \
 			asm volatile ( \
-				"mrs r0, cpsr\n\t" \
-				"mov %0, r0" \
-				: "=r" (sreg)
-				: /* no inputs */
-				: "r0" \
+				"mrs %0, cpsr\n\t" \
+				: "=r" (sreg) \
+				: /* no inputs */ \
 			); \
-			(bool)(sreg & 0xb0); \
+			!((sreg & 0xc0) == 0xc0); \
 		})
 
-	#endif /* __IAR_SYSTEMS_ICC_ */
+	#endif /* !__IAR_SYSTEMS_ICC_ */
 
 #elif CPU_PPC
 	#define NOP                 asm volatile ("nop" ::)