Changeset e3c762cd in mainline for generic/include

Timestamp:

2006-05-05T11:59:19Z (20 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

de07bcf

Parents:

22cf454d

Message:

Complete implementation of copy_from_uspace() and copy_to_uspace()
for amd64 and ia32. Other architectures still compile and run,
but need to implement their own assembly-only memcpy(), memcpy_from_uspace(),
memcpy_to_uspace() and their failover parts. For these architectures
only dummy implementations are provided.

Location:

generic/include

Files:

• interrupt.h (modified) (1 diff)
• mm/as.h (modified) (2 diffs)
• mm/page.h (modified) (1 diff)
• proc/thread.h (modified) (1 diff)
• syscall/copy.h (added)

generic/include/interrupt.h

@@ -32 +32 @@
 #include <arch/interrupt.h>
 #include <typedefs.h>
+#include <arch/types.h>
 
 #ifndef IVT_ITEMS

generic/include/mm/as.h

@@ -64 +64 @@
 #define AS_AREA_ATTR_PARTIAL    1       /* Not fully initialized area. */
 
+#define AS_PF_FAULT             0       /**< The page fault was not resolved by asp_page_fault(). */
+#define AS_PF_OK                1       /**< The page fault was resolved by as_page_fault(). */
+#define AS_PF_DEFER             2       /**< The page fault was caused by memcpy_from_uspace(). */
+
 /** Address space area structure.
  *
@@ -122 +126 @@
 int as_area_send(task_id_t dst_id, __address base);
 extern void as_set_mapping(as_t *as, __address page, __address frame);
-extern int as_page_fault(__address page);
+extern int as_page_fault(__address page, istate_t *istate);
 extern void as_switch(as_t *old, as_t *new);
 extern void as_free(as_t *as);

generic/include/mm/page.h

@@ -61 +61 @@
 #define PAGE_GLOBAL             (1<<PAGE_GLOBAL_SHIFT)
 
-/* TODO - check that userspace is OK, platform specific functions etc */
-static inline void copy_to_uspace(void *dst, void *src, count_t cnt)
-{
-        memcpy(dst, src, cnt);
-} 
-
-static inline void copy_from_uspace(void *dst, void *src, count_t cnt)
-{
-        memcpy(dst, src, cnt);
-}
-
 /** Operations to manipulate page mappings. */
 struct page_mapping_operations {

generic/include/proc/thread.h

@@ -92 +92 @@
         volatile int timeout_pending;           /**< Flag signalling sleep timeout in progress. */
 
+        /** True if this thread is executing copy_from_uspace(). False otherwise. */
+        bool in_copy_from_uspace;
+        /** True if this thread is executing copy_to_uspace(). False otherwise. */
+        bool in_copy_to_uspace;
+
+
         fpu_context_t *saved_fpu_context;
         int fpu_context_exists;