Changeset 3abfe9a8 in mainline for kernel/arch/ia64/src

Timestamp:

2011-03-29T21:38:40Z (15 years ago)

Author:

Martin Decky <martin@…>

Branches:

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

Children:

d6b81941

Parents:

ebebd38 (diff), eaf4c393 (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:

separate memset/memcpy redirection to builtin functions and fallback C implementations

Location:

kernel/arch/ia64/src

Files:

• asm.S (modified) (4 diffs)
• mm/tlb.c (modified) (6 diffs)

kernel/arch/ia64/src/asm.S

@@ -30 +30 @@
 
 .text
-.global memcpy
 .global memcpy_from_uspace
 .global memcpy_to_uspace
@@ -39 +38 @@
  *
  * This memcpy() has been taken from the assembler output of
- * the generic _memcpy() and modified to have the failover part.
+ * a plain C implementation of memcpy() modified to have the
+ * failover part.
  *
  * @param in0 Destination address.
@@ -46 +46 @@
  *
  */
-memcpy:
 memcpy_from_uspace:
 memcpy_to_uspace:
@@ -141 +140 @@
         br.ret.sptk.many rp
 
-.global memsetb
-memsetb:
-        br _memsetb
-
-.global memsetw
-memsetw:
-        br _memsetw
-
 .global cpu_halt
 cpu_halt:

kernel/arch/ia64/src/mm/tlb.c

@@ -475 +475 @@
 void alternate_instruction_tlb_fault(uint64_t vector, istate_t *istate)
 {
-        region_register_t rr;
-        rid_t rid;
         uintptr_t va;
         pte_t *t;
         
         va = istate->cr_ifa; /* faulting address */
-        rr.word = rr_read(VA2VRN(va));
-        rid = rr.map.rid;
         
         page_table_lock(AS, true);
@@ -649 +645 @@
 void data_dirty_bit_fault(uint64_t vector, istate_t *istate)
 {
-        region_register_t rr;
-        rid_t rid;
         uintptr_t va;
         pte_t *t;
         
         va = istate->cr_ifa;  /* faulting address */
-        rr.word = rr_read(VA2VRN(va));
-        rid = rr.map.rid;
         
         page_table_lock(AS, true);
@@ -686 +678 @@
 void instruction_access_bit_fault(uint64_t vector, istate_t *istate)
 {
-        region_register_t rr;
-        rid_t rid;
         uintptr_t va;
         pte_t *t;
         
         va = istate->cr_ifa;  /* faulting address */
-        rr.word = rr_read(VA2VRN(va));
-        rid = rr.map.rid;
         
         page_table_lock(AS, true);
@@ -723 +711 @@
 void data_access_bit_fault(uint64_t vector, istate_t *istate)
 {
-        region_register_t rr;
-        rid_t rid;
         uintptr_t va;
         pte_t *t;
         
         va = istate->cr_ifa;  /* faulting address */
-        rr.word = rr_read(VA2VRN(va));
-        rid = rr.map.rid;
         
         page_table_lock(AS, true);
@@ -760 +744 @@
 void data_access_rights_fault(uint64_t vector, istate_t *istate)
 {
-        region_register_t rr;
-        rid_t rid;
         uintptr_t va;
         pte_t *t;
         
         va = istate->cr_ifa;  /* faulting address */
-        rr.word = rr_read(VA2VRN(va));
-        rid = rr.map.rid;
         
         /*
@@ -792 +772 @@
 void page_not_present(uint64_t vector, istate_t *istate)
 {
-        region_register_t rr;
-        rid_t rid;
         uintptr_t va;
         pte_t *t;
         
         va = istate->cr_ifa;  /* faulting address */
-        rr.word = rr_read(VA2VRN(va));
-        rid = rr.map.rid;
         
         page_table_lock(AS, true);