Annotation improvements, and add deputy_no_annots.h which causes CPP

to take an app.c and squash all annotations.

diff --git a/tos/lib/safe/include/deputy_annots.h b/tos/lib/safe/include/deputy_annots.h
index 4667f1fae3097c0f1257fd6ffa1c515753d65718..2b20b90854eef748610a8f42fd42527e2a2e7827 100644 (file)
--- a/tos/lib/safe/include/deputy_annots.h
+++ b/tos/lib/safe/include/deputy_annots.h
@@ -1,6 +1,10 @@
 #define __DEPUTY_BOUND(__lo,__hi)              __attribute__((bounds((__lo),(__hi))))
-#define __DEPUTY_COUNT(__n)                    _DEPUTY_BOUND(__this, __this + (__n))
-#define __DEPUTY_SINGLE(__n)                   _DEPUTY_COUNT(1)
-#define __DEPUTY_TRUSTED_CAST(__type,__expr)   ((__type)((void * TRUSTED COPYTYPE)(__expr)))
+#define __DEPUTY_COUNT(__n)                    __DEPUTY_BOUND(__this, __this + (__n))
+#define __DEPUTY_SINGLE(__n)                   __DEPUTY_COUNT(1)
+#define __DEPUTY_TRUSTED_CAST(__type,__expr)   ((__type)((void * __DEPUTY_TRUSTED __DEPUTY_COPYTYPE)(__expr)))
 
 #define TC(__type,__expr)                      __DEPUTY_TRUSTED_CAST(__type,__expr)
+
+#define __DEPUTY_NONNULL                       __attribute__((nonnull))
+#define __DEPUTY_TRUSTED                       __attribute__((trusted))
+#define __DEPUTY_COPYTYPE                      __attribute__((copytype))

diff --git a/tos/lib/safe/include/deputy_no_annots.h b/tos/lib/safe/include/deputy_no_annots.h
new file mode 100644 (file)
index 0000000..ecb3c71
--- /dev/null
+++ b/tos/lib/safe/include/deputy_no_annots.h
@@ -0,0 +1,6 @@
+#define __DEPUTY_BOUND(__lo,__hi)              
+#define __DEPUTY_COUNT(__n)                    
+#define __DEPUTY_SINGLE(__n)                   
+#define __DEPUTY_TRUSTED_CAST(__type,__expr)   
+
+#define TC(__type,__expr)                      __DEPUTY_TRUSTED_CAST(__type,__expr)

diff --git a/tos/lib/safe/include/nesc_annots.h b/tos/lib/safe/include/nesc_annots.h
index 2b25e10053a9b806780d8cecc3a9f7edb108b2a1..f0cc00cf94bf7d210e082802396a1bd43ba0010a 100644 (file)
--- a/tos/lib/safe/include/nesc_annots.h
+++ b/tos/lib/safe/include/nesc_annots.h
@@ -1,3 +1,3 @@
-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 @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") { };