WebSVN – HelenOS – Path Comparison – / – /trunk/kernel/arch/ Rev 2724 and /trunk/kernel/arch/ Rev 2725

Ignore whitespace Rev 2724 → Rev 2725

/trunk/kernel/arch/sparc64/Makefile.inc
89,7 → 89,6
arch/$(ARCH)/src/mm/frame.c \
arch/$(ARCH)/src/mm/page.c \
arch/$(ARCH)/src/mm/tlb.c \
arch/$(ARCH)/src/mm/memory_init.c \
arch/$(ARCH)/src/sparc64.c \
arch/$(ARCH)/src/start.S \
arch/$(ARCH)/src/proc/scheduler.c \

 /trunk/kernel/arch/ia64/src/mm/frame.c
 ,17 → 41,18
  * This is Ski-specific and certainly not sufficient
  * for real ia64 systems that provide memory map.
  */
+#define MEMORY_SIZE (512 * 1024 * 1024)
 #define ROM_BASE    0xa0000
-#define ROM_SIZE    (384*1024)
+#define ROM_SIZE    (384 * 1024)
 void frame_arch_init(void)
 {
-    zone_create(0, config.memory_size >> FRAME_WIDTH, 1, 0);
+    zone_create(0, SIZE2FRAMES(MEMORY_SIZE), 1, 0);
     /*
      * Blacklist ROM regions.
      */
-    frame_mark_unavailable(ADDR2PFN(ROM_BASE), ROM_SIZE >> FRAME_WIDTH);
+    frame_mark_unavailable(ADDR2PFN(ROM_BASE), SIZE2FRAMES(ROM_SIZE));
 }
 /** @}

/trunk/kernel/arch/arm32/Makefile.inc
88,7 → 88,6
arch/$(ARCH)/src/mm/frame.c \
arch/$(ARCH)/src/mm/page.c \
arch/$(ARCH)/src/mm/tlb.c \
arch/$(ARCH)/src/mm/memory_init.c \
arch/$(ARCH)/src/mm/page_fault.c

ifeq ($(MACHINE), gxemul_testarm)

 /trunk/kernel/arch/arm32/src/mm/frame.c
 ,6 → 35,7
 #include <mm/frame.h>
 #include <arch/mm/frame.h>
+#include <arch/machine.h>
 #include <config.h>
 #include <arch/debug/print.h>
 ,9 → 46,9
 void frame_arch_init(void)
 {
     /* all memory as one zone */
