update

git-svn-id: http://svn.tudos.org/repos/oc/tudos/trunk@47 d050ee49-bd90-4346-b210-929a50b99cfc

diff --git a/kernel/fiasco/src/kern/arm/mem_op.cpp b/kernel/fiasco/src/kern/arm/mem_op.cpp
index 8cf22586999f6bfe7588d556702f007a160994a2..b483216c5b010ffc4b54d1dd29d1c9b7edbe96b9 100644 (file)
--- a/kernel/fiasco/src/kern/arm/mem_op.cpp
+++ b/kernel/fiasco/src/kern/arm/mem_op.cpp
@@ -218,8 +218,10 @@ PRIVATE static
 void
 Mem_op::outer_cache_op(int op, Address start, Address end)
 {
-  Mem_space::Vaddr v = Virt_addr(Address(start));
-  Mem_space::Vaddr e = Virt_addr(Address(end));
+
+  Virt_addr s = Virt_addr(start);
+  Virt_addr v = Virt_addr(start);
+  Virt_addr e = Virt_addr(end);
 
   Context *c = current();
 
@@ -228,30 +230,36 @@ Mem_op::outer_cache_op(int op, Address start, Address end)
       Mem_space::Size phys_size;
       Mem_space::Phys_addr phys_addr;
       unsigned attrs;
+      bool mapped =    c->mem_space()->v_lookup(Mem_space::Vaddr(v), &phys_addr, &phys_size, &attrs)
+                    && (attrs & Mem_space::Page_user_accessible);
+
+      Virt_size sz = Virt_size(phys_size);
+      Virt_size offs = Virt_size(Virt_addr(v).value() & (Mem_space::Size(phys_size).value() - 1));
+      sz -= offs;
+      if (e - v < sz)
+        sz = e - v;
 
-      if (   c->mem_space()->v_lookup(v, &phys_addr, &phys_size, &attrs)
-          && (attrs & Mem_space::Page_user_accessible))
+      if (mapped)
         {
-          unsigned long sz = Virt_size(phys_size).value();
-          if (Address(end) - Address(start) < sz)
-            sz = Address(end) - Address(start);
+          Virt_addr vstart = Virt_addr(phys_addr) | offs;
+          Virt_addr vend = vstart + sz;
           switch (op)
             {
             case Op_cache_l2_clean:
-              Outer_cache::clean(Virt_addr(phys_addr).value(),
-                                 Virt_addr(phys_addr).value() + sz, false);
+              Outer_cache::clean(Virt_addr(vstart).value(),
+                                 Virt_addr(vend).value(), false);
               break;
             case Op_cache_l2_flush:
-              Outer_cache::flush(Virt_addr(phys_addr).value(),
-                                 Virt_addr(phys_addr).value() + sz, false);
+              Outer_cache::flush(Virt_addr(vstart).value(),
+                                 Virt_addr(vend).value(), false);
               break;
             case Op_cache_l2_inv:
-              Outer_cache::invalidate(Virt_addr(phys_addr).value(),
-                                      Virt_addr(phys_addr).value() + sz, false);
+              Outer_cache::invalidate(Virt_addr(vstart).value(),
+                                      Virt_addr(vend).value(), false);
               break;
             }
         }
-      v += phys_size;
+      v += sz;
     }
   Outer_cache::sync();
 }