moved memory manager sources into their own directory to consolidate everything
locally
This commit is contained in:
Eric J. Bowersox
parent
ab31b81050
commit
621aec75bb
|
|
@ -32,13 +32,14 @@ MAKEFLAGS += -rR
|
||||||
CRBASEDIR := $(abspath ..)
|
CRBASEDIR := $(abspath ..)
|
||||||
include $(CRBASEDIR)/armcompile.mk
|
include $(CRBASEDIR)/armcompile.mk
|
||||||
|
|
||||||
RES_OBJS = lowlevel.o trace.o memmgr.o vmmap.o pagealloc.o kernel_space.o
|
RES_OBJS = lowlevel.o trace.o
|
||||||
INIT_OBJS = start.o kistart.o init_heap.o
|
INIT_OBJS = start.o kistart.o
|
||||||
|
|
||||||
all: kernel.img
|
all: kernel.img
|
||||||
|
|
||||||
kernel.elf: prestart/kernel-prestart.o lib/kernel-lib.o $(RES_OBJS) $(INIT_OBJS) kernel.lds
|
kernel.elf: prestart/kernel-prestart.o lib/kernel-lib.o $(RES_OBJS) $(INIT_OBJS) mm/kernel-mm.o kernel.lds
|
||||||
$(LD) -T kernel.lds prestart/kernel-prestart.o lib/kernel-lib.o $(RES_OBJS) $(INIT_OBJS) -o kernel.elf
|
$(LD) -T kernel.lds prestart/kernel-prestart.o lib/kernel-lib.o $(RES_OBJS) $(INIT_OBJS) \
|
||||||
|
mm/kernel-mm.o -o kernel.elf
|
||||||
|
|
||||||
prestart/kernel-prestart.o:
|
prestart/kernel-prestart.o:
|
||||||
make -C prestart
|
make -C prestart
|
||||||
|
|
@ -46,6 +47,9 @@ prestart/kernel-prestart.o:
|
||||||
lib/kernel-lib.o:
|
lib/kernel-lib.o:
|
||||||
make -C lib
|
make -C lib
|
||||||
|
|
||||||
|
mm/kernel-mm.o:
|
||||||
|
make -C mm
|
||||||
|
|
||||||
kernel.img: kernel.elf
|
kernel.img: kernel.elf
|
||||||
$(OBJDUMP) -D kernel.elf > kernel.list
|
$(OBJDUMP) -D kernel.elf > kernel.list
|
||||||
$(OBJDUMP) -t kernel.elf > kernel.syms
|
$(OBJDUMP) -t kernel.elf > kernel.syms
|
||||||
|
|
@ -56,3 +60,4 @@ clean:
|
||||||
-rm *.o *.s *.lds kernel.img kernel.elf kernel.list kernel.syms*
|
-rm *.o *.s *.lds kernel.img kernel.elf kernel.list kernel.syms*
|
||||||
make -C prestart clean
|
make -C prestart clean
|
||||||
make -C lib clean
|
make -C lib clean
|
||||||
|
make -C mm clean
|
||||||
|
|
|
||||||
44
kernel/mm/Makefile
Normal file
44
kernel/mm/Makefile
Normal file
|
|
@ -0,0 +1,44 @@
|
||||||
|
#
|
||||||
|
# This file is part of the COMROGUE Operating System for Raspberry Pi
|
||||||
|
#
|
||||||
|
# Copyright (c) 2013, Eric J. Bowersox / Erbosoft Enterprises
|
||||||
|
# All rights reserved.
|
||||||
|
#
|
||||||
|
# This program is free for commercial and non-commercial use as long as the following conditions are
|
||||||
|
# adhered to.
|
||||||
|
#
|
||||||
|
# Copyright in this file remains Eric J. Bowersox and/or Erbosoft, and as such any copyright notices
|
||||||
|
# in the code are not to be removed.
|
||||||
|
#
|
||||||
|
# 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.
|
||||||
|
#
|
||||||
|
# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "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 COPYRIGHT HOLDER OR CONTRIBUTORS 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.
|
||||||
|
#
|
||||||
|
# "Raspberry Pi" is a trademark of the Raspberry Pi Foundation.
|
||||||
|
MAKEFLAGS += -rR
|
||||||
|
CRBASEDIR := $(abspath ../..)
|
||||||
|
include $(CRBASEDIR)/armcompile.mk
|
||||||
|
|
||||||
|
MM_OBJS = memmgr.o vmmap.o pagealloc.o kernel_space.o
|
||||||
|
MM_INIT_OBJS = init_heap.o
|
||||||
|
|
||||||
|
all: kernel-mm.o
|
||||||
|
|
||||||
|
kernel-mm.o: $(MM_OBJS) $(MM_INIT_OBJS) kernel-mm.lds
|
||||||
|
$(LD) -r -T kernel-mm.lds $(MM_OBJS) $(MM_INIT_OBJS) -o kernel-mm.o
|
||||||
|
|
||||||
|
clean:
|
||||||
|
-rm *.o *.s *.lds
|
||||||
193
kernel/mm/kernel-mm.ldi
Normal file
193
kernel/mm/kernel-mm.ldi
Normal file
|
|
@ -0,0 +1,193 @@
|
||||||
|
/*
|
||||||
|
* This file is part of the COMROGUE Operating System for Raspberry Pi
|
||||||
|
*
|
||||||
|
* Copyright (c) 2013, Eric J. Bowersox / Erbosoft Enterprises
|
||||||
|
* All rights reserved.
|
||||||
|
*
|
||||||
|
* This program is free for commercial and non-commercial use as long as the following conditions are
|
||||||
|
* adhered to.
|
||||||
|
*
|
||||||
|
* Copyright in this file remains Eric J. Bowersox and/or Erbosoft, and as such any copyright notices
|
||||||
|
* in the code are not to be removed.
|
||||||
|
*
|
||||||
|
* 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.
|
||||||
|
*
|
||||||
|
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "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 COPYRIGHT HOLDER OR CONTRIBUTORS 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.
|
||||||
|
*
|
||||||
|
* "Raspberry Pi" is a trademark of the Raspberry Pi Foundation.
|
||||||
|
*/
|
||||||
|
/* Copied from default linker script for relocatable linking under ARM & modified */
|
||||||
|
OUTPUT_FORMAT("elf32-littlearm", "elf32-bigarm", "elf32-littlearm")
|
||||||
|
OUTPUT_ARCH(arm)
|
||||||
|
|
||||||
|
SECTIONS
|
||||||
|
{
|
||||||
|
/* Read-only sections, merged into text segment: */
|
||||||
|
.interp 0 : { *(.interp) }
|
||||||
|
.note.gnu.build-id : { *(.note.gnu.build-id) }
|
||||||
|
.hash 0 : { *(.hash) }
|
||||||
|
.gnu.hash 0 : { *(.gnu.hash) }
|
||||||
|
.dynsym 0 : { *(.dynsym) }
|
||||||
|
.dynstr 0 : { *(.dynstr) }
|
||||||
|
.gnu.version 0 : { *(.gnu.version) }
|
||||||
|
.gnu.version_d 0: { *(.gnu.version_d) }
|
||||||
|
.gnu.version_r 0: { *(.gnu.version_r) }
|
||||||
|
.rel.init 0 : { *(.rel.init) }
|
||||||
|
.rela.init 0 : { *(.rela.init) }
|
||||||
|
.rel.text 0 : { *(.rel.text) }
|
||||||
|
.rela.text 0 : { *(.rela.text) }
|
||||||
|
.rel.fini 0 : { *(.rel.fini) }
|
||||||
|
.rela.fini 0 : { *(.rela.fini) }
|
||||||
|
.rel.rodata 0 : { *(.rel.rodata) }
|
||||||
|
.rela.rodata 0 : { *(.rela.rodata) }
|
||||||
|
.rel.data.rel.ro 0 : { *(.rel.data.rel.ro) }
|
||||||
|
.rela.data.rel.ro 0 : { *(.rela.data.rel.ro) }
|
||||||
|
.rel.data 0 : { *(.rel.data) }
|
||||||
|
.rela.data 0 : { *(.rela.data) }
|
||||||
|
.rel.tdata 0 : { *(.rel.tdata) }
|
||||||
|
.rela.tdata 0 : { *(.rela.tdata) }
|
||||||
|
.rel.tbss 0 : { *(.rel.tbss) }
|
||||||
|
.rela.tbss 0 : { *(.rela.tbss) }
|
||||||
|
.rel.ctors 0 : { *(.rel.ctors) }
|
||||||
|
.rela.ctors 0 : { *(.rela.ctors) }
|
||||||
|
.rel.dtors 0 : { *(.rel.dtors) }
|
||||||
|
.rela.dtors 0 : { *(.rela.dtors) }
|
||||||
|
.rel.got 0 : { *(.rel.got) }
|
||||||
|
.rela.got 0 : { *(.rela.got) }
|
||||||
|
.rel.bss 0 : { *(.rel.bss) }
|
||||||
|
.rela.bss 0 : { *(.rela.bss) }
|
||||||
|
.rel.iplt 0 :
|
||||||
|
{
|
||||||
|
*(.rel.iplt)
|
||||||
|
}
|
||||||
|
.rela.iplt 0 :
|
||||||
|
{
|
||||||
|
*(.rela.iplt)
|
||||||
|
}
|
||||||
|
.rel.plt 0 :
|
||||||
|
{
|
||||||
|
*(.rel.plt)
|
||||||
|
}
|
||||||
|
.rela.plt 0 :
|
||||||
|
{
|
||||||
|
*(.rela.plt)
|
||||||
|
}
|
||||||
|
.init 0 :
|
||||||
|
{
|
||||||
|
KEEP (*(.init))
|
||||||
|
} =0
|
||||||
|
.plt 0 : { *(.plt) }
|
||||||
|
.iplt 0 : { *(.iplt) }
|
||||||
|
.text 0 :
|
||||||
|
{
|
||||||
|
*(.text .stub)
|
||||||
|
/* .gnu.warning sections are handled specially by elf32.em. */
|
||||||
|
*(.gnu.warning)
|
||||||
|
} =0
|
||||||
|
.init.text 0 : { *(.init.text) }
|
||||||
|
.fini 0 :
|
||||||
|
{
|
||||||
|
KEEP (*(.fini))
|
||||||
|
} =0
|
||||||
|
.rodata 0 : { *(.rodata) }
|
||||||
|
.rodata1 0 : { *(.rodata1) }
|
||||||
|
.init.rodata 0 : { *(.init.rodata) }
|
||||||
|
.ARM.extab 0 : { *(.ARM.extab) }
|
||||||
|
.ARM.exidx 0 : { *(.ARM.exidx) }
|
||||||
|
.eh_frame_hdr : { *(.eh_frame_hdr) }
|
||||||
|
.eh_frame 0 : ONLY_IF_RO { KEEP (*(.eh_frame)) }
|
||||||
|
.gcc_except_table 0 : ONLY_IF_RO { *(.gcc_except_table
|
||||||
|
.gcc_except_table.*) }
|
||||||
|
/* These sections are generated by the Sun/Oracle C++ compiler. */
|
||||||
|
.exception_ranges 0 : ONLY_IF_RO { *(.exception_ranges
|
||||||
|
.exception_ranges*) }
|
||||||
|
/* Adjust the address for the data segment. We want to adjust up to
|
||||||
|
the same address within the page on the next page up. */
|
||||||
|
/* Exception handling */
|
||||||
|
.eh_frame 0 : ONLY_IF_RW { KEEP (*(.eh_frame)) }
|
||||||
|
.gcc_except_table 0 : ONLY_IF_RW { *(.gcc_except_table .gcc_except_table.*) }
|
||||||
|
.exception_ranges 0 : ONLY_IF_RW { *(.exception_ranges .exception_ranges*) }
|
||||||
|
/* Thread Local Storage sections */
|
||||||
|
.tdata 0 : { *(.tdata) }
|
||||||
|
.tbss 0 : { *(.tbss) }
|
||||||
|
.preinit_array 0 :
|
||||||
|
{
|
||||||
|
KEEP (*(.preinit_array))
|
||||||
|
}
|
||||||
|
.jcr 0 : { KEEP (*(.jcr)) }
|
||||||
|
.dynamic 0 : { *(.dynamic) }
|
||||||
|
.got 0 : { *(.got.plt) *(.igot.plt) *(.got) *(.igot) }
|
||||||
|
.data 0 :
|
||||||
|
{
|
||||||
|
*(.data)
|
||||||
|
}
|
||||||
|
.data1 0 : { *(.data1) }
|
||||||
|
.init.data 0 : { *(.init.data) }
|
||||||
|
.bss 0 :
|
||||||
|
{
|
||||||
|
*(.dynbss)
|
||||||
|
*(.bss)
|
||||||
|
*(COMMON)
|
||||||
|
/* Align here to ensure that the .bss section occupies space up to
|
||||||
|
_end. Align after .bss to ensure correct alignment even if the
|
||||||
|
.bss section disappears because there are no input sections.
|
||||||
|
FIXME: Why do we need it? When there is no .bss section, we don't
|
||||||
|
pad the .data section. */
|
||||||
|
}
|
||||||
|
.init.bss 0 : { *(.init.bss) }
|
||||||
|
/* Stabs debugging sections. */
|
||||||
|
.stab 0 : { *(.stab) }
|
||||||
|
.stabstr 0 : { *(.stabstr) }
|
||||||
|
.stab.excl 0 : { *(.stab.excl) }
|
||||||
|
.stab.exclstr 0 : { *(.stab.exclstr) }
|
||||||
|
.stab.index 0 : { *(.stab.index) }
|
||||||
|
.stab.indexstr 0 : { *(.stab.indexstr) }
|
||||||
|
.comment 0 : { *(.comment) }
|
||||||
|
/* DWARF debug sections.
|
||||||
|
Symbols in the DWARF debugging sections are relative to the beginning
|
||||||
|
of the section so we begin them at 0. */
|
||||||
|
/* DWARF 1 */
|
||||||
|
.debug 0 : { *(.debug) }
|
||||||
|
.line 0 : { *(.line) }
|
||||||
|
/* GNU DWARF 1 extensions */
|
||||||
|
.debug_srcinfo 0 : { *(.debug_srcinfo) }
|
||||||
|
.debug_sfnames 0 : { *(.debug_sfnames) }
|
||||||
|
/* DWARF 1.1 and DWARF 2 */
|
||||||
|
.debug_aranges 0 : { *(.debug_aranges) }
|
||||||
|
.debug_pubnames 0 : { *(.debug_pubnames) }
|
||||||
|
/* DWARF 2 */
|
||||||
|
.debug_info 0 : { *(.debug_info) }
|
||||||
|
.debug_abbrev 0 : { *(.debug_abbrev) }
|
||||||
|
.debug_line 0 : { *(.debug_line) }
|
||||||
|
.debug_frame 0 : { *(.debug_frame) }
|
||||||
|
.debug_str 0 : { *(.debug_str) }
|
||||||
|
.debug_loc 0 : { *(.debug_loc) }
|
||||||
|
.debug_macinfo 0 : { *(.debug_macinfo) }
|
||||||
|
/* SGI/MIPS DWARF 2 extensions */
|
||||||
|
.debug_weaknames 0 : { *(.debug_weaknames) }
|
||||||
|
.debug_funcnames 0 : { *(.debug_funcnames) }
|
||||||
|
.debug_typenames 0 : { *(.debug_typenames) }
|
||||||
|
.debug_varnames 0 : { *(.debug_varnames) }
|
||||||
|
/* DWARF 3 */
|
||||||
|
.debug_pubtypes 0 : { *(.debug_pubtypes) }
|
||||||
|
.debug_ranges 0 : { *(.debug_ranges) }
|
||||||
|
.stack 0 :
|
||||||
|
{
|
||||||
|
*(.stack)
|
||||||
|
}
|
||||||
|
.ARM.attributes 0 : { KEEP (*(.ARM.attributes)) KEEP (*(.gnu.attributes)) }
|
||||||
|
.note.gnu.arm.ident 0 : { KEEP (*(.note.gnu.arm.ident)) }
|
||||||
|
}
|
||||||
Loading…
Reference in New Issue
Block a user