Changeset d681c17 in mainline for uspace

Timestamp:

2006-09-05T14:52:11Z (19 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

5035eeb7

Parents:

2def788

Message:

sparc64 work.

• the syscall wrapper needs to use the "memory" clobber specifier to prevent over-optimization.
• on sparc64, the user address space spans the whole 64-bit space and therefore the macro USER_ADDRESS_SPACE_SIZE_ARCH, as it was defined, overflows to 0
• stop using USER_ADDRESS_SPACE_SIZE_ARCH and define MAX_HEAP_SIZE instead
• in our situation when kernel and user address spaces are separate, the G (global) bit cannot be used (there is no point in it anymore)
• add the DEBUG() macro to stdio.h; DEBUG() uses SYS_IO and is a good debugging tool for getting early userspace to work

Location:

uspace/libc

Files:

• arch/sparc64/include/syscall.h (modified) (1 diff)
• generic/as.c (modified) (2 diffs)
• generic/psthread.c (modified) (3 diffs)
• include/as.h (modified) (1 diff)
• include/stdio.h (modified) (1 diff)

uspace/libc/arch/sparc64/include/syscall.h

@@ -51 +51 @@
                 : "=r" (a1)
                 : "r" (a1), "r" (a2), "r" (a3), "r" (a4), "i" (id)
+                : "memory"
         );
         

uspace/libc/generic/as.c

@@ -37 +37 @@
 #include <unistd.h>
 #include <align.h>
+#include <types.h>
+
+/**
+ * Either 4*256M on 32-bit architecures or 16*256M on 64-bit architectures.
+ */
+#define MAX_HEAP_SIZE   (sizeof(uintptr_t)<<28)
 
 /** Create address space area.
@@ -142 +148 @@
         /* Set heapsize to some meaningful value */
         if (maxheapsize == -1)
-                set_maxheapsize(ALIGN_UP(USER_ADDRESS_SPACE_SIZE_ARCH >> 1, PAGE_SIZE));
+                set_maxheapsize(MAX_HEAP_SIZE);
         
         if (!last_allocated)

uspace/libc/generic/psthread.c

@@ -62 +62 @@
 static int threads_in_manager;
 
-/** Setup PSthread information into TCB structure */
+/** Setup psthread information into TCB structure */
 psthread_data_t * psthread_setup()
 {
@@ -90 +90 @@
 }
 
-/** Function that is called on entry to new uspace thread */
+/** Function that is called on entry to new pseudo thread */
 void psthread_main(void)
 {
@@ -210 +210 @@
 }
 
-/**
- * Create a userspace thread
+/** Create a userspace pseudo thread.
  *
  * @param func Pseudo thread function.

uspace/libc/include/as.h

@@ -41 +41 @@
 #include <kernel/mm/as.h>
 
-#define USER_ADDRESS_SPACE_SIZE_ARCH (USER_ADDRESS_SPACE_END_ARCH-USER_ADDRESS_SPACE_START_ARCH+1)
-
 extern void *as_area_create(void *address, size_t size, int flags);
 extern int as_area_resize(void *address, size_t size, int flags);

uspace/libc/include/stdio.h

@@ -41 +41 @@
 #define EOF (-1)
 
+#include <string.h>
 #include <io/stream.h>
+
+#define DEBUG(fmt, ...) \
+{ \
+        char buf[256]; \
+        int n; \
+        n = snprintf(buf, sizeof(buf), fmt, ##__VA_ARGS__); \
+        if (n > 0) \
+                (void) __SYSCALL3(SYS_IO, 1, (sysarg_t) buf, strlen(buf)); \
+}
 
 extern int getchar(void);