-    zone_create(0, ADDR2PFN(config.memory_size),
+    zone_create(0, ADDR2PFN(machine_get_memory_size()),
         BOOT_PAGE_TABLE_START_FRAME + BOOT_PAGE_TABLE_SIZE_IN_FRAMES, 0);
-    last_frame = config.memory_size;
+    last_frame = machine_get_memory_size();
     /* blacklist boot page table */
     frame_mark_unavailable(BOOT_PAGE_TABLE_START_FRAME,

/trunk/kernel/arch/ppc32/Makefile.inc
79,7 → 79,6
arch/$(ARCH)/src/drivers/cuda.c \
arch/$(ARCH)/src/mm/as.c \
arch/$(ARCH)/src/mm/frame.c \
arch/$(ARCH)/src/mm/memory_init.c \
arch/$(ARCH)/src/mm/page.c \
arch/$(ARCH)/src/mm/tlb.c \
arch/$(ARCH)/src/drivers/pic.c

/trunk/kernel/arch/ppc32/src/ppc32.c
36,7 → 36,6
#include <arch.h>
#include <arch/boot/boot.h>
#include <arch/drivers/cuda.h>
#include <arch/mm/memory_init.h>
#include <arch/interrupt.h>
#include <genarch/fb/fb.h>
#include <genarch/fb/visuals.h>

/trunk/kernel/arch/ppc32/src/mm/frame.c
34,7 → 34,6

#include <arch/boot/boot.h>
#include <arch/mm/frame.h>
#include <arch/mm/memory_init.h>
#include <mm/frame.h>
#include <align.h>
#include <macros.h>

/trunk/kernel/arch/ia32xen/Makefile.inc
131,7 → 131,6
arch/$(ARCH)/src/cpu/cpu.c \
arch/$(ARCH)/src/mm/as.c \
arch/$(ARCH)/src/mm/frame.c \
arch/$(ARCH)/src/mm/memory_init.c \
arch/$(ARCH)/src/mm/page.c \
arch/$(ARCH)/src/mm/tlb.c \
arch/$(ARCH)/src/ddi/ddi.c \

/trunk/kernel/arch/ia32xen/src/ia32xen.c
53,7 → 53,6

#include <arch/bios/bios.h>

#include <arch/mm/memory_init.h>
#include <interrupt.h>
#include <arch/debugger.h>
#include <proc/thread.h>

/trunk/kernel/arch/amd64/include/mm/memory_init.h
File deleted
\ No newline at end of file
Property changes:
Deleted: svn:special
-*
\ No newline at end of property

/trunk/kernel/arch/amd64/Makefile.inc
87,6 → 87,7
ARCH_SOURCES = \
arch/$(ARCH)/src/fpu_context.c \
arch/$(ARCH)/src/boot/boot.S \
arch/$(ARCH)/src/boot/memmap.c \
arch/$(ARCH)/src/pm.c \
arch/$(ARCH)/src/context.S \
arch/$(ARCH)/src/ddi/ddi.c \
103,7 → 104,6
arch/$(ARCH)/src/mm/page.c \
arch/$(ARCH)/src/mm/tlb.c \
arch/$(ARCH)/src/asm_utils.S \
arch/$(ARCH)/src/mm/memory_init.c \
arch/$(ARCH)/src/cpu/cpu.c \
arch/$(ARCH)/src/proc/scheduler.c \
arch/$(ARCH)/src/proc/task.c \

/trunk/kernel/arch/amd64/src/amd64.c
50,7 → 50,6
#endif

#include <arch/bios/bios.h>
#include <arch/mm/memory_init.h>
#include <arch/cpu.h>
#include <print.h>
#include <arch/cpuid.h>

 /trunk/kernel/arch/amd64/src/boot/boot.S
 ,7 → 182,6
     je valid_boot
         xorl %ecx, %ecx                 # no memory size or map available
-        movl %ecx, e801memorysize
         movl %ecx, e820counter
         jmp invalid_boot
 ,19 → 190,6
         movl (%ebx), %eax               # ebx = physical address of struct multiboot_info
-        bt $0, %eax                 # mbi->flags[0] (mem_lower, mem_upper valid)
-        jc mem_valid
-            xorl %ecx, %ecx
-            jmp mem_invalid
-        mem_valid:
-        movl 4(%ebx), %ecx              # mbi->mem_lower
-        addl 8(%ebx), %ecx              # mbi->mem_upper
-        mem_invalid:
-        movl %ecx, e801memorysize
         bt $3, %eax                 # mbi->flags[3] (mods_count, mods_addr valid)
         jc mods_valid

 /trunk/kernel/arch/amd64/src/boot/memmap.c
 ,0 → 1,41
+/*
+ * 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.
+ */
+/** @addtogroup amd64mm
+ * @{
+ */
+/** @file
+ */
+#include <arch/boot/memmap.h>
+uint8_t e820counter = 0xff;
+e820memmap_t e820table[MEMMAP_E820_MAX_RECORDS];
+/** @}
+ */

/trunk/kernel/arch/ppc64/Makefile.inc
67,7 → 67,6
arch/$(ARCH)/src/ddi/ddi.c \
arch/$(ARCH)/src/mm/as.c \
arch/$(ARCH)/src/mm/frame.c \
arch/$(ARCH)/src/mm/memory_init.c \
arch/$(ARCH)/src/mm/page.c \
arch/$(ARCH)/src/mm/tlb.c \
arch/$(ARCH)/src/drivers/pic.c

/trunk/kernel/arch/ppc64/src/mm/frame.c
34,7 → 34,6

#include <arch/boot/boot.h>
#include <arch/mm/frame.h>
#include <arch/mm/memory_init.h>
#include <mm/frame.h>
#include <align.h>
#include <macros.h>

/trunk/kernel/arch/ppc64/src/ppc64.c
34,7 → 34,6

#include <arch.h>
#include <arch/boot/boot.h>
#include <arch/mm/memory_init.h>
#include <arch/interrupt.h>
#include <genarch/fb/fb.h>
#include <genarch/fb/visuals.h>

 /trunk/kernel/arch/mips32/src/mm/frame.c
 ,7 → 46,7
 void frame_arch_init(void)
 {
     if (!arc_frame_init()) {
-        zone_create(0, ADDR2PFN(config.memory_size), 1, 0);
+        zone_create(0, ADDR2PFN(CONFIG_MEMORY_SIZE), 1, 0);
         /*
          * Blacklist interrupt vector
          */

 /trunk/kernel/arch/mips32/src/drivers/arc.c
 ,7 → 220,7
             desc = arc_entry->getmemorydescriptor(desc);
         }
     } else
-        printf("%#10x %#10x free\n", 0, config.memory_size);
+        printf("%#10x %#10x free\n", 0, CONFIG_MEMORY_SIZE);
 }
 /** Print charactor to console */
 ,7 → 362,6
 {
     if (arc_enabled()) {
         arc_memdescriptor_t *desc;
-        int total = 0;
         uintptr_t base;
         size_t basesize;
 ,8 → 378,6
                 }
                 basesize = ALIGN_DOWN(basesize, FRAME_SIZE);
-                total += basesize;
                 zone_create(ADDR2PFN(base), SIZE2FRAMES(basesize),
                         ADDR2PFN(base), 0);
             }
 ,7 → 384,6
             desc = arc_entry->getmemorydescriptor(desc);
         }
