X-Git-Url: https://codewiz.org/gitweb?a=blobdiff_plain;f=cpu.h;h=2f4086229d6b72e57e6166584e7ebfd70219afbd;hb=cdf3e45aaa38fc701dceeb57e6ceedd6ca68f408;hp=44c123ede2d543facf1ab686529d22a8aad32dfd;hpb=9e65a04fb4ea28b482012fc5b6077a06efe4afae;p=bertos.git

diff --git a/cpu.h b/cpu.h
index 44c123ed..2f408622 100755
--- a/cpu.h
+++ b/cpu.h
@@ -1,9 +1,9 @@
 /*!
  * \file
  * <!--
- * Copyright 2004 Develer S.r.l. (http://www.develer.com/)
+ * Copyright 2004, 2005 Develer S.r.l. (http://www.develer.com/)
  * Copyright 2004 Giovanni Bajo
- * This file is part of DevLib - See devlib/README for information.
+ * This file is part of DevLib - See README.devlib for information.
  * -->
  *
  * \brief CPU-specific definitions
@@ -17,62 +17,28 @@
 
 /*#*
  *#* $Log$
- *#* 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.
- *#*
- *#* Revision 1.24  2004/12/08 08:04:13  bernie
- *#* Doxygen fixes.
- *#*
- *#* Revision 1.23  2004/11/16 22:41:58  bernie
- *#* Support 64bit CPUs.
- *#*
- *#* Revision 1.22  2004/11/16 21:57:59  bernie
- *#* CPU_IDLE: Rename from SCHEDULER_IDLE.
+ *#* Revision 1.30  2005/03/15 00:20:09  bernie
+ *#* BREAKPOINT, IRQ_RUNNING(), IRQ_GETSTATE(): New DSP56K macros.
  *#*
- *#* Revision 1.21  2004/11/16 21:34:25  bernie
- *#* Commonize obsolete names for IRQ macros; Doxygen fixes.
+ *#* Revision 1.29  2005/02/16 20:33:24  bernie
+ *#* Preliminary PPC support.
  *#*
- *#* Revision 1.20  2004/11/16 20:33:32  bernie
- *#* CPU_HARVARD: New macro.
+ *#* Revision 1.28  2004/12/31 17:39:41  bernie
+ *#* Fix documentation.
  *#*
- *#* Revision 1.19  2004/10/03 20:43:54  bernie
- *#* Fix Doxygen markup.
+ *#* Revision 1.27  2004/12/31 17:02:47  bernie
+ *#* IRQ_SAVE_DISABLE(), IRQ_RESTORE(): Add null stubs for x86.
  *#*
- *#* Revision 1.18  2004/10/03 18:36:31  bernie
- *#* IRQ_GETSTATE(): New macro; Rename IRQ macros for consistency.
- *#*
- *#* Revision 1.17  2004/09/06 21:48:27  bernie
- *#* ATOMIC(): New macro.
- *#*
- *#* Revision 1.16  2004/08/29 21:58:33  bernie
- *#* Rename BITS_PER_XYZ macros; Add sanity checks.
- *#*
- *#* Revision 1.15  2004/08/25 14:12:08  rasky
- *#* Aggiornato il comment block dei log RCS
- *#*
- *#* Revision 1.14  2004/08/24 13:29:28  bernie
- *#* Trim CVS log; Rename header guards.
- *#*
- *#* Revision 1.12  2004/08/14 19:37:57  rasky
- *#* Merge da SC: macros.h, pool.h, BIT_CHANGE, nome dei processi, etc.
- *#*
- *#* Revision 1.11  2004/08/05 17:39:56  bernie
- *#* Fix a Doxygen tag.
- *#*
- *#* Revision 1.10  2004/08/02 20:20:29  aleph
- *#* Merge from project_ks
+ *#* Revision 1.26  2004/12/13 12:08:12  bernie
+ *#* DISABLE_IRQSAVE, ENABLE_IRQRESTORE, DISABLE_INTS, ENABLE_INTS: Remove obsolete macros.
  *#*
- *#* Revision 1.9  2004/07/30 14:24:16  rasky
- *#* Task switching con salvataggio perfetto stato di interrupt (SR)
- *#* Kernel monitor per dump informazioni su stack dei processi
+ *#* 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
 
-#include "compiler.h" /* for uintXX_t, PP_CAT3(), PP_STRINGIZE() */
+#include "compiler.h" /* for uintXX_t */
 
 
 /*!
@@ -108,6 +74,8 @@
 	#define NOP                     asm volatile ("nop")
 	#define IRQ_DISABLE             /* nothing */
 	#define IRQ_ENABLE              /* nothing */
