Changeset 8cc4ddb in mainline for uspace/lib/c

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:

uspace/lib/c

Files:

• arch/ia32/include/ddi.h (modified) (9 diffs)
• generic/async.c (modified) (1 diff)
• generic/io/printf_core.c (modified) (3 diffs)
• generic/str.c (modified) (4 diffs)
• generic/sysinfo.c (modified) (1 diff)
• include/bool.h (modified) (1 diff)
• include/str.h (modified) (2 diffs)
• include/sysinfo.h (modified) (1 diff)
• include/task.h (modified) (1 diff)
• include/thread.h (modified) (1 diff)

uspace/lib/c/arch/ia32/include/ddi.h

@@ -43 +43 @@
         if (port < (ioport8_t *) IO_SPACE_BOUNDARY) {
                 uint8_t val;
+                
                 asm volatile (
                         "inb %w[port], %b[val]\n"
@@ -48 +49 @@
                         : [port] "d" (port)
                 );
+                
                 return val;
-        } else {
+        } else
                 return (uint8_t) *port;
-        }
 }
 
@@ -58 +59 @@
         if (port < (ioport16_t *) IO_SPACE_BOUNDARY) {
                 uint16_t val;
+                
                 asm volatile (
                         "inw %w[port], %w[val]\n"
@@ -63 +65 @@
                         : [port] "d" (port)
                 );
+                
                 return val;
-        } else {
+        } else
                 return (uint16_t) *port;
-        }
 }
 
@@ -73 +75 @@
         if (port < (ioport32_t *) IO_SPACE_BOUNDARY) {
                 uint32_t val;
+                
                 asm volatile (
                         "inl %w[port], %[val]\n"
@@ -78 +81 @@
                         : [port] "d" (port)
                 );
+                
                 return val;
-        } else {
+        } else
                 return (uint32_t) *port;
-        }
 }
 
@@ -91 +94 @@
                         :: [val] "a" (val), [port] "d" (port)
                 );      
-        } else {
+        } else
                 *port = val;
-        }
 }
 
@@ -103 +105 @@
                         :: [val] "a" (val), [port] "d" (port)
                 );
-        } else {
+        } else
                 *port = val;
-        }
 }
 
@@ -115 +116 @@
                         :: [val] "a" (val), [port] "d" (port)
                 );
-        } else {
+        } else
                 *port = val;
-        }
 }
 

uspace/lib/c/generic/async.c

@@ -1777 +1777 @@
 int async_hangup(async_sess_t *sess)
 {
+        async_exch_t *exch;
+        
         assert(sess);
         
         if (atomic_get(&sess->refcnt) > 0)
                 return EBUSY;
+        
+        fibril_mutex_lock(&async_sess_mutex);
         
         int rc = async_hangup_internal(sess->phone);
         if (rc == EOK)
                 free(sess);
+        
+        while (!list_empty(&sess->exch_list)) {
+                exch = (async_exch_t *)
+                    list_get_instance(list_first(&sess->exch_list),
+                    async_exch_t, sess_link);
+                
+                list_remove(&exch->sess_link);
+                list_remove(&exch->global_link);
+                async_hangup_internal(exch->phone);
+                free(exch);
+        }
+        
+        fibril_mutex_unlock(&async_sess_mutex);
         
         return rc;

uspace/lib/c/generic/io/printf_core.c

@@ -73 +73 @@
  */
 #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.
@@ -831 +850 @@
                         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:
@@ -865 +885 @@
                                 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++;
-                                        }
-                                }
                         }
                         

uspace/lib/c/generic/str.c

@@ -2 +2 @@
  * Copyright (c) 2005 Martin Decky
  * Copyright (c) 2008 Jiri Svoboda
+ * Copyright (c) 2011 Martin Sucha
+ * Copyright (c) 2011 Oleg Romanenko
  * All rights reserved.
  *
@@ -639 +641 @@
 }
 
