| /SPARTAN/trunk/src/main/main.c |
|---|
| 47,6 → 47,7 |
| #include <smp/smp.h> |
| #include <arch/mm/memory_init.h> |
| #include <mm/frame.h> |
| #include <mm/page.h> |
| #include <mm/tlb.h> |
| 98,7 → 99,7 |
| config.cpu_active = 1; |
| config.base = hardcoded_load_address; |
| config.memory_size = CONFIG_MEMORY_SIZE; |
| config.memory_size = get_memory_size(); |
| config.kernel_size = hardcoded_ktext_size + hardcoded_kdata_size + CONFIG_HEAP_SIZE + CONFIG_STACK_SIZE; |
| context_save(&ctx); |
| /SPARTAN/trunk/arch/ia32/include/mm/memory_init.h |
|---|
| 0,0 → 1,36 |
| /* |
| * Copyright (C) 2005 Josef Cejka |
| * All rights reserved. |
| * |
| * Redistribution and use in source and binary forms, with or without |
| * modification, are permitted provided that the following conditions |
| * are met: |
| * |
| * - Redistributions of source code must retain the above copyright |
| * notice, this list of conditions and the following disclaimer. |
| * - Redistributions in binary form must reproduce the above copyright |
| * notice, this list of conditions and the following disclaimer in the |
| * documentation and/or other materials provided with the distribution. |
| * - The name of the author may not be used to endorse or promote products |
| * derived from this software without specific prior written permission. |
| * |
| * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR |
| * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES |
| * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. |
| * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, |
| * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT |
| * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, |
| * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY |
| * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT |
| * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF |
| * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. |
| */ |
| #ifndef __ai32_MEMORY_INIT_H__ |
| #define __ai32_MEMORY_INIT_H__ |
| #include <typedefs.h> |
| size_t get_memory_size(void); |
| #endif |
| /SPARTAN/trunk/arch/ia32/Makefile.inc |
|---|
| 38,6 → 38,7 |
| arch/userspace.c \ |
| arch/cpu/cpu.c \ |
| arch/mm/frame.c \ |
| arch/mm/memory_init.c \ |
| arch/mm/page.c \ |
| arch/mm/tlb.c \ |
| arch/drivers/i8042.c \ |
| /SPARTAN/trunk/arch/ia32/src/mm/frame.c |
|---|
| 48,7 → 48,7 |
| frame_region_not_free(0xfec00000,0xffffffff); |
| for (i=e820counter;i>0;i--) { |
| //printf("E820 base: %Q size: %Q type: %L \n",e820table[i-1].base_address,e820table[i-1].size,e820table[i-1].type); |
| // printf("E820 base: %Q size: %Q type: %L \n",e820table[i-1].base_address,e820table[i-1].size,e820table[i-1].type); |
| if (e820table[i-1].type!=MEMMAP_MEMORY_AVAILABLE) { |
| frame_region_not_free(e820table[i-1].base_address,e820table[i-1].size); |
| } |
| /SPARTAN/trunk/arch/ia32/src/mm/memory_init.c |
|---|
| 0,0 → 1,38 |
| /* |
| * Copyright (C) 2005 Josef Cejka |
| * All rights reserved. |
| * |
| * Redistribution and use in source and binary forms, with or without |
| * modification, are permitted provided that the following conditions |
| * are met: |
| * |
| * - Redistributions of source code must retain the above copyright |
| * notice, this list of conditions and the following disclaimer. |
| * - Redistributions in binary form must reproduce the above copyright |
| * notice, this list of conditions and the following disclaimer in the |
| * documentation and/or other materials provided with the distribution. |
| * - The name of the author may not be used to endorse or promote products |
| * derived from this software without specific prior written permission. |
| * |
| * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR |
| * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES |
| * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. |
| * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, |
| * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT |
| * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, |
| * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY |
| * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT |
| * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF |
| * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. |
| */ |
| #include <arch/boot/memmap.h> |
| #include <arch/mm/memory_init.h> |
| size_t get_memory_size(void) |
| { |
| return e801memorysize; |
| } |