X-Git-Url: http://git.buserror.net/cgi-bin/gitweb.cgi?p=polintos%2Fscott%2Fpriv.git;a=blobdiff_plain;f=kernel%2Ftests%2Faspace.cc;h=8471c37883fd7f644e249a1c44b6364c46c13550;hp=a9537df38b2ce55ded9e2132f0d1d0e7037992d0;hb=f95829cb521c076eebee345a1007e9fc912a0765;hpb=7da27a216a7f4bb3331fe315cdbec69bfcf2c762

diff --git a/kernel/tests/aspace.cc b/kernel/tests/aspace.cc
index a9537df..8471c37 100644
--- a/kernel/tests/aspace.cc
+++ b/kernel/tests/aspace.cc
@@ -2,37 +2,22 @@
 //
 // This software is copyright (c) 2006 Scott Wood <scott@buserror.net>.
 // 
-// Permission is hereby granted, free of charge, to any person obtaining a copy of
-// this software and associated documentation files (the "Software"), to deal with
-// the Software without restriction, including without limitation the rights to
-// use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies
-// of the Software, and to permit persons to whom the Software is furnished to do
-// so, subject to the following conditions:
+// This software is provided 'as-is', without any express or implied warranty.
+// In no event will the authors or contributors be held liable for any damages
+// arising from the use of this software.
 // 
-//     * Redistributions of source code must retain the above copyright notice,
-//       this list of conditions and the following disclaimers.
-// 
-//     * Redistributions in binary form must reproduce the above copyright notice,
-//       this list of conditions and the following disclaimers in the
-//       documentation and/or other materials provided with the distribution.
-// 
-//     * The names of the Software's authors and/or contributors
-//       may not be used to endorse or promote products derived from
-//       this Software without specific prior written permission.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
-// FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
-// CONTRIBUTORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS WITH THE
-// SOFTWARE.
+// Permission is hereby granted to everyone, free of charge, to use, copy,
+// modify, prepare derivative works of, publish, distribute, perform,
+// sublicense, and/or sell copies of the Software, provided that the above
+// copyright notice and disclaimer of warranty be included in all copies or
+// substantial portions of this software.
 
 #include <kern/types.h>
 #include <kern/libc.h>
 #include <kern/time.h>
 #include <kern/thread.h>
 #include <kern/mem.h>
+#include <kern/process.h>
 
 using namespace Mem;
 namespace Mem {
@@ -52,7 +37,7 @@ void thread(void *arg)
 	
 	printf("aspace %p created\n", (void *)aspace);
 	
-	AddrSpace *kaspace = AddrSpace::classptr(aspace);
+	ProcAddrSpace *kaspace = static_cast<ProcAddrSpace *>(AddrSpace::classptr(aspace));
 	
 	printf("kaspace %p\n", kaspace);
 	
@@ -72,7 +57,8 @@ void thread(void *arg)
 	       (void *)stacked[0], (void *)stacked[1],
 	       (void *)mappables[0], (void *)mappables[1]);
 		
-	char *buf = new char[100000];
+//	char *buf = new char[100000];
+	char *buf = (char *)alloc_pages(25);
 	printf("buf %p\n", buf);
 	
 	char *abuf = (char *)((((ulong)buf) + 4095) & ~4095);