more annotation work

diff --git a/tos/lib/safe/include/annots_stage1.h b/tos/lib/safe/include/annots_stage1.h
new file mode 100644 (file)
index 0000000..f7ea1fb
--- /dev/null
+++ b/tos/lib/safe/include/annots_stage1.h
@@ -0,0 +1,27 @@
+#if NESC >= 130
+
+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") { }; 
+
+#define COUNT(x)                               @count(x)
+#define BOUND(x,y)                             @bound(x,y)
+#define SINGLE                                 @single()
+#define NONNULL                                @nonnull()
+
+#ifdef SAFE_TINYOS
+#define TCAST(__type,__expr)                   ((__type)((void * __DEPUTY_TRUSTED __DEPUTY_COPYTYPE)(__expr)))
+#define __DEPUTY_TRUSTED                       __attribute__((trusted))
+#define __DEPUTY_COPYTYPE                      __attribute__((copytype))
+#else
+#define TCAST(__type,__expr)                   ((__type)(__expr))                
+#endif
+
+#else // NESC < 130
+
+#ifdef SAFE_TINYOS
+#error Safe TinyOS requires nesC >= 1.3.0
+#endif
+
+#endif

diff --git a/tos/lib/safe/include/annots_stage2.h b/tos/lib/safe/include/annots_stage2.h
new file mode 100644 (file)
index 0000000..b327022
--- /dev/null
+++ b/tos/lib/safe/include/annots_stage2.h
@@ -0,0 +1,17 @@
+#ifdef SAFE_TINYOS
+
+#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_NONNULL(__n)                  __attribute__((nonnull))
+#define __DEPUTY_TRUSTEDBLOCK                  __blockattribute__((trusted))
+
+#else
+
+#define __DEPUTY_BOUND(__lo,__hi)              
+#define __DEPUTY_COUNT(__n)                    
+#define __DEPUTY_SINGLE(__n)                   
+#define __DEPUTY_NONNULL(__n)                  
+#define __DEPUTY_TRUSTEDBLOCK                  
+
+#endif

diff --git a/tos/lib/safe/include/deputy_annots.h b/tos/lib/safe/include/deputy_annots.h
deleted file mode 100644 (file)
index 15b6f1c..0000000
--- a/tos/lib/safe/include/deputy_annots.h
+++ /dev/null
@@ -1,6 +0,0 @@
-#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_NONNULL(__n)                  __attribute__((nonnull))
-#define __DEPUTY_TRUSTEDBLOCK                  __blockattribute__((trusted))

diff --git a/tos/lib/safe/include/deputy_no_annots.h b/tos/lib/safe/include/deputy_no_annots.h
deleted file mode 100644 (file)
index f6ac7c2..0000000
--- a/tos/lib/safe/include/deputy_no_annots.h
+++ /dev/null
@@ -1,6 +0,0 @@
-#define __DEPUTY_BOUND(__lo,__hi)              
-#define __DEPUTY_COUNT(__n)                    
-#define __DEPUTY_SINGLE(__n)                   
-
-#define __DEPUTY_NONNULL(__n)                  
-#define __DEPUTY_TRUSTEDBLOCK                  

diff --git a/tos/lib/safe/include/nesc_annots.h b/tos/lib/safe/include/nesc_annots.h
deleted file mode 100644 (file)
index b918a54..0000000
--- a/tos/lib/safe/include/nesc_annots.h
+++ /dev/null
@@ -1,9 +0,0 @@
-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") { }; 
-
-#define __DEPUTY_TRUSTED                       __attribute__((trusted))
-#define __DEPUTY_COPYTYPE                      __attribute__((copytype))
-#define TC(__type,__expr)                      __DEPUTY_TRUSTED_CAST(__type,__expr)
-#define __DEPUTY_TRUSTED_CAST(__type,__expr)   ((__type)((void * __DEPUTY_TRUSTED __DEPUTY_COPYTYPE)(__expr)))

diff --git a/tos/lib/safe/include/nesc_no_annots.h b/tos/lib/safe/include/nesc_no_annots.h
deleted file mode 100644 (file)
index 4256564..0000000
--- a/tos/lib/safe/include/nesc_no_annots.h
+++ /dev/null
@@ -1,9 +0,0 @@
-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") { }; 
-
-#define __DEPUTY_TRUSTED                       
-#define __DEPUTY_COPYTYPE                      
-#define TC(__type,__expr)                      __DEPUTY_TRUSTED_CAST(__type,__expr)   
-#define __DEPUTY_TRUSTED_CAST(__type,__expr)   ((__type)(__expr))