diff --git a/MP2/MP2_Sources/dev_kernel_grub.img b/MP2/MP2_Sources/dev_kernel_grub.img deleted file mode 100755 index f490066..0000000 Binary files a/MP2/MP2_Sources/dev_kernel_grub.img and /dev/null differ diff --git a/MP2/MP2_Sources/kernel.C b/MP2/MP2_Sources/kernel.C index 4376f60..21e6eb1 100755 --- a/MP2/MP2_Sources/kernel.C +++ b/MP2/MP2_Sources/kernel.C @@ -75,6 +75,7 @@ int main() { /* ---- PROCESS POOL -- */ +// unsigned long n_info_frames = ContFramePool::needed_info_frames(PROCESS_POOL_SIZE); unsigned long process_mem_pool_info_frame = kernel_mem_pool.get_frames(n_info_frames); @@ -85,7 +86,7 @@ int main() { n_info_frames); process_mem_pool.mark_inaccessible(MEM_HOLE_START_FRAME, MEM_HOLE_SIZE); - +// /* -- MOST OF WHAT WE NEED IS SETUP. THE KERNEL CAN START. */ Console::puts("Hello World!\n"); @@ -110,8 +111,11 @@ void test_memory(ContFramePool * _pool, unsigned int _allocs_to_go) { Console::puts("alloc_to_go = "); Console::puti(_allocs_to_go); Console::puts("\n"); if (_allocs_to_go > 0) { int n_frames = _allocs_to_go % 4 + 1; + Console::puti(n_frames); unsigned long frame = _pool->get_frames(n_frames); + Console::puts("testing."); int * value_array = (int*)(frame * (4 KB)); + Console::puts("testing."); for (int i = 0; i < (1 KB) * n_frames; i++) { value_array[i] = _allocs_to_go; }