+	#define IRQ_SAVE_DISABLE(x)     /* nothing */
+	#define IRQ_RESTORE(x)          /* nothing */
 
 	typedef uint32_t cpuflags_t; // FIXME
 	typedef uint32_t cpustack_t;
@@ -119,9 +87,30 @@
 	#define CPU_BYTE_ORDER          CPU_LITTLE_ENDIAN
 	#define CPU_HARVARD		0
 
+#elif CPU_PPC
+	#define NOP                 asm volatile ("nop" ::)
+	#define IRQ_DISABLE         FIXME
+	#define IRQ_ENABLE          FIXME
+	#define IRQ_SAVE_DISABLE(x) FIXME
+	#define IRQ_RESTORE(x)      FIXME
+	#define IRQ_GETSTATE()      FIXME
+
+	typedef uint32_t cpuflags_t; // FIXME
+	typedef uint32_t cpustack_t; // FIXME
+
+	/* Register counts include SREG too */
+	#define CPU_REG_BITS           (CPU_PPC32 ? 32 : 64)
+	#define CPU_REGS_CNT           FIXME
+	#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_DSP56K
 
 	#define NOP                     asm(nop)
+	#define BREAKPOINT              asm(debug)
 	#define IRQ_DISABLE             do { asm(bfset #0x0200,SR); asm(nop); } while (0)
 	#define IRQ_ENABLE              do { asm(bfclr #0x0200,SR); asm(nop); } while (0)
 
@@ -130,6 +119,22 @@
 	#define IRQ_RESTORE(x)  \
 		do { (void)x; asm(move x,SR); } while (0)
 
+	static inline bool irq_running(void)
+	{
+		extern void *user_sp;
+		return !!user_sp;
+	}
+	#define IRQ_RUNNING() irq_running()
+
+	static inline bool irq_getstate(void)
+	{
+		uint16_t x;
+		asm(move SR,x);
+		return !(x & 0x0200);
+	}
+	#define IRQ_GETSTATE() irq_getstate()
+
+
 
 	typedef uint16_t cpuflags_t;
 	typedef unsigned int cpustack_t;
@@ -191,7 +196,7 @@
 	#define CPU_STACK_GROWS_UPWARD  0
 	#define CPU_SP_ON_EMPTY_SLOT    1
 	#define CPU_BYTE_ORDER          CPU_LITTLE_ENDIAN
-	#define CPU_HARVARD		1
+	#define CPU_HARVARD             1
 
 	/*!
 	 * Initialization value for registers in stack frame.
@@ -361,6 +366,11 @@
 #ifndef CPU_BITS_PER_PTR
 #define CPU_BITS_PER_PTR    (SIZEOF_PTR * CPU_BITS_PER_CHAR)
 #endif
+
+#ifndef BREAKPOINT
+#define BREAKPOINT /* nop */
+#endif
+
 /*\}*/
 
 /* Sanity checks for the above definitions */
@@ -371,7 +381,7 @@ STATIC_ASSERT(sizeof(int) == SIZEOF_INT);
 
 
 /*!
- * \def SCHEDULER_IDLE
+ * \def CPU_IDLE
  *
  * \brief Invoked by the scheduler to stop the CPU when idle.
  *