X-Git-Url: https://codewiz.org/gitweb?a=blobdiff_plain;f=bertos%2Fcfg%2Fdebug.h;h=4aa33639d5765d3cf4c87461bf41aecb826d563c;hb=c5478437ae3b87dd00978e2644d635559e0a1f92;hp=02c0489460bc30ce008a3ea797d40d7c14467a0e;hpb=33b33ae4a68da6dba63e2cdff3c42edfcfc5ba89;p=bertos.git

diff --git a/bertos/cfg/debug.h b/bertos/cfg/debug.h
index 02c04894..4aa33639 100644
--- a/bertos/cfg/debug.h
+++ b/bertos/cfg/debug.h
@@ -129,7 +129,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,16 +168,23 @@
 	 * 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) >= (void *)CPU_RAM_START) \
+	#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) >= (void *)CPU_RAM_START)) \
+	#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