Changeset 3deb0155 in mainline for uspace/lib/c

Timestamp:

2013-04-10T19:11:45Z (13 years ago)

Author:

Beniamino Galvani <b.galvani@…>

Branches:

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

Children:

dd0c8a0

Parents:

44186b01 (diff), b4f43a1 (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/src/setjmp.S (modified) (1 diff)
• generic/adt/hash_table.c (modified) (1 diff)
• generic/async.c (modified) (2 diffs)
• include/mem.h (modified) (1 diff)
• include/setjmp.h (modified) (2 diffs)
• include/sys/types.h (modified) (1 diff)

uspace/lib/c/arch/ia32/src/setjmp.S

@@ -35 +35 @@
 .type setjmp,@function
 setjmp:
-        movl 0(%esp),%eax       # save pc value into eax        
-        movl 4(%esp),%edx       # address of the jmp_buf structure to save context to 
-
-                # save registers to the jmp_buf structure
+        movl 0(%esp),%eax  # save pc value into eax
+        movl 4(%esp),%edx  # address of the jmp_buf structure to save context to
+        
+        # save registers to the jmp_buf structure
         CONTEXT_SAVE_ARCH_CORE %edx %eax
-
-        xorl %eax,%eax          # set_jmp returns 0
+        
+        xorl %eax,%eax  # set_jmp returns 0
         ret
 
 .type longjmp,@function
 longjmp:
-
-        movl 4(%esp), %ecx      # put address of jmp_buf into ecx
-        movl 8(%esp), %eax      # put return value into eax     
-
-                # restore registers from the jmp_buf structure
+        movl 4(%esp), %ecx  # put address of jmp_buf into ecx
+        movl 8(%esp), %eax  # put return value into eax
+        
+        # restore registers from the jmp_buf structure
         CONTEXT_RESTORE_ARCH_CORE %ecx %edx
-
-        movl %edx,0(%esp)       # put saved pc on stack
+        
+        movl %edx,0(%esp)  # put saved pc on stack
         ret
-

uspace/lib/c/generic/adt/hash_table.c

@@ -81 +81 @@
  * @param init_size Initial desired number of hash table buckets. Pass zero
  *                 if you want the default initial size. 
- * @param max_keys Maximal number of keys needed to identify an item.
+ * @param max_load The table is resized when the average load per bucket
+ *                 exceeds this number. Pass zero if you want the default.
  * @param op       Hash table operations structure. remove_callback()
  *                 is optional and can be NULL if no action is to be taken

uspace/lib/c/generic/async.c

@@ -2090 +2090 @@
  * @param arg   User defined argument.
  * @param flags Storage for the received flags. Can be NULL.
- * @param dst   Destination address space area base. Cannot be NULL.
+ * @param dst   Address of the storage for the destination address space area
+ *              base address. Cannot be NULL.
  *
  * @return Zero on success or a negative error code from errno.h.
@@ -2218 +2219 @@
  *
  * @param callid Hash of the IPC_M_DATA_WRITE call to answer.
- * @param dst    Destination address space area base address.
+ * @param dst    Address of the storage for the destination address space area
+ *               base address.
  *
  * @return Zero on success or a value from @ref errno.h on failure.

uspace/lib/c/include/mem.h

@@ -40 +40 @@
 #define bzero(ptr, len)  memset((ptr), 0, (len))
 
-extern void *memset(void *, int, size_t);
-extern void *memcpy(void *, const void *, size_t);
+extern void *memset(void *, int, size_t)
+    __attribute__ ((optimize("-fno-tree-loop-distribute-patterns")));
+extern void *memcpy(void *, const void *, size_t)
+    __attribute__ ((optimize("-fno-tree-loop-distribute-patterns")));
 extern void *memmove(void *, const void *, size_t);
 

uspace/lib/c/include/setjmp.h

@@ -38 +38 @@
 #include <libarch/fibril.h>
 
-typedef context_t jmp_buf;
+typedef context_t jmp_buf[1];
 
 extern int setjmp(jmp_buf env);
@@ -47 +47 @@
 /** @}
  */
-

uspace/lib/c/include/sys/types.h

@@ -50 +50 @@
 typedef volatile uint32_t ioport32_t;
 
+typedef int16_t unaligned_int16_t __attribute__ ((aligned(1)));
+typedef int32_t unaligned_int32_t __attribute__ ((aligned(1)));
+typedef int64_t unaligned_int64_t __attribute__ ((aligned(1)));
+
+typedef uint16_t unaligned_uint16_t __attribute__ ((aligned(1)));
+typedef uint32_t unaligned_uint32_t __attribute__ ((aligned(1)));
+typedef uint64_t unaligned_uint64_t __attribute__ ((aligned(1)));
+
 #endif