[Tinyos-2-commits] CVS: tinyos-2.x/tos/lib/safe/include nesc_no_annots.h, NONE, 1.1 deputy_annots.h, 1.3, 1.4 deputy_no_annots.h, 1.3, 1.4 nesc_annots.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-serv5635/include

Modified Files:
	deputy_annots.h deputy_no_annots.h nesc_annots.h 
Added Files:
	nesc_no_annots.h 
Log Message:
updates to annotations

--- NEW FILE: nesc_no_annots.h ---
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))   

Index: deputy_annots.h
===================================================================
RCS file: /cvsroot/tinyos/tinyos-2.x/tos/lib/safe/include/deputy_annots.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** deputy_annots.h	11 Feb 2008 21:17:04 -0000	1.3
--- deputy_annots.h	14 Feb 2008 18:21:02 -0000	1.4
***************
*** 2,11 ****
  #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))
  #define __DEPUTY_TRUSTEDBLOCK                  __blockattribute__((trusted))
--- 2,6 ----
  #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))

Index: deputy_no_annots.h
===================================================================
RCS file: /cvsroot/tinyos/tinyos-2.x/tos/lib/safe/include/deputy_no_annots.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** deputy_no_annots.h	12 Feb 2008 21:16:00 -0000	1.3
--- deputy_no_annots.h	14 Feb 2008 18:21:02 -0000	1.4
***************
*** 2,11 ****
  #define __DEPUTY_COUNT(__n)                    
  #define __DEPUTY_SINGLE(__n)                   
- #define __DEPUTY_TRUSTED_CAST(__type,__expr)   ((__type)(__expr))
- 
- #define TC(__type,__expr)                      __DEPUTY_TRUSTED_CAST(__type,__expr)
  
! #define __DEPUTY_NONNULL                       
! #define __DEPUTY_TRUSTED                       
! #define __DEPUTY_COPYTYPE                      
  #define __DEPUTY_TRUSTEDBLOCK                  
--- 2,6 ----
  #define __DEPUTY_COUNT(__n)                    
  #define __DEPUTY_SINGLE(__n)                   
  
! #define __DEPUTY_NONNULL(__n)                  
  #define __DEPUTY_TRUSTEDBLOCK                  

Index: nesc_annots.h
===================================================================
RCS file: /cvsroot/tinyos/tinyos-2.x/tos/lib/safe/include/nesc_annots.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** nesc_annots.h	12 Feb 2008 21:16:00 -0000	1.3
--- nesc_annots.h	14 Feb 2008 18:21:02 -0000	1.4
***************
*** 3,4 ****
--- 3,9 ----
  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)))