Move arrays to Util namespace, add parametric allocator.

[polintos/scott/priv.git] / kernel / mem / addrspace.cc

diff --git a/kernel/mem/addrspace.cc b/kernel/mem/addrspace.cc
index 78cbe5e6b573aa5c2429fcbd70ee5392cf478d9b..3280adde37e39109d696237810f4ee9cf7bc285e 100644 (file)
--- a/kernel/mem/addrspace.cc
+++ b/kernel/mem/addrspace.cc
@@ -567,7 +567,7 @@ namespace Mem {
                
                if (mflags.Replace)
                        throw_idl(InvalidArgument, 3,
-                                 countarray("Replace unimplemented"));
+                                 countarray<ORBMM>("Replace unimplemented"));
                
                Mappable *cma = Mappable::classptr(ma);
                if (!cma) {
@@ -583,10 +583,10 @@ namespace Mem {
                        mflags.Fixed = 1;
                
                if (!page_aligned(region.start))
-                       throw_idl(InvalidArgument, 1, countarray("unaligned start"));
+                       throw_idl(InvalidArgument, 1, countarray<ORBMM>("unaligned start"));
                
                if (!page_aligned(region.end + 1))
-                       throw_idl(InvalidArgument, 1, countarray("unaligned end"));
+                       throw_idl(InvalidArgument, 1, countarray<ORBMM>("unaligned end"));
                
                Lock::AutoLock autolock(lock);
                Region vregion;
@@ -599,11 +599,11 @@ namespace Mem {
                        if (is_process) {
                                if (!valid_addr(vregion.start))
                                        throw_idl(InvalidArgument, 2,
-                                                 countarray("invalid virtual start"));
+                                                 countarray<ORBMM>("invalid virtual start"));
                                
                                if (!valid_addr(vregion.end))
                                        throw_idl(InvalidArgument, 2,
-                                                 countarray("invalid virtual end"));
+                                                 countarray<ORBMM>("invalid virtual end"));
                        }
                        
                        if (check_overlap(vregion, prev))
@@ -612,10 +612,10 @@ namespace Mem {
                
                if (*vstart == System::Mem::AddrSpace_ns::unspecified_start) {
                        if (fixed)
-                               throw_idl(ResourceBusy, 2, countarray("varea overlap"));
+                               throw_idl(ResourceBusy, 2, countarray<ORBMM>("varea overlap"));
                        
                        if (!get_free_region(region.end - region.start + 1, vregion, prev))
-                               throw_idl(OutOfSpace, countarray("out of vspace"));
+                               throw_idl(OutOfSpace, countarray<ORBMM>("out of vspace"));
                        
                        *vstart = vregion.start;
                }