+/** Convert UTF16 string to string.
+ *
+ * Convert utf16 string @a src to string. The output is written to the buffer
+ * specified by @a dest and @a size. @a size must be non-zero and the string
+ * written will always be well-formed. Surrogate pairs also supported.
+ *
+ * @param dest  Destination buffer.
+ * @param size  Size of the destination buffer.
+ * @param src   Source utf16 string.
+ *
+ * @return EOK, if success, negative otherwise.
+ */
+int utf16_to_str(char *dest, size_t size, const uint16_t *src)
+{
+        size_t idx = 0, dest_off = 0;
+        wchar_t ch;
+        int rc = EOK;
+
+        /* There must be space for a null terminator in the buffer. */
+        assert(size > 0);
+
+        while (src[idx]) {
+                if ((src[idx] & 0xfc00) == 0xd800) {
+                        if (src[idx + 1] && (src[idx + 1] & 0xfc00) == 0xdc00) {
+                                ch = 0x10000;
+                                ch += (src[idx] & 0x03FF) << 10;
+                                ch += (src[idx + 1] & 0x03FF);
+                                idx += 2;
+                        }
+                        else
+                                break;
+                } else {
+                        ch = src[idx];
+                        idx++;
+                }
+                rc = chr_encode(ch, dest, &dest_off, size - 1);
+                if (rc != EOK)
+                        break;
+        }
+        dest[dest_off] = '\0';
+        return rc;
+}
+
+int str_to_utf16(uint16_t *dest, size_t size, const char *src)
+{
+        int rc = EOK;
+        size_t offset = 0;
+        size_t idx = 0;
+        wchar_t c;
+
+        assert(size > 0);
+        
+        while ((c = str_decode(src, &offset, STR_NO_LIMIT)) != 0) {
+                if (c > 0x10000) {
+                        if (idx + 2 >= size - 1) {
+                                rc = EOVERFLOW;
+                                break;
+                        }
+                        c = (c - 0x10000);
+                        dest[idx] = 0xD800 | (c >> 10);
+                        dest[idx + 1] = 0xDC00 | (c & 0x3FF);
+                        idx++;
+                } else {
+                         dest[idx] = c;
+                }
+
+                idx++;
+                if (idx >= size - 1) {
+                        rc = EOVERFLOW;
+                        break;
+                }
+        }
+
+        dest[idx] = '\0';
+        return rc;
+}
+
+
 /** Convert wide string to new string.
  *
@@ -718 +798 @@
 
         dest[dlen - 1] = '\0';
+}
+
+/** Convert string to wide string.
+ *
+ * Convert string @a src to wide string. A new wide NULL-terminated
+ * string will be allocated on the heap.
+ *
+ * @param src   Source string.
+ */
+wchar_t *str_to_awstr(const char *str)
+{
+        size_t len = str_length(str);
+        
+        wchar_t *wstr = calloc(len+1, sizeof(wchar_t));
+        if (wstr == NULL)
+                return NULL;
+        
+        str_to_wstr(wstr, len + 1, str);
+        return wstr;
 }
 
@@ -1016 +1115 @@
         return dest;
 }
-
 
 /** Convert initial part of string to unsigned long according to given base.

uspace/lib/c/generic/sysinfo.c

@@ -47 +47 @@
  *
  */
-sysinfo_item_tag_t sysinfo_get_tag(const char *path)
+sysinfo_item_val_type_t sysinfo_get_val_type(const char *path)
 {
-        return (sysinfo_item_tag_t) __SYSCALL2(SYS_SYSINFO_GET_TAG,
+        return (sysinfo_item_val_type_t) __SYSCALL2(SYS_SYSINFO_GET_VAL_TYPE,
             (sysarg_t) path, (sysarg_t) str_size(path));
 }

uspace/lib/c/include/bool.h

@@ -37 +37 @@
 
 #include <libarch/types.h>
+#include <abi/bool.h>
 
 #define false  0
 #define true   1
-
-typedef uint8_t bool;
 
 #endif

uspace/lib/c/include/str.h

@@ -1 +1 @@
 /*
  * Copyright (c) 2005 Martin Decky
+ * Copyright (c) 2011 Oleg Romanenko
  * All rights reserved.
  *
@@ -83 +84 @@
 extern char *wstr_to_astr(const wchar_t *src);
 extern void str_to_wstr(wchar_t *dest, size_t dlen, const char *src);
+extern wchar_t *str_to_awstr(const char *src);
+extern int utf16_to_str(char *dest, size_t size, const uint16_t *src);
+extern int str_to_utf16(uint16_t *dest, size_t size, const char *src);
 
 extern char *str_chr(const char *str, wchar_t ch);

uspace/lib/c/include/sysinfo.h

@@ -36 +36 @@
 #define LIBC_SYSINFO_H_
 
-#include <libc.h>
+#include <sys/types.h>
+#include <bool.h>
+#include <abi/sysinfo.h>
 
-/** Sysinfo value types
- *
- */
-typedef enum {
-        SYSINFO_VAL_UNDEFINED = 0,
-        SYSINFO_VAL_VAL = 1,
-        SYSINFO_VAL_DATA = 2
-} sysinfo_item_tag_t;
-
-extern sysinfo_item_tag_t sysinfo_get_tag(const char *);
+extern sysinfo_item_val_type_t sysinfo_get_val_type(const char *);
 extern int sysinfo_get_value(const char *, sysarg_t *);
 extern void *sysinfo_get_data(const char *, size_t *);

uspace/lib/c/include/task.h

@@ -37 +37 @@
 
 #include <sys/types.h>
-
-typedef uint64_t task_id_t;
+#include <abi/proc/task.h>
 
 typedef enum {

uspace/lib/c/include/thread.h

@@ -38 +38 @@
 #include <libarch/thread.h>
 #include <sys/types.h>
-
-typedef uint64_t thread_id_t;
+#include <abi/proc/thread.h>
 
 extern int thread_create(void (*)(void *), void *, const char *, thread_id_t *);