Changeset e3c762cd in mainline for arch/ia64/src

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:

arch/ia64/src

Files:

• asm.S (modified) (1 diff)
• mm/tlb.c (modified) (3 diffs)

arch/ia64/src/asm.S

@@ -31 +31 @@
 .text
 
+/** Copy memory from/to userspace.
+ *
+ * @param in0 Destination address.
+ * @param in1 Source address.
+ * @param in2 Number of byte to copy.
+ */
 .global memcpy
+.global memcpy_from_uspace
+.global memcpy_to_uspace
+.global memcpy_from_uspace_failover_address
+.global memcpy_to_uspace_failover_address
 memcpy:
+memcpy_from_uspace:
+memcpy_to_uspace:
         br _memcpy
+        
+memcpy_from_uspace_failover_address:
+memcpy_to_uspace_failover_address:
+        br memcpy_from_uspace_failover_address
 
 .global memsetb

arch/ia64/src/mm/tlb.c

@@ -448 +448 @@
                  */
                 page_table_unlock(AS, true);
-                if (!as_page_fault(va)) {
+                if (as_page_fault(va, istate) == AS_PF_FAULT) {
                         panic("%s: va=%p, rid=%d, iip=%p\n", __FUNCTION__, istate->cr_ifa, rr.map.rid, istate->cr_iip);
                 }
@@ -494 +494 @@
                  */
                 page_table_unlock(AS, true);
-                if (!as_page_fault(va)) {
+                if (as_page_fault(va, istate) == AS_PF_FAULT) {
                         panic("%s: va=%p, rid=%d, iip=%p\n", __FUNCTION__, va, rid, istate->cr_iip);
                 }
@@ -609 +609 @@
         } else {
                 page_table_unlock(AS, true);
-                if (!as_page_fault(va)) {
+                if (as_page_fault(va, istate) == AS_PF_FAULT) {
                         panic("%s: va=%p, rid=%d\n", __FUNCTION__, va, rr.map.rid);
                 }