assert fix in kernel and user level (assert()s in vm.c all fail - don't

use this code yet.)

src/components/implementation/no_interface/blk/Makefile

@@ -2,7 +2,7 @@ C_OBJS=blk.o
 ASM_OBJS=
 COMPONENT=b.o
 INTERFACES=
-DEPENDENCIES=timed_blk sched
+DEPENDENCIES=timed_blk sched printc
 IF_LIB=
 
 include ../../Makefile.subsubdir

src/components/include/cos_debug.h

@@ -1,4 +1,5 @@
 #ifndef COS_DEBUG_H
+#define COS_DEBUG_H
 
 #include <cos_component.h>
 #include <cos_config.h>
@@ -19,18 +20,12 @@
 #define BUG() do { debug_print("BUG @ "); *((int *)0) = 0; } while (0);
 
 #ifdef DEBUG
-#ifndef assert
 /* 
  * Tell the compiler that we will not return, thus it can make the
  * static assertion that the condition is true past the assertion.
  */
 __attribute__ ((noreturn)) static inline void __cos_noret(void) { while (1) ; }
-#ifdef COS_PLATFORM == LINUX
-#define assert(node) do { if (unlikely(!(node))) { debug_print("FIXME: assert error in @ "); /* *((int *)0) = 0 ; */ call_cap(0,0,0,0,0); /* FIXME: remove the return when we have fault handling. */ __cos_noret(); } } while(0)
-#else
 #define assert(node) do { if (unlikely(!(node))) { debug_print("FIXME: assert error in @ "); *((int *)0) = 0; __cos_noret(); } } while(0)
-#endif
-#endif
 #ifndef BUG_ON
 #define BUG_ON(c) assert(!(c))
 #endif

src/kernel/include/debug.h

@@ -11,23 +11,21 @@
 #define likely(x)       __builtin_expect(!!(x), 1)
 #endif
 
-#ifdef __KERNEL__
+#ifndef die
+__attribute__ ((noreturn)) static inline void __kern_noret(void) { while (1) ; }
+#define die(fmt, ...) do {                 \
+    printk(fmt, ##__VA_ARGS__);            \
+    (*(int *)0) = 0;                       \
+    __kern_noret();                        \
+} while (0)
+#endif
+
 #ifdef COS_DEBUG
-#define assert(node) \
-	do {								\
-		if(likely((node))) break;				\
-		WARN_ON(unlikely(!(node)));				\
-		BUG();							\
-	} while(0);
 #define printd(str,args...) printk(str, ## args)
-/*#else
-  #define printd(str,args...) printf(str, ## args)*/
+#define assert(node) do { \
+	if(unlikely(!(node))) die("%s:%s:%d - Assertion '%s' failed\n", __FILE__, __func__, __LINE__, #node); \
+} while (0)
 #else
 #define assert(a) (void)0
 #define printd(str,args...) 
 #endif
-#endif
-
-#ifndef assert
-#define assert(a)
-#endif

src/kernel/include/shared/cos_types.h

@@ -16,7 +16,6 @@
 
 #include "./consts.h"
 #include "./cos_config.h"
-#include "../debug.h"
 
 #ifndef COS_BASE_TYPES
 #define COS_BASE_TYPES

src/kernel/tcap.c

@@ -40,7 +40,6 @@ static int
 tcap_delete(struct tcap *s, struct tcap *tcap)
 {
 	assert(s && tcap);
-	assert(tcap < &s->tcaps[TCAP_MAX] && tcap >= &s->tcaps[0]);
 	/* Can't delete your persistent tcap! */
 	if (s == tcap) return -1;
 	/* tcap still holds a reference to a child */

src/platform/i386/boot_comp.c

@@ -1,4 +1,3 @@
-#include "assert.h"
 #include "kernel.h"
 #include "boot_comp.h"
 #include "chal_cpu.h"

src/platform/i386/kernel.c

@@ -1,4 +1,3 @@
-#include "assert.h"
 #include "kernel.h"
 #include "multiboot.h"
 #include "string.h"

src/platform/i386/kernel.h

@@ -10,6 +10,7 @@
 #include <thd.h>
 
 /* A not so nice way of oopsing */
+#undef die
 #define die(fmt, ...) do {              \
     printk(fmt,##__VA_ARGS__);   \
     khalt();				\

src/platform/i386/vm.c

@@ -46,8 +46,8 @@ kern_retype_initial(void)
 {
 	u8_t *k;
 
-	assert(mem_bootc_start() % RETYPE_MEM_NPAGES == 0);
-	assert(mem_bootc_end()   % RETYPE_MEM_NPAGES == 0);
+	assert((int)mem_bootc_start() % RETYPE_MEM_NPAGES == 0);
+	assert((int)mem_bootc_end()   % RETYPE_MEM_NPAGES == 0);
 	for (k = mem_bootc_start() ; k < mem_bootc_end() ; k += PAGE_SIZE * RETYPE_MEM_NPAGES) {
 		if (retypetbl_retype2user((void*)(chal_va2pa(k)))) assert(0);
 	}