change FAT annotations to BND

diff --git a/tos/chips/atm128/adc/AdcStreamP.nc b/tos/chips/atm128/adc/AdcStreamP.nc
index 3e25c49577fe167520c459455a1d4f3c5e802adb..dae467e350c114273e43014a94310de3ea9c6964 100644 (file)
--- a/tos/chips/atm128/adc/AdcStreamP.nc
+++ b/tos/chips/atm128/adc/AdcStreamP.nc
@@ -76,7 +76,7 @@ implementation {
 
   norace uint16_t count;
   norace uint16_t * COUNT_NOK(count) buffer; 
-  norace uint16_t * FAT_NOK(buffer, buffer+count) pos;
+  norace uint16_t * BND_NOK(buffer, buffer+count) pos;
   norace uint32_t now, period;
 
 

diff --git a/tos/chips/msp430/adc12/AdcStreamP.nc b/tos/chips/msp430/adc12/AdcStreamP.nc
index 52b9df34c9571b8df789d8586af0951160ef72a0..864f6786cc1fcc9db9b68d79cd2c491f4dc2ee25 100644 (file)
--- a/tos/chips/msp430/adc12/AdcStreamP.nc
+++ b/tos/chips/msp430/adc12/AdcStreamP.nc
@@ -75,7 +75,7 @@ implementation {
 
   norace uint16_t count;
   norace uint16_t * COUNT_NOK(count) buffer; 
-  norace uint16_t * FAT_NOK(buffer, buffer+count) pos;
+  norace uint16_t * BND_NOK(buffer, buffer+count) pos;
   norace uint32_t now, period;
   norace bool periodModified;
 

diff --git a/tos/chips/msp430/adc12/Msp430Adc12ImplP.nc b/tos/chips/msp430/adc12/Msp430Adc12ImplP.nc
index a6ac26e6aa80e86c4aac8c1ff9c478662cf15539..c2fd4bbfbf848c99c9776cee5c0bdf99e8e6ec2e 100644 (file)
--- a/tos/chips/msp430/adc12/Msp430Adc12ImplP.nc
+++ b/tos/chips/msp430/adc12/Msp430Adc12ImplP.nc
@@ -81,7 +81,7 @@ implementation
   
   uint16_t resultBufferLength;    /* length of buffer */
   uint16_t *COUNT_NOK(resultBufferLength) resultBufferStart;
-  uint16_t *FAT_NOK(resultBufferStart, resultBufferStart+resultBufferLength) resultBuffer;         /* conversion results */
+  uint16_t *BND_NOK(resultBufferStart, resultBufferStart+resultBufferLength) resultBuffer;         /* conversion results */
   uint16_t resultBufferIndex;     /* offset into buffer */
   uint8_t numChannels;            /* number of channels (multi-channel conversion) */
   uint8_t clientID;               /* ID of client that called getData() */

diff --git a/tos/lib/safe/include/annots_stage1.h b/tos/lib/safe/include/annots_stage1.h
index bdfa61ccb6a1bd0b86950bb0c119a4bef997e309..c1278895c4f1777ba026b60f00d5c602351e6dd1 100644 (file)
--- a/tos/lib/safe/include/annots_stage1.h
+++ b/tos/lib/safe/include/annots_stage1.h
@@ -11,8 +11,8 @@
 #if NESC >= 130
 
 struct @nonnull @deputy_scope() @macro("__DEPUTY_NONNULL") { }; 
-struct @fat @deputy_scope() @macro("__DEPUTY_FAT") { void *lo, *hi; }; 
-struct @fat_nok @deputy_scope() @macro("__DEPUTY_FAT_NOK") { void *lo, *hi; }; 
+struct @bnd @deputy_scope() @macro("__DEPUTY_BND") { void *lo, *hi; }; 
+struct @bnd_nok @deputy_scope() @macro("__DEPUTY_BND_NOK") { void *lo, *hi; }; 
 struct @count @deputy_scope() @macro("__DEPUTY_COUNT") { int n; }; 
 struct @count_nok @deputy_scope() @macro("__DEPUTY_COUNT_NOK") { int n; }; 
 struct @one @deputy_scope() @macro("__DEPUTY_ONE") { }; 
@@ -21,8 +21,8 @@ struct @dmemset @deputy_scope() @macro("__DEPUTY_DMEMSET") {void *p; int what; s
 struct @dmemcpy @deputy_scope() @macro("__DEPUTY_DMEMCPY") {void *dst; void *src; size_t sz; };
 
 #define NONNULL                                @nonnull()
-#define FAT(x,y)                               @fat(x,y)
-#define FAT_NOK(x,y)                           @fat_nok(x,y)
+#define BND(x,y)                               @bnd(x,y)
+#define BND_NOK(x,y)                           @bnd_nok(x,y)
 #define COUNT(x)                               @count(x)
 #define COUNT_NOK(x)                           @count_nok(x)
 #define ONE                                    @one()
@@ -38,8 +38,8 @@ struct @dmemcpy @deputy_scope() @macro("__DEPUTY_DMEMCPY") {void *dst; void *src
 #endif
 
 #define NONNULL                                
-#define FAT(x,y)                             
-#define FAT_NOK(x,y)                             
+#define BND(x,y)                             
+#define BND_NOK(x,y)                             
 #define COUNT(x)                               
 #define COUNT_NOK(x)                               
 #define ONE 

diff --git a/tos/lib/safe/include/annots_stage2.h b/tos/lib/safe/include/annots_stage2.h
index cf7717644656268ac698f98117fc073ca31d365c..d2885a3e7e89ff1f3f815016abff3723874c06a1 100644 (file)
--- a/tos/lib/safe/include/annots_stage2.h
+++ b/tos/lib/safe/include/annots_stage2.h
@@ -4,9 +4,9 @@
 #ifdef SAFE_TINYOS
 
 #define __DEPUTY_NONNULL(__n)                  __attribute__((nonnull))
-#define __DEPUTY_FAT_NOK(__lo,__hi)            __attribute__((bounds((__lo),(__hi))))
-#define __DEPUTY_FAT(__lo,__hi)                __DEPUTY_NONNULL(__n) __DEPUTY_FAT_NOK(__lo,__hi)
-#define __DEPUTY_COUNT_NOK(__n)                __DEPUTY_FAT_NOK(__this, __this + (__n))
+#define __DEPUTY_BND_NOK(__lo,__hi)            __attribute__((bounds((__lo),(__hi))))
+#define __DEPUTY_BND(__lo,__hi)                __DEPUTY_NONNULL(__n) __DEPUTY_BND_NOK(__lo,__hi)
+#define __DEPUTY_COUNT_NOK(__n)                __DEPUTY_BND_NOK(__this, __this + (__n))
 #define __DEPUTY_COUNT(__n)                    __DEPUTY_NONNULL(__n) __DEPUTY_COUNT_NOK(__n)
 #define __DEPUTY_ONE_NOK(__n)                  __DEPUTY_COUNT_NOK(1)
 #define __DEPUTY_ONE(__n)                      __DEPUTY_NONNULL(__n) __DEPUTY_ONE_NOK(__n)
@@ -17,8 +17,8 @@
 #else 
 
 #define __DEPUTY_NONNULL(__n)                  
-#define __DEPUTY_FAT_NOK(__lo,__hi)              
-#define __DEPUTY_FAT(__lo,__hi)              
+#define __DEPUTY_BND_NOK(__lo,__hi)              
+#define __DEPUTY_BND(__lo,__hi)              
 #define __DEPUTY_COUNT_NOK(__n)                    
 #define __DEPUTY_COUNT(__n)                    
 #define __DEPUTY_ONE_NOK(__n)