X-Git-Url: https://codewiz.org/gitweb?a=blobdiff_plain;f=bertos%2Fcfg%2Fdebug.h;h=2fefc1b1468c68ed509503ec52c67abfc428c4c2;hb=c439c5c30317f0210ca62fd32b6d841037f544c9;hp=0c8bfec09e75effc8d830d6acd853ffd36d9f9e4;hpb=4cc44c9888a0336b9d01121ec0b7ad95f4a76195;p=bertos.git

diff --git a/bertos/cfg/debug.h b/bertos/cfg/debug.h
index 0c8bfec0..2fefc1b1 100644
--- a/bertos/cfg/debug.h
+++ b/bertos/cfg/debug.h
@@ -38,6 +38,12 @@
  *
  * \version $Id$
  * \author Bernie Innocenti <bernie@codewiz.org>
+ *
+ * $WIZ$ module_name = "debug"
+ * $WIZ$ module_configuration = "bertos/cfg/cfg_debug.h"
+ * $WIZ$ DEBUG = 1
+ * $WIZ$ module_depends = "formatwr"
+ * $WIZ$ module_supports = "not atmega103"
  */
 
 #ifndef BERTOS_DEBUG_H
@@ -129,7 +135,7 @@
 	void __init_wall(long *wall, int size);
 
 	#if CPU_HARVARD
-		#include <mware/pgm.h>
+		#include <cpu/pgm.h>
 		void kputs_P(const char *PROGMEM str);
 		void kprintf_P(const char *PROGMEM fmt, ...) FORMAT(__printf__, 1, 2);
 		int __bassert_P(const char *PROGMEM cond, const char *PROGMEM file, int line);
@@ -168,15 +174,24 @@
 	 * The assumption here is that valid pointers never point to low
 	 * memory regions.  This helps catching pointers taken from
 	 * struct/class memebers when the struct pointer was NULL.
+	 *
+	 * \see ASSERT_VALID_PTR_OR_NULL()
 	 */
-	#define ASSERT_VALID_PTR(p)         ((void)(LIKELY((p) >= 0x200) ? 0 : __invalid_ptr(p, #p, THIS_FILE, __LINE__)))
+	#define ASSERT_VALID_PTR(p) ((void)(LIKELY((void *)(p) >= (void *)CPU_RAM_START) \
+		? 0 : __invalid_ptr(p, #p, THIS_FILE, __LINE__)))
 
 	/**
 	 * Check that the given pointer is not pointing to invalid memory.
 	 *
+	 * \note The check for invalid memory is architecture specific and
+	 *       conservative.  The current implementation only checks against
+	 *       a lower bound.
+	 *
 	 * \see ASSERT_VALID_PTR()
 	 */
-	#define ASSERT_VALID_PTR_OR_NULL(p) ((void)(LIKELY((p == NULL) || ((p) >= 0x200)) ? 0 : __invalid_ptr((p), #p, THIS_FILE, __LINE__)))
+	#define ASSERT_VALID_PTR_OR_NULL(p) ((void)(LIKELY((p == NULL) \
+		|| ((void *)(p) >= (void *)CPU_RAM_START)) \
+		? 0 : __invalid_ptr((p), #p, THIS_FILE, __LINE__)))
 
 	#if !CONFIG_KDEBUG_DISABLE_TRACE
 		#define TRACE  __trace(__func__)