Changeset 8f88beb7 in mainline for kernel/generic/include

Timestamp:

2012-11-25T21:34:07Z (14 years ago)

Author:

Maurizio Lombardi <m.lombardi85@…>

Branches:

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

Children:

e1a27be

Parents:

150a2718 (diff), 7462674 (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/include

Files:

• config.h (modified) (1 diff)
• macros.h (modified) (2 diffs)
• mm/as.h (modified) (3 diffs)

kernel/generic/include/config.h

@@ -44 +44 @@
 #define STACK_FRAMES  TWO_FRAMES
 #define STACK_SIZE    ((1 << STACK_FRAMES) << PAGE_WIDTH)
+
+#define STACK_SIZE_USER (1 * 1024 * 1024)
 
 #define CONFIG_INIT_TASKS        32

kernel/generic/include/macros.h

@@ -52 +52 @@
     uint64_t sz2)
 {
-        uint64_t e1 = s1 + sz1;
-        uint64_t e2 = s2 + sz2;
-        
-        return ((s1 < e2) && (s2 < e1));
+        uint64_t e1 = s1 + sz1 - 1;
+        uint64_t e2 = s2 + sz2 - 1;
+
+        /* both sizes are non-zero */
+        if (sz1 && sz2)
+                return ((s1 <= e2) && (s2 <= e1));
+
+        /* one size is non-zero */
+        if (sz2)
+                return ((s1 >= s2) && (s1 <= e2));
+        if (sz1)
+                return ((s2 >= s1) && (s2 <= e1));
+
+        /* both are zero */
+        return (s1 == s2);
 }
 
@@ -119 +130 @@
             | ((((uint64_t) (up)) & UINT32_C(0xffffffff)) << 32))
 
+/* Test for sum overflow. */
+#define overflows(a, b) \
+        ((a) + (b) < (a))
+
+/* Test for sum overflow into positive numbers. */
+#define overflows_into_positive(a, b)   \
+        (overflows((a), (b)) && ((a) + (b) > 0))
+
 /** Pseudorandom generator
  *

kernel/generic/include/mm/as.h

@@ -61 +61 @@
 #define USER_ADDRESS_SPACE_END      USER_ADDRESS_SPACE_END_ARCH
 
-#ifdef USTACK_ADDRESS_ARCH
-        #define USTACK_ADDRESS  USTACK_ADDRESS_ARCH
-#else
-        #define USTACK_ADDRESS  (USER_ADDRESS_SPACE_END - (STACK_SIZE - 1))
-#endif
-
 /** Kernel address space. */
 #define FLAG_AS_KERNEL  (1 << 0)
@@ -74 +68 @@
 #define AS_AREA_ATTR_PARTIAL  1  /**< Not fully initialized area. */
 
+/** The page fault was resolved by as_page_fault(). */
+#define AS_PF_OK     0 
+
+/** The page fault was caused by memcpy_from_uspace() or memcpy_to_uspace(). */
+#define AS_PF_DEFER  1
+
 /** The page fault was not resolved by as_page_fault(). */
-#define AS_PF_FAULT  0
-
-/** The page fault was resolved by as_page_fault(). */
-#define AS_PF_OK  1
-
-/** The page fault was caused by memcpy_from_uspace() or memcpy_to_uspace(). */
-#define AS_PF_DEFER  2
+#define AS_PF_FAULT  2
+
+/** The page fault was not resolved by as_page_fault(). Non-verbose version. */
+#define AS_PF_SILENT 3
 
 /** Address space structure.
@@ -224 +221 @@
         void (* destroy)(as_area_t *);
 
+        bool (* is_resizable)(as_area_t *);
+        bool (* is_shareable)(as_area_t *);
+
         int (* page_fault)(as_area_t *, uintptr_t, pf_access_t);
         void (* frame_free)(as_area_t *, uintptr_t, uintptr_t);