From f9769af4ceefa5690bd2fb5b8c5fcd831d8ff6db Mon Sep 17 00:00:00 2001 From: Hubert Badocha Date: Mon, 9 Sep 2024 15:23:17 +0200 Subject: [PATCH] feature(pmap): define VADDR_KERN in makefile JIRA: RTOS-908 --- Makefile | 9 +- hal/armv7a/arch/pmap.h | 1 - hal/ia32/arch/pmap.h | 1 - hal/riscv64/arch/pmap.h | 1 - hal/sparcv8leon3/arch/pmap.h | 1 - ld/sparcv8leon3.ld | 209 ----------------------------------- 6 files changed, 4 insertions(+), 218 deletions(-) delete mode 100644 ld/sparcv8leon3.ld diff --git a/Makefile b/Makefile index 2c2d08da4..ba12edb42 100644 --- a/Makefile +++ b/Makefile @@ -16,6 +16,9 @@ MAKEFLAGS += --no-print-directory include ../phoenix-rtos-build/Makefile.common CFLAGS += -I. +ifeq ($(HAVE_MMU),y) +CPPFLAGS += -DVADDR_KERNEL=$(VADDR_KERNEL) +endif CPPFLAGS += -DVERSION=\"$(VERSION)\" # uncomment to enable stack canary checking @@ -56,11 +59,7 @@ DEPS := $(patsubst %.o, %.c.d, $(OBJS)) $(PREFIX_PROG)phoenix-$(TARGET_FAMILY)-$(TARGET_SUBFAMILY).elf: $(OBJS) @mkdir -p $(@D) @(printf "LD %-24s\n" "$(@F)"); -ifeq ($(TARGET_FAMILY),sparcv8leon3) - $(SIL)$(LD) $(CFLAGS) $(LDFLAGS) -nostdlib -e _start -Wl,--section-start,.init=$(VADDR_KERNEL_INIT) -o $@ $(OBJS) -lgcc -T ld/sparcv8leon3.ld -else - $(SIL)$(LD) $(CFLAGS) $(LDFLAGS) -nostdlib -e _start -Wl,--section-start,.init=$(VADDR_KERNEL_INIT) -o $@ $(OBJS) -lgcc -endif + $(SIL)$(LD) $(CFLAGS) $(LDFLAGS) -nostdlib -e _start -Wl,--section-start,.init=$(KERNEL_INIT_START) -o $@ $(OBJS) -lgcc install-headers: $(EXTERNAL_HEADERS) @printf "Installing kernel headers\n" diff --git a/hal/armv7a/arch/pmap.h b/hal/armv7a/arch/pmap.h index 16da3c216..a0743c079 100644 --- a/hal/armv7a/arch/pmap.h +++ b/hal/armv7a/arch/pmap.h @@ -19,7 +19,6 @@ #include "hal/types.h" /* Predefined virtual adresses */ -#define VADDR_KERNEL 0xc0000000 /* base virtual address of kernel space */ #define VADDR_MIN 0x00000000 #define VADDR_MAX 0xffffffff #define VADDR_USR_MAX 0x80000000 diff --git a/hal/ia32/arch/pmap.h b/hal/ia32/arch/pmap.h index 6846d6055..ca8221c74 100644 --- a/hal/ia32/arch/pmap.h +++ b/hal/ia32/arch/pmap.h @@ -18,7 +18,6 @@ #define _HAL_IA32_PMAP_H_ /* Predefined virtual addresses */ -#define VADDR_KERNEL 0xc0000000 /* base virtual address of kernel space */ #define VADDR_MIN 0x00000000 #define VADDR_MAX 0xffffffff #define VADDR_USR_MAX VADDR_KERNEL diff --git a/hal/riscv64/arch/pmap.h b/hal/riscv64/arch/pmap.h index 537cb9c27..884cf2f9d 100644 --- a/hal/riscv64/arch/pmap.h +++ b/hal/riscv64/arch/pmap.h @@ -17,7 +17,6 @@ #define _HAL_RISCV64_PMAP_H_ /* Predefined virtual addresses */ -#define VADDR_KERNEL 0x0000003fc0000000L /* base virtual address of kernel space */ #define VADDR_MIN 0x00000000 #define VADDR_MAX 0xffffffffffffffffL #define VADDR_USR_MAX VADDR_KERNEL diff --git a/hal/sparcv8leon3/arch/pmap.h b/hal/sparcv8leon3/arch/pmap.h index 75653a884..c0d2de36e 100644 --- a/hal/sparcv8leon3/arch/pmap.h +++ b/hal/sparcv8leon3/arch/pmap.h @@ -21,7 +21,6 @@ /* Predefined virtual addresses */ -#define VADDR_KERNEL 0xc0000000 /* base virtual address of kernel space */ #define VADDR_MIN 0x00000000 #define VADDR_MAX 0xffffffff #define VADDR_USR_MAX 0x80000000 diff --git a/ld/sparcv8leon3.ld b/ld/sparcv8leon3.ld deleted file mode 100644 index 19cacf151..000000000 --- a/ld/sparcv8leon3.ld +++ /dev/null @@ -1,209 +0,0 @@ -OUTPUT_FORMAT("elf32-sparc", "elf32-sparc", - "elf32-sparc") -OUTPUT_ARCH(sparc) -ENTRY(_start) -SEARCH_DIR("=/home/lukasz/toolchains/sparc-phoenix/sparc-phoenix/sparc-phoenix/lib"); SEARCH_DIR("=/usr/local/lib"); SEARCH_DIR("=/lib"); SEARCH_DIR("=/usr/lib"); -SECTIONS -{ - /* Read-only sections, merged into text segment: */ - PROVIDE (__executable_start = SEGMENT_START("text-segment", 0x10000)); . = SEGMENT_START("text-segment", 0x10000); - .interp : { *(.interp) } - .note.gnu.build-id : { *(.note.gnu.build-id) } - .hash : { *(.hash) } - .gnu.hash : { *(.gnu.hash) } - .dynsym : { *(.dynsym) } - .dynstr : { *(.dynstr) } - .gnu.version : { *(.gnu.version) } - .gnu.version_d : { *(.gnu.version_d) } - .gnu.version_r : { *(.gnu.version_r) } - .rela.dyn : - { - *(.rela.init) - *(.rela.text .rela.text.* .rela.gnu.linkonce.t.*) - *(.rela.fini) - *(.rela.rodata .rela.rodata.* .rela.gnu.linkonce.r.*) - *(.rela.data .rela.data.* .rela.gnu.linkonce.d.*) - *(.rela.tdata .rela.tdata.* .rela.gnu.linkonce.td.*) - *(.rela.tbss .rela.tbss.* .rela.gnu.linkonce.tb.*) - *(.rela.ctors) - *(.rela.dtors) - *(.rela.got) - *(.rela.bss .rela.bss.* .rela.gnu.linkonce.b.*) - PROVIDE_HIDDEN (__rela_iplt_start = .); - *(.rela.iplt) - PROVIDE_HIDDEN (__rela_iplt_end = .); - } - .rela.plt : - { - *(.rela.plt) - } - .init : - { - KEEP (*(SORT_NONE(.init))) - } =0x01000000 - .text : - { - *(.text.unlikely .text.*_unlikely .text.unlikely.*) - *(.text.exit .text.exit.*) - *(.text.startup .text.startup.*) - *(.text.hot .text.hot.*) - *(SORT(.text.sorted.*)) - *(.text .stub .text.* .gnu.linkonce.t.*) - /* .gnu.warning sections are handled specially by elf.em. */ - *(.gnu.warning) - } =0x01000000 - .fini : - { - KEEP (*(SORT_NONE(.fini))) - } =0x01000000 - PROVIDE (__etext = .); - PROVIDE (_etext = .); - PROVIDE (etext = .); - .rodata : { *(.rodata .rodata.* .gnu.linkonce.r.*) } - .rodata1 : { *(.rodata1) } - .eh_frame_hdr : { *(.eh_frame_hdr) *(.eh_frame_entry .eh_frame_entry.*) } - .eh_frame : ONLY_IF_RO { KEEP (*(.eh_frame)) *(.eh_frame.*) } - .gcc_except_table : ONLY_IF_RO { *(.gcc_except_table .gcc_except_table.*) } - .gnu_extab : ONLY_IF_RO { *(.gnu_extab*) } - /* These sections are generated by the Sun/Oracle C++ compiler. */ - .exception_ranges : ONLY_IF_RO { *(.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. */ - . = DATA_SEGMENT_ALIGN (CONSTANT (MAXPAGESIZE), CONSTANT (COMMONPAGESIZE)); - /* Exception handling */ - .eh_frame : ONLY_IF_RW { KEEP (*(.eh_frame)) *(.eh_frame.*) } - .gnu_extab : ONLY_IF_RW { *(.gnu_extab) } - .gcc_except_table : ONLY_IF_RW { *(.gcc_except_table .gcc_except_table.*) } - .exception_ranges : ONLY_IF_RW { *(.exception_ranges*) } - /* Thread Local Storage sections */ - .tdata : - { - PROVIDE_HIDDEN (__tdata_start = .); - *(.tdata .tdata.* .gnu.linkonce.td.*) - } - .tbss : { *(.tbss .tbss.* .gnu.linkonce.tb.*) *(.tcommon) } - .preinit_array : - { - PROVIDE_HIDDEN (__preinit_array_start = .); - KEEP (*(.preinit_array)) - PROVIDE_HIDDEN (__preinit_array_end = .); - } - .init_array : - { - PROVIDE_HIDDEN (__init_array_start = .); - KEEP (*(SORT_BY_INIT_PRIORITY(.init_array.*) SORT_BY_INIT_PRIORITY(.ctors.*))) - KEEP (*(.init_array EXCLUDE_FILE (*crtbegin.o *crtbegin?.o *crtend.o *crtend?.o ) .ctors)) - PROVIDE_HIDDEN (__init_array_end = .); - } - .fini_array : - { - PROVIDE_HIDDEN (__fini_array_start = .); - KEEP (*(SORT_BY_INIT_PRIORITY(.fini_array.*) SORT_BY_INIT_PRIORITY(.dtors.*))) - KEEP (*(.fini_array EXCLUDE_FILE (*crtbegin.o *crtbegin?.o *crtend.o *crtend?.o ) .dtors)) - PROVIDE_HIDDEN (__fini_array_end = .); - } - .ctors : - { - /* gcc uses crtbegin.o to find the start of - the constructors, so we make sure it is - first. Because this is a wildcard, it - doesn't matter if the user does not - actually link against crtbegin.o; the - linker won't look for a file to match a - wildcard. The wildcard also means that it - doesn't matter which directory crtbegin.o - is in. */ - KEEP (*crtbegin.o(.ctors)) - KEEP (*crtbegin?.o(.ctors)) - /* We don't want to include the .ctor section from - the crtend.o file until after the sorted ctors. - The .ctor section from the crtend file contains the - end of ctors marker and it must be last */ - KEEP (*(EXCLUDE_FILE (*crtend.o *crtend?.o ) .ctors)) - KEEP (*(SORT(.ctors.*))) - KEEP (*(.ctors)) - } - .dtors : - { - KEEP (*crtbegin.o(.dtors)) - KEEP (*crtbegin?.o(.dtors)) - KEEP (*(EXCLUDE_FILE (*crtend.o *crtend?.o ) .dtors)) - KEEP (*(SORT(.dtors.*))) - KEEP (*(.dtors)) - } - .jcr : { KEEP (*(.jcr)) } - .data.rel.ro : { *(.data.rel.ro.local* .gnu.linkonce.d.rel.ro.local.*) *(.data.rel.ro .data.rel.ro.* .gnu.linkonce.d.rel.ro.*) } - .dynamic : { *(.dynamic) } - . = DATA_SEGMENT_RELRO_END (0, .); - .got : { *(.got.plt) *(.igot.plt) *(.got) *(.igot) } - .plt : { *(.plt) } - .iplt : { *(.iplt) } - .data : - { - *(.data .data.* .gnu.linkonce.d.*) - SORT(CONSTRUCTORS) - } - .data1 : { *(.data1) } - _edata = .; PROVIDE (edata = .); - . = .; - __bss_start = .; - .bss : - { - *(.dynbss) - *(.bss .bss.* .gnu.linkonce.b.*) - *(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 do not - pad the .data section. */ - . = ALIGN(. != 0 ? 8 : 1); - } - . = ALIGN(8); - . = SEGMENT_START("ldata-segment", .); - . = ALIGN(8); - _end = .; PROVIDE (end = .); - . = DATA_SEGMENT_END (.); - /* 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) } - .gnu.build.attributes : { *(.gnu.build.attributes .gnu.build.attributes.*) } - /* 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 .gnu.linkonce.wi.*) } - .debug_abbrev 0 : { *(.debug_abbrev) } - .debug_line 0 : { *(.debug_line .debug_line.* .debug_line_end) } - .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) } - /* DWARF Extension. */ - .debug_macro 0 : { *(.debug_macro) } - .debug_addr 0 : { *(.debug_addr) } - .gnu.attributes 0 : { KEEP (*(.gnu.attributes)) } - /DISCARD/ : { *(.note.GNU-stack) *(.gnu_debuglink) *(.gnu.lto_*) } -}