Changeset fc81981 in mainline

Timestamp:

2010-06-25T14:49:42Z (14 years ago)

Author:

Martin Decky <martin@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

decfbe56

Parents:

33c4f72

Message:

add and improve annotations

Files:

• kernel/arch/abs32le/include/interrupt.h (modified) (4 diffs)
• kernel/arch/abs32le/include/mm/page.h (modified) (2 diffs)
• kernel/generic/include/verify.h (modified) (1 diff)
• tools/checkers/vcc.h (modified) (2 diffs)

kernel/arch/abs32le/include/interrupt.h

@@ -54 +54 @@
 
 static inline int istate_from_uspace(istate_t *istate)
+    REQUIRES_EXTENT_MUTABLE(istate)
 {
         /* On real hardware this checks whether the interrupted
@@ -62 +63 @@
 
 static inline void istate_set_retaddr(istate_t *istate, uintptr_t retaddr)
+    WRITES(&istate->ip)
 {
         /* On real hardware this sets the instruction pointer. */
@@ -69 +71 @@
 
 static inline unative_t istate_get_pc(istate_t *istate)
+    REQUIRES_EXTENT_MUTABLE(istate)
 {
         /* On real hardware this returns the instruction pointer. */
@@ -76 +79 @@
 
 static inline unative_t istate_get_fp(istate_t *istate)
+    REQUIRES_EXTENT_MUTABLE(istate)
 {
         /* On real hardware this returns the frame pointer. */

kernel/arch/abs32le/include/mm/page.h

@@ -140 +140 @@
 
 static inline unsigned int get_pt_flags(pte_t *pt, size_t i)
+    REQUIRES_ARRAY_MUTABLE(pt, PTL0_ENTRIES_ARCH)
 {
         pte_t *p = &pt[i];
@@ -155 +156 @@
 
 static inline void set_pt_flags(pte_t *pt, size_t i, int flags)
+    WRITES(ARRAY_RANGE(pt, PTL0_ENTRIES_ARCH))
+    REQUIRES_ARRAY_MUTABLE(pt, PTL0_ENTRIES_ARCH)
 {
         pte_t *p = &pt[i];

kernel/generic/include/verify.h

@@ -40 +40 @@
 
 #define ATOMIC         __specification_attr("atomic_inline", "")
-#define READS(...)     __specification(reads(__VA_ARGS__))
-#define WRITES(...)    __specification(writes(__VA_ARGS__))
+
+#define READS(ptr)     __specification(reads(ptr))
+#define WRITES(ptr)    __specification(writes(ptr))
 #define REQUIRES(...)  __specification(requires __VA_ARGS__)
 
-#define REQUIRES_EXTENT_MUTABLE(...) \
-        REQUIRES(\extent_mutable(__VA_ARGS__))
+#define EXTENT(ptr)              \extent(ptr)
+#define ARRAY_RANGE(ptr, nmemb)  \array_range(ptr, nmemb)
+
+#define REQUIRES_EXTENT_MUTABLE(ptr) \
+        REQUIRES(\extent_mutable(ptr))
+
+#define REQUIRES_ARRAY_MUTABLE(ptr, nmemb) \
+        REQUIRES(\mutable_array(ptr, nmemb))
 
 #else /* CONFIG_VERIFY_VCC */
 
 #define ATOMIC
-#define READS(...)
-#define WRITES(...)
+
+#define READS(ptr)
+#define WRITES(ptr)
 #define REQUIRES(...)
 
-#define REQUIRES_EXTENT_MUTABLE(...)
+#define EXTENT(ptr)
+#define ARRAY_RANGE(ptr, nmemb)
+
+#define REQUIRES_EXTENT_MUTABLE(ptr)
+#define REQUIRES_ARRAY_MUTABLE(ptr, nmemb)
 
 #endif /* CONFIG_VERIFY_VCC */

tools/checkers/vcc.h

@@ -54 +54 @@
 __specification(typedef void * \object;)
 __specification(typedef __int64 \integer;)
+__specification(typedef unsigned __int64 \size_t;)
 
 __specification_type(objset)
@@ -66 +67 @@
 
 __specification(bool \extent_mutable(\object);)
+__specification(\objset \extent(\object);)
+__specification(\objset \array_range(\object, \size_t);)
+__specification(bool \mutable_array(\object, \size_t);)
 
 #endif