Changeset 8cc4ddb in mainline for kernel/generic

Timestamp:

2011-08-28T21:16:54Z (14 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

0f0f8bc

Parents:

1a5b252 (diff), 36e2b55 (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 mainline changes.

Location:

kernel/generic

Files:

• include/ipc/ipc.h (modified) (1 diff)
• include/sysinfo/sysinfo.h (modified) (2 diffs)
• include/typedefs.h (modified) (2 diffs)
• src/mm/slab.c (modified) (1 diff)
• src/printf/printf_core.c (modified) (5 diffs)
• src/syscall/syscall.c (modified) (1 diff)
• src/sysinfo/sysinfo.c (modified) (1 diff)

kernel/generic/include/ipc/ipc.h

@@ -36 +36 @@
 #define KERN_IPC_H_
 
-#include <abi/ipc/ipc.h>
 #include <synch/spinlock.h>
 #include <synch/mutex.h>
 #include <synch/waitq.h>
+#include <abi/ipc/ipc.h>
+#include <abi/proc/task.h>
 #include <typedefs.h>
 
-#define IPC_MAX_PHONES  32
+#define IPC_MAX_PHONES  64
 
 struct answerbox;

kernel/generic/include/sysinfo/sysinfo.h

@@ -38 +38 @@
 #include <typedefs.h>
 #include <str.h>
+#include <abi/sysinfo.h>
 
 /** Framebuffer info exported flags */
 extern bool fb_exported;
-
-/** Item value type
- *
- */
-typedef enum {
-        SYSINFO_VAL_UNDEFINED = 0,     /**< Undefined value */
-        SYSINFO_VAL_VAL = 1,           /**< Constant numeric value */
-        SYSINFO_VAL_DATA = 2,          /**< Constant binary data */
-        SYSINFO_VAL_FUNCTION_VAL = 3,  /**< Generated numeric value */
-        SYSINFO_VAL_FUNCTION_DATA = 4  /**< Generated binary data */
-} sysinfo_item_val_type_t;
 
 /** Subtree type
@@ -145 +135 @@
 extern void sysinfo_dump(sysinfo_item_t *);
 
-extern sysarg_t sys_sysinfo_get_tag(void *, size_t);
+extern sysarg_t sys_sysinfo_get_val_type(void *, size_t);
 extern sysarg_t sys_sysinfo_get_value(void *, size_t, void *);
 extern sysarg_t sys_sysinfo_get_data_size(void *, size_t, void *);

kernel/generic/include/typedefs.h

@@ -39 +39 @@
 #include <arch/common.h>
 #include <arch/types.h>
+#include <abi/bool.h>
 
 #define NULL  ((void *) 0)
@@ -61 +62 @@
 typedef void (* function)();
 
-typedef uint8_t bool;
-typedef uint64_t thread_id_t;
-typedef uint64_t task_id_t;
 typedef uint32_t container_id_t;
 

kernel/generic/src/mm/slab.c

@@ -180 +180 @@
     unsigned int flags)
 {
-        
-        
         size_t zone = 0;
         

kernel/generic/src/printf/printf_core.c

@@ -75 +75 @@
 #define PRINT_NUMBER_BUFFER_SIZE  (64 + 5)
 
+/** Get signed or unsigned integer argument */
+#define PRINTF_GET_INT_ARGUMENT(type, ap, flags) \
+        ({ \
+                unsigned type res; \
+                \
+                if ((flags) & __PRINTF_FLAG_SIGNED) { \
+                        signed type arg = va_arg((ap), signed type); \
+                        \
+                        if (arg < 0) { \
+                                res = -arg; \
+                                (flags) |= __PRINTF_FLAG_NEGATIVE; \
+                        } else \
+                                res = arg; \
+                } else \
+                        res = va_arg((ap), unsigned type); \
+                \
+                res; \
+        })
+
 /** Enumeration of possible arguments types.
  */
@@ -207 +226 @@
         }
         
-        return (int) (counter + 1);
+        return (int) (counter);
 }
 
@@ -245 +264 @@
         }
         
-        return (int) (counter + 1);
+        return (int) (counter);
 }
 
@@ -832 +851 @@
                         size_t size;
                         uint64_t number;
+                        
                         switch (qualifier) {
                         case PrintfQualifierByte:
                                 size = sizeof(unsigned char);
-                                number = (uint64_t) va_arg(ap, unsigned int);
+                                number = PRINTF_GET_INT_ARGUMENT(int, ap, flags);
                                 break;
                         case PrintfQualifierShort:
                                 size = sizeof(unsigned short);
-                                number = (uint64_t) va_arg(ap, unsigned int);
+                                number = PRINTF_GET_INT_ARGUMENT(int, ap, flags);
                                 break;
                         case PrintfQualifierInt:
                                 size = sizeof(unsigned int);
-                                number = (uint64_t) va_arg(ap, unsigned int);
+                                number = PRINTF_GET_INT_ARGUMENT(int, ap, flags);
                                 break;
                         case PrintfQualifierLong:
                                 size = sizeof(unsigned long);
-                                number = (uint64_t) va_arg(ap, unsigned long);
+                                number = PRINTF_GET_INT_ARGUMENT(long, ap, flags);
                                 break;
                         case PrintfQualifierLongLong:
                                 size = sizeof(unsigned long long);
-                                number = (uint64_t) va_arg(ap, unsigned long long);
+                                number = PRINTF_GET_INT_ARGUMENT(long long, ap, flags);
                                 break;
                         case PrintfQualifierPointer:
@@ -866 +886 @@
                                 counter = -counter;
                                 goto out;
-                        }
-                        
-                        if (flags & __PRINTF_FLAG_SIGNED) {
-                                if (number & (0x1 << (size * 8 - 1))) {
-                                        flags |= __PRINTF_FLAG_NEGATIVE;
-                                        
-                                        if (size == sizeof(uint64_t)) {
-                                                number = -((int64_t) number);
-                                        } else {
-                                                number = ~number;
-                                                number &=
-                                                    ~(0xFFFFFFFFFFFFFFFFll <<
-                                                    (size * 8));
-                                                number++;
-                                        }
-                                }
                         }
                         

kernel/generic/src/syscall/syscall.c

@@ -181 +181 @@
         
         /* Sysinfo syscalls. */
-        (syshandler_t) sys_sysinfo_get_tag,
+        (syshandler_t) sys_sysinfo_get_val_type,
         (syshandler_t) sys_sysinfo_get_value,
         (syshandler_t) sys_sysinfo_get_data_size,

kernel/generic/src/sysinfo/sysinfo.c

@@ -661 +661 @@
  *
  */
-sysarg_t sys_sysinfo_get_tag(void *path_ptr, size_t path_size)
+sysarg_t sys_sysinfo_get_val_type(void *path_ptr, size_t path_size)
 {
         /*