Changeset 09a0bd4a in mainline

Timestamp:

2010-06-24T13:00:16Z (14 years ago)

Author:

Martin Decky <martin@…>

Branches:

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

Children:

2d03471, 33c4f72

Parents:

e821e49

Message:

initial properties annotation and verification support
(does not do much yet, but also does not stand in the way)

Files:

• kernel/arch/abs32le/include/atomic.h (modified) (5 diffs)
• kernel/arch/abs32le/include/types.h (modified) (1 diff)
• kernel/generic/include/atomic.h (modified) (1 diff)
• kernel/generic/include/verify.h (added)
• tools/checkers/vcc.py (modified) (3 diffs)

kernel/arch/abs32le/include/atomic.h

@@ -39 +39 @@
 #include <arch/barrier.h>
 #include <preemption.h>
+#include <verify.h>
 
-static inline void atomic_inc(atomic_t *val) {
+ATOMIC static inline void atomic_inc(atomic_t *val)
+    REQUIRES(val->count < ATOMIC_COUNT_MAX)
+{
         /* On real hardware the increment has to be done
            as an atomic action. */
@@ -47 +50 @@
 }
 
-static inline void atomic_dec(atomic_t *val) {
+ATOMIC static inline void atomic_dec(atomic_t *val)
+    REQUIRES(val->count > ATOMIC_COUNT_MIN)
+{
         /* On real hardware the decrement has to be done
            as an atomic action. */
         
-        val->count++;
+        val->count--;
 }
 
-static inline atomic_count_t atomic_postinc(atomic_t *val)
+ATOMIC static inline atomic_count_t atomic_postinc(atomic_t *val)
+    REQUIRES(val->count < ATOMIC_COUNT_MAX)
 {
         /* On real hardware both the storing of the previous
@@ -66 +72 @@
 }
 
-static inline atomic_count_t atomic_postdec(atomic_t *val)
+ATOMIC static inline atomic_count_t atomic_postdec(atomic_t *val)
+    REQUIRES(val->count > ATOMIC_COUNT_MIN)
 {
         /* On real hardware both the storing of the previous
@@ -81 +88 @@
 #define atomic_predec(val)  (atomic_postdec(val) - 1)
 
-static inline atomic_count_t test_and_set(atomic_t *val)
+ATOMIC static inline atomic_count_t test_and_set(atomic_t *val)
 {
+        /* On real hardware the retrieving of the original
+           value and storing 1 have to be done as a single
+           atomic action. */
+        
         atomic_count_t prev = val->count;
         val->count = 1;
@@ -88 +99 @@
 }
 
+ATOMIC static inline atomic_count_t arch_atomic_get(atomic_t *val)
+{
+        /* This function is not needed on real hardware, it just
+           duplicates the functionality of atomic_get(). It is
+           defined here because atomic_get() is an inline function
+           declared in a header file which we are included in. */
+        
+        return val->count;
+}
+
 static inline void atomic_lock_arch(atomic_t *val)
 {
         do {
-                while (val->count);
+                while (arch_atomic_get(val));
         } while (test_and_set(val));
 }

kernel/arch/abs32le/include/types.h

@@ -35 +35 @@
 #ifndef KERN_abs32le_TYPES_H_
 #define KERN_abs32le_TYPES_H_
+
+#define ATOMIC_COUNT_MIN  UINT32_MIN
+#define ATOMIC_COUNT_MAX  UINT32_MAX
 
 typedef uint32_t size_t;

kernel/generic/include/atomic.h

@@ -38 +38 @@
 #include <typedefs.h>
 #include <arch/atomic.h>
+#include <verify.h>
 
-static inline void atomic_set(atomic_t *val, atomic_count_t i)
+ATOMIC static inline void atomic_set(atomic_t *val, atomic_count_t i)
 {
         val->count = i;
 }
 
-static inline atomic_count_t atomic_get(atomic_t *val)
+ATOMIC static inline atomic_count_t atomic_get(atomic_t *val)
 {
         return val->count;

tools/checkers/vcc.py

@@ -59 +59 @@
         args = ['gcc', '-E']
         args.extend(options.split())
-        args.append(srcfname)
+        args.extend(['-DCONFIG_VERIFY_VCC=1', srcfname])
         
         # Change working directory
@@ -69 +69 @@
         
         tmpf = file(tmpfname, "w")
+        
+        tmpf.write("__specification(const char * const \\declspec_atomic_inline;)\n\n");
+        
+        tmpf.write("#define __spec_attr(key, value) \\\n");
+        tmpf.write("    __declspec(System.Diagnostics.Contracts.CodeContract.StringVccAttr, \\\n");
+        tmpf.write("        key, value)\n\n");
         
         for line in preproc.splitlines():
@@ -149 +155 @@
                 # Run Vcc
                 print " -- %s --" % srcfname            
-                retval = subprocess.Popen([vcc_path, cygpath(tmpfqname)]).wait()
+                retval = subprocess.Popen([vcc_path, '/pointersize:32', cygpath(tmpfqname)]).wait()
                 
                 if (retval != 0):