[Tinyos-2-commits] CVS: tinyos-2.x/tos/lib/safe/include annots_stage1.h, 1.7, 1.8 annots_stage2.h, 1.3, 1.4

[John Regehr]

Update of /cvsroot/tinyos/tinyos-2.x/tos/lib/safe/include
In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv21816/tos/lib/safe/include

Modified Files:
	annots_stage1.h annots_stage2.h 
Log Message:
change FAT annotations to BND

Index: annots_stage1.h
===================================================================
RCS file: /cvsroot/tinyos/tinyos-2.x/tos/lib/safe/include/annots_stage1.h,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** annots_stage1.h	4 Jun 2008 03:46:24 -0000	1.7
--- annots_stage1.h	4 Jun 2008 19:22:33 -0000	1.8
***************
*** 12,17 ****
  
  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 @count @deputy_scope() @macro("__DEPUTY_COUNT") { int n; }; 
  struct @count_nok @deputy_scope() @macro("__DEPUTY_COUNT_NOK") { int n; }; 
--- 12,17 ----
  
  struct @nonnull @deputy_scope() @macro("__DEPUTY_NONNULL") { }; 
! 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; }; 
***************
*** 22,27 ****
  
  #define NONNULL                                @nonnull()
! #define FAT(x,y)                               @fat(x,y)
! #define FAT_NOK(x,y)                           @fat_nok(x,y)
  #define COUNT(x)                               @count(x)
  #define COUNT_NOK(x)                           @count_nok(x)
--- 22,27 ----
  
  #define NONNULL                                @nonnull()
! #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)
***************
*** 39,44 ****
  
  #define NONNULL                                
! #define FAT(x,y)                             
! #define FAT_NOK(x,y)                             
  #define COUNT(x)                               
  #define COUNT_NOK(x)                               
--- 39,44 ----
  
  #define NONNULL                                
! #define BND(x,y)                             
! #define BND_NOK(x,y)                             
  #define COUNT(x)                               
  #define COUNT_NOK(x)                               

Index: annots_stage2.h
===================================================================
RCS file: /cvsroot/tinyos/tinyos-2.x/tos/lib/safe/include/annots_stage2.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** annots_stage2.h	31 May 2008 20:19:46 -0000	1.3
--- annots_stage2.h	4 Jun 2008 19:22:33 -0000	1.4
***************
*** 5,11 ****
  
  #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_COUNT(__n)                    __DEPUTY_NONNULL(__n) __DEPUTY_COUNT_NOK(__n)
  #define __DEPUTY_ONE_NOK(__n)                  __DEPUTY_COUNT_NOK(1)
--- 5,11 ----
  
  #define __DEPUTY_NONNULL(__n)                  __attribute__((nonnull))
! #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)
***************
*** 18,23 ****
  
  #define __DEPUTY_NONNULL(__n)                  
! #define __DEPUTY_FAT_NOK(__lo,__hi)              
! #define __DEPUTY_FAT(__lo,__hi)              
  #define __DEPUTY_COUNT_NOK(__n)                    
  #define __DEPUTY_COUNT(__n)                    
--- 18,23 ----
  
  #define __DEPUTY_NONNULL(__n)                  
! #define __DEPUTY_BND_NOK(__lo,__hi)              
! #define __DEPUTY_BND(__lo,__hi)              
  #define __DEPUTY_COUNT_NOK(__n)                    
  #define __DEPUTY_COUNT(__n)