annotation work

diff --git a/tos/lib/safe/include/deputy_no_annots.h b/tos/lib/safe/include/deputy_no_annots.h
index 0a6fb97597be5a048cd16c904a6b6515c4813891..c3adeade836d02fe153ba1aa5eba6fc28f4d0752 100644 (file)
--- a/tos/lib/safe/include/deputy_no_annots.h
+++ b/tos/lib/safe/include/deputy_no_annots.h
@@ -1,9 +1,9 @@
 #define __DEPUTY_BOUND(__lo,__hi)              
 #define __DEPUTY_COUNT(__n)                    
 #define __DEPUTY_SINGLE(__n)                   
-#define __DEPUTY_TRUSTED_CAST(__type,__expr)   
+#define __DEPUTY_TRUSTED_CAST(__type,__expr)   ((__type)(__expr))
 
-#define TC(__type,__expr)                      
+#define TC(__type,__expr)                      __DEPUTY_TRUSTED_CAST(__type,__expr)
 
 #define __DEPUTY_NONNULL                       
 #define __DEPUTY_TRUSTED                       

diff --git a/tos/lib/safe/include/nesc_annots.h b/tos/lib/safe/include/nesc_annots.h
index f0cc00cf94bf7d210e082802396a1bd43ba0010a..5b4220de6c094d93723feb5c78dac2cff5fc23df 100644 (file)
--- a/tos/lib/safe/include/nesc_annots.h
+++ b/tos/lib/safe/include/nesc_annots.h
@@ -1,3 +1,4 @@
 struct @bound @deputy_scope() @macro("__DEPUTY_BOUND") { void *lo, *hi; }; 
 struct @count @deputy_scope() @macro("__DEPUTY_COUNT") { int n; }; 
 struct @single @deputy_scope() @macro("__DEPUTY_SINGLE") { }; 
+struct @nonnull @deputy_scope() @macro("__DEPUTY_NONNULL") { };