Changeset bf61d3a in mainline for kernel/generic/include

Timestamp:

2010-11-26T01:34:21Z (15 years ago)

Author:

Martin Decky <martin@…>

Branches:

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

Children:

273b958

Parents:

4b9a410 (diff), 7e752b2 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

merge compile-time printf() argument checking, fixes of actual printf() arguments and related modifications

Location:

kernel/generic/include

Files:

• config.h (modified) (1 diff)
• cpu.h (modified) (1 diff)
• interrupt.h (modified) (2 diffs)
• panic.h (modified) (2 diffs)
• print.h (modified) (1 diff)
• stdint.h (modified) (1 diff)
• synch/spinlock.h (modified) (1 diff)
• sysinfo/abi.h (modified) (1 diff)
• typedefs.h (modified) (2 diffs)

kernel/generic/include/config.h

@@ -66 +66 @@
 
 typedef struct {
-        size_t cpu_count;            /**< Number of processors detected. */
+        unsigned int cpu_count;      /**< Number of processors detected. */
         volatile size_t cpu_active;  /**< Number of processors that are up and running. */
         

kernel/generic/include/cpu.h

@@ -83 +83 @@
          * Processor ID assigned by kernel.
          */
-        size_t id;
+        unsigned int id;
         
         bool active;

kernel/generic/include/interrupt.h

@@ -37 +37 @@
 
 #include <arch/interrupt.h>
+#include <print.h>
 #include <typedefs.h>
 #include <proc/task.h>
@@ -57 +58 @@
 extern exc_table_t exc_table[];
 
-extern void fault_if_from_uspace(istate_t *, const char *, ...);
+extern void fault_if_from_uspace(istate_t *, const char *, ...)
+    PRINTF_ATTRIBUTE(2, 3);
 extern iroutine_t exc_register(unsigned int, const char *, bool, iroutine_t);
 extern void exc_dispatch(unsigned int, istate_t *);

kernel/generic/include/panic.h

@@ -37 +37 @@
 
 #include <typedefs.h>
+#include <print.h>
 
 #define panic(fmt, ...) \
@@ -62 +63 @@
 
 extern void panic_common(panic_category_t, struct istate *, int,
-    uintptr_t, const char *, ...) __attribute__ ((noreturn));
+    uintptr_t, const char *, ...) __attribute__ ((noreturn))
+    PRINTF_ATTRIBUTE(5, 6);
 
 #endif

kernel/generic/include/print.h

@@ -39 +39 @@
 #include <stdarg.h>
 
+#ifndef NVERIFY_PRINTF
+
+#define PRINTF_ATTRIBUTE(start, end) \
+        __attribute__((format(gnu_printf, start, end)))
+
+#else /* NVERIFY_PRINTF */
+
+#define PRINTF_ATTRIBUTE(start, end)
+
+#endif /* NVERIFY_PRINTF */
+
 #define EOF  (-1)
 
 extern int puts(const char *s);
-extern int printf(const char *fmt, ...);
-extern int snprintf(char *str, size_t size, const char *fmt, ...);
+extern int printf(const char *fmt, ...)
+    PRINTF_ATTRIBUTE(1, 2);
+extern int snprintf(char *str, size_t size, const char *fmt, ...)
+    PRINTF_ATTRIBUTE(3, 4);
 
 extern int vprintf(const char *fmt, va_list ap);

kernel/generic/include/stdint.h

@@ -36 +36 @@
 #define KERN_STDINT_H_
 
-#define INT8_MIN  (0x80)
-#define INT8_MAX  (0x7F)
+#define INT8_MIN  INT8_C(0x80)
+#define INT8_MAX  INT8_C(0x7F)
 
-#define UINT8_MIN  (0u)
-#define UINT8_MAX  (0xFFu)
+#define UINT8_MIN  UINT8_C(0)
+#define UINT8_MAX  UINT8_C(0xFF)
 
-#define INT16_MIN  (0x8000)
-#define INT16_MAX  (0x7FFF)
+#define INT16_MIN  INT16_C(0x8000)
+#define INT16_MAX  INT16_C(0x7FFF)
 
-#define UINT16_MIN  (0u)
-#define UINT16_MAX  (0xFFFFu)
+#define UINT16_MIN  UINT16_C(0)
+#define UINT16_MAX  UINT16_C(0xFFFF)
 
-#define INT32_MIN  (0x80000000l)
-#define INT32_MAX  (0x7FFFFFFFl)
+#define INT32_MIN  INT32_C(0x80000000)
+#define INT32_MAX  INT32_C(0x7FFFFFFF)
 
-#define UINT32_MIN  (0ul)
-#define UINT32_MAX  (0xFFFFFFFFul)
+#define UINT32_MIN  UINT32_C(0)
+#define UINT32_MAX  UINT32_C(0xFFFFFFFF)
 
-#define INT64_MIN  (0x8000000000000000ll)
-#define INT64_MAX  (0x7FFFFFFFFFFFFFFFll)
+#define INT64_MIN  INT64_C(0x8000000000000000)
+#define INT64_MAX  INT64_C(0x7FFFFFFFFFFFFFFF)
 
-#define UINT64_MIN  (0ull)
-#define UINT64_MAX  (0xFFFFFFFFFFFFFFFFull)
+#define UINT64_MIN  UINT64_C(0)
+#define UINT64_MAX  UINT64_C(0xFFFFFFFFFFFFFFFF)
 
 #endif

kernel/generic/include/synch/spinlock.h

@@ -146 +146 @@
         if ((pname)++ > (value)) { \
                 (pname) = 0; \
-                printf("Deadlock probe %s: exceeded threshold %u\n", \
+                printf("Deadlock probe %s: exceeded threshold %u\n" \
                     "cpu%u: function=%s, line=%u\n", \
                     #pname, (value), CPU->id, __func__, __LINE__); \

kernel/generic/include/sysinfo/abi.h

@@ -66 +66 @@
  */
 typedef struct {
-        size_t id;               /**< CPU ID as stored by kernel */
+        unsigned int id;         /**< CPU ID as stored by kernel */
         bool active;             /**< CPU is activate */
         uint16_t frequency_mhz;  /**< Frequency in MHz */

kernel/generic/include/typedefs.h

@@ -40 +40 @@
 #include <arch/types.h>
 
-#define NULL    ((void *) 0)
+#define NULL  ((void *) 0)
 
 #define false  0
@@ -69 +69 @@
 typedef int32_t devno_t;
 
-typedef int32_t wchar_t;
-
 typedef volatile uint8_t ioport8_t;
 typedef volatile uint16_t ioport16_t;