From: bernie <bernie@38d2e660-2303-0410-9eaa-f027e97ec537>
Date: Tue, 21 Mar 2006 10:52:39 +0000 (+0000)
Subject: Update ARM support.
X-Git-Tag: 1.0.0~666
X-Git-Url: https://codewiz.org/gitweb?a=commitdiff_plain;h=60336b428df2d4a973b79b23cd41ce48f7043b5b;p=bertos.git

Update ARM support.


git-svn-id: https://src.develer.com/svnoss/bertos/trunk@575 38d2e660-2303-0410-9eaa-f027e97ec537
---

diff --git a/cfg/cpu.h b/cfg/cpu.h
index b008247f..f845bde1 100755
--- a/cfg/cpu.h
+++ b/cfg/cpu.h
@@ -17,6 +17,9 @@
 
 /*#*
  *#* $Log$
+ *#* 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.
  *#*
@@ -142,29 +145,52 @@
 
 #elif CPU_ARM
 
+	typedef uint32_t cpuflags_t;
+	typedef uint32_t cpustack_t;
+
+	/* Register counts include SREG too */
+	#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_BYTE_ORDER         (__BIG_ENDIAN__ ? CPU_BIG_ENDIAN : CPU_LITTLE_ENDIAN)
+	#define CPU_HARVARD            0
+
 	#ifdef __IAR_SYSTEMS_ICC__
 
 		#include <inarm.h>
 
+		#if __CPU_MODE__ == 1 /* Thumb */
+			/* Use stubs */
+			extern cpuflags_t get_CPSR(void);
+			extern void set_CPSR(cpuflags_t flags);
+		#else
+			#define get_CPSR __get_CPSR
+			#define set_CPSR __set_CPSR
+		#endif
+
 		#define NOP         __no_operation()
 		#define IRQ_DISABLE __disable_interrupt()
 		#define IRQ_ENABLE  __enable_interrupt()
 
 		#define IRQ_SAVE_DISABLE(x) \
 		do { \
-			(x) = __get_CPSR(); \
+			(x) = get_CPSR(); \
 			__disable_interrupt(); \
 		} while (0)
 
 		#define IRQ_RESTORE(x) \
 		do { \
-			__set_CPSR(x); \
+			set_CPSR(x); \
 		} while (0)
 
 		#define IRQ_GETSTATE() \
-			((bool)(__get_CPSR() & 0xb0))
+			((bool)(get_CPSR() & 0xb0))
+
+		#define BREAKPOINT  /* asm("bkpt 0") DOES NOT WORK */
 
-	#else /* __IAR_SYSTEMS_ICC__ */
+	#else /* !__IAR_SYSTEMS_ICC__ */
 
 		#warning "IRQ_ macros need testing!"
 
@@ -229,18 +255,6 @@
 
 	#endif /* __IAR_SYSTEMS_ICC_ */
 
-	typedef uint32_t cpuflags_t;
-	typedef uint32_t cpustack_t;
-
-	/* Register counts include SREG too */
-	#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_BYTE_ORDER         (__BIG_ENDIAN__ ? CPU_BIG_ENDIAN : CPU_LITTLE_ENDIAN)
-	#define CPU_HARVARD            0
-
 #elif CPU_PPC
 	#define NOP                 asm volatile ("nop" ::)