-        config.memory_size = total;
         return true;
     }

/trunk/kernel/arch/ia32/include/boot/memmap.h
65,7 → 65,6

extern e820memmap_t e820table[MEMMAP_E820_MAX_RECORDS];
extern uint8_t e820counter;
extern uint32_t e801memorysize; /*< Size of available memory in KB. /

#endif

/trunk/kernel/arch/ia32/Makefile.inc
141,7 → 141,6
arch/$(ARCH)/src/cpu/cpu.c \
arch/$(ARCH)/src/mm/as.c \
arch/$(ARCH)/src/mm/frame.c \
arch/$(ARCH)/src/mm/memory_init.c \
arch/$(ARCH)/src/mm/page.c \
arch/$(ARCH)/src/mm/tlb.c \
arch/$(ARCH)/src/ddi/ddi.c \
150,5 → 149,6
arch/$(ARCH)/src/drivers/ega.c \
arch/$(ARCH)/src/drivers/vesa.c \
arch/$(ARCH)/src/boot/boot.S \
arch/$(ARCH)/src/boot/memmap.c \
arch/$(ARCH)/src/fpu_context.c \
arch/$(ARCH)/src/debugger.c

/trunk/kernel/arch/ia32/src/ia32.c
54,7 → 54,6

#include <arch/bios/bios.h>

#include <arch/mm/memory_init.h>
#include <interrupt.h>
#include <ddi/irq.h>
#include <arch/debugger.h>

 /trunk/kernel/arch/ia32/src/boot/boot.S
 ,8 → 109,7
     cmpl $MULTIBOOT_LOADER_MAGIC, %eax              # compare GRUB signature
     je valid_boot
-        xorl %ecx, %ecx                         # no memory size or map available
-        movl %ecx, e801memorysize
+        xorl %ecx, %ecx                         # no memory map available
         movl %ecx, e820counter
         jmp invalid_boot
 ,19 → 118,6
         movl (%ebx), %eax                       # ebx = physical address of struct multiboot_info
-        bt $0, %eax                             # mbi->flags[0] (mem_lower, mem_upper valid)
-        jc mem_valid
-            xorl %ecx, %ecx
-            jmp mem_invalid
-        mem_valid:
-        movl 4(%ebx), %ecx                      # mbi->mem_lower
-        addl 8(%ebx), %ecx                      # mbi->mem_upper
-        mem_invalid:
-        movl %ecx, e801memorysize
         bt $3, %eax                             # mbi->flags[3] (mods_count, mods_addr valid)
         jc mods_valid

 /trunk/kernel/arch/ia32/src/boot/memmap.c
 ,0 → 1,41
+/*
+ * 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.
+ */
+/** @addtogroup ia32mm
+ * @{
+ */
+/** @file
+ */
+#include <arch/boot/memmap.h>
+uint8_t e820counter = 0xff;
+e820memmap_t e820table[MEMMAP_E820_MAX_RECORDS];
+/** @}
+ */

Subversion Repositories HelenOS

Compare Revisions

Ignore whitespace Rev 2724 → Rev 2725