Index: .gitignore =================================================================== --- .gitignore (revision c878693123930f0906703462cf2807430679517e) +++ .gitignore (revision de9e28e0c0b35a214dcdc3688dc8579f50c5fbd6) @@ -24,4 +24,5 @@ autotool/ boot/arch/arm32/_link.ld +boot/arch/arm64/_link.ld boot/arch/ia64/_link.ld boot/arch/mips32/_link.ld @@ -49,4 +50,5 @@ kernel/arch/amd64/_link.ld kernel/arch/arm32/_link.ld +kernel/arch/arm64/_link.ld kernel/arch/ia32/_link.ld kernel/arch/ia64/_link.ld @@ -90,5 +92,4 @@ uspace/app/bithenge/bithenge uspace/app/blkdump/blkdump -uspace/app/bnchmark/bnchmark uspace/app/contacts/contacts uspace/app/corecfg/corecfg @@ -107,7 +108,9 @@ uspace/app/getterm/getterm uspace/app/gunzip/gunzip +uspace/app/hbench/hbench uspace/app/inet/inet uspace/app/init/init uspace/app/init/init.gz +uspace/app/lprint/lprint uspace/app/kill/kill uspace/app/killall/killall @@ -129,10 +132,8 @@ uspace/app/nic/nic uspace/app/nterm/nterm -uspace/app/perf/perf +uspace/app/pci/pci uspace/app/ping/ping uspace/app/ping6/ping6 uspace/app/pkg/pkg -uspace/app/rcubench/rcubench -uspace/app/rcutest/rcutest uspace/app/redir/redir uspace/app/sbi/sbi @@ -173,5 +174,4 @@ uspace/dist/app/bithenge uspace/dist/app/blkdump -uspace/dist/app/bnchmark uspace/dist/app/corecfg uspace/dist/app/cpptest @@ -211,6 +211,4 @@ uspace/dist/app/ping6 uspace/dist/app/pkg -uspace/dist/app/rcubench -uspace/dist/app/rcutest uspace/dist/app/redir uspace/dist/app/sbi @@ -314,4 +312,6 @@ uspace/drv/char/msim-con/msim-con uspace/drv/char/ns8250/ns8250 +uspace/drv/char/pc-lpt/pc-lpt +uspace/drv/char/pl011/pl011 uspace/drv/char/pl050/pl050 uspace/drv/char/ps2mouse/ps2mouse @@ -327,4 +327,5 @@ uspace/drv/hid/xtkbd/xtkbd uspace/drv/intctl/apic/apic +uspace/drv/intctl/gicv2/gicv2 uspace/drv/intctl/i8259/i8259 uspace/drv/intctl/icp-ic/icp-ic @@ -337,4 +338,5 @@ uspace/drv/nic/virtio-net/virtio-net uspace/drv/platform/amdm37x/amdm37x +uspace/drv/platform/arm64virt/arm64virt uspace/drv/platform/icp/icp uspace/drv/platform/mac/mac @@ -352,40 +354,4 @@ uspace/drv/time/cmos-rtc/cmos-rtc uspace/export -uspace/lib/c/arch/abs32le/_link-dlexe.ld -uspace/lib/c/arch/abs32le/_link-loader.ld -uspace/lib/c/arch/abs32le/_link-shlib.ld -uspace/lib/c/arch/abs32le/_link.ld -uspace/lib/c/arch/amd64/_link-dlexe.ld -uspace/lib/c/arch/amd64/_link-loader.ld -uspace/lib/c/arch/amd64/_link-shlib.ld -uspace/lib/c/arch/amd64/_link.ld -uspace/lib/c/arch/arm32/_link-dlexe.ld -uspace/lib/c/arch/arm32/_link-loader.ld -uspace/lib/c/arch/arm32/_link-shlib.ld -uspace/lib/c/arch/arm32/_link.ld -uspace/lib/c/arch/ia32/_link-dlexe.ld -uspace/lib/c/arch/ia32/_link-loader.ld -uspace/lib/c/arch/ia32/_link-shlib.ld -uspace/lib/c/arch/ia32/_link.ld -uspace/lib/c/arch/ia64/_link-dlexe.ld -uspace/lib/c/arch/ia64/_link-loader.ld -uspace/lib/c/arch/ia64/_link-shlib.ld -uspace/lib/c/arch/ia64/_link.ld -uspace/lib/c/arch/mips32/_link-dlexe.ld -uspace/lib/c/arch/mips32/_link-loader.ld -uspace/lib/c/arch/mips32/_link-shlib.ld -uspace/lib/c/arch/mips32/_link.ld -uspace/lib/c/arch/mips32eb/_link-dlexe.ld -uspace/lib/c/arch/mips32eb/_link-loader.ld -uspace/lib/c/arch/mips32eb/_link-shlib.ld -uspace/lib/c/arch/mips32eb/_link.ld -uspace/lib/c/arch/ppc32/_link-dlexe.ld -uspace/lib/c/arch/ppc32/_link-loader.ld -uspace/lib/c/arch/ppc32/_link-shlib.ld -uspace/lib/c/arch/ppc32/_link.ld -uspace/lib/c/arch/sparc64/_link-dlexe.ld -uspace/lib/c/arch/sparc64/_link-loader.ld -uspace/lib/c/arch/sparc64/_link-shlib.ld -uspace/lib/c/arch/sparc64/_link.ld uspace/lib/c/test-libc uspace/lib/label/test-liblabel Index: .travis.yml =================================================================== --- .travis.yml (revision c878693123930f0906703462cf2807430679517e) +++ .travis.yml (revision de9e28e0c0b35a214dcdc3688dc8579f50c5fbd6) @@ -35,5 +35,5 @@ language: c -dist: trusty +dist: xenial sudo: required env: Index: HelenOS.config =================================================================== --- HelenOS.config (revision c878693123930f0906703462cf2807430679517e) +++ HelenOS.config (revision de9e28e0c0b35a214dcdc3688dc8579f50c5fbd6) @@ -34,4 +34,5 @@ @ "amd64" AMD64/EM64T 64-bit (PC) @ "arm32" ARM 32-bit +@ "arm64" ARM 64-bit (AArch64) @ "ia32" IA-32 32-bit (PC) @ "ia64" IA-64 64-bit @@ -65,4 +66,8 @@ ! [PLATFORM=arm32] MACHINE (choice) +% Machine type +@ "virt" QEMU virt +! [PLATFORM=arm64] MACHINE (choice) + % CPU type @ "pentium4" Pentium 4 @@ -160,4 +165,8 @@ % Kernel architecture +@ "arm64" +! [PLATFORM=arm64] KARCH (choice) + +% Kernel architecture @ "ia32" ! [PLATFORM=ia32] KARCH (choice) @@ -207,4 +216,8 @@ % User space architecture +@ "arm64" +! [PLATFORM=arm64] UARCH (choice) + +% User space architecture @ "ia32" ! [PLATFORM=ia32|PLATFORM=ia32xen] UARCH (choice) @@ -252,4 +265,8 @@ @ "arm32" ! [PLATFORM=arm32] BARCH (choice) + +% Boot architecture +@ "arm64" +! [PLATFORM=arm64] BARCH (choice) % Boot architecture @@ -334,5 +351,5 @@ % IOMAP dummy support -! [PLATFORM=abs32le|PLATFORM=arm32|PLATFORM=mips32|PLATFORM=ppc32|PLATFORM=riscv64|PLATFORM=sparc64] CONFIG_IOMAP_DUMMY (y) +! [PLATFORM=abs32le|PLATFORM=arm32|PLATFORM=arm64|PLATFORM=mips32|PLATFORM=ppc32|PLATFORM=riscv64|PLATFORM=sparc64] CONFIG_IOMAP_DUMMY (y) % ACPI support @@ -340,5 +357,5 @@ % Hierarchical page tables support -! [PLATFORM=abs32le|PLATFORM=ia32|PLATFORM=amd64|PLATFORM=arm32|PLATFORM=mips32|PLATFORM=ppc32|PLATFORM=riscv64] CONFIG_PAGE_PT (y) +! [PLATFORM=abs32le|PLATFORM=ia32|PLATFORM=amd64|PLATFORM=arm32|PLATFORM=arm64|PLATFORM=mips32|PLATFORM=ppc32|PLATFORM=riscv64] CONFIG_PAGE_PT (y) % Page hash table support @@ -349,8 +366,8 @@ % ASID support -! [PLATFORM=ia64|PLATFORM=mips32|PLATFORM=ppc32|PLATFORM=sparc64] CONFIG_ASID (y) +! [PLATFORM=arm64|PLATFORM=ia64|PLATFORM=mips32|PLATFORM=ppc32|PLATFORM=sparc64] CONFIG_ASID (y) % ASID FIFO support -! [PLATFORM=ia64|PLATFORM=mips32|PLATFORM=ppc32|PLATFORM=sparc64] CONFIG_ASID_FIFO (y) +! [PLATFORM=arm64|PLATFORM=ia64|PLATFORM=mips32|PLATFORM=ppc32|PLATFORM=sparc64] CONFIG_ASID_FIFO (y) % OpenFirmware tree support @@ -364,5 +381,5 @@ % FPU support -! [PLATFORM=ia32|PLATFORM=amd64|PLATFORM=ia64|PLATFORM=ppc32|PLATFORM=sparc64] CONFIG_FPU (y) +! [PLATFORM=ia32|PLATFORM=amd64|PLATFORM=arm64|PLATFORM=ia64|PLATFORM=ppc32|PLATFORM=sparc64] CONFIG_FPU (y) ## ARMv7 made FPU hardware compulsory @@ -377,5 +394,5 @@ % Support for SMP -! [(PLATFORM=ia32&PROCESSOR!=athlon_xp)|PLATFORM=amd64|PLATFORM=sparc64|PLATFORM=ia64|(PLATFORM=mips32&MACHINE=msim)|PLATFORM=abs32le] CONFIG_SMP (y/n) +! [(PLATFORM=ia32&PROCESSOR!=athlon_xp)|PLATFORM=amd64|PLATFORM=arm64|PLATFORM=sparc64|PLATFORM=ia64|(PLATFORM=mips32&MACHINE=msim)|PLATFORM=abs32le] CONFIG_SMP (y/n) % Debug build @@ -406,4 +423,7 @@ ! [PLATFORM=ia64&MACHINE!=ski] CONFIG_IOSAPIC (y/n) +% Support for Intel i8259 PIC +! [PLATFORM=ia32|PLATFORM=amd64|(PLATFORM=mips32&MACHINE=bmalta)|(PLATFORM=mips32&MACHINE=lmalta)] CONFIG_I8259 (y) + % Virtually indexed D-cache support ! [PLATFORM=sparc64] CONFIG_VIRT_IDX_DCACHE (y/n) @@ -439,5 +459,5 @@ % Input device class @ "generic" Keyboard or serial line -! [PLATFORM=arm32&MACHINE=integratorcp] CONFIG_HID_IN (choice) +! [(PLATFORM=arm32&MACHINE=integratorcp)|PLATFORM=arm64] CONFIG_HID_IN (choice) % Input device class @@ -455,5 +475,5 @@ % Output device class @ "generic" Monitor or serial line -! [PLATFORM=arm32&(MACHINE=gta02|MACHINE=integratorcp|MACHINE=beagleboardxm|MACHINE=beaglebone|MACHINE=raspberrypi)] CONFIG_HID_OUT (choice) +! [(PLATFORM=arm32&(MACHINE=gta02|MACHINE=integratorcp|MACHINE=beagleboardxm|MACHINE=beaglebone|MACHINE=raspberrypi))|PLATFORM=arm64] CONFIG_HID_OUT (choice) % Output device class @@ -486,6 +506,12 @@ ! [(CONFIG_HID_IN=generic|CONFIG_HID_IN=serial)&PLATFORM=ia64&MACHINE=i460GX] CONFIG_NS16550 (y/n) +% Support for NS16550 controller +! [CONFIG_HID_IN=generic&PLATFORM=mips32&(MACHINE=lmalta|MACHINE=bmalta)] CONFIG_NS16550 (y) + % Support for PL011 UART -! [(CONFIG_HID_OUT=generic|CONFIG_HID_OUT=serial)&PLATFORM=arm32&(MACHINE=integratorcp|MACHINE=raspberrypi)] CONFIG_PL011_UART (y/n) +! [(CONFIG_HID_OUT=generic|CONFIG_HID_OUT=serial)&(PLATFORM=arm32&(MACHINE=integratorcp|MACHINE=raspberrypi))] CONFIG_PL011_UART (y/n) + +% Support for PL011 UART +! [CONFIG_HID_OUT=generic|(PLATFORM=arm64&MACHINE=virt)] CONFIG_PL011_UART (y) % Support for NS16550 controller (kernel console) @@ -498,4 +524,7 @@ ! [(CONFIG_HID_OUT=generic|CONFIG_HID_OUT=serial)&(PLATFORM=ia32|PLATFORM=amd64)&CONFIG_NS16550_KCON=y] CONFIG_NS16550_OUT (y) +% Use NS16550 controller as dummy serial output (kernel console) +! [CONFIG_HID_OUT=generic&PLATFORM=mips32&(MACHINE=lmalta|MACHINE=bmalta)] CONFIG_NS16550_OUT (y) + % Support for Samsung S3C24XX on-chip UART ! [(CONFIG_HID_OUT=generic|CONFIG_HID_OUT=serial)&PLATFORM=arm32&MACHINE=gta02] CONFIG_S3C24XX_UART (y/n) @@ -513,4 +542,7 @@ ! [PLATFORM=arm32&MACHINE=raspberrypi] CONFIG_BCM2835_MAILBOX (y/n) +% Support for ARM GICv2 +! [PLATFORM=arm64&MACHINE=virt] CONFIG_GICV2 (y) + % Support for i8042 controller ! [CONFIG_PC_KBD=y] CONFIG_I8042 (y) @@ -522,4 +554,7 @@ ! [(CONFIG_HID_IN=generic|CONFIG_HID_IN=keyboard)&PLATFORM=sparc64&MACHINE=generic&CONFIG_NS16550=y] CONFIG_SUN_KBD (y) +% Sun serial console support +! [(CONFIG_HID_IN=generic|CONFIG_HID_IN=keyboard)&PLATFORM=sparc64&MACHINE=generic&CONFIG_NS16550=y] CONFIG_SUN_TTY (y) + % Macintosh ADB keyboard support ! [(CONFIG_HID_IN=generic|CONFIG_HID_IN=keyboard)&PLATFORM=ppc32&(CONFIG_VIA_CUDA=y)] CONFIG_MAC_KBD (y) @@ -532,5 +567,8 @@ % Serial line input module -! [CONFIG_DSRLNIN=y|(PLATFORM=arm32&MACHINE=gta02)|(PLATFORM=arm32&MACHINE=integratorcp&CONFIG_PL011_UART=y)|(PLATFORM=arm32&MACHINE=beaglebone&CONFIG_OMAP_UART=y)|(PLATFORM=arm32&MACHINE=beagleboardxm&CONFIG_OMAP_UART=y)|(PLATFORM=ia64&MACHINE=i460GX&CONFIG_NS16550=y)|(PLATFORM=ia64&MACHINE=ski)|(PLATFORM=sparc64&PROCESSOR=sun4v)|(PLATFORM=arm32&MACHINE=raspberrypi&CONFIG_PL011_UART=y)|(PLATFORM=ia32&CONFIG_NS16550=y)|(PLATFORM=amd64&CONFIG_NS16550=y)] CONFIG_SRLN (y) +! [CONFIG_DSRLNIN=y|(PLATFORM=arm32&MACHINE=gta02)|(PLATFORM=arm32&MACHINE=integratorcp&CONFIG_PL011_UART=y)|(PLATFORM=arm32&MACHINE=beaglebone&CONFIG_OMAP_UART=y)|(PLATFORM=arm32&MACHINE=beagleboardxm&CONFIG_OMAP_UART=y)|(PLATFORM=arm64&CONFIG_PL011_UART=y)|(PLATFORM=ia64&MACHINE=i460GX&CONFIG_NS16550=y)|(PLATFORM=ia64&MACHINE=ski)|(PLATFORM=sparc64&PROCESSOR=sun4v)|(PLATFORM=arm32&MACHINE=raspberrypi&CONFIG_PL011_UART=y)|(PLATFORM=ia32&CONFIG_NS16550=y)|(PLATFORM=amd64&CONFIG_NS16550=y)|(PLATFORM=mips32&CONFIG_NS16550=y)|(PLATFORM=sparc64&CONFIG_SUN_TTY=y)] CONFIG_SRLN (y) + +% L4Re uvmm print hypercall support +! [PLATFORM=amd64] CONFIG_L4RE_UVMM_EARLY_PRINT (n/y) % EGA support @@ -578,6 +616,6 @@ % Dynamic linking support -! [PLATFORM=ia32] CONFIG_RTLD (n/y) -! [PLATFORM=abs32le|PLATFORM=amd64|PLATFORM=arm32|PLATFORM=ia64|PLATFORM=mips32|PLATFORM=ppc32|PLATFORM=riscv64|PLATFORM=sparc64] CONFIG_RTLD (n) +! [PLATFORM=amd64|PLATFORM=arm32|PLATFORM=ia32|PLATFORM=ppc32|PLATFORM=sparc64] CONFIG_RTLD (y/n) +! [PLATFORM=abs32le|PLATFORM=arm64|PLATFORM=ia64|PLATFORM=mips32|PLATFORM=riscv64] CONFIG_RTLD (n) % Build shared libraries @@ -642,4 +680,8 @@ ! [PLATFORM=ia32|PLATFORM=amd64] GRUB_ARCH (choice) +% GRUB boot loader architecture +@ "efi" GRUB for UEFI +! [PLATFORM=arm64&MACHINE=virt] GRUB_ARCH (choice) + % uImage OS type @ "2" NetBSD stage 2 boot loader Index: README.md =================================================================== --- README.md (revision c878693123930f0906703462cf2807430679517e) +++ README.md (revision de9e28e0c0b35a214dcdc3688dc8579f50c5fbd6) @@ -9,4 +9,6 @@ directly harm others. HelenOS is therefore flexible, modular, extensible, fault tolerant and easy to understand. + +![screenshot](http://www.helenos.org/raw-attachment/wiki/Screenshots/screenshot.png "Screenshot") HelenOS aims to be compatible with the C11 and C++14 standards, but does not @@ -24,5 +26,5 @@ ## Portability -HelenOS runs on seven different processor architectures and machines ranging +HelenOS runs on eight different processor architectures and machines ranging from embedded ARM devices and single-board computers through multicore 32-bit and 64-bit desktop PCs to 64-bit Itanium and SPARC rack-mount servers. @@ -52,5 +54,5 @@ ``` -$ sudo apt-get install build-essential libgmp-dev libmpfr-dev ppl-dev libmpc-dev zlib1g-dev texinfo libtinfo-dev xutils-dev +$ sudo apt-get install build-essential libgmp-dev libmpfr-dev ppl-dev libmpc-dev zlib1g-dev texinfo libtinfo-dev xutils-dev flex bison ``` @@ -59,5 +61,5 @@ ``` # sudo dnf group install 'Development Tools' -# sudo dnf install wget texinfo libmpc-devel mpfr-devel gmp-devel PyYAML genisoimage +# sudo dnf install wget texinfo libmpc-devel mpfr-devel gmp-devel PyYAML genisoimage flex bison ``` In case the toolchain script won't work no matter how hard you try, let us know. Index: abi/arch/abs32le/include/abi/arch/elf.h =================================================================== --- abi/arch/abs32le/include/abi/arch/elf.h (revision c878693123930f0906703462cf2807430679517e) +++ abi/arch/abs32le/include/abi/arch/elf.h (revision de9e28e0c0b35a214dcdc3688dc8579f50c5fbd6) @@ -33,6 +33,6 @@ */ -#ifndef ABI_abs32le_ELF_H_ -#define ABI_abs32le_ELF_H_ +#ifndef _ABI_abs32le_ELF_H_ +#define _ABI_abs32le_ELF_H_ #define ELF_MACHINE EM_NO Index: abi/arch/amd64/include/abi/arch/elf.h =================================================================== --- abi/arch/amd64/include/abi/arch/elf.h (revision c878693123930f0906703462cf2807430679517e) +++ abi/arch/amd64/include/abi/arch/elf.h (revision de9e28e0c0b35a214dcdc3688dc8579f50c5fbd6) @@ -33,6 +33,6 @@ */ -#ifndef ABI_amd64_ELF_H_ -#define ABI_amd64_ELF_H_ +#ifndef _ABI_amd64_ELF_H_ +#define _ABI_amd64_ELF_H_ #define ELF_MACHINE EM_X86_64 Index: abi/arch/arm32/include/abi/arch/elf.h =================================================================== --- abi/arch/arm32/include/abi/arch/elf.h (revision c878693123930f0906703462cf2807430679517e) +++ abi/arch/arm32/include/abi/arch/elf.h (revision de9e28e0c0b35a214dcdc3688dc8579f50c5fbd6) @@ -34,6 +34,6 @@ */ -#ifndef ABI_arm32_ELF_H_ -#define ABI_arm32_ELF_H_ +#ifndef _ABI_arm32_ELF_H_ +#define _ABI_arm32_ELF_H_ #define ELF_MACHINE EM_ARM Index: abi/arch/arm64/include/abi/arch/elf.h =================================================================== --- abi/arch/arm64/include/abi/arch/elf.h (revision de9e28e0c0b35a214dcdc3688dc8579f50c5fbd6) +++ abi/arch/arm64/include/abi/arch/elf.h (revision de9e28e0c0b35a214dcdc3688dc8579f50c5fbd6) @@ -0,0 +1,48 @@ +/* + * Copyright (c) 2015 Petr Pavlu + * 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 abi_arm64 + * @{ + */ +/** @file + * @brief ARM64 ELF constants. + */ + +#ifndef _ABI_arm64_ELF_H_ +#define _ABI_arm64_ELF_H_ + +#define ELF_MACHINE EM_AARCH64 +#define ELF_DATA_ENCODING ELFDATA2LSB +#define ELF_CLASS ELFCLASS64 + +#define R_AARCH64_RELATIVE 1027 + +#endif + +/** @} + */ Index: abi/arch/ia32/include/abi/arch/elf.h =================================================================== --- abi/arch/ia32/include/abi/arch/elf.h (revision c878693123930f0906703462cf2807430679517e) +++ abi/arch/ia32/include/abi/arch/elf.h (revision de9e28e0c0b35a214dcdc3688dc8579f50c5fbd6) @@ -33,6 +33,6 @@ */ -#ifndef ABI_ia32_ELF_H_ -#define ABI_ia32_ELF_H_ +#ifndef _ABI_ia32_ELF_H_ +#define _ABI_ia32_ELF_H_ #define ELF_MACHINE EM_386 Index: abi/arch/ia64/include/abi/arch/elf.h =================================================================== --- abi/arch/ia64/include/abi/arch/elf.h (revision c878693123930f0906703462cf2807430679517e) +++ abi/arch/ia64/include/abi/arch/elf.h (revision de9e28e0c0b35a214dcdc3688dc8579f50c5fbd6) @@ -33,6 +33,6 @@ */ -#ifndef ABI_ia64_ELF_H_ -#define ABI_ia64_ELF_H_ +#ifndef _ABI_ia64_ELF_H_ +#define _ABI_ia64_ELF_H_ #define ELF_MACHINE EM_IA_64 Index: abi/arch/mips32/include/abi/arch/elf.h =================================================================== --- abi/arch/mips32/include/abi/arch/elf.h (revision c878693123930f0906703462cf2807430679517e) +++ abi/arch/mips32/include/abi/arch/elf.h (revision de9e28e0c0b35a214dcdc3688dc8579f50c5fbd6) @@ -33,6 +33,6 @@ */ -#ifndef ABI_mips32_ELF_H_ -#define ABI_mips32_ELF_H_ +#ifndef _ABI_mips32_ELF_H_ +#define _ABI_mips32_ELF_H_ #define ELF_MACHINE EM_MIPS Index: abi/arch/ppc32/include/abi/arch/elf.h =================================================================== --- abi/arch/ppc32/include/abi/arch/elf.h (revision c878693123930f0906703462cf2807430679517e) +++ abi/arch/ppc32/include/abi/arch/elf.h (revision de9e28e0c0b35a214dcdc3688dc8579f50c5fbd6) @@ -33,6 +33,6 @@ */ -#ifndef ABI_ppc32_ELF_H_ -#define ABI_ppc32_ELF_H_ +#ifndef _ABI_ppc32_ELF_H_ +#define _ABI_ppc32_ELF_H_ #define ELF_MACHINE EM_PPC Index: abi/arch/riscv64/include/abi/arch/elf.h =================================================================== --- abi/arch/riscv64/include/abi/arch/elf.h (revision c878693123930f0906703462cf2807430679517e) +++ abi/arch/riscv64/include/abi/arch/elf.h (revision de9e28e0c0b35a214dcdc3688dc8579f50c5fbd6) @@ -33,6 +33,6 @@ */ -#ifndef ABI_riscv64_ELF_H_ -#define ABI_riscv64_ELF_H_ +#ifndef _ABI_riscv64_ELF_H_ +#define _ABI_riscv64_ELF_H_ #define ELF_MACHINE EM_RISCV Index: abi/arch/sparc64/include/abi/arch/elf.h =================================================================== --- abi/arch/sparc64/include/abi/arch/elf.h (revision c878693123930f0906703462cf2807430679517e) +++ abi/arch/sparc64/include/abi/arch/elf.h (revision de9e28e0c0b35a214dcdc3688dc8579f50c5fbd6) @@ -33,6 +33,6 @@ */ -#ifndef ABI_sparc64_ELF_H_ -#define ABI_sparc64_ELF_H_ +#ifndef _ABI_sparc64_ELF_H_ +#define _ABI_sparc64_ELF_H_ #define ELF_MACHINE EM_SPARCV9 Index: abi/doc/doxygroups.h =================================================================== --- abi/doc/doxygroups.h (revision c878693123930f0906703462cf2807430679517e) +++ abi/doc/doxygroups.h (revision de9e28e0c0b35a214dcdc3688dc8579f50c5fbd6) @@ -30,4 +30,9 @@ /** + * @defgroup abi_arm64 arm64 + * @ingroup abi + */ + +/** * @defgroup abi_ia32 ia32 * @ingroup abi @@ -50,5 +55,5 @@ /** - * @defgroup abi_riscv5 riscv5 + * @defgroup abi_riscv64 riscv64 * @ingroup abi */ Index: abi/include/_bits/NULL.h =================================================================== --- abi/include/_bits/NULL.h (revision c878693123930f0906703462cf2807430679517e) +++ abi/include/_bits/NULL.h (revision de9e28e0c0b35a214dcdc3688dc8579f50c5fbd6) @@ -37,8 +37,4 @@ /** @file * Definition of constant NULL. - * - * This definition is designed to work in both C and C++, and use - * the special constant `nullptr` in C++11 and above. - * Including this file is preferrable to defining the constant separately. */ @@ -46,15 +42,6 @@ #define _BITS_NULL_H_ -#ifndef NULL - -#if __cplusplus >= 201103L -#define NULL nullptr -#elif defined(__cplusplus) -#define NULL 0L -#else -#define NULL ((void *) 0) -#endif - -#endif +#define __need_NULL +#include #endif Index: abi/include/_bits/__opaque_handle.h =================================================================== --- abi/include/_bits/__opaque_handle.h (revision de9e28e0c0b35a214dcdc3688dc8579f50c5fbd6) +++ abi/include/_bits/__opaque_handle.h (revision de9e28e0c0b35a214dcdc3688dc8579f50c5fbd6) @@ -0,0 +1,46 @@ +/* + * Copyright (c) 2017 CZ.NIC, z.s.p.o. + * 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. + */ + +/* + * Authors: + * Jiří Zárevúcky (jzr) + */ + +/** @addtogroup bits + * @{ + */ + +#ifndef _BITS_OPAQUE_HANDLE_H_ +#define _BITS_OPAQUE_HANDLE_H_ + +#define __opaque_handle(__name) typedef struct __opaque_##__name *__name + +#endif + +/** @} + */ Index: abi/include/_bits/decls.h =================================================================== --- abi/include/_bits/decls.h (revision de9e28e0c0b35a214dcdc3688dc8579f50c5fbd6) +++ abi/include/_bits/decls.h (revision de9e28e0c0b35a214dcdc3688dc8579f50c5fbd6) @@ -0,0 +1,66 @@ +/* + * Copyright (c) 2019 Jiří Zárevúcky + * 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 bits + * @{ + */ +/** @file + */ + +#ifndef _BITS_DECLS_H_ +#define _BITS_DECLS_H_ + +#ifdef __cplusplus + +#define __HELENOS_DECLS_BEGIN \ + namespace helenos { \ + extern "C" { + +#define __HELENOS_DECLS_END \ + } \ + } + +#define __C_DECLS_BEGIN \ + extern "C" { + +#define __C_DECLS_END \ + } + +#else /* !__cplusplus */ + +#define __HELENOS_DECLS_BEGIN +#define __HELENOS_DECLS_END +#define __C_DECLS_BEGIN +#define __C_DECLS_END + +#endif /* __cplusplus */ + +#endif + +/** @} + */ Index: abi/include/_bits/errno.h =================================================================== --- abi/include/_bits/errno.h (revision c878693123930f0906703462cf2807430679517e) +++ abi/include/_bits/errno.h (revision de9e28e0c0b35a214dcdc3688dc8579f50c5fbd6) @@ -41,14 +41,20 @@ #define _BITS_ERRNO_H_ +#include <_bits/native.h> +#include <_bits/decls.h> + #ifdef __OPAQUE_ERRNO__ -#include <_bits/opaque_handle.h> +#include <_bits/__opaque_handle.h> -opaque_handle(errno_t); +__HELENOS_DECLS_BEGIN; +__opaque_handle(errno_t); typedef errno_t sys_errno_t; +__HELENOS_DECLS_END; + #define __errno_t(val) ((errno_t) val) #else -#include <_bits/native.h> +__HELENOS_DECLS_BEGIN; /** @@ -65,4 +71,6 @@ typedef sysarg_t sys_errno_t; +__HELENOS_DECLS_END; + /** * A C++-style "cast" to `errno_t`. Index: abi/include/_bits/native.h =================================================================== --- abi/include/_bits/native.h (revision c878693123930f0906703462cf2807430679517e) +++ abi/include/_bits/native.h (revision de9e28e0c0b35a214dcdc3688dc8579f50c5fbd6) @@ -47,4 +47,7 @@ #include +#include <_bits/decls.h> + +__HELENOS_DECLS_BEGIN; typedef uintptr_t pfn_t; @@ -53,7 +56,5 @@ typedef intptr_t native_t; -#define PRIdn PRIdPTR /**< Format for native_t. */ -#define PRIun PRIuPTR /**< Format for sysarg_t. */ -#define PRIxn PRIxPTR /**< Format for hexadecimal sysarg_t. */ +__HELENOS_DECLS_END; #endif Index: abi/include/_bits/off64_t.h =================================================================== --- abi/include/_bits/off64_t.h (revision de9e28e0c0b35a214dcdc3688dc8579f50c5fbd6) +++ abi/include/_bits/off64_t.h (revision de9e28e0c0b35a214dcdc3688dc8579f50c5fbd6) @@ -0,0 +1,48 @@ +/* + * Copyright (c) 2019 Jiří Zárevúcky + * 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 bits + * @{ + */ +/** @file + */ + +#ifndef _BITS_OFF64_T_H_ +#define _BITS_OFF64_T_H_ + +#include +#include <_bits/decls.h> + +__C_DECLS_BEGIN; +typedef int64_t off64_t; +__C_DECLS_END; + +#endif + +/** @} + */ Index: i/include/_bits/opaque_handle.h =================================================================== --- abi/include/_bits/opaque_handle.h (revision c878693123930f0906703462cf2807430679517e) +++ (revision ) @@ -1,46 +1,0 @@ -/* - * Copyright (c) 2017 CZ.NIC, z.s.p.o. - * 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. - */ - -/* - * Authors: - * Jiří Zárevúcky (jzr) - */ - -/** @addtogroup bits - * @{ - */ - -#ifndef _BITS_OPAQUE_HANDLE_H_ -#define _BITS_OPAQUE_HANDLE_H_ - -#define opaque_handle(__name) typedef struct __opaque_##__name *__name - -#endif - -/** @} - */ Index: abi/include/_bits/ssize_t.h =================================================================== --- abi/include/_bits/ssize_t.h (revision c878693123930f0906703462cf2807430679517e) +++ abi/include/_bits/ssize_t.h (revision de9e28e0c0b35a214dcdc3688dc8579f50c5fbd6) @@ -42,9 +42,9 @@ #include +#include <_bits/decls.h> +__C_DECLS_BEGIN; typedef intptr_t ssize_t; - -#define SSIZE_MIN INTPTR_MIN -#define SSIZE_MAX INTPTR_MAX +__C_DECLS_END; #endif Index: abi/include/abi/asmtool.h =================================================================== --- abi/include/abi/asmtool.h (revision c878693123930f0906703462cf2807430679517e) +++ abi/include/abi/asmtool.h (revision de9e28e0c0b35a214dcdc3688dc8579f50c5fbd6) @@ -33,6 +33,6 @@ */ -#ifndef ABI_ASMTOOL_H_ -#define ABI_ASMTOOL_H_ +#ifndef _ABI_ASMTOOL_H_ +#define _ABI_ASMTOOL_H_ #define SYMBOL(sym) \ @@ -56,4 +56,10 @@ SYMBOL_END(func) +#ifdef __PIC__ +#define FUNCTION_REF(func) func@PLT +#else +#define FUNCTION_REF(func) func +#endif + #endif Index: abi/include/abi/cap.h =================================================================== --- abi/include/abi/cap.h (revision c878693123930f0906703462cf2807430679517e) +++ abi/include/abi/cap.h (revision de9e28e0c0b35a214dcdc3688dc8579f50c5fbd6) @@ -33,11 +33,13 @@ */ -#ifndef ABI_CAP_H_ -#define ABI_CAP_H_ +#ifndef _ABI_CAP_H_ +#define _ABI_CAP_H_ -#define CAP_NIL 0 +#include +#include -#define CAP_HANDLE_VALID(handle) ((handle) != CAP_NIL) -#define CAP_HANDLE_RAW(handle) ((intptr_t) (handle)) +enum { + CAP_NIL = 0, +}; typedef void *cap_handle_t; @@ -55,4 +57,14 @@ } *cap_waitq_handle_t; +static inline bool cap_handle_valid(cap_handle_t handle) +{ + return handle != CAP_NIL; +} + +static inline intptr_t cap_handle_raw(cap_handle_t handle) +{ + return (intptr_t) handle; +} + #endif Index: abi/include/abi/ddi/arg.h =================================================================== --- abi/include/abi/ddi/arg.h (revision c878693123930f0906703462cf2807430679517e) +++ abi/include/abi/ddi/arg.h (revision de9e28e0c0b35a214dcdc3688dc8579f50c5fbd6) @@ -33,10 +33,12 @@ */ -#ifndef ABI_DDI_ARG_H_ -#define ABI_DDI_ARG_H_ +#ifndef _ABI_DDI_ARG_H_ +#define _ABI_DDI_ARG_H_ #include -#define DMAMEM_FLAGS_ANONYMOUS 0x01 +enum { + DMAMEM_FLAGS_ANONYMOUS = 0x01, +}; /** Structure encapsulating arguments for SYS_PHYSMEM_MAP syscall. */ Index: abi/include/abi/ddi/irq.h =================================================================== --- abi/include/abi/ddi/irq.h (revision c878693123930f0906703462cf2807430679517e) +++ abi/include/abi/ddi/irq.h (revision de9e28e0c0b35a214dcdc3688dc8579f50c5fbd6) @@ -33,6 +33,6 @@ */ -#ifndef ABI_DDI_IRQ_H_ -#define ABI_DDI_IRQ_H_ +#ifndef _ABI_DDI_IRQ_H_ +#define _ABI_DDI_IRQ_H_ #include Index: abi/include/abi/elf.h =================================================================== --- abi/include/abi/elf.h (revision c878693123930f0906703462cf2807430679517e) +++ abi/include/abi/elf.h (revision de9e28e0c0b35a214dcdc3688dc8579f50c5fbd6) @@ -33,6 +33,6 @@ */ -#ifndef ABI_ELF_H_ -#define ABI_ELF_H_ +#ifndef _ABI_ELF_H_ +#define _ABI_ELF_H_ #include @@ -42,152 +42,259 @@ * Current ELF version */ -#define EV_CURRENT 1 +enum { + EV_CURRENT = 1, +}; /** * ELF types */ -#define ET_NONE 0 /* No type */ -#define ET_REL 1 /* Relocatable file */ -#define ET_EXEC 2 /* Executable */ -#define ET_DYN 3 /* Shared object */ -#define ET_CORE 4 /* Core */ -#define ET_LOPROC 0xff00 /* Processor specific */ -#define ET_HIPROC 0xffff /* Processor specific */ +enum elf_type { + ET_NONE = 0, /* No type */ + ET_REL = 1, /* Relocatable file */ + ET_EXEC = 2, /* Executable */ + ET_DYN = 3, /* Shared object */ + ET_CORE = 4, /* Core */ +}; + +enum { + ET_LOPROC = 0xff00, /* Lowest processor specific */ + ET_HIPROC = 0xffff, /* Highest processor specific */ +}; /** * ELF machine types */ -#define EM_NO 0 /* No machine */ -#define EM_SPARC 2 /* SPARC */ -#define EM_386 3 /* i386 */ -#define EM_MIPS 8 /* MIPS RS3000 */ -#define EM_MIPS_RS3_LE 10 /* MIPS RS3000 LE */ -#define EM_PPC 20 /* PPC32 */ -#define EM_PPC64 21 /* PPC64 */ -#define EM_ARM 40 /* ARM */ -#define EM_SPARCV9 43 /* SPARC64 */ -#define EM_IA_64 50 /* IA-64 */ -#define EM_X86_64 62 /* AMD64/EMT64 */ -#define EM_RISCV 243 /* RISC-V */ +enum elf_machine { + EM_NO = 0, /* No machine */ + EM_SPARC = 2, /* SPARC */ + EM_386 = 3, /* i386 */ + EM_MIPS = 8, /* MIPS RS3000 */ + EM_MIPS_RS3_LE = 10, /* MIPS RS3000 LE */ + EM_PPC = 20, /* PPC32 */ + EM_PPC64 = 21, /* PPC64 */ + EM_ARM = 40, /* ARM */ + EM_SPARCV9 = 43, /* SPARC64 */ + EM_IA_64 = 50, /* IA-64 */ + EM_X86_64 = 62, /* AMD64/EMT64 */ + EM_AARCH64 = 183, /* ARM 64-bit architecture */ + EM_RISCV = 243, /* RISC-V */ +}; /** * ELF identification indexes */ -#define EI_MAG0 0 -#define EI_MAG1 1 -#define EI_MAG2 2 -#define EI_MAG3 3 -#define EI_CLASS 4 /* File class */ -#define EI_DATA 5 /* Data encoding */ -#define EI_VERSION 6 /* File version */ -#define EI_OSABI 7 -#define EI_ABIVERSION 8 -#define EI_PAD 9 /* Start of padding bytes */ -#define EI_NIDENT 16 /* ELF identification table size */ +enum { + EI_MAG0 = 0, + EI_MAG1 = 1, + EI_MAG2 = 2, + EI_MAG3 = 3, + EI_CLASS = 4, /* File class */ + EI_DATA = 5, /* Data encoding */ + EI_VERSION = 6, /* File version */ + EI_OSABI = 7, + EI_ABIVERSION = 8, + EI_PAD = 9, /* Start of padding bytes */ + EI_NIDENT = 16, /* ELF identification table size */ +}; /** * ELF magic number */ -#define ELFMAG0 0x7f -#define ELFMAG1 'E' -#define ELFMAG2 'L' -#define ELFMAG3 'F' +enum { + ELFMAG0 = 0x7f, + ELFMAG1 = 'E', + ELFMAG2 = 'L', + ELFMAG3 = 'F', +}; /** * ELF file classes */ -#define ELFCLASSNONE 0 -#define ELFCLASS32 1 -#define ELFCLASS64 2 +enum elf_class { + ELFCLASSNONE = 0, + ELFCLASS32 = 1, + ELFCLASS64 = 2, +}; /** * ELF data encoding types */ -#define ELFDATANONE 0 -#define ELFDATA2LSB 1 /* Least significant byte first (little endian) */ -#define ELFDATA2MSB 2 /* Most signigicant byte first (big endian) */ +enum elf_data_encoding { + ELFDATANONE = 0, + ELFDATA2LSB = 1, /* Least significant byte first (little endian) */ + ELFDATA2MSB = 2, /* Most signigicant byte first (big endian) */ +}; /** * ELF section types */ -#define SHT_NULL 0 -#define SHT_PROGBITS 1 -#define SHT_SYMTAB 2 -#define SHT_STRTAB 3 -#define SHT_RELA 4 -#define SHT_HASH 5 -#define SHT_DYNAMIC 6 -#define SHT_NOTE 7 -#define SHT_NOBITS 8 -#define SHT_REL 9 -#define SHT_SHLIB 10 -#define SHT_DYNSYM 11 -#define SHT_LOOS 0x60000000 -#define SHT_HIOS 0x6fffffff -#define SHT_LOPROC 0x70000000 -#define SHT_HIPROC 0x7fffffff -#define SHT_LOUSER 0x80000000 -#define SHT_HIUSER 0xffffffff +enum elf_section_type { + SHT_NULL = 0, + SHT_PROGBITS = 1, + SHT_SYMTAB = 2, + SHT_STRTAB = 3, + SHT_RELA = 4, + SHT_HASH = 5, + SHT_DYNAMIC = 6, + SHT_NOTE = 7, + SHT_NOBITS = 8, + SHT_REL = 9, + SHT_SHLIB = 10, + SHT_DYNSYM = 11, +}; + +enum { + SHT_LOOS = 0x60000000, + SHT_HIOS = 0x6fffffff, + SHT_LOPROC = 0x70000000, + SHT_HIPROC = 0x7fffffff, + SHT_LOUSER = 0x80000000, + SHT_HIUSER = 0xffffffff, +}; /** * ELF section flags */ -#define SHF_WRITE 0x1 -#define SHF_ALLOC 0x2 -#define SHF_EXECINSTR 0x4 -#define SHF_TLS 0x400 -#define SHF_MASKPROC 0xf0000000 - -/** Macros for decomposing elf_symbol.st_info into binging and type */ -#define ELF_ST_BIND(i) ((i) >> 4) -#define ELF_ST_TYPE(i) ((i) & 0x0f) -#define ELF_ST_INFO(b, t) (((b) << 4) + ((t) & 0x0f)) +enum { + SHF_WRITE = 0x1, + SHF_ALLOC = 0x2, + SHF_EXECINSTR = 0x4, + SHF_TLS = 0x400, + SHF_MASKPROC = 0xf0000000, +}; + +/** Functions for decomposing elf_symbol.st_info into binding and type */ +static inline uint8_t elf_st_bind(uint8_t info) +{ + return info >> 4; +} + +static inline uint8_t elf_st_type(uint8_t info) +{ + return info & 0x0f; +} + +static inline uint8_t elf_st_info(uint8_t bind, uint8_t type) +{ + return (bind << 4) | (type & 0x0f); +} /** * Symbol binding */ -#define STB_LOCAL 0 -#define STB_GLOBAL 1 -#define STB_WEAK 2 -#define STB_LOPROC 13 -#define STB_HIPROC 15 +enum elf_symbol_binding { + STB_LOCAL = 0, + STB_GLOBAL = 1, + STB_WEAK = 2, +}; + +enum { + STB_LOPROC = 13, + STB_HIPROC = 15, +}; /** * Symbol types */ -#define STT_NOTYPE 0 -#define STT_OBJECT 1 -#define STT_FUNC 2 -#define STT_SECTION 3 -#define STT_FILE 4 -#define STT_TLS 6 -#define STT_LOPROC 13 -#define STT_HIPROC 15 +enum elf_symbol_type { + STT_NOTYPE = 0, + STT_OBJECT = 1, + STT_FUNC = 2, + STT_SECTION = 3, + STT_FILE = 4, + STT_TLS = 6, +}; + +enum { + STT_LOPROC = 13, + STT_HIPROC = 15, +}; /** * Program segment types */ -#define PT_NULL 0 -#define PT_LOAD 1 -#define PT_DYNAMIC 2 -#define PT_INTERP 3 -#define PT_NOTE 4 -#define PT_SHLIB 5 -#define PT_PHDR 6 -#define PT_TLS 7 -#define PT_LOOS 0x60000000 -#define PT_GNU_EH_FRAME 0x6474e550 -#define PT_GNU_STACK 0x6474e551 -#define PT_GNU_RELRO 0x6474e552 -#define PT_HIOS 0x6fffffff -#define PT_LOPROC 0x70000000 -#define PT_HIPROC 0x7fffffff +enum elf_segment_type { + PT_NULL = 0, + PT_LOAD = 1, + PT_DYNAMIC = 2, + PT_INTERP = 3, + PT_NOTE = 4, + PT_SHLIB = 5, + PT_PHDR = 6, + PT_TLS = 7, + + PT_GNU_EH_FRAME = 0x6474e550, + PT_GNU_STACK = 0x6474e551, + PT_GNU_RELRO = 0x6474e552, +}; + +enum { + PT_LOOS = 0x60000000, + PT_HIOS = 0x6fffffff, + PT_LOPROC = 0x70000000, + PT_HIPROC = 0x7fffffff, +}; /** * Program segment attributes. */ -#define PF_X 1 -#define PF_W 2 -#define PF_R 4 +enum elf_segment_access { + PF_X = 1, + PF_W = 2, + PF_R = 4, +}; + +/** + * Dynamic array tags + */ +enum elf_dynamic_tag { + DT_NULL = 0, + DT_NEEDED = 1, + DT_PLTRELSZ = 2, + DT_PLTGOT = 3, + DT_HASH = 4, + DT_STRTAB = 5, + DT_SYMTAB = 6, + DT_RELA = 7, + DT_RELASZ = 8, + DT_RELAENT = 9, + DT_STRSZ = 10, + DT_SYMENT = 11, + DT_INIT = 12, + DT_FINI = 13, + DT_SONAME = 14, + DT_RPATH = 15, + DT_SYMBOLIC = 16, + DT_REL = 17, + DT_RELSZ = 18, + DT_RELENT = 19, + DT_PLTREL = 20, + DT_DEBUG = 21, + DT_TEXTREL = 22, + DT_JMPREL = 23, + DT_BIND_NOW = 24, + DT_LOPROC = 0x70000000, + DT_HIPROC = 0x7fffffff, +}; + +/** + * Special section indexes + */ +enum { + SHN_UNDEF = 0, + SHN_LORESERVE = 0xff00, + SHN_LOPROC = 0xff00, + SHN_HIPROC = 0xff1f, + SHN_ABS = 0xfff1, + SHN_COMMON = 0xfff2, + SHN_HIRESERVE = 0xffff, +}; + +/** + * Special symbol table index + */ +enum { + STN_UNDEF = 0, +}; /** @@ -353,4 +460,51 @@ }; +/** + * Dynamic structure + */ +struct elf32_dyn { + elf_sword d_tag; + union { + elf_word d_val; + elf32_addr d_ptr; + } d_un; +}; + +struct elf64_dyn { + elf_sxword d_tag; + union { + elf_xword d_val; + elf64_addr d_ptr; + } d_un; +}; + +struct elf32_rel { + elf32_addr r_offset; + elf_word r_info; +}; + +struct elf32_rela { + elf32_addr r_offset; + elf_word r_info; + elf_sword r_addend; +}; + +struct elf64_rel { + elf64_addr r_offset; + elf_xword r_info; +}; + +struct elf64_rela { + elf64_addr r_offset; + elf_xword r_info; + elf_sxword r_addend; +}; + +#define ELF32_R_SYM(i) ((i) >> 8) +#define ELF32_R_TYPE(i) ((unsigned char)(i)) + +#define ELF64_R_SYM(i) ((i) >> 32) +#define ELF64_R_TYPE(i) ((i) & 0xffffffffL) + #ifdef __32_BITS__ typedef struct elf32_header elf_header_t; @@ -359,4 +513,8 @@ typedef struct elf32_symbol elf_symbol_t; typedef struct elf32_note elf_note_t; +typedef struct elf32_dyn elf_dyn_t; +typedef struct elf32_rel elf_rel_t; +typedef struct elf32_rela elf_rela_t; +#define ELF_R_TYPE(i) ELF32_R_TYPE(i) #endif @@ -367,4 +525,8 @@ typedef struct elf64_symbol elf_symbol_t; typedef struct elf64_note elf_note_t; +typedef struct elf64_dyn elf_dyn_t; +typedef struct elf64_rel elf_rel_t; +typedef struct elf64_rela elf_rela_t; +#define ELF_R_TYPE(i) ELF64_R_TYPE(i) #endif Index: abi/include/abi/fb/visuals.h =================================================================== --- abi/include/abi/fb/visuals.h (revision c878693123930f0906703462cf2807430679517e) +++ abi/include/abi/fb/visuals.h (revision de9e28e0c0b35a214dcdc3688dc8579f50c5fbd6) @@ -34,6 +34,6 @@ */ -#ifndef ABI_VISUALS_H_ -#define ABI_VISUALS_H_ +#ifndef _ABI_VISUALS_H_ +#define _ABI_VISUALS_H_ typedef enum { Index: abi/include/abi/fourcc.h =================================================================== --- abi/include/abi/fourcc.h (revision c878693123930f0906703462cf2807430679517e) +++ abi/include/abi/fourcc.h (revision de9e28e0c0b35a214dcdc3688dc8579f50c5fbd6) @@ -33,6 +33,6 @@ */ -#ifndef ABI_FOURCC_H_ -#define ABI_FOURCC_H_ +#ifndef _ABI_FOURCC_H_ +#define _ABI_FOURCC_H_ #include Index: abi/include/abi/ipc/event.h =================================================================== --- abi/include/abi/ipc/event.h (revision c878693123930f0906703462cf2807430679517e) +++ abi/include/abi/ipc/event.h (revision de9e28e0c0b35a214dcdc3688dc8579f50c5fbd6) @@ -33,6 +33,6 @@ */ -#ifndef ABI_IPC_EVENT_H_ -#define ABI_IPC_EVENT_H_ +#ifndef _ABI_IPC_EVENT_H_ +#define _ABI_IPC_EVENT_H_ /** Global events */ Index: abi/include/abi/ipc/interfaces.h =================================================================== --- abi/include/abi/ipc/interfaces.h (revision c878693123930f0906703462cf2807430679517e) +++ abi/include/abi/ipc/interfaces.h (revision de9e28e0c0b35a214dcdc3688dc8579f50c5fbd6) @@ -35,11 +35,13 @@ */ -#ifndef ABI_IPC_INTERFACES_H_ -#define ABI_IPC_INTERFACES_H_ +#ifndef _ABI_IPC_INTERFACES_H_ +#define _ABI_IPC_INTERFACES_H_ #include -#define IFACE_EXCHANGE_MASK 0x03 -#define IFACE_MOD_MASK 0x04 +enum { + IFACE_EXCHANGE_MASK = 0x03, + IFACE_MOD_MASK = 0x04, +}; /** Interface exchange management style @@ -183,5 +185,7 @@ FOURCC_COMPACT('v', 'b', 'd', ' ') | IFACE_EXCHANGE_SERIALIZE, INTERFACE_IPC_TEST = - FOURCC_COMPACT('i', 'p', 'c', 't') | IFACE_EXCHANGE_SERIALIZE + FOURCC_COMPACT('i', 'p', 'c', 't') | IFACE_EXCHANGE_SERIALIZE, + INTERFACE_PCI = + FOURCC_COMPACT('p', 'c', 'i', ' ') | IFACE_EXCHANGE_SERIALIZE } iface_t; Index: abi/include/abi/ipc/ipc.h =================================================================== --- abi/include/abi/ipc/ipc.h (revision c878693123930f0906703462cf2807430679517e) +++ abi/include/abi/ipc/ipc.h (revision de9e28e0c0b35a214dcdc3688dc8579f50c5fbd6) @@ -33,81 +33,76 @@ */ -#ifndef ABI_IPC_IPC_H_ -#define ABI_IPC_IPC_H_ +#ifndef _ABI_IPC_IPC_H_ +#define _ABI_IPC_IPC_H_ +#include #include #include +#include <_bits/errno.h> -/** Length of data being transferred with IPC call - * - * The uspace may not be able to utilize the full length - * - */ -#define IPC_CALL_LEN 6 +/* Miscellaneous constants */ +enum { + /** Length of data being transferred with IPC call + * + * The uspace may not be able to utilize the full length + * + */ + IPC_CALL_LEN = 6, -/** Maximum active async calls per phone */ -#define IPC_MAX_ASYNC_CALLS 64 + /** Maximum active async calls per phone */ + IPC_MAX_ASYNC_CALLS = 64, + + /** + * Maximum buffer size allowed for IPC_M_DATA_WRITE and + * IPC_M_DATA_READ requests. + */ + DATA_XFER_LIMIT = 64 * 1024, +}; /* Flags for calls */ +enum { + /** This is answer to a call */ + IPC_CALL_ANSWERED = 1 << 0, -/** This is answer to a call */ -#define IPC_CALL_ANSWERED (1 << 0) + /** Answer will not be passed to userspace, will be discarded */ + IPC_CALL_DISCARD_ANSWER = 1 << 1, -/** Answer will not be passed to userspace, will be discarded */ -#define IPC_CALL_DISCARD_ANSWER (1 << 1) + /** Call was forwarded */ + IPC_CALL_FORWARDED = 1 << 2, -/** Call was forwarded */ -#define IPC_CALL_FORWARDED (1 << 2) + /** Interrupt notification */ + IPC_CALL_NOTIF = 1 << 3, -/** Interrupt notification */ -#define IPC_CALL_NOTIF (1 << 3) - -/** The call was automatically answered by the kernel due to error */ -#define IPC_CALL_AUTO_REPLY (1 << 4) - -/** - * Maximum buffer size allowed for IPC_M_DATA_WRITE and - * IPC_M_DATA_READ requests. - */ -#define DATA_XFER_LIMIT (64 * 1024) - -/* Macros for manipulating calling data */ -#define IPC_SET_RETVAL(data, retval) ((data).args[0] = (sysarg_t) (retval)) -#define IPC_SET_IMETHOD(data, val) ((data).args[0] = (val)) -#define IPC_SET_ARG1(data, val) ((data).args[1] = (val)) -#define IPC_SET_ARG2(data, val) ((data).args[2] = (val)) -#define IPC_SET_ARG3(data, val) ((data).args[3] = (val)) -#define IPC_SET_ARG4(data, val) ((data).args[4] = (val)) -#define IPC_SET_ARG5(data, val) ((data).args[5] = (val)) - -#define IPC_GET_IMETHOD(data) ((data).args[0]) -#define IPC_GET_RETVAL(data) ((errno_t) (data).args[0]) - -#define IPC_GET_ARG1(data) ((data).args[1]) -#define IPC_GET_ARG2(data) ((data).args[2]) -#define IPC_GET_ARG3(data) ((data).args[3]) -#define IPC_GET_ARG4(data) ((data).args[4]) -#define IPC_GET_ARG5(data) ((data).args[5]) + /** The call was automatically answered by the kernel due to error */ + IPC_CALL_AUTO_REPLY = 1 << 4, +}; /* Forwarding flags. */ -#define IPC_FF_NONE 0 +enum { + IPC_FF_NONE = 0, -/** - * The call will be routed as though it was initially sent via the phone used to - * forward it. This feature is intended to support the situation in which the - * forwarded call needs to be handled by the same connection fibril as any other - * calls that were initially sent by the forwarder to the same destination. This - * flag has no imapct on routing replies. - */ -#define IPC_FF_ROUTE_FROM_ME (1 << 0) + /** + * The call will be routed as though it was initially sent via the phone + * used to forward it. This feature is intended to support the situation + * in which the forwarded call needs to be handled by the same + * connection fibril as any other calls that were initially sent by + * the forwarder to the same destination. + * This flag has no imapct on routing replies. + */ + IPC_FF_ROUTE_FROM_ME = 1 << 0, +}; /* Data transfer flags. */ -#define IPC_XF_NONE 0 +enum { + IPC_XF_NONE = 0, -/** Restrict the transfer size if necessary. */ -#define IPC_XF_RESTRICT (1 << 0) + /** Restrict the transfer size if necessary. */ + IPC_XF_RESTRICT = 1 << 0, +}; /** User-defined IPC methods */ -#define IPC_FIRST_USER_METHOD 1024 +enum { + IPC_FIRST_USER_METHOD = 1024, +}; typedef struct { @@ -128,4 +123,75 @@ } ipc_data_t; +/* Functions for manipulating calling data */ + +static inline void ipc_set_retval(ipc_data_t *data, errno_t retval) +{ + data->args[0] = (sysarg_t) retval; +} + +static inline void ipc_set_imethod(ipc_data_t *data, sysarg_t val) +{ + data->args[0] = val; +} + +static inline void ipc_set_arg1(ipc_data_t *data, sysarg_t val) +{ + data->args[1] = val; +} + +static inline void ipc_set_arg2(ipc_data_t *data, sysarg_t val) +{ + data->args[2] = val; +} + +static inline void ipc_set_arg3(ipc_data_t *data, sysarg_t val) +{ + data->args[3] = val; +} + +static inline void ipc_set_arg4(ipc_data_t *data, sysarg_t val) +{ + data->args[4] = val; +} + +static inline void ipc_set_arg5(ipc_data_t *data, sysarg_t val) +{ + data->args[5] = val; +} + +static inline sysarg_t ipc_get_imethod(ipc_data_t *data) +{ + return data->args[0]; +} +static inline errno_t ipc_get_retval(ipc_data_t *data) +{ + return (errno_t) data->args[0]; +} + +static inline sysarg_t ipc_get_arg1(ipc_data_t *data) +{ + return data->args[1]; +} + +static inline sysarg_t ipc_get_arg2(ipc_data_t *data) +{ + return data->args[2]; +} + +static inline sysarg_t ipc_get_arg3(ipc_data_t *data) +{ + return data->args[3]; +} + +static inline sysarg_t ipc_get_arg4(ipc_data_t *data) +{ + return data->args[4]; +} + +static inline sysarg_t ipc_get_arg5(ipc_data_t *data) +{ + return data->args[5]; +} + #endif Index: abi/include/abi/ipc/methods.h =================================================================== --- abi/include/abi/ipc/methods.h (revision c878693123930f0906703462cf2807430679517e) +++ abi/include/abi/ipc/methods.h (revision de9e28e0c0b35a214dcdc3688dc8579f50c5fbd6) @@ -33,16 +33,18 @@ */ -#ifndef ABI_IPC_METHODS_H_ -#define ABI_IPC_METHODS_H_ +#ifndef _ABI_IPC_METHODS_H_ +#define _ABI_IPC_METHODS_H_ #include /* Well known phone descriptors */ -#define PHONE_NS ((cap_phone_handle_t) (CAP_NIL + 1)) +static cap_phone_handle_t const PHONE_NS = (cap_phone_handle_t) (CAP_NIL + 1); /** Kernel IPC interfaces * */ -#define IPC_IF_KERNEL 0 +enum { + IPC_IF_KERNEL = 0, +}; /** System-specific IPC methods @@ -52,5 +54,4 @@ * */ - enum { /** This message is sent to answerbox when the phone is hung up @@ -152,5 +153,5 @@ * * - ARG1 - dst as_area lower bound - * - ARG2 - dst as_area base adress pointer + * - ARG2 - dst as_area base address pointer * (filled automatically by the kernel) */ @@ -217,5 +218,7 @@ /** Last system IPC method */ -#define IPC_M_LAST_SYSTEM 511 +enum { + IPC_M_LAST_SYSTEM = 511, +}; #endif Index: abi/include/abi/kio.h =================================================================== --- abi/include/abi/kio.h (revision c878693123930f0906703462cf2807430679517e) +++ abi/include/abi/kio.h (revision de9e28e0c0b35a214dcdc3688dc8579f50c5fbd6) @@ -33,9 +33,9 @@ */ -#ifndef ABI_KIO_H_ -#define ABI_KIO_H_ +#ifndef _ABI_KIO_H_ +#define _ABI_KIO_H_ enum { - KIO_UNKNOW, + KIO_UNKNOWN, KIO_WRITE, KIO_UPDATE, Index: abi/include/abi/klog.h =================================================================== --- abi/include/abi/klog.h (revision c878693123930f0906703462cf2807430679517e) +++ abi/include/abi/klog.h (revision de9e28e0c0b35a214dcdc3688dc8579f50c5fbd6) @@ -33,6 +33,6 @@ */ -#ifndef ABI_KLOG_H_ -#define ABI_KLOG_H_ +#ifndef _ABI_KLOG_H_ +#define _ABI_KLOG_H_ typedef enum { Index: abi/include/abi/log.h =================================================================== --- abi/include/abi/log.h (revision c878693123930f0906703462cf2807430679517e) +++ abi/include/abi/log.h (revision de9e28e0c0b35a214dcdc3688dc8579f50c5fbd6) @@ -35,6 +35,6 @@ */ -#ifndef ABI_LOG_H_ -#define ABI_LOG_H_ +#ifndef _ABI_LOG_H_ +#define _ABI_LOG_H_ /** Log message level. */ Index: abi/include/abi/mm/as.h =================================================================== --- abi/include/abi/mm/as.h (revision c878693123930f0906703462cf2807430679517e) +++ abi/include/abi/mm/as.h (revision de9e28e0c0b35a214dcdc3688dc8579f50c5fbd6) @@ -33,21 +33,22 @@ */ -#ifndef ABI_AS_H_ -#define ABI_AS_H_ +#ifndef _ABI_AS_H_ +#define _ABI_AS_H_ #include /** Address space area flags. */ -#define AS_AREA_READ 0x01 -#define AS_AREA_WRITE 0x02 -#define AS_AREA_EXEC 0x04 -#define AS_AREA_CACHEABLE 0x08 -#define AS_AREA_GUARD 0x10 -#define AS_AREA_LATE_RESERVE 0x20 +enum { + AS_AREA_READ = 0x01, + AS_AREA_WRITE = 0x02, + AS_AREA_EXEC = 0x04, + AS_AREA_CACHEABLE = 0x08, + AS_AREA_GUARD = 0x10, + AS_AREA_LATE_RESERVE = 0x20, +}; -#define AS_AREA_ANY ((void *) -1) -#define AS_MAP_FAILED ((void *) -1) - -#define AS_AREA_UNPAGED NULL +static void *const AS_AREA_ANY = (void *) -1; +static void *const AS_MAP_FAILED = (void *) -1; +static void *const AS_AREA_UNPAGED = NULL; /** Address space area info exported to uspace. */ Index: abi/include/abi/proc/task.h =================================================================== --- abi/include/abi/proc/task.h (revision c878693123930f0906703462cf2807430679517e) +++ abi/include/abi/proc/task.h (revision de9e28e0c0b35a214dcdc3688dc8579f50c5fbd6) @@ -33,6 +33,6 @@ */ -#ifndef ABI_PROC_TASK_H_ -#define ABI_PROC_TASK_H_ +#ifndef _ABI_PROC_TASK_H_ +#define _ABI_PROC_TASK_H_ #include Index: abi/include/abi/proc/thread.h =================================================================== --- abi/include/abi/proc/thread.h (revision c878693123930f0906703462cf2807430679517e) +++ abi/include/abi/proc/thread.h (revision de9e28e0c0b35a214dcdc3688dc8579f50c5fbd6) @@ -33,6 +33,6 @@ */ -#ifndef ABI_PROC_THREAD_H_ -#define ABI_PROC_THREAD_H_ +#ifndef _ABI_PROC_THREAD_H_ +#define _ABI_PROC_THREAD_H_ #include Index: abi/include/abi/proc/uarg.h =================================================================== --- abi/include/abi/proc/uarg.h (revision c878693123930f0906703462cf2807430679517e) +++ abi/include/abi/proc/uarg.h (revision de9e28e0c0b35a214dcdc3688dc8579f50c5fbd6) @@ -33,6 +33,6 @@ */ -#ifndef ABI_PROC_UARG_H_ -#define ABI_PROC_UARG_H_ +#ifndef _ABI_PROC_UARG_H_ +#define _ABI_PROC_UARG_H_ #include Index: abi/include/abi/synch.h =================================================================== --- abi/include/abi/synch.h (revision c878693123930f0906703462cf2807430679517e) +++ abi/include/abi/synch.h (revision de9e28e0c0b35a214dcdc3688dc8579f50c5fbd6) @@ -33,18 +33,22 @@ */ -#ifndef ABI_SYNCH_H_ -#define ABI_SYNCH_H_ +#ifndef _ABI_SYNCH_H_ +#define _ABI_SYNCH_H_ -/** Request with no timeout. */ -#define SYNCH_NO_TIMEOUT 0 +enum { + /** Request with no timeout. */ + SYNCH_NO_TIMEOUT = 0, +}; -/** No flags specified. */ -#define SYNCH_FLAGS_NONE 0 -/** Non-blocking operation request. */ -#define SYNCH_FLAGS_NON_BLOCKING (1 << 0) -/** Interruptible operation. */ -#define SYNCH_FLAGS_INTERRUPTIBLE (1 << 1) -/** Futex operation (makes sleep with timeout composable). */ -#define SYNCH_FLAGS_FUTEX (1 << 2) +enum { + /** No flags specified. */ + SYNCH_FLAGS_NONE = 0, + /** Non-blocking operation request. */ + SYNCH_FLAGS_NON_BLOCKING = 1 << 0, + /** Interruptible operation. */ + SYNCH_FLAGS_INTERRUPTIBLE = 1 << 1, + /** Futex operation (makes sleep with timeout composable). */ + SYNCH_FLAGS_FUTEX = 1 << 2, +}; #endif Index: abi/include/abi/syscall.h =================================================================== --- abi/include/abi/syscall.h (revision c878693123930f0906703462cf2807430679517e) +++ abi/include/abi/syscall.h (revision de9e28e0c0b35a214dcdc3688dc8579f50c5fbd6) @@ -33,6 +33,6 @@ */ -#ifndef ABI_SYSCALL_H_ -#define ABI_SYSCALL_H_ +#ifndef _ABI_SYSCALL_H_ +#define _ABI_SYSCALL_H_ typedef enum { Index: abi/include/abi/sysinfo.h =================================================================== --- abi/include/abi/sysinfo.h (revision c878693123930f0906703462cf2807430679517e) +++ abi/include/abi/sysinfo.h (revision de9e28e0c0b35a214dcdc3688dc8579f50c5fbd6) @@ -34,6 +34,6 @@ */ -#ifndef ABI_SYSINFO_H_ -#define ABI_SYSINFO_H_ +#ifndef _ABI_SYSINFO_H_ +#define _ABI_SYSINFO_H_ #include @@ -42,10 +42,12 @@ #include -/** Number of load components */ -#define LOAD_STEPS 3 +enum { + /** Number of load components */ + LOAD_STEPS = 3, -/** Maximum name sizes */ -#define TASK_NAME_BUFLEN 64 -#define EXC_NAME_BUFLEN 20 + /** Maximum name sizes */ + TASK_NAME_BUFLEN = 64, + EXC_NAME_BUFLEN = 20, +}; /** Item value type Index: abi/include/abi/udebug.h =================================================================== --- abi/include/abi/udebug.h (revision c878693123930f0906703462cf2807430679517e) +++ abi/include/abi/udebug.h (revision de9e28e0c0b35a214dcdc3688dc8579f50c5fbd6) @@ -33,6 +33,6 @@ */ -#ifndef ABI_UDEBUG_H_ -#define ABI_UDEBUG_H_ +#ifndef _ABI_UDEBUG_H_ +#define _ABI_UDEBUG_H_ #define UDEBUG_EVMASK(event) (1 << ((event) - 1)) Index: abi/include/inttypes.h =================================================================== --- abi/include/inttypes.h (revision c878693123930f0906703462cf2807430679517e) +++ abi/include/inttypes.h (revision de9e28e0c0b35a214dcdc3688dc8579f50c5fbd6) @@ -43,4 +43,5 @@ #include #include <_bits/wchar_t.h> +#include <_bits/decls.h> /* @@ -311,11 +312,4 @@ #endif -#ifdef _HELENOS_SOURCE -#define UINT8_MIN 0 -#define UINT16_MIN 0 -#define UINT32_MIN 0 -#define UINT64_MIN 0 -#endif - #define PRIdMAX "lld" #define PRIiMAX "lli" @@ -330,7 +324,11 @@ #define SCNxMAX "llx" -#ifdef __cplusplus -extern "C" { +#if defined(_HELENOS_SOURCE) && !defined(__cplusplus) +#define PRIdn PRIdPTR /**< Format for native_t. */ +#define PRIun PRIuPTR /**< Format for sysarg_t. */ +#define PRIxn PRIxPTR /**< Format for hexadecimal sysarg_t. */ #endif + +__C_DECLS_BEGIN; typedef struct { @@ -343,11 +341,11 @@ intmax_t strtoimax(const char *__restrict__, char **__restrict__, int); uintmax_t strtoumax(const char *__restrict__, char **__restrict__, int); - -#ifdef __cplusplus -} +intmax_t wcstoimax(const wchar_t *__restrict__, wchar_t **__restrict__, int); +uintmax_t wcstoumax(const wchar_t *__restrict__, wchar_t **__restrict__, int); + +__C_DECLS_END; + #endif -#endif - /** @} */ Index: abi/include/limits.h =================================================================== --- abi/include/limits.h (revision c878693123930f0906703462cf2807430679517e) +++ abi/include/limits.h (revision de9e28e0c0b35a214dcdc3688dc8579f50c5fbd6) @@ -33,6 +33,6 @@ */ -#ifndef LIBC_LIMITS_H_ -#define LIBC_LIMITS_H_ +#ifndef _LIBC_LIMITS_H_ +#define _LIBC_LIMITS_H_ #ifdef __GNUC__ @@ -84,4 +84,5 @@ #define MB_LEN_MAX 4 +#ifdef _HELENOS_SOURCE #define UCHAR_MIN 0 #define USHRT_MIN 0 @@ -89,4 +90,19 @@ #define ULONG_MIN (0ul) #define ULLONG_MIN (0ull) +#define SSIZE_MIN INTPTR_MIN +#define UINT8_MIN 0 +#define UINT16_MIN 0 +#define UINT32_MIN 0 +#define UINT64_MIN 0 +#endif + +#if defined(_HELENOS_SOURCE) || defined(_POSIX_SOURCE) || \ + defined(_POSIX_C_SOURCE) || defined(_XOPEN_SOURCE) || \ + defined(_GNU_SOURCE) || defined(_BSD_SOURCE) + +#define SSIZE_MAX INTPTR_MAX +#define NAME_MAX 255 + +#endif /* GCC's doesn't define these for C++11, even though it should. */ Index: boot/Makefile.build =================================================================== --- boot/Makefile.build (revision c878693123930f0906703462cf2807430679517e) +++ boot/Makefile.build (revision de9e28e0c0b35a214dcdc3688dc8579f50c5fbd6) @@ -37,5 +37,5 @@ AFLAGS = --fatal-warnings -LDFLAGS = -Wl,--fatal-warnings,--warn-common +LDFLAGS = -Wl,--fatal-warnings,--warn-common $(EXTRA_LDFLAGS) COMMON_CFLAGS = $(INCLUDES) -O$(OPTIMIZATION) -imacros $(CONFIG_HEADER) \ @@ -103,5 +103,5 @@ %.gz: % - gzip -n -k -f $< + gzip -n -k -9 -f $< $(COMPS).tar: $(COMPONENTS) Index: boot/Makefile.common =================================================================== --- boot/Makefile.common (revision c878693123930f0906703462cf2807430679517e) +++ boot/Makefile.common (revision de9e28e0c0b35a214dcdc3688dc8579f50c5fbd6) @@ -94,6 +94,10 @@ devman \ fs/locfs \ - hid/compositor \ klog + +ifeq ($(CONFIG_FB), y) + RD_SRVS_ESSENTIAL += \ + hid/compositor +endif RD_SRVS_NON_ESSENTIAL = \ @@ -141,5 +145,6 @@ nic/ar9271 \ nic/virtio-net \ - block/ahci + block/ahci \ + block/virtio-blk RD_DRV_CFG = @@ -162,5 +167,14 @@ endif -RD_APPS_ESSENTIAL = bdsh getterm kio vlaunch vterm +RD_APPS_ESSENTIAL = \ + bdsh \ + getterm \ + kio + +ifeq ($(CONFIG_FB), y) + RD_APPS_ESSENTIAL += \ + vlaunch \ + vterm +endif RD_APPS_NON_ESSENTIAL = \ @@ -168,5 +182,4 @@ bithenge \ blkdump \ - bnchmark \ contacts \ corecfg \ @@ -179,8 +192,10 @@ fdisk \ gunzip \ + hbench \ inet \ kill \ killall \ loc \ + lprint \ mixerctl \ modplay \ @@ -191,7 +206,4 @@ mkmfs \ nic \ - perf \ - rcutest \ - rcubench \ sbi \ sportdmp \ @@ -207,4 +219,5 @@ netecho \ nterm \ + pci \ ping \ pkg \ Index: boot/Makefile.grub =================================================================== --- boot/Makefile.grub (revision c878693123930f0906703462cf2807430679517e) +++ boot/Makefile.grub (revision de9e28e0c0b35a214dcdc3688dc8579f50c5fbd6) @@ -31,5 +31,5 @@ include Makefile.common -GRUB = grub.$(GRUB_ARCH) +GRUB = grub/$(BARCH)-$(GRUB_ARCH) BOOT = $(DISTROOT)/boot BOOT_CONFIG = $(BOOT)/grub/grub.cfg @@ -64,7 +64,12 @@ endif +ifeq ($(GRUB_LOADER),multiboot) for module in $(COMPONENTS) ; do \ cp "$$module" $(BOOT)/ ; \ done +endif +ifeq ($(GRUB_LOADER),chainloader) + cp "$(BOOT_OUTPUT)" $(BOOT)/ +endif echo "set default=0" > $(BOOT_CONFIG) @@ -83,4 +88,5 @@ echo "menuentry 'HelenOS $(RELEASE)' --class helenos --class os {" >> $(BOOT_CONFIG) +ifeq ($(GRUB_LOADER),multiboot) for module in $(MODULES) ; do \ echo " echo 'Loading $$module'" >> $(BOOT_CONFIG) ; \ @@ -91,4 +97,10 @@ fi \ done +endif +ifeq ($(GRUB_LOADER),chainloader) + echo " echo 'Loading $(BOOT_OUTPUT)'" >> $(BOOT_CONFIG) + echo " chainloader /boot/$(BOOT_OUTPUT)" >> $(BOOT_CONFIG) + echo " boot" >> $(BOOT_CONFIG) +endif echo "}" >> $(BOOT_CONFIG) Index: boot/arch/amd64/Makefile.inc =================================================================== --- boot/arch/amd64/Makefile.inc (revision c878693123930f0906703462cf2807430679517e) +++ boot/arch/amd64/Makefile.inc (revision de9e28e0c0b35a214dcdc3688dc8579f50c5fbd6) @@ -46,4 +46,5 @@ audio/hdaudio \ char/ns8250 \ + char/pc-lpt \ time/cmos-rtc \ bus/usb/ehci\ @@ -73,2 +74,3 @@ BUILD = Makefile.empty POSTBUILD = Makefile.grub +GRUB_LOADER = multiboot Index: boot/arch/arm32/src/mm.c =================================================================== --- boot/arch/arm32/src/mm.c (revision c878693123930f0906703462cf2807430679517e) +++ boot/arch/arm32/src/mm.c (revision de9e28e0c0b35a214dcdc3688dc8579f50c5fbd6) @@ -99,5 +99,4 @@ * * Memory areas used for I/O are excluded from caching. - * At the moment caching is enabled only on GTA02. * * @param section The section number. @@ -171,14 +170,36 @@ { /* - * Create 1:1 virtual-physical mapping. - * Physical memory on BBxM a BBone starts at 2GB - * boundary, icp has a memory mirror at 2GB. - * (ARM Integrator Core Module User guide ch. 6.3, p. 6-7) - * gta02 somehow works (probably due to limited address size), - * s3c2442b manual ch. 5, p.5-1: - * "Address space: 128Mbytes per bank (total 1GB/8 banks)" - */ - for (pfn_t page = 0; page < PTL0_ENTRIES; ++page) - init_ptl0_section(&boot_pt[page], page); + * Our goal is to create page tables that serve two purposes: + * + * 1. Allow the loader to run in identity-mapped virtual memory and use + * I/O devices (e.g. an UART for logging). + * 2. Allow the kernel to start running in virtual memory from addresses + * above 2G. + * + * The matters are slightly complicated by the different locations of + * physical memory and I/O devices on the various boards that we + * support. We see two cases (but other are still possible): + * + * a) Both RAM and I/O is in memory below 2G + * For instance, this is the case of GTA02, Integrator/CP + * and RaspberryPi + * b) RAM starts at 2G and I/O devices are below 2G + * For example, this is the case of BeagleBone and BeagleBoard XM + * + * This leads to two possible setups of boot page tables: + * + * A) To arrange for a), split the virtual address space into two + * halves, both identity-mapping the first 2G of physical address + * space. + * B) To accommodate b), create one larger virtual address space + * identity-mapping the entire physical address space. + */ + + for (pfn_t page = 0; page < PTL0_ENTRIES; page++) { + pfn_t frame = page; + if (BOOT_BASE < 0x80000000UL && page >= PTL0_ENTRIES / 2) + frame -= PTL0_ENTRIES / 2; + init_ptl0_section(&boot_pt[page], frame); + } /* Index: boot/arch/arm64/Makefile.inc =================================================================== --- boot/arch/arm64/Makefile.inc (revision de9e28e0c0b35a214dcdc3688dc8579f50c5fbd6) +++ boot/arch/arm64/Makefile.inc (revision de9e28e0c0b35a214dcdc3688dc8579f50c5fbd6) @@ -0,0 +1,79 @@ +# +# Copyright (c) 2015 Petr Pavlu +# 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. +# + +BOOT_OUTPUT = image.boot +POST_OUTPUT = $(ROOT_PATH)/image.iso +POSTBUILD = Makefile.grub +GRUB_LOADER = chainloader + +BFD_NAME = elf64-littleaarch64 +# Request binary BFD output. The ARM64 port manually prepares the .text +# section to look as a PE file than can be loaded on EFI systems. +BFD_OUTPUT = binary +BFD_ARCH = aarch64 + +BITS = 64 +ENDIANESS = LE + +# UEFI binaries should be relocatable, the EFI boot service LoadImage() will +# rebase the boot file using the .reloc information in the image if it cannot +# load the binary at its preferred address. The ARM64 port does not provide this +# information in its PE file (that would require manually creating it) but +# instead the boot code is compiled with the -fpic option and the bootloader +# relocates itself at runtime. +# +# N.B. The UEFI guarantees for AArch64 that during boot time the primary +# processor is in the execution mode that has unaligned access enabled. The +# -mstrict-align option is therefore not needed. +EXTRA_CFLAGS = -fpic -fvisibility=hidden +EXTRA_LDFLAGS = -Wl,-shared + +ifeq ($(MACHINE), virt) + RD_DRVS_ESSENTIAL += \ + char/pl011 \ + intctl/gicv2 \ + platform/arm64virt +endif + +SOURCES = \ + arch/$(BARCH)/src/asm.S \ + arch/$(BARCH)/src/main.c \ + arch/$(BARCH)/src/relocate.c \ + $(COMPS).o \ + genarch/src/efi.c \ + generic/src/gzip.c \ + generic/src/inflate.c \ + generic/src/kernel.c \ + generic/src/memstr.c \ + generic/src/payload.c \ + generic/src/printf.c \ + generic/src/printf_core.c \ + generic/src/str.c \ + generic/src/tar.c \ + generic/src/version.c \ + generic/src/vprintf.c Index: boot/arch/arm64/_link.ld.in =================================================================== --- boot/arch/arm64/_link.ld.in (revision de9e28e0c0b35a214dcdc3688dc8579f50c5fbd6) +++ boot/arch/arm64/_link.ld.in (revision de9e28e0c0b35a214dcdc3688dc8579f50c5fbd6) @@ -0,0 +1,33 @@ +#include + +ENTRY(start) + +SECTIONS { + . = 0x0; + .text : { + HIDDEN(loader_start = .); + *(BOOTSTRAP); + *(.text); + } + .dynamic : { *(.dynamic); } + .rela.got : { *(.rela.got); } + .hash : { *(.hash); } + .dynsym : { *(.dynsym); } + .dynstr : { *(.dynstr); } + . = 0x8000; + .data : { + *(.data*); /* initialized data */ + *(.rodata*); + *(.bss); /* uninitialized static variables */ + *(COMMON); /* global variables */ + *(.got .got.plt); + HIDDEN(loader_end = .); + HIDDEN(payload_start = .); + *(.payload); + HIDDEN(payload_end = .); + } + + /DISCARD/ : { + *(*); + } +} Index: boot/arch/arm64/include/arch/arch.h =================================================================== --- boot/arch/arm64/include/arch/arch.h (revision de9e28e0c0b35a214dcdc3688dc8579f50c5fbd6) +++ boot/arch/arm64/include/arch/arch.h (revision de9e28e0c0b35a214dcdc3688dc8579f50c5fbd6) @@ -0,0 +1,50 @@ +/* + * Copyright (c) 2015 Petr Pavlu + * 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 boot_arm64 + * @{ + */ +/** @file + * @brief Various ARM64-specific macros. + */ + +#ifndef BOOT_arm64_ARCH_H +#define BOOT_arm64_ARCH_H + +#define PAGE_WIDTH 12 +#define PAGE_SIZE (1 << PAGE_WIDTH) + +#define BOOT_OFFSET 0x80000 +#ifndef __ASSEMBLER__ +#define KA2PA(x) (((uintptr_t) (x)) - UINT64_C(0xffffffff80000000)) +#endif + +#endif + +/** @} + */ Index: boot/arch/arm64/include/arch/asm.h =================================================================== --- boot/arch/arm64/include/arch/asm.h (revision de9e28e0c0b35a214dcdc3688dc8579f50c5fbd6) +++ boot/arch/arm64/include/arch/asm.h (revision de9e28e0c0b35a214dcdc3688dc8579f50c5fbd6) @@ -0,0 +1,50 @@ +/* + * Copyright (c) 2015 Petr Pavlu + * 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 boot_arm64 + * @{ + */ +/** @file + * @brief Functions implemented in assembly. + */ + +#ifndef BOOT_arm64_ASM_H +#define BOOT_arm64_ASM_H + +/** Jump to the kernel entry point. + * + * @param entry Kernel entry point. + * @param bootinfo Structure holding information about loaded tasks. + */ +extern void jump_to_kernel(void *entry, void *bootinfo) + __attribute__((noreturn)); + +#endif + +/** @} + */ Index: boot/arch/arm64/include/arch/barrier.h =================================================================== --- boot/arch/arm64/include/arch/barrier.h (revision de9e28e0c0b35a214dcdc3688dc8579f50c5fbd6) +++ boot/arch/arm64/include/arch/barrier.h (revision de9e28e0c0b35a214dcdc3688dc8579f50c5fbd6) @@ -0,0 +1,1 @@ +../../../../../kernel/arch/arm64/include/arch/barrier.h Index: boot/arch/arm64/include/arch/boot.h =================================================================== --- boot/arch/arm64/include/arch/boot.h (revision de9e28e0c0b35a214dcdc3688dc8579f50c5fbd6) +++ boot/arch/arm64/include/arch/boot.h (revision de9e28e0c0b35a214dcdc3688dc8579f50c5fbd6) @@ -0,0 +1,1 @@ +../../../../../kernel/arch/arm64/include/arch/boot/boot.h Index: boot/arch/arm64/include/arch/main.h =================================================================== --- boot/arch/arm64/include/arch/main.h (revision de9e28e0c0b35a214dcdc3688dc8579f50c5fbd6) +++ boot/arch/arm64/include/arch/main.h (revision de9e28e0c0b35a214dcdc3688dc8579f50c5fbd6) @@ -0,0 +1,47 @@ +/* + * Copyright (c) 2015 Petr Pavlu + * 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 boot_arm64 + * @{ + */ +/** @file + * @brief Boot related declarations. + */ + +#ifndef BOOT_arm64_MAIN_H +#define BOOT_arm64_MAIN_H + +#include + +extern efi_status_t bootstrap(void *efi_handle_in, + efi_system_table_t *efi_system_table_in, void *load_address); + +#endif + +/** @} + */ Index: boot/arch/arm64/include/arch/regutils.h =================================================================== --- boot/arch/arm64/include/arch/regutils.h (revision de9e28e0c0b35a214dcdc3688dc8579f50c5fbd6) +++ boot/arch/arm64/include/arch/regutils.h (revision de9e28e0c0b35a214dcdc3688dc8579f50c5fbd6) @@ -0,0 +1,1 @@ +../../../../../kernel/arch/arm64/include/arch/regutils.h Index: boot/arch/arm64/include/arch/relocate.h =================================================================== --- boot/arch/arm64/include/arch/relocate.h (revision de9e28e0c0b35a214dcdc3688dc8579f50c5fbd6) +++ boot/arch/arm64/include/arch/relocate.h (revision de9e28e0c0b35a214dcdc3688dc8579f50c5fbd6) @@ -0,0 +1,48 @@ +/* + * Copyright (c) 2019 Petr Pavlu + * 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 boot_arm64 + * @{ + */ +/** @file + * @brief Image self-relocation support. + */ + +#ifndef BOOT_arm64_RELOCATE_H +#define BOOT_arm64_RELOCATE_H + +#include +#include +#include + +extern efi_status_t self_relocate(uintptr_t base, const elf_dyn_t *dyn); + +#endif + +/** @} + */ Index: boot/arch/arm64/include/arch/types.h =================================================================== --- boot/arch/arm64/include/arch/types.h (revision de9e28e0c0b35a214dcdc3688dc8579f50c5fbd6) +++ boot/arch/arm64/include/arch/types.h (revision de9e28e0c0b35a214dcdc3688dc8579f50c5fbd6) @@ -0,0 +1,47 @@ +/* + * Copyright (c) 2015 Petr Pavlu + * 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 boot_arm64 + * @{ + */ +/** @file + * @brief Definitions of basic types like #uintptr_t. + */ + +#ifndef BOOT_arm64_TYPES_H +#define BOOT_arm64_TYPES_H + +#include <_bits/all.h> + +#include +#define task_t utask_t + +#endif + +/** @} + */ Index: boot/arch/arm64/src/asm.S =================================================================== --- boot/arch/arm64/src/asm.S (revision de9e28e0c0b35a214dcdc3688dc8579f50c5fbd6) +++ boot/arch/arm64/src/asm.S (revision de9e28e0c0b35a214dcdc3688dc8579f50c5fbd6) @@ -0,0 +1,166 @@ +/* + * Copyright (c) 2015 Petr Pavlu + * 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 +#include +#include + +.section BOOTSTRAP + +/* MS-DOS stub */ +msdos_stub: + .ascii "MZ" /* MS-DOS signature */ + .space 0x3a /* Ignore fields up to byte at 0x3c */ + .long pe_header - msdos_stub /* Offset to the PE header */ + +/* Portable Executable header */ +pe_header: + /* PE signature */ + .ascii "PE\x0\x0" + + /* COFF File Header */ + .short 0xaa64 /* Machine = IMAGE_FILE_MACHINE_ARM64 */ + .short 1 /* Number of sections */ + .long 0 /* Time date stamp */ + .long 0 /* Pointer to symbol table */ + .long 0 /* Number of symbols */ + .short sec_table - opt_header /* Size of optional header */ + /* Characteristics = IMAGE_FILE_EXECUTABLE_IMAGE | + * IMAGE_FILE_LARGE_ADDRESS_AWARE */ + .short 0x22 + + /* Optional header standard fields */ +opt_header: + .short 0x20b /* Magic = PE32+ */ + .byte 0 /* Major linker version */ + .byte 0 /* Minor linker version */ + .long payload_end - msdos_stub /* Size of code */ + .long 0 /* Size of initialized data */ + .long 0 /* Size of uninitialized data */ + .long start - msdos_stub /* Address of entry point */ + .long start - msdos_stub /* Base of code */ + + /* Optional header Windows-specific fields */ + .quad 0 /* Image base */ + .long 4 /* Section alignment */ + .long 4 /* File alignment */ + .short 0 /* Major operating system version */ + .short 0 /* Minor operating system version */ + .short 0 /* Major image version */ + .short 0 /* Minor image version */ + .short 0 /* Major subsystem version */ + .short 0 /* Minor subsystem version */ + .long 0 /* Win32 version value */ + .long payload_end - msdos_stub /* Size of image */ + .long start - msdos_stub /* Size of headers */ + .long 0 /* Checksum */ + .short 10 /* Subsystem = EFI application */ + .short 0 /* DLL characteristics */ + .quad 0 /* Size of stack reserve */ + .quad 0 /* Size of stack commit */ + .quad 0 /* Size of heap reserve */ + .quad 0 /* Size of heap commit */ + .long 0 /* Loader flags */ + .long 0 /* Number of RVA and sizes */ + +sec_table: + .ascii ".text\x0\x0\x0" /* Name */ + .long payload_end - start /* Virtual size */ + .long start - msdos_stub /* Virtual address */ + .long payload_end - start /* Size of raw data */ + .long start - msdos_stub /* Pointer to raw data */ + .long 0 /* Pointer to relocations */ + .long 0 /* Pointer to line numbers */ + .short 0 /* Number of relocations */ + .short 0 /* Number of line numbers */ + /* Characteristics = IMAGE_SCN_CNT_CODE | IMAGE_SCN_MEM_EXECUTE | + * IMAGE_SCN_MEM_READ | IMAGE_SCN_MEM_WRITE */ + .long 0xe0000020 + +SYMBOL(start) + .hidden start + + /* + * Parameters: + * x0 is the image handle. + * x1 is a pointer to the UEFI system table. + */ + + /* + * Stay on the UEFI stack. Its size is at least 128 kB, plenty for this + * boot loader. + */ + stp x29, x30, [sp, #-32]! + mov x29, sp + stp x0, x1, [sp, #16] + + /* + * Self-relocate the image. Pass a load address of the image (x0) and a + * pointer to the dynamic array (x1). + */ + adr x0, msdos_stub + adrp x1, _DYNAMIC + add x1, x1, #:lo12:_DYNAMIC + bl self_relocate + cbnz x0, 0f + + /* + * Pass the image handle (x0), a pointer to the UEFI system table (x1), + * and the image load address (x2) to the boostrap function. + */ + ldp x0, x1, [sp, #16] + adr x2, msdos_stub + bl bootstrap + +0: + ldp x29, x30, [sp], #32 + ret + +FUNCTION_BEGIN(halt) + .hidden halt + + b halt +FUNCTION_END(halt) + +FUNCTION_BEGIN(jump_to_kernel) + .hidden jump_to_kernel + + /* + * Parameters: + * x0 is kernel entry point. + * x1 is pointer to the bootinfo structure. + */ + + /* Disable MMU (removes the identity mapping provided by UEFI). */ + mrs x2, sctlr_el1 + bic x2, x2, #SCTLR_M_FLAG + msr sctlr_el1, x2 + isb + + br x0 +FUNCTION_END(jump_to_kernel) Index: boot/arch/arm64/src/main.c =================================================================== --- boot/arch/arm64/src/main.c (revision de9e28e0c0b35a214dcdc3688dc8579f50c5fbd6) +++ boot/arch/arm64/src/main.c (revision de9e28e0c0b35a214dcdc3688dc8579f50c5fbd6) @@ -0,0 +1,326 @@ +/* + * Copyright (c) 2015 Petr Pavlu + * 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 boot_arm64 + * @{ + */ +/** @file + * @brief Bootstrap. + */ + +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include + +static efi_system_table_t *efi_system_table; + +/** Translate given UEFI memory type to the bootinfo memory type. + * + * @param type UEFI memory type. + */ +static memtype_t get_memtype(uint32_t type) +{ + switch (type) { + case EFI_RESERVED: + case EFI_RUNTIME_SERVICES_CODE: + case EFI_RUNTIME_SERVICES_DATA: + case EFI_UNUSABLE_MEMORY: + case EFI_ACPI_MEMORY_NVS: + case EFI_MEMORY_MAPPED_IO: + case EFI_MEMORY_MAPPED_IO_PORT_SPACE: + case EFI_PAL_CODE: + return MEMTYPE_UNUSABLE; + case EFI_LOADER_CODE: + case EFI_LOADER_DATA: + case EFI_BOOT_SERVICES_CODE: + case EFI_BOOT_SERVICES_DATA: + case EFI_CONVENTIONAL_MEMORY: + case EFI_PERSISTENT_MEMORY: + return MEMTYPE_AVAILABLE; + case EFI_ACPI_RECLAIM_MEMORY: + return MEMTYPE_ACPI_RECLAIM; + } + + return MEMTYPE_UNUSABLE; +} + +/** Send a byte to the UEFI console output. + * + * @param byte Byte to send. + */ +static void scons_sendb(uint8_t byte) +{ + int16_t out[2] = { byte, '\0' }; + efi_system_table->cons_out->output_string(efi_system_table->cons_out, + out); +} + +/** Display a character. + * + * @param ch Character to display. + */ +void putwchar(wchar_t ch) +{ + if (ch == '\n') + scons_sendb('\r'); + + if (ascii_check(ch)) + scons_sendb((uint8_t) ch); + else + scons_sendb('?'); +} + +efi_status_t bootstrap(void *efi_handle_in, + efi_system_table_t *efi_system_table_in, void *load_address) +{ + efi_status_t status; + uint64_t current_el; + uint64_t memmap = 0; + sysarg_t memmap_size; + sysarg_t memmap_key; + sysarg_t memmap_descriptor_size; + uint32_t memmap_descriptor_version; + uint64_t alloc_addr = 0; + sysarg_t alloc_pages = 0; + + /* + * Bootinfo structure is dynamically allocated in the ARM64 port. It is + * placed directly after the inflated components. This assures that if + * the kernel identity maps the first gigabyte of the main memory in the + * kernel/upper address space then it can access the bootinfo because + * the inflated components and bootinfo can always fit in this area. + */ + bootinfo_t *bootinfo; + + efi_system_table = efi_system_table_in; + + version_print(); + + printf("Boot loader: %p -> %p\n", loader_start, loader_end); + printf("\nMemory statistics\n"); + printf(" %p|%p: loader\n", load_address, load_address); + printf(" %p|%p: UEFI system table\n", efi_system_table_in, + efi_system_table_in); + + /* Validate the exception level. */ + current_el = CurrentEL_read(); + if (current_el != CURRENT_EL_EL1) { + printf("Error: Unexpected CurrentEL value %0#18" PRIx64 ".\n", + current_el); + status = EFI_UNSUPPORTED; + goto fail; + } + + /* Obtain memory map. */ + status = efi_get_memory_map(efi_system_table, &memmap_size, + (efi_v1_memdesc_t **) &memmap, &memmap_key, &memmap_descriptor_size, + &memmap_descriptor_version); + if (status != EFI_SUCCESS) { + printf("Error: Unable to obtain initial memory map, status " + "code: %" PRIx64 ".\n", status); + goto fail; + } + + /* Find start of usable RAM. */ + uint64_t memory_base = (uint64_t) -1; + for (sysarg_t i = 0; i < memmap_size / memmap_descriptor_size; i++) { + efi_v1_memdesc_t *desc = (void *) memmap + + (i * memmap_descriptor_size); + if (get_memtype(desc->type) != MEMTYPE_AVAILABLE || + !(desc->attribute & EFI_MEMORY_WB)) + continue; + + if (desc->phys_start < memory_base) + memory_base = desc->phys_start; + } + + /* Deallocate memory holding the map. */ + efi_system_table->boot_services->free_pool((void *) memmap); + memmap = 0; + + if (memory_base == (uint64_t) -1) { + printf("Error: Memory map does not contain any usable RAM.\n"); + status = EFI_UNSUPPORTED; + goto fail; + } + + /* + * Check that everything is aligned on a 4kB boundary and the kernel can + * be placed by the decompression code at a correct address. + */ + + /* Statically check PAGE_SIZE and BOOT_OFFSET. */ + _Static_assert(PAGE_SIZE == 4096, "PAGE_SIZE must be equal to 4096"); + _Static_assert(IS_ALIGNED(BOOT_OFFSET, PAGE_SIZE), + "BOOT_OFFSET must be a multiple of PAGE_SIZE"); + + /* + * Dynamically check the memory base. The condition should be always + * true because UEFI guarantees each physical/virtual address in the + * memory map is aligned on a 4kB boundary. + */ + if (!IS_ALIGNED(memory_base, PAGE_SIZE)) { + printf("Error: Start of usable RAM (%p) is not aligned on a " + "4kB boundary.\n", (void *) memory_base); + status = EFI_UNSUPPORTED; + goto fail; + } + + /* + * Calculate where the components (including the kernel) will get + * placed. + */ + uint64_t decompress_base = memory_base + BOOT_OFFSET; + printf(" %p|%p: kernel entry point\n", (void *) decompress_base, + (void *) decompress_base); + + /* + * Allocate memory for the decompressed components and for the bootinfo. + */ + uint64_t component_pages = + ALIGN_UP(payload_unpacked_size(), EFI_PAGE_SIZE) / EFI_PAGE_SIZE; + uint64_t bootinfo_pages = ALIGN_UP(sizeof(*bootinfo), EFI_PAGE_SIZE) / + EFI_PAGE_SIZE; + alloc_pages = component_pages + bootinfo_pages; + alloc_addr = decompress_base; + status = efi_system_table->boot_services->allocate_pages( + EFI_ALLOCATE_ADDRESS, EFI_LOADER_CODE, alloc_pages, &alloc_addr); + if (status != EFI_SUCCESS) { + printf("Error: Unable to allocate memory for inflated " + "components and bootinfo, status code: %" PRIx64 ".\n", + status); + goto fail; + } + + bootinfo = (void *) alloc_addr + component_pages * EFI_PAGE_SIZE; + printf(" %p|%p: boot info structure\n", bootinfo, bootinfo); + memset(bootinfo, 0, sizeof(*bootinfo)); + + /* Decompress the components. */ + uint8_t *kernel_dest = (uint8_t *) alloc_addr; + uint8_t *ram_end = kernel_dest + component_pages * EFI_PAGE_SIZE; + + extract_payload(&bootinfo->taskmap, kernel_dest, ram_end, + (uintptr_t) kernel_dest, ensure_visibility); + + /* Get final memory map. */ + status = efi_get_memory_map(efi_system_table, &memmap_size, + (efi_v1_memdesc_t **) &memmap, &memmap_key, &memmap_descriptor_size, + &memmap_descriptor_version); + if (status != EFI_SUCCESS) { + printf("Error: Unable to obtain final memory map, status code: " + "%" PRIx64 ".\n", status); + goto fail; + } + + /* Convert the UEFI memory map to the bootinfo representation. */ + size_t cnt = 0; + memtype_t current_type = MEMTYPE_UNUSABLE; + void *current_start = 0; + size_t current_size = 0; + sysarg_t memmap_items_count = memmap_size / memmap_descriptor_size; + for (sysarg_t i = 0; i < memmap_items_count; i++) { + efi_v1_memdesc_t *desc = (void *) memmap + + (i * memmap_descriptor_size); + + /* Get type of the new area. */ + memtype_t type; + if (!(desc->attribute & EFI_MEMORY_WB)) + type = MEMTYPE_UNUSABLE; + else + type = get_memtype(desc->type); + + /* Try to merge the new area with the previous one. */ + if (type == current_type && + (uint64_t)current_start + current_size == desc->phys_start) { + current_size += desc->pages * EFI_PAGE_SIZE; + if (i != memmap_items_count - 1) + continue; + } + + /* Record the previous area. */ + if (current_type != MEMTYPE_UNUSABLE) { + if (cnt >= MEMMAP_MAX_RECORDS) { + printf("Error: Too many usable memory " + "areas.\n"); + status = EFI_UNSUPPORTED; + goto fail; + } + bootinfo->memmap.zones[cnt].type = current_type; + bootinfo->memmap.zones[cnt].start = current_start; + bootinfo->memmap.zones[cnt].size = current_size; + cnt++; + } + + /* Remember the new area. */ + current_type = type; + current_start = (void *) desc->phys_start; + current_size = desc->pages * EFI_PAGE_SIZE; + } + bootinfo->memmap.cnt = cnt; + + uintptr_t entry = check_kernel_translated((void *) decompress_base, + BOOT_OFFSET); + + printf("Booting the kernel...\n"); + + /* Exit boot services. This is a point of no return. */ + efi_system_table->boot_services->exit_boot_services(efi_handle_in, + memmap_key); + + entry = memory_base + KA2PA(entry); + jump_to_kernel((void *) entry, bootinfo); + +fail: + if (memmap != 0) + efi_system_table->boot_services->free_pool((void *) memmap); + + if (alloc_addr != 0) + efi_system_table->boot_services->free_pages(alloc_addr, + alloc_pages); + + return status; +} + +/** @} + */ Index: boot/arch/arm64/src/relocate.c =================================================================== --- boot/arch/arm64/src/relocate.c (revision de9e28e0c0b35a214dcdc3688dc8579f50c5fbd6) +++ boot/arch/arm64/src/relocate.c (revision de9e28e0c0b35a214dcdc3688dc8579f50c5fbd6) @@ -0,0 +1,91 @@ +/* + * Copyright (c) 2019 Petr Pavlu + * 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 boot_arm64 + * @{ + */ +/** @file + * @brief Image self-relocation support. + */ + +#include +#include + +/** Self-relocate the bootloader. + * + * Note: This code is responsible for self-relocating the bootloader when it is + * started. As such, it is required that it is written in a way that it itself + * does not need any dynamic relocation. + */ +efi_status_t self_relocate(uintptr_t base, const elf_dyn_t *dyn) +{ + const elf_rela_t *rela = NULL; + uint64_t relasz = 0; + uint64_t relaent = 0; + + /* Parse the dynamic array. */ + while (dyn->d_tag != DT_NULL) { + switch (dyn->d_tag) { + case DT_RELA: + rela = (const elf_rela_t *) (base + dyn->d_un.d_ptr); + break; + case DT_RELASZ: + relasz = dyn->d_un.d_val; + break; + case DT_RELAENT: + relaent = dyn->d_un.d_val; + break; + } + dyn++; + } + + /* Validate obtained information. */ + if (rela == NULL) + return EFI_SUCCESS; + if (relaent == 0 || relasz % relaent != 0) + return EFI_UNSUPPORTED; + + /* Process relocations in the image. */ + while (relasz > 0) { + switch (ELF_R_TYPE(rela->r_info)) { + case R_AARCH64_RELATIVE: + *(uint64_t *) (base + rela->r_offset) = + base + rela->r_addend; + break; + default: + return EFI_UNSUPPORTED; + } + + rela = (const elf_rela_t *) ((const char *) rela + relaent); + relasz -= relaent; + } + return EFI_SUCCESS; +} + +/** @} + */ Index: boot/arch/ia64/src/main.c =================================================================== --- boot/arch/ia64/src/main.c (revision c878693123930f0906703462cf2807430679517e) +++ boot/arch/ia64/src/main.c (revision de9e28e0c0b35a214dcdc3688dc8579f50c5fbd6) @@ -94,7 +94,20 @@ cur += md_size) { efi_v1_memdesc_t *md = (efi_v1_memdesc_t *) cur; + memmap_item_t *o = NULL; + + if (items) + o = &memmap[items - 1]; switch ((efi_memory_type_t) md->type) { + case EFI_LOADER_CODE: + case EFI_LOADER_DATA: + case EFI_BOOT_SERVICES_CODE: + case EFI_BOOT_SERVICES_DATA: case EFI_CONVENTIONAL_MEMORY: + if (o && o->type == MEMMAP_FREE_MEM && + o->base + o->size == md->phys_start) { + o->size += md->pages * EFI_PAGE_SIZE; + continue; + } memmap[items].type = MEMMAP_FREE_MEM; break; Index: boot/arch/mips32/Makefile.inc =================================================================== --- boot/arch/mips32/Makefile.inc (revision c878693123930f0906703462cf2807430679517e) +++ boot/arch/mips32/Makefile.inc (revision de9e28e0c0b35a214dcdc3688dc8579f50c5fbd6) @@ -54,8 +54,10 @@ RD_DRVS_ESSENTIAL += \ platform/malta \ + intctl/i8259 \ block/ata_bd \ bus/pci/pciintel \ bus/isa \ char/i8042 \ + char/ns8250 \ hid/ps2mouse \ hid/xtkbd Index: boot/doc/doxygroups.h =================================================================== --- boot/doc/doxygroups.h (revision c878693123930f0906703462cf2807430679517e) +++ boot/doc/doxygroups.h (revision de9e28e0c0b35a214dcdc3688dc8579f50c5fbd6) @@ -11,2 +11,6 @@ * @ingroup boot */ + +/** @addtogroup boot_arm64 arm64 + * @ingroup boot + */ Index: boot/genarch/include/genarch/efi.h =================================================================== --- boot/genarch/include/genarch/efi.h (revision c878693123930f0906703462cf2807430679517e) +++ boot/genarch/include/genarch/efi.h (revision de9e28e0c0b35a214dcdc3688dc8579f50c5fbd6) @@ -32,4 +32,12 @@ #include +#define EFI_SUCCESS 0 +#define EFI_ERROR(code) (((sysarg_t) 1 << (sizeof(sysarg_t) * 8 - 1)) | (code)) +#define EFI_LOAD_ERROR EFI_ERROR(1) +#define EFI_UNSUPPORTED EFI_ERROR(3) +#define EFI_BUFFER_TOO_SMALL EFI_ERROR(5) + +typedef uint64_t efi_status_t; + typedef struct { uint64_t signature; @@ -56,24 +64,9 @@ } efi_guid_t; -typedef struct { - efi_guid_t guid; - void *table; -} efi_configuration_table_t; - -typedef struct { - efi_table_header_t hdr; - char *fw_vendor; - uint32_t fw_revision; - void *cons_in_handle; - void *cons_in; - void *cons_out_handle; - void *cons_out; - void *cons_err_handle; - void *cons_err; - void *runtime_services; - void *boot_services; - sysarg_t conf_table_entries; - efi_configuration_table_t *conf_table; -} efi_system_table_t; +typedef enum { + EFI_ALLOCATE_ANY_PAGES, + EFI_ALLOCATE_MAX_ADDRESS, + EFI_ALLOCATE_ADDRESS +} efi_allocate_type_t; typedef enum { @@ -91,6 +84,20 @@ EFI_MEMORY_MAPPED_IO, EFI_MEMORY_MAPPED_IO_PORT_SPACE, - EFI_PAL_CODE + EFI_PAL_CODE, + EFI_PERSISTENT_MEMORY } efi_memory_type_t; + +#define EFI_MEMORY_UC UINT64_C(0x0000000000000001) +#define EFI_MEMORY_WC UINT64_C(0x0000000000000002) +#define EFI_MEMORY_WT UINT64_C(0x0000000000000004) +#define EFI_MEMORY_WB UINT64_C(0x0000000000000008) +#define EFI_MEMORY_UCE UINT64_C(0x0000000000000010) +#define EFI_MEMORY_WP UINT64_C(0x0000000000001000) +#define EFI_MEMORY_RP UINT64_C(0x0000000000002000) +#define EFI_MEMORY_XP UINT64_C(0x0000000000004000) +#define EFI_MEMORY_NV UINT64_C(0x0000000000008000) +#define EFI_MEMORY_MORE_RELIABLE UINT64_C(0x0000000000010000) +#define EFI_MEMORY_RO UINT64_C(0x0000000000020000) +#define EFI_MEMORY_RUNTIME UINT64_C(0x8000000000000000) typedef struct { @@ -102,7 +109,94 @@ } efi_v1_memdesc_t; +typedef struct { + efi_guid_t guid; + void *table; +} efi_configuration_table_t; + +typedef struct efi_simple_text_output_protocol { + void *reset; + efi_status_t (*output_string)(struct efi_simple_text_output_protocol *, + int16_t *); + void *test_string; + void *query_mode; + void *set_mode; + void *set_attribute; + void *clear_screen; + void *set_cursor_position; + void *enable_cursor; + void *mode; +} efi_simple_text_output_protocol_t; + +typedef struct { + efi_table_header_t hdr; + void *raise_TPL; + void *restore_TPL; + efi_status_t (*allocate_pages)(efi_allocate_type_t, efi_memory_type_t, + sysarg_t, uint64_t *); + efi_status_t (*free_pages)(uint64_t, sysarg_t); + efi_status_t (*get_memory_map)(sysarg_t *, efi_v1_memdesc_t *, + sysarg_t *, sysarg_t *, uint32_t *); + efi_status_t (*allocate_pool)(efi_memory_type_t, sysarg_t, void **); + efi_status_t (*free_pool)(void *); + void *create_event; + void *set_timer; + void *wait_for_event; + void *signal_event; + void *close_event; + void *check_event; + void *install_protocol_interface; + void *reinstall_protocol_interface; + void *uninstall_protocol_interface; + void *handle_protocol; + void *reserved; + void *register_protocol_notify; + void *locate_handle; + void *locate_device_path; + void *install_configuration_table; + void *load_image; + void *start_image; + void *exit; + void *unload_image; + efi_status_t (*exit_boot_services)(void *, sysarg_t); + void *get_next_monotonic_count; + void *stall; + void *set_watchdog_timer; + void *connect_controller; + void *disconnect_controller; + void *open_protocol; + void *close_protocol; + void *open_protocol_information; + void *protocols_per_handle; + void *locate_handle_buffer; + void *locate_protocol; + void *install_multiple_protocol_interfaces; + void *uninstall_multiple_protocol_intefaces; + void *calculate_crc32; + void *copy_mem; + void *set_mem; + void *create_event_ex; +} efi_boot_services_t; + +typedef struct { + efi_table_header_t hdr; + char *fw_vendor; + uint32_t fw_revision; + void *cons_in_handle; + void *cons_in; + void *cons_out_handle; + efi_simple_text_output_protocol_t *cons_out; + void *cons_err_handle; + efi_simple_text_output_protocol_t *cons_err; + void *runtime_services; + efi_boot_services_t *boot_services; + sysarg_t conf_table_entries; + efi_configuration_table_t *conf_table; +} efi_system_table_t; + #define EFI_PAGE_SIZE 4096 extern void *efi_vendor_table_find(efi_system_table_t *, efi_guid_t); +extern efi_status_t efi_get_memory_map(efi_system_table_t *, sysarg_t *, + efi_v1_memdesc_t **, sysarg_t *, sysarg_t *, uint32_t *); #endif Index: boot/genarch/src/efi.c =================================================================== --- boot/genarch/src/efi.c (revision c878693123930f0906703462cf2807430679517e) +++ boot/genarch/src/efi.c (revision de9e28e0c0b35a214dcdc3688dc8579f50c5fbd6) @@ -42,2 +42,30 @@ return NULL; } + +efi_status_t efi_get_memory_map(efi_system_table_t *st, + sysarg_t *memory_map_size, efi_v1_memdesc_t **memory_map, sysarg_t *map_key, + sysarg_t *descriptor_size, uint32_t *descriptor_version) +{ + efi_status_t status; + + *memory_map_size = 8 * sizeof(**memory_map); + + do { + /* Allocate space for the memory map. */ + status = st->boot_services->allocate_pool(EFI_LOADER_DATA, + *memory_map_size, (void **) memory_map); + if (status != EFI_SUCCESS) + return status; + + /* Try to obtain the map. */ + status = st->boot_services->get_memory_map(memory_map_size, + *memory_map, map_key, descriptor_size, descriptor_version); + if (status == EFI_SUCCESS) + return status; + + /* An error occurred, release the allocated memory. */ + st->boot_services->free_pool(*memory_map); + } while (status == EFI_BUFFER_TOO_SMALL); + + return status; +} Index: boot/generic/include/align.h =================================================================== --- boot/generic/include/align.h (revision c878693123930f0906703462cf2807430679517e) +++ boot/generic/include/align.h (revision de9e28e0c0b35a214dcdc3688dc8579f50c5fbd6) @@ -49,4 +49,11 @@ #define ALIGN_UP(s, a) (((s) + ((a) - 1)) & ~((a) - 1)) +/** Check alignment. + * + * @param s Address or size to be checked for alignment. + * @param a Size of alignment, must be a power of 2. + */ +#define IS_ALIGNED(s, a) (ALIGN_UP((s), (a)) == (s)) + #endif Index: boot/generic/include/byteorder.h =================================================================== --- boot/generic/include/byteorder.h (revision c878693123930f0906703462cf2807430679517e) +++ boot/generic/include/byteorder.h (revision de9e28e0c0b35a214dcdc3688dc8579f50c5fbd6) @@ -33,6 +33,6 @@ */ -#ifndef LIBC_BYTEORDER_H_ -#define LIBC_BYTEORDER_H_ +#ifndef _LIBC_BYTEORDER_H_ +#define _LIBC_BYTEORDER_H_ #include Index: boot/generic/include/errno.h =================================================================== --- boot/generic/include/errno.h (revision c878693123930f0906703462cf2807430679517e) +++ boot/generic/include/errno.h (revision de9e28e0c0b35a214dcdc3688dc8579f50c5fbd6) @@ -40,4 +40,6 @@ #define EOVERFLOW -16 /* The result does not fit its size. */ +typedef int errno_t; + #endif Index: boot/generic/include/str.h =================================================================== --- boot/generic/include/str.h (revision c878693123930f0906703462cf2807430679517e) +++ boot/generic/include/str.h (revision de9e28e0c0b35a214dcdc3688dc8579f50c5fbd6) @@ -1,4 +1,6 @@ /* - * Copyright (c) 2010 Martin Decky + * Copyright (c) 2001-2004 Jakub Jermar + * Copyright (c) 2005 Martin Decky + * Copyright (c) 2011 Oleg Romanenko * All rights reserved. * @@ -33,25 +35,26 @@ #define BOOT_STR_H_ +#include #include #include -/**< Common Unicode characters */ -#define U_SPECIAL '?' +/* Common Unicode characters */ +#define U_SPECIAL '?' -/**< No size limit constant */ +/** No size limit constant */ #define STR_NO_LIMIT ((size_t) -1) -extern wchar_t str_decode(const char *, size_t *, size_t); -extern int chr_encode(wchar_t, char *, size_t *, size_t); +extern wchar_t str_decode(const char *str, size_t *offset, size_t sz); +extern errno_t chr_encode(wchar_t ch, char *str, size_t *offset, size_t sz); -extern size_t str_size(const char *); -extern size_t str_lsize(const char *, size_t); -extern size_t str_length(const char *); +extern size_t str_size(const char *str); +extern size_t str_lsize(const char *str, size_t max_len); +extern size_t str_length(const char *str); -extern bool ascii_check(wchar_t); -extern bool chr_check(wchar_t); +extern bool ascii_check(wchar_t ch); +extern bool chr_check(wchar_t ch); -extern int str_cmp(const char *, const char *); -extern void str_cpy(char *, size_t, const char *); +extern int str_cmp(const char *s1, const char *s2); +extern void str_cpy(char *dest, size_t size, const char *src); #endif Index: boot/generic/src/str.c =================================================================== --- boot/generic/src/str.c (revision c878693123930f0906703462cf2807430679517e) +++ boot/generic/src/str.c (revision de9e28e0c0b35a214dcdc3688dc8579f50c5fbd6) @@ -1,4 +1,8 @@ /* * Copyright (c) 2001-2004 Jakub Jermar + * Copyright (c) 2005 Martin Decky + * Copyright (c) 2008 Jiri Svoboda + * Copyright (c) 2011 Martin Sucha + * Copyright (c) 2011 Oleg Romanenko * All rights reserved. * @@ -98,9 +102,10 @@ */ +#include + #include #include #include #include -#include /** Check the condition if wchar_t is signed */ @@ -208,5 +213,5 @@ * code was invalid. */ -int chr_encode(const wchar_t ch, char *str, size_t *offset, size_t size) +errno_t chr_encode(const wchar_t ch, char *str, size_t *offset, size_t size) { if (*offset >= size) @@ -392,5 +397,5 @@ return 1; - if ((c1 == 0) || (c2 == 0)) + if (c1 == 0 || c2 == 0) break; } Index: ot/grub.efi/COPYING =================================================================== --- boot/grub.efi/COPYING (revision c878693123930f0906703462cf2807430679517e) +++ (revision ) @@ -1,674 +1,0 @@ - GNU GENERAL PUBLIC LICENSE - Version 3, 29 June 2007 - - Copyright (C) 2007 Free Software Foundation, Inc. - Everyone is permitted to copy and distribute verbatim copies - of this license document, but changing it is not allowed. - - Preamble - - The GNU General Public License is a free, copyleft license for -software and other kinds of works. - - The licenses for most software and other practical works are designed -to take away your freedom to share and change the works. By contrast, -the GNU General Public License is intended to guarantee your freedom to -share and change all versions of a program--to make sure it remains free -software for all its users. We, the Free Software Foundation, use the -GNU General Public License for most of our software; it applies also to -any other work released this way by its authors. You can apply it to -your programs, too. - - When we speak of free software, we are referring to freedom, not -price. Our General Public Licenses are designed to make sure that you -have the freedom to distribute copies of free software (and charge for -them if you wish), that you receive source code or can get it if you -want it, that you can change the software or use pieces of it in new -free programs, and that you know you can do these things. - - To protect your rights, we need to prevent others from denying you -these rights or asking you to surrender the rights. Therefore, you have -certain responsibilities if you distribute copies of the software, or if -you modify it: responsibilities to respect the freedom of others. - - For example, if you distribute copies of such a program, whether -gratis or for a fee, you must pass on to the recipients the same -freedoms that you received. You must make sure that they, too, receive -or can get the source code. And you must show them these terms so they -know their rights. - - Developers that use the GNU GPL protect your rights with two steps: -(1) assert copyright on the software, and (2) offer you this License -giving you legal permission to copy, distribute and/or modify it. - - For the developers' and authors' protection, the GPL clearly explains -that there is no warranty for this free software. For both users' and -authors' sake, the GPL requires that modified versions be marked as -changed, so that their problems will not be attributed erroneously to -authors of previous versions. - - Some devices are designed to deny users access to install or run -modified versions of the software inside them, although the manufacturer -can do so. This is fundamentally incompatible with the aim of -protecting users' freedom to change the software. The systematic -pattern of such abuse occurs in the area of products for individuals to -use, which is precisely where it is most unacceptable. Therefore, we -have designed this version of the GPL to prohibit the practice for those -products. If such problems arise substantially in other domains, we -stand ready to extend this provision to those domains in future versions -of the GPL, as needed to protect the freedom of users. - - Finally, every program is threatened constantly by software patents. -States should not allow patents to restrict development and use of -software on general-purpose computers, but in those that do, we wish to -avoid the special danger that patents applied to a free program could -make it effectively proprietary. To prevent this, the GPL assures that -patents cannot be used to render the program non-free. - - The precise terms and conditions for copying, distribution and -modification follow. - - TERMS AND CONDITIONS - - 0. Definitions. - - "This License" refers to version 3 of the GNU General Public License. - - "Copyright" also means copyright-like laws that apply to other kinds of -works, such as semiconductor masks. - - "The Program" refers to any copyrightable work licensed under this -License. Each licensee is addressed as "you". "Licensees" and -"recipients" may be individuals or organizations. - - To "modify" a work means to copy from or adapt all or part of the work -in a fashion requiring copyright permission, other than the making of an -exact copy. The resulting work is called a "modified version" of the -earlier work or a work "based on" the earlier work. - - A "covered work" means either the unmodified Program or a work based -on the Program. - - To "propagate" a work means to do anything with it that, without -permission, would make you directly or secondarily liable for -infringement under applicable copyright law, except executing it on a -computer or modifying a private copy. Propagation includes copying, -distribution (with or without modification), making available to the -public, and in some countries other activities as well. - - To "convey" a work means any kind of propagation that enables other -parties to make or receive copies. Mere interaction with a user through -a computer network, with no transfer of a copy, is not conveying. - - An interactive user interface displays "Appropriate Legal Notices" -to the extent that it includes a convenient and prominently visible -feature that (1) displays an appropriate copyright notice, and (2) -tells the user that there is no warranty for the work (except to the -extent that warranties are provided), that licensees may convey the -work under this License, and how to view a copy of this License. If -the interface presents a list of user commands or options, such as a -menu, a prominent item in the list meets this criterion. - - 1. Source Code. - - The "source code" for a work means the preferred form of the work -for making modifications to it. "Object code" means any non-source -form of a work. - - A "Standard Interface" means an interface that either is an official -standard defined by a recognized standards body, or, in the case of -interfaces specified for a particular programming language, one that -is widely used among developers working in that language. - - The "System Libraries" of an executable work include anything, other -than the work as a whole, that (a) is included in the normal form of -packaging a Major Component, but which is not part of that Major -Component, and (b) serves only to enable use of the work with that -Major Component, or to implement a Standard Interface for which an -implementation is available to the public in source code form. A -"Major Component", in this context, means a major essential component -(kernel, window system, and so on) of the specific operating system -(if any) on which the executable work runs, or a compiler used to -produce the work, or an object code interpreter used to run it. - - The "Corresponding Source" for a work in object code form means all -the source code needed to generate, install, and (for an executable -work) run the object code and to modify the work, including scripts to -control those activities. However, it does not include the work's -System Libraries, or general-purpose tools or generally available free -programs which are used unmodified in performing those activities but -which are not part of the work. For example, Corresponding Source -includes interface definition files associated with source files for -the work, and the source code for shared libraries and dynamically -linked subprograms that the work is specifically designed to require, -such as by intimate data communication or control flow between those -subprograms and other parts of the work. - - The Corresponding Source need not include anything that users -can regenerate automatically from other parts of the Corresponding -Source. - - The Corresponding Source for a work in source code form is that -same work. - - 2. Basic Permissions. - - All rights granted under this License are granted for the term of -copyright on the Program, and are irrevocable provided the stated -conditions are met. This License explicitly affirms your unlimited -permission to run the unmodified Program. The output from running a -covered work is covered by this License only if the output, given its -content, constitutes a covered work. This License acknowledges your -rights of fair use or other equivalent, as provided by copyright law. - - You may make, run and propagate covered works that you do not -convey, without conditions so long as your license otherwise remains -in force. You may convey covered works to others for the sole purpose -of having them make modifications exclusively for you, or provide you -with facilities for running those works, provided that you comply with -the terms of this License in conveying all material for which you do -not control copyright. Those thus making or running the covered works -for you must do so exclusively on your behalf, under your direction -and control, on terms that prohibit them from making any copies of -your copyrighted material outside their relationship with you. - - Conveying under any other circumstances is permitted solely under -the conditions stated below. Sublicensing is not allowed; section 10 -makes it unnecessary. - - 3. Protecting Users' Legal Rights From Anti-Circumvention Law. - - No covered work shall be deemed part of an effective technological -measure under any applicable law fulfilling obligations under article -11 of the WIPO copyright treaty adopted on 20 December 1996, or -similar laws prohibiting or restricting circumvention of such -measures. - - When you convey a covered work, you waive any legal power to forbid -circumvention of technological measures to the extent such circumvention -is effected by exercising rights under this License with respect to -the covered work, and you disclaim any intention to limit operation or -modification of the work as a means of enforcing, against the work's -users, your or third parties' legal rights to forbid circumvention of -technological measures. - - 4. Conveying Verbatim Copies. - - You may convey verbatim copies of the Program's source code as you -receive it, in any medium, provided that you conspicuously and -appropriately publish on each copy an appropriate copyright notice; -keep intact all notices stating that this License and any -non-permissive terms added in accord with section 7 apply to the code; -keep intact all notices of the absence of any warranty; and give all -recipients a copy of this License along with the Program. - - You may charge any price or no price for each copy that you convey, -and you may offer support or warranty protection for a fee. - - 5. Conveying Modified Source Versions. - - You may convey a work based on the Program, or the modifications to -produce it from the Program, in the form of source code under the -terms of section 4, provided that you also meet all of these conditions: - - a) The work must carry prominent notices stating that you modified - it, and giving a relevant date. - - b) The work must carry prominent notices stating that it is - released under this License and any conditions added under section - 7. This requirement modifies the requirement in section 4 to - "keep intact all notices". - - c) You must license the entire work, as a whole, under this - License to anyone who comes into possession of a copy. This - License will therefore apply, along with any applicable section 7 - additional terms, to the whole of the work, and all its parts, - regardless of how they are packaged. This License gives no - permission to license the work in any other way, but it does not - invalidate such permission if you have separately received it. - - d) If the work has interactive user interfaces, each must display - Appropriate Legal Notices; however, if the Program has interactive - interfaces that do not display Appropriate Legal Notices, your - work need not make them do so. - - A compilation of a covered work with other separate and independent -works, which are not by their nature extensions of the covered work, -and which are not combined with it such as to form a larger program, -in or on a volume of a storage or distribution medium, is called an -"aggregate" if the compilation and its resulting copyright are not -used to limit the access or legal rights of the compilation's users -beyond what the individual works permit. Inclusion of a covered work -in an aggregate does not cause this License to apply to the other -parts of the aggregate. - - 6. Conveying Non-Source Forms. - - You may convey a covered work in object code form under the terms -of sections 4 and 5, provided that you also convey the -machine-readable Corresponding Source under the terms of this License, -in one of these ways: - - a) Convey the object code in, or embodied in, a physical product - (including a physical distribution medium), accompanied by the - Corresponding Source fixed on a durable physical medium - customarily used for software interchange. - - b) Convey the object code in, or embodied in, a physical product - (including a physical distribution medium), accompanied by a - written offer, valid for at least three years and valid for as - long as you offer spare parts or customer support for that product - model, to give anyone who possesses the object code either (1) a - copy of the Corresponding Source for all the software in the - product that is covered by this License, on a durable physical - medium customarily used for software interchange, for a price no - more than your reasonable cost of physically performing this - conveying of source, or (2) access to copy the - Corresponding Source from a network server at no charge. - - c) Convey individual copies of the object code with a copy of the - written offer to provide the Corresponding Source. This - alternative is allowed only occasionally and noncommercially, and - only if you received the object code with such an offer, in accord - with subsection 6b. - - d) Convey the object code by offering access from a designated - place (gratis or for a charge), and offer equivalent access to the - Corresponding Source in the same way through the same place at no - further charge. You need not require recipients to copy the - Corresponding Source along with the object code. If the place to - copy the object code is a network server, the Corresponding Source - may be on a different server (operated by you or a third party) - that supports equivalent copying facilities, provided you maintain - clear directions next to the object code saying where to find the - Corresponding Source. Regardless of what server hosts the - Corresponding Source, you remain obligated to ensure that it is - available for as long as needed to satisfy these requirements. - - e) Convey the object code using peer-to-peer transmission, provided - you inform other peers where the object code and Corresponding - Source of the work are being offered to the general public at no - charge under subsection 6d. - - A separable portion of the object code, whose source code is excluded -from the Corresponding Source as a System Library, need not be -included in conveying the object code work. - - A "User Product" is either (1) a "consumer product", which means any -tangible personal property which is normally used for personal, family, -or household purposes, or (2) anything designed or sold for incorporation -into a dwelling. In determining whether a product is a consumer product, -doubtful cases shall be resolved in favor of coverage. For a particular -product received by a particular user, "normally used" refers to a -typical or common use of that class of product, regardless of the status -of the particular user or of the way in which the particular user -actually uses, or expects or is expected to use, the product. A product -is a consumer product regardless of whether the product has substantial -commercial, industrial or non-consumer uses, unless such uses represent -the only significant mode of use of the product. - - "Installation Information" for a User Product means any methods, -procedures, authorization keys, or other information required to install -and execute modified versions of a covered work in that User Product from -a modified version of its Corresponding Source. The information must -suffice to ensure that the continued functioning of the modified object -code is in no case prevented or interfered with solely because -modification has been made. - - If you convey an object code work under this section in, or with, or -specifically for use in, a User Product, and the conveying occurs as -part of a transaction in which the right of possession and use of the -User Product is transferred to the recipient in perpetuity or for a -fixed term (regardless of how the transaction is characterized), the -Corresponding Source conveyed under this section must be accompanied -by the Installation Information. But this requirement does not apply -if neither you nor any third party retains the ability to install -modified object code on the User Product (for example, the work has -been installed in ROM). - - The requirement to provide Installation Information does not include a -requirement to continue to provide support service, warranty, or updates -for a work that has been modified or installed by the recipient, or for -the User Product in which it has been modified or installed. Access to a -network may be denied when the modification itself materially and -adversely affects the operation of the network or violates the rules and -protocols for communication across the network. - - Corresponding Source conveyed, and Installation Information provided, -in accord with this section must be in a format that is publicly -documented (and with an implementation available to the public in -source code form), and must require no special password or key for -unpacking, reading or copying. - - 7. Additional Terms. - - "Additional permissions" are terms that supplement the terms of this -License by making exceptions from one or more of its conditions. -Additional permissions that are applicable to the entire Program shall -be treated as though they were included in this License, to the extent -that they are valid under applicable law. If additional permissions -apply only to part of the Program, that part may be used separately -under those permissions, but the entire Program remains governed by -this License without regard to the additional permissions. - - When you convey a copy of a covered work, you may at your option -remove any additional permissions from that copy, or from any part of -it. (Additional permissions may be written to require their own -removal in certain cases when you modify the work.) You may place -additional permissions on material, added by you to a covered work, -for which you have or can give appropriate copyright permission. - - Notwithstanding any other provision of this License, for material you -add to a covered work, you may (if authorized by the copyright holders of -that material) supplement the terms of this License with terms: - - a) Disclaiming warranty or limiting liability differently from the - terms of sections 15 and 16 of this License; or - - b) Requiring preservation of specified reasonable legal notices or - author attributions in that material or in the Appropriate Legal - Notices displayed by works containing it; or - - c) Prohibiting misrepresentation of the origin of that material, or - requiring that modified versions of such material be marked in - reasonable ways as different from the original version; or - - d) Limiting the use for publicity purposes of names of licensors or - authors of the material; or - - e) Declining to grant rights under trademark law for use of some - trade names, trademarks, or service marks; or - - f) Requiring indemnification of licensors and authors of that - material by anyone who conveys the material (or modified versions of - it) with contractual assumptions of liability to the recipient, for - any liability that these contractual assumptions directly impose on - those licensors and authors. - - All other non-permissive additional terms are considered "further -restrictions" within the meaning of section 10. If the Program as you -received it, or any part of it, contains a notice stating that it is -governed by this License along with a term that is a further -restriction, you may remove that term. If a license document contains -a further restriction but permits relicensing or conveying under this -License, you may add to a covered work material governed by the terms -of that license document, provided that the further restriction does -not survive such relicensing or conveying. - - If you add terms to a covered work in accord with this section, you -must place, in the relevant source files, a statement of the -additional terms that apply to those files, or a notice indicating -where to find the applicable terms. - - Additional terms, permissive or non-permissive, may be stated in the -form of a separately written license, or stated as exceptions; -the above requirements apply either way. - - 8. Termination. - - You may not propagate or modify a covered work except as expressly -provided under this License. Any attempt otherwise to propagate or -modify it is void, and will automatically terminate your rights under -this License (including any patent licenses granted under the third -paragraph of section 11). - - However, if you cease all violation of this License, then your -license from a particular copyright holder is reinstated (a) -provisionally, unless and until the copyright holder explicitly and -finally terminates your license, and (b) permanently, if the copyright -holder fails to notify you of the violation by some reasonable means -prior to 60 days after the cessation. - - Moreover, your license from a particular copyright holder is -reinstated permanently if the copyright holder notifies you of the -violation by some reasonable means, this is the first time you have -received notice of violation of this License (for any work) from that -copyright holder, and you cure the violation prior to 30 days after -your receipt of the notice. - - Termination of your rights under this section does not terminate the -licenses of parties who have received copies or rights from you under -this License. If your rights have been terminated and not permanently -reinstated, you do not qualify to receive new licenses for the same -material under section 10. - - 9. Acceptance Not Required for Having Copies. - - You are not required to accept this License in order to receive or -run a copy of the Program. Ancillary propagation of a covered work -occurring solely as a consequence of using peer-to-peer transmission -to receive a copy likewise does not require acceptance. However, -nothing other than this License grants you permission to propagate or -modify any covered work. These actions infringe copyright if you do -not accept this License. Therefore, by modifying or propagating a -covered work, you indicate your acceptance of this License to do so. - - 10. Automatic Licensing of Downstream Recipients. - - Each time you convey a covered work, the recipient automatically -receives a license from the original licensors, to run, modify and -propagate that work, subject to this License. You are not responsible -for enforcing compliance by third parties with this License. - - An "entity transaction" is a transaction transferring control of an -organization, or substantially all assets of one, or subdividing an -organization, or merging organizations. If propagation of a covered -work results from an entity transaction, each party to that -transaction who receives a copy of the work also receives whatever -licenses to the work the party's predecessor in interest had or could -give under the previous paragraph, plus a right to possession of the -Corresponding Source of the work from the predecessor in interest, if -the predecessor has it or can get it with reasonable efforts. - - You may not impose any further restrictions on the exercise of the -rights granted or affirmed under this License. For example, you may -not impose a license fee, royalty, or other charge for exercise of -rights granted under this License, and you may not initiate litigation -(including a cross-claim or counterclaim in a lawsuit) alleging that -any patent claim is infringed by making, using, selling, offering for -sale, or importing the Program or any portion of it. - - 11. Patents. - - A "contributor" is a copyright holder who authorizes use under this -License of the Program or a work on which the Program is based. The -work thus licensed is called the contributor's "contributor version". - - A contributor's "essential patent claims" are all patent claims -owned or controlled by the contributor, whether already acquired or -hereafter acquired, that would be infringed by some manner, permitted -by this License, of making, using, or selling its contributor version, -but do not include claims that would be infringed only as a -consequence of further modification of the contributor version. For -purposes of this definition, "control" includes the right to grant -patent sublicenses in a manner consistent with the requirements of -this License. - - Each contributor grants you a non-exclusive, worldwide, royalty-free -patent license under the contributor's essential patent claims, to -make, use, sell, offer for sale, import and otherwise run, modify and -propagate the contents of its contributor version. - - In the following three paragraphs, a "patent license" is any express -agreement or commitment, however denominated, not to enforce a patent -(such as an express permission to practice a patent or covenant not to -sue for patent infringement). To "grant" such a patent license to a -party means to make such an agreement or commitment not to enforce a -patent against the party. - - If you convey a covered work, knowingly relying on a patent license, -and the Corresponding Source of the work is not available for anyone -to copy, free of charge and under the terms of this License, through a -publicly available network server or other readily accessible means, -then you must either (1) cause the Corresponding Source to be so -available, or (2) arrange to deprive yourself of the benefit of the -patent license for this particular work, or (3) arrange, in a manner -consistent with the requirements of this License, to extend the patent -license to downstream recipients. "Knowingly relying" means you have -actual knowledge that, but for the patent license, your conveying the -covered work in a country, or your recipient's use of the covered work -in a country, would infringe one or more identifiable patents in that -country that you have reason to believe are valid. - - If, pursuant to or in connection with a single transaction or -arrangement, you convey, or propagate by procuring conveyance of, a -covered work, and grant a patent license to some of the parties -receiving the covered work authorizing them to use, propagate, modify -or convey a specific copy of the covered work, then the patent license -you grant is automatically extended to all recipients of the covered -work and works based on it. - - A patent license is "discriminatory" if it does not include within -the scope of its coverage, prohibits the exercise of, or is -conditioned on the non-exercise of one or more of the rights that are -specifically granted under this License. You may not convey a covered -work if you are a party to an arrangement with a third party that is -in the business of distributing software, under which you make payment -to the third party based on the extent of your activity of conveying -the work, and under which the third party grants, to any of the -parties who would receive the covered work from you, a discriminatory -patent license (a) in connection with copies of the covered work -conveyed by you (or copies made from those copies), or (b) primarily -for and in connection with specific products or compilations that -contain the covered work, unless you entered into that arrangement, -or that patent license was granted, prior to 28 March 2007. - - Nothing in this License shall be construed as excluding or limiting -any implied license or other defenses to infringement that may -otherwise be available to you under applicable patent law. - - 12. No Surrender of Others' Freedom. - - If conditions are imposed on you (whether by court order, agreement or -otherwise) that contradict the conditions of this License, they do not -excuse you from the conditions of this License. If you cannot convey a -covered work so as to satisfy simultaneously your obligations under this -License and any other pertinent obligations, then as a consequence you may -not convey it at all. For example, if you agree to terms that obligate you -to collect a royalty for further conveying from those to whom you convey -the Program, the only way you could satisfy both those terms and this -License would be to refrain entirely from conveying the Program. - - 13. Use with the GNU Affero General Public License. - - Notwithstanding any other provision of this License, you have -permission to link or combine any covered work with a work licensed -under version 3 of the GNU Affero General Public License into a single -combined work, and to convey the resulting work. The terms of this -License will continue to apply to the part which is the covered work, -but the special requirements of the GNU Affero General Public License, -section 13, concerning interaction through a network will apply to the -combination as such. - - 14. Revised Versions of this License. - - The Free Software Foundation may publish revised and/or new versions of -the GNU General Public License from time to time. Such new versions will -be similar in spirit to the present version, but may differ in detail to -address new problems or concerns. - - Each version is given a distinguishing version number. If the -Program specifies that a certain numbered version of the GNU General -Public License "or any later version" applies to it, you have the -option of following the terms and conditions either of that numbered -version or of any later version published by the Free Software -Foundation. If the Program does not specify a version number of the -GNU General Public License, you may choose any version ever published -by the Free Software Foundation. - - If the Program specifies that a proxy can decide which future -versions of the GNU General Public License can be used, that proxy's -public statement of acceptance of a version permanently authorizes you -to choose that version for the Program. - - Later license versions may give you additional or different -permissions. However, no additional obligations are imposed on any -author or copyright holder as a result of your choosing to follow a -later version. - - 15. Disclaimer of Warranty. - - THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY -APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT -HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY -OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, -THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR -PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM -IS WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF -ALL NECESSARY SERVICING, REPAIR OR CORRECTION. - - 16. Limitation of Liability. - - IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING -WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS -THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY -GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE -USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF -DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD -PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS), -EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF -SUCH DAMAGES. - - 17. Interpretation of Sections 15 and 16. - - If the disclaimer of warranty and limitation of liability provided -above cannot be given local legal effect according to their terms, -reviewing courts shall apply local law that most closely approximates -an absolute waiver of all civil liability in connection with the -Program, unless a warranty or assumption of liability accompanies a -copy of the Program in return for a fee. - - END OF TERMS AND CONDITIONS - - How to Apply These Terms to Your New Programs - - If you develop a new program, and you want it to be of the greatest -possible use to the public, the best way to achieve this is to make it -free software which everyone can redistribute and change under these terms. - - To do so, attach the following notices to the program. It is safest -to attach them to the start of each source file to most effectively -state the exclusion of warranty; and each file should have at least -the "copyright" line and a pointer to where the full notice is found. - - - Copyright (C) - - This program is free software: you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation, either version 3 of the License, or - (at your option) any later version. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - You should have received a copy of the GNU General Public License - along with this program. If not, see . - -Also add information on how to contact you by electronic and paper mail. - - If the program does terminal interaction, make it output a short -notice like this when it starts in an interactive mode: - - Copyright (C) - This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'. - This is free software, and you are welcome to redistribute it - under certain conditions; type `show c' for details. - -The hypothetical commands `show w' and `show c' should show the appropriate -parts of the General Public License. Of course, your program's commands -might be different; for a GUI interface, you would use an "about box". - - You should also get your employer (if you work as a programmer) or school, -if any, to sign a "copyright disclaimer" for the program, if necessary. -For more information on this, and how to apply and follow the GNU GPL, see -. - - The GNU General Public License does not permit incorporating your program -into proprietary programs. If your program is a subroutine library, you -may consider it more useful to permit linking proprietary applications with -the library. If this is what you want to do, use the GNU Lesser General -Public License instead of this License. But first, please read -. Index: ot/grub.efi/README =================================================================== --- boot/grub.efi/README (revision c878693123930f0906703462cf2807430679517e) +++ (revision ) @@ -1,12 +1,0 @@ -The binary files of GRUB boot loader in this directory have been created -by compiling GRUB for the 'i386-efi' and 'x86_64-efi' targets. The combined -32bit and 64bit EFI boot floppy image was created by modifying the -i386-grub-mkrescue and x86_64-grub-mkrescue scripts to create EFI payloads -which search for the bootable ISO image with the volume label -'HelenOS boot ISO'. - -For licensing terms of GRUB boot loader see the file COPYING contained -in this directory. Full version of GRUB, including its source code, -can be downloaded from GRUB's project page: - -http://www.gnu.org/software/grub/ Index: ot/grub.efi/REVISION =================================================================== --- boot/grub.efi/REVISION (revision c878693123930f0906703462cf2807430679517e) +++ (revision ) @@ -1,1 +1,0 @@ -bc220962e366b1b46769ed6f9fa5be603ba58ab5 Index: ot/grub.efi/i386-efi/command.lst =================================================================== --- boot/grub.efi/i386-efi/command.lst (revision c878693123930f0906703462cf2807430679517e) +++ (revision ) @@ -1,190 +1,0 @@ -*acpi: acpi -*all_functional_test: functional_test -*background_image: gfxterm_background -*cat: cat -*cpuid: cpuid -*crc: hashsum -*cryptomount: cryptodisk -*echo: echo -*extract_syslinux_entries_configfile: syslinuxcfg -*extract_syslinux_entries_source: syslinuxcfg -*file: file -*functional_test: functional_test -*gettext: gettext -*hashsum: hashsum -*hdparm: hdparm -*hello: hello -*help: help -*hexdump: hexdump -*inb: iorw -*inl: iorw -*inw: iorw -*keystatus: keystatus -*kfreebsd: bsd -*knetbsd: bsd -*kopenbsd: bsd -*list_env: loadenv -*load_env: loadenv -*loopback: loopback -*ls: ls -*lsacpi: lsacpi -*lspci: lspci -*md5sum: hashsum -*menuentry: normal -*pcidump: pcidump -*probe: probe -*read_byte: memrw -*read_dword: memrw -*read_word: memrw -*regexp: regexp -*save_env: loadenv -*search: search -*serial: serial -*setpci: setpci -*sha1sum: hashsum -*sha256sum: hashsum -*sha512sum: hashsum -*sleep: sleep -*submenu: normal -*syslinux_configfile: syslinuxcfg -*syslinux_source: syslinuxcfg -*terminfo: terminfo -*test_blockarg: test_blockarg -*testspeed: testspeed -*tr: tr -*trust: verify -*verify_detached: verify -*xnu_splash: xnu -*zfskey: zfscrypt -.: configfile -[: test -appleloader: appleldr -authenticate: normal -background_color: gfxterm_background -backtrace: backtrace -badram: mmap -blocklist: blocklist -boot: boot -break: normal -cat: minicmd -cbmemc: cbmemc -chainloader: chain -clear: normal -cmp: cmp -configfile: configfile -continue: normal -coreboot_boottime: cbtime -cutmem: mmap -date: date -distrust: verify -dump: minicmd -eval: eval -exit: minicmd -export: normal -extract_entries_configfile: configfile -extract_entries_source: configfile -extract_legacy_entries_configfile: legacycfg -extract_legacy_entries_source: legacycfg -fakebios: loadbios -false: true -fix_video: fixvideo -fwsetup: efifwsetup -gdbstub: gdb -gdbstub_break: gdb -gdbstub_stop: gdb -gptsync: gptsync -halt: halt -help: minicmd -hexdump_random: random -initrd16: linux16 -initrd: linux -keymap: keylayouts -kfreebsd_loadenv: bsd -kfreebsd_module: bsd -kfreebsd_module_elf: bsd -knetbsd_module: bsd -knetbsd_module_elf: bsd -kopenbsd_ramdisk: bsd -legacy_check_password: legacycfg -legacy_configfile: legacycfg -legacy_initrd: legacycfg -legacy_initrd_nounzip: legacycfg -legacy_kernel: legacycfg -legacy_password: legacycfg -legacy_source: legacycfg -linux16: linux16 -linux: linux -list_trusted: verify -loadbios: loadbios -loadfont: font -lscoreboot: cbls -lsefi: lsefi -lsefimmap: lsefimmap -lsefisystab: lsefisystab -lsfonts: font -lsmmap: lsmmap -lsmod: minicmd -lssal: lssal -macppcbless: macbless -mactelbless: macbless -module2: multiboot2 -module: multiboot -multiboot2: multiboot2 -multiboot: multiboot -nativedisk: nativedisk -net_add_addr: net -net_add_dns: net -net_add_route: net -net_bootp: net -net_del_addr: net -net_del_dns: net -net_del_route: net -net_get_dhcp_option: net -net_ipv6_autoconf: net -net_ls_addr: net -net_ls_cards: net -net_ls_dns: net -net_ls_routes: net -net_nslookup: net -normal: normal -normal_exit: normal -outb: iorw -outl: iorw -outw: iorw -parttool: parttool -password: password -password_pbkdf2: password_pbkdf2 -play: play -read: read -reboot: reboot -return: normal -rmmod: minicmd -search.file: search_fs_file -search.fs_label: search_label -search.fs_uuid: search_fs_uuid -setparams: normal -shift: normal -source: configfile -terminal_input: terminal -terminal_output: terminal -test: test -testload: testload -time: time -true: true -usb: usbtest -videoinfo: videoinfo -videotest: videotest -write_byte: memrw -write_dword: memrw -write_word: memrw -xnu_devprop_load: xnu -xnu_kernel64: xnu -xnu_kernel: xnu -xnu_kext: xnu -xnu_kextdir: xnu -xnu_mkext: xnu -xnu_ramdisk: xnu -xnu_resume: xnu -xnu_uuid: xnu_uuid -zfs-bootfs: zfsinfo -zfsinfo: zfsinfo Index: ot/grub.efi/i386-efi/crypto.lst =================================================================== --- boot/grub.efi/i386-efi/crypto.lst (revision c878693123930f0906703462cf2807430679517e) +++ (revision ) @@ -1,45 +1,0 @@ -RIJNDAEL: gcry_rijndael -RIJNDAEL192: gcry_rijndael -RIJNDAEL256: gcry_rijndael -AES128: gcry_rijndael -AES-128: gcry_rijndael -AES-192: gcry_rijndael -AES-256: gcry_rijndael -ADLER32: adler32 -CRC64: crc64 -ARCFOUR: gcry_arcfour -BLOWFISH: gcry_blowfish -CAMELLIA128: gcry_camellia -CAMELLIA192: gcry_camellia -CAMELLIA256: gcry_camellia -CAST5: gcry_cast5 -CRC32: gcry_crc -CRC32RFC1510: gcry_crc -CRC24RFC2440: gcry_crc -DES: gcry_des -3DES: gcry_des -DSA: gcry_dsa -IDEA: gcry_idea -MD4: gcry_md4 -MD5: gcry_md5 -RFC2268_40: gcry_rfc2268 -AES: gcry_rijndael -AES192: gcry_rijndael -AES256: gcry_rijndael -RIPEMD160: gcry_rmd160 -RSA: gcry_rsa -SEED: gcry_seed -SERPENT128: gcry_serpent -SERPENT192: gcry_serpent -SERPENT256: gcry_serpent -SHA1: gcry_sha1 -SHA224: gcry_sha256 -SHA256: gcry_sha256 -SHA512: gcry_sha512 -SHA384: gcry_sha512 -TIGER192: gcry_tiger -TIGER: gcry_tiger -TIGER2: gcry_tiger -TWOFISH: gcry_twofish -TWOFISH128: gcry_twofish -WHIRLPOOL: gcry_whirlpool Index: ot/grub.efi/i386-efi/fs.lst =================================================================== --- boot/grub.efi/i386-efi/fs.lst (revision c878693123930f0906703462cf2807430679517e) +++ (revision ) @@ -1,36 +1,0 @@ -affs -afs -bfs -btrfs -cbfs -cpio -cpio_be -exfat -ext2 -fat -hfs -hfsplus -iso9660 -jfs -minix -minix2 -minix2_be -minix3 -minix3_be -minix_be -newc -nilfs2 -ntfs -odc -procfs -reiserfs -romfs -sfs -squash4 -tar -udf -ufs1 -ufs1_be -ufs2 -xfs -zfs Index: ot/grub.efi/i386-efi/gdb_grub =================================================================== --- boot/grub.efi/i386-efi/gdb_grub (revision c878693123930f0906703462cf2807430679517e) +++ (revision ) @@ -1,85 +1,0 @@ -### -### Load debuging information about GNU GRUB 2 modules into GDB -### automatically. Needs readelf, Perl and gmodule.pl script -### -### Has to be launched from the writable and trusted -### directory containing *.image and *.module -### -### $Id: .gdbinit,v 1.1 2006/05/14 11:38:08 lkundrak Exp $ -### Lubomir Kundrak -### - -# Add section numbers and addresses to .segments.tmp -define dump_module_sections - set $mod = $arg0 - - # FIXME: save logging status - set logging file .segments.tmp - set logging redirect on - set logging overwrite off - set logging on - - printf "%s", $mod->name - set $segment = $mod->segment - while ($segment) - printf " %i 0x%lx", $segment->section, $segment->addr - set $segment = $segment->next - end - printf "\n" - - set logging off - # FIXME: restore logging status -end -document dump_module_sections - Gather information about module whose mod structure was - given for use with match_and_load_symbols -end - -# Generate and execute GDB commands and delete temporary files -# afterwards -define match_and_load_symbols - shell perl gmodule.pl <.segments.tmp >.loadsym.gdb - source .loadsym.gdb - shell rm -f .segments.tmp .loadsym.gdb -end -document match_and_load_symbols - Launch script, that matches section names with information - generated by dump_module_sections and load debugging info - apropriately -end - -### - -define load_module - dump_module_sections $arg0 - match_and_load_symbols -end -document load_module - Load debugging information for module given as argument. -end - -define load_all_modules - set $this = grub_dl_head - while ($this != 0) - dump_module_sections $this - set $this = $this->next - end - match_and_load_symbols -end -document load_all_modules - Load debugging information for all loaded modules. -end - -### - -set confirm off -file kernel.exec -target remote :1234 - -# inform when module is loaded -break grub_dl_add -commands - silent - load_module mod - cont -end Index: ot/grub.efi/i386-efi/gmodule.pl =================================================================== --- boot/grub.efi/i386-efi/gmodule.pl (revision c878693123930f0906703462cf2807430679517e) +++ (revision ) @@ -1,30 +1,0 @@ -### -### Generate GDB commands, that load symbols for specified module, -### with proper section relocations. See .gdbinit -### -### $Id: gmodule.pl,v 1.2 2006/05/14 11:38:42 lkundrak Exp lkundrak $ -### Lubomir Kundrak -### - -use strict; - -while (<>) { - my ($name, %sections) = split; - - print "add-symbol-file $name.module"; - - open (READELF, "readelf -S $name.mod |") or die; - while () { - /\[\s*(\d+)\]\s+(\.\S+)/ or next; - - if ($2 eq '.text') { - print " $sections{$1}"; - next; - } - - print " -s $2 $sections{$1}" - if ($sections{$1} ne '0x0' and $sections{$1} ne ''); - }; - close (READELF); - print "\n"; -} Index: ot/grub.efi/i386-efi/moddep.lst =================================================================== --- boot/grub.efi/i386-efi/moddep.lst (revision c878693123930f0906703462cf2807430679517e) +++ (revision ) @@ -1,257 +1,0 @@ -videotest: font video gfxmenu -odc: archelp -loopback: extcmd -macho: -gcry_des: crypto -memrw: extcmd -terminfo: extcmd -part_gpt: -romfs: fshelp -read: -lsefimmap: -aout: -gcry_arcfour: crypto -tftp: net priority_queue -newc: archelp -minix2_be: -elf: -videotest_checksum: font functional_test video_fb -password_pbkdf2: crypto gcry_sha512 pbkdf2 normal -gcry_seed: crypto -pcidump: extcmd -bsd: elf serial crypto gcry_md5 extcmd video boot aout cpuid relocator mmap -sfs: fshelp -reiserfs: fshelp -part_sunpc: -gfxmenu: video_colors trig bitmap_scale gfxterm font normal video bitmap -backtrace: -jfs: -help: extcmd normal -configfile: normal -cbls: cbtable -gfxterm_menu: font functional_test procfs normal video_fb -gcry_idea: crypto -tr: extcmd -shift_test: functional_test -ohci: cs5536 usb boot -afs: fshelp -spkmodem: terminfo -usb_keyboard: usb keylayouts -xzio: crypto -syslinuxcfg: extcmd normal -search_fs_file: -usbms: scsi usb -test_blockarg: extcmd normal -true: -affs: fshelp -iso9660: fshelp -exfat: fshelp -setjmp_test: functional_test setjmp -gfxterm: font video -efinet: net -disk: -appleldr: boot -xfs: fshelp -testspeed: extcmd normal -cpio_be: archelp -functional_test: btrfs extcmd video video_fb -bswap_test: functional_test -sleep: extcmd normal -memdisk: -gcry_rijndael: crypto -mdraid09_be: diskfilter -gettext: -gcry_sha1: crypto -hfspluscomp: gzio hfsplus -cmp: -random: hexdump -offsetio: -file: macho elf extcmd offsetio -usbserial_usbdebug: serial usb usbserial_common -video_colors: -morse: -hashsum: crypto extcmd normal -usb: -halt: acpi -gdb: serial backtrace -gfxterm_background: video_colors bitmap_scale gfxterm extcmd video bitmap -search_fs_uuid: -gcry_dsa: verify mpi -keystatus: extcmd -linux: video boot relocator mmap -geli: cryptodisk crypto gcry_sha512 pbkdf2 gcry_sha256 -cmdline_cat_test: font functional_test procfs normal video_fb -part_sun: -cbtable: -pbkdf2_test: functional_test pbkdf2 gcry_sha1 -video_bochs: video video_fb -bufio: -usbserial_ftdi: serial usb usbserial_common -legacy_password_test: functional_test legacycfg -cpuid: extcmd -bfs: fshelp -hdparm: extcmd -gcry_blowfish: crypto -test: -nilfs2: fshelp -gcry_rsa: verify mpi -cryptodisk: crypto extcmd procfs -nativedisk: -minicmd: -signature_test: functional_test procfs -ata: scsi -udf: fshelp -gzio: -xnu_uuid: gcry_md5 -uhci: usb -pata: ata -mul_test: functional_test -adler32: crypto -terminal: -div: -ehci: cs5536 usb boot -crypto: -part_bsd: part_msdos -cs5536: -gcry_sha512: crypto -password: crypto normal -fshelp: -sleep_test: functional_test datetime -iorw: extcmd -xnu: macho bitmap_scale random extcmd video bitmap boot relocator mmap -mmap: -exfctest: functional_test -zfsinfo: zfs -ldm: part_gpt diskfilter part_msdos -eval: normal -part_dvh: -lssal: -ext2: fshelp -blocklist: -net: priority_queue bufio datetime boot -part_acorn: -videoinfo: video -btrfs: lzopio gzio -lsmmap: mmap -bitmap: -ntfs: fshelp -multiboot: net video boot relocator mmap -gcry_crc: crypto -png: bufio bitmap -jpeg: bufio bitmap -macbless: disk -div_test: functional_test div -regexp: extcmd normal -parttool: normal -usbserial_pl2303: serial usb usbserial_common -cpio: archelp -gcry_rmd160: crypto -fat: fshelp -ufs1_be: -archelp: -raid6rec: diskfilter -http: net -zfs: gzio -lsefisystab: -minix2: -lsacpi: extcmd acpi -datehook: datetime normal -loadenv: disk extcmd -bitmap_scale: bitmap -probe: extcmd -minix3: -tar: archelp -loadbios: -hfs: fshelp -procfs: archelp -boot: -keylayouts: -progress: normal -kernel: -usbtest: usb -relocator: mmap -acpi: extcmd mmap -tga: bufio bitmap -reboot: relocator -serial: extcmd terminfo -zfscrypt: crypto pbkdf2 zfs extcmd gcry_sha1 gcry_rijndael -efi_uga: video video_fb -dm_nv: diskfilter -cmp_test: functional_test -luks: cryptodisk crypto pbkdf2 -font: bufio video -raid5rec: diskfilter -crc64: crypto -datetime: -efifwsetup: reboot -ctz_test: functional_test -video: -cbmemc: normal cbtable terminfo -hfsplus: fshelp -gcry_cast5: crypto -extcmd: -squash4: fshelp lzopio xzio gzio -part_plan: -minix_be: -gcry_whirlpool: crypto -gcry_tiger: crypto -fixvideo: -search: search_fs_uuid search_fs_file extcmd search_label -lspci: extcmd -cbtime: cbtable -video_fb: -verify: crypto extcmd mpi gcry_sha1 -minix3_be: -trig: -msdospart: disk parttool -priority_queue: -gcry_twofish: crypto -part_dfly: -xnu_uuid_test: functional_test -diskfilter: -testload: -part_apple: -hexdump: extcmd -date: datetime normal -pbkdf2: crypto -gcry_sha256: crypto -ls: extcmd normal -usbserial_common: serial usb -ntfscomp: ntfs -lzopio: crypto -video_cirrus: video video_fb -hello: extcmd -scsi: -cat: extcmd -ahci: ata boot -normal: terminal crypto bufio extcmd boot gettext -linux16: video boot relocator mmap -ufs1: -mdraid09: diskfilter -lvm: diskfilter -chain: net efinet boot -cbfs: archelp -ufs2: -time: -setpci: extcmd -gptsync: disk -search_label: -setjmp: -multiboot2: net video boot relocator mmap acpi -gcry_rfc2268: crypto -mdraid1x: diskfilter -mpi: crypto -legacycfg: password crypto gcry_md5 normal -play: -part_amiga: -efi_gop: video video_fb -minix: -echo: extcmd -lsefi: -gcry_serpent: crypto -gcry_md4: crypto -gcry_md5: crypto -part_msdos: -gcry_camellia: crypto -at_keyboard: keylayouts boot -all_video: efi_gop efi_uga video_bochs video_cirrus Index: ot/grub.efi/i386-efi/modinfo.sh =================================================================== --- boot/grub.efi/i386-efi/modinfo.sh (revision c878693123930f0906703462cf2807430679517e) +++ (revision ) @@ -1,40 +1,0 @@ -#!/bin/sh - -# User-controllable options -grub_modinfo_target_cpu=i386 -grub_modinfo_platform=efi -grub_disk_cache_stats=0 -grub_boot_time_stats=0 -grub_have_font_source=1 - -# Autodetected config -grub_have_asm_uscore=0 -grub_bss_start_symbol="__bss_start" -grub_end_symbol="end" - -# Build environment -grub_target_cc='gcc' -grub_target_cc_version='gcc (SUSE Linux) 4.8.5' -grub_target_cflags=' -Os -Wall -W -Wshadow -Wpointer-arith -Wundef -Wchar-subscripts -Wcomment -Wdeprecated-declarations -Wdisabled-optimization -Wdiv-by-zero -Wfloat-equal -Wformat-extra-args -Wformat-security -Wformat-y2k -Wimplicit -Wimplicit-function-declaration -Wimplicit-int -Wmain -Wmissing-braces -Wmissing-format-attribute -Wmultichar -Wparentheses -Wreturn-type -Wsequence-point -Wshadow -Wsign-compare -Wswitch -Wtrigraphs -Wunknown-pragmas -Wunused -Wunused-function -Wunused-label -Wunused-parameter -Wunused-value -Wunused-variable -Wwrite-strings -Wnested-externs -Wstrict-prototypes -g -Wredundant-decls -Wmissing-prototypes -Wmissing-declarations -Wextra -Wattributes -Wendif-labels -Winit-self -Wint-to-pointer-cast -Winvalid-pch -Wmissing-field-initializers -Wnonnull -Woverflow -Wvla -Wpointer-to-int-cast -Wstrict-aliasing -Wvariadic-macros -Wvolatile-register-var -Wpointer-sign -Wmissing-include-dirs -Wmissing-prototypes -Wmissing-declarations -Wformat=2 -march=i386 -m32 -falign-jumps=1 -falign-loops=1 -falign-functions=1 -freg-struct-return -mno-mmx -mno-sse -mno-sse2 -mno-sse3 -mno-3dnow -msoft-float -fno-dwarf2-cfi-asm -mno-stack-arg-probe -fno-asynchronous-unwind-tables -fno-unwind-tables -Qn -fno-stack-protector -Wtrampolines -Werror' -grub_target_cppflags=' -Wall -W -DGRUB_MACHINE_EFI=1 -DGRUB_MACHINE=I386_EFI -m32 -nostdinc -isystem /usr/lib64/gcc/x86_64-suse-linux/4.8/include -I$(top_srcdir)/include -I$(top_builddir)/include' -grub_target_ccasflags=' -g -m32 -msoft-float' -grub_target_ldflags=' -m32 -Wl,-melf_i386 -Wl,--build-id=none' -grub_cflags='' -grub_cppflags=' -D_FILE_OFFSET_BITS=64' -grub_ccasflags='' -grub_ldflags='' -grub_target_strip='strip' -grub_target_nm='nm' -grub_target_ranlib='ranlib' -grub_target_objconf='' -grub_target_obj2elf='' -grub_target_img_base_ldopt='-Wl,-Ttext' -grub_target_img_ldflags='@TARGET_IMG_BASE_LDFLAGS@' - -# Version -grub_version="2.02~beta2" -grub_package="grub" -grub_package_string="GRUB 2.02~beta2" -grub_package_version="2.02~beta2" -grub_package_name="GRUB" -grub_package_bugreport="bug-grub@gnu.org" Index: ot/grub.efi/i386-efi/partmap.lst =================================================================== --- boot/grub.efi/i386-efi/partmap.lst (revision c878693123930f0906703462cf2807430679517e) +++ (revision ) @@ -1,11 +1,0 @@ -part_acorn -part_amiga -part_apple -part_bsd -part_dfly -part_dvh -part_gpt -part_msdos -part_plan -part_sun -part_sunpc Index: ot/grub.efi/i386-efi/parttool.lst =================================================================== --- boot/grub.efi/i386-efi/parttool.lst (revision c878693123930f0906703462cf2807430679517e) +++ (revision ) @@ -1,1 +1,0 @@ -msdos: msdospart Index: ot/grub.efi/i386-efi/terminal.lst =================================================================== --- boot/grub.efi/i386-efi/terminal.lst (revision c878693123930f0906703462cf2807430679517e) +++ (revision ) @@ -1,9 +1,0 @@ -iat_keyboard: at_keyboard -iserial: serial -iserial_*: serial -oaudio: morse -ocbmemc: cbmemc -ogfxterm: gfxterm -oserial: serial -oserial_*: serial -ospkmodem: spkmodem Index: ot/grub.efi/i386-efi/video.lst =================================================================== --- boot/grub.efi/i386-efi/video.lst (revision c878693123930f0906703462cf2807430679517e) +++ (revision ) @@ -1,4 +1,0 @@ -efi_gop -efi_uga -video_bochs -video_cirrus Index: ot/grub.efi/x86_64-efi/command.lst =================================================================== --- boot/grub.efi/x86_64-efi/command.lst (revision c878693123930f0906703462cf2807430679517e) +++ (revision ) @@ -1,187 +1,0 @@ -*acpi: acpi -*all_functional_test: functional_test -*background_image: gfxterm_background -*cat: cat -*cpuid: cpuid -*crc: hashsum -*cryptomount: cryptodisk -*echo: echo -*extract_syslinux_entries_configfile: syslinuxcfg -*extract_syslinux_entries_source: syslinuxcfg -*file: file -*functional_test: functional_test -*gettext: gettext -*hashsum: hashsum -*hdparm: hdparm -*hello: hello -*help: help -*hexdump: hexdump -*inb: iorw -*inl: iorw -*inw: iorw -*keystatus: keystatus -*kfreebsd: bsd -*knetbsd: bsd -*kopenbsd: bsd -*list_env: loadenv -*load_env: loadenv -*loopback: loopback -*ls: ls -*lsacpi: lsacpi -*lspci: lspci -*md5sum: hashsum -*menuentry: normal -*pcidump: pcidump -*probe: probe -*read_byte: memrw -*read_dword: memrw -*read_word: memrw -*regexp: regexp -*save_env: loadenv -*search: search -*serial: serial -*setpci: setpci -*sha1sum: hashsum -*sha256sum: hashsum -*sha512sum: hashsum -*sleep: sleep -*submenu: normal -*syslinux_configfile: syslinuxcfg -*syslinux_source: syslinuxcfg -*terminfo: terminfo -*test_blockarg: test_blockarg -*testspeed: testspeed -*tr: tr -*trust: verify -*verify_detached: verify -*xnu_splash: xnu -*zfskey: zfscrypt -.: configfile -[: test -appleloader: appleldr -authenticate: normal -background_color: gfxterm_background -backtrace: backtrace -badram: mmap -blocklist: blocklist -boot: boot -break: normal -cat: minicmd -cbmemc: cbmemc -chainloader: chain -clear: normal -cmp: cmp -configfile: configfile -continue: normal -coreboot_boottime: cbtime -cutmem: mmap -date: date -distrust: verify -dump: minicmd -eval: eval -exit: minicmd -export: normal -extract_entries_configfile: configfile -extract_entries_source: configfile -extract_legacy_entries_configfile: legacycfg -extract_legacy_entries_source: legacycfg -fakebios: loadbios -false: true -fix_video: fixvideo -fwsetup: efifwsetup -gptsync: gptsync -halt: halt -help: minicmd -hexdump_random: random -initrd16: linux16 -initrd: linux -keymap: keylayouts -kfreebsd_loadenv: bsd -kfreebsd_module: bsd -kfreebsd_module_elf: bsd -knetbsd_module: bsd -knetbsd_module_elf: bsd -kopenbsd_ramdisk: bsd -legacy_check_password: legacycfg -legacy_configfile: legacycfg -legacy_initrd: legacycfg -legacy_initrd_nounzip: legacycfg -legacy_kernel: legacycfg -legacy_password: legacycfg -legacy_source: legacycfg -linux16: linux16 -linux: linux -list_trusted: verify -loadbios: loadbios -loadfont: font -lscoreboot: cbls -lsefi: lsefi -lsefimmap: lsefimmap -lsefisystab: lsefisystab -lsfonts: font -lsmmap: lsmmap -lsmod: minicmd -lssal: lssal -macppcbless: macbless -mactelbless: macbless -module2: multiboot2 -module: multiboot -multiboot2: multiboot2 -multiboot: multiboot -nativedisk: nativedisk -net_add_addr: net -net_add_dns: net -net_add_route: net -net_bootp: net -net_del_addr: net -net_del_dns: net -net_del_route: net -net_get_dhcp_option: net -net_ipv6_autoconf: net -net_ls_addr: net -net_ls_cards: net -net_ls_dns: net -net_ls_routes: net -net_nslookup: net -normal: normal -normal_exit: normal -outb: iorw -outl: iorw -outw: iorw -parttool: parttool -password: password -password_pbkdf2: password_pbkdf2 -play: play -read: read -reboot: reboot -return: normal -rmmod: minicmd -search.file: search_fs_file -search.fs_label: search_label -search.fs_uuid: search_fs_uuid -setparams: normal -shift: normal -source: configfile -terminal_input: terminal -terminal_output: terminal -test: test -testload: testload -time: time -true: true -usb: usbtest -videoinfo: videoinfo -videotest: videotest -write_byte: memrw -write_dword: memrw -write_word: memrw -xnu_devprop_load: xnu -xnu_kernel64: xnu -xnu_kernel: xnu -xnu_kext: xnu -xnu_kextdir: xnu -xnu_mkext: xnu -xnu_ramdisk: xnu -xnu_resume: xnu -xnu_uuid: xnu_uuid -zfs-bootfs: zfsinfo -zfsinfo: zfsinfo Index: ot/grub.efi/x86_64-efi/crypto.lst =================================================================== --- boot/grub.efi/x86_64-efi/crypto.lst (revision c878693123930f0906703462cf2807430679517e) +++ (revision ) @@ -1,45 +1,0 @@ -RIJNDAEL: gcry_rijndael -RIJNDAEL192: gcry_rijndael -RIJNDAEL256: gcry_rijndael -AES128: gcry_rijndael -AES-128: gcry_rijndael -AES-192: gcry_rijndael -AES-256: gcry_rijndael -ADLER32: adler32 -CRC64: crc64 -ARCFOUR: gcry_arcfour -BLOWFISH: gcry_blowfish -CAMELLIA128: gcry_camellia -CAMELLIA192: gcry_camellia -CAMELLIA256: gcry_camellia -CAST5: gcry_cast5 -CRC32: gcry_crc -CRC32RFC1510: gcry_crc -CRC24RFC2440: gcry_crc -DES: gcry_des -3DES: gcry_des -DSA: gcry_dsa -IDEA: gcry_idea -MD4: gcry_md4 -MD5: gcry_md5 -RFC2268_40: gcry_rfc2268 -AES: gcry_rijndael -AES192: gcry_rijndael -AES256: gcry_rijndael -RIPEMD160: gcry_rmd160 -RSA: gcry_rsa -SEED: gcry_seed -SERPENT128: gcry_serpent -SERPENT192: gcry_serpent -SERPENT256: gcry_serpent -SHA1: gcry_sha1 -SHA224: gcry_sha256 -SHA256: gcry_sha256 -SHA512: gcry_sha512 -SHA384: gcry_sha512 -TIGER192: gcry_tiger -TIGER: gcry_tiger -TIGER2: gcry_tiger -TWOFISH: gcry_twofish -TWOFISH128: gcry_twofish -WHIRLPOOL: gcry_whirlpool Index: ot/grub.efi/x86_64-efi/fs.lst =================================================================== --- boot/grub.efi/x86_64-efi/fs.lst (revision c878693123930f0906703462cf2807430679517e) +++ (revision ) @@ -1,36 +1,0 @@ -affs -afs -bfs -btrfs -cbfs -cpio -cpio_be -exfat -ext2 -fat -hfs -hfsplus -iso9660 -jfs -minix -minix2 -minix2_be -minix3 -minix3_be -minix_be -newc -nilfs2 -ntfs -odc -procfs -reiserfs -romfs -sfs -squash4 -tar -udf -ufs1 -ufs1_be -ufs2 -xfs -zfs Index: ot/grub.efi/x86_64-efi/gdb_grub =================================================================== --- boot/grub.efi/x86_64-efi/gdb_grub (revision c878693123930f0906703462cf2807430679517e) +++ (revision ) @@ -1,85 +1,0 @@ -### -### Load debuging information about GNU GRUB 2 modules into GDB -### automatically. Needs readelf, Perl and gmodule.pl script -### -### Has to be launched from the writable and trusted -### directory containing *.image and *.module -### -### $Id: .gdbinit,v 1.1 2006/05/14 11:38:08 lkundrak Exp $ -### Lubomir Kundrak -### - -# Add section numbers and addresses to .segments.tmp -define dump_module_sections - set $mod = $arg0 - - # FIXME: save logging status - set logging file .segments.tmp - set logging redirect on - set logging overwrite off - set logging on - - printf "%s", $mod->name - set $segment = $mod->segment - while ($segment) - printf " %i 0x%lx", $segment->section, $segment->addr - set $segment = $segment->next - end - printf "\n" - - set logging off - # FIXME: restore logging status -end -document dump_module_sections - Gather information about module whose mod structure was - given for use with match_and_load_symbols -end - -# Generate and execute GDB commands and delete temporary files -# afterwards -define match_and_load_symbols - shell perl gmodule.pl <.segments.tmp >.loadsym.gdb - source .loadsym.gdb - shell rm -f .segments.tmp .loadsym.gdb -end -document match_and_load_symbols - Launch script, that matches section names with information - generated by dump_module_sections and load debugging info - apropriately -end - -### - -define load_module - dump_module_sections $arg0 - match_and_load_symbols -end -document load_module - Load debugging information for module given as argument. -end - -define load_all_modules - set $this = grub_dl_head - while ($this != 0) - dump_module_sections $this - set $this = $this->next - end - match_and_load_symbols -end -document load_all_modules - Load debugging information for all loaded modules. -end - -### - -set confirm off -file kernel.exec -target remote :1234 - -# inform when module is loaded -break grub_dl_add -commands - silent - load_module mod - cont -end Index: ot/grub.efi/x86_64-efi/gmodule.pl =================================================================== --- boot/grub.efi/x86_64-efi/gmodule.pl (revision c878693123930f0906703462cf2807430679517e) +++ (revision ) @@ -1,30 +1,0 @@ -### -### Generate GDB commands, that load symbols for specified module, -### with proper section relocations. See .gdbinit -### -### $Id: gmodule.pl,v 1.2 2006/05/14 11:38:42 lkundrak Exp lkundrak $ -### Lubomir Kundrak -### - -use strict; - -while (<>) { - my ($name, %sections) = split; - - print "add-symbol-file $name.module"; - - open (READELF, "readelf -S $name.mod |") or die; - while () { - /\[\s*(\d+)\]\s+(\.\S+)/ or next; - - if ($2 eq '.text') { - print " $sections{$1}"; - next; - } - - print " -s $2 $sections{$1}" - if ($sections{$1} ne '0x0' and $sections{$1} ne ''); - }; - close (READELF); - print "\n"; -} Index: ot/grub.efi/x86_64-efi/moddep.lst =================================================================== --- boot/grub.efi/x86_64-efi/moddep.lst (revision c878693123930f0906703462cf2807430679517e) +++ (revision ) @@ -1,256 +1,0 @@ -videotest: font video gfxmenu -odc: archelp -loopback: extcmd -macho: -gcry_des: crypto -memrw: extcmd -terminfo: extcmd -part_gpt: -romfs: fshelp -read: -lsefimmap: -aout: -gcry_arcfour: crypto -tftp: net priority_queue -newc: archelp -minix2_be: -elf: -videotest_checksum: font functional_test video_fb -password_pbkdf2: crypto gcry_sha512 pbkdf2 normal -gcry_seed: crypto -pcidump: extcmd -bsd: elf serial crypto gcry_md5 extcmd video boot aout cpuid relocator mmap -sfs: fshelp -reiserfs: fshelp -part_sunpc: -gfxmenu: video_colors trig bitmap_scale gfxterm font normal video bitmap -backtrace: -jfs: -help: extcmd normal -configfile: normal -cbls: cbtable -gfxterm_menu: font functional_test procfs normal video_fb -gcry_idea: crypto -tr: extcmd -shift_test: functional_test -ohci: cs5536 usb boot -afs: fshelp -spkmodem: terminfo -usb_keyboard: usb keylayouts -xzio: crypto -syslinuxcfg: extcmd normal -search_fs_file: -usbms: scsi usb -test_blockarg: extcmd normal -true: -affs: fshelp -iso9660: fshelp -exfat: fshelp -setjmp_test: functional_test setjmp -gfxterm: font video -efinet: net -disk: -appleldr: boot -xfs: fshelp -testspeed: extcmd normal -cpio_be: archelp -functional_test: btrfs extcmd video video_fb -bswap_test: functional_test -sleep: extcmd normal -memdisk: -gcry_rijndael: crypto -mdraid09_be: diskfilter -gettext: -gcry_sha1: crypto -hfspluscomp: gzio hfsplus -cmp: -random: hexdump -offsetio: -file: macho elf extcmd offsetio -usbserial_usbdebug: serial usb usbserial_common -video_colors: -morse: -hashsum: crypto extcmd normal -usb: -halt: acpi -gfxterm_background: video_colors bitmap_scale gfxterm extcmd video bitmap -search_fs_uuid: -gcry_dsa: verify mpi -keystatus: extcmd -linux: video boot relocator mmap -geli: cryptodisk crypto gcry_sha512 pbkdf2 gcry_sha256 -cmdline_cat_test: font functional_test procfs normal video_fb -part_sun: -cbtable: -pbkdf2_test: functional_test pbkdf2 gcry_sha1 -video_bochs: video video_fb -bufio: -usbserial_ftdi: serial usb usbserial_common -legacy_password_test: functional_test legacycfg -cpuid: extcmd -bfs: fshelp -hdparm: extcmd -gcry_blowfish: crypto -test: -nilfs2: fshelp -gcry_rsa: verify mpi -cryptodisk: crypto extcmd procfs -nativedisk: -minicmd: -signature_test: functional_test procfs -ata: scsi -udf: fshelp -gzio: -xnu_uuid: gcry_md5 -uhci: usb -pata: ata -mul_test: functional_test -adler32: crypto -terminal: -div: -ehci: cs5536 usb boot -crypto: -part_bsd: part_msdos -cs5536: -gcry_sha512: crypto -password: crypto normal -fshelp: -sleep_test: functional_test datetime -iorw: extcmd -xnu: macho bitmap_scale random extcmd video bitmap boot relocator mmap -mmap: -exfctest: functional_test -zfsinfo: zfs -ldm: part_gpt diskfilter part_msdos -eval: normal -part_dvh: -lssal: -ext2: fshelp -blocklist: -net: priority_queue bufio datetime boot -part_acorn: -videoinfo: video -btrfs: lzopio gzio -lsmmap: mmap -bitmap: -ntfs: fshelp -multiboot: net video boot relocator mmap -gcry_crc: crypto -png: bufio bitmap -jpeg: bufio bitmap -macbless: disk -div_test: functional_test div -regexp: extcmd normal -parttool: normal -usbserial_pl2303: serial usb usbserial_common -cpio: archelp -gcry_rmd160: crypto -fat: fshelp -ufs1_be: -archelp: -raid6rec: diskfilter -http: net -zfs: gzio -lsefisystab: -minix2: -lsacpi: extcmd acpi -datehook: datetime normal -loadenv: disk extcmd -bitmap_scale: bitmap -probe: extcmd -minix3: -tar: archelp -loadbios: -hfs: fshelp -procfs: archelp -boot: -keylayouts: -progress: normal -kernel: -usbtest: usb -relocator: mmap -acpi: extcmd mmap -tga: bufio bitmap -reboot: -serial: extcmd terminfo -zfscrypt: crypto pbkdf2 zfs extcmd gcry_sha1 gcry_rijndael -efi_uga: video video_fb -dm_nv: diskfilter -cmp_test: functional_test -luks: cryptodisk crypto pbkdf2 -font: bufio video -raid5rec: diskfilter -crc64: crypto -datetime: -efifwsetup: reboot -ctz_test: functional_test -video: -cbmemc: normal cbtable terminfo -hfsplus: fshelp -gcry_cast5: crypto -extcmd: -squash4: fshelp lzopio xzio gzio -part_plan: -minix_be: -gcry_whirlpool: crypto -gcry_tiger: crypto -fixvideo: -search: search_fs_uuid search_fs_file extcmd search_label -lspci: extcmd -cbtime: cbtable -video_fb: -verify: crypto extcmd mpi gcry_sha1 -minix3_be: -trig: -msdospart: disk parttool -priority_queue: -gcry_twofish: crypto -part_dfly: -xnu_uuid_test: functional_test -diskfilter: -testload: -part_apple: -hexdump: extcmd -date: datetime normal -pbkdf2: crypto -gcry_sha256: crypto -ls: extcmd normal -usbserial_common: serial usb -ntfscomp: ntfs -lzopio: crypto -video_cirrus: video video_fb -hello: extcmd -scsi: -cat: extcmd -ahci: ata boot -normal: terminal crypto bufio extcmd boot gettext -linux16: video boot relocator mmap -ufs1: -mdraid09: diskfilter -lvm: diskfilter -chain: net efinet boot -cbfs: archelp -ufs2: -time: -setpci: extcmd -gptsync: disk -search_label: -setjmp: -multiboot2: net video boot relocator mmap acpi -gcry_rfc2268: crypto -mdraid1x: diskfilter -mpi: crypto -legacycfg: password crypto gcry_md5 normal -play: -part_amiga: -efi_gop: video video_fb -minix: -echo: extcmd -lsefi: -gcry_serpent: crypto -gcry_md4: crypto -gcry_md5: crypto -part_msdos: -gcry_camellia: crypto -at_keyboard: keylayouts boot -all_video: efi_gop efi_uga video_bochs video_cirrus Index: ot/grub.efi/x86_64-efi/modinfo.sh =================================================================== --- boot/grub.efi/x86_64-efi/modinfo.sh (revision c878693123930f0906703462cf2807430679517e) +++ (revision ) @@ -1,40 +1,0 @@ -#!/bin/sh - -# User-controllable options -grub_modinfo_target_cpu=x86_64 -grub_modinfo_platform=efi -grub_disk_cache_stats=0 -grub_boot_time_stats=0 -grub_have_font_source=1 - -# Autodetected config -grub_have_asm_uscore=0 -grub_bss_start_symbol="" -grub_end_symbol="" - -# Build environment -grub_target_cc='gcc' -grub_target_cc_version='gcc (SUSE Linux) 4.8.5' -grub_target_cflags=' -Os -Wall -W -Wshadow -Wpointer-arith -Wundef -Wchar-subscripts -Wcomment -Wdeprecated-declarations -Wdisabled-optimization -Wdiv-by-zero -Wfloat-equal -Wformat-extra-args -Wformat-security -Wformat-y2k -Wimplicit -Wimplicit-function-declaration -Wimplicit-int -Wmain -Wmissing-braces -Wmissing-format-attribute -Wmultichar -Wparentheses -Wreturn-type -Wsequence-point -Wshadow -Wsign-compare -Wswitch -Wtrigraphs -Wunknown-pragmas -Wunused -Wunused-function -Wunused-label -Wunused-parameter -Wunused-value -Wunused-variable -Wwrite-strings -Wnested-externs -Wstrict-prototypes -g -Wredundant-decls -Wmissing-prototypes -Wmissing-declarations -Wextra -Wattributes -Wendif-labels -Winit-self -Wint-to-pointer-cast -Winvalid-pch -Wmissing-field-initializers -Wnonnull -Woverflow -Wvla -Wpointer-to-int-cast -Wstrict-aliasing -Wvariadic-macros -Wvolatile-register-var -Wpointer-sign -Wmissing-include-dirs -Wmissing-prototypes -Wmissing-declarations -Wformat=2 -m64 -freg-struct-return -mno-mmx -mno-sse -mno-sse2 -mno-sse3 -mno-3dnow -msoft-float -fno-dwarf2-cfi-asm -mno-stack-arg-probe -fno-asynchronous-unwind-tables -fno-unwind-tables -mcmodel=large -mno-red-zone -Qn -fno-stack-protector -Wtrampolines -Werror' -grub_target_cppflags=' -Wall -W -DGRUB_MACHINE_EFI=1 -DGRUB_MACHINE=X86_64_EFI -m64 -nostdinc -isystem /usr/lib64/gcc/x86_64-suse-linux/4.8/include -I$(top_srcdir)/include -I$(top_builddir)/include' -grub_target_ccasflags=' -g -m64 -msoft-float' -grub_target_ldflags=' -m64 -Wl,-melf_x86_64 -Wl,--build-id=none' -grub_cflags='' -grub_cppflags=' -D_FILE_OFFSET_BITS=64' -grub_ccasflags='' -grub_ldflags='' -grub_target_strip='strip' -grub_target_nm='nm' -grub_target_ranlib='ranlib' -grub_target_objconf='' -grub_target_obj2elf='' -grub_target_img_base_ldopt='-Wl,-Ttext' -grub_target_img_ldflags='@TARGET_IMG_BASE_LDFLAGS@' - -# Version -grub_version="2.02~beta2" -grub_package="grub" -grub_package_string="GRUB 2.02~beta2" -grub_package_version="2.02~beta2" -grub_package_name="GRUB" -grub_package_bugreport="bug-grub@gnu.org" Index: ot/grub.efi/x86_64-efi/partmap.lst =================================================================== --- boot/grub.efi/x86_64-efi/partmap.lst (revision c878693123930f0906703462cf2807430679517e) +++ (revision ) @@ -1,11 +1,0 @@ -part_acorn -part_amiga -part_apple -part_bsd -part_dfly -part_dvh -part_gpt -part_msdos -part_plan -part_sun -part_sunpc Index: ot/grub.efi/x86_64-efi/parttool.lst =================================================================== --- boot/grub.efi/x86_64-efi/parttool.lst (revision c878693123930f0906703462cf2807430679517e) +++ (revision ) @@ -1,1 +1,0 @@ -msdos: msdospart Index: ot/grub.efi/x86_64-efi/terminal.lst =================================================================== --- boot/grub.efi/x86_64-efi/terminal.lst (revision c878693123930f0906703462cf2807430679517e) +++ (revision ) @@ -1,9 +1,0 @@ -iat_keyboard: at_keyboard -iserial: serial -iserial_*: serial -oaudio: morse -ocbmemc: cbmemc -ogfxterm: gfxterm -oserial: serial -oserial_*: serial -ospkmodem: spkmodem Index: ot/grub.efi/x86_64-efi/video.lst =================================================================== --- boot/grub.efi/x86_64-efi/video.lst (revision c878693123930f0906703462cf2807430679517e) +++ (revision ) @@ -1,4 +1,0 @@ -efi_gop -efi_uga -video_bochs -video_cirrus Index: ot/grub.pc/COPYING =================================================================== --- boot/grub.pc/COPYING (revision c878693123930f0906703462cf2807430679517e) +++ (revision ) @@ -1,674 +1,0 @@ - GNU GENERAL PUBLIC LICENSE - Version 3, 29 June 2007 - - Copyright (C) 2007 Free Software Foundation, Inc. - Everyone is permitted to copy and distribute verbatim copies - of this license document, but changing it is not allowed. - - Preamble - - The GNU General Public License is a free, copyleft license for -software and other kinds of works. - - The licenses for most software and other practical works are designed -to take away your freedom to share and change the works. By contrast, -the GNU General Public License is intended to guarantee your freedom to -share and change all versions of a program--to make sure it remains free -software for all its users. We, the Free Software Foundation, use the -GNU General Public License for most of our software; it applies also to -any other work released this way by its authors. You can apply it to -your programs, too. - - When we speak of free software, we are referring to freedom, not -price. Our General Public Licenses are designed to make sure that you -have the freedom to distribute copies of free software (and charge for -them if you wish), that you receive source code or can get it if you -want it, that you can change the software or use pieces of it in new -free programs, and that you know you can do these things. - - To protect your rights, we need to prevent others from denying you -these rights or asking you to surrender the rights. Therefore, you have -certain responsibilities if you distribute copies of the software, or if -you modify it: responsibilities to respect the freedom of others. - - For example, if you distribute copies of such a program, whether -gratis or for a fee, you must pass on to the recipients the same -freedoms that you received. You must make sure that they, too, receive -or can get the source code. And you must show them these terms so they -know their rights. - - Developers that use the GNU GPL protect your rights with two steps: -(1) assert copyright on the software, and (2) offer you this License -giving you legal permission to copy, distribute and/or modify it. - - For the developers' and authors' protection, the GPL clearly explains -that there is no warranty for this free software. For both users' and -authors' sake, the GPL requires that modified versions be marked as -changed, so that their problems will not be attributed erroneously to -authors of previous versions. - - Some devices are designed to deny users access to install or run -modified versions of the software inside them, although the manufacturer -can do so. This is fundamentally incompatible with the aim of -protecting users' freedom to change the software. The systematic -pattern of such abuse occurs in the area of products for individuals to -use, which is precisely where it is most unacceptable. Therefore, we -have designed this version of the GPL to prohibit the practice for those -products. If such problems arise substantially in other domains, we -stand ready to extend this provision to those domains in future versions -of the GPL, as needed to protect the freedom of users. - - Finally, every program is threatened constantly by software patents. -States should not allow patents to restrict development and use of -software on general-purpose computers, but in those that do, we wish to -avoid the special danger that patents applied to a free program could -make it effectively proprietary. To prevent this, the GPL assures that -patents cannot be used to render the program non-free. - - The precise terms and conditions for copying, distribution and -modification follow. - - TERMS AND CONDITIONS - - 0. Definitions. - - "This License" refers to version 3 of the GNU General Public License. - - "Copyright" also means copyright-like laws that apply to other kinds of -works, such as semiconductor masks. - - "The Program" refers to any copyrightable work licensed under this -License. Each licensee is addressed as "you". "Licensees" and -"recipients" may be individuals or organizations. - - To "modify" a work means to copy from or adapt all or part of the work -in a fashion requiring copyright permission, other than the making of an -exact copy. The resulting work is called a "modified version" of the -earlier work or a work "based on" the earlier work. - - A "covered work" means either the unmodified Program or a work based -on the Program. - - To "propagate" a work means to do anything with it that, without -permission, would make you directly or secondarily liable for -infringement under applicable copyright law, except executing it on a -computer or modifying a private copy. Propagation includes copying, -distribution (with or without modification), making available to the -public, and in some countries other activities as well. - - To "convey" a work means any kind of propagation that enables other -parties to make or receive copies. Mere interaction with a user through -a computer network, with no transfer of a copy, is not conveying. - - An interactive user interface displays "Appropriate Legal Notices" -to the extent that it includes a convenient and prominently visible -feature that (1) displays an appropriate copyright notice, and (2) -tells the user that there is no warranty for the work (except to the -extent that warranties are provided), that licensees may convey the -work under this License, and how to view a copy of this License. If -the interface presents a list of user commands or options, such as a -menu, a prominent item in the list meets this criterion. - - 1. Source Code. - - The "source code" for a work means the preferred form of the work -for making modifications to it. "Object code" means any non-source -form of a work. - - A "Standard Interface" means an interface that either is an official -standard defined by a recognized standards body, or, in the case of -interfaces specified for a particular programming language, one that -is widely used among developers working in that language. - - The "System Libraries" of an executable work include anything, other -than the work as a whole, that (a) is included in the normal form of -packaging a Major Component, but which is not part of that Major -Component, and (b) serves only to enable use of the work with that -Major Component, or to implement a Standard Interface for which an -implementation is available to the public in source code form. A -"Major Component", in this context, means a major essential component -(kernel, window system, and so on) of the specific operating system -(if any) on which the executable work runs, or a compiler used to -produce the work, or an object code interpreter used to run it. - - The "Corresponding Source" for a work in object code form means all -the source code needed to generate, install, and (for an executable -work) run the object code and to modify the work, including scripts to -control those activities. However, it does not include the work's -System Libraries, or general-purpose tools or generally available free -programs which are used unmodified in performing those activities but -which are not part of the work. For example, Corresponding Source -includes interface definition files associated with source files for -the work, and the source code for shared libraries and dynamically -linked subprograms that the work is specifically designed to require, -such as by intimate data communication or control flow between those -subprograms and other parts of the work. - - The Corresponding Source need not include anything that users -can regenerate automatically from other parts of the Corresponding -Source. - - The Corresponding Source for a work in source code form is that -same work. - - 2. Basic Permissions. - - All rights granted under this License are granted for the term of -copyright on the Program, and are irrevocable provided the stated -conditions are met. This License explicitly affirms your unlimited -permission to run the unmodified Program. The output from running a -covered work is covered by this License only if the output, given its -content, constitutes a covered work. This License acknowledges your -rights of fair use or other equivalent, as provided by copyright law. - - You may make, run and propagate covered works that you do not -convey, without conditions so long as your license otherwise remains -in force. You may convey covered works to others for the sole purpose -of having them make modifications exclusively for you, or provide you -with facilities for running those works, provided that you comply with -the terms of this License in conveying all material for which you do -not control copyright. Those thus making or running the covered works -for you must do so exclusively on your behalf, under your direction -and control, on terms that prohibit them from making any copies of -your copyrighted material outside their relationship with you. - - Conveying under any other circumstances is permitted solely under -the conditions stated below. Sublicensing is not allowed; section 10 -makes it unnecessary. - - 3. Protecting Users' Legal Rights From Anti-Circumvention Law. - - No covered work shall be deemed part of an effective technological -measure under any applicable law fulfilling obligations under article -11 of the WIPO copyright treaty adopted on 20 December 1996, or -similar laws prohibiting or restricting circumvention of such -measures. - - When you convey a covered work, you waive any legal power to forbid -circumvention of technological measures to the extent such circumvention -is effected by exercising rights under this License with respect to -the covered work, and you disclaim any intention to limit operation or -modification of the work as a means of enforcing, against the work's -users, your or third parties' legal rights to forbid circumvention of -technological measures. - - 4. Conveying Verbatim Copies. - - You may convey verbatim copies of the Program's source code as you -receive it, in any medium, provided that you conspicuously and -appropriately publish on each copy an appropriate copyright notice; -keep intact all notices stating that this License and any -non-permissive terms added in accord with section 7 apply to the code; -keep intact all notices of the absence of any warranty; and give all -recipients a copy of this License along with the Program. - - You may charge any price or no price for each copy that you convey, -and you may offer support or warranty protection for a fee. - - 5. Conveying Modified Source Versions. - - You may convey a work based on the Program, or the modifications to -produce it from the Program, in the form of source code under the -terms of section 4, provided that you also meet all of these conditions: - - a) The work must carry prominent notices stating that you modified - it, and giving a relevant date. - - b) The work must carry prominent notices stating that it is - released under this License and any conditions added under section - 7. This requirement modifies the requirement in section 4 to - "keep intact all notices". - - c) You must license the entire work, as a whole, under this - License to anyone who comes into possession of a copy. This - License will therefore apply, along with any applicable section 7 - additional terms, to the whole of the work, and all its parts, - regardless of how they are packaged. This License gives no - permission to license the work in any other way, but it does not - invalidate such permission if you have separately received it. - - d) If the work has interactive user interfaces, each must display - Appropriate Legal Notices; however, if the Program has interactive - interfaces that do not display Appropriate Legal Notices, your - work need not make them do so. - - A compilation of a covered work with other separate and independent -works, which are not by their nature extensions of the covered work, -and which are not combined with it such as to form a larger program, -in or on a volume of a storage or distribution medium, is called an -"aggregate" if the compilation and its resulting copyright are not -used to limit the access or legal rights of the compilation's users -beyond what the individual works permit. Inclusion of a covered work -in an aggregate does not cause this License to apply to the other -parts of the aggregate. - - 6. Conveying Non-Source Forms. - - You may convey a covered work in object code form under the terms -of sections 4 and 5, provided that you also convey the -machine-readable Corresponding Source under the terms of this License, -in one of these ways: - - a) Convey the object code in, or embodied in, a physical product - (including a physical distribution medium), accompanied by the - Corresponding Source fixed on a durable physical medium - customarily used for software interchange. - - b) Convey the object code in, or embodied in, a physical product - (including a physical distribution medium), accompanied by a - written offer, valid for at least three years and valid for as - long as you offer spare parts or customer support for that product - model, to give anyone who possesses the object code either (1) a - copy of the Corresponding Source for all the software in the - product that is covered by this License, on a durable physical - medium customarily used for software interchange, for a price no - more than your reasonable cost of physically performing this - conveying of source, or (2) access to copy the - Corresponding Source from a network server at no charge. - - c) Convey individual copies of the object code with a copy of the - written offer to provide the Corresponding Source. This - alternative is allowed only occasionally and noncommercially, and - only if you received the object code with such an offer, in accord - with subsection 6b. - - d) Convey the object code by offering access from a designated - place (gratis or for a charge), and offer equivalent access to the - Corresponding Source in the same way through the same place at no - further charge. You need not require recipients to copy the - Corresponding Source along with the object code. If the place to - copy the object code is a network server, the Corresponding Source - may be on a different server (operated by you or a third party) - that supports equivalent copying facilities, provided you maintain - clear directions next to the object code saying where to find the - Corresponding Source. Regardless of what server hosts the - Corresponding Source, you remain obligated to ensure that it is - available for as long as needed to satisfy these requirements. - - e) Convey the object code using peer-to-peer transmission, provided - you inform other peers where the object code and Corresponding - Source of the work are being offered to the general public at no - charge under subsection 6d. - - A separable portion of the object code, whose source code is excluded -from the Corresponding Source as a System Library, need not be -included in conveying the object code work. - - A "User Product" is either (1) a "consumer product", which means any -tangible personal property which is normally used for personal, family, -or household purposes, or (2) anything designed or sold for incorporation -into a dwelling. In determining whether a product is a consumer product, -doubtful cases shall be resolved in favor of coverage. For a particular -product received by a particular user, "normally used" refers to a -typical or common use of that class of product, regardless of the status -of the particular user or of the way in which the particular user -actually uses, or expects or is expected to use, the product. A product -is a consumer product regardless of whether the product has substantial -commercial, industrial or non-consumer uses, unless such uses represent -the only significant mode of use of the product. - - "Installation Information" for a User Product means any methods, -procedures, authorization keys, or other information required to install -and execute modified versions of a covered work in that User Product from -a modified version of its Corresponding Source. The information must -suffice to ensure that the continued functioning of the modified object -code is in no case prevented or interfered with solely because -modification has been made. - - If you convey an object code work under this section in, or with, or -specifically for use in, a User Product, and the conveying occurs as -part of a transaction in which the right of possession and use of the -User Product is transferred to the recipient in perpetuity or for a -fixed term (regardless of how the transaction is characterized), the -Corresponding Source conveyed under this section must be accompanied -by the Installation Information. But this requirement does not apply -if neither you nor any third party retains the ability to install -modified object code on the User Product (for example, the work has -been installed in ROM). - - The requirement to provide Installation Information does not include a -requirement to continue to provide support service, warranty, or updates -for a work that has been modified or installed by the recipient, or for -the User Product in which it has been modified or installed. Access to a -network may be denied when the modification itself materially and -adversely affects the operation of the network or violates the rules and -protocols for communication across the network. - - Corresponding Source conveyed, and Installation Information provided, -in accord with this section must be in a format that is publicly -documented (and with an implementation available to the public in -source code form), and must require no special password or key for -unpacking, reading or copying. - - 7. Additional Terms. - - "Additional permissions" are terms that supplement the terms of this -License by making exceptions from one or more of its conditions. -Additional permissions that are applicable to the entire Program shall -be treated as though they were included in this License, to the extent -that they are valid under applicable law. If additional permissions -apply only to part of the Program, that part may be used separately -under those permissions, but the entire Program remains governed by -this License without regard to the additional permissions. - - When you convey a copy of a covered work, you may at your option -remove any additional permissions from that copy, or from any part of -it. (Additional permissions may be written to require their own -removal in certain cases when you modify the work.) You may place -additional permissions on material, added by you to a covered work, -for which you have or can give appropriate copyright permission. - - Notwithstanding any other provision of this License, for material you -add to a covered work, you may (if authorized by the copyright holders of -that material) supplement the terms of this License with terms: - - a) Disclaiming warranty or limiting liability differently from the - terms of sections 15 and 16 of this License; or - - b) Requiring preservation of specified reasonable legal notices or - author attributions in that material or in the Appropriate Legal - Notices displayed by works containing it; or - - c) Prohibiting misrepresentation of the origin of that material, or - requiring that modified versions of such material be marked in - reasonable ways as different from the original version; or - - d) Limiting the use for publicity purposes of names of licensors or - authors of the material; or - - e) Declining to grant rights under trademark law for use of some - trade names, trademarks, or service marks; or - - f) Requiring indemnification of licensors and authors of that - material by anyone who conveys the material (or modified versions of - it) with contractual assumptions of liability to the recipient, for - any liability that these contractual assumptions directly impose on - those licensors and authors. - - All other non-permissive additional terms are considered "further -restrictions" within the meaning of section 10. If the Program as you -received it, or any part of it, contains a notice stating that it is -governed by this License along with a term that is a further -restriction, you may remove that term. If a license document contains -a further restriction but permits relicensing or conveying under this -License, you may add to a covered work material governed by the terms -of that license document, provided that the further restriction does -not survive such relicensing or conveying. - - If you add terms to a covered work in accord with this section, you -must place, in the relevant source files, a statement of the -additional terms that apply to those files, or a notice indicating -where to find the applicable terms. - - Additional terms, permissive or non-permissive, may be stated in the -form of a separately written license, or stated as exceptions; -the above requirements apply either way. - - 8. Termination. - - You may not propagate or modify a covered work except as expressly -provided under this License. Any attempt otherwise to propagate or -modify it is void, and will automatically terminate your rights under -this License (including any patent licenses granted under the third -paragraph of section 11). - - However, if you cease all violation of this License, then your -license from a particular copyright holder is reinstated (a) -provisionally, unless and until the copyright holder explicitly and -finally terminates your license, and (b) permanently, if the copyright -holder fails to notify you of the violation by some reasonable means -prior to 60 days after the cessation. - - Moreover, your license from a particular copyright holder is -reinstated permanently if the copyright holder notifies you of the -violation by some reasonable means, this is the first time you have -received notice of violation of this License (for any work) from that -copyright holder, and you cure the violation prior to 30 days after -your receipt of the notice. - - Termination of your rights under this section does not terminate the -licenses of parties who have received copies or rights from you under -this License. If your rights have been terminated and not permanently -reinstated, you do not qualify to receive new licenses for the same -material under section 10. - - 9. Acceptance Not Required for Having Copies. - - You are not required to accept this License in order to receive or -run a copy of the Program. Ancillary propagation of a covered work -occurring solely as a consequence of using peer-to-peer transmission -to receive a copy likewise does not require acceptance. However, -nothing other than this License grants you permission to propagate or -modify any covered work. These actions infringe copyright if you do -not accept this License. Therefore, by modifying or propagating a -covered work, you indicate your acceptance of this License to do so. - - 10. Automatic Licensing of Downstream Recipients. - - Each time you convey a covered work, the recipient automatically -receives a license from the original licensors, to run, modify and -propagate that work, subject to this License. You are not responsible -for enforcing compliance by third parties with this License. - - An "entity transaction" is a transaction transferring control of an -organization, or substantially all assets of one, or subdividing an -organization, or merging organizations. If propagation of a covered -work results from an entity transaction, each party to that -transaction who receives a copy of the work also receives whatever -licenses to the work the party's predecessor in interest had or could -give under the previous paragraph, plus a right to possession of the -Corresponding Source of the work from the predecessor in interest, if -the predecessor has it or can get it with reasonable efforts. - - You may not impose any further restrictions on the exercise of the -rights granted or affirmed under this License. For example, you may -not impose a license fee, royalty, or other charge for exercise of -rights granted under this License, and you may not initiate litigation -(including a cross-claim or counterclaim in a lawsuit) alleging that -any patent claim is infringed by making, using, selling, offering for -sale, or importing the Program or any portion of it. - - 11. Patents. - - A "contributor" is a copyright holder who authorizes use under this -License of the Program or a work on which the Program is based. The -work thus licensed is called the contributor's "contributor version". - - A contributor's "essential patent claims" are all patent claims -owned or controlled by the contributor, whether already acquired or -hereafter acquired, that would be infringed by some manner, permitted -by this License, of making, using, or selling its contributor version, -but do not include claims that would be infringed only as a -consequence of further modification of the contributor version. For -purposes of this definition, "control" includes the right to grant -patent sublicenses in a manner consistent with the requirements of -this License. - - Each contributor grants you a non-exclusive, worldwide, royalty-free -patent license under the contributor's essential patent claims, to -make, use, sell, offer for sale, import and otherwise run, modify and -propagate the contents of its contributor version. - - In the following three paragraphs, a "patent license" is any express -agreement or commitment, however denominated, not to enforce a patent -(such as an express permission to practice a patent or covenant not to -sue for patent infringement). To "grant" such a patent license to a -party means to make such an agreement or commitment not to enforce a -patent against the party. - - If you convey a covered work, knowingly relying on a patent license, -and the Corresponding Source of the work is not available for anyone -to copy, free of charge and under the terms of this License, through a -publicly available network server or other readily accessible means, -then you must either (1) cause the Corresponding Source to be so -available, or (2) arrange to deprive yourself of the benefit of the -patent license for this particular work, or (3) arrange, in a manner -consistent with the requirements of this License, to extend the patent -license to downstream recipients. "Knowingly relying" means you have -actual knowledge that, but for the patent license, your conveying the -covered work in a country, or your recipient's use of the covered work -in a country, would infringe one or more identifiable patents in that -country that you have reason to believe are valid. - - If, pursuant to or in connection with a single transaction or -arrangement, you convey, or propagate by procuring conveyance of, a -covered work, and grant a patent license to some of the parties -receiving the covered work authorizing them to use, propagate, modify -or convey a specific copy of the covered work, then the patent license -you grant is automatically extended to all recipients of the covered -work and works based on it. - - A patent license is "discriminatory" if it does not include within -the scope of its coverage, prohibits the exercise of, or is -conditioned on the non-exercise of one or more of the rights that are -specifically granted under this License. You may not convey a covered -work if you are a party to an arrangement with a third party that is -in the business of distributing software, under which you make payment -to the third party based on the extent of your activity of conveying -the work, and under which the third party grants, to any of the -parties who would receive the covered work from you, a discriminatory -patent license (a) in connection with copies of the covered work -conveyed by you (or copies made from those copies), or (b) primarily -for and in connection with specific products or compilations that -contain the covered work, unless you entered into that arrangement, -or that patent license was granted, prior to 28 March 2007. - - Nothing in this License shall be construed as excluding or limiting -any implied license or other defenses to infringement that may -otherwise be available to you under applicable patent law. - - 12. No Surrender of Others' Freedom. - - If conditions are imposed on you (whether by court order, agreement or -otherwise) that contradict the conditions of this License, they do not -excuse you from the conditions of this License. If you cannot convey a -covered work so as to satisfy simultaneously your obligations under this -License and any other pertinent obligations, then as a consequence you may -not convey it at all. For example, if you agree to terms that obligate you -to collect a royalty for further conveying from those to whom you convey -the Program, the only way you could satisfy both those terms and this -License would be to refrain entirely from conveying the Program. - - 13. Use with the GNU Affero General Public License. - - Notwithstanding any other provision of this License, you have -permission to link or combine any covered work with a work licensed -under version 3 of the GNU Affero General Public License into a single -combined work, and to convey the resulting work. The terms of this -License will continue to apply to the part which is the covered work, -but the special requirements of the GNU Affero General Public License, -section 13, concerning interaction through a network will apply to the -combination as such. - - 14. Revised Versions of this License. - - The Free Software Foundation may publish revised and/or new versions of -the GNU General Public License from time to time. Such new versions will -be similar in spirit to the present version, but may differ in detail to -address new problems or concerns. - - Each version is given a distinguishing version number. If the -Program specifies that a certain numbered version of the GNU General -Public License "or any later version" applies to it, you have the -option of following the terms and conditions either of that numbered -version or of any later version published by the Free Software -Foundation. If the Program does not specify a version number of the -GNU General Public License, you may choose any version ever published -by the Free Software Foundation. - - If the Program specifies that a proxy can decide which future -versions of the GNU General Public License can be used, that proxy's -public statement of acceptance of a version permanently authorizes you -to choose that version for the Program. - - Later license versions may give you additional or different -permissions. However, no additional obligations are imposed on any -author or copyright holder as a result of your choosing to follow a -later version. - - 15. Disclaimer of Warranty. - - THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY -APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT -HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY -OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, -THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR -PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM -IS WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF -ALL NECESSARY SERVICING, REPAIR OR CORRECTION. - - 16. Limitation of Liability. - - IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING -WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS -THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY -GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE -USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF -DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD -PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS), -EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF -SUCH DAMAGES. - - 17. Interpretation of Sections 15 and 16. - - If the disclaimer of warranty and limitation of liability provided -above cannot be given local legal effect according to their terms, -reviewing courts shall apply local law that most closely approximates -an absolute waiver of all civil liability in connection with the -Program, unless a warranty or assumption of liability accompanies a -copy of the Program in return for a fee. - - END OF TERMS AND CONDITIONS - - How to Apply These Terms to Your New Programs - - If you develop a new program, and you want it to be of the greatest -possible use to the public, the best way to achieve this is to make it -free software which everyone can redistribute and change under these terms. - - To do so, attach the following notices to the program. It is safest -to attach them to the start of each source file to most effectively -state the exclusion of warranty; and each file should have at least -the "copyright" line and a pointer to where the full notice is found. - - - Copyright (C) - - This program is free software: you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation, either version 3 of the License, or - (at your option) any later version. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - You should have received a copy of the GNU General Public License - along with this program. If not, see . - -Also add information on how to contact you by electronic and paper mail. - - If the program does terminal interaction, make it output a short -notice like this when it starts in an interactive mode: - - Copyright (C) - This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'. - This is free software, and you are welcome to redistribute it - under certain conditions; type `show c' for details. - -The hypothetical commands `show w' and `show c' should show the appropriate -parts of the General Public License. Of course, your program's commands -might be different; for a GUI interface, you would use an "about box". - - You should also get your employer (if you work as a programmer) or school, -if any, to sign a "copyright disclaimer" for the program, if necessary. -For more information on this, and how to apply and follow the GNU GPL, see -. - - The GNU General Public License does not permit incorporating your program -into proprietary programs. If your program is a subroutine library, you -may consider it more useful to permit linking proprietary applications with -the library. If this is what you want to do, use the GNU Lesser General -Public License instead of this License. But first, please read -. Index: ot/grub.pc/README =================================================================== --- boot/grub.pc/README (revision c878693123930f0906703462cf2807430679517e) +++ (revision ) @@ -1,9 +1,0 @@ -The binary files of GRUB boot loader in this directory have been created -by compiling GRUB for the 'i386-pc' target and then using the grub-mkrescue -script to create the El Torito boot image. - -For licensing terms of GRUB boot loader see the file COPYING contained -in this directory. Full version of GRUB, including its source code, -can be downloaded from GRUB's project page: - -http://www.gnu.org/software/grub/ Index: ot/grub.pc/REVISION =================================================================== --- boot/grub.pc/REVISION (revision c878693123930f0906703462cf2807430679517e) +++ (revision ) @@ -1,1 +1,0 @@ -bc220962e366b1b46769ed6f9fa5be603ba58ab5 Index: ot/grub.pc/i386-pc/command.lst =================================================================== --- boot/grub.pc/i386-pc/command.lst (revision c878693123930f0906703462cf2807430679517e) +++ (revision ) @@ -1,198 +1,0 @@ -*acpi: acpi -*all_functional_test: functional_test -*background_image: gfxterm_background -*cat: cat -*cpuid: cpuid -*crc: hashsum -*cryptomount: cryptodisk -*drivemap: drivemap -*echo: echo -*extract_syslinux_entries_configfile: syslinuxcfg -*extract_syslinux_entries_source: syslinuxcfg -*file: file -*functional_test: functional_test -*gettext: gettext -*halt: halt -*hashsum: hashsum -*hdparm: hdparm -*hello: hello -*help: help -*hexdump: hexdump -*inb: iorw -*inl: iorw -*inw: iorw -*keystatus: keystatus -*kfreebsd: bsd -*knetbsd: bsd -*kopenbsd: bsd -*list_env: loadenv -*load_env: loadenv -*loopback: loopback -*ls: ls -*lsacpi: lsacpi -*lspci: lspci -*md5sum: hashsum -*menuentry: normal -*pcidump: pcidump -*plan9: plan9 -*probe: probe -*read_byte: memrw -*read_dword: memrw -*read_word: memrw -*regexp: regexp -*save_env: loadenv -*search: search -*sendkey: sendkey -*serial: serial -*setpci: setpci -*sha1sum: hashsum -*sha256sum: hashsum -*sha512sum: hashsum -*sleep: sleep -*submenu: normal -*syslinux_configfile: syslinuxcfg -*syslinux_source: syslinuxcfg -*terminfo: terminfo -*test_blockarg: test_blockarg -*testspeed: testspeed -*tr: tr -*trust: verify -*verify_detached: verify -*xnu_splash: xnu -*zfskey: zfscrypt -.: configfile -[: test -authenticate: normal -background_color: gfxterm_background -backtrace: backtrace -badram: mmap -blocklist: blocklist -boot: boot -break: normal -cat: minicmd -cbmemc: cbmemc -chainloader: chain -clear: normal -cmosclean: cmostest -cmosdump: cmosdump -cmosset: cmostest -cmostest: cmostest -cmp: cmp -configfile: configfile -continue: normal -coreboot_boottime: cbtime -cutmem: mmap -date: date -distrust: verify -dump: minicmd -efiemu_loadcore: efiemu -efiemu_prepare: efiemu -efiemu_unload: efiemu -eval: eval -exit: minicmd -export: normal -extract_entries_configfile: configfile -extract_entries_source: configfile -extract_legacy_entries_configfile: legacycfg -extract_legacy_entries_source: legacycfg -false: true -freedos: freedos -gdbstub: gdb -gdbstub_break: gdb -gdbstub_stop: gdb -gptsync: gptsync -help: minicmd -hexdump_random: random -initrd16: linux16 -initrd: linux -keymap: keylayouts -kfreebsd_loadenv: bsd -kfreebsd_module: bsd -kfreebsd_module_elf: bsd -knetbsd_module: bsd -knetbsd_module_elf: bsd -kopenbsd_ramdisk: bsd -legacy_check_password: legacycfg -legacy_configfile: legacycfg -legacy_initrd: legacycfg -legacy_initrd_nounzip: legacycfg -legacy_kernel: legacycfg -legacy_password: legacycfg -legacy_source: legacycfg -linux16: linux16 -linux: linux -list_trusted: verify -loadfont: font -lsapm: lsapm -lscoreboot: cbls -lsfonts: font -lsmmap: lsmmap -lsmod: minicmd -macppcbless: macbless -mactelbless: macbless -module2: multiboot2 -module: multiboot -multiboot2: multiboot2 -multiboot: multiboot -nativedisk: nativedisk -net_add_addr: net -net_add_dns: net -net_add_route: net -net_bootp: net -net_del_addr: net -net_del_dns: net -net_del_route: net -net_get_dhcp_option: net -net_ipv6_autoconf: net -net_ls_addr: net -net_ls_cards: net -net_ls_dns: net -net_ls_routes: net -net_nslookup: net -normal: normal -normal_exit: normal -ntldr: ntldr -outb: iorw -outl: iorw -outw: iorw -parttool: parttool -password: password -password_pbkdf2: password_pbkdf2 -play: play -pxechainloader: pxechain -read: read -reboot: reboot -return: normal -rmmod: minicmd -search.file: search_fs_file -search.fs_label: search_label -search.fs_uuid: search_fs_uuid -setparams: normal -shift: normal -source: configfile -terminal_input: terminal -terminal_output: terminal -test: test -testload: testload -time: time -true: true -truecrypt: truecrypt -usb: usbtest -vbeinfo: videoinfo -vbetest: videotest -videoinfo: videoinfo -videotest: videotest -write_byte: memrw -write_dword: memrw -write_word: memrw -xnu_devprop_load: xnu -xnu_kernel64: xnu -xnu_kernel: xnu -xnu_kext: xnu -xnu_kextdir: xnu -xnu_mkext: xnu -xnu_ramdisk: xnu -xnu_resume: xnu -xnu_uuid: xnu_uuid -zfs-bootfs: zfsinfo -zfsinfo: zfsinfo Index: ot/grub.pc/i386-pc/crypto.lst =================================================================== --- boot/grub.pc/i386-pc/crypto.lst (revision c878693123930f0906703462cf2807430679517e) +++ (revision ) @@ -1,45 +1,0 @@ -RIJNDAEL: gcry_rijndael -RIJNDAEL192: gcry_rijndael -RIJNDAEL256: gcry_rijndael -AES128: gcry_rijndael -AES-128: gcry_rijndael -AES-192: gcry_rijndael -AES-256: gcry_rijndael -ADLER32: adler32 -CRC64: crc64 -ARCFOUR: gcry_arcfour -BLOWFISH: gcry_blowfish -CAMELLIA128: gcry_camellia -CAMELLIA192: gcry_camellia -CAMELLIA256: gcry_camellia -CAST5: gcry_cast5 -CRC32: gcry_crc -CRC32RFC1510: gcry_crc -CRC24RFC2440: gcry_crc -DES: gcry_des -3DES: gcry_des -DSA: gcry_dsa -IDEA: gcry_idea -MD4: gcry_md4 -MD5: gcry_md5 -RFC2268_40: gcry_rfc2268 -AES: gcry_rijndael -AES192: gcry_rijndael -AES256: gcry_rijndael -RIPEMD160: gcry_rmd160 -RSA: gcry_rsa -SEED: gcry_seed -SERPENT128: gcry_serpent -SERPENT192: gcry_serpent -SERPENT256: gcry_serpent -SHA1: gcry_sha1 -SHA224: gcry_sha256 -SHA256: gcry_sha256 -SHA512: gcry_sha512 -SHA384: gcry_sha512 -TIGER192: gcry_tiger -TIGER: gcry_tiger -TIGER2: gcry_tiger -TWOFISH: gcry_twofish -TWOFISH128: gcry_twofish -WHIRLPOOL: gcry_whirlpool Index: ot/grub.pc/i386-pc/fs.lst =================================================================== --- boot/grub.pc/i386-pc/fs.lst (revision c878693123930f0906703462cf2807430679517e) +++ (revision ) @@ -1,36 +1,0 @@ -affs -afs -bfs -btrfs -cbfs -cpio -cpio_be -exfat -ext2 -fat -hfs -hfsplus -iso9660 -jfs -minix -minix2 -minix2_be -minix3 -minix3_be -minix_be -newc -nilfs2 -ntfs -odc -procfs -reiserfs -romfs -sfs -squash4 -tar -udf -ufs1 -ufs1_be -ufs2 -xfs -zfs Index: ot/grub.pc/i386-pc/gdb_grub =================================================================== --- boot/grub.pc/i386-pc/gdb_grub (revision c878693123930f0906703462cf2807430679517e) +++ (revision ) @@ -1,85 +1,0 @@ -### -### Load debuging information about GNU GRUB 2 modules into GDB -### automatically. Needs readelf, Perl and gmodule.pl script -### -### Has to be launched from the writable and trusted -### directory containing *.image and *.module -### -### $Id: .gdbinit,v 1.1 2006/05/14 11:38:08 lkundrak Exp $ -### Lubomir Kundrak -### - -# Add section numbers and addresses to .segments.tmp -define dump_module_sections - set $mod = $arg0 - - # FIXME: save logging status - set logging file .segments.tmp - set logging redirect on - set logging overwrite off - set logging on - - printf "%s", $mod->name - set $segment = $mod->segment - while ($segment) - printf " %i 0x%lx", $segment->section, $segment->addr - set $segment = $segment->next - end - printf "\n" - - set logging off - # FIXME: restore logging status -end -document dump_module_sections - Gather information about module whose mod structure was - given for use with match_and_load_symbols -end - -# Generate and execute GDB commands and delete temporary files -# afterwards -define match_and_load_symbols - shell perl gmodule.pl <.segments.tmp >.loadsym.gdb - source .loadsym.gdb - shell rm -f .segments.tmp .loadsym.gdb -end -document match_and_load_symbols - Launch script, that matches section names with information - generated by dump_module_sections and load debugging info - apropriately -end - -### - -define load_module - dump_module_sections $arg0 - match_and_load_symbols -end -document load_module - Load debugging information for module given as argument. -end - -define load_all_modules - set $this = grub_dl_head - while ($this != 0) - dump_module_sections $this - set $this = $this->next - end - match_and_load_symbols -end -document load_all_modules - Load debugging information for all loaded modules. -end - -### - -set confirm off -file kernel.exec -target remote :1234 - -# inform when module is loaded -break grub_dl_add -commands - silent - load_module mod - cont -end Index: ot/grub.pc/i386-pc/gmodule.pl =================================================================== --- boot/grub.pc/i386-pc/gmodule.pl (revision c878693123930f0906703462cf2807430679517e) +++ (revision ) @@ -1,30 +1,0 @@ -### -### Generate GDB commands, that load symbols for specified module, -### with proper section relocations. See .gdbinit -### -### $Id: gmodule.pl,v 1.2 2006/05/14 11:38:42 lkundrak Exp lkundrak $ -### Lubomir Kundrak -### - -use strict; - -while (<>) { - my ($name, %sections) = split; - - print "add-symbol-file $name.module"; - - open (READELF, "readelf -S $name.mod |") or die; - while () { - /\[\s*(\d+)\]\s+(\.\S+)/ or next; - - if ($2 eq '.text') { - print " $sections{$1}"; - next; - } - - print " -s $2 $sections{$1}" - if ($sections{$1} ne '0x0' and $sections{$1} ne ''); - }; - close (READELF); - print "\n"; -} Index: ot/grub.pc/i386-pc/moddep.lst =================================================================== --- boot/grub.pc/i386-pc/moddep.lst (revision c878693123930f0906703462cf2807430679517e) +++ (revision ) @@ -1,264 +1,0 @@ -videotest: font video gfxmenu -odc: archelp -loopback: extcmd -macho: -gcry_des: crypto -memrw: extcmd -terminfo: extcmd -part_gpt: -romfs: fshelp -read: -aout: -gcry_arcfour: crypto -vga_text: -tftp: net priority_queue -newc: archelp -minix2_be: -elf: -videotest_checksum: font functional_test video_fb -password_pbkdf2: crypto gcry_sha512 pbkdf2 normal -gcry_seed: crypto -pcidump: extcmd pci -bsd: elf serial crypto gcry_md5 extcmd vbe video boot aout cpuid relocator mmap -sfs: fshelp -reiserfs: fshelp -part_sunpc: -gfxmenu: video_colors trig bitmap_scale gfxterm font normal video bitmap -backtrace: -jfs: -help: extcmd normal -configfile: normal -cbls: cbtable -gfxterm_menu: font functional_test procfs normal video_fb -gcry_idea: crypto -tr: extcmd -shift_test: functional_test -ohci: cs5536 usb boot pci -afs: fshelp -spkmodem: terminfo -usb_keyboard: usb keylayouts -xzio: crypto -syslinuxcfg: extcmd normal -search_fs_file: -vga: video video_fb -usbms: scsi usb -test_blockarg: extcmd normal -true: -affs: fshelp -iso9660: fshelp -exfat: fshelp -setjmp_test: functional_test setjmp -gfxterm: font video -disk: -xfs: fshelp -testspeed: extcmd normal -cpio_be: archelp -functional_test: btrfs extcmd video video_fb -pxechain: pxe video boot relocator -bswap_test: functional_test -sleep: extcmd normal -memdisk: -gcry_rijndael: crypto -mdraid09_be: diskfilter -gettext: -gcry_sha1: crypto -hfspluscomp: gzio hfsplus -cmp: -random: hexdump acpi -offsetio: -file: macho elf extcmd offsetio -usbserial_usbdebug: serial usb usbserial_common -video_colors: -morse: -hashsum: crypto extcmd normal -usb: pci -halt: extcmd acpi -gdb: serial backtrace -gfxterm_background: video_colors bitmap_scale gfxterm extcmd video bitmap -search_fs_uuid: -gcry_dsa: verify mpi -keystatus: extcmd -linux: normal vbe video boot relocator mmap -geli: cryptodisk crypto gcry_sha512 pbkdf2 gcry_sha256 -cmdline_cat_test: font functional_test procfs normal video_fb -part_sun: -cbtable: -plan9: extcmd video boot relocator -sendkey: extcmd boot -pbkdf2_test: functional_test pbkdf2 gcry_sha1 -video_bochs: video pci video_fb -bufio: -usbserial_ftdi: serial usb usbserial_common -legacy_password_test: functional_test legacycfg -cpuid: extcmd -bfs: fshelp -hdparm: extcmd -gcry_blowfish: crypto -test: -nilfs2: fshelp -gcry_rsa: verify mpi -cryptodisk: crypto extcmd procfs -nativedisk: -minicmd: -signature_test: functional_test procfs -ata: scsi -udf: fshelp -gzio: -xnu_uuid: gcry_md5 -uhci: usb pci -pata: ata pci -mul_test: functional_test -adler32: crypto -terminal: -div: -ehci: cs5536 usb boot pci -crypto: -part_bsd: part_msdos -cs5536: pci -biosdisk: -lsapm: -gcry_sha512: crypto -password: crypto normal -efiemu: gcry_crc crypto cpuid acpi -fshelp: -sleep_test: functional_test datetime -iorw: extcmd -xnu: macho bitmap_scale random extcmd video bitmap boot efiemu relocator mmap -mmap: boot -exfctest: functional_test -zfsinfo: zfs -ldm: part_gpt diskfilter part_msdos -cmostest: -eval: normal -part_dvh: -ext2: fshelp -blocklist: -net: priority_queue bufio datetime boot -drivemap: extcmd boot mmap -part_acorn: -videoinfo: video -btrfs: lzopio gzio -lsmmap: -bitmap: -vbe: video video_fb -ntfs: fshelp -multiboot: net vbe video boot relocator mmap lsapm -gcry_crc: crypto -png: bufio bitmap -jpeg: bufio bitmap -macbless: disk -div_test: functional_test div -regexp: extcmd normal -parttool: normal -usbserial_pl2303: serial usb usbserial_common -cpio: archelp -gcry_rmd160: crypto -fat: fshelp -ufs1_be: -truecrypt: video boot relocator mmap gzio -archelp: -raid6rec: diskfilter -ntldr: chain video boot relocator -http: net -zfs: gzio -minix2: -mda_text: -lsacpi: extcmd acpi -datehook: datetime normal -loadenv: disk extcmd -bitmap_scale: bitmap -probe: extcmd -minix3: -tar: archelp -hfs: fshelp -procfs: archelp -boot: -keylayouts: -progress: normal -kernel: -usbtest: usb -relocator: mmap -acpi: extcmd mmap -tga: bufio bitmap -reboot: relocator -serial: extcmd terminfo -zfscrypt: crypto pbkdf2 zfs extcmd gcry_sha1 gcry_rijndael -dm_nv: diskfilter -cmp_test: functional_test -luks: cryptodisk crypto pbkdf2 -font: bufio video -raid5rec: diskfilter -crc64: crypto -datetime: -ctz_test: functional_test -video: -pci: -cbmemc: normal cbtable terminfo -cmosdump: -hfsplus: fshelp -gcry_cast5: crypto -extcmd: -squash4: fshelp lzopio xzio gzio -part_plan: -minix_be: -gcry_whirlpool: crypto -pxe: net boot -gcry_tiger: crypto -search: search_fs_uuid search_fs_file extcmd search_label -lspci: extcmd pci -cbtime: cbtable -video_fb: -verify: crypto extcmd mpi gcry_sha1 -minix3_be: -trig: -msdospart: disk parttool -priority_queue: -gcry_twofish: crypto -part_dfly: -xnu_uuid_test: functional_test -diskfilter: -testload: -part_apple: -hexdump: extcmd -date: datetime normal -pbkdf2: crypto -gcry_sha256: crypto -ls: extcmd normal -usbserial_common: serial usb -ntfscomp: ntfs -lzopio: crypto -video_cirrus: video pci video_fb -hello: extcmd -scsi: -cat: extcmd -ahci: ata boot pci -normal: terminal crypto bufio extcmd boot gettext -linux16: video boot relocator mmap -ufs1: -mdraid09: diskfilter -lvm: diskfilter -cbfs: archelp -chain: video boot relocator -ufs2: -time: -setpci: extcmd pci -gptsync: disk -freedos: chain video boot relocator -search_label: -setjmp: -multiboot2: net vbe video boot relocator mmap lsapm acpi -gcry_rfc2268: crypto -mdraid1x: diskfilter -mpi: crypto -legacycfg: linux password crypto gcry_md5 normal -play: -part_amiga: -minix: -echo: extcmd -gcry_serpent: crypto -gcry_md4: crypto -gcry_md5: crypto -part_msdos: -gcry_camellia: crypto -at_keyboard: keylayouts boot -all_video: vbe vga video_bochs video_cirrus Index: ot/grub.pc/i386-pc/modinfo.sh =================================================================== --- boot/grub.pc/i386-pc/modinfo.sh (revision c878693123930f0906703462cf2807430679517e) +++ (revision ) @@ -1,40 +1,0 @@ -#!/bin/sh - -# User-controllable options -grub_modinfo_target_cpu=i386 -grub_modinfo_platform=pc -grub_disk_cache_stats=0 -grub_boot_time_stats=0 -grub_have_font_source=1 - -# Autodetected config -grub_have_asm_uscore=0 -grub_bss_start_symbol="__bss_start" -grub_end_symbol="end" - -# Build environment -grub_target_cc='gcc' -grub_target_cc_version='gcc (SUSE Linux) 4.8.5' -grub_target_cflags=' -Os -Wall -W -Wshadow -Wpointer-arith -Wundef -Wchar-subscripts -Wcomment -Wdeprecated-declarations -Wdisabled-optimization -Wdiv-by-zero -Wfloat-equal -Wformat-extra-args -Wformat-security -Wformat-y2k -Wimplicit -Wimplicit-function-declaration -Wimplicit-int -Wmain -Wmissing-braces -Wmissing-format-attribute -Wmultichar -Wparentheses -Wreturn-type -Wsequence-point -Wshadow -Wsign-compare -Wswitch -Wtrigraphs -Wunknown-pragmas -Wunused -Wunused-function -Wunused-label -Wunused-parameter -Wunused-value -Wunused-variable -Wwrite-strings -Wnested-externs -Wstrict-prototypes -g -Wredundant-decls -Wmissing-prototypes -Wmissing-declarations -Wextra -Wattributes -Wendif-labels -Winit-self -Wint-to-pointer-cast -Winvalid-pch -Wmissing-field-initializers -Wnonnull -Woverflow -Wvla -Wpointer-to-int-cast -Wstrict-aliasing -Wvariadic-macros -Wvolatile-register-var -Wpointer-sign -Wmissing-include-dirs -Wmissing-prototypes -Wmissing-declarations -Wformat=2 -march=i386 -m32 -mrtd -mregparm=3 -falign-jumps=1 -falign-loops=1 -falign-functions=1 -freg-struct-return -mno-mmx -mno-sse -mno-sse2 -mno-sse3 -mno-3dnow -msoft-float -fno-dwarf2-cfi-asm -mno-stack-arg-probe -fno-asynchronous-unwind-tables -fno-unwind-tables -Qn -fno-stack-protector -Wtrampolines -Werror' -grub_target_cppflags=' -Wall -W -DGRUB_MACHINE_PCBIOS=1 -DGRUB_MACHINE=I386_PC -m32 -nostdinc -isystem /usr/lib64/gcc/x86_64-suse-linux/4.8/include -I$(top_srcdir)/include -I$(top_builddir)/include' -grub_target_ccasflags=' -g -m32 -msoft-float' -grub_target_ldflags=' -m32 -Wl,-melf_i386 -Wl,--build-id=none' -grub_cflags='' -grub_cppflags=' -D_FILE_OFFSET_BITS=64' -grub_ccasflags='' -grub_ldflags='' -grub_target_strip='strip' -grub_target_nm='nm' -grub_target_ranlib='ranlib' -grub_target_objconf='' -grub_target_obj2elf='' -grub_target_img_base_ldopt='-Wl,-Ttext' -grub_target_img_ldflags='@TARGET_IMG_BASE_LDFLAGS@' - -# Version -grub_version="2.02~beta2" -grub_package="grub" -grub_package_string="GRUB 2.02~beta2" -grub_package_version="2.02~beta2" -grub_package_name="GRUB" -grub_package_bugreport="bug-grub@gnu.org" Index: ot/grub.pc/i386-pc/partmap.lst =================================================================== --- boot/grub.pc/i386-pc/partmap.lst (revision c878693123930f0906703462cf2807430679517e) +++ (revision ) @@ -1,11 +1,0 @@ -part_acorn -part_amiga -part_apple -part_bsd -part_dfly -part_dvh -part_gpt -part_msdos -part_plan -part_sun -part_sunpc Index: ot/grub.pc/i386-pc/parttool.lst =================================================================== --- boot/grub.pc/i386-pc/parttool.lst (revision c878693123930f0906703462cf2807430679517e) +++ (revision ) @@ -1,1 +1,0 @@ -msdos: msdospart Index: ot/grub.pc/i386-pc/terminal.lst =================================================================== --- boot/grub.pc/i386-pc/terminal.lst (revision c878693123930f0906703462cf2807430679517e) +++ (revision ) @@ -1,11 +1,0 @@ -iat_keyboard: at_keyboard -iserial: serial -iserial_*: serial -oaudio: morse -ocbmemc: cbmemc -ogfxterm: gfxterm -omda_text: mda_text -oserial: serial -oserial_*: serial -ospkmodem: spkmodem -ovga_text: vga_text Index: ot/grub.pc/i386-pc/video.lst =================================================================== --- boot/grub.pc/i386-pc/video.lst (revision c878693123930f0906703462cf2807430679517e) +++ (revision ) @@ -1,4 +1,0 @@ -vbe -vga -video_bochs -video_cirrus Index: boot/grub/amd64-efi =================================================================== --- boot/grub/amd64-efi (revision de9e28e0c0b35a214dcdc3688dc8579f50c5fbd6) +++ boot/grub/amd64-efi (revision de9e28e0c0b35a214dcdc3688dc8579f50c5fbd6) @@ -0,0 +1,1 @@ +ia32-efi Index: boot/grub/amd64-pc =================================================================== --- boot/grub/amd64-pc (revision de9e28e0c0b35a214dcdc3688dc8579f50c5fbd6) +++ boot/grub/amd64-pc (revision de9e28e0c0b35a214dcdc3688dc8579f50c5fbd6) @@ -0,0 +1,1 @@ +ia32-pc Index: boot/grub/arm64-efi/COPYING =================================================================== --- boot/grub/arm64-efi/COPYING (revision de9e28e0c0b35a214dcdc3688dc8579f50c5fbd6) +++ boot/grub/arm64-efi/COPYING (revision de9e28e0c0b35a214dcdc3688dc8579f50c5fbd6) @@ -0,0 +1,674 @@ + GNU GENERAL PUBLIC LICENSE + Version 3, 29 June 2007 + + Copyright (C) 2007 Free Software Foundation, Inc. + Everyone is permitted to copy and distribute verbatim copies + of this license document, but changing it is not allowed. + + Preamble + + The GNU General Public License is a free, copyleft license for +software and other kinds of works. + + The licenses for most software and other practical works are designed +to take away your freedom to share and change the works. By contrast, +the GNU General Public License is intended to guarantee your freedom to +share and change all versions of a program--to make sure it remains free +software for all its users. We, the Free Software Foundation, use the +GNU General Public License for most of our software; it applies also to +any other work released this way by its authors. You can apply it to +your programs, too. + + When we speak of free software, we are referring to freedom, not +price. Our General Public Licenses are designed to make sure that you +have the freedom to distribute copies of free software (and charge for +them if you wish), that you receive source code or can get it if you +want it, that you can change the software or use pieces of it in new +free programs, and that you know you can do these things. + + To protect your rights, we need to prevent others from denying you +these rights or asking you to surrender the rights. Therefore, you have +certain responsibilities if you distribute copies of the software, or if +you modify it: responsibilities to respect the freedom of others. + + For example, if you distribute copies of such a program, whether +gratis or for a fee, you must pass on to the recipients the same +freedoms that you received. You must make sure that they, too, receive +or can get the source code. And you must show them these terms so they +know their rights. + + Developers that use the GNU GPL protect your rights with two steps: +(1) assert copyright on the software, and (2) offer you this License +giving you legal permission to copy, distribute and/or modify it. + + For the developers' and authors' protection, the GPL clearly explains +that there is no warranty for this free software. For both users' and +authors' sake, the GPL requires that modified versions be marked as +changed, so that their problems will not be attributed erroneously to +authors of previous versions. + + Some devices are designed to deny users access to install or run +modified versions of the software inside them, although the manufacturer +can do so. This is fundamentally incompatible with the aim of +protecting users' freedom to change the software. The systematic +pattern of such abuse occurs in the area of products for individuals to +use, which is precisely where it is most unacceptable. Therefore, we +have designed this version of the GPL to prohibit the practice for those +products. If such problems arise substantially in other domains, we +stand ready to extend this provision to those domains in future versions +of the GPL, as needed to protect the freedom of users. + + Finally, every program is threatened constantly by software patents. +States should not allow patents to restrict development and use of +software on general-purpose computers, but in those that do, we wish to +avoid the special danger that patents applied to a free program could +make it effectively proprietary. To prevent this, the GPL assures that +patents cannot be used to render the program non-free. + + The precise terms and conditions for copying, distribution and +modification follow. + + TERMS AND CONDITIONS + + 0. Definitions. + + "This License" refers to version 3 of the GNU General Public License. + + "Copyright" also means copyright-like laws that apply to other kinds of +works, such as semiconductor masks. + + "The Program" refers to any copyrightable work licensed under this +License. Each licensee is addressed as "you". "Licensees" and +"recipients" may be individuals or organizations. + + To "modify" a work means to copy from or adapt all or part of the work +in a fashion requiring copyright permission, other than the making of an +exact copy. The resulting work is called a "modified version" of the +earlier work or a work "based on" the earlier work. + + A "covered work" means either the unmodified Program or a work based +on the Program. + + To "propagate" a work means to do anything with it that, without +permission, would make you directly or secondarily liable for +infringement under applicable copyright law, except executing it on a +computer or modifying a private copy. Propagation includes copying, +distribution (with or without modification), making available to the +public, and in some countries other activities as well. + + To "convey" a work means any kind of propagation that enables other +parties to make or receive copies. Mere interaction with a user through +a computer network, with no transfer of a copy, is not conveying. + + An interactive user interface displays "Appropriate Legal Notices" +to the extent that it includes a convenient and prominently visible +feature that (1) displays an appropriate copyright notice, and (2) +tells the user that there is no warranty for the work (except to the +extent that warranties are provided), that licensees may convey the +work under this License, and how to view a copy of this License. If +the interface presents a list of user commands or options, such as a +menu, a prominent item in the list meets this criterion. + + 1. Source Code. + + The "source code" for a work means the preferred form of the work +for making modifications to it. "Object code" means any non-source +form of a work. + + A "Standard Interface" means an interface that either is an official +standard defined by a recognized standards body, or, in the case of +interfaces specified for a particular programming language, one that +is widely used among developers working in that language. + + The "System Libraries" of an executable work include anything, other +than the work as a whole, that (a) is included in the normal form of +packaging a Major Component, but which is not part of that Major +Component, and (b) serves only to enable use of the work with that +Major Component, or to implement a Standard Interface for which an +implementation is available to the public in source code form. A +"Major Component", in this context, means a major essential component +(kernel, window system, and so on) of the specific operating system +(if any) on which the executable work runs, or a compiler used to +produce the work, or an object code interpreter used to run it. + + The "Corresponding Source" for a work in object code form means all +the source code needed to generate, install, and (for an executable +work) run the object code and to modify the work, including scripts to +control those activities. However, it does not include the work's +System Libraries, or general-purpose tools or generally available free +programs which are used unmodified in performing those activities but +which are not part of the work. For example, Corresponding Source +includes interface definition files associated with source files for +the work, and the source code for shared libraries and dynamically +linked subprograms that the work is specifically designed to require, +such as by intimate data communication or control flow between those +subprograms and other parts of the work. + + The Corresponding Source need not include anything that users +can regenerate automatically from other parts of the Corresponding +Source. + + The Corresponding Source for a work in source code form is that +same work. + + 2. Basic Permissions. + + All rights granted under this License are granted for the term of +copyright on the Program, and are irrevocable provided the stated +conditions are met. This License explicitly affirms your unlimited +permission to run the unmodified Program. The output from running a +covered work is covered by this License only if the output, given its +content, constitutes a covered work. This License acknowledges your +rights of fair use or other equivalent, as provided by copyright law. + + You may make, run and propagate covered works that you do not +convey, without conditions so long as your license otherwise remains +in force. You may convey covered works to others for the sole purpose +of having them make modifications exclusively for you, or provide you +with facilities for running those works, provided that you comply with +the terms of this License in conveying all material for which you do +not control copyright. Those thus making or running the covered works +for you must do so exclusively on your behalf, under your direction +and control, on terms that prohibit them from making any copies of +your copyrighted material outside their relationship with you. + + Conveying under any other circumstances is permitted solely under +the conditions stated below. Sublicensing is not allowed; section 10 +makes it unnecessary. + + 3. Protecting Users' Legal Rights From Anti-Circumvention Law. + + No covered work shall be deemed part of an effective technological +measure under any applicable law fulfilling obligations under article +11 of the WIPO copyright treaty adopted on 20 December 1996, or +similar laws prohibiting or restricting circumvention of such +measures. + + When you convey a covered work, you waive any legal power to forbid +circumvention of technological measures to the extent such circumvention +is effected by exercising rights under this License with respect to +the covered work, and you disclaim any intention to limit operation or +modification of the work as a means of enforcing, against the work's +users, your or third parties' legal rights to forbid circumvention of +technological measures. + + 4. Conveying Verbatim Copies. + + You may convey verbatim copies of the Program's source code as you +receive it, in any medium, provided that you conspicuously and +appropriately publish on each copy an appropriate copyright notice; +keep intact all notices stating that this License and any +non-permissive terms added in accord with section 7 apply to the code; +keep intact all notices of the absence of any warranty; and give all +recipients a copy of this License along with the Program. + + You may charge any price or no price for each copy that you convey, +and you may offer support or warranty protection for a fee. + + 5. Conveying Modified Source Versions. + + You may convey a work based on the Program, or the modifications to +produce it from the Program, in the form of source code under the +terms of section 4, provided that you also meet all of these conditions: + + a) The work must carry prominent notices stating that you modified + it, and giving a relevant date. + + b) The work must carry prominent notices stating that it is + released under this License and any conditions added under section + 7. This requirement modifies the requirement in section 4 to + "keep intact all notices". + + c) You must license the entire work, as a whole, under this + License to anyone who comes into possession of a copy. This + License will therefore apply, along with any applicable section 7 + additional terms, to the whole of the work, and all its parts, + regardless of how they are packaged. This License gives no + permission to license the work in any other way, but it does not + invalidate such permission if you have separately received it. + + d) If the work has interactive user interfaces, each must display + Appropriate Legal Notices; however, if the Program has interactive + interfaces that do not display Appropriate Legal Notices, your + work need not make them do so. + + A compilation of a covered work with other separate and independent +works, which are not by their nature extensions of the covered work, +and which are not combined with it such as to form a larger program, +in or on a volume of a storage or distribution medium, is called an +"aggregate" if the compilation and its resulting copyright are not +used to limit the access or legal rights of the compilation's users +beyond what the individual works permit. Inclusion of a covered work +in an aggregate does not cause this License to apply to the other +parts of the aggregate. + + 6. Conveying Non-Source Forms. + + You may convey a covered work in object code form under the terms +of sections 4 and 5, provided that you also convey the +machine-readable Corresponding Source under the terms of this License, +in one of these ways: + + a) Convey the object code in, or embodied in, a physical product + (including a physical distribution medium), accompanied by the + Corresponding Source fixed on a durable physical medium + customarily used for software interchange. + + b) Convey the object code in, or embodied in, a physical product + (including a physical distribution medium), accompanied by a + written offer, valid for at least three years and valid for as + long as you offer spare parts or customer support for that product + model, to give anyone who possesses the object code either (1) a + copy of the Corresponding Source for all the software in the + product that is covered by this License, on a durable physical + medium customarily used for software interchange, for a price no + more than your reasonable cost of physically performing this + conveying of source, or (2) access to copy the + Corresponding Source from a network server at no charge. + + c) Convey individual copies of the object code with a copy of the + written offer to provide the Corresponding Source. This + alternative is allowed only occasionally and noncommercially, and + only if you received the object code with such an offer, in accord + with subsection 6b. + + d) Convey the object code by offering access from a designated + place (gratis or for a charge), and offer equivalent access to the + Corresponding Source in the same way through the same place at no + further charge. You need not require recipients to copy the + Corresponding Source along with the object code. If the place to + copy the object code is a network server, the Corresponding Source + may be on a different server (operated by you or a third party) + that supports equivalent copying facilities, provided you maintain + clear directions next to the object code saying where to find the + Corresponding Source. Regardless of what server hosts the + Corresponding Source, you remain obligated to ensure that it is + available for as long as needed to satisfy these requirements. + + e) Convey the object code using peer-to-peer transmission, provided + you inform other peers where the object code and Corresponding + Source of the work are being offered to the general public at no + charge under subsection 6d. + + A separable portion of the object code, whose source code is excluded +from the Corresponding Source as a System Library, need not be +included in conveying the object code work. + + A "User Product" is either (1) a "consumer product", which means any +tangible personal property which is normally used for personal, family, +or household purposes, or (2) anything designed or sold for incorporation +into a dwelling. In determining whether a product is a consumer product, +doubtful cases shall be resolved in favor of coverage. For a particular +product received by a particular user, "normally used" refers to a +typical or common use of that class of product, regardless of the status +of the particular user or of the way in which the particular user +actually uses, or expects or is expected to use, the product. A product +is a consumer product regardless of whether the product has substantial +commercial, industrial or non-consumer uses, unless such uses represent +the only significant mode of use of the product. + + "Installation Information" for a User Product means any methods, +procedures, authorization keys, or other information required to install +and execute modified versions of a covered work in that User Product from +a modified version of its Corresponding Source. The information must +suffice to ensure that the continued functioning of the modified object +code is in no case prevented or interfered with solely because +modification has been made. + + If you convey an object code work under this section in, or with, or +specifically for use in, a User Product, and the conveying occurs as +part of a transaction in which the right of possession and use of the +User Product is transferred to the recipient in perpetuity or for a +fixed term (regardless of how the transaction is characterized), the +Corresponding Source conveyed under this section must be accompanied +by the Installation Information. But this requirement does not apply +if neither you nor any third party retains the ability to install +modified object code on the User Product (for example, the work has +been installed in ROM). + + The requirement to provide Installation Information does not include a +requirement to continue to provide support service, warranty, or updates +for a work that has been modified or installed by the recipient, or for +the User Product in which it has been modified or installed. Access to a +network may be denied when the modification itself materially and +adversely affects the operation of the network or violates the rules and +protocols for communication across the network. + + Corresponding Source conveyed, and Installation Information provided, +in accord with this section must be in a format that is publicly +documented (and with an implementation available to the public in +source code form), and must require no special password or key for +unpacking, reading or copying. + + 7. Additional Terms. + + "Additional permissions" are terms that supplement the terms of this +License by making exceptions from one or more of its conditions. +Additional permissions that are applicable to the entire Program shall +be treated as though they were included in this License, to the extent +that they are valid under applicable law. If additional permissions +apply only to part of the Program, that part may be used separately +under those permissions, but the entire Program remains governed by +this License without regard to the additional permissions. + + When you convey a copy of a covered work, you may at your option +remove any additional permissions from that copy, or from any part of +it. (Additional permissions may be written to require their own +removal in certain cases when you modify the work.) You may place +additional permissions on material, added by you to a covered work, +for which you have or can give appropriate copyright permission. + + Notwithstanding any other provision of this License, for material you +add to a covered work, you may (if authorized by the copyright holders of +that material) supplement the terms of this License with terms: + + a) Disclaiming warranty or limiting liability differently from the + terms of sections 15 and 16 of this License; or + + b) Requiring preservation of specified reasonable legal notices or + author attributions in that material or in the Appropriate Legal + Notices displayed by works containing it; or + + c) Prohibiting misrepresentation of the origin of that material, or + requiring that modified versions of such material be marked in + reasonable ways as different from the original version; or + + d) Limiting the use for publicity purposes of names of licensors or + authors of the material; or + + e) Declining to grant rights under trademark law for use of some + trade names, trademarks, or service marks; or + + f) Requiring indemnification of licensors and authors of that + material by anyone who conveys the material (or modified versions of + it) with contractual assumptions of liability to the recipient, for + any liability that these contractual assumptions directly impose on + those licensors and authors. + + All other non-permissive additional terms are considered "further +restrictions" within the meaning of section 10. If the Program as you +received it, or any part of it, contains a notice stating that it is +governed by this License along with a term that is a further +restriction, you may remove that term. If a license document contains +a further restriction but permits relicensing or conveying under this +License, you may add to a covered work material governed by the terms +of that license document, provided that the further restriction does +not survive such relicensing or conveying. + + If you add terms to a covered work in accord with this section, you +must place, in the relevant source files, a statement of the +additional terms that apply to those files, or a notice indicating +where to find the applicable terms. + + Additional terms, permissive or non-permissive, may be stated in the +form of a separately written license, or stated as exceptions; +the above requirements apply either way. + + 8. Termination. + + You may not propagate or modify a covered work except as expressly +provided under this License. Any attempt otherwise to propagate or +modify it is void, and will automatically terminate your rights under +this License (including any patent licenses granted under the third +paragraph of section 11). + + However, if you cease all violation of this License, then your +license from a particular copyright holder is reinstated (a) +provisionally, unless and until the copyright holder explicitly and +finally terminates your license, and (b) permanently, if the copyright +holder fails to notify you of the violation by some reasonable means +prior to 60 days after the cessation. + + Moreover, your license from a particular copyright holder is +reinstated permanently if the copyright holder notifies you of the +violation by some reasonable means, this is the first time you have +received notice of violation of this License (for any work) from that +copyright holder, and you cure the violation prior to 30 days after +your receipt of the notice. + + Termination of your rights under this section does not terminate the +licenses of parties who have received copies or rights from you under +this License. If your rights have been terminated and not permanently +reinstated, you do not qualify to receive new licenses for the same +material under section 10. + + 9. Acceptance Not Required for Having Copies. + + You are not required to accept this License in order to receive or +run a copy of the Program. Ancillary propagation of a covered work +occurring solely as a consequence of using peer-to-peer transmission +to receive a copy likewise does not require acceptance. However, +nothing other than this License grants you permission to propagate or +modify any covered work. These actions infringe copyright if you do +not accept this License. Therefore, by modifying or propagating a +covered work, you indicate your acceptance of this License to do so. + + 10. Automatic Licensing of Downstream Recipients. + + Each time you convey a covered work, the recipient automatically +receives a license from the original licensors, to run, modify and +propagate that work, subject to this License. You are not responsible +for enforcing compliance by third parties with this License. + + An "entity transaction" is a transaction transferring control of an +organization, or substantially all assets of one, or subdividing an +organization, or merging organizations. If propagation of a covered +work results from an entity transaction, each party to that +transaction who receives a copy of the work also receives whatever +licenses to the work the party's predecessor in interest had or could +give under the previous paragraph, plus a right to possession of the +Corresponding Source of the work from the predecessor in interest, if +the predecessor has it or can get it with reasonable efforts. + + You may not impose any further restrictions on the exercise of the +rights granted or affirmed under this License. For example, you may +not impose a license fee, royalty, or other charge for exercise of +rights granted under this License, and you may not initiate litigation +(including a cross-claim or counterclaim in a lawsuit) alleging that +any patent claim is infringed by making, using, selling, offering for +sale, or importing the Program or any portion of it. + + 11. Patents. + + A "contributor" is a copyright holder who authorizes use under this +License of the Program or a work on which the Program is based. The +work thus licensed is called the contributor's "contributor version". + + A contributor's "essential patent claims" are all patent claims +owned or controlled by the contributor, whether already acquired or +hereafter acquired, that would be infringed by some manner, permitted +by this License, of making, using, or selling its contributor version, +but do not include claims that would be infringed only as a +consequence of further modification of the contributor version. For +purposes of this definition, "control" includes the right to grant +patent sublicenses in a manner consistent with the requirements of +this License. + + Each contributor grants you a non-exclusive, worldwide, royalty-free +patent license under the contributor's essential patent claims, to +make, use, sell, offer for sale, import and otherwise run, modify and +propagate the contents of its contributor version. + + In the following three paragraphs, a "patent license" is any express +agreement or commitment, however denominated, not to enforce a patent +(such as an express permission to practice a patent or covenant not to +sue for patent infringement). To "grant" such a patent license to a +party means to make such an agreement or commitment not to enforce a +patent against the party. + + If you convey a covered work, knowingly relying on a patent license, +and the Corresponding Source of the work is not available for anyone +to copy, free of charge and under the terms of this License, through a +publicly available network server or other readily accessible means, +then you must either (1) cause the Corresponding Source to be so +available, or (2) arrange to deprive yourself of the benefit of the +patent license for this particular work, or (3) arrange, in a manner +consistent with the requirements of this License, to extend the patent +license to downstream recipients. "Knowingly relying" means you have +actual knowledge that, but for the patent license, your conveying the +covered work in a country, or your recipient's use of the covered work +in a country, would infringe one or more identifiable patents in that +country that you have reason to believe are valid. + + If, pursuant to or in connection with a single transaction or +arrangement, you convey, or propagate by procuring conveyance of, a +covered work, and grant a patent license to some of the parties +receiving the covered work authorizing them to use, propagate, modify +or convey a specific copy of the covered work, then the patent license +you grant is automatically extended to all recipients of the covered +work and works based on it. + + A patent license is "discriminatory" if it does not include within +the scope of its coverage, prohibits the exercise of, or is +conditioned on the non-exercise of one or more of the rights that are +specifically granted under this License. You may not convey a covered +work if you are a party to an arrangement with a third party that is +in the business of distributing software, under which you make payment +to the third party based on the extent of your activity of conveying +the work, and under which the third party grants, to any of the +parties who would receive the covered work from you, a discriminatory +patent license (a) in connection with copies of the covered work +conveyed by you (or copies made from those copies), or (b) primarily +for and in connection with specific products or compilations that +contain the covered work, unless you entered into that arrangement, +or that patent license was granted, prior to 28 March 2007. + + Nothing in this License shall be construed as excluding or limiting +any implied license or other defenses to infringement that may +otherwise be available to you under applicable patent law. + + 12. No Surrender of Others' Freedom. + + If conditions are imposed on you (whether by court order, agreement or +otherwise) that contradict the conditions of this License, they do not +excuse you from the conditions of this License. If you cannot convey a +covered work so as to satisfy simultaneously your obligations under this +License and any other pertinent obligations, then as a consequence you may +not convey it at all. For example, if you agree to terms that obligate you +to collect a royalty for further conveying from those to whom you convey +the Program, the only way you could satisfy both those terms and this +License would be to refrain entirely from conveying the Program. + + 13. Use with the GNU Affero General Public License. + + Notwithstanding any other provision of this License, you have +permission to link or combine any covered work with a work licensed +under version 3 of the GNU Affero General Public License into a single +combined work, and to convey the resulting work. The terms of this +License will continue to apply to the part which is the covered work, +but the special requirements of the GNU Affero General Public License, +section 13, concerning interaction through a network will apply to the +combination as such. + + 14. Revised Versions of this License. + + The Free Software Foundation may publish revised and/or new versions of +the GNU General Public License from time to time. Such new versions will +be similar in spirit to the present version, but may differ in detail to +address new problems or concerns. + + Each version is given a distinguishing version number. If the +Program specifies that a certain numbered version of the GNU General +Public License "or any later version" applies to it, you have the +option of following the terms and conditions either of that numbered +version or of any later version published by the Free Software +Foundation. If the Program does not specify a version number of the +GNU General Public License, you may choose any version ever published +by the Free Software Foundation. + + If the Program specifies that a proxy can decide which future +versions of the GNU General Public License can be used, that proxy's +public statement of acceptance of a version permanently authorizes you +to choose that version for the Program. + + Later license versions may give you additional or different +permissions. However, no additional obligations are imposed on any +author or copyright holder as a result of your choosing to follow a +later version. + + 15. Disclaimer of Warranty. + + THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY +APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT +HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY +OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, +THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR +PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM +IS WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF +ALL NECESSARY SERVICING, REPAIR OR CORRECTION. + + 16. Limitation of Liability. + + IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING +WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS +THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY +GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE +USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF +DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD +PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS), +EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF +SUCH DAMAGES. + + 17. Interpretation of Sections 15 and 16. + + If the disclaimer of warranty and limitation of liability provided +above cannot be given local legal effect according to their terms, +reviewing courts shall apply local law that most closely approximates +an absolute waiver of all civil liability in connection with the +Program, unless a warranty or assumption of liability accompanies a +copy of the Program in return for a fee. + + END OF TERMS AND CONDITIONS + + How to Apply These Terms to Your New Programs + + If you develop a new program, and you want it to be of the greatest +possible use to the public, the best way to achieve this is to make it +free software which everyone can redistribute and change under these terms. + + To do so, attach the following notices to the program. It is safest +to attach them to the start of each source file to most effectively +state the exclusion of warranty; and each file should have at least +the "copyright" line and a pointer to where the full notice is found. + + + Copyright (C) + + This program is free software: you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program. If not, see . + +Also add information on how to contact you by electronic and paper mail. + + If the program does terminal interaction, make it output a short +notice like this when it starts in an interactive mode: + + Copyright (C) + This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'. + This is free software, and you are welcome to redistribute it + under certain conditions; type `show c' for details. + +The hypothetical commands `show w' and `show c' should show the appropriate +parts of the General Public License. Of course, your program's commands +might be different; for a GUI interface, you would use an "about box". + + You should also get your employer (if you work as a programmer) or school, +if any, to sign a "copyright disclaimer" for the program, if necessary. +For more information on this, and how to apply and follow the GNU GPL, see +. + + The GNU General Public License does not permit incorporating your program +into proprietary programs. If your program is a subroutine library, you +may consider it more useful to permit linking proprietary applications with +the library. If this is what you want to do, use the GNU Lesser General +Public License instead of this License. But first, please read +. Index: boot/grub/arm64-efi/README =================================================================== --- boot/grub/arm64-efi/README (revision de9e28e0c0b35a214dcdc3688dc8579f50c5fbd6) +++ boot/grub/arm64-efi/README (revision de9e28e0c0b35a214dcdc3688dc8579f50c5fbd6) @@ -0,0 +1,9 @@ +The binary files of GRUB boot loader in this directory have been created +by compiling GRUB for the 'arm64-efi' target and then using the grub-mkrescue +script to create the El Torito boot image. + +For licensing terms of GRUB boot loader see the file COPYING contained +in this directory. Full version of GRUB, including its source code, +can be downloaded from GRUB's project page: + +http://www.gnu.org/software/grub/ Index: boot/grub/arm64-efi/REVISION =================================================================== --- boot/grub/arm64-efi/REVISION (revision de9e28e0c0b35a214dcdc3688dc8579f50c5fbd6) +++ boot/grub/arm64-efi/REVISION (revision de9e28e0c0b35a214dcdc3688dc8579f50c5fbd6) @@ -0,0 +1,1 @@ +bc220962e366b1b46769ed6f9fa5be603ba58ab5 Index: boot/grub/arm64-efi/arm64-efi/command.lst =================================================================== --- boot/grub/arm64-efi/arm64-efi/command.lst (revision de9e28e0c0b35a214dcdc3688dc8579f50c5fbd6) +++ boot/grub/arm64-efi/arm64-efi/command.lst (revision de9e28e0c0b35a214dcdc3688dc8579f50c5fbd6) @@ -0,0 +1,133 @@ +*acpi: acpi +*all_functional_test: functional_test +*background_image: gfxterm_background +*cat: cat +*crc: hashsum +*cryptomount: cryptodisk +*echo: echo +*extract_syslinux_entries_configfile: syslinuxcfg +*extract_syslinux_entries_source: syslinuxcfg +*file: file +*functional_test: functional_test +*gettext: gettext +*hashsum: hashsum +*hello: hello +*help: help +*hexdump: hexdump +*keystatus: keystatus +*list_env: loadenv +*load_env: loadenv +*loopback: loopback +*ls: ls +*lsacpi: lsacpi +*md5sum: hashsum +*menuentry: normal +*probe: probe +*read_byte: memrw +*read_dword: memrw +*read_word: memrw +*regexp: regexp +*save_env: loadenv +*search: search +*serial: serial +*sha1sum: hashsum +*sha256sum: hashsum +*sha512sum: hashsum +*sleep: sleep +*submenu: normal +*syslinux_configfile: syslinuxcfg +*syslinux_source: syslinuxcfg +*terminfo: terminfo +*test_blockarg: test_blockarg +*testspeed: testspeed +*tr: tr +*trust: verify +*verify_detached: verify +*zfskey: zfscrypt +.: configfile +[: test +authenticate: normal +background_color: gfxterm_background +badram: mmap +blocklist: blocklist +boot: boot +break: normal +cat: minicmd +chainloader: chain +clear: normal +cmp: cmp +configfile: configfile +continue: normal +cutmem: mmap +date: date +devicetree: fdt +distrust: verify +dump: minicmd +eval: eval +exit: minicmd +export: normal +extract_entries_configfile: configfile +extract_entries_source: configfile +false: true +fwsetup: efifwsetup +gptsync: gptsync +halt: halt +help: minicmd +initrd: linux +linux: linux +list_trusted: verify +loadfont: font +lsefi: lsefi +lsefimmap: lsefimmap +lsefisystab: lsefisystab +lsfonts: font +lsmmap: lsmmap +lsmod: minicmd +lssal: lssal +macppcbless: macbless +mactelbless: macbless +net_add_addr: net +net_add_dns: net +net_add_route: net +net_bootp: net +net_del_addr: net +net_del_dns: net +net_del_route: net +net_get_dhcp_option: net +net_ipv6_autoconf: net +net_ls_addr: net +net_ls_cards: net +net_ls_dns: net +net_ls_routes: net +net_nslookup: net +normal: normal +normal_exit: normal +parttool: parttool +password: password +password_pbkdf2: password_pbkdf2 +read: read +reboot: reboot +return: normal +rmmod: minicmd +search.file: search_fs_file +search.fs_label: search_label +search.fs_uuid: search_fs_uuid +setparams: normal +shift: normal +source: configfile +terminal_input: terminal +terminal_output: terminal +test: test +testload: testload +time: time +true: true +videoinfo: videoinfo +videotest: videotest +write_byte: memrw +write_dword: memrw +write_word: memrw +xen_hypervisor: xen_boot +xen_module: xen_boot +xnu_uuid: xnu_uuid +zfs-bootfs: zfsinfo +zfsinfo: zfsinfo Index: boot/grub/arm64-efi/arm64-efi/crypto.lst =================================================================== --- boot/grub/arm64-efi/arm64-efi/crypto.lst (revision de9e28e0c0b35a214dcdc3688dc8579f50c5fbd6) +++ boot/grub/arm64-efi/arm64-efi/crypto.lst (revision de9e28e0c0b35a214dcdc3688dc8579f50c5fbd6) @@ -0,0 +1,45 @@ +RIJNDAEL: gcry_rijndael +RIJNDAEL192: gcry_rijndael +RIJNDAEL256: gcry_rijndael +AES128: gcry_rijndael +AES-128: gcry_rijndael +AES-192: gcry_rijndael +AES-256: gcry_rijndael +ADLER32: adler32 +CRC64: crc64 +ARCFOUR: gcry_arcfour +BLOWFISH: gcry_blowfish +CAMELLIA128: gcry_camellia +CAMELLIA192: gcry_camellia +CAMELLIA256: gcry_camellia +CAST5: gcry_cast5 +CRC32: gcry_crc +CRC32RFC1510: gcry_crc +CRC24RFC2440: gcry_crc +DES: gcry_des +3DES: gcry_des +DSA: gcry_dsa +IDEA: gcry_idea +MD4: gcry_md4 +MD5: gcry_md5 +RFC2268_40: gcry_rfc2268 +AES: gcry_rijndael +AES192: gcry_rijndael +AES256: gcry_rijndael +RIPEMD160: gcry_rmd160 +RSA: gcry_rsa +SEED: gcry_seed +SERPENT128: gcry_serpent +SERPENT192: gcry_serpent +SERPENT256: gcry_serpent +SHA1: gcry_sha1 +SHA224: gcry_sha256 +SHA256: gcry_sha256 +SHA512: gcry_sha512 +SHA384: gcry_sha512 +TIGER192: gcry_tiger +TIGER: gcry_tiger +TIGER2: gcry_tiger +TWOFISH: gcry_twofish +TWOFISH128: gcry_twofish +WHIRLPOOL: gcry_whirlpool Index: boot/grub/arm64-efi/arm64-efi/fs.lst =================================================================== --- boot/grub/arm64-efi/arm64-efi/fs.lst (revision de9e28e0c0b35a214dcdc3688dc8579f50c5fbd6) +++ boot/grub/arm64-efi/arm64-efi/fs.lst (revision de9e28e0c0b35a214dcdc3688dc8579f50c5fbd6) @@ -0,0 +1,36 @@ +affs +afs +bfs +btrfs +cbfs +cpio +cpio_be +exfat +ext2 +fat +hfs +hfsplus +iso9660 +jfs +minix +minix2 +minix2_be +minix3 +minix3_be +minix_be +newc +nilfs2 +ntfs +odc +procfs +reiserfs +romfs +sfs +squash4 +tar +udf +ufs1 +ufs1_be +ufs2 +xfs +zfs Index: boot/grub/arm64-efi/arm64-efi/gdb_grub =================================================================== --- boot/grub/arm64-efi/arm64-efi/gdb_grub (revision de9e28e0c0b35a214dcdc3688dc8579f50c5fbd6) +++ boot/grub/arm64-efi/arm64-efi/gdb_grub (revision de9e28e0c0b35a214dcdc3688dc8579f50c5fbd6) @@ -0,0 +1,85 @@ +### +### Load debuging information about GNU GRUB 2 modules into GDB +### automatically. Needs readelf, Perl and gmodule.pl script +### +### Has to be launched from the writable and trusted +### directory containing *.image and *.module +### +### $Id: .gdbinit,v 1.1 2006/05/14 11:38:08 lkundrak Exp $ +### Lubomir Kundrak +### + +# Add section numbers and addresses to .segments.tmp +define dump_module_sections + set $mod = $arg0 + + # FIXME: save logging status + set logging file .segments.tmp + set logging redirect on + set logging overwrite off + set logging on + + printf "%s", $mod->name + set $segment = $mod->segment + while ($segment) + printf " %i 0x%lx", $segment->section, $segment->addr + set $segment = $segment->next + end + printf "\n" + + set logging off + # FIXME: restore logging status +end +document dump_module_sections + Gather information about module whose mod structure was + given for use with match_and_load_symbols +end + +# Generate and execute GDB commands and delete temporary files +# afterwards +define match_and_load_symbols + shell perl gmodule.pl <.segments.tmp >.loadsym.gdb + source .loadsym.gdb + shell rm -f .segments.tmp .loadsym.gdb +end +document match_and_load_symbols + Launch script, that matches section names with information + generated by dump_module_sections and load debugging info + apropriately +end + +### + +define load_module + dump_module_sections $arg0 + match_and_load_symbols +end +document load_module + Load debugging information for module given as argument. +end + +define load_all_modules + set $this = grub_dl_head + while ($this != 0) + dump_module_sections $this + set $this = $this->next + end + match_and_load_symbols +end +document load_all_modules + Load debugging information for all loaded modules. +end + +### + +set confirm off +file kernel.exec +target remote :1234 + +# inform when module is loaded +break grub_dl_add +commands + silent + load_module mod + cont +end Index: boot/grub/arm64-efi/arm64-efi/gmodule.pl =================================================================== --- boot/grub/arm64-efi/arm64-efi/gmodule.pl (revision de9e28e0c0b35a214dcdc3688dc8579f50c5fbd6) +++ boot/grub/arm64-efi/arm64-efi/gmodule.pl (revision de9e28e0c0b35a214dcdc3688dc8579f50c5fbd6) @@ -0,0 +1,30 @@ +### +### Generate GDB commands, that load symbols for specified module, +### with proper section relocations. See .gdbinit +### +### $Id: gmodule.pl,v 1.2 2006/05/14 11:38:42 lkundrak Exp lkundrak $ +### Lubomir Kundrak +### + +use strict; + +while (<>) { + my ($name, %sections) = split; + + print "add-symbol-file $name.module"; + + open (READELF, "readelf -S $name.mod |") or die; + while () { + /\[\s*(\d+)\]\s+(\.\S+)/ or next; + + if ($2 eq '.text') { + print " $sections{$1}"; + next; + } + + print " -s $2 $sections{$1}" + if ($sections{$1} ne '0x0' and $sections{$1} ne ''); + }; + close (READELF); + print "\n"; +} Index: boot/grub/arm64-efi/arm64-efi/moddep.lst =================================================================== --- boot/grub/arm64-efi/arm64-efi/moddep.lst (revision de9e28e0c0b35a214dcdc3688dc8579f50c5fbd6) +++ boot/grub/arm64-efi/arm64-efi/moddep.lst (revision de9e28e0c0b35a214dcdc3688dc8579f50c5fbd6) @@ -0,0 +1,210 @@ +videotest: font video gfxmenu +odc: archelp +loopback: extcmd +macho: +gcry_des: crypto +memrw: extcmd +terminfo: extcmd +part_gpt: +romfs: fshelp +read: +lsefimmap: +gcry_arcfour: crypto +tftp: net priority_queue +newc: archelp +minix2_be: +elf: +videotest_checksum: font functional_test video_fb +password_pbkdf2: crypto gcry_sha512 pbkdf2 normal +gcry_seed: crypto +sfs: fshelp +reiserfs: fshelp +part_sunpc: +gfxmenu: video_colors trig bitmap_scale gfxterm font normal video bitmap +jfs: +help: extcmd normal +configfile: normal +gfxterm_menu: font functional_test procfs normal video_fb +gcry_idea: crypto +tr: extcmd +shift_test: functional_test +afs: fshelp +xzio: crypto +syslinuxcfg: extcmd normal +search_fs_file: +test_blockarg: extcmd normal +xen_boot: linux boot fdt +true: +affs: fshelp +iso9660: fshelp +exfat: fshelp +setjmp_test: functional_test setjmp +gfxterm: font video +fdt: +efinet: net +disk: +xfs: fshelp +testspeed: extcmd normal +cpio_be: archelp +functional_test: btrfs extcmd video video_fb +bswap_test: functional_test +sleep: extcmd normal +memdisk: +gcry_rijndael: crypto +mdraid09_be: diskfilter +gettext: +gcry_sha1: crypto +hfspluscomp: gzio hfsplus +cmp: +offsetio: +file: macho elf extcmd offsetio +video_colors: +hashsum: crypto extcmd normal +halt: +gfxterm_background: video_colors bitmap_scale gfxterm extcmd video bitmap +search_fs_uuid: +gcry_dsa: verify mpi +keystatus: extcmd +linux: boot fdt +geli: cryptodisk crypto gcry_sha512 pbkdf2 gcry_sha256 +cmdline_cat_test: font functional_test procfs normal video_fb +part_sun: +pbkdf2_test: functional_test pbkdf2 gcry_sha1 +bufio: +bfs: fshelp +gcry_blowfish: crypto +test: +nilfs2: fshelp +gcry_rsa: verify mpi +cryptodisk: crypto extcmd procfs +minicmd: +signature_test: functional_test procfs +udf: fshelp +gzio: +xnu_uuid: gcry_md5 +mul_test: functional_test +adler32: crypto +terminal: +div: +crypto: +part_bsd: part_msdos +gcry_sha512: crypto +password: crypto normal +fshelp: +sleep_test: functional_test datetime +mmap: +exfctest: functional_test +zfsinfo: zfs +ldm: part_gpt diskfilter part_msdos +eval: normal +part_dvh: +lssal: +ext2: fshelp +blocklist: +net: priority_queue bufio datetime boot +part_acorn: +videoinfo: video +btrfs: lzopio gzio +lsmmap: mmap +bitmap: +ntfs: fshelp +gcry_crc: crypto +png: bufio bitmap +jpeg: bufio bitmap +macbless: disk +div_test: functional_test div +regexp: extcmd normal +parttool: normal +cpio: archelp +gcry_rmd160: crypto +fat: fshelp +ufs1_be: +archelp: +raid6rec: diskfilter +http: net +zfs: gzio +lsefisystab: +minix2: +lsacpi: extcmd acpi +datehook: datetime normal +loadenv: disk extcmd +bitmap_scale: bitmap +probe: extcmd +minix3: +tar: archelp +hfs: fshelp +procfs: archelp +boot: +progress: normal +kernel: +acpi: extcmd mmap +tga: bufio bitmap +reboot: +serial: extcmd terminfo +zfscrypt: crypto pbkdf2 zfs extcmd gcry_sha1 gcry_rijndael +dm_nv: diskfilter +cmp_test: functional_test +luks: cryptodisk crypto pbkdf2 +font: bufio video +raid5rec: diskfilter +crc64: crypto +datetime: +efifwsetup: reboot +ctz_test: functional_test +video: +hfsplus: fshelp +gcry_cast5: crypto +extcmd: +squash4: fshelp lzopio xzio gzio +part_plan: +minix_be: +gcry_whirlpool: crypto +gcry_tiger: crypto +search: search_fs_uuid search_fs_file extcmd search_label +video_fb: +verify: crypto extcmd mpi gcry_sha1 +minix3_be: +trig: +msdospart: disk parttool +priority_queue: +gcry_twofish: crypto +part_dfly: +xnu_uuid_test: functional_test +diskfilter: +testload: +part_apple: +hexdump: extcmd +date: datetime normal +pbkdf2: crypto +gcry_sha256: crypto +ls: extcmd normal +ntfscomp: ntfs +lzopio: crypto +hello: extcmd +scsi: +cat: extcmd +normal: terminal crypto bufio extcmd boot gettext +ufs1: +mdraid09: diskfilter +lvm: diskfilter +chain: net efinet boot +cbfs: archelp +ufs2: +time: +gptsync: disk +search_label: +setjmp: +gcry_rfc2268: crypto +mdraid1x: diskfilter +mpi: crypto +part_amiga: +efi_gop: video video_fb +minix: +echo: extcmd +lsefi: +gcry_serpent: crypto +gcry_md4: crypto +gcry_md5: crypto +part_msdos: +gcry_camellia: crypto +all_video: efi_gop Index: boot/grub/arm64-efi/arm64-efi/modinfo.sh =================================================================== --- boot/grub/arm64-efi/arm64-efi/modinfo.sh (revision de9e28e0c0b35a214dcdc3688dc8579f50c5fbd6) +++ boot/grub/arm64-efi/arm64-efi/modinfo.sh (revision de9e28e0c0b35a214dcdc3688dc8579f50c5fbd6) @@ -0,0 +1,40 @@ +#!/bin/sh + +# User-controllable options +grub_modinfo_target_cpu=arm64 +grub_modinfo_platform=efi +grub_disk_cache_stats=0 +grub_boot_time_stats=0 +grub_have_font_source=1 + +# Autodetected config +grub_have_asm_uscore=0 +grub_bss_start_symbol="" +grub_end_symbol="" + +# Build environment +grub_target_cc='aarch64-linux-gnu-gcc' +grub_target_cc_version='aarch64-linux-gnu-gcc (Linaro GCC 6.3-2017.02) 6.3.1 20170109' +grub_target_cflags=' -Os -Wall -W -Wshadow -Wpointer-arith -Wundef -Wchar-subscripts -Wcomment -Wdeprecated-declarations -Wdisabled-optimization -Wdiv-by-zero -Wfloat-equal -Wformat-extra-args -Wformat-security -Wformat-y2k -Wimplicit -Wimplicit-function-declaration -Wimplicit-int -Wmain -Wmissing-braces -Wmissing-format-attribute -Wmultichar -Wparentheses -Wreturn-type -Wsequence-point -Wshadow -Wsign-compare -Wswitch -Wtrigraphs -Wunknown-pragmas -Wunused -Wunused-function -Wunused-label -Wunused-parameter -Wunused-value -Wunused-variable -Wwrite-strings -Wnested-externs -Wstrict-prototypes -g -Wredundant-decls -Wmissing-prototypes -Wmissing-declarations -Wcast-align -Wextra -Wattributes -Wendif-labels -Winit-self -Wint-to-pointer-cast -Winvalid-pch -Wmissing-field-initializers -Wnonnull -Woverflow -Wvla -Wpointer-to-int-cast -Wstrict-aliasing -Wvariadic-macros -Wvolatile-register-var -Wpointer-sign -Wmissing-include-dirs -Wmissing-prototypes -Wmissing-declarations -Wformat=2 -freg-struct-return -mgeneral-regs-only -fno-dwarf2-cfi-asm -fno-asynchronous-unwind-tables -fno-unwind-tables -Qn -fno-stack-protector -Wtrampolines' +grub_target_cppflags=' -Wall -W -DGRUB_MACHINE_EFI=1 -DGRUB_MACHINE=ARM64_EFI -nostdinc -isystem /home/setup/opt/gcc-linaro-6.3.1-2017.02-x86_64_aarch64-linux-gnu/bin/../lib/gcc/aarch64-linux-gnu/6.3.1/include -I$(top_srcdir)/include -I$(top_builddir)/include' +grub_target_ccasflags=' -g -mgeneral-regs-only' +grub_target_ldflags=' -Wl,--build-id=none' +grub_cflags='' +grub_cppflags=' -D_FILE_OFFSET_BITS=64' +grub_ccasflags='' +grub_ldflags='' +grub_target_strip='aarch64-linux-gnu-strip' +grub_target_nm='aarch64-linux-gnu-nm' +grub_target_ranlib='aarch64-linux-gnu-ranlib' +grub_target_objconf='' +grub_target_obj2elf='' +grub_target_img_base_ldopt='-Wl,-Ttext' +grub_target_img_ldflags='@TARGET_IMG_BASE_LDFLAGS@' + +# Version +grub_version="2.02~beta2" +grub_package="grub" +grub_package_string="GRUB 2.02~beta2" +grub_package_version="2.02~beta2" +grub_package_name="GRUB" +grub_package_bugreport="bug-grub@gnu.org" Index: boot/grub/arm64-efi/arm64-efi/partmap.lst =================================================================== --- boot/grub/arm64-efi/arm64-efi/partmap.lst (revision de9e28e0c0b35a214dcdc3688dc8579f50c5fbd6) +++ boot/grub/arm64-efi/arm64-efi/partmap.lst (revision de9e28e0c0b35a214dcdc3688dc8579f50c5fbd6) @@ -0,0 +1,11 @@ +part_acorn +part_amiga +part_apple +part_bsd +part_dfly +part_dvh +part_gpt +part_msdos +part_plan +part_sun +part_sunpc Index: boot/grub/arm64-efi/arm64-efi/parttool.lst =================================================================== --- boot/grub/arm64-efi/arm64-efi/parttool.lst (revision de9e28e0c0b35a214dcdc3688dc8579f50c5fbd6) +++ boot/grub/arm64-efi/arm64-efi/parttool.lst (revision de9e28e0c0b35a214dcdc3688dc8579f50c5fbd6) @@ -0,0 +1,1 @@ +msdos: msdospart Index: boot/grub/arm64-efi/arm64-efi/terminal.lst =================================================================== --- boot/grub/arm64-efi/arm64-efi/terminal.lst (revision de9e28e0c0b35a214dcdc3688dc8579f50c5fbd6) +++ boot/grub/arm64-efi/arm64-efi/terminal.lst (revision de9e28e0c0b35a214dcdc3688dc8579f50c5fbd6) @@ -0,0 +1,3 @@ +iserial_*: serial +ogfxterm: gfxterm +oserial_*: serial Index: boot/grub/arm64-efi/arm64-efi/video.lst =================================================================== --- boot/grub/arm64-efi/arm64-efi/video.lst (revision de9e28e0c0b35a214dcdc3688dc8579f50c5fbd6) +++ boot/grub/arm64-efi/arm64-efi/video.lst (revision de9e28e0c0b35a214dcdc3688dc8579f50c5fbd6) @@ -0,0 +1,1 @@ +efi_gop Index: boot/grub/ia32-efi/COPYING =================================================================== --- boot/grub/ia32-efi/COPYING (revision de9e28e0c0b35a214dcdc3688dc8579f50c5fbd6) +++ boot/grub/ia32-efi/COPYING (revision de9e28e0c0b35a214dcdc3688dc8579f50c5fbd6) @@ -0,0 +1,674 @@ + GNU GENERAL PUBLIC LICENSE + Version 3, 29 June 2007 + + Copyright (C) 2007 Free Software Foundation, Inc. + Everyone is permitted to copy and distribute verbatim copies + of this license document, but changing it is not allowed. + + Preamble + + The GNU General Public License is a free, copyleft license for +software and other kinds of works. + + The licenses for most software and other practical works are designed +to take away your freedom to share and change the works. By contrast, +the GNU General Public License is intended to guarantee your freedom to +share and change all versions of a program--to make sure it remains free +software for all its users. We, the Free Software Foundation, use the +GNU General Public License for most of our software; it applies also to +any other work released this way by its authors. You can apply it to +your programs, too. + + When we speak of free software, we are referring to freedom, not +price. Our General Public Licenses are designed to make sure that you +have the freedom to distribute copies of free software (and charge for +them if you wish), that you receive source code or can get it if you +want it, that you can change the software or use pieces of it in new +free programs, and that you know you can do these things. + + To protect your rights, we need to prevent others from denying you +these rights or asking you to surrender the rights. Therefore, you have +certain responsibilities if you distribute copies of the software, or if +you modify it: responsibilities to respect the freedom of others. + + For example, if you distribute copies of such a program, whether +gratis or for a fee, you must pass on to the recipients the same +freedoms that you received. You must make sure that they, too, receive +or can get the source code. And you must show them these terms so they +know their rights. + + Developers that use the GNU GPL protect your rights with two steps: +(1) assert copyright on the software, and (2) offer you this License +giving you legal permission to copy, distribute and/or modify it. + + For the developers' and authors' protection, the GPL clearly explains +that there is no warranty for this free software. For both users' and +authors' sake, the GPL requires that modified versions be marked as +changed, so that their problems will not be attributed erroneously to +authors of previous versions. + + Some devices are designed to deny users access to install or run +modified versions of the software inside them, although the manufacturer +can do so. This is fundamentally incompatible with the aim of +protecting users' freedom to change the software. The systematic +pattern of such abuse occurs in the area of products for individuals to +use, which is precisely where it is most unacceptable. Therefore, we +have designed this version of the GPL to prohibit the practice for those +products. If such problems arise substantially in other domains, we +stand ready to extend this provision to those domains in future versions +of the GPL, as needed to protect the freedom of users. + + Finally, every program is threatened constantly by software patents. +States should not allow patents to restrict development and use of +software on general-purpose computers, but in those that do, we wish to +avoid the special danger that patents applied to a free program could +make it effectively proprietary. To prevent this, the GPL assures that +patents cannot be used to render the program non-free. + + The precise terms and conditions for copying, distribution and +modification follow. + + TERMS AND CONDITIONS + + 0. Definitions. + + "This License" refers to version 3 of the GNU General Public License. + + "Copyright" also means copyright-like laws that apply to other kinds of +works, such as semiconductor masks. + + "The Program" refers to any copyrightable work licensed under this +License. Each licensee is addressed as "you". "Licensees" and +"recipients" may be individuals or organizations. + + To "modify" a work means to copy from or adapt all or part of the work +in a fashion requiring copyright permission, other than the making of an +exact copy. The resulting work is called a "modified version" of the +earlier work or a work "based on" the earlier work. + + A "covered work" means either the unmodified Program or a work based +on the Program. + + To "propagate" a work means to do anything with it that, without +permission, would make you directly or secondarily liable for +infringement under applicable copyright law, except executing it on a +computer or modifying a private copy. Propagation includes copying, +distribution (with or without modification), making available to the +public, and in some countries other activities as well. + + To "convey" a work means any kind of propagation that enables other +parties to make or receive copies. Mere interaction with a user through +a computer network, with no transfer of a copy, is not conveying. + + An interactive user interface displays "Appropriate Legal Notices" +to the extent that it includes a convenient and prominently visible +feature that (1) displays an appropriate copyright notice, and (2) +tells the user that there is no warranty for the work (except to the +extent that warranties are provided), that licensees may convey the +work under this License, and how to view a copy of this License. If +the interface presents a list of user commands or options, such as a +menu, a prominent item in the list meets this criterion. + + 1. Source Code. + + The "source code" for a work means the preferred form of the work +for making modifications to it. "Object code" means any non-source +form of a work. + + A "Standard Interface" means an interface that either is an official +standard defined by a recognized standards body, or, in the case of +interfaces specified for a particular programming language, one that +is widely used among developers working in that language. + + The "System Libraries" of an executable work include anything, other +than the work as a whole, that (a) is included in the normal form of +packaging a Major Component, but which is not part of that Major +Component, and (b) serves only to enable use of the work with that +Major Component, or to implement a Standard Interface for which an +implementation is available to the public in source code form. A +"Major Component", in this context, means a major essential component +(kernel, window system, and so on) of the specific operating system +(if any) on which the executable work runs, or a compiler used to +produce the work, or an object code interpreter used to run it. + + The "Corresponding Source" for a work in object code form means all +the source code needed to generate, install, and (for an executable +work) run the object code and to modify the work, including scripts to +control those activities. However, it does not include the work's +System Libraries, or general-purpose tools or generally available free +programs which are used unmodified in performing those activities but +which are not part of the work. For example, Corresponding Source +includes interface definition files associated with source files for +the work, and the source code for shared libraries and dynamically +linked subprograms that the work is specifically designed to require, +such as by intimate data communication or control flow between those +subprograms and other parts of the work. + + The Corresponding Source need not include anything that users +can regenerate automatically from other parts of the Corresponding +Source. + + The Corresponding Source for a work in source code form is that +same work. + + 2. Basic Permissions. + + All rights granted under this License are granted for the term of +copyright on the Program, and are irrevocable provided the stated +conditions are met. This License explicitly affirms your unlimited +permission to run the unmodified Program. The output from running a +covered work is covered by this License only if the output, given its +content, constitutes a covered work. This License acknowledges your +rights of fair use or other equivalent, as provided by copyright law. + + You may make, run and propagate covered works that you do not +convey, without conditions so long as your license otherwise remains +in force. You may convey covered works to others for the sole purpose +of having them make modifications exclusively for you, or provide you +with facilities for running those works, provided that you comply with +the terms of this License in conveying all material for which you do +not control copyright. Those thus making or running the covered works +for you must do so exclusively on your behalf, under your direction +and control, on terms that prohibit them from making any copies of +your copyrighted material outside their relationship with you. + + Conveying under any other circumstances is permitted solely under +the conditions stated below. Sublicensing is not allowed; section 10 +makes it unnecessary. + + 3. Protecting Users' Legal Rights From Anti-Circumvention Law. + + No covered work shall be deemed part of an effective technological +measure under any applicable law fulfilling obligations under article +11 of the WIPO copyright treaty adopted on 20 December 1996, or +similar laws prohibiting or restricting circumvention of such +measures. + + When you convey a covered work, you waive any legal power to forbid +circumvention of technological measures to the extent such circumvention +is effected by exercising rights under this License with respect to +the covered work, and you disclaim any intention to limit operation or +modification of the work as a means of enforcing, against the work's +users, your or third parties' legal rights to forbid circumvention of +technological measures. + + 4. Conveying Verbatim Copies. + + You may convey verbatim copies of the Program's source code as you +receive it, in any medium, provided that you conspicuously and +appropriately publish on each copy an appropriate copyright notice; +keep intact all notices stating that this License and any +non-permissive terms added in accord with section 7 apply to the code; +keep intact all notices of the absence of any warranty; and give all +recipients a copy of this License along with the Program. + + You may charge any price or no price for each copy that you convey, +and you may offer support or warranty protection for a fee. + + 5. Conveying Modified Source Versions. + + You may convey a work based on the Program, or the modifications to +produce it from the Program, in the form of source code under the +terms of section 4, provided that you also meet all of these conditions: + + a) The work must carry prominent notices stating that you modified + it, and giving a relevant date. + + b) The work must carry prominent notices stating that it is + released under this License and any conditions added under section + 7. This requirement modifies the requirement in section 4 to + "keep intact all notices". + + c) You must license the entire work, as a whole, under this + License to anyone who comes into possession of a copy. This + License will therefore apply, along with any applicable section 7 + additional terms, to the whole of the work, and all its parts, + regardless of how they are packaged. This License gives no + permission to license the work in any other way, but it does not + invalidate such permission if you have separately received it. + + d) If the work has interactive user interfaces, each must display + Appropriate Legal Notices; however, if the Program has interactive + interfaces that do not display Appropriate Legal Notices, your + work need not make them do so. + + A compilation of a covered work with other separate and independent +works, which are not by their nature extensions of the covered work, +and which are not combined with it such as to form a larger program, +in or on a volume of a storage or distribution medium, is called an +"aggregate" if the compilation and its resulting copyright are not +used to limit the access or legal rights of the compilation's users +beyond what the individual works permit. Inclusion of a covered work +in an aggregate does not cause this License to apply to the other +parts of the aggregate. + + 6. Conveying Non-Source Forms. + + You may convey a covered work in object code form under the terms +of sections 4 and 5, provided that you also convey the +machine-readable Corresponding Source under the terms of this License, +in one of these ways: + + a) Convey the object code in, or embodied in, a physical product + (including a physical distribution medium), accompanied by the + Corresponding Source fixed on a durable physical medium + customarily used for software interchange. + + b) Convey the object code in, or embodied in, a physical product + (including a physical distribution medium), accompanied by a + written offer, valid for at least three years and valid for as + long as you offer spare parts or customer support for that product + model, to give anyone who possesses the object code either (1) a + copy of the Corresponding Source for all the software in the + product that is covered by this License, on a durable physical + medium customarily used for software interchange, for a price no + more than your reasonable cost of physically performing this + conveying of source, or (2) access to copy the + Corresponding Source from a network server at no charge. + + c) Convey individual copies of the object code with a copy of the + written offer to provide the Corresponding Source. This + alternative is allowed only occasionally and noncommercially, and + only if you received the object code with such an offer, in accord + with subsection 6b. + + d) Convey the object code by offering access from a designated + place (gratis or for a charge), and offer equivalent access to the + Corresponding Source in the same way through the same place at no + further charge. You need not require recipients to copy the + Corresponding Source along with the object code. If the place to + copy the object code is a network server, the Corresponding Source + may be on a different server (operated by you or a third party) + that supports equivalent copying facilities, provided you maintain + clear directions next to the object code saying where to find the + Corresponding Source. Regardless of what server hosts the + Corresponding Source, you remain obligated to ensure that it is + available for as long as needed to satisfy these requirements. + + e) Convey the object code using peer-to-peer transmission, provided + you inform other peers where the object code and Corresponding + Source of the work are being offered to the general public at no + charge under subsection 6d. + + A separable portion of the object code, whose source code is excluded +from the Corresponding Source as a System Library, need not be +included in conveying the object code work. + + A "User Product" is either (1) a "consumer product", which means any +tangible personal property which is normally used for personal, family, +or household purposes, or (2) anything designed or sold for incorporation +into a dwelling. In determining whether a product is a consumer product, +doubtful cases shall be resolved in favor of coverage. For a particular +product received by a particular user, "normally used" refers to a +typical or common use of that class of product, regardless of the status +of the particular user or of the way in which the particular user +actually uses, or expects or is expected to use, the product. A product +is a consumer product regardless of whether the product has substantial +commercial, industrial or non-consumer uses, unless such uses represent +the only significant mode of use of the product. + + "Installation Information" for a User Product means any methods, +procedures, authorization keys, or other information required to install +and execute modified versions of a covered work in that User Product from +a modified version of its Corresponding Source. The information must +suffice to ensure that the continued functioning of the modified object +code is in no case prevented or interfered with solely because +modification has been made. + + If you convey an object code work under this section in, or with, or +specifically for use in, a User Product, and the conveying occurs as +part of a transaction in which the right of possession and use of the +User Product is transferred to the recipient in perpetuity or for a +fixed term (regardless of how the transaction is characterized), the +Corresponding Source conveyed under this section must be accompanied +by the Installation Information. But this requirement does not apply +if neither you nor any third party retains the ability to install +modified object code on the User Product (for example, the work has +been installed in ROM). + + The requirement to provide Installation Information does not include a +requirement to continue to provide support service, warranty, or updates +for a work that has been modified or installed by the recipient, or for +the User Product in which it has been modified or installed. Access to a +network may be denied when the modification itself materially and +adversely affects the operation of the network or violates the rules and +protocols for communication across the network. + + Corresponding Source conveyed, and Installation Information provided, +in accord with this section must be in a format that is publicly +documented (and with an implementation available to the public in +source code form), and must require no special password or key for +unpacking, reading or copying. + + 7. Additional Terms. + + "Additional permissions" are terms that supplement the terms of this +License by making exceptions from one or more of its conditions. +Additional permissions that are applicable to the entire Program shall +be treated as though they were included in this License, to the extent +that they are valid under applicable law. If additional permissions +apply only to part of the Program, that part may be used separately +under those permissions, but the entire Program remains governed by +this License without regard to the additional permissions. + + When you convey a copy of a covered work, you may at your option +remove any additional permissions from that copy, or from any part of +it. (Additional permissions may be written to require their own +removal in certain cases when you modify the work.) You may place +additional permissions on material, added by you to a covered work, +for which you have or can give appropriate copyright permission. + + Notwithstanding any other provision of this License, for material you +add to a covered work, you may (if authorized by the copyright holders of +that material) supplement the terms of this License with terms: + + a) Disclaiming warranty or limiting liability differently from the + terms of sections 15 and 16 of this License; or + + b) Requiring preservation of specified reasonable legal notices or + author attributions in that material or in the Appropriate Legal + Notices displayed by works containing it; or + + c) Prohibiting misrepresentation of the origin of that material, or + requiring that modified versions of such material be marked in + reasonable ways as different from the original version; or + + d) Limiting the use for publicity purposes of names of licensors or + authors of the material; or + + e) Declining to grant rights under trademark law for use of some + trade names, trademarks, or service marks; or + + f) Requiring indemnification of licensors and authors of that + material by anyone who conveys the material (or modified versions of + it) with contractual assumptions of liability to the recipient, for + any liability that these contractual assumptions directly impose on + those licensors and authors. + + All other non-permissive additional terms are considered "further +restrictions" within the meaning of section 10. If the Program as you +received it, or any part of it, contains a notice stating that it is +governed by this License along with a term that is a further +restriction, you may remove that term. If a license document contains +a further restriction but permits relicensing or conveying under this +License, you may add to a covered work material governed by the terms +of that license document, provided that the further restriction does +not survive such relicensing or conveying. + + If you add terms to a covered work in accord with this section, you +must place, in the relevant source files, a statement of the +additional terms that apply to those files, or a notice indicating +where to find the applicable terms. + + Additional terms, permissive or non-permissive, may be stated in the +form of a separately written license, or stated as exceptions; +the above requirements apply either way. + + 8. Termination. + + You may not propagate or modify a covered work except as expressly +provided under this License. Any attempt otherwise to propagate or +modify it is void, and will automatically terminate your rights under +this License (including any patent licenses granted under the third +paragraph of section 11). + + However, if you cease all violation of this License, then your +license from a particular copyright holder is reinstated (a) +provisionally, unless and until the copyright holder explicitly and +finally terminates your license, and (b) permanently, if the copyright +holder fails to notify you of the violation by some reasonable means +prior to 60 days after the cessation. + + Moreover, your license from a particular copyright holder is +reinstated permanently if the copyright holder notifies you of the +violation by some reasonable means, this is the first time you have +received notice of violation of this License (for any work) from that +copyright holder, and you cure the violation prior to 30 days after +your receipt of the notice. + + Termination of your rights under this section does not terminate the +licenses of parties who have received copies or rights from you under +this License. If your rights have been terminated and not permanently +reinstated, you do not qualify to receive new licenses for the same +material under section 10. + + 9. Acceptance Not Required for Having Copies. + + You are not required to accept this License in order to receive or +run a copy of the Program. Ancillary propagation of a covered work +occurring solely as a consequence of using peer-to-peer transmission +to receive a copy likewise does not require acceptance. However, +nothing other than this License grants you permission to propagate or +modify any covered work. These actions infringe copyright if you do +not accept this License. Therefore, by modifying or propagating a +covered work, you indicate your acceptance of this License to do so. + + 10. Automatic Licensing of Downstream Recipients. + + Each time you convey a covered work, the recipient automatically +receives a license from the original licensors, to run, modify and +propagate that work, subject to this License. You are not responsible +for enforcing compliance by third parties with this License. + + An "entity transaction" is a transaction transferring control of an +organization, or substantially all assets of one, or subdividing an +organization, or merging organizations. If propagation of a covered +work results from an entity transaction, each party to that +transaction who receives a copy of the work also receives whatever +licenses to the work the party's predecessor in interest had or could +give under the previous paragraph, plus a right to possession of the +Corresponding Source of the work from the predecessor in interest, if +the predecessor has it or can get it with reasonable efforts. + + You may not impose any further restrictions on the exercise of the +rights granted or affirmed under this License. For example, you may +not impose a license fee, royalty, or other charge for exercise of +rights granted under this License, and you may not initiate litigation +(including a cross-claim or counterclaim in a lawsuit) alleging that +any patent claim is infringed by making, using, selling, offering for +sale, or importing the Program or any portion of it. + + 11. Patents. + + A "contributor" is a copyright holder who authorizes use under this +License of the Program or a work on which the Program is based. The +work thus licensed is called the contributor's "contributor version". + + A contributor's "essential patent claims" are all patent claims +owned or controlled by the contributor, whether already acquired or +hereafter acquired, that would be infringed by some manner, permitted +by this License, of making, using, or selling its contributor version, +but do not include claims that would be infringed only as a +consequence of further modification of the contributor version. For +purposes of this definition, "control" includes the right to grant +patent sublicenses in a manner consistent with the requirements of +this License. + + Each contributor grants you a non-exclusive, worldwide, royalty-free +patent license under the contributor's essential patent claims, to +make, use, sell, offer for sale, import and otherwise run, modify and +propagate the contents of its contributor version. + + In the following three paragraphs, a "patent license" is any express +agreement or commitment, however denominated, not to enforce a patent +(such as an express permission to practice a patent or covenant not to +sue for patent infringement). To "grant" such a patent license to a +party means to make such an agreement or commitment not to enforce a +patent against the party. + + If you convey a covered work, knowingly relying on a patent license, +and the Corresponding Source of the work is not available for anyone +to copy, free of charge and under the terms of this License, through a +publicly available network server or other readily accessible means, +then you must either (1) cause the Corresponding Source to be so +available, or (2) arrange to deprive yourself of the benefit of the +patent license for this particular work, or (3) arrange, in a manner +consistent with the requirements of this License, to extend the patent +license to downstream recipients. "Knowingly relying" means you have +actual knowledge that, but for the patent license, your conveying the +covered work in a country, or your recipient's use of the covered work +in a country, would infringe one or more identifiable patents in that +country that you have reason to believe are valid. + + If, pursuant to or in connection with a single transaction or +arrangement, you convey, or propagate by procuring conveyance of, a +covered work, and grant a patent license to some of the parties +receiving the covered work authorizing them to use, propagate, modify +or convey a specific copy of the covered work, then the patent license +you grant is automatically extended to all recipients of the covered +work and works based on it. + + A patent license is "discriminatory" if it does not include within +the scope of its coverage, prohibits the exercise of, or is +conditioned on the non-exercise of one or more of the rights that are +specifically granted under this License. You may not convey a covered +work if you are a party to an arrangement with a third party that is +in the business of distributing software, under which you make payment +to the third party based on the extent of your activity of conveying +the work, and under which the third party grants, to any of the +parties who would receive the covered work from you, a discriminatory +patent license (a) in connection with copies of the covered work +conveyed by you (or copies made from those copies), or (b) primarily +for and in connection with specific products or compilations that +contain the covered work, unless you entered into that arrangement, +or that patent license was granted, prior to 28 March 2007. + + Nothing in this License shall be construed as excluding or limiting +any implied license or other defenses to infringement that may +otherwise be available to you under applicable patent law. + + 12. No Surrender of Others' Freedom. + + If conditions are imposed on you (whether by court order, agreement or +otherwise) that contradict the conditions of this License, they do not +excuse you from the conditions of this License. If you cannot convey a +covered work so as to satisfy simultaneously your obligations under this +License and any other pertinent obligations, then as a consequence you may +not convey it at all. For example, if you agree to terms that obligate you +to collect a royalty for further conveying from those to whom you convey +the Program, the only way you could satisfy both those terms and this +License would be to refrain entirely from conveying the Program. + + 13. Use with the GNU Affero General Public License. + + Notwithstanding any other provision of this License, you have +permission to link or combine any covered work with a work licensed +under version 3 of the GNU Affero General Public License into a single +combined work, and to convey the resulting work. The terms of this +License will continue to apply to the part which is the covered work, +but the special requirements of the GNU Affero General Public License, +section 13, concerning interaction through a network will apply to the +combination as such. + + 14. Revised Versions of this License. + + The Free Software Foundation may publish revised and/or new versions of +the GNU General Public License from time to time. Such new versions will +be similar in spirit to the present version, but may differ in detail to +address new problems or concerns. + + Each version is given a distinguishing version number. If the +Program specifies that a certain numbered version of the GNU General +Public License "or any later version" applies to it, you have the +option of following the terms and conditions either of that numbered +version or of any later version published by the Free Software +Foundation. If the Program does not specify a version number of the +GNU General Public License, you may choose any version ever published +by the Free Software Foundation. + + If the Program specifies that a proxy can decide which future +versions of the GNU General Public License can be used, that proxy's +public statement of acceptance of a version permanently authorizes you +to choose that version for the Program. + + Later license versions may give you additional or different +permissions. However, no additional obligations are imposed on any +author or copyright holder as a result of your choosing to follow a +later version. + + 15. Disclaimer of Warranty. + + THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY +APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT +HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY +OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, +THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR +PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM +IS WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF +ALL NECESSARY SERVICING, REPAIR OR CORRECTION. + + 16. Limitation of Liability. + + IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING +WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS +THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY +GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE +USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF +DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD +PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS), +EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF +SUCH DAMAGES. + + 17. Interpretation of Sections 15 and 16. + + If the disclaimer of warranty and limitation of liability provided +above cannot be given local legal effect according to their terms, +reviewing courts shall apply local law that most closely approximates +an absolute waiver of all civil liability in connection with the +Program, unless a warranty or assumption of liability accompanies a +copy of the Program in return for a fee. + + END OF TERMS AND CONDITIONS + + How to Apply These Terms to Your New Programs + + If you develop a new program, and you want it to be of the greatest +possible use to the public, the best way to achieve this is to make it +free software which everyone can redistribute and change under these terms. + + To do so, attach the following notices to the program. It is safest +to attach them to the start of each source file to most effectively +state the exclusion of warranty; and each file should have at least +the "copyright" line and a pointer to where the full notice is found. + + + Copyright (C) + + This program is free software: you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program. If not, see . + +Also add information on how to contact you by electronic and paper mail. + + If the program does terminal interaction, make it output a short +notice like this when it starts in an interactive mode: + + Copyright (C) + This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'. + This is free software, and you are welcome to redistribute it + under certain conditions; type `show c' for details. + +The hypothetical commands `show w' and `show c' should show the appropriate +parts of the General Public License. Of course, your program's commands +might be different; for a GUI interface, you would use an "about box". + + You should also get your employer (if you work as a programmer) or school, +if any, to sign a "copyright disclaimer" for the program, if necessary. +For more information on this, and how to apply and follow the GNU GPL, see +. + + The GNU General Public License does not permit incorporating your program +into proprietary programs. If your program is a subroutine library, you +may consider it more useful to permit linking proprietary applications with +the library. If this is what you want to do, use the GNU Lesser General +Public License instead of this License. But first, please read +. Index: boot/grub/ia32-efi/README =================================================================== --- boot/grub/ia32-efi/README (revision de9e28e0c0b35a214dcdc3688dc8579f50c5fbd6) +++ boot/grub/ia32-efi/README (revision de9e28e0c0b35a214dcdc3688dc8579f50c5fbd6) @@ -0,0 +1,12 @@ +The binary files of GRUB boot loader in this directory have been created +by compiling GRUB for the 'i386-efi' and 'x86_64-efi' targets. The combined +32bit and 64bit EFI boot floppy image was created by modifying the +i386-grub-mkrescue and x86_64-grub-mkrescue scripts to create EFI payloads +which search for the bootable ISO image with the volume label +'HelenOS boot ISO'. + +For licensing terms of GRUB boot loader see the file COPYING contained +in this directory. Full version of GRUB, including its source code, +can be downloaded from GRUB's project page: + +http://www.gnu.org/software/grub/ Index: boot/grub/ia32-efi/REVISION =================================================================== --- boot/grub/ia32-efi/REVISION (revision de9e28e0c0b35a214dcdc3688dc8579f50c5fbd6) +++ boot/grub/ia32-efi/REVISION (revision de9e28e0c0b35a214dcdc3688dc8579f50c5fbd6) @@ -0,0 +1,1 @@ +bc220962e366b1b46769ed6f9fa5be603ba58ab5 Index: boot/grub/ia32-efi/i386-efi/command.lst =================================================================== --- boot/grub/ia32-efi/i386-efi/command.lst (revision de9e28e0c0b35a214dcdc3688dc8579f50c5fbd6) +++ boot/grub/ia32-efi/i386-efi/command.lst (revision de9e28e0c0b35a214dcdc3688dc8579f50c5fbd6) @@ -0,0 +1,190 @@ +*acpi: acpi +*all_functional_test: functional_test +*background_image: gfxterm_background +*cat: cat +*cpuid: cpuid +*crc: hashsum +*cryptomount: cryptodisk +*echo: echo +*extract_syslinux_entries_configfile: syslinuxcfg +*extract_syslinux_entries_source: syslinuxcfg +*file: file +*functional_test: functional_test +*gettext: gettext +*hashsum: hashsum +*hdparm: hdparm +*hello: hello +*help: help +*hexdump: hexdump +*inb: iorw +*inl: iorw +*inw: iorw +*keystatus: keystatus +*kfreebsd: bsd +*knetbsd: bsd +*kopenbsd: bsd +*list_env: loadenv +*load_env: loadenv +*loopback: loopback +*ls: ls +*lsacpi: lsacpi +*lspci: lspci +*md5sum: hashsum +*menuentry: normal +*pcidump: pcidump +*probe: probe +*read_byte: memrw +*read_dword: memrw +*read_word: memrw +*regexp: regexp +*save_env: loadenv +*search: search +*serial: serial +*setpci: setpci +*sha1sum: hashsum +*sha256sum: hashsum +*sha512sum: hashsum +*sleep: sleep +*submenu: normal +*syslinux_configfile: syslinuxcfg +*syslinux_source: syslinuxcfg +*terminfo: terminfo +*test_blockarg: test_blockarg +*testspeed: testspeed +*tr: tr +*trust: verify +*verify_detached: verify +*xnu_splash: xnu +*zfskey: zfscrypt +.: configfile +[: test +appleloader: appleldr +authenticate: normal +background_color: gfxterm_background +backtrace: backtrace +badram: mmap +blocklist: blocklist +boot: boot +break: normal +cat: minicmd +cbmemc: cbmemc +chainloader: chain +clear: normal +cmp: cmp +configfile: configfile +continue: normal +coreboot_boottime: cbtime +cutmem: mmap +date: date +distrust: verify +dump: minicmd +eval: eval +exit: minicmd +export: normal +extract_entries_configfile: configfile +extract_entries_source: configfile +extract_legacy_entries_configfile: legacycfg +extract_legacy_entries_source: legacycfg +fakebios: loadbios +false: true +fix_video: fixvideo +fwsetup: efifwsetup +gdbstub: gdb +gdbstub_break: gdb +gdbstub_stop: gdb +gptsync: gptsync +halt: halt +help: minicmd +hexdump_random: random +initrd16: linux16 +initrd: linux +keymap: keylayouts +kfreebsd_loadenv: bsd +kfreebsd_module: bsd +kfreebsd_module_elf: bsd +knetbsd_module: bsd +knetbsd_module_elf: bsd +kopenbsd_ramdisk: bsd +legacy_check_password: legacycfg +legacy_configfile: legacycfg +legacy_initrd: legacycfg +legacy_initrd_nounzip: legacycfg +legacy_kernel: legacycfg +legacy_password: legacycfg +legacy_source: legacycfg +linux16: linux16 +linux: linux +list_trusted: verify +loadbios: loadbios +loadfont: font +lscoreboot: cbls +lsefi: lsefi +lsefimmap: lsefimmap +lsefisystab: lsefisystab +lsfonts: font +lsmmap: lsmmap +lsmod: minicmd +lssal: lssal +macppcbless: macbless +mactelbless: macbless +module2: multiboot2 +module: multiboot +multiboot2: multiboot2 +multiboot: multiboot +nativedisk: nativedisk +net_add_addr: net +net_add_dns: net +net_add_route: net +net_bootp: net +net_del_addr: net +net_del_dns: net +net_del_route: net +net_get_dhcp_option: net +net_ipv6_autoconf: net +net_ls_addr: net +net_ls_cards: net +net_ls_dns: net +net_ls_routes: net +net_nslookup: net +normal: normal +normal_exit: normal +outb: iorw +outl: iorw +outw: iorw +parttool: parttool +password: password +password_pbkdf2: password_pbkdf2 +play: play +read: read +reboot: reboot +return: normal +rmmod: minicmd +search.file: search_fs_file +search.fs_label: search_label +search.fs_uuid: search_fs_uuid +setparams: normal +shift: normal +source: configfile +terminal_input: terminal +terminal_output: terminal +test: test +testload: testload +time: time +true: true +usb: usbtest +videoinfo: videoinfo +videotest: videotest +write_byte: memrw +write_dword: memrw +write_word: memrw +xnu_devprop_load: xnu +xnu_kernel64: xnu +xnu_kernel: xnu +xnu_kext: xnu +xnu_kextdir: xnu +xnu_mkext: xnu +xnu_ramdisk: xnu +xnu_resume: xnu +xnu_uuid: xnu_uuid +zfs-bootfs: zfsinfo +zfsinfo: zfsinfo Index: boot/grub/ia32-efi/i386-efi/crypto.lst =================================================================== --- boot/grub/ia32-efi/i386-efi/crypto.lst (revision de9e28e0c0b35a214dcdc3688dc8579f50c5fbd6) +++ boot/grub/ia32-efi/i386-efi/crypto.lst (revision de9e28e0c0b35a214dcdc3688dc8579f50c5fbd6) @@ -0,0 +1,45 @@ +RIJNDAEL: gcry_rijndael +RIJNDAEL192: gcry_rijndael +RIJNDAEL256: gcry_rijndael +AES128: gcry_rijndael +AES-128: gcry_rijndael +AES-192: gcry_rijndael +AES-256: gcry_rijndael +ADLER32: adler32 +CRC64: crc64 +ARCFOUR: gcry_arcfour +BLOWFISH: gcry_blowfish +CAMELLIA128: gcry_camellia +CAMELLIA192: gcry_camellia +CAMELLIA256: gcry_camellia +CAST5: gcry_cast5 +CRC32: gcry_crc +CRC32RFC1510: gcry_crc +CRC24RFC2440: gcry_crc +DES: gcry_des +3DES: gcry_des +DSA: gcry_dsa +IDEA: gcry_idea +MD4: gcry_md4 +MD5: gcry_md5 +RFC2268_40: gcry_rfc2268 +AES: gcry_rijndael +AES192: gcry_rijndael +AES256: gcry_rijndael +RIPEMD160: gcry_rmd160 +RSA: gcry_rsa +SEED: gcry_seed +SERPENT128: gcry_serpent +SERPENT192: gcry_serpent +SERPENT256: gcry_serpent +SHA1: gcry_sha1 +SHA224: gcry_sha256 +SHA256: gcry_sha256 +SHA512: gcry_sha512 +SHA384: gcry_sha512 +TIGER192: gcry_tiger +TIGER: gcry_tiger +TIGER2: gcry_tiger +TWOFISH: gcry_twofish +TWOFISH128: gcry_twofish +WHIRLPOOL: gcry_whirlpool Index: boot/grub/ia32-efi/i386-efi/fs.lst =================================================================== --- boot/grub/ia32-efi/i386-efi/fs.lst (revision de9e28e0c0b35a214dcdc3688dc8579f50c5fbd6) +++ boot/grub/ia32-efi/i386-efi/fs.lst (revision de9e28e0c0b35a214dcdc3688dc8579f50c5fbd6) @@ -0,0 +1,36 @@ +affs +afs +bfs +btrfs +cbfs +cpio +cpio_be +exfat +ext2 +fat +hfs +hfsplus +iso9660 +jfs +minix +minix2 +minix2_be +minix3 +minix3_be +minix_be +newc +nilfs2 +ntfs +odc +procfs +reiserfs +romfs +sfs +squash4 +tar +udf +ufs1 +ufs1_be +ufs2 +xfs +zfs Index: boot/grub/ia32-efi/i386-efi/gdb_grub =================================================================== --- boot/grub/ia32-efi/i386-efi/gdb_grub (revision de9e28e0c0b35a214dcdc3688dc8579f50c5fbd6) +++ boot/grub/ia32-efi/i386-efi/gdb_grub (revision de9e28e0c0b35a214dcdc3688dc8579f50c5fbd6) @@ -0,0 +1,85 @@ +### +### Load debuging information about GNU GRUB 2 modules into GDB +### automatically. Needs readelf, Perl and gmodule.pl script +### +### Has to be launched from the writable and trusted +### directory containing *.image and *.module +### +### $Id: .gdbinit,v 1.1 2006/05/14 11:38:08 lkundrak Exp $ +### Lubomir Kundrak +### + +# Add section numbers and addresses to .segments.tmp +define dump_module_sections + set $mod = $arg0 + + # FIXME: save logging status + set logging file .segments.tmp + set logging redirect on + set logging overwrite off + set logging on + + printf "%s", $mod->name + set $segment = $mod->segment + while ($segment) + printf " %i 0x%lx", $segment->section, $segment->addr + set $segment = $segment->next + end + printf "\n" + + set logging off + # FIXME: restore logging status +end +document dump_module_sections + Gather information about module whose mod structure was + given for use with match_and_load_symbols +end + +# Generate and execute GDB commands and delete temporary files +# afterwards +define match_and_load_symbols + shell perl gmodule.pl <.segments.tmp >.loadsym.gdb + source .loadsym.gdb + shell rm -f .segments.tmp .loadsym.gdb +end +document match_and_load_symbols + Launch script, that matches section names with information + generated by dump_module_sections and load debugging info + apropriately +end + +### + +define load_module + dump_module_sections $arg0 + match_and_load_symbols +end +document load_module + Load debugging information for module given as argument. +end + +define load_all_modules + set $this = grub_dl_head + while ($this != 0) + dump_module_sections $this + set $this = $this->next + end + match_and_load_symbols +end +document load_all_modules + Load debugging information for all loaded modules. +end + +### + +set confirm off +file kernel.exec +target remote :1234 + +# inform when module is loaded +break grub_dl_add +commands + silent + load_module mod + cont +end Index: boot/grub/ia32-efi/i386-efi/gmodule.pl =================================================================== --- boot/grub/ia32-efi/i386-efi/gmodule.pl (revision de9e28e0c0b35a214dcdc3688dc8579f50c5fbd6) +++ boot/grub/ia32-efi/i386-efi/gmodule.pl (revision de9e28e0c0b35a214dcdc3688dc8579f50c5fbd6) @@ -0,0 +1,30 @@ +### +### Generate GDB commands, that load symbols for specified module, +### with proper section relocations. See .gdbinit +### +### $Id: gmodule.pl,v 1.2 2006/05/14 11:38:42 lkundrak Exp lkundrak $ +### Lubomir Kundrak +### + +use strict; + +while (<>) { + my ($name, %sections) = split; + + print "add-symbol-file $name.module"; + + open (READELF, "readelf -S $name.mod |") or die; + while () { + /\[\s*(\d+)\]\s+(\.\S+)/ or next; + + if ($2 eq '.text') { + print " $sections{$1}"; + next; + } + + print " -s $2 $sections{$1}" + if ($sections{$1} ne '0x0' and $sections{$1} ne ''); + }; + close (READELF); + print "\n"; +} Index: boot/grub/ia32-efi/i386-efi/moddep.lst =================================================================== --- boot/grub/ia32-efi/i386-efi/moddep.lst (revision de9e28e0c0b35a214dcdc3688dc8579f50c5fbd6) +++ boot/grub/ia32-efi/i386-efi/moddep.lst (revision de9e28e0c0b35a214dcdc3688dc8579f50c5fbd6) @@ -0,0 +1,257 @@ +videotest: font video gfxmenu +odc: archelp +loopback: extcmd +macho: +gcry_des: crypto +memrw: extcmd +terminfo: extcmd +part_gpt: +romfs: fshelp +read: +lsefimmap: +aout: +gcry_arcfour: crypto +tftp: net priority_queue +newc: archelp +minix2_be: +elf: +videotest_checksum: font functional_test video_fb +password_pbkdf2: crypto gcry_sha512 pbkdf2 normal +gcry_seed: crypto +pcidump: extcmd +bsd: elf serial crypto gcry_md5 extcmd video boot aout cpuid relocator mmap +sfs: fshelp +reiserfs: fshelp +part_sunpc: +gfxmenu: video_colors trig bitmap_scale gfxterm font normal video bitmap +backtrace: +jfs: +help: extcmd normal +configfile: normal +cbls: cbtable +gfxterm_menu: font functional_test procfs normal video_fb +gcry_idea: crypto +tr: extcmd +shift_test: functional_test +ohci: cs5536 usb boot +afs: fshelp +spkmodem: terminfo +usb_keyboard: usb keylayouts +xzio: crypto +syslinuxcfg: extcmd normal +search_fs_file: +usbms: scsi usb +test_blockarg: extcmd normal +true: +affs: fshelp +iso9660: fshelp +exfat: fshelp +setjmp_test: functional_test setjmp +gfxterm: font video +efinet: net +disk: +appleldr: boot +xfs: fshelp +testspeed: extcmd normal +cpio_be: archelp +functional_test: btrfs extcmd video video_fb +bswap_test: functional_test +sleep: extcmd normal +memdisk: +gcry_rijndael: crypto +mdraid09_be: diskfilter +gettext: +gcry_sha1: crypto +hfspluscomp: gzio hfsplus +cmp: +random: hexdump +offsetio: +file: macho elf extcmd offsetio +usbserial_usbdebug: serial usb usbserial_common +video_colors: +morse: +hashsum: crypto extcmd normal +usb: +halt: acpi +gdb: serial backtrace +gfxterm_background: video_colors bitmap_scale gfxterm extcmd video bitmap +search_fs_uuid: +gcry_dsa: verify mpi +keystatus: extcmd +linux: video boot relocator mmap +geli: cryptodisk crypto gcry_sha512 pbkdf2 gcry_sha256 +cmdline_cat_test: font functional_test procfs normal video_fb +part_sun: +cbtable: +pbkdf2_test: functional_test pbkdf2 gcry_sha1 +video_bochs: video video_fb +bufio: +usbserial_ftdi: serial usb usbserial_common +legacy_password_test: functional_test legacycfg +cpuid: extcmd +bfs: fshelp +hdparm: extcmd +gcry_blowfish: crypto +test: +nilfs2: fshelp +gcry_rsa: verify mpi +cryptodisk: crypto extcmd procfs +nativedisk: +minicmd: +signature_test: functional_test procfs +ata: scsi +udf: fshelp +gzio: +xnu_uuid: gcry_md5 +uhci: usb +pata: ata +mul_test: functional_test +adler32: crypto +terminal: +div: +ehci: cs5536 usb boot +crypto: +part_bsd: part_msdos +cs5536: +gcry_sha512: crypto +password: crypto normal +fshelp: +sleep_test: functional_test datetime +iorw: extcmd +xnu: macho bitmap_scale random extcmd video bitmap boot relocator mmap +mmap: +exfctest: functional_test +zfsinfo: zfs +ldm: part_gpt diskfilter part_msdos +eval: normal +part_dvh: +lssal: +ext2: fshelp +blocklist: +net: priority_queue bufio datetime boot +part_acorn: +videoinfo: video +btrfs: lzopio gzio +lsmmap: mmap +bitmap: +ntfs: fshelp +multiboot: net video boot relocator mmap +gcry_crc: crypto +png: bufio bitmap +jpeg: bufio bitmap +macbless: disk +div_test: functional_test div +regexp: extcmd normal +parttool: normal +usbserial_pl2303: serial usb usbserial_common +cpio: archelp +gcry_rmd160: crypto +fat: fshelp +ufs1_be: +archelp: +raid6rec: diskfilter +http: net +zfs: gzio +lsefisystab: +minix2: +lsacpi: extcmd acpi +datehook: datetime normal +loadenv: disk extcmd +bitmap_scale: bitmap +probe: extcmd +minix3: +tar: archelp +loadbios: +hfs: fshelp +procfs: archelp +boot: +keylayouts: +progress: normal +kernel: +usbtest: usb +relocator: mmap +acpi: extcmd mmap +tga: bufio bitmap +reboot: relocator +serial: extcmd terminfo +zfscrypt: crypto pbkdf2 zfs extcmd gcry_sha1 gcry_rijndael +efi_uga: video video_fb +dm_nv: diskfilter +cmp_test: functional_test +luks: cryptodisk crypto pbkdf2 +font: bufio video +raid5rec: diskfilter +crc64: crypto +datetime: +efifwsetup: reboot +ctz_test: functional_test +video: +cbmemc: normal cbtable terminfo +hfsplus: fshelp +gcry_cast5: crypto +extcmd: +squash4: fshelp lzopio xzio gzio +part_plan: +minix_be: +gcry_whirlpool: crypto +gcry_tiger: crypto +fixvideo: +search: search_fs_uuid search_fs_file extcmd search_label +lspci: extcmd +cbtime: cbtable +video_fb: +verify: crypto extcmd mpi gcry_sha1 +minix3_be: +trig: +msdospart: disk parttool +priority_queue: +gcry_twofish: crypto +part_dfly: +xnu_uuid_test: functional_test +diskfilter: +testload: +part_apple: +hexdump: extcmd +date: datetime normal +pbkdf2: crypto +gcry_sha256: crypto +ls: extcmd normal +usbserial_common: serial usb +ntfscomp: ntfs +lzopio: crypto +video_cirrus: video video_fb +hello: extcmd +scsi: +cat: extcmd +ahci: ata boot +normal: terminal crypto bufio extcmd boot gettext +linux16: video boot relocator mmap +ufs1: +mdraid09: diskfilter +lvm: diskfilter +chain: net efinet boot +cbfs: archelp +ufs2: +time: +setpci: extcmd +gptsync: disk +search_label: +setjmp: +multiboot2: net video boot relocator mmap acpi +gcry_rfc2268: crypto +mdraid1x: diskfilter +mpi: crypto +legacycfg: password crypto gcry_md5 normal +play: +part_amiga: +efi_gop: video video_fb +minix: +echo: extcmd +lsefi: +gcry_serpent: crypto +gcry_md4: crypto +gcry_md5: crypto +part_msdos: +gcry_camellia: crypto +at_keyboard: keylayouts boot +all_video: efi_gop efi_uga video_bochs video_cirrus Index: boot/grub/ia32-efi/i386-efi/modinfo.sh =================================================================== --- boot/grub/ia32-efi/i386-efi/modinfo.sh (revision de9e28e0c0b35a214dcdc3688dc8579f50c5fbd6) +++ boot/grub/ia32-efi/i386-efi/modinfo.sh (revision de9e28e0c0b35a214dcdc3688dc8579f50c5fbd6) @@ -0,0 +1,40 @@ +#!/bin/sh + +# User-controllable options +grub_modinfo_target_cpu=i386 +grub_modinfo_platform=efi +grub_disk_cache_stats=0 +grub_boot_time_stats=0 +grub_have_font_source=1 + +# Autodetected config +grub_have_asm_uscore=0 +grub_bss_start_symbol="__bss_start" +grub_end_symbol="end" + +# Build environment +grub_target_cc='gcc' +grub_target_cc_version='gcc (SUSE Linux) 4.8.5' +grub_target_cflags=' -Os -Wall -W -Wshadow -Wpointer-arith -Wundef -Wchar-subscripts -Wcomment -Wdeprecated-declarations -Wdisabled-optimization -Wdiv-by-zero -Wfloat-equal -Wformat-extra-args -Wformat-security -Wformat-y2k -Wimplicit -Wimplicit-function-declaration -Wimplicit-int -Wmain -Wmissing-braces -Wmissing-format-attribute -Wmultichar -Wparentheses -Wreturn-type -Wsequence-point -Wshadow -Wsign-compare -Wswitch -Wtrigraphs -Wunknown-pragmas -Wunused -Wunused-function -Wunused-label -Wunused-parameter -Wunused-value -Wunused-variable -Wwrite-strings -Wnested-externs -Wstrict-prototypes -g -Wredundant-decls -Wmissing-prototypes -Wmissing-declarations -Wextra -Wattributes -Wendif-labels -Winit-self -Wint-to-pointer-cast -Winvalid-pch -Wmissing-field-initializers -Wnonnull -Woverflow -Wvla -Wpointer-to-int-cast -Wstrict-aliasing -Wvariadic-macros -Wvolatile-register-var -Wpointer-sign -Wmissing-include-dirs -Wmissing-prototypes -Wmissing-declarations -Wformat=2 -march=i386 -m32 -falign-jumps=1 -falign-loops=1 -falign-functions=1 -freg-struct-return -mno-mmx -mno-sse -mno-sse2 -mno-sse3 -mno-3dnow -msoft-float -fno-dwarf2-cfi-asm -mno-stack-arg-probe -fno-asynchronous-unwind-tables -fno-unwind-tables -Qn -fno-stack-protector -Wtrampolines -Werror' +grub_target_cppflags=' -Wall -W -DGRUB_MACHINE_EFI=1 -DGRUB_MACHINE=I386_EFI -m32 -nostdinc -isystem /usr/lib64/gcc/x86_64-suse-linux/4.8/include -I$(top_srcdir)/include -I$(top_builddir)/include' +grub_target_ccasflags=' -g -m32 -msoft-float' +grub_target_ldflags=' -m32 -Wl,-melf_i386 -Wl,--build-id=none' +grub_cflags='' +grub_cppflags=' -D_FILE_OFFSET_BITS=64' +grub_ccasflags='' +grub_ldflags='' +grub_target_strip='strip' +grub_target_nm='nm' +grub_target_ranlib='ranlib' +grub_target_objconf='' +grub_target_obj2elf='' +grub_target_img_base_ldopt='-Wl,-Ttext' +grub_target_img_ldflags='@TARGET_IMG_BASE_LDFLAGS@' + +# Version +grub_version="2.02~beta2" +grub_package="grub" +grub_package_string="GRUB 2.02~beta2" +grub_package_version="2.02~beta2" +grub_package_name="GRUB" +grub_package_bugreport="bug-grub@gnu.org" Index: boot/grub/ia32-efi/i386-efi/partmap.lst =================================================================== --- boot/grub/ia32-efi/i386-efi/partmap.lst (revision de9e28e0c0b35a214dcdc3688dc8579f50c5fbd6) +++ boot/grub/ia32-efi/i386-efi/partmap.lst (revision de9e28e0c0b35a214dcdc3688dc8579f50c5fbd6) @@ -0,0 +1,11 @@ +part_acorn +part_amiga +part_apple +part_bsd +part_dfly +part_dvh +part_gpt +part_msdos +part_plan +part_sun +part_sunpc Index: boot/grub/ia32-efi/i386-efi/parttool.lst =================================================================== --- boot/grub/ia32-efi/i386-efi/parttool.lst (revision de9e28e0c0b35a214dcdc3688dc8579f50c5fbd6) +++ boot/grub/ia32-efi/i386-efi/parttool.lst (revision de9e28e0c0b35a214dcdc3688dc8579f50c5fbd6) @@ -0,0 +1,1 @@ +msdos: msdospart Index: boot/grub/ia32-efi/i386-efi/terminal.lst =================================================================== --- boot/grub/ia32-efi/i386-efi/terminal.lst (revision de9e28e0c0b35a214dcdc3688dc8579f50c5fbd6) +++ boot/grub/ia32-efi/i386-efi/terminal.lst (revision de9e28e0c0b35a214dcdc3688dc8579f50c5fbd6) @@ -0,0 +1,9 @@ +iat_keyboard: at_keyboard +iserial: serial +iserial_*: serial +oaudio: morse +ocbmemc: cbmemc +ogfxterm: gfxterm +oserial: serial +oserial_*: serial +ospkmodem: spkmodem Index: boot/grub/ia32-efi/i386-efi/video.lst =================================================================== --- boot/grub/ia32-efi/i386-efi/video.lst (revision de9e28e0c0b35a214dcdc3688dc8579f50c5fbd6) +++ boot/grub/ia32-efi/i386-efi/video.lst (revision de9e28e0c0b35a214dcdc3688dc8579f50c5fbd6) @@ -0,0 +1,4 @@ +efi_gop +efi_uga +video_bochs +video_cirrus Index: boot/grub/ia32-efi/x86_64-efi/command.lst =================================================================== --- boot/grub/ia32-efi/x86_64-efi/command.lst (revision de9e28e0c0b35a214dcdc3688dc8579f50c5fbd6) +++ boot/grub/ia32-efi/x86_64-efi/command.lst (revision de9e28e0c0b35a214dcdc3688dc8579f50c5fbd6) @@ -0,0 +1,187 @@ +*acpi: acpi +*all_functional_test: functional_test +*background_image: gfxterm_background +*cat: cat +*cpuid: cpuid +*crc: hashsum +*cryptomount: cryptodisk +*echo: echo +*extract_syslinux_entries_configfile: syslinuxcfg +*extract_syslinux_entries_source: syslinuxcfg +*file: file +*functional_test: functional_test +*gettext: gettext +*hashsum: hashsum +*hdparm: hdparm +*hello: hello +*help: help +*hexdump: hexdump +*inb: iorw +*inl: iorw +*inw: iorw +*keystatus: keystatus +*kfreebsd: bsd +*knetbsd: bsd +*kopenbsd: bsd +*list_env: loadenv +*load_env: loadenv +*loopback: loopback +*ls: ls +*lsacpi: lsacpi +*lspci: lspci +*md5sum: hashsum +*menuentry: normal +*pcidump: pcidump +*probe: probe +*read_byte: memrw +*read_dword: memrw +*read_word: memrw +*regexp: regexp +*save_env: loadenv +*search: search +*serial: serial +*setpci: setpci +*sha1sum: hashsum +*sha256sum: hashsum +*sha512sum: hashsum +*sleep: sleep +*submenu: normal +*syslinux_configfile: syslinuxcfg +*syslinux_source: syslinuxcfg +*terminfo: terminfo +*test_blockarg: test_blockarg +*testspeed: testspeed +*tr: tr +*trust: verify +*verify_detached: verify +*xnu_splash: xnu +*zfskey: zfscrypt +.: configfile +[: test +appleloader: appleldr +authenticate: normal +background_color: gfxterm_background +backtrace: backtrace +badram: mmap +blocklist: blocklist +boot: boot +break: normal +cat: minicmd +cbmemc: cbmemc +chainloader: chain +clear: normal +cmp: cmp +configfile: configfile +continue: normal +coreboot_boottime: cbtime +cutmem: mmap +date: date +distrust: verify +dump: minicmd +eval: eval +exit: minicmd +export: normal +extract_entries_configfile: configfile +extract_entries_source: configfile +extract_legacy_entries_configfile: legacycfg +extract_legacy_entries_source: legacycfg +fakebios: loadbios +false: true +fix_video: fixvideo +fwsetup: efifwsetup +gptsync: gptsync +halt: halt +help: minicmd +hexdump_random: random +initrd16: linux16 +initrd: linux +keymap: keylayouts +kfreebsd_loadenv: bsd +kfreebsd_module: bsd +kfreebsd_module_elf: bsd +knetbsd_module: bsd +knetbsd_module_elf: bsd +kopenbsd_ramdisk: bsd +legacy_check_password: legacycfg +legacy_configfile: legacycfg +legacy_initrd: legacycfg +legacy_initrd_nounzip: legacycfg +legacy_kernel: legacycfg +legacy_password: legacycfg +legacy_source: legacycfg +linux16: linux16 +linux: linux +list_trusted: verify +loadbios: loadbios +loadfont: font +lscoreboot: cbls +lsefi: lsefi +lsefimmap: lsefimmap +lsefisystab: lsefisystab +lsfonts: font +lsmmap: lsmmap +lsmod: minicmd +lssal: lssal +macppcbless: macbless +mactelbless: macbless +module2: multiboot2 +module: multiboot +multiboot2: multiboot2 +multiboot: multiboot +nativedisk: nativedisk +net_add_addr: net +net_add_dns: net +net_add_route: net +net_bootp: net +net_del_addr: net +net_del_dns: net +net_del_route: net +net_get_dhcp_option: net +net_ipv6_autoconf: net +net_ls_addr: net +net_ls_cards: net +net_ls_dns: net +net_ls_routes: net +net_nslookup: net +normal: normal +normal_exit: normal +outb: iorw +outl: iorw +outw: iorw +parttool: parttool +password: password +password_pbkdf2: password_pbkdf2 +play: play +read: read +reboot: reboot +return: normal +rmmod: minicmd +search.file: search_fs_file +search.fs_label: search_label +search.fs_uuid: search_fs_uuid +setparams: normal +shift: normal +source: configfile +terminal_input: terminal +terminal_output: terminal +test: test +testload: testload +time: time +true: true +usb: usbtest +videoinfo: videoinfo +videotest: videotest +write_byte: memrw +write_dword: memrw +write_word: memrw +xnu_devprop_load: xnu +xnu_kernel64: xnu +xnu_kernel: xnu +xnu_kext: xnu +xnu_kextdir: xnu +xnu_mkext: xnu +xnu_ramdisk: xnu +xnu_resume: xnu +xnu_uuid: xnu_uuid +zfs-bootfs: zfsinfo +zfsinfo: zfsinfo Index: boot/grub/ia32-efi/x86_64-efi/crypto.lst =================================================================== --- boot/grub/ia32-efi/x86_64-efi/crypto.lst (revision de9e28e0c0b35a214dcdc3688dc8579f50c5fbd6) +++ boot/grub/ia32-efi/x86_64-efi/crypto.lst (revision de9e28e0c0b35a214dcdc3688dc8579f50c5fbd6) @@ -0,0 +1,45 @@ +RIJNDAEL: gcry_rijndael +RIJNDAEL192: gcry_rijndael +RIJNDAEL256: gcry_rijndael +AES128: gcry_rijndael +AES-128: gcry_rijndael +AES-192: gcry_rijndael +AES-256: gcry_rijndael +ADLER32: adler32 +CRC64: crc64 +ARCFOUR: gcry_arcfour +BLOWFISH: gcry_blowfish +CAMELLIA128: gcry_camellia +CAMELLIA192: gcry_camellia +CAMELLIA256: gcry_camellia +CAST5: gcry_cast5 +CRC32: gcry_crc +CRC32RFC1510: gcry_crc +CRC24RFC2440: gcry_crc +DES: gcry_des +3DES: gcry_des +DSA: gcry_dsa +IDEA: gcry_idea +MD4: gcry_md4 +MD5: gcry_md5 +RFC2268_40: gcry_rfc2268 +AES: gcry_rijndael +AES192: gcry_rijndael +AES256: gcry_rijndael +RIPEMD160: gcry_rmd160 +RSA: gcry_rsa +SEED: gcry_seed +SERPENT128: gcry_serpent +SERPENT192: gcry_serpent +SERPENT256: gcry_serpent +SHA1: gcry_sha1 +SHA224: gcry_sha256 +SHA256: gcry_sha256 +SHA512: gcry_sha512 +SHA384: gcry_sha512 +TIGER192: gcry_tiger +TIGER: gcry_tiger +TIGER2: gcry_tiger +TWOFISH: gcry_twofish +TWOFISH128: gcry_twofish +WHIRLPOOL: gcry_whirlpool Index: boot/grub/ia32-efi/x86_64-efi/fs.lst =================================================================== --- boot/grub/ia32-efi/x86_64-efi/fs.lst (revision de9e28e0c0b35a214dcdc3688dc8579f50c5fbd6) +++ boot/grub/ia32-efi/x86_64-efi/fs.lst (revision de9e28e0c0b35a214dcdc3688dc8579f50c5fbd6) @@ -0,0 +1,36 @@ +affs +afs +bfs +btrfs +cbfs +cpio +cpio_be +exfat +ext2 +fat +hfs +hfsplus +iso9660 +jfs +minix +minix2 +minix2_be +minix3 +minix3_be +minix_be +newc +nilfs2 +ntfs +odc +procfs +reiserfs +romfs +sfs +squash4 +tar +udf +ufs1 +ufs1_be +ufs2 +xfs +zfs Index: boot/grub/ia32-efi/x86_64-efi/gdb_grub =================================================================== --- boot/grub/ia32-efi/x86_64-efi/gdb_grub (revision de9e28e0c0b35a214dcdc3688dc8579f50c5fbd6) +++ boot/grub/ia32-efi/x86_64-efi/gdb_grub (revision de9e28e0c0b35a214dcdc3688dc8579f50c5fbd6) @@ -0,0 +1,85 @@ +### +### Load debuging information about GNU GRUB 2 modules into GDB +### automatically. Needs readelf, Perl and gmodule.pl script +### +### Has to be launched from the writable and trusted +### directory containing *.image and *.module +### +### $Id: .gdbinit,v 1.1 2006/05/14 11:38:08 lkundrak Exp $ +### Lubomir Kundrak +### + +# Add section numbers and addresses to .segments.tmp +define dump_module_sections + set $mod = $arg0 + + # FIXME: save logging status + set logging file .segments.tmp + set logging redirect on + set logging overwrite off + set logging on + + printf "%s", $mod->name + set $segment = $mod->segment + while ($segment) + printf " %i 0x%lx", $segment->section, $segment->addr + set $segment = $segment->next + end + printf "\n" + + set logging off + # FIXME: restore logging status +end +document dump_module_sections + Gather information about module whose mod structure was + given for use with match_and_load_symbols +end + +# Generate and execute GDB commands and delete temporary files +# afterwards +define match_and_load_symbols + shell perl gmodule.pl <.segments.tmp >.loadsym.gdb + source .loadsym.gdb + shell rm -f .segments.tmp .loadsym.gdb +end +document match_and_load_symbols + Launch script, that matches section names with information + generated by dump_module_sections and load debugging info + apropriately +end + +### + +define load_module + dump_module_sections $arg0 + match_and_load_symbols +end +document load_module + Load debugging information for module given as argument. +end + +define load_all_modules + set $this = grub_dl_head + while ($this != 0) + dump_module_sections $this + set $this = $this->next + end + match_and_load_symbols +end +document load_all_modules + Load debugging information for all loaded modules. +end + +### + +set confirm off +file kernel.exec +target remote :1234 + +# inform when module is loaded +break grub_dl_add +commands + silent + load_module mod + cont +end Index: boot/grub/ia32-efi/x86_64-efi/gmodule.pl =================================================================== --- boot/grub/ia32-efi/x86_64-efi/gmodule.pl (revision de9e28e0c0b35a214dcdc3688dc8579f50c5fbd6) +++ boot/grub/ia32-efi/x86_64-efi/gmodule.pl (revision de9e28e0c0b35a214dcdc3688dc8579f50c5fbd6) @@ -0,0 +1,30 @@ +### +### Generate GDB commands, that load symbols for specified module, +### with proper section relocations. See .gdbinit +### +### $Id: gmodule.pl,v 1.2 2006/05/14 11:38:42 lkundrak Exp lkundrak $ +### Lubomir Kundrak +### + +use strict; + +while (<>) { + my ($name, %sections) = split; + + print "add-symbol-file $name.module"; + + open (READELF, "readelf -S $name.mod |") or die; + while () { + /\[\s*(\d+)\]\s+(\.\S+)/ or next; + + if ($2 eq '.text') { + print " $sections{$1}"; + next; + } + + print " -s $2 $sections{$1}" + if ($sections{$1} ne '0x0' and $sections{$1} ne ''); + }; + close (READELF); + print "\n"; +} Index: boot/grub/ia32-efi/x86_64-efi/moddep.lst =================================================================== --- boot/grub/ia32-efi/x86_64-efi/moddep.lst (revision de9e28e0c0b35a214dcdc3688dc8579f50c5fbd6) +++ boot/grub/ia32-efi/x86_64-efi/moddep.lst (revision de9e28e0c0b35a214dcdc3688dc8579f50c5fbd6) @@ -0,0 +1,256 @@ +videotest: font video gfxmenu +odc: archelp +loopback: extcmd +macho: +gcry_des: crypto +memrw: extcmd +terminfo: extcmd +part_gpt: +romfs: fshelp +read: +lsefimmap: +aout: +gcry_arcfour: crypto +tftp: net priority_queue +newc: archelp +minix2_be: +elf: +videotest_checksum: font functional_test video_fb +password_pbkdf2: crypto gcry_sha512 pbkdf2 normal +gcry_seed: crypto +pcidump: extcmd +bsd: elf serial crypto gcry_md5 extcmd video boot aout cpuid relocator mmap +sfs: fshelp +reiserfs: fshelp +part_sunpc: +gfxmenu: video_colors trig bitmap_scale gfxterm font normal video bitmap +backtrace: +jfs: +help: extcmd normal +configfile: normal +cbls: cbtable +gfxterm_menu: font functional_test procfs normal video_fb +gcry_idea: crypto +tr: extcmd +shift_test: functional_test +ohci: cs5536 usb boot +afs: fshelp +spkmodem: terminfo +usb_keyboard: usb keylayouts +xzio: crypto +syslinuxcfg: extcmd normal +search_fs_file: +usbms: scsi usb +test_blockarg: extcmd normal +true: +affs: fshelp +iso9660: fshelp +exfat: fshelp +setjmp_test: functional_test setjmp +gfxterm: font video +efinet: net +disk: +appleldr: boot +xfs: fshelp +testspeed: extcmd normal +cpio_be: archelp +functional_test: btrfs extcmd video video_fb +bswap_test: functional_test +sleep: extcmd normal +memdisk: +gcry_rijndael: crypto +mdraid09_be: diskfilter +gettext: +gcry_sha1: crypto +hfspluscomp: gzio hfsplus +cmp: +random: hexdump +offsetio: +file: macho elf extcmd offsetio +usbserial_usbdebug: serial usb usbserial_common +video_colors: +morse: +hashsum: crypto extcmd normal +usb: +halt: acpi +gfxterm_background: video_colors bitmap_scale gfxterm extcmd video bitmap +search_fs_uuid: +gcry_dsa: verify mpi +keystatus: extcmd +linux: video boot relocator mmap +geli: cryptodisk crypto gcry_sha512 pbkdf2 gcry_sha256 +cmdline_cat_test: font functional_test procfs normal video_fb +part_sun: +cbtable: +pbkdf2_test: functional_test pbkdf2 gcry_sha1 +video_bochs: video video_fb +bufio: +usbserial_ftdi: serial usb usbserial_common +legacy_password_test: functional_test legacycfg +cpuid: extcmd +bfs: fshelp +hdparm: extcmd +gcry_blowfish: crypto +test: +nilfs2: fshelp +gcry_rsa: verify mpi +cryptodisk: crypto extcmd procfs +nativedisk: +minicmd: +signature_test: functional_test procfs +ata: scsi +udf: fshelp +gzio: +xnu_uuid: gcry_md5 +uhci: usb +pata: ata +mul_test: functional_test +adler32: crypto +terminal: +div: +ehci: cs5536 usb boot +crypto: +part_bsd: part_msdos +cs5536: +gcry_sha512: crypto +password: crypto normal +fshelp: +sleep_test: functional_test datetime +iorw: extcmd +xnu: macho bitmap_scale random extcmd video bitmap boot relocator mmap +mmap: +exfctest: functional_test +zfsinfo: zfs +ldm: part_gpt diskfilter part_msdos +eval: normal +part_dvh: +lssal: +ext2: fshelp +blocklist: +net: priority_queue bufio datetime boot +part_acorn: +videoinfo: video +btrfs: lzopio gzio +lsmmap: mmap +bitmap: +ntfs: fshelp +multiboot: net video boot relocator mmap +gcry_crc: crypto +png: bufio bitmap +jpeg: bufio bitmap +macbless: disk +div_test: functional_test div +regexp: extcmd normal +parttool: normal +usbserial_pl2303: serial usb usbserial_common +cpio: archelp +gcry_rmd160: crypto +fat: fshelp +ufs1_be: +archelp: +raid6rec: diskfilter +http: net +zfs: gzio +lsefisystab: +minix2: +lsacpi: extcmd acpi +datehook: datetime normal +loadenv: disk extcmd +bitmap_scale: bitmap +probe: extcmd +minix3: +tar: archelp +loadbios: +hfs: fshelp +procfs: archelp +boot: +keylayouts: +progress: normal +kernel: +usbtest: usb +relocator: mmap +acpi: extcmd mmap +tga: bufio bitmap +reboot: +serial: extcmd terminfo +zfscrypt: crypto pbkdf2 zfs extcmd gcry_sha1 gcry_rijndael +efi_uga: video video_fb +dm_nv: diskfilter +cmp_test: functional_test +luks: cryptodisk crypto pbkdf2 +font: bufio video +raid5rec: diskfilter +crc64: crypto +datetime: +efifwsetup: reboot +ctz_test: functional_test +video: +cbmemc: normal cbtable terminfo +hfsplus: fshelp +gcry_cast5: crypto +extcmd: +squash4: fshelp lzopio xzio gzio +part_plan: +minix_be: +gcry_whirlpool: crypto +gcry_tiger: crypto +fixvideo: +search: search_fs_uuid search_fs_file extcmd search_label +lspci: extcmd +cbtime: cbtable +video_fb: +verify: crypto extcmd mpi gcry_sha1 +minix3_be: +trig: +msdospart: disk parttool +priority_queue: +gcry_twofish: crypto +part_dfly: +xnu_uuid_test: functional_test +diskfilter: +testload: +part_apple: +hexdump: extcmd +date: datetime normal +pbkdf2: crypto +gcry_sha256: crypto +ls: extcmd normal +usbserial_common: serial usb +ntfscomp: ntfs +lzopio: crypto +video_cirrus: video video_fb +hello: extcmd +scsi: +cat: extcmd +ahci: ata boot +normal: terminal crypto bufio extcmd boot gettext +linux16: video boot relocator mmap +ufs1: +mdraid09: diskfilter +lvm: diskfilter +chain: net efinet boot +cbfs: archelp +ufs2: +time: +setpci: extcmd +gptsync: disk +search_label: +setjmp: +multiboot2: net video boot relocator mmap acpi +gcry_rfc2268: crypto +mdraid1x: diskfilter +mpi: crypto +legacycfg: password crypto gcry_md5 normal +play: +part_amiga: +efi_gop: video video_fb +minix: +echo: extcmd +lsefi: +gcry_serpent: crypto +gcry_md4: crypto +gcry_md5: crypto +part_msdos: +gcry_camellia: crypto +at_keyboard: keylayouts boot +all_video: efi_gop efi_uga video_bochs video_cirrus Index: boot/grub/ia32-efi/x86_64-efi/modinfo.sh =================================================================== --- boot/grub/ia32-efi/x86_64-efi/modinfo.sh (revision de9e28e0c0b35a214dcdc3688dc8579f50c5fbd6) +++ boot/grub/ia32-efi/x86_64-efi/modinfo.sh (revision de9e28e0c0b35a214dcdc3688dc8579f50c5fbd6) @@ -0,0 +1,40 @@ +#!/bin/sh + +# User-controllable options +grub_modinfo_target_cpu=x86_64 +grub_modinfo_platform=efi +grub_disk_cache_stats=0 +grub_boot_time_stats=0 +grub_have_font_source=1 + +# Autodetected config +grub_have_asm_uscore=0 +grub_bss_start_symbol="" +grub_end_symbol="" + +# Build environment +grub_target_cc='gcc' +grub_target_cc_version='gcc (SUSE Linux) 4.8.5' +grub_target_cflags=' -Os -Wall -W -Wshadow -Wpointer-arith -Wundef -Wchar-subscripts -Wcomment -Wdeprecated-declarations -Wdisabled-optimization -Wdiv-by-zero -Wfloat-equal -Wformat-extra-args -Wformat-security -Wformat-y2k -Wimplicit -Wimplicit-function-declaration -Wimplicit-int -Wmain -Wmissing-braces -Wmissing-format-attribute -Wmultichar -Wparentheses -Wreturn-type -Wsequence-point -Wshadow -Wsign-compare -Wswitch -Wtrigraphs -Wunknown-pragmas -Wunused -Wunused-function -Wunused-label -Wunused-parameter -Wunused-value -Wunused-variable -Wwrite-strings -Wnested-externs -Wstrict-prototypes -g -Wredundant-decls -Wmissing-prototypes -Wmissing-declarations -Wextra -Wattributes -Wendif-labels -Winit-self -Wint-to-pointer-cast -Winvalid-pch -Wmissing-field-initializers -Wnonnull -Woverflow -Wvla -Wpointer-to-int-cast -Wstrict-aliasing -Wvariadic-macros -Wvolatile-register-var -Wpointer-sign -Wmissing-include-dirs -Wmissing-prototypes -Wmissing-declarations -Wformat=2 -m64 -freg-struct-return -mno-mmx -mno-sse -mno-sse2 -mno-sse3 -mno-3dnow -msoft-float -fno-dwarf2-cfi-asm -mno-stack-arg-probe -fno-asynchronous-unwind-tables -fno-unwind-tables -mcmodel=large -mno-red-zone -Qn -fno-stack-protector -Wtrampolines -Werror' +grub_target_cppflags=' -Wall -W -DGRUB_MACHINE_EFI=1 -DGRUB_MACHINE=X86_64_EFI -m64 -nostdinc -isystem /usr/lib64/gcc/x86_64-suse-linux/4.8/include -I$(top_srcdir)/include -I$(top_builddir)/include' +grub_target_ccasflags=' -g -m64 -msoft-float' +grub_target_ldflags=' -m64 -Wl,-melf_x86_64 -Wl,--build-id=none' +grub_cflags='' +grub_cppflags=' -D_FILE_OFFSET_BITS=64' +grub_ccasflags='' +grub_ldflags='' +grub_target_strip='strip' +grub_target_nm='nm' +grub_target_ranlib='ranlib' +grub_target_objconf='' +grub_target_obj2elf='' +grub_target_img_base_ldopt='-Wl,-Ttext' +grub_target_img_ldflags='@TARGET_IMG_BASE_LDFLAGS@' + +# Version +grub_version="2.02~beta2" +grub_package="grub" +grub_package_string="GRUB 2.02~beta2" +grub_package_version="2.02~beta2" +grub_package_name="GRUB" +grub_package_bugreport="bug-grub@gnu.org" Index: boot/grub/ia32-efi/x86_64-efi/partmap.lst =================================================================== --- boot/grub/ia32-efi/x86_64-efi/partmap.lst (revision de9e28e0c0b35a214dcdc3688dc8579f50c5fbd6) +++ boot/grub/ia32-efi/x86_64-efi/partmap.lst (revision de9e28e0c0b35a214dcdc3688dc8579f50c5fbd6) @@ -0,0 +1,11 @@ +part_acorn +part_amiga +part_apple +part_bsd +part_dfly +part_dvh +part_gpt +part_msdos +part_plan +part_sun +part_sunpc Index: boot/grub/ia32-efi/x86_64-efi/parttool.lst =================================================================== --- boot/grub/ia32-efi/x86_64-efi/parttool.lst (revision de9e28e0c0b35a214dcdc3688dc8579f50c5fbd6) +++ boot/grub/ia32-efi/x86_64-efi/parttool.lst (revision de9e28e0c0b35a214dcdc3688dc8579f50c5fbd6) @@ -0,0 +1,1 @@ +msdos: msdospart Index: boot/grub/ia32-efi/x86_64-efi/terminal.lst =================================================================== --- boot/grub/ia32-efi/x86_64-efi/terminal.lst (revision de9e28e0c0b35a214dcdc3688dc8579f50c5fbd6) +++ boot/grub/ia32-efi/x86_64-efi/terminal.lst (revision de9e28e0c0b35a214dcdc3688dc8579f50c5fbd6) @@ -0,0 +1,9 @@ +iat_keyboard: at_keyboard +iserial: serial +iserial_*: serial +oaudio: morse +ocbmemc: cbmemc +ogfxterm: gfxterm +oserial: serial +oserial_*: serial +ospkmodem: spkmodem Index: boot/grub/ia32-efi/x86_64-efi/video.lst =================================================================== --- boot/grub/ia32-efi/x86_64-efi/video.lst (revision de9e28e0c0b35a214dcdc3688dc8579f50c5fbd6) +++ boot/grub/ia32-efi/x86_64-efi/video.lst (revision de9e28e0c0b35a214dcdc3688dc8579f50c5fbd6) @@ -0,0 +1,4 @@ +efi_gop +efi_uga +video_bochs +video_cirrus Index: boot/grub/ia32-pc/COPYING =================================================================== --- boot/grub/ia32-pc/COPYING (revision de9e28e0c0b35a214dcdc3688dc8579f50c5fbd6) +++ boot/grub/ia32-pc/COPYING (revision de9e28e0c0b35a214dcdc3688dc8579f50c5fbd6) @@ -0,0 +1,674 @@ + GNU GENERAL PUBLIC LICENSE + Version 3, 29 June 2007 + + Copyright (C) 2007 Free Software Foundation, Inc. + Everyone is permitted to copy and distribute verbatim copies + of this license document, but changing it is not allowed. + + Preamble + + The GNU General Public License is a free, copyleft license for +software and other kinds of works. + + The licenses for most software and other practical works are designed +to take away your freedom to share and change the works. By contrast, +the GNU General Public License is intended to guarantee your freedom to +share and change all versions of a program--to make sure it remains free +software for all its users. We, the Free Software Foundation, use the +GNU General Public License for most of our software; it applies also to +any other work released this way by its authors. You can apply it to +your programs, too. + + When we speak of free software, we are referring to freedom, not +price. Our General Public Licenses are designed to make sure that you +have the freedom to distribute copies of free software (and charge for +them if you wish), that you receive source code or can get it if you +want it, that you can change the software or use pieces of it in new +free programs, and that you know you can do these things. + + To protect your rights, we need to prevent others from denying you +these rights or asking you to surrender the rights. Therefore, you have +certain responsibilities if you distribute copies of the software, or if +you modify it: responsibilities to respect the freedom of others. + + For example, if you distribute copies of such a program, whether +gratis or for a fee, you must pass on to the recipients the same +freedoms that you received. You must make sure that they, too, receive +or can get the source code. And you must show them these terms so they +know their rights. + + Developers that use the GNU GPL protect your rights with two steps: +(1) assert copyright on the software, and (2) offer you this License +giving you legal permission to copy, distribute and/or modify it. + + For the developers' and authors' protection, the GPL clearly explains +that there is no warranty for this free software. For both users' and +authors' sake, the GPL requires that modified versions be marked as +changed, so that their problems will not be attributed erroneously to +authors of previous versions. + + Some devices are designed to deny users access to install or run +modified versions of the software inside them, although the manufacturer +can do so. This is fundamentally incompatible with the aim of +protecting users' freedom to change the software. The systematic +pattern of such abuse occurs in the area of products for individuals to +use, which is precisely where it is most unacceptable. Therefore, we +have designed this version of the GPL to prohibit the practice for those +products. If such problems arise substantially in other domains, we +stand ready to extend this provision to those domains in future versions +of the GPL, as needed to protect the freedom of users. + + Finally, every program is threatened constantly by software patents. +States should not allow patents to restrict development and use of +software on general-purpose computers, but in those that do, we wish to +avoid the special danger that patents applied to a free program could +make it effectively proprietary. To prevent this, the GPL assures that +patents cannot be used to render the program non-free. + + The precise terms and conditions for copying, distribution and +modification follow. + + TERMS AND CONDITIONS + + 0. Definitions. + + "This License" refers to version 3 of the GNU General Public License. + + "Copyright" also means copyright-like laws that apply to other kinds of +works, such as semiconductor masks. + + "The Program" refers to any copyrightable work licensed under this +License. Each licensee is addressed as "you". "Licensees" and +"recipients" may be individuals or organizations. + + To "modify" a work means to copy from or adapt all or part of the work +in a fashion requiring copyright permission, other than the making of an +exact copy. The resulting work is called a "modified version" of the +earlier work or a work "based on" the earlier work. + + A "covered work" means either the unmodified Program or a work based +on the Program. + + To "propagate" a work means to do anything with it that, without +permission, would make you directly or secondarily liable for +infringement under applicable copyright law, except executing it on a +computer or modifying a private copy. Propagation includes copying, +distribution (with or without modification), making available to the +public, and in some countries other activities as well. + + To "convey" a work means any kind of propagation that enables other +parties to make or receive copies. Mere interaction with a user through +a computer network, with no transfer of a copy, is not conveying. + + An interactive user interface displays "Appropriate Legal Notices" +to the extent that it includes a convenient and prominently visible +feature that (1) displays an appropriate copyright notice, and (2) +tells the user that there is no warranty for the work (except to the +extent that warranties are provided), that licensees may convey the +work under this License, and how to view a copy of this License. If +the interface presents a list of user commands or options, such as a +menu, a prominent item in the list meets this criterion. + + 1. Source Code. + + The "source code" for a work means the preferred form of the work +for making modifications to it. "Object code" means any non-source +form of a work. + + A "Standard Interface" means an interface that either is an official +standard defined by a recognized standards body, or, in the case of +interfaces specified for a particular programming language, one that +is widely used among developers working in that language. + + The "System Libraries" of an executable work include anything, other +than the work as a whole, that (a) is included in the normal form of +packaging a Major Component, but which is not part of that Major +Component, and (b) serves only to enable use of the work with that +Major Component, or to implement a Standard Interface for which an +implementation is available to the public in source code form. A +"Major Component", in this context, means a major essential component +(kernel, window system, and so on) of the specific operating system +(if any) on which the executable work runs, or a compiler used to +produce the work, or an object code interpreter used to run it. + + The "Corresponding Source" for a work in object code form means all +the source code needed to generate, install, and (for an executable +work) run the object code and to modify the work, including scripts to +control those activities. However, it does not include the work's +System Libraries, or general-purpose tools or generally available free +programs which are used unmodified in performing those activities but +which are not part of the work. For example, Corresponding Source +includes interface definition files associated with source files for +the work, and the source code for shared libraries and dynamically +linked subprograms that the work is specifically designed to require, +such as by intimate data communication or control flow between those +subprograms and other parts of the work. + + The Corresponding Source need not include anything that users +can regenerate automatically from other parts of the Corresponding +Source. + + The Corresponding Source for a work in source code form is that +same work. + + 2. Basic Permissions. + + All rights granted under this License are granted for the term of +copyright on the Program, and are irrevocable provided the stated +conditions are met. This License explicitly affirms your unlimited +permission to run the unmodified Program. The output from running a +covered work is covered by this License only if the output, given its +content, constitutes a covered work. This License acknowledges your +rights of fair use or other equivalent, as provided by copyright law. + + You may make, run and propagate covered works that you do not +convey, without conditions so long as your license otherwise remains +in force. You may convey covered works to others for the sole purpose +of having them make modifications exclusively for you, or provide you +with facilities for running those works, provided that you comply with +the terms of this License in conveying all material for which you do +not control copyright. Those thus making or running the covered works +for you must do so exclusively on your behalf, under your direction +and control, on terms that prohibit them from making any copies of +your copyrighted material outside their relationship with you. + + Conveying under any other circumstances is permitted solely under +the conditions stated below. Sublicensing is not allowed; section 10 +makes it unnecessary. + + 3. Protecting Users' Legal Rights From Anti-Circumvention Law. + + No covered work shall be deemed part of an effective technological +measure under any applicable law fulfilling obligations under article +11 of the WIPO copyright treaty adopted on 20 December 1996, or +similar laws prohibiting or restricting circumvention of such +measures. + + When you convey a covered work, you waive any legal power to forbid +circumvention of technological measures to the extent such circumvention +is effected by exercising rights under this License with respect to +the covered work, and you disclaim any intention to limit operation or +modification of the work as a means of enforcing, against the work's +users, your or third parties' legal rights to forbid circumvention of +technological measures. + + 4. Conveying Verbatim Copies. + + You may convey verbatim copies of the Program's source code as you +receive it, in any medium, provided that you conspicuously and +appropriately publish on each copy an appropriate copyright notice; +keep intact all notices stating that this License and any +non-permissive terms added in accord with section 7 apply to the code; +keep intact all notices of the absence of any warranty; and give all +recipients a copy of this License along with the Program. + + You may charge any price or no price for each copy that you convey, +and you may offer support or warranty protection for a fee. + + 5. Conveying Modified Source Versions. + + You may convey a work based on the Program, or the modifications to +produce it from the Program, in the form of source code under the +terms of section 4, provided that you also meet all of these conditions: + + a) The work must carry prominent notices stating that you modified + it, and giving a relevant date. + + b) The work must carry prominent notices stating that it is + released under this License and any conditions added under section + 7. This requirement modifies the requirement in section 4 to + "keep intact all notices". + + c) You must license the entire work, as a whole, under this + License to anyone who comes into possession of a copy. This + License will therefore apply, along with any applicable section 7 + additional terms, to the whole of the work, and all its parts, + regardless of how they are packaged. This License gives no + permission to license the work in any other way, but it does not + invalidate such permission if you have separately received it. + + d) If the work has interactive user interfaces, each must display + Appropriate Legal Notices; however, if the Program has interactive + interfaces that do not display Appropriate Legal Notices, your + work need not make them do so. + + A compilation of a covered work with other separate and independent +works, which are not by their nature extensions of the covered work, +and which are not combined with it such as to form a larger program, +in or on a volume of a storage or distribution medium, is called an +"aggregate" if the compilation and its resulting copyright are not +used to limit the access or legal rights of the compilation's users +beyond what the individual works permit. Inclusion of a covered work +in an aggregate does not cause this License to apply to the other +parts of the aggregate. + + 6. Conveying Non-Source Forms. + + You may convey a covered work in object code form under the terms +of sections 4 and 5, provided that you also convey the +machine-readable Corresponding Source under the terms of this License, +in one of these ways: + + a) Convey the object code in, or embodied in, a physical product + (including a physical distribution medium), accompanied by the + Corresponding Source fixed on a durable physical medium + customarily used for software interchange. + + b) Convey the object code in, or embodied in, a physical product + (including a physical distribution medium), accompanied by a + written offer, valid for at least three years and valid for as + long as you offer spare parts or customer support for that product + model, to give anyone who possesses the object code either (1) a + copy of the Corresponding Source for all the software in the + product that is covered by this License, on a durable physical + medium customarily used for software interchange, for a price no + more than your reasonable cost of physically performing this + conveying of source, or (2) access to copy the + Corresponding Source from a network server at no charge. + + c) Convey individual copies of the object code with a copy of the + written offer to provide the Corresponding Source. This + alternative is allowed only occasionally and noncommercially, and + only if you received the object code with such an offer, in accord + with subsection 6b. + + d) Convey the object code by offering access from a designated + place (gratis or for a charge), and offer equivalent access to the + Corresponding Source in the same way through the same place at no + further charge. You need not require recipients to copy the + Corresponding Source along with the object code. If the place to + copy the object code is a network server, the Corresponding Source + may be on a different server (operated by you or a third party) + that supports equivalent copying facilities, provided you maintain + clear directions next to the object code saying where to find the + Corresponding Source. Regardless of what server hosts the + Corresponding Source, you remain obligated to ensure that it is + available for as long as needed to satisfy these requirements. + + e) Convey the object code using peer-to-peer transmission, provided + you inform other peers where the object code and Corresponding + Source of the work are being offered to the general public at no + charge under subsection 6d. + + A separable portion of the object code, whose source code is excluded +from the Corresponding Source as a System Library, need not be +included in conveying the object code work. + + A "User Product" is either (1) a "consumer product", which means any +tangible personal property which is normally used for personal, family, +or household purposes, or (2) anything designed or sold for incorporation +into a dwelling. In determining whether a product is a consumer product, +doubtful cases shall be resolved in favor of coverage. For a particular +product received by a particular user, "normally used" refers to a +typical or common use of that class of product, regardless of the status +of the particular user or of the way in which the particular user +actually uses, or expects or is expected to use, the product. A product +is a consumer product regardless of whether the product has substantial +commercial, industrial or non-consumer uses, unless such uses represent +the only significant mode of use of the product. + + "Installation Information" for a User Product means any methods, +procedures, authorization keys, or other information required to install +and execute modified versions of a covered work in that User Product from +a modified version of its Corresponding Source. The information must +suffice to ensure that the continued functioning of the modified object +code is in no case prevented or interfered with solely because +modification has been made. + + If you convey an object code work under this section in, or with, or +specifically for use in, a User Product, and the conveying occurs as +part of a transaction in which the right of possession and use of the +User Product is transferred to the recipient in perpetuity or for a +fixed term (regardless of how the transaction is characterized), the +Corresponding Source conveyed under this section must be accompanied +by the Installation Information. But this requirement does not apply +if neither you nor any third party retains the ability to install +modified object code on the User Product (for example, the work has +been installed in ROM). + + The requirement to provide Installation Information does not include a +requirement to continue to provide support service, warranty, or updates +for a work that has been modified or installed by the recipient, or for +the User Product in which it has been modified or installed. Access to a +network may be denied when the modification itself materially and +adversely affects the operation of the network or violates the rules and +protocols for communication across the network. + + Corresponding Source conveyed, and Installation Information provided, +in accord with this section must be in a format that is publicly +documented (and with an implementation available to the public in +source code form), and must require no special password or key for +unpacking, reading or copying. + + 7. Additional Terms. + + "Additional permissions" are terms that supplement the terms of this +License by making exceptions from one or more of its conditions. +Additional permissions that are applicable to the entire Program shall +be treated as though they were included in this License, to the extent +that they are valid under applicable law. If additional permissions +apply only to part of the Program, that part may be used separately +under those permissions, but the entire Program remains governed by +this License without regard to the additional permissions. + + When you convey a copy of a covered work, you may at your option +remove any additional permissions from that copy, or from any part of +it. (Additional permissions may be written to require their own +removal in certain cases when you modify the work.) You may place +additional permissions on material, added by you to a covered work, +for which you have or can give appropriate copyright permission. + + Notwithstanding any other provision of this License, for material you +add to a covered work, you may (if authorized by the copyright holders of +that material) supplement the terms of this License with terms: + + a) Disclaiming warranty or limiting liability differently from the + terms of sections 15 and 16 of this License; or + + b) Requiring preservation of specified reasonable legal notices or + author attributions in that material or in the Appropriate Legal + Notices displayed by works containing it; or + + c) Prohibiting misrepresentation of the origin of that material, or + requiring that modified versions of such material be marked in + reasonable ways as different from the original version; or + + d) Limiting the use for publicity purposes of names of licensors or + authors of the material; or + + e) Declining to grant rights under trademark law for use of some + trade names, trademarks, or service marks; or + + f) Requiring indemnification of licensors and authors of that + material by anyone who conveys the material (or modified versions of + it) with contractual assumptions of liability to the recipient, for + any liability that these contractual assumptions directly impose on + those licensors and authors. + + All other non-permissive additional terms are considered "further +restrictions" within the meaning of section 10. If the Program as you +received it, or any part of it, contains a notice stating that it is +governed by this License along with a term that is a further +restriction, you may remove that term. If a license document contains +a further restriction but permits relicensing or conveying under this +License, you may add to a covered work material governed by the terms +of that license document, provided that the further restriction does +not survive such relicensing or conveying. + + If you add terms to a covered work in accord with this section, you +must place, in the relevant source files, a statement of the +additional terms that apply to those files, or a notice indicating +where to find the applicable terms. + + Additional terms, permissive or non-permissive, may be stated in the +form of a separately written license, or stated as exceptions; +the above requirements apply either way. + + 8. Termination. + + You may not propagate or modify a covered work except as expressly +provided under this License. Any attempt otherwise to propagate or +modify it is void, and will automatically terminate your rights under +this License (including any patent licenses granted under the third +paragraph of section 11). + + However, if you cease all violation of this License, then your +license from a particular copyright holder is reinstated (a) +provisionally, unless and until the copyright holder explicitly and +finally terminates your license, and (b) permanently, if the copyright +holder fails to notify you of the violation by some reasonable means +prior to 60 days after the cessation. + + Moreover, your license from a particular copyright holder is +reinstated permanently if the copyright holder notifies you of the +violation by some reasonable means, this is the first time you have +received notice of violation of this License (for any work) from that +copyright holder, and you cure the violation prior to 30 days after +your receipt of the notice. + + Termination of your rights under this section does not terminate the +licenses of parties who have received copies or rights from you under +this License. If your rights have been terminated and not permanently +reinstated, you do not qualify to receive new licenses for the same +material under section 10. + + 9. Acceptance Not Required for Having Copies. + + You are not required to accept this License in order to receive or +run a copy of the Program. Ancillary propagation of a covered work +occurring solely as a consequence of using peer-to-peer transmission +to receive a copy likewise does not require acceptance. However, +nothing other than this License grants you permission to propagate or +modify any covered work. These actions infringe copyright if you do +not accept this License. Therefore, by modifying or propagating a +covered work, you indicate your acceptance of this License to do so. + + 10. Automatic Licensing of Downstream Recipients. + + Each time you convey a covered work, the recipient automatically +receives a license from the original licensors, to run, modify and +propagate that work, subject to this License. You are not responsible +for enforcing compliance by third parties with this License. + + An "entity transaction" is a transaction transferring control of an +organization, or substantially all assets of one, or subdividing an +organization, or merging organizations. If propagation of a covered +work results from an entity transaction, each party to that +transaction who receives a copy of the work also receives whatever +licenses to the work the party's predecessor in interest had or could +give under the previous paragraph, plus a right to possession of the +Corresponding Source of the work from the predecessor in interest, if +the predecessor has it or can get it with reasonable efforts. + + You may not impose any further restrictions on the exercise of the +rights granted or affirmed under this License. For example, you may +not impose a license fee, royalty, or other charge for exercise of +rights granted under this License, and you may not initiate litigation +(including a cross-claim or counterclaim in a lawsuit) alleging that +any patent claim is infringed by making, using, selling, offering for +sale, or importing the Program or any portion of it. + + 11. Patents. + + A "contributor" is a copyright holder who authorizes use under this +License of the Program or a work on which the Program is based. The +work thus licensed is called the contributor's "contributor version". + + A contributor's "essential patent claims" are all patent claims +owned or controlled by the contributor, whether already acquired or +hereafter acquired, that would be infringed by some manner, permitted +by this License, of making, using, or selling its contributor version, +but do not include claims that would be infringed only as a +consequence of further modification of the contributor version. For +purposes of this definition, "control" includes the right to grant +patent sublicenses in a manner consistent with the requirements of +this License. + + Each contributor grants you a non-exclusive, worldwide, royalty-free +patent license under the contributor's essential patent claims, to +make, use, sell, offer for sale, import and otherwise run, modify and +propagate the contents of its contributor version. + + In the following three paragraphs, a "patent license" is any express +agreement or commitment, however denominated, not to enforce a patent +(such as an express permission to practice a patent or covenant not to +sue for patent infringement). To "grant" such a patent license to a +party means to make such an agreement or commitment not to enforce a +patent against the party. + + If you convey a covered work, knowingly relying on a patent license, +and the Corresponding Source of the work is not available for anyone +to copy, free of charge and under the terms of this License, through a +publicly available network server or other readily accessible means, +then you must either (1) cause the Corresponding Source to be so +available, or (2) arrange to deprive yourself of the benefit of the +patent license for this particular work, or (3) arrange, in a manner +consistent with the requirements of this License, to extend the patent +license to downstream recipients. "Knowingly relying" means you have +actual knowledge that, but for the patent license, your conveying the +covered work in a country, or your recipient's use of the covered work +in a country, would infringe one or more identifiable patents in that +country that you have reason to believe are valid. + + If, pursuant to or in connection with a single transaction or +arrangement, you convey, or propagate by procuring conveyance of, a +covered work, and grant a patent license to some of the parties +receiving the covered work authorizing them to use, propagate, modify +or convey a specific copy of the covered work, then the patent license +you grant is automatically extended to all recipients of the covered +work and works based on it. + + A patent license is "discriminatory" if it does not include within +the scope of its coverage, prohibits the exercise of, or is +conditioned on the non-exercise of one or more of the rights that are +specifically granted under this License. You may not convey a covered +work if you are a party to an arrangement with a third party that is +in the business of distributing software, under which you make payment +to the third party based on the extent of your activity of conveying +the work, and under which the third party grants, to any of the +parties who would receive the covered work from you, a discriminatory +patent license (a) in connection with copies of the covered work +conveyed by you (or copies made from those copies), or (b) primarily +for and in connection with specific products or compilations that +contain the covered work, unless you entered into that arrangement, +or that patent license was granted, prior to 28 March 2007. + + Nothing in this License shall be construed as excluding or limiting +any implied license or other defenses to infringement that may +otherwise be available to you under applicable patent law. + + 12. No Surrender of Others' Freedom. + + If conditions are imposed on you (whether by court order, agreement or +otherwise) that contradict the conditions of this License, they do not +excuse you from the conditions of this License. If you cannot convey a +covered work so as to satisfy simultaneously your obligations under this +License and any other pertinent obligations, then as a consequence you may +not convey it at all. For example, if you agree to terms that obligate you +to collect a royalty for further conveying from those to whom you convey +the Program, the only way you could satisfy both those terms and this +License would be to refrain entirely from conveying the Program. + + 13. Use with the GNU Affero General Public License. + + Notwithstanding any other provision of this License, you have +permission to link or combine any covered work with a work licensed +under version 3 of the GNU Affero General Public License into a single +combined work, and to convey the resulting work. The terms of this +License will continue to apply to the part which is the covered work, +but the special requirements of the GNU Affero General Public License, +section 13, concerning interaction through a network will apply to the +combination as such. + + 14. Revised Versions of this License. + + The Free Software Foundation may publish revised and/or new versions of +the GNU General Public License from time to time. Such new versions will +be similar in spirit to the present version, but may differ in detail to +address new problems or concerns. + + Each version is given a distinguishing version number. If the +Program specifies that a certain numbered version of the GNU General +Public License "or any later version" applies to it, you have the +option of following the terms and conditions either of that numbered +version or of any later version published by the Free Software +Foundation. If the Program does not specify a version number of the +GNU General Public License, you may choose any version ever published +by the Free Software Foundation. + + If the Program specifies that a proxy can decide which future +versions of the GNU General Public License can be used, that proxy's +public statement of acceptance of a version permanently authorizes you +to choose that version for the Program. + + Later license versions may give you additional or different +permissions. However, no additional obligations are imposed on any +author or copyright holder as a result of your choosing to follow a +later version. + + 15. Disclaimer of Warranty. + + THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY +APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT +HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY +OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, +THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR +PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM +IS WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF +ALL NECESSARY SERVICING, REPAIR OR CORRECTION. + + 16. Limitation of Liability. + + IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING +WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS +THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY +GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE +USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF +DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD +PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS), +EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF +SUCH DAMAGES. + + 17. Interpretation of Sections 15 and 16. + + If the disclaimer of warranty and limitation of liability provided +above cannot be given local legal effect according to their terms, +reviewing courts shall apply local law that most closely approximates +an absolute waiver of all civil liability in connection with the +Program, unless a warranty or assumption of liability accompanies a +copy of the Program in return for a fee. + + END OF TERMS AND CONDITIONS + + How to Apply These Terms to Your New Programs + + If you develop a new program, and you want it to be of the greatest +possible use to the public, the best way to achieve this is to make it +free software which everyone can redistribute and change under these terms. + + To do so, attach the following notices to the program. It is safest +to attach them to the start of each source file to most effectively +state the exclusion of warranty; and each file should have at least +the "copyright" line and a pointer to where the full notice is found. + + + Copyright (C) + + This program is free software: you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program. If not, see . + +Also add information on how to contact you by electronic and paper mail. + + If the program does terminal interaction, make it output a short +notice like this when it starts in an interactive mode: + + Copyright (C) + This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'. + This is free software, and you are welcome to redistribute it + under certain conditions; type `show c' for details. + +The hypothetical commands `show w' and `show c' should show the appropriate +parts of the General Public License. Of course, your program's commands +might be different; for a GUI interface, you would use an "about box". + + You should also get your employer (if you work as a programmer) or school, +if any, to sign a "copyright disclaimer" for the program, if necessary. +For more information on this, and how to apply and follow the GNU GPL, see +. + + The GNU General Public License does not permit incorporating your program +into proprietary programs. If your program is a subroutine library, you +may consider it more useful to permit linking proprietary applications with +the library. If this is what you want to do, use the GNU Lesser General +Public License instead of this License. But first, please read +. Index: boot/grub/ia32-pc/README =================================================================== --- boot/grub/ia32-pc/README (revision de9e28e0c0b35a214dcdc3688dc8579f50c5fbd6) +++ boot/grub/ia32-pc/README (revision de9e28e0c0b35a214dcdc3688dc8579f50c5fbd6) @@ -0,0 +1,9 @@ +The binary files of GRUB boot loader in this directory have been created +by compiling GRUB for the 'i386-pc' target and then using the grub-mkrescue +script to create the El Torito boot image. + +For licensing terms of GRUB boot loader see the file COPYING contained +in this directory. Full version of GRUB, including its source code, +can be downloaded from GRUB's project page: + +http://www.gnu.org/software/grub/ Index: boot/grub/ia32-pc/REVISION =================================================================== --- boot/grub/ia32-pc/REVISION (revision de9e28e0c0b35a214dcdc3688dc8579f50c5fbd6) +++ boot/grub/ia32-pc/REVISION (revision de9e28e0c0b35a214dcdc3688dc8579f50c5fbd6) @@ -0,0 +1,1 @@ +bc220962e366b1b46769ed6f9fa5be603ba58ab5 Index: boot/grub/ia32-pc/i386-pc/command.lst =================================================================== --- boot/grub/ia32-pc/i386-pc/command.lst (revision de9e28e0c0b35a214dcdc3688dc8579f50c5fbd6) +++ boot/grub/ia32-pc/i386-pc/command.lst (revision de9e28e0c0b35a214dcdc3688dc8579f50c5fbd6) @@ -0,0 +1,198 @@ +*acpi: acpi +*all_functional_test: functional_test +*background_image: gfxterm_background +*cat: cat +*cpuid: cpuid +*crc: hashsum +*cryptomount: cryptodisk +*drivemap: drivemap +*echo: echo +*extract_syslinux_entries_configfile: syslinuxcfg +*extract_syslinux_entries_source: syslinuxcfg +*file: file +*functional_test: functional_test +*gettext: gettext +*halt: halt +*hashsum: hashsum +*hdparm: hdparm +*hello: hello +*help: help +*hexdump: hexdump +*inb: iorw +*inl: iorw +*inw: iorw +*keystatus: keystatus +*kfreebsd: bsd +*knetbsd: bsd +*kopenbsd: bsd +*list_env: loadenv +*load_env: loadenv +*loopback: loopback +*ls: ls +*lsacpi: lsacpi +*lspci: lspci +*md5sum: hashsum +*menuentry: normal +*pcidump: pcidump +*plan9: plan9 +*probe: probe +*read_byte: memrw +*read_dword: memrw +*read_word: memrw +*regexp: regexp +*save_env: loadenv +*search: search +*sendkey: sendkey +*serial: serial +*setpci: setpci +*sha1sum: hashsum +*sha256sum: hashsum +*sha512sum: hashsum +*sleep: sleep +*submenu: normal +*syslinux_configfile: syslinuxcfg +*syslinux_source: syslinuxcfg +*terminfo: terminfo +*test_blockarg: test_blockarg +*testspeed: testspeed +*tr: tr +*trust: verify +*verify_detached: verify +*xnu_splash: xnu +*zfskey: zfscrypt +.: configfile +[: test +authenticate: normal +background_color: gfxterm_background +backtrace: backtrace +badram: mmap +blocklist: blocklist +boot: boot +break: normal +cat: minicmd +cbmemc: cbmemc +chainloader: chain +clear: normal +cmosclean: cmostest +cmosdump: cmosdump +cmosset: cmostest +cmostest: cmostest +cmp: cmp +configfile: configfile +continue: normal +coreboot_boottime: cbtime +cutmem: mmap +date: date +distrust: verify +dump: minicmd +efiemu_loadcore: efiemu +efiemu_prepare: efiemu +efiemu_unload: efiemu +eval: eval +exit: minicmd +export: normal +extract_entries_configfile: configfile +extract_entries_source: configfile +extract_legacy_entries_configfile: legacycfg +extract_legacy_entries_source: legacycfg +false: true +freedos: freedos +gdbstub: gdb +gdbstub_break: gdb +gdbstub_stop: gdb +gptsync: gptsync +help: minicmd +hexdump_random: random +initrd16: linux16 +initrd: linux +keymap: keylayouts +kfreebsd_loadenv: bsd +kfreebsd_module: bsd +kfreebsd_module_elf: bsd +knetbsd_module: bsd +knetbsd_module_elf: bsd +kopenbsd_ramdisk: bsd +legacy_check_password: legacycfg +legacy_configfile: legacycfg +legacy_initrd: legacycfg +legacy_initrd_nounzip: legacycfg +legacy_kernel: legacycfg +legacy_password: legacycfg +legacy_source: legacycfg +linux16: linux16 +linux: linux +list_trusted: verify +loadfont: font +lsapm: lsapm +lscoreboot: cbls +lsfonts: font +lsmmap: lsmmap +lsmod: minicmd +macppcbless: macbless +mactelbless: macbless +module2: multiboot2 +module: multiboot +multiboot2: multiboot2 +multiboot: multiboot +nativedisk: nativedisk +net_add_addr: net +net_add_dns: net +net_add_route: net +net_bootp: net +net_del_addr: net +net_del_dns: net +net_del_route: net +net_get_dhcp_option: net +net_ipv6_autoconf: net +net_ls_addr: net +net_ls_cards: net +net_ls_dns: net +net_ls_routes: net +net_nslookup: net +normal: normal +normal_exit: normal +ntldr: ntldr +outb: iorw +outl: iorw +outw: iorw +parttool: parttool +password: password +password_pbkdf2: password_pbkdf2 +play: play +pxechainloader: pxechain +read: read +reboot: reboot +return: normal +rmmod: minicmd +search.file: search_fs_file +search.fs_label: search_label +search.fs_uuid: search_fs_uuid +setparams: normal +shift: normal +source: configfile +terminal_input: terminal +terminal_output: terminal +test: test +testload: testload +time: time +true: true +truecrypt: truecrypt +usb: usbtest +vbeinfo: videoinfo +vbetest: videotest +videoinfo: videoinfo +videotest: videotest +write_byte: memrw +write_dword: memrw +write_word: memrw +xnu_devprop_load: xnu +xnu_kernel64: xnu +xnu_kernel: xnu +xnu_kext: xnu +xnu_kextdir: xnu +xnu_mkext: xnu +xnu_ramdisk: xnu +xnu_resume: xnu +xnu_uuid: xnu_uuid +zfs-bootfs: zfsinfo +zfsinfo: zfsinfo Index: boot/grub/ia32-pc/i386-pc/crypto.lst =================================================================== --- boot/grub/ia32-pc/i386-pc/crypto.lst (revision de9e28e0c0b35a214dcdc3688dc8579f50c5fbd6) +++ boot/grub/ia32-pc/i386-pc/crypto.lst (revision de9e28e0c0b35a214dcdc3688dc8579f50c5fbd6) @@ -0,0 +1,45 @@ +RIJNDAEL: gcry_rijndael +RIJNDAEL192: gcry_rijndael +RIJNDAEL256: gcry_rijndael +AES128: gcry_rijndael +AES-128: gcry_rijndael +AES-192: gcry_rijndael +AES-256: gcry_rijndael +ADLER32: adler32 +CRC64: crc64 +ARCFOUR: gcry_arcfour +BLOWFISH: gcry_blowfish +CAMELLIA128: gcry_camellia +CAMELLIA192: gcry_camellia +CAMELLIA256: gcry_camellia +CAST5: gcry_cast5 +CRC32: gcry_crc +CRC32RFC1510: gcry_crc +CRC24RFC2440: gcry_crc +DES: gcry_des +3DES: gcry_des +DSA: gcry_dsa +IDEA: gcry_idea +MD4: gcry_md4 +MD5: gcry_md5 +RFC2268_40: gcry_rfc2268 +AES: gcry_rijndael +AES192: gcry_rijndael +AES256: gcry_rijndael +RIPEMD160: gcry_rmd160 +RSA: gcry_rsa +SEED: gcry_seed +SERPENT128: gcry_serpent +SERPENT192: gcry_serpent +SERPENT256: gcry_serpent +SHA1: gcry_sha1 +SHA224: gcry_sha256 +SHA256: gcry_sha256 +SHA512: gcry_sha512 +SHA384: gcry_sha512 +TIGER192: gcry_tiger +TIGER: gcry_tiger +TIGER2: gcry_tiger +TWOFISH: gcry_twofish +TWOFISH128: gcry_twofish +WHIRLPOOL: gcry_whirlpool Index: boot/grub/ia32-pc/i386-pc/fs.lst =================================================================== --- boot/grub/ia32-pc/i386-pc/fs.lst (revision de9e28e0c0b35a214dcdc3688dc8579f50c5fbd6) +++ boot/grub/ia32-pc/i386-pc/fs.lst (revision de9e28e0c0b35a214dcdc3688dc8579f50c5fbd6) @@ -0,0 +1,36 @@ +affs +afs +bfs +btrfs +cbfs +cpio +cpio_be +exfat +ext2 +fat +hfs +hfsplus +iso9660 +jfs +minix +minix2 +minix2_be +minix3 +minix3_be +minix_be +newc +nilfs2 +ntfs +odc +procfs +reiserfs +romfs +sfs +squash4 +tar +udf +ufs1 +ufs1_be +ufs2 +xfs +zfs Index: boot/grub/ia32-pc/i386-pc/gdb_grub =================================================================== --- boot/grub/ia32-pc/i386-pc/gdb_grub (revision de9e28e0c0b35a214dcdc3688dc8579f50c5fbd6) +++ boot/grub/ia32-pc/i386-pc/gdb_grub (revision de9e28e0c0b35a214dcdc3688dc8579f50c5fbd6) @@ -0,0 +1,85 @@ +### +### Load debuging information about GNU GRUB 2 modules into GDB +### automatically. Needs readelf, Perl and gmodule.pl script +### +### Has to be launched from the writable and trusted +### directory containing *.image and *.module +### +### $Id: .gdbinit,v 1.1 2006/05/14 11:38:08 lkundrak Exp $ +### Lubomir Kundrak +### + +# Add section numbers and addresses to .segments.tmp +define dump_module_sections + set $mod = $arg0 + + # FIXME: save logging status + set logging file .segments.tmp + set logging redirect on + set logging overwrite off + set logging on + + printf "%s", $mod->name + set $segment = $mod->segment + while ($segment) + printf " %i 0x%lx", $segment->section, $segment->addr + set $segment = $segment->next + end + printf "\n" + + set logging off + # FIXME: restore logging status +end +document dump_module_sections + Gather information about module whose mod structure was + given for use with match_and_load_symbols +end + +# Generate and execute GDB commands and delete temporary files +# afterwards +define match_and_load_symbols + shell perl gmodule.pl <.segments.tmp >.loadsym.gdb + source .loadsym.gdb + shell rm -f .segments.tmp .loadsym.gdb +end +document match_and_load_symbols + Launch script, that matches section names with information + generated by dump_module_sections and load debugging info + apropriately +end + +### + +define load_module + dump_module_sections $arg0 + match_and_load_symbols +end +document load_module + Load debugging information for module given as argument. +end + +define load_all_modules + set $this = grub_dl_head + while ($this != 0) + dump_module_sections $this + set $this = $this->next + end + match_and_load_symbols +end +document load_all_modules + Load debugging information for all loaded modules. +end + +### + +set confirm off +file kernel.exec +target remote :1234 + +# inform when module is loaded +break grub_dl_add +commands + silent + load_module mod + cont +end Index: boot/grub/ia32-pc/i386-pc/gmodule.pl =================================================================== --- boot/grub/ia32-pc/i386-pc/gmodule.pl (revision de9e28e0c0b35a214dcdc3688dc8579f50c5fbd6) +++ boot/grub/ia32-pc/i386-pc/gmodule.pl (revision de9e28e0c0b35a214dcdc3688dc8579f50c5fbd6) @@ -0,0 +1,30 @@ +### +### Generate GDB commands, that load symbols for specified module, +### with proper section relocations. See .gdbinit +### +### $Id: gmodule.pl,v 1.2 2006/05/14 11:38:42 lkundrak Exp lkundrak $ +### Lubomir Kundrak +### + +use strict; + +while (<>) { + my ($name, %sections) = split; + + print "add-symbol-file $name.module"; + + open (READELF, "readelf -S $name.mod |") or die; + while () { + /\[\s*(\d+)\]\s+(\.\S+)/ or next; + + if ($2 eq '.text') { + print " $sections{$1}"; + next; + } + + print " -s $2 $sections{$1}" + if ($sections{$1} ne '0x0' and $sections{$1} ne ''); + }; + close (READELF); + print "\n"; +} Index: boot/grub/ia32-pc/i386-pc/moddep.lst =================================================================== --- boot/grub/ia32-pc/i386-pc/moddep.lst (revision de9e28e0c0b35a214dcdc3688dc8579f50c5fbd6) +++ boot/grub/ia32-pc/i386-pc/moddep.lst (revision de9e28e0c0b35a214dcdc3688dc8579f50c5fbd6) @@ -0,0 +1,264 @@ +videotest: font video gfxmenu +odc: archelp +loopback: extcmd +macho: +gcry_des: crypto +memrw: extcmd +terminfo: extcmd +part_gpt: +romfs: fshelp +read: +aout: +gcry_arcfour: crypto +vga_text: +tftp: net priority_queue +newc: archelp +minix2_be: +elf: +videotest_checksum: font functional_test video_fb +password_pbkdf2: crypto gcry_sha512 pbkdf2 normal +gcry_seed: crypto +pcidump: extcmd pci +bsd: elf serial crypto gcry_md5 extcmd vbe video boot aout cpuid relocator mmap +sfs: fshelp +reiserfs: fshelp +part_sunpc: +gfxmenu: video_colors trig bitmap_scale gfxterm font normal video bitmap +backtrace: +jfs: +help: extcmd normal +configfile: normal +cbls: cbtable +gfxterm_menu: font functional_test procfs normal video_fb +gcry_idea: crypto +tr: extcmd +shift_test: functional_test +ohci: cs5536 usb boot pci +afs: fshelp +spkmodem: terminfo +usb_keyboard: usb keylayouts +xzio: crypto +syslinuxcfg: extcmd normal +search_fs_file: +vga: video video_fb +usbms: scsi usb +test_blockarg: extcmd normal +true: +affs: fshelp +iso9660: fshelp +exfat: fshelp +setjmp_test: functional_test setjmp +gfxterm: font video +disk: +xfs: fshelp +testspeed: extcmd normal +cpio_be: archelp +functional_test: btrfs extcmd video video_fb +pxechain: pxe video boot relocator +bswap_test: functional_test +sleep: extcmd normal +memdisk: +gcry_rijndael: crypto +mdraid09_be: diskfilter +gettext: +gcry_sha1: crypto +hfspluscomp: gzio hfsplus +cmp: +random: hexdump acpi +offsetio: +file: macho elf extcmd offsetio +usbserial_usbdebug: serial usb usbserial_common +video_colors: +morse: +hashsum: crypto extcmd normal +usb: pci +halt: extcmd acpi +gdb: serial backtrace +gfxterm_background: video_colors bitmap_scale gfxterm extcmd video bitmap +search_fs_uuid: +gcry_dsa: verify mpi +keystatus: extcmd +linux: normal vbe video boot relocator mmap +geli: cryptodisk crypto gcry_sha512 pbkdf2 gcry_sha256 +cmdline_cat_test: font functional_test procfs normal video_fb +part_sun: +cbtable: +plan9: extcmd video boot relocator +sendkey: extcmd boot +pbkdf2_test: functional_test pbkdf2 gcry_sha1 +video_bochs: video pci video_fb +bufio: +usbserial_ftdi: serial usb usbserial_common +legacy_password_test: functional_test legacycfg +cpuid: extcmd +bfs: fshelp +hdparm: extcmd +gcry_blowfish: crypto +test: +nilfs2: fshelp +gcry_rsa: verify mpi +cryptodisk: crypto extcmd procfs +nativedisk: +minicmd: +signature_test: functional_test procfs +ata: scsi +udf: fshelp +gzio: +xnu_uuid: gcry_md5 +uhci: usb pci +pata: ata pci +mul_test: functional_test +adler32: crypto +terminal: +div: +ehci: cs5536 usb boot pci +crypto: +part_bsd: part_msdos +cs5536: pci +biosdisk: +lsapm: +gcry_sha512: crypto +password: crypto normal +efiemu: gcry_crc crypto cpuid acpi +fshelp: +sleep_test: functional_test datetime +iorw: extcmd +xnu: macho bitmap_scale random extcmd video bitmap boot efiemu relocator mmap +mmap: boot +exfctest: functional_test +zfsinfo: zfs +ldm: part_gpt diskfilter part_msdos +cmostest: +eval: normal +part_dvh: +ext2: fshelp +blocklist: +net: priority_queue bufio datetime boot +drivemap: extcmd boot mmap +part_acorn: +videoinfo: video +btrfs: lzopio gzio +lsmmap: +bitmap: +vbe: video video_fb +ntfs: fshelp +multiboot: net vbe video boot relocator mmap lsapm +gcry_crc: crypto +png: bufio bitmap +jpeg: bufio bitmap +macbless: disk +div_test: functional_test div +regexp: extcmd normal +parttool: normal +usbserial_pl2303: serial usb usbserial_common +cpio: archelp +gcry_rmd160: crypto +fat: fshelp +ufs1_be: +truecrypt: video boot relocator mmap gzio +archelp: +raid6rec: diskfilter +ntldr: chain video boot relocator +http: net +zfs: gzio +minix2: +mda_text: +lsacpi: extcmd acpi +datehook: datetime normal +loadenv: disk extcmd +bitmap_scale: bitmap +probe: extcmd +minix3: +tar: archelp +hfs: fshelp +procfs: archelp +boot: +keylayouts: +progress: normal +kernel: +usbtest: usb +relocator: mmap +acpi: extcmd mmap +tga: bufio bitmap +reboot: relocator +serial: extcmd terminfo +zfscrypt: crypto pbkdf2 zfs extcmd gcry_sha1 gcry_rijndael +dm_nv: diskfilter +cmp_test: functional_test +luks: cryptodisk crypto pbkdf2 +font: bufio video +raid5rec: diskfilter +crc64: crypto +datetime: +ctz_test: functional_test +video: +pci: +cbmemc: normal cbtable terminfo +cmosdump: +hfsplus: fshelp +gcry_cast5: crypto +extcmd: +squash4: fshelp lzopio xzio gzio +part_plan: +minix_be: +gcry_whirlpool: crypto +pxe: net boot +gcry_tiger: crypto +search: search_fs_uuid search_fs_file extcmd search_label +lspci: extcmd pci +cbtime: cbtable +video_fb: +verify: crypto extcmd mpi gcry_sha1 +minix3_be: +trig: +msdospart: disk parttool +priority_queue: +gcry_twofish: crypto +part_dfly: +xnu_uuid_test: functional_test +diskfilter: +testload: +part_apple: +hexdump: extcmd +date: datetime normal +pbkdf2: crypto +gcry_sha256: crypto +ls: extcmd normal +usbserial_common: serial usb +ntfscomp: ntfs +lzopio: crypto +video_cirrus: video pci video_fb +hello: extcmd +scsi: +cat: extcmd +ahci: ata boot pci +normal: terminal crypto bufio extcmd boot gettext +linux16: video boot relocator mmap +ufs1: +mdraid09: diskfilter +lvm: diskfilter +cbfs: archelp +chain: video boot relocator +ufs2: +time: +setpci: extcmd pci +gptsync: disk +freedos: chain video boot relocator +search_label: +setjmp: +multiboot2: net vbe video boot relocator mmap lsapm acpi +gcry_rfc2268: crypto +mdraid1x: diskfilter +mpi: crypto +legacycfg: linux password crypto gcry_md5 normal +play: +part_amiga: +minix: +echo: extcmd +gcry_serpent: crypto +gcry_md4: crypto +gcry_md5: crypto +part_msdos: +gcry_camellia: crypto +at_keyboard: keylayouts boot +all_video: vbe vga video_bochs video_cirrus Index: boot/grub/ia32-pc/i386-pc/modinfo.sh =================================================================== --- boot/grub/ia32-pc/i386-pc/modinfo.sh (revision de9e28e0c0b35a214dcdc3688dc8579f50c5fbd6) +++ boot/grub/ia32-pc/i386-pc/modinfo.sh (revision de9e28e0c0b35a214dcdc3688dc8579f50c5fbd6) @@ -0,0 +1,40 @@ +#!/bin/sh + +# User-controllable options +grub_modinfo_target_cpu=i386 +grub_modinfo_platform=pc +grub_disk_cache_stats=0 +grub_boot_time_stats=0 +grub_have_font_source=1 + +# Autodetected config +grub_have_asm_uscore=0 +grub_bss_start_symbol="__bss_start" +grub_end_symbol="end" + +# Build environment +grub_target_cc='gcc' +grub_target_cc_version='gcc (SUSE Linux) 4.8.5' +grub_target_cflags=' -Os -Wall -W -Wshadow -Wpointer-arith -Wundef -Wchar-subscripts -Wcomment -Wdeprecated-declarations -Wdisabled-optimization -Wdiv-by-zero -Wfloat-equal -Wformat-extra-args -Wformat-security -Wformat-y2k -Wimplicit -Wimplicit-function-declaration -Wimplicit-int -Wmain -Wmissing-braces -Wmissing-format-attribute -Wmultichar -Wparentheses -Wreturn-type -Wsequence-point -Wshadow -Wsign-compare -Wswitch -Wtrigraphs -Wunknown-pragmas -Wunused -Wunused-function -Wunused-label -Wunused-parameter -Wunused-value -Wunused-variable -Wwrite-strings -Wnested-externs -Wstrict-prototypes -g -Wredundant-decls -Wmissing-prototypes -Wmissing-declarations -Wextra -Wattributes -Wendif-labels -Winit-self -Wint-to-pointer-cast -Winvalid-pch -Wmissing-field-initializers -Wnonnull -Woverflow -Wvla -Wpointer-to-int-cast -Wstrict-aliasing -Wvariadic-macros -Wvolatile-register-var -Wpointer-sign -Wmissing-include-dirs -Wmissing-prototypes -Wmissing-declarations -Wformat=2 -march=i386 -m32 -mrtd -mregparm=3 -falign-jumps=1 -falign-loops=1 -falign-functions=1 -freg-struct-return -mno-mmx -mno-sse -mno-sse2 -mno-sse3 -mno-3dnow -msoft-float -fno-dwarf2-cfi-asm -mno-stack-arg-probe -fno-asynchronous-unwind-tables -fno-unwind-tables -Qn -fno-stack-protector -Wtrampolines -Werror' +grub_target_cppflags=' -Wall -W -DGRUB_MACHINE_PCBIOS=1 -DGRUB_MACHINE=I386_PC -m32 -nostdinc -isystem /usr/lib64/gcc/x86_64-suse-linux/4.8/include -I$(top_srcdir)/include -I$(top_builddir)/include' +grub_target_ccasflags=' -g -m32 -msoft-float' +grub_target_ldflags=' -m32 -Wl,-melf_i386 -Wl,--build-id=none' +grub_cflags='' +grub_cppflags=' -D_FILE_OFFSET_BITS=64' +grub_ccasflags='' +grub_ldflags='' +grub_target_strip='strip' +grub_target_nm='nm' +grub_target_ranlib='ranlib' +grub_target_objconf='' +grub_target_obj2elf='' +grub_target_img_base_ldopt='-Wl,-Ttext' +grub_target_img_ldflags='@TARGET_IMG_BASE_LDFLAGS@' + +# Version +grub_version="2.02~beta2" +grub_package="grub" +grub_package_string="GRUB 2.02~beta2" +grub_package_version="2.02~beta2" +grub_package_name="GRUB" +grub_package_bugreport="bug-grub@gnu.org" Index: boot/grub/ia32-pc/i386-pc/partmap.lst =================================================================== --- boot/grub/ia32-pc/i386-pc/partmap.lst (revision de9e28e0c0b35a214dcdc3688dc8579f50c5fbd6) +++ boot/grub/ia32-pc/i386-pc/partmap.lst (revision de9e28e0c0b35a214dcdc3688dc8579f50c5fbd6) @@ -0,0 +1,11 @@ +part_acorn +part_amiga +part_apple +part_bsd +part_dfly +part_dvh +part_gpt +part_msdos +part_plan +part_sun +part_sunpc Index: boot/grub/ia32-pc/i386-pc/parttool.lst =================================================================== --- boot/grub/ia32-pc/i386-pc/parttool.lst (revision de9e28e0c0b35a214dcdc3688dc8579f50c5fbd6) +++ boot/grub/ia32-pc/i386-pc/parttool.lst (revision de9e28e0c0b35a214dcdc3688dc8579f50c5fbd6) @@ -0,0 +1,1 @@ +msdos: msdospart Index: boot/grub/ia32-pc/i386-pc/terminal.lst =================================================================== --- boot/grub/ia32-pc/i386-pc/terminal.lst (revision de9e28e0c0b35a214dcdc3688dc8579f50c5fbd6) +++ boot/grub/ia32-pc/i386-pc/terminal.lst (revision de9e28e0c0b35a214dcdc3688dc8579f50c5fbd6) @@ -0,0 +1,11 @@ +iat_keyboard: at_keyboard +iserial: serial +iserial_*: serial +oaudio: morse +ocbmemc: cbmemc +ogfxterm: gfxterm +omda_text: mda_text +oserial: serial +oserial_*: serial +ospkmodem: spkmodem +ovga_text: vga_text Index: boot/grub/ia32-pc/i386-pc/video.lst =================================================================== --- boot/grub/ia32-pc/i386-pc/video.lst (revision de9e28e0c0b35a214dcdc3688dc8579f50c5fbd6) +++ boot/grub/ia32-pc/i386-pc/video.lst (revision de9e28e0c0b35a214dcdc3688dc8579f50c5fbd6) @@ -0,0 +1,4 @@ +vbe +vga +video_bochs +video_cirrus Index: contrib/qemu/build-from-scratch.sh =================================================================== --- contrib/qemu/build-from-scratch.sh (revision c878693123930f0906703462cf2807430679517e) +++ contrib/qemu/build-from-scratch.sh (revision de9e28e0c0b35a214dcdc3688dc8579f50c5fbd6) @@ -29,5 +29,5 @@ # -VERSION=3.0.0 +VERSION=4.0.0 BASENAME=qemu-${VERSION} BASENAME_MASTER=qemu-master @@ -106,5 +106,5 @@ echo "==== Configuring QEMU ====" -./configure --target-list=i386-softmmu,x86_64-softmmu,arm-softmmu,ppc-softmmu,sparc64-softmmu,mips-softmmu,mipsel-softmmu --audio-drv-list=pa +./configure --target-list=i386-softmmu,x86_64-softmmu,arm-softmmu,aarch64-softmmu,ppc-softmmu,sparc64-softmmu,mips-softmmu,mipsel-softmmu --audio-drv-list=pa echo "==== Building QEMU ====" Index: defaults/amd64/Makefile.config =================================================================== --- defaults/amd64/Makefile.config (revision c878693123930f0906703462cf2807430679517e) +++ defaults/amd64/Makefile.config (revision de9e28e0c0b35a214dcdc3688dc8579f50c5fbd6) @@ -65,4 +65,16 @@ CONFIG_BFB_BPP = 16 +# Dynamic linking support +CONFIG_RTLD = y + +# Build shared libraries +CONFIG_BUILD_SHARED_LIBS = y + +# Link against shared libraries +CONFIG_USE_SHARED_LIBS = y + +# Include userspace unit tests (PCUT) +CONFIG_PCUT_TESTS = y + # Include development files (headers, libraries) CONFIG_DEVEL_FILES = y Index: defaults/arm32/Makefile.config =================================================================== --- defaults/arm32/Makefile.config (revision c878693123930f0906703462cf2807430679517e) +++ defaults/arm32/Makefile.config (revision de9e28e0c0b35a214dcdc3688dc8579f50c5fbd6) @@ -38,4 +38,13 @@ CONFIG_HID_OUT = generic +# Dynamic linking support +CONFIG_RTLD = y + +# Build shared libraries +CONFIG_BUILD_SHARED_LIBS = y + +# Link against shared libraries +CONFIG_USE_SHARED_LIBS = y + # Optimization level OPTIMIZATION = 3 Index: defaults/arm32/beagleboardxm/Makefile.config =================================================================== --- defaults/arm32/beagleboardxm/Makefile.config (revision c878693123930f0906703462cf2807430679517e) +++ defaults/arm32/beagleboardxm/Makefile.config (revision de9e28e0c0b35a214dcdc3688dc8579f50c5fbd6) @@ -10,2 +10,5 @@ CONFIG_BFB_MODE = 1024x768 CONFIG_BFB_BPP = 24 + +# Barebone build with essential binaries only +CONFIG_BAREBONE = y Index: defaults/arm32/beaglebone/Makefile.config =================================================================== --- defaults/arm32/beaglebone/Makefile.config (revision c878693123930f0906703462cf2807430679517e) +++ defaults/arm32/beaglebone/Makefile.config (revision de9e28e0c0b35a214dcdc3688dc8579f50c5fbd6) @@ -7,2 +7,5 @@ #framebuffer CONFIG_FB = n + +# Barebone build with essential binaries only +CONFIG_BAREBONE = y Index: defaults/arm64/Makefile.config =================================================================== --- defaults/arm64/Makefile.config (revision de9e28e0c0b35a214dcdc3688dc8579f50c5fbd6) +++ defaults/arm64/Makefile.config (revision de9e28e0c0b35a214dcdc3688dc8579f50c5fbd6) @@ -0,0 +1,50 @@ +# Platform +PLATFORM = arm64 + +# Ramdisk format +RDFMT = ext4fs + +# Compiler +COMPILER = gcc_cross + +# In case compiler is clang, whether or not to use its integrated assembler. +INTEGRATED_AS = default + +# Debug build +CONFIG_DEBUG = y + +# Deadlock detection support for spinlocks +CONFIG_DEBUG_SPINLOCK = y + +# Support for SMP +CONFIG_SMP = y + +# Lazy FPU context switching +CONFIG_FPU_LAZY = y + +# Support for userspace debuggers +CONFIG_UDEBUG = y + +# Kernel console support +CONFIG_KCONSOLE = y + +# Kernel symbol information +CONFIG_SYMTAB = y + +# Detailed kernel logging +CONFIG_LOG = n + +# Kernel function tracing +CONFIG_TRACE = n + +# Compile kernel tests +CONFIG_TEST = y + +# Input device class +CONFIG_HID_IN = generic + +# Output device class +CONFIG_HID_OUT = generic + +# Optimization level +OPTIMIZATION = 3 Index: defaults/arm64/output =================================================================== --- defaults/arm64/output (revision de9e28e0c0b35a214dcdc3688dc8579f50c5fbd6) +++ defaults/arm64/output (revision de9e28e0c0b35a214dcdc3688dc8579f50c5fbd6) @@ -0,0 +1,1 @@ +image.iso Index: defaults/arm64/virt/Makefile.config =================================================================== --- defaults/arm64/virt/Makefile.config (revision de9e28e0c0b35a214dcdc3688dc8579f50c5fbd6) +++ defaults/arm64/virt/Makefile.config (revision de9e28e0c0b35a214dcdc3688dc8579f50c5fbd6) @@ -0,0 +1,2 @@ +# Machine type +MACHINE = virt Index: defaults/ia32/Makefile.config =================================================================== --- defaults/ia32/Makefile.config (revision c878693123930f0906703462cf2807430679517e) +++ defaults/ia32/Makefile.config (revision de9e28e0c0b35a214dcdc3688dc8579f50c5fbd6) @@ -77,4 +77,7 @@ CONFIG_USE_SHARED_LIBS = y +# Include userspace unit tests (PCUT) +CONFIG_PCUT_TESTS = y + # Include development files (headers, libraries) CONFIG_DEVEL_FILES = y Index: defaults/ppc32/Makefile.config =================================================================== --- defaults/ppc32/Makefile.config (revision c878693123930f0906703462cf2807430679517e) +++ defaults/ppc32/Makefile.config (revision de9e28e0c0b35a214dcdc3688dc8579f50c5fbd6) @@ -44,4 +44,13 @@ CONFIG_FB = y +# Dynamic linking support +CONFIG_RTLD = y + +# Build shared libraries +CONFIG_BUILD_SHARED_LIBS = y + +# Link against shared libraries +CONFIG_USE_SHARED_LIBS = y + # OHCI root hub power switch, ganged is enough OHCI_POWER_SWITCH = ganged Index: defaults/sparc64/niagara/Makefile.config =================================================================== --- defaults/sparc64/niagara/Makefile.config (revision c878693123930f0906703462cf2807430679517e) +++ defaults/sparc64/niagara/Makefile.config (revision de9e28e0c0b35a214dcdc3688dc8579f50c5fbd6) @@ -14,4 +14,13 @@ CONFIG_FB = n +# Dynamic linking support +CONFIG_RTLD = y + +# Build shared libraries +CONFIG_BUILD_SHARED_LIBS = y + +# Link against shared libraries +CONFIG_USE_SHARED_LIBS = y + # Barebone build with essential binaries only CONFIG_BAREBONE = y Index: defaults/sparc64/ultra/Makefile.config =================================================================== --- defaults/sparc64/ultra/Makefile.config (revision c878693123930f0906703462cf2807430679517e) +++ defaults/sparc64/ultra/Makefile.config (revision de9e28e0c0b35a214dcdc3688dc8579f50c5fbd6) @@ -8,4 +8,13 @@ QUADFLOAT = hard +# Dynamic linking support +CONFIG_RTLD = y + +# Build shared libraries +CONFIG_BUILD_SHARED_LIBS = y + +# Link against shared libraries +CONFIG_USE_SHARED_LIBS = y + # Barebone build with essential binaries only CONFIG_BAREBONE = y Index: doxygen/doxygen.cfg.diff =================================================================== --- doxygen/doxygen.cfg.diff (revision c878693123930f0906703462cf2807430679517e) +++ doxygen/doxygen.cfg.diff (revision de9e28e0c0b35a214dcdc3688dc8579f50c5fbd6) @@ -24,5 +24,5 @@ -ENABLED_SECTIONS = -+ENABLED_SECTIONS = abs32le amd64 arm32 ia32 ia64 mips32 ppc32 riscv64 sparc64 ++ENABLED_SECTIONS = abs32le amd64 arm32 arm64 ia32 ia64 mips32 ppc32 riscv64 sparc64 # The MAX_INITIALIZER_LINES tag determines the maximum number of lines that the @@ -33,5 +33,5 @@ -INPUT = -+INPUT = .. ++INPUT = ../README.md ../abi ../boot ../kernel ../uspace # This tag can be used to specify the character encoding of the source files Index: kernel/Makefile =================================================================== --- kernel/Makefile (revision c878693123930f0906703462cf2807430679517e) +++ kernel/Makefile (revision de9e28e0c0b35a214dcdc3688dc8579f50c5fbd6) @@ -87,5 +87,5 @@ INCLUDES_FLAGS = $(addprefix -I,$(INCLUDES)) -DEFS = -DKERNEL -DRELEASE=$(RELEASE) "-DCOPYRIGHT=$(COPYRIGHT)" "-DNAME=$(NAME)" -D__$(BITS)_BITS__ -D__$(ENDIANESS)__ +DEFS = -D_HELENOS_SOURCE -DKERNEL -DRELEASE=$(RELEASE) "-DCOPYRIGHT=$(COPYRIGHT)" "-DNAME=$(NAME)" -D__$(BITS)_BITS__ -D__$(ENDIANESS)__ COMMON_CFLAGS = $(INCLUDES_FLAGS) -O$(OPTIMIZATION) -imacros $(CONFIG_HEADER) \ @@ -162,5 +162,4 @@ GENERIC_SOURCES = \ generic/src/adt/bitmap.c \ - generic/src/adt/btree.c \ generic/src/adt/hash_table.c \ generic/src/adt/list.c \ @@ -279,5 +278,4 @@ test/test.c \ test/atomic/atomic1.c \ - test/btree/btree1.c \ test/fault/fault1.c \ test/mm/falloc1.c \ @@ -314,5 +312,4 @@ ifeq ($(CONFIG_TRACE),y) INSTRUMENTED_SOURCES = \ - generic/src/adt/btree.c \ generic/src/cpu/cpu.c \ generic/src/ddi/ddi.c \ Index: kernel/arch/abs32le/include/arch/asm.h =================================================================== --- kernel/arch/abs32le/include/arch/asm.h (revision c878693123930f0906703462cf2807430679517e) +++ kernel/arch/abs32le/include/arch/asm.h (revision de9e28e0c0b35a214dcdc3688dc8579f50c5fbd6) @@ -40,9 +40,9 @@ #include -NO_TRACE static inline void asm_delay_loop(uint32_t usec) -{ -} - -NO_TRACE static inline __attribute__((noreturn)) void cpu_halt(void) +_NO_TRACE static inline void asm_delay_loop(uint32_t usec) +{ +} + +_NO_TRACE static inline __attribute__((noreturn)) void cpu_halt(void) { /* @@ -57,5 +57,5 @@ } -NO_TRACE static inline void cpu_sleep(void) +_NO_TRACE static inline void cpu_sleep(void) { /* @@ -67,5 +67,5 @@ } -NO_TRACE static inline void pio_write_8(ioport8_t *port, uint8_t val) +_NO_TRACE static inline void pio_write_8(ioport8_t *port, uint8_t val) { } @@ -79,5 +79,5 @@ * */ -NO_TRACE static inline void pio_write_16(ioport16_t *port, uint16_t val) +_NO_TRACE static inline void pio_write_16(ioport16_t *port, uint16_t val) { } @@ -91,5 +91,5 @@ * */ -NO_TRACE static inline void pio_write_32(ioport32_t *port, uint32_t val) +_NO_TRACE static inline void pio_write_32(ioport32_t *port, uint32_t val) { } @@ -103,5 +103,5 @@ * */ -NO_TRACE static inline uint8_t pio_read_8(ioport8_t *port) +_NO_TRACE static inline uint8_t pio_read_8(ioport8_t *port) { return 0; @@ -116,5 +116,5 @@ * */ -NO_TRACE static inline uint16_t pio_read_16(ioport16_t *port) +_NO_TRACE static inline uint16_t pio_read_16(ioport16_t *port) { return 0; @@ -129,10 +129,10 @@ * */ -NO_TRACE static inline uint32_t pio_read_32(ioport32_t *port) -{ - return 0; -} - -NO_TRACE static inline ipl_t interrupts_enable(void) +_NO_TRACE static inline uint32_t pio_read_32(ioport32_t *port) +{ + return 0; +} + +_NO_TRACE static inline ipl_t interrupts_enable(void) { /* @@ -146,5 +146,5 @@ } -NO_TRACE static inline ipl_t interrupts_disable(void) +_NO_TRACE static inline ipl_t interrupts_disable(void) { /* @@ -160,5 +160,5 @@ } -NO_TRACE static inline void interrupts_restore(ipl_t ipl) +_NO_TRACE static inline void interrupts_restore(ipl_t ipl) { /* @@ -168,5 +168,5 @@ } -NO_TRACE static inline ipl_t interrupts_read(void) +_NO_TRACE static inline ipl_t interrupts_read(void) { /* @@ -178,5 +178,5 @@ } -NO_TRACE static inline bool interrupts_disabled(void) +_NO_TRACE static inline bool interrupts_disabled(void) { /* @@ -188,5 +188,5 @@ } -NO_TRACE static inline uintptr_t get_stack_base(void) +_NO_TRACE static inline uintptr_t get_stack_base(void) { /* Index: kernel/arch/abs32le/include/arch/cycle.h =================================================================== --- kernel/arch/abs32le/include/arch/cycle.h (revision c878693123930f0906703462cf2807430679517e) +++ kernel/arch/abs32le/include/arch/cycle.h (revision de9e28e0c0b35a214dcdc3688dc8579f50c5fbd6) @@ -38,5 +38,5 @@ #include -NO_TRACE static inline uint64_t get_cycle(void) +_NO_TRACE static inline uint64_t get_cycle(void) { return 0; Index: kernel/arch/abs32le/include/arch/istate.h =================================================================== --- kernel/arch/abs32le/include/arch/istate.h (revision c878693123930f0906703462cf2807430679517e) +++ kernel/arch/abs32le/include/arch/istate.h (revision de9e28e0c0b35a214dcdc3688dc8579f50c5fbd6) @@ -62,5 +62,5 @@ } istate_t; -NO_TRACE static inline int istate_from_uspace(istate_t *istate) +_NO_TRACE static inline int istate_from_uspace(istate_t *istate) REQUIRES_EXTENT_MUTABLE(istate) { @@ -73,5 +73,5 @@ } -NO_TRACE static inline void istate_set_retaddr(istate_t *istate, +_NO_TRACE static inline void istate_set_retaddr(istate_t *istate, uintptr_t retaddr) WRITES(&istate->ip) @@ -82,5 +82,5 @@ } -NO_TRACE static inline uintptr_t istate_get_pc(istate_t *istate) +_NO_TRACE static inline uintptr_t istate_get_pc(istate_t *istate) REQUIRES_EXTENT_MUTABLE(istate) { @@ -90,5 +90,5 @@ } -NO_TRACE static inline uintptr_t istate_get_fp(istate_t *istate) +_NO_TRACE static inline uintptr_t istate_get_fp(istate_t *istate) REQUIRES_EXTENT_MUTABLE(istate) { Index: kernel/arch/abs32le/include/arch/mm/as.h =================================================================== --- kernel/arch/abs32le/include/arch/mm/as.h (revision c878693123930f0906703462cf2807430679517e) +++ kernel/arch/abs32le/include/arch/mm/as.h (revision de9e28e0c0b35a214dcdc3688dc8579f50c5fbd6) @@ -37,4 +37,5 @@ #define KERNEL_ADDRESS_SPACE_SHADOWED_ARCH 0 +#define KERNEL_SEPARATE_PTL0_ARCH 0 #define KERNEL_ADDRESS_SPACE_START_ARCH UINT32_C(0x80000000) Index: kernel/arch/abs32le/include/arch/mm/page.h =================================================================== --- kernel/arch/abs32le/include/arch/mm/page.h (revision c878693123930f0906703462cf2807430679517e) +++ kernel/arch/abs32le/include/arch/mm/page.h (revision de9e28e0c0b35a214dcdc3688dc8579f50c5fbd6) @@ -147,5 +147,5 @@ } __attribute__((packed)) pte_t; -NO_TRACE static inline unsigned int get_pt_flags(pte_t *pt, size_t i) +_NO_TRACE static inline unsigned int get_pt_flags(pte_t *pt, size_t i) REQUIRES_ARRAY_MUTABLE(pt, PTL0_ENTRIES_ARCH) { @@ -161,5 +161,5 @@ } -NO_TRACE static inline void set_pt_flags(pte_t *pt, size_t i, int flags) +_NO_TRACE static inline void set_pt_flags(pte_t *pt, size_t i, int flags) WRITES(ARRAY_RANGE(pt, PTL0_ENTRIES_ARCH)) REQUIRES_ARRAY_MUTABLE(pt, PTL0_ENTRIES_ARCH) @@ -180,5 +180,5 @@ } -NO_TRACE static inline void set_pt_present(pte_t *pt, size_t i) +_NO_TRACE static inline void set_pt_present(pte_t *pt, size_t i) WRITES(ARRAY_RANGE(pt, PTL0_ENTRIES_ARCH)) REQUIRES_ARRAY_MUTABLE(pt, PTL0_ENTRIES_ARCH) Index: kernel/arch/amd64/Makefile.inc =================================================================== --- kernel/arch/amd64/Makefile.inc (revision c878693123930f0906703462cf2807430679517e) +++ kernel/arch/amd64/Makefile.inc (revision de9e28e0c0b35a214dcdc3688dc8579f50c5fbd6) @@ -60,5 +60,4 @@ arch/$(KARCH)/src/ddi/ddi.c \ arch/$(KARCH)/src/drivers/i8254.c \ - arch/$(KARCH)/src/drivers/i8259.c \ arch/$(KARCH)/src/delay.S \ arch/$(KARCH)/src/amd64.c \ Index: kernel/arch/amd64/include/arch/asm.h =================================================================== --- kernel/arch/amd64/include/arch/asm.h (revision c878693123930f0906703462cf2807430679517e) +++ kernel/arch/amd64/include/arch/asm.h (revision de9e28e0c0b35a214dcdc3688dc8579f50c5fbd6) @@ -50,5 +50,5 @@ * */ -NO_TRACE static inline uintptr_t get_stack_base(void) +_NO_TRACE static inline uintptr_t get_stack_base(void) { uintptr_t v; @@ -63,5 +63,5 @@ } -NO_TRACE static inline void cpu_sleep(void) +_NO_TRACE static inline void cpu_sleep(void) { asm volatile ( @@ -70,5 +70,5 @@ } -NO_TRACE static inline void __attribute__((noreturn)) cpu_halt(void) +_NO_TRACE static inline void __attribute__((noreturn)) cpu_halt(void) { while (true) { @@ -87,5 +87,5 @@ * */ -NO_TRACE static inline uint8_t pio_read_8(ioport8_t *port) +_NO_TRACE static inline uint8_t pio_read_8(ioport8_t *port) { if (port < (ioport8_t *) IO_SPACE_BOUNDARY) { @@ -111,5 +111,5 @@ * */ -NO_TRACE static inline uint16_t pio_read_16(ioport16_t *port) +_NO_TRACE static inline uint16_t pio_read_16(ioport16_t *port) { if (port < (ioport16_t *) IO_SPACE_BOUNDARY) { @@ -135,5 +135,5 @@ * */ -NO_TRACE static inline uint32_t pio_read_32(ioport32_t *port) +_NO_TRACE static inline uint32_t pio_read_32(ioport32_t *port) { if (port < (ioport32_t *) IO_SPACE_BOUNDARY) { @@ -159,5 +159,5 @@ * */ -NO_TRACE static inline void pio_write_8(ioport8_t *port, uint8_t val) +_NO_TRACE static inline void pio_write_8(ioport8_t *port, uint8_t val) { if (port < (ioport8_t *) IO_SPACE_BOUNDARY) { @@ -178,5 +178,5 @@ * */ -NO_TRACE static inline void pio_write_16(ioport16_t *port, uint16_t val) +_NO_TRACE static inline void pio_write_16(ioport16_t *port, uint16_t val) { if (port < (ioport16_t *) IO_SPACE_BOUNDARY) { @@ -197,5 +197,5 @@ * */ -NO_TRACE static inline void pio_write_32(ioport32_t *port, uint32_t val) +_NO_TRACE static inline void pio_write_32(ioport32_t *port, uint32_t val) { if (port < (ioport32_t *) IO_SPACE_BOUNDARY) { @@ -208,5 +208,5 @@ } -NO_TRACE static inline uint64_t read_rflags(void) +_NO_TRACE static inline uint64_t read_rflags(void) { uint64_t rflags; @@ -221,5 +221,5 @@ } -NO_TRACE static inline void write_rflags(uint64_t rflags) +_NO_TRACE static inline void write_rflags(uint64_t rflags) { asm volatile ( @@ -237,5 +237,5 @@ * */ -NO_TRACE static inline ipl_t interrupts_read(void) +_NO_TRACE static inline ipl_t interrupts_read(void) { return (ipl_t) read_rflags(); @@ -249,5 +249,5 @@ * */ -NO_TRACE static inline ipl_t interrupts_enable(void) +_NO_TRACE static inline ipl_t interrupts_enable(void) { ipl_t ipl = interrupts_read(); @@ -265,5 +265,5 @@ * */ -NO_TRACE static inline ipl_t interrupts_disable(void) +_NO_TRACE static inline ipl_t interrupts_disable(void) { ipl_t ipl = interrupts_read(); @@ -281,5 +281,5 @@ * */ -NO_TRACE static inline void interrupts_restore(ipl_t ipl) +_NO_TRACE static inline void interrupts_restore(ipl_t ipl) { write_rflags((uint64_t) ipl); @@ -291,5 +291,5 @@ * */ -NO_TRACE static inline bool interrupts_disabled(void) +_NO_TRACE static inline bool interrupts_disabled(void) { return ((read_rflags() & RFLAGS_IF) == 0); @@ -297,5 +297,5 @@ /** Write to MSR */ -NO_TRACE static inline void write_msr(uint32_t msr, uint64_t value) +_NO_TRACE static inline void write_msr(uint32_t msr, uint64_t value) { asm volatile ( @@ -307,5 +307,5 @@ } -NO_TRACE static inline sysarg_t read_msr(uint32_t msr) +_NO_TRACE static inline sysarg_t read_msr(uint32_t msr) { uint32_t ax, dx; @@ -325,5 +325,5 @@ * */ -NO_TRACE static inline void invlpg(uintptr_t addr) +_NO_TRACE static inline void invlpg(uintptr_t addr) { asm volatile ( @@ -338,5 +338,5 @@ * */ -NO_TRACE static inline void gdtr_load(ptr_16_64_t *gdtr_reg) +_NO_TRACE static inline void gdtr_load(ptr_16_64_t *gdtr_reg) { asm volatile ( @@ -351,5 +351,5 @@ * */ -NO_TRACE static inline void gdtr_store(ptr_16_64_t *gdtr_reg) +_NO_TRACE static inline void gdtr_store(ptr_16_64_t *gdtr_reg) { asm volatile ( @@ -364,5 +364,5 @@ * */ -NO_TRACE static inline void idtr_load(ptr_16_64_t *idtr_reg) +_NO_TRACE static inline void idtr_load(ptr_16_64_t *idtr_reg) { asm volatile ( @@ -376,5 +376,5 @@ * */ -NO_TRACE static inline void tr_load(uint16_t sel) +_NO_TRACE static inline void tr_load(uint16_t sel) { asm volatile ( @@ -384,5 +384,5 @@ } -#define GEN_READ_REG(reg) NO_TRACE static inline sysarg_t read_ ##reg (void) \ +#define GEN_READ_REG(reg) _NO_TRACE static inline sysarg_t read_ ##reg (void) \ { \ sysarg_t res; \ @@ -394,5 +394,5 @@ } -#define GEN_WRITE_REG(reg) NO_TRACE static inline void write_ ##reg (sysarg_t regn) \ +#define GEN_WRITE_REG(reg) _NO_TRACE static inline void write_ ##reg (sysarg_t regn) \ { \ asm volatile ( \ Index: kernel/arch/amd64/include/arch/cycle.h =================================================================== --- kernel/arch/amd64/include/arch/cycle.h (revision c878693123930f0906703462cf2807430679517e) +++ kernel/arch/amd64/include/arch/cycle.h (revision de9e28e0c0b35a214dcdc3688dc8579f50c5fbd6) @@ -38,5 +38,5 @@ #include -NO_TRACE static inline uint64_t get_cycle(void) +_NO_TRACE static inline uint64_t get_cycle(void) { uint32_t lower; Index: kernel/arch/amd64/include/arch/interrupt.h =================================================================== --- kernel/arch/amd64/include/arch/interrupt.h (revision c878693123930f0906703462cf2807430679517e) +++ kernel/arch/amd64/include/arch/interrupt.h (revision de9e28e0c0b35a214dcdc3688dc8579f50c5fbd6) @@ -61,6 +61,7 @@ /* NS16550 at COM1 */ #define IRQ_NS16550 4 -#define IRQ_PIC_SPUR 7 +#define IRQ_PIC0_SPUR 7 #define IRQ_MOUSE 12 +#define IRQ_PIC1_SPUR 15 /* This one must have four least significant bits set to ones */ @@ -77,5 +78,6 @@ #define VECTOR_PF (IVT_EXCBASE + EXC_PF) #define VECTOR_CLK (IVT_IRQBASE + IRQ_CLK) -#define VECTOR_PIC_SPUR (IVT_IRQBASE + IRQ_PIC_SPUR) +#define VECTOR_PIC0_SPUR (IVT_IRQBASE + IRQ_PIC0_SPUR) +#define VECTOR_PIC1_SPUR (IVT_IRQBASE + IRQ_PIC1_SPUR) #define VECTOR_SYSCALL IVT_FREEBASE #define VECTOR_TLB_SHOOTDOWN_IPI (IVT_FREEBASE + 1) @@ -84,5 +86,5 @@ extern void (*disable_irqs_function)(uint16_t); extern void (*enable_irqs_function)(uint16_t); -extern void (*eoi_function)(void); +extern void (*eoi_function)(unsigned int); extern const char *irqs_info; Index: kernel/arch/amd64/include/arch/istate.h =================================================================== --- kernel/arch/amd64/include/arch/istate.h (revision c878693123930f0906703462cf2807430679517e) +++ kernel/arch/amd64/include/arch/istate.h (revision de9e28e0c0b35a214dcdc3688dc8579f50c5fbd6) @@ -47,10 +47,10 @@ /** Return true if exception happened while in userspace */ -NO_TRACE static inline int istate_from_uspace(istate_t *istate) +_NO_TRACE static inline int istate_from_uspace(istate_t *istate) { return (istate->cs & RPL_USER) == RPL_USER; } -NO_TRACE static inline void istate_set_retaddr(istate_t *istate, +_NO_TRACE static inline void istate_set_retaddr(istate_t *istate, uintptr_t retaddr) { @@ -58,10 +58,10 @@ } -NO_TRACE static inline uintptr_t istate_get_pc(istate_t *istate) +_NO_TRACE static inline uintptr_t istate_get_pc(istate_t *istate) { return istate->rip; } -NO_TRACE static inline uintptr_t istate_get_fp(istate_t *istate) +_NO_TRACE static inline uintptr_t istate_get_fp(istate_t *istate) { return istate->rbp; Index: kernel/arch/amd64/include/arch/mm/as.h =================================================================== --- kernel/arch/amd64/include/arch/mm/as.h (revision c878693123930f0906703462cf2807430679517e) +++ kernel/arch/amd64/include/arch/mm/as.h (revision de9e28e0c0b35a214dcdc3688dc8579f50c5fbd6) @@ -40,4 +40,5 @@ #define KERNEL_ADDRESS_SPACE_SHADOWED_ARCH 0 +#define KERNEL_SEPARATE_PTL0_ARCH 0 #define KERNEL_ADDRESS_SPACE_START_ARCH UINT64_C(0xffff800000000000) Index: kernel/arch/amd64/include/arch/mm/page.h =================================================================== --- kernel/arch/amd64/include/arch/mm/page.h (revision c878693123930f0906703462cf2807430679517e) +++ kernel/arch/amd64/include/arch/mm/page.h (revision de9e28e0c0b35a214dcdc3688dc8579f50c5fbd6) @@ -207,5 +207,5 @@ } __attribute__((packed)) pte_t; -NO_TRACE static inline unsigned int get_pt_flags(pte_t *pt, size_t i) +_NO_TRACE static inline unsigned int get_pt_flags(pte_t *pt, size_t i) { pte_t *p = &pt[i]; @@ -220,5 +220,5 @@ } -NO_TRACE static inline void set_pt_addr(pte_t *pt, size_t i, uintptr_t a) +_NO_TRACE static inline void set_pt_addr(pte_t *pt, size_t i, uintptr_t a) { pte_t *p = &pt[i]; @@ -228,5 +228,5 @@ } -NO_TRACE static inline void set_pt_flags(pte_t *pt, size_t i, int flags) +_NO_TRACE static inline void set_pt_flags(pte_t *pt, size_t i, int flags) { pte_t *p = &pt[i]; @@ -245,5 +245,5 @@ } -NO_TRACE static inline void set_pt_present(pte_t *pt, size_t i) +_NO_TRACE static inline void set_pt_present(pte_t *pt, size_t i) { pte_t *p = &pt[i]; Index: kernel/arch/amd64/src/amd64.c =================================================================== --- kernel/arch/amd64/src/amd64.c (revision c878693123930f0906703462cf2807430679517e) +++ kernel/arch/amd64/src/amd64.c (revision de9e28e0c0b35a214dcdc3688dc8579f50c5fbd6) @@ -45,9 +45,9 @@ #include #include -#include #include #include #include #include +#include #include #include @@ -120,5 +120,15 @@ /* PIC */ - i8259_init(); + i8259_init((i8259_t *) I8259_PIC0_BASE, + (i8259_t *) I8259_PIC1_BASE, IVT_IRQBASE); + + /* + * Set the enable/disable IRQs handlers. + * Set the End-of-Interrupt handler. + */ + enable_irqs_function = pic_enable_irqs; + disable_irqs_function = pic_disable_irqs; + eoi_function = pic_eoi; + irqs_info = "i8259"; } } Index: kernel/arch/amd64/src/asm.S =================================================================== --- kernel/arch/amd64/src/asm.S (revision c878693123930f0906703462cf2807430679517e) +++ kernel/arch/amd64/src/asm.S (revision de9e28e0c0b35a214dcdc3688dc8579f50c5fbd6) @@ -398,8 +398,5 @@ .asciz "Invalid instruction pointer." -/** Print Unicode character to EGA display. - * - * If CONFIG_EGA is undefined or CONFIG_FB is defined - * then this function does nothing. +/** Print Unicode character to an early display device. * * Since the EGA can only display Extended ASCII (usually @@ -413,4 +410,11 @@ */ FUNCTION_BEGIN(early_putwchar) + +#if (defined(CONFIG_L4RE_UVMM_EARLY_PRINT)) + xorl %eax, %eax /* RAX==0: uvmm's print hypercall */ + mov %rdi, %rcx /* RCX: printed character */ + vmcall +#endif + #if ((defined(CONFIG_EGA)) && (!defined(CONFIG_FB))) Index: kernel/arch/amd64/src/interrupt.c =================================================================== --- kernel/arch/amd64/src/interrupt.c (revision c878693123930f0906703462cf2807430679517e) +++ kernel/arch/amd64/src/interrupt.c (revision de9e28e0c0b35a214dcdc3688dc8579f50c5fbd6) @@ -37,5 +37,5 @@ #include #include -#include +#include #include #include @@ -60,5 +60,5 @@ void (*disable_irqs_function)(uint16_t irqmask) = NULL; void (*enable_irqs_function)(uint16_t irqmask) = NULL; -void (*eoi_function)(void) = NULL; +void (*eoi_function)(unsigned int) = NULL; const char *irqs_info = NULL; @@ -91,8 +91,8 @@ } -static void trap_virtual_eoi(void) +static void trap_virtual_eoi(unsigned int irq) { if (eoi_function) - eoi_function(); + eoi_function(irq); else panic("No eoi_function."); @@ -157,5 +157,5 @@ static void tlb_shootdown_ipi(unsigned int n, istate_t *istate) { - trap_virtual_eoi(); + trap_virtual_eoi(0); tlb_shootdown_ipi_recv(); } @@ -172,5 +172,5 @@ bool ack = false; assert(inum < IRQ_COUNT); - assert((inum != IRQ_PIC_SPUR) && (inum != IRQ_PIC1)); + assert(inum != IRQ_PIC1); irq_t *irq = irq_dispatch_and_lock(inum); @@ -182,5 +182,5 @@ if (irq->preack) { /* Send EOI before processing the interrupt */ - trap_virtual_eoi(); + trap_virtual_eoi(inum); ack = true; } @@ -188,15 +188,27 @@ irq_spinlock_unlock(&irq->lock, false); } else { - /* - * Spurious interrupt. - */ #ifdef CONFIG_DEBUG - log(LF_ARCH, LVL_DEBUG, "cpu%u: spurious interrupt (inum=%u)", - CPU->id, inum); + log(LF_ARCH, LVL_DEBUG, "cpu%u: unhandled IRQ %u", CPU->id, + inum); #endif } if (!ack) - trap_virtual_eoi(); + trap_virtual_eoi(inum); +} + +static void pic_spurious(unsigned int n, istate_t *istate) +{ + unsigned int inum = n - IVT_IRQBASE; + if (!pic_is_spurious(inum)) { + /* This is actually not a spurious IRQ, so proceed as usual. */ + irq_interrupt(n, istate); + return; + } + pic_handle_spurious(n); +#ifdef CONFIG_DEBUG + log(LF_ARCH, LVL_DEBUG, "cpu%u: PIC spurious interrupt %u", CPU->id, + inum); +#endif } @@ -209,5 +221,6 @@ for (i = 0; i < IRQ_COUNT; i++) { - if ((i != IRQ_PIC_SPUR) && (i != IRQ_PIC1)) + if ((i != IRQ_PIC0_SPUR) && (i != IRQ_PIC1_SPUR) && + (i != IRQ_PIC1)) exc_register(IVT_IRQBASE + i, "irq", true, (iroutine_t) irq_interrupt); @@ -218,4 +231,8 @@ exc_register(VECTOR_SS, "ss_fault", true, (iroutine_t) ss_fault); exc_register(VECTOR_GP, "gp_fault", true, (iroutine_t) gp_fault); + exc_register(VECTOR_PIC0_SPUR, "pic0_spurious", true, + (iroutine_t) pic_spurious); + exc_register(VECTOR_PIC1_SPUR, "pic1_spurious", true, + (iroutine_t) pic_spurious); #ifdef CONFIG_SMP Index: kernel/arch/arm32/include/arch/asm.h =================================================================== --- kernel/arch/arm32/include/arch/asm.h (revision c878693123930f0906703462cf2807430679517e) +++ kernel/arch/arm32/include/arch/asm.h (revision de9e28e0c0b35a214dcdc3688dc8579f50c5fbd6) @@ -56,5 +56,5 @@ * only for armv6+. */ -NO_TRACE static inline void cpu_sleep(void) +_NO_TRACE static inline void cpu_sleep(void) { #ifdef PROCESSOR_ARCH_armv7_a @@ -65,30 +65,30 @@ } -NO_TRACE static inline void pio_write_8(ioport8_t *port, uint8_t v) +_NO_TRACE static inline void pio_write_8(ioport8_t *port, uint8_t v) { *port = v; } -NO_TRACE static inline void pio_write_16(ioport16_t *port, uint16_t v) +_NO_TRACE static inline void pio_write_16(ioport16_t *port, uint16_t v) { *port = v; } -NO_TRACE static inline void pio_write_32(ioport32_t *port, uint32_t v) +_NO_TRACE static inline void pio_write_32(ioport32_t *port, uint32_t v) { *port = v; } -NO_TRACE static inline uint8_t pio_read_8(ioport8_t *port) +_NO_TRACE static inline uint8_t pio_read_8(ioport8_t *port) { return *port; } -NO_TRACE static inline uint16_t pio_read_16(ioport16_t *port) +_NO_TRACE static inline uint16_t pio_read_16(ioport16_t *port) { return *port; } -NO_TRACE static inline uint32_t pio_read_32(ioport32_t *port) +_NO_TRACE static inline uint32_t pio_read_32(ioport32_t *port) { return *port; @@ -102,5 +102,5 @@ * */ -NO_TRACE static inline uintptr_t get_stack_base(void) +_NO_TRACE static inline uintptr_t get_stack_base(void) { uintptr_t v; Index: kernel/arch/arm32/include/arch/context.h =================================================================== --- kernel/arch/arm32/include/arch/context.h (revision c878693123930f0906703462cf2807430679517e) +++ kernel/arch/arm32/include/arch/context.h (revision de9e28e0c0b35a214dcdc3688dc8579f50c5fbd6) @@ -40,4 +40,5 @@ #include #include +#include /* Put one item onto the stack to support get_stack_base() and align it up. */ @@ -49,4 +50,5 @@ (c)->sp = ((uintptr_t) (stack)) + (size) - SP_DELTA; \ (c)->fp = 0; \ + (c)->cpu_mode = SUPERVISOR_MODE; \ } while (0) Index: kernel/arch/arm32/include/arch/cycle.h =================================================================== --- kernel/arch/arm32/include/arch/cycle.h (revision c878693123930f0906703462cf2807430679517e) +++ kernel/arch/arm32/include/arch/cycle.h (revision de9e28e0c0b35a214dcdc3688dc8579f50c5fbd6) @@ -47,5 +47,5 @@ * */ -NO_TRACE static inline uint64_t get_cycle(void) +_NO_TRACE static inline uint64_t get_cycle(void) { #ifdef PROCESSOR_ARCH_armv7_a Index: kernel/arch/arm32/include/arch/istate.h =================================================================== --- kernel/arch/arm32/include/arch/istate.h (revision c878693123930f0906703462cf2807430679517e) +++ kernel/arch/arm32/include/arch/istate.h (revision de9e28e0c0b35a214dcdc3688dc8579f50c5fbd6) @@ -55,5 +55,5 @@ * */ -NO_TRACE static inline void istate_set_retaddr(istate_t *istate, +_NO_TRACE static inline void istate_set_retaddr(istate_t *istate, uintptr_t retaddr) { @@ -62,5 +62,5 @@ /** Return true if exception happened while in userspace. */ -NO_TRACE static inline int istate_from_uspace(istate_t *istate) +_NO_TRACE static inline int istate_from_uspace(istate_t *istate) { return (istate->spsr & STATUS_REG_MODE_MASK) == USER_MODE; @@ -68,10 +68,10 @@ /** Return Program Counter member of given istate structure. */ -NO_TRACE static inline uintptr_t istate_get_pc(istate_t *istate) +_NO_TRACE static inline uintptr_t istate_get_pc(istate_t *istate) { return istate->pc; } -NO_TRACE static inline uintptr_t istate_get_fp(istate_t *istate) +_NO_TRACE static inline uintptr_t istate_get_fp(istate_t *istate) { return istate->fp; Index: kernel/arch/arm32/include/arch/mm/as.h =================================================================== --- kernel/arch/arm32/include/arch/mm/as.h (revision c878693123930f0906703462cf2807430679517e) +++ kernel/arch/arm32/include/arch/mm/as.h (revision de9e28e0c0b35a214dcdc3688dc8579f50c5fbd6) @@ -38,4 +38,5 @@ #define KERNEL_ADDRESS_SPACE_SHADOWED_ARCH 0 +#define KERNEL_SEPARATE_PTL0_ARCH 0 #define KERNEL_ADDRESS_SPACE_START_ARCH UINT32_C(0x80000000) Index: kernel/arch/arm32/include/arch/mm/page.h =================================================================== --- kernel/arch/arm32/include/arch/mm/page.h (revision c878693123930f0906703462cf2807430679517e) +++ kernel/arch/arm32/include/arch/mm/page.h (revision de9e28e0c0b35a214dcdc3688dc8579f50c5fbd6) @@ -151,5 +151,5 @@ * set_pt_level1_flags (kernel/arch/arm32/include/arch/mm/page_armv6.h) */ -NO_TRACE static inline void set_ptl0_addr(pte_t *pt) +_NO_TRACE static inline void set_ptl0_addr(pte_t *pt) { uint32_t val = (uint32_t)pt & TTBR_ADDR_MASK; @@ -161,5 +161,5 @@ } -NO_TRACE static inline void set_ptl1_addr(pte_t *pt, size_t i, uintptr_t address) +_NO_TRACE static inline void set_ptl1_addr(pte_t *pt, size_t i, uintptr_t address) { pt[i].l0.coarse_table_addr = address >> 10; @@ -167,5 +167,5 @@ } -NO_TRACE static inline void set_ptl3_addr(pte_t *pt, size_t i, uintptr_t address) +_NO_TRACE static inline void set_ptl3_addr(pte_t *pt, size_t i, uintptr_t address) { pt[i].l1.frame_base_addr = address >> 12; Index: kernel/arch/arm32/include/arch/mm/page_armv4.h =================================================================== --- kernel/arch/arm32/include/arch/mm/page_armv4.h (revision c878693123930f0906703462cf2807430679517e) +++ kernel/arch/arm32/include/arch/mm/page_armv4.h (revision de9e28e0c0b35a214dcdc3688dc8579f50c5fbd6) @@ -137,5 +137,5 @@ * */ -NO_TRACE static inline int get_pt_level0_flags(pte_t *pt, size_t i) +_NO_TRACE static inline int get_pt_level0_flags(pte_t *pt, size_t i) { pte_level0_t *p = &pt[i].l0; @@ -153,5 +153,5 @@ * */ -NO_TRACE static inline int get_pt_level1_flags(pte_t *pt, size_t i) +_NO_TRACE static inline int get_pt_level1_flags(pte_t *pt, size_t i) { pte_level1_t *p = &pt[i].l1; @@ -178,5 +178,5 @@ * */ -NO_TRACE static inline void set_pt_level0_flags(pte_t *pt, size_t i, int flags) +_NO_TRACE static inline void set_pt_level0_flags(pte_t *pt, size_t i, int flags) { pte_level0_t *p = &pt[i].l0; @@ -206,5 +206,5 @@ * */ -NO_TRACE static inline void set_pt_level1_flags(pte_t *pt, size_t i, int flags) +_NO_TRACE static inline void set_pt_level1_flags(pte_t *pt, size_t i, int flags) { pte_level1_t *p = &pt[i].l1; @@ -236,5 +236,5 @@ } -NO_TRACE static inline void set_pt_level0_present(pte_t *pt, size_t i) +_NO_TRACE static inline void set_pt_level0_present(pte_t *pt, size_t i) { pte_level0_t *p = &pt[i].l0; @@ -245,5 +245,5 @@ } -NO_TRACE static inline void set_pt_level1_present(pte_t *pt, size_t i) +_NO_TRACE static inline void set_pt_level1_present(pte_t *pt, size_t i) { pte_level1_t *p = &pt[i].l1; Index: kernel/arch/arm32/include/arch/mm/page_armv6.h =================================================================== --- kernel/arch/arm32/include/arch/mm/page_armv6.h (revision c878693123930f0906703462cf2807430679517e) +++ kernel/arch/arm32/include/arch/mm/page_armv6.h (revision de9e28e0c0b35a214dcdc3688dc8579f50c5fbd6) @@ -164,5 +164,5 @@ * */ -NO_TRACE static inline int get_pt_level0_flags(pte_t *pt, size_t i) +_NO_TRACE static inline int get_pt_level0_flags(pte_t *pt, size_t i) { const pte_level0_t *p = &pt[i].l0; @@ -180,5 +180,5 @@ * */ -NO_TRACE static inline int get_pt_level1_flags(pte_t *pt, size_t i) +_NO_TRACE static inline int get_pt_level1_flags(pte_t *pt, size_t i) { const pte_level1_t *p = &pt[i].l1; @@ -206,5 +206,5 @@ * */ -NO_TRACE static inline void set_pt_level0_flags(pte_t *pt, size_t i, int flags) +_NO_TRACE static inline void set_pt_level0_flags(pte_t *pt, size_t i, int flags) { pte_level0_t *p = &pt[i].l0; @@ -239,5 +239,5 @@ * */ -NO_TRACE static inline void set_pt_level1_flags(pte_t *pt, size_t i, int flags) +_NO_TRACE static inline void set_pt_level1_flags(pte_t *pt, size_t i, int flags) { pte_level1_t *p = &pt[i].l1; @@ -297,5 +297,5 @@ } -NO_TRACE static inline void set_pt_level0_present(pte_t *pt, size_t i) +_NO_TRACE static inline void set_pt_level0_present(pte_t *pt, size_t i) { pte_level0_t *p = &pt[i].l0; @@ -307,5 +307,5 @@ } -NO_TRACE static inline void set_pt_level1_present(pte_t *pt, size_t i) +_NO_TRACE static inline void set_pt_level1_present(pte_t *pt, size_t i) { pte_level1_t *p = &pt[i].l1; Index: kernel/arch/arm32/src/mm/tlb.c =================================================================== --- kernel/arch/arm32/src/mm/tlb.c (revision c878693123930f0906703462cf2807430679517e) +++ kernel/arch/arm32/src/mm/tlb.c (revision de9e28e0c0b35a214dcdc3688dc8579f50c5fbd6) @@ -76,5 +76,5 @@ /** Invalidate single entry in TLB * - * @param page Virtual adress of the page + * @param page Virtual address of the page */ static inline void invalidate_page(uintptr_t page) Index: kernel/arch/arm64/Makefile.inc =================================================================== --- kernel/arch/arm64/Makefile.inc (revision de9e28e0c0b35a214dcdc3688dc8579f50c5fbd6) +++ kernel/arch/arm64/Makefile.inc (revision de9e28e0c0b35a214dcdc3688dc8579f50c5fbd6) @@ -0,0 +1,68 @@ +# +# Copyright (c) 2015 Petr Pavlu +# 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. +# + +BFD_NAME = elf64-littleaarch64 +BFD_ARCH = aarch64 +BFD = binary + +COMMON_CFLAGS += -fno-omit-frame-pointer -march=armv8-a+nofp+nosimd \ + -mgeneral-regs-only + +BITS = 64 +ENDIANESS = LE + +ARCH_SOURCES = \ + arch/$(KARCH)/src/arm64.c \ + arch/$(KARCH)/src/asm.S \ + arch/$(KARCH)/src/context.S \ + arch/$(KARCH)/src/cpu/cpu.c \ + arch/$(KARCH)/src/debug/stacktrace.c \ + arch/$(KARCH)/src/debug/stacktrace_asm.S \ + arch/$(KARCH)/src/exception.c \ + arch/$(KARCH)/src/fpu.S \ + arch/$(KARCH)/src/fpu_context.c \ + arch/$(KARCH)/src/interrupt.c \ + arch/$(KARCH)/src/machine_func.c \ + arch/$(KARCH)/src/mm/as.c \ + arch/$(KARCH)/src/mm/frame.c \ + arch/$(KARCH)/src/mm/km.c \ + arch/$(KARCH)/src/mm/page.c \ + arch/$(KARCH)/src/mm/tlb.c \ + arch/$(KARCH)/src/smc.c \ + arch/$(KARCH)/src/smp/ipi.c \ + arch/$(KARCH)/src/smp/smp.c \ + arch/$(KARCH)/src/start.S + +ifeq ($(MACHINE),virt) + ARCH_SOURCES += arch/$(KARCH)/src/mach/virt/virt.c +endif + +ARCH_AUTOCHECK_HEADERS = \ + arch/$(KARCH)/include/arch/context_struct.h \ + arch/$(KARCH)/include/arch/fpu_context_struct.h \ + arch/$(KARCH)/include/arch/istate_struct.h Index: kernel/arch/arm64/_link.ld.in =================================================================== --- kernel/arch/arm64/_link.ld.in (revision de9e28e0c0b35a214dcdc3688dc8579f50c5fbd6) +++ kernel/arch/arm64/_link.ld.in (revision de9e28e0c0b35a214dcdc3688dc8579f50c5fbd6) @@ -0,0 +1,60 @@ +/* + * ARM64 linker script + * + * kernel text + * kernel data + * + */ + +#include +#include + +#define LOAD_ADDRESS_V (KM_ARM64_IDENTITY_START + BOOT_OFFSET) +#define LOAD_ADDRESS_P BOOT_OFFSET + +OUTPUT_ARCH(aarch64) +ENTRY(kernel_image_start) + +SECTIONS { + kernel_load_address = LOAD_ADDRESS_V; + + .image (LOAD_ADDRESS_V + SIZEOF_HEADERS) : AT (LOAD_ADDRESS_P + SIZEOF_HEADERS) { + . = ALIGN(16); + ktext_start = .; + *(K_TEXT_START) + *(.text .text.*); + ktext_end = .; + + kdata_start = .; + *(K_DATA_START) + *(.data); /* initialized data */ + *(.bss); /* uninitialized static variables */ + *(COMMON); /* global variables */ + + *(.rodata*); + . = ALIGN(8); + symbol_table = .; + *(symtab.*); + + kdata_end = .; + } + +#ifdef CONFIG_LINE_DEBUG + .comment 0 : { *(.comment); } + .debug_abbrev 0 : { *(.debug_abbrev); } + .debug_aranges 0 : { *(.debug_aranges); } + .debug_frame 0 : { *(.debug_frame); } + .debug_info 0 : { *(.debug_info); } + .debug_line 0 : { *(.debug_line); } + .debug_loc 0 : { *(.debug_loc); } + .debug_macinfo 0 : { *(.debug_macinfo); } + .debug_pubnames 0 : { *(.debug_pubnames); } + .debug_pubtypes 0 : { *(.debug_pubtypes); } + .debug_ranges 0 : { *(.debug_ranges); } + .debug_str 0 : { *(.debug_str); } +#endif + + /DISCARD/ : { + *(*); + } +} Index: kernel/arch/arm64/include/arch/arch.h =================================================================== --- kernel/arch/arm64/include/arch/arch.h (revision de9e28e0c0b35a214dcdc3688dc8579f50c5fbd6) +++ kernel/arch/arm64/include/arch/arch.h (revision de9e28e0c0b35a214dcdc3688dc8579f50c5fbd6) @@ -0,0 +1,46 @@ +/* + * Copyright (c) 2015 Petr Pavlu + * 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 kernel_arm64 + * @{ + */ +/** @file + * @brief Various ARM64-specific macros. + */ + +#ifndef KERN_arm64_ARCH_H_ +#define KERN_arm64_ARCH_H_ + +#include + +extern void arm64_pre_main(void *entry, bootinfo_t *bootinfo); + +#endif + +/** @} + */ Index: kernel/arch/arm64/include/arch/asm.h =================================================================== --- kernel/arch/arm64/include/arch/asm.h (revision de9e28e0c0b35a214dcdc3688dc8579f50c5fbd6) +++ kernel/arch/arm64/include/arch/asm.h (revision de9e28e0c0b35a214dcdc3688dc8579f50c5fbd6) @@ -0,0 +1,146 @@ +/* + * Copyright (c) 2015 Petr Pavlu + * 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 kernel_arm64 + * @{ + */ +/** @file + * @brief Declarations of functions implemented in assembly. + */ + +#ifndef KERN_arm64_ASM_H_ +#define KERN_arm64_ASM_H_ + +#include +#include + +extern char exc_vector; + +/* + * Note: Function asm_delay_loop() is defined in arm64.c but declared here + * because the generic kernel code expects it in arch/asm.h. + */ +extern void asm_delay_loop(uint32_t usec); + +/** CPU specific way to sleep cpu. */ +_NO_TRACE static inline void cpu_sleep(void) +{ + asm volatile ("wfe"); +} + +/** Return base address of current stack. + * + * Return the base address of the current stack. + * The stack is assumed to be STACK_SIZE bytes long. + * The stack must start on page boundary. + */ +_NO_TRACE static inline uintptr_t get_stack_base(void) +{ + uintptr_t v; + + asm volatile ( + "mov %[v], sp\n" + "and %[v], %[v], %[size]\n" + : [v] "=&r" (v) + : [size] "r" (~((uint64_t) STACK_SIZE - 1)) + ); + + return v; +} + +/** Halts CPU. */ +_NO_TRACE static inline __attribute__((noreturn)) void cpu_halt(void) +{ + while (true) + ; +} + +/** Output byte to port. + * + * @param port Port to write to. + * @param val Value to write. + */ +_NO_TRACE static inline void pio_write_8(ioport8_t *port, uint8_t val) +{ + *port = val; +} + +/** Output half-word to port. + * + * @param port Port to write to. + * @param val Value to write. + */ +_NO_TRACE static inline void pio_write_16(ioport16_t *port, uint16_t val) +{ + *port = val; +} + +/** Output word to port. + * + * @param port Port to write to. + * @param val Value to write. + */ +_NO_TRACE static inline void pio_write_32(ioport32_t *port, uint32_t val) +{ + *port = val; +} + +/** Get byte from port. + * + * @param port Port to read from. + * @return Value read. + */ +_NO_TRACE static inline uint8_t pio_read_8(const ioport8_t *port) +{ + return *port; +} + +/** Get word from port. + * + * @param port Port to read from. + * @return Value read. + */ +_NO_TRACE static inline uint16_t pio_read_16(const ioport16_t *port) +{ + return *port; +} + +/** Get double word from port. + * + * @param port Port to read from. + * @return Value read. + */ +_NO_TRACE static inline uint32_t pio_read_32(const ioport32_t *port) +{ + return *port; +} + +#endif + +/** @} + */ Index: kernel/arch/arm64/include/arch/barrier.h =================================================================== --- kernel/arch/arm64/include/arch/barrier.h (revision de9e28e0c0b35a214dcdc3688dc8579f50c5fbd6) +++ kernel/arch/arm64/include/arch/barrier.h (revision de9e28e0c0b35a214dcdc3688dc8579f50c5fbd6) @@ -0,0 +1,82 @@ +/* + * Copyright (c) 2015 Petr Pavlu + * 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 kernel_arm64 + * @{ + */ +/** @file + * @brief Memory barriers. + */ + +#ifndef KERN_arm64_BARRIER_H_ +#define KERN_arm64_BARRIER_H_ + +#include + +#define COHERENCE_INVAL_MIN 4 + +/** Ensure visibility of instruction updates for a multiprocessor. + * + * @param addr Address of the first instruction. + * @param size Size of the instruction block (in bytes). + */ +static inline void ensure_visibility(void *addr, size_t len) +{ + size_t i; + + /* + * Clean to Point of Unification to make the new instructions visible to + * the instruction cache. + */ + for (i = 0; i < len; i += COHERENCE_INVAL_MIN) + asm volatile ( + "dc cvau, %[addr]\n" + : : [addr] "r" ((char *) addr + i) + ); + + /* Ensure completion on all PEs. */ + asm volatile ("dsb ish" ::: "memory"); + + /* Ensure instruction cache/branch predictor discards stale data. */ + for (i = 0; i < len; i += COHERENCE_INVAL_MIN) + asm volatile ( + "ic ivau, %[addr]\n" + : : [addr] "r" ((char *) addr + i) + ); + + /* Ensure completion on all PEs. */ + asm volatile ("dsb ish" ::: "memory"); + + /* Synchronize context on this PE. */ + asm volatile ("isb"); +} + +#endif + +/** @} + */ Index: kernel/arch/arm64/include/arch/boot/boot.h =================================================================== --- kernel/arch/arm64/include/arch/boot/boot.h (revision de9e28e0c0b35a214dcdc3688dc8579f50c5fbd6) +++ kernel/arch/arm64/include/arch/boot/boot.h (revision de9e28e0c0b35a214dcdc3688dc8579f50c5fbd6) @@ -0,0 +1,107 @@ +/* + * Copyright (c) 2015 Petr Pavlu + * 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 kernel_arm64 + * @{ + */ +/** @file + * @brief Shared interface between the bootcode and the kernel. + */ + +#ifndef KERN_arm64_BOOT_H_ +#define KERN_arm64_BOOT_H_ + +#define BOOT_OFFSET 0x80000 + +#ifndef __ASSEMBLER__ +#include + +#define BOOTINFO_TASK_NAME_BUFLEN 32 +#define TASKMAP_MAX_RECORDS 32 +#define MEMMAP_MAX_RECORDS 128 + +/** Task structure. */ +typedef struct { + /** Address where the task was placed. */ + void *addr; + /** Size of the task's binary. */ + size_t size; + /** Task name. */ + char name[BOOTINFO_TASK_NAME_BUFLEN]; +} utask_t; + +/** Task map structure. */ +typedef struct { + /** Number of boot tasks. */ + size_t cnt; + /** Boot task data. */ + utask_t tasks[TASKMAP_MAX_RECORDS]; +} taskmap_t; + +/** Memory zone types. */ +typedef enum { + /** Unusuable memory. */ + MEMTYPE_UNUSABLE, + /** Usable memory. */ + MEMTYPE_AVAILABLE, + /** Memory that can be used after ACPI is enabled. */ + MEMTYPE_ACPI_RECLAIM +} memtype_t; + +/** Memory area. */ +typedef struct { + /** Type of the memory. */ + memtype_t type; + /** Address of the area. */ + void *start; + /** Size of the area. */ + size_t size; +} memzone_t; + +/** System memory map. */ +typedef struct { + /** Number of memory zones. */ + size_t cnt; + /** Memory zones. */ + memzone_t zones[MEMMAP_MAX_RECORDS]; +} memmap_t; + +/** Bootinfo structure. */ +typedef struct { + /** Task map. */ + taskmap_t taskmap; + /** Memory map. */ + memmap_t memmap; +} bootinfo_t; + +#endif /* __ASSEMBLER__ */ + +#endif + +/** @} + */ Index: kernel/arch/arm64/include/arch/context.h =================================================================== --- kernel/arch/arm64/include/arch/context.h (revision de9e28e0c0b35a214dcdc3688dc8579f50c5fbd6) +++ kernel/arch/arm64/include/arch/context.h (revision de9e28e0c0b35a214dcdc3688dc8579f50c5fbd6) @@ -0,0 +1,57 @@ +/* + * Copyright (c) 2015 Petr Pavlu + * 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 kernel_arm64 + * @{ + */ +/** @file + * @brief Thread context. + */ + +#ifndef KERN_arm64_CONTEXT_H_ +#define KERN_arm64_CONTEXT_H_ + +#include +#include +#include + +/* Put one item onto the stack to support get_stack_base() and align it up. */ +#define SP_DELTA (0 + ALIGN_UP(STACK_ITEM_SIZE, STACK_ALIGNMENT)) + +#define context_set(c, _pc, stack, size) \ + do { \ + (c)->pc = (uint64_t) (_pc); \ + (c)->sp = ((uint64_t) (stack)) + (size) - SP_DELTA; \ + /* Set frame pointer too. */ \ + (c)->x29 = 0; \ + } while (0) + +#endif + +/** @} + */ Index: kernel/arch/arm64/include/arch/context_struct.h =================================================================== --- kernel/arch/arm64/include/arch/context_struct.h (revision de9e28e0c0b35a214dcdc3688dc8579f50c5fbd6) +++ kernel/arch/arm64/include/arch/context_struct.h (revision de9e28e0c0b35a214dcdc3688dc8579f50c5fbd6) @@ -0,0 +1,74 @@ +/* + * Copyright (c) 2015 Petr Pavlu + * All rights preserved. + * + * 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 KERN_ARCH_CONTEXT_STRUCT_H_ +#define KERN_ARCH_CONTEXT_STRUCT_H_ + +#define CONTEXT_OFFSET_SP 0x00 +#define CONTEXT_OFFSET_PC 0x08 +#define CONTEXT_OFFSET_X19 0x10 +#define CONTEXT_OFFSET_X20 0x18 +#define CONTEXT_OFFSET_X21 0x20 +#define CONTEXT_OFFSET_X22 0x28 +#define CONTEXT_OFFSET_X23 0x30 +#define CONTEXT_OFFSET_X24 0x38 +#define CONTEXT_OFFSET_X25 0x40 +#define CONTEXT_OFFSET_X26 0x48 +#define CONTEXT_OFFSET_X27 0x50 +#define CONTEXT_OFFSET_X28 0x58 +#define CONTEXT_OFFSET_X29 0x60 +#define CONTEXT_OFFSET_IPL 0x68 +#define CONTEXT_SIZE 0x70 + +#ifndef __ASSEMBLER__ + +#include + +/* + * Thread context containing registers that must be preserved across function + * calls. + */ +typedef struct context { + uint64_t sp; + uint64_t pc; + uint64_t x19; + uint64_t x20; + uint64_t x21; + uint64_t x22; + uint64_t x23; + uint64_t x24; + uint64_t x25; + uint64_t x26; + uint64_t x27; + uint64_t x28; + uint64_t x29; + ipl_t ipl; +} context_t; + +#endif +#endif Index: kernel/arch/arm64/include/arch/cpu.h =================================================================== --- kernel/arch/arm64/include/arch/cpu.h (revision de9e28e0c0b35a214dcdc3688dc8579f50c5fbd6) +++ kernel/arch/arm64/include/arch/cpu.h (revision de9e28e0c0b35a214dcdc3688dc8579f50c5fbd6) @@ -0,0 +1,57 @@ +/* + * Copyright (c) 2015 Petr Pavlu + * 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 kernel_arm64 + * @{ + */ +/** @file + * @brief CPU identification. + */ + +#ifndef KERN_arm64_CPU_H_ +#define KERN_arm64_CPU_H_ + +/** Struct representing ARM CPU identification. */ +typedef struct { + /** Implementer (vendor) number. */ + uint32_t implementer; + + /** Variant number. */ + uint32_t variant; + + /** Primary part number. */ + uint32_t partnum; + + /** Revision number. */ + uint32_t revision; +} cpu_arch_t; + +#endif + +/** @} + */ Index: kernel/arch/arm64/include/arch/cycle.h =================================================================== --- kernel/arch/arm64/include/arch/cycle.h (revision de9e28e0c0b35a214dcdc3688dc8579f50c5fbd6) +++ kernel/arch/arm64/include/arch/cycle.h (revision de9e28e0c0b35a214dcdc3688dc8579f50c5fbd6) @@ -0,0 +1,55 @@ +/* + * Copyright (c) 2015 Petr Pavlu + * 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 kernel_arm64 + * @{ + */ +/** @file + * @brief Information about a current cycle. + */ + +#ifndef KERN_arm64_CYCLE_H_ +#define KERN_arm64_CYCLE_H_ + +#include +#include + +/** Get a current cycle. + * + * No instruction exists on ARM64 to get the actual CPU cycle. The function + * instead returns the value of the virtual counter. + */ +_NO_TRACE static inline uint64_t get_cycle(void) +{ + return CNTVCT_EL0_read(); +} + +#endif + +/** @} + */ Index: kernel/arch/arm64/include/arch/exception.h =================================================================== --- kernel/arch/arm64/include/arch/exception.h (revision de9e28e0c0b35a214dcdc3688dc8579f50c5fbd6) +++ kernel/arch/arm64/include/arch/exception.h (revision de9e28e0c0b35a214dcdc3688dc8579f50c5fbd6) @@ -0,0 +1,98 @@ +/* + * Copyright (c) 2016 Petr Pavlu + * + * 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 kernel_arm64 + * @{ + */ +/** @file + * @brief Exception declarations. + */ + +#ifndef KERN_arm64_EXCEPTION_H_ +#define KERN_arm64_EXCEPTION_H_ + +/* Exception numbers. */ + +/** Current Exception level with SP_EL0, Synchronous. */ +#define EXC_CURRENT_EL_SP_SEL0_SYNCH 0 +/** Current Exception level with SP_EL0, IRQ or vIRQ. */ +#define EXC_CURRENT_EL_SP_SEL0_IRQ 1 +/** Current Exception level with SP_EL0, FIQ or vFIQ. */ +#define EXC_CURRENT_EL_SP_SEL0_FIQ 2 +/** Current Exception level with SP_EL0, SError or vSError. */ +#define EXC_CURRENT_EL_SP_SEL0_SERROR 3 +/** Current Exception level with SP_ELx, x > 0, Synchronous. */ +#define EXC_CURRENT_EL_SP_SELX_SYNCH 4 +/** Current Exception level with SP_ELx, x > 0, IRQ or vIRQ. */ +#define EXC_CURRENT_EL_SP_SELX_IRQ 5 +/** Current Exception level with SP_ELx, x > 0, FIQ or vFIQ. */ +#define EXC_CURRENT_EL_SP_SELX_FIQ 6 +/** Current Exception level with SP_ELx, x > 0, SError or vSError. */ +#define EXC_CURRENT_EL_SP_SELX_SERROR 7 +/** Lower Exception level, where the implemented level immediately lower than + * the target level is using AArch64, Synchronous. + */ +#define EXC_LOWER_EL_AARCH64_SYNCH 8 +/** Lower Exception level, where the implemented level immediately lower than + * the target level is using AArch64, IRQ or vIRQ. + */ +#define EXC_LOWER_EL_AARCH64_IRQ 9 +/** Lower Exception level, where the implemented level immediately lower than + * the target level is using AArch64, FIQ or vFIQ. + */ +#define EXC_LOWER_EL_AARCH64_FIQ 10 +/** Lower Exception level, where the implemented level immediately lower than + * the target level is using AArch64, SError or vSError. + */ +#define EXC_LOWER_EL_AARCH64_SERROR 11 +/** Lower Exception level, where the implemented level immediately lower than + * the target level is using AArch32, Synchronous. + */ +#define EXC_LOWER_EL_AARCH32_SYNCH 12 +/** Lower Exception level, where the implemented level immediately lower than + * the target level is using AArch32, IRQ or vIRQ. + */ +#define EXC_LOWER_EL_AARCH32_IRQ 13 +/** Lower Exception level, where the implemented level immediately lower than + * the target level is using AArch32, FIQ or vFIQ. + */ +#define EXC_LOWER_EL_AARCH32_FIQ 14 +/** Lower Exception level, where the implemented level immediately lower than + * the target level is using AArch32, SError or vSError. + */ +#define EXC_LOWER_EL_AARCH32_SERROR 15 + +#ifndef __ASSEMBLER__ +extern void exception_init(void); +#endif /* __ASSEMBLER__ */ + +#endif + +/** @} + */ Index: kernel/arch/arm64/include/arch/faddr.h =================================================================== --- kernel/arch/arm64/include/arch/faddr.h (revision de9e28e0c0b35a214dcdc3688dc8579f50c5fbd6) +++ kernel/arch/arm64/include/arch/faddr.h (revision de9e28e0c0b35a214dcdc3688dc8579f50c5fbd6) @@ -0,0 +1,50 @@ +/* + * Copyright (c) 2015 Petr Pavlu + * 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 kernel_arm64 + * @{ + */ +/** @file + * @brief Function address conversion. + */ + +#ifndef KERN_arm64_FADDR_H_ +#define KERN_arm64_FADDR_H_ + +#include + +/** Calculate absolute address of function referenced by fptr pointer. + * + * @param fptr Function pointer. + */ +#define FADDR(fptr) ((uintptr_t) (fptr)) + +#endif + +/** @} + */ Index: kernel/arch/arm64/include/arch/fpu_context.h =================================================================== --- kernel/arch/arm64/include/arch/fpu_context.h (revision de9e28e0c0b35a214dcdc3688dc8579f50c5fbd6) +++ kernel/arch/arm64/include/arch/fpu_context.h (revision de9e28e0c0b35a214dcdc3688dc8579f50c5fbd6) @@ -0,0 +1,46 @@ +/* + * Copyright (c) 2015 Petr Pavlu + * 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 kernel_arm64 + * @{ + */ +/** @file + * @brief FPU context. + */ + +#ifndef KERN_arm64_FPU_CONTEXT_H_ +#define KERN_arm64_FPU_CONTEXT_H_ + +#include + +#define FPU_CONTEXT_ALIGN 16 + +#endif + +/** @} + */ Index: kernel/arch/arm64/include/arch/fpu_context_struct.h =================================================================== --- kernel/arch/arm64/include/arch/fpu_context_struct.h (revision de9e28e0c0b35a214dcdc3688dc8579f50c5fbd6) +++ kernel/arch/arm64/include/arch/fpu_context_struct.h (revision de9e28e0c0b35a214dcdc3688dc8579f50c5fbd6) @@ -0,0 +1,50 @@ +/* + * Copyright (c) 2018 Petr Pavlu + * All rights preserved. + * + * 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 KERN_ARCH_FPU_CONTEXT_STRUCT_H_ +#define KERN_ARCH_FPU_CONTEXT_STRUCT_H_ + +#define FPU_CONTEXT_OFFSET_VREGS 0x000 +#define FPU_CONTEXT_OFFSET_FPCR 0x200 +#define FPU_CONTEXT_OFFSET_FPSR 0x204 +#define FPU_CONTEXT_SIZE 0x210 + +#ifndef __ASSEMBLER__ + +#include +#include <_bits/int128_t.h> + +/** ARM64 FPU context. */ +typedef struct fpu_context { + uint128_t vregs[32]; + uint32_t fpcr; + uint32_t fpsr; +} fpu_context_t; + +#endif +#endif Index: kernel/arch/arm64/include/arch/interrupt.h =================================================================== --- kernel/arch/arm64/include/arch/interrupt.h (revision de9e28e0c0b35a214dcdc3688dc8579f50c5fbd6) +++ kernel/arch/arm64/include/arch/interrupt.h (revision de9e28e0c0b35a214dcdc3688dc8579f50c5fbd6) @@ -0,0 +1,63 @@ +/* + * Copyright (c) 2015 Petr Pavlu + * 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 kernel_arm64_interrupt + * @{ + */ +/** @file + * @brief Declarations of interrupt controlling routines. + */ + +#ifndef KERN_arm64_INTERRUPT_H_ +#define KERN_arm64_INTERRUPT_H_ + +#include +#include +#include + +/** Size of exception table. */ +#define IVT_ITEMS 16 + +/** Index of the first item in exception table. */ +#define IVT_FIRST 0 + +/* REVISIT */ +/* This needs to be defined for inter-architecture API portability. */ +#define VECTOR_TLB_SHOOTDOWN_IPI 0 + +extern ipl_t interrupts_disable(void); +extern ipl_t interrupts_enable(void); +extern void interrupts_restore(ipl_t ipl); +extern ipl_t interrupts_read(void); +extern bool interrupts_disabled(void); +extern void interrupt_init(void); + +#endif + +/** @} + */ Index: kernel/arch/arm64/include/arch/istate.h =================================================================== --- kernel/arch/arm64/include/arch/istate.h (revision de9e28e0c0b35a214dcdc3688dc8579f50c5fbd6) +++ kernel/arch/arm64/include/arch/istate.h (revision de9e28e0c0b35a214dcdc3688dc8579f50c5fbd6) @@ -0,0 +1,84 @@ +/* + * Copyright (c) 2015 Petr Pavlu + * + * 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 kernel_arm64_interrupt + * @{ + */ + +#ifndef KERN_arm64_ISTATE_H_ +#define KERN_arm64_ISTATE_H_ + +#include + +#ifdef KERNEL + +#include +#include + +#else /* KERNEL */ + +#include +#include + +#endif /* KERNEL */ + +/** Set Program Counter member of given istate structure. + * + * @param istate istate structure + * @param retaddr new value of istate's PC member + */ +_NO_TRACE static inline void istate_set_retaddr(istate_t *istate, + uintptr_t retaddr) +{ + istate->pc = retaddr; +} + +/** Return true if exception happened while in userspace. */ +_NO_TRACE static inline int istate_from_uspace(istate_t *istate) +{ + return (istate->spsr & SPSR_MODE_MASK) >> SPSR_MODE_SHIFT == + SPSR_MODE_ARM64_EL0T; +} + +/** Return Program Counter member of given istate structure. */ +_NO_TRACE static inline uintptr_t istate_get_pc(istate_t *istate) +{ + return istate->pc; +} + +/** Return Frame Pointer member of given istate structure. */ +_NO_TRACE static inline uintptr_t istate_get_fp(istate_t *istate) +{ + return istate->x29; +} + +#endif + +/** @} + */ Index: kernel/arch/arm64/include/arch/istate_struct.h =================================================================== --- kernel/arch/arm64/include/arch/istate_struct.h (revision de9e28e0c0b35a214dcdc3688dc8579f50c5fbd6) +++ kernel/arch/arm64/include/arch/istate_struct.h (revision de9e28e0c0b35a214dcdc3688dc8579f50c5fbd6) @@ -0,0 +1,114 @@ +/* + * Copyright (c) 2015 Petr Pavlu + * 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 KERN_ARCH_ISTATE_STRUCT_H_ +#define KERN_ARCH_ISTATE_STRUCT_H_ + +#define ISTATE_OFFSET_SPSR 0x00 +#define ISTATE_OFFSET_SP 0x08 +#define ISTATE_OFFSET_PC 0x10 +#define ISTATE_OFFSET_TPIDR 0x18 +#define ISTATE_OFFSET_X0 0x20 +#define ISTATE_OFFSET_X1 0x28 +#define ISTATE_OFFSET_X2 0x30 +#define ISTATE_OFFSET_X3 0x38 +#define ISTATE_OFFSET_X4 0x40 +#define ISTATE_OFFSET_X5 0x48 +#define ISTATE_OFFSET_X6 0x50 +#define ISTATE_OFFSET_X7 0x58 +#define ISTATE_OFFSET_X8 0x60 +#define ISTATE_OFFSET_X9 0x68 +#define ISTATE_OFFSET_X10 0x70 +#define ISTATE_OFFSET_X11 0x78 +#define ISTATE_OFFSET_X12 0x80 +#define ISTATE_OFFSET_X13 0x88 +#define ISTATE_OFFSET_X14 0x90 +#define ISTATE_OFFSET_X15 0x98 +#define ISTATE_OFFSET_X16 0xa0 +#define ISTATE_OFFSET_X17 0xa8 +#define ISTATE_OFFSET_X18 0xb0 +#define ISTATE_OFFSET_X19 0xb8 +#define ISTATE_OFFSET_X20 0xc0 +#define ISTATE_OFFSET_X21 0xc8 +#define ISTATE_OFFSET_X22 0xd0 +#define ISTATE_OFFSET_X23 0xd8 +#define ISTATE_OFFSET_X24 0xe0 +#define ISTATE_OFFSET_X25 0xe8 +#define ISTATE_OFFSET_X26 0xf0 +#define ISTATE_OFFSET_X27 0xf8 +#define ISTATE_OFFSET_X28 0x100 +#define ISTATE_OFFSET_X29 0x108 +#define ISTATE_OFFSET_X30 0x110 +#define ISTATE_SIZE 0x118 + +#ifndef __ASSEMBLER__ + +#include + +typedef struct istate { + uint64_t spsr; + uint64_t sp; + uint64_t pc; + uint64_t tpidr; + uint64_t x0; + uint64_t x1; + uint64_t x2; + uint64_t x3; + uint64_t x4; + uint64_t x5; + uint64_t x6; + uint64_t x7; + uint64_t x8; + uint64_t x9; + uint64_t x10; + uint64_t x11; + uint64_t x12; + uint64_t x13; + uint64_t x14; + uint64_t x15; + uint64_t x16; + uint64_t x17; + uint64_t x18; + uint64_t x19; + uint64_t x20; + uint64_t x21; + uint64_t x22; + uint64_t x23; + uint64_t x24; + uint64_t x25; + uint64_t x26; + uint64_t x27; + uint64_t x28; + /* Frame Pointer. */ + uint64_t x29; + /* Link Register. */ + uint64_t x30; +} istate_t; + +#endif +#endif Index: kernel/arch/arm64/include/arch/mach/virt/virt.h =================================================================== --- kernel/arch/arm64/include/arch/mach/virt/virt.h (revision de9e28e0c0b35a214dcdc3688dc8579f50c5fbd6) +++ kernel/arch/arm64/include/arch/mach/virt/virt.h (revision de9e28e0c0b35a214dcdc3688dc8579f50c5fbd6) @@ -0,0 +1,48 @@ +/* + * Copyright (c) 2016 Petr Pavlu + * 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 kernel_arm64_virt + * @brief QEMU virt platform. + * @ingroup kernel_arm64 + * @{ + */ +/** @file + * @brief QEMU virt platform driver. + */ + +#ifndef KERN_arm64_virt_H_ +#define KERN_arm64_virt_H_ + +#include + +extern struct arm_machine_ops virt_machine_ops; + +#endif + +/** @} + */ Index: kernel/arch/arm64/include/arch/machine_func.h =================================================================== --- kernel/arch/arm64/include/arch/machine_func.h (revision de9e28e0c0b35a214dcdc3688dc8579f50c5fbd6) +++ kernel/arch/arm64/include/arch/machine_func.h (revision de9e28e0c0b35a214dcdc3688dc8579f50c5fbd6) @@ -0,0 +1,66 @@ +/* + * Copyright (c) 2016 Petr Pavlu + * 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 kernel_arm64 + * @{ + */ +/** @file + * @brief Declarations of machine specific functions. + * + * These functions enable to differentiate more kinds of ARM platforms. + */ + +#ifndef KERN_arm64_MACHINE_FUNC_H_ +#define KERN_arm64_MACHINE_FUNC_H_ + +#include +#include + +struct arm_machine_ops { + void (*machine_init)(void); + void (*machine_irq_exception)(unsigned int, istate_t *); + void (*machine_output_init)(void); + void (*machine_input_init)(void); + inr_t (*machine_enable_vtimer_irq)(void); + size_t (*machine_get_irq_count)(void); + const char *(*machine_get_platform_name)(void); +}; + +extern void machine_ops_init(void); +extern void machine_init(void); +void machine_irq_exception(unsigned int, istate_t *); +extern void machine_output_init(void); +extern void machine_input_init(void); +extern inr_t machine_enable_vtimer_irq(void); +extern size_t machine_get_irq_count(void); +extern const char *machine_get_platform_name(void); + +#endif + +/** @} + */ Index: kernel/arch/arm64/include/arch/mm/as.h =================================================================== --- kernel/arch/arm64/include/arch/mm/as.h (revision de9e28e0c0b35a214dcdc3688dc8579f50c5fbd6) +++ kernel/arch/arm64/include/arch/mm/as.h (revision de9e28e0c0b35a214dcdc3688dc8579f50c5fbd6) @@ -0,0 +1,63 @@ +/* + * Copyright (c) 2015 Petr Pavlu + * 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 kernel_arm64_mm + * @{ + */ +/** @file + * @brief Address space manipulating functions declarations. + */ + +#ifndef KERN_arm64_AS_H_ +#define KERN_arm64_AS_H_ + +#define KERNEL_ADDRESS_SPACE_SHADOWED_ARCH 0 +#define KERNEL_SEPARATE_PTL0_ARCH 1 + +#define KERNEL_ADDRESS_SPACE_START_ARCH UINT64_C(0xffff000000000000) +#define KERNEL_ADDRESS_SPACE_END_ARCH UINT64_C(0xffffffffffffffff) +#define USER_ADDRESS_SPACE_START_ARCH UINT64_C(0x0000000000000000) +#define USER_ADDRESS_SPACE_END_ARCH UINT64_C(0x0000ffffffffffff) + +typedef struct { +} as_arch_t; + +#include + +#define as_constructor_arch(as, flags) ((void)as, (void)flags, EOK) +#define as_destructor_arch(as) ((void)as, 0) +#define as_create_arch(as, flags) ((void)as, (void)flags, EOK) +#define as_deinstall_arch(as) +#define as_invalidate_translation_cache(as, page, cnt) + +extern void as_arch_init(void); + +#endif + +/** @} + */ Index: kernel/arch/arm64/include/arch/mm/asid.h =================================================================== --- kernel/arch/arm64/include/arch/mm/asid.h (revision de9e28e0c0b35a214dcdc3688dc8579f50c5fbd6) +++ kernel/arch/arm64/include/arch/mm/asid.h (revision de9e28e0c0b35a214dcdc3688dc8579f50c5fbd6) @@ -0,0 +1,53 @@ +/* + * Copyright (c) 2015 Petr Pavlu + * 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 kernel_arm64_mm + * @{ + */ +/** @file + * @brief ASIDs related declarations. + */ + +#ifndef KERN_arm64_ASID_H_ +#define KERN_arm64_ASID_H_ + +#include + +/* + * The ASID size is in VMSAv8-64 an implementation defined choice of 8 or 16 + * bits. The actual size can be obtained by reading ID_AA64MMFR0_EL1.ASIDBits + * but for simplicity, HelenOS currently defaults to 8 bits. + */ +typedef uint8_t asid_t; + +#define ASID_MAX_ARCH 255 + +#endif + +/** @} + */ Index: kernel/arch/arm64/include/arch/mm/frame.h =================================================================== --- kernel/arch/arm64/include/arch/mm/frame.h (revision de9e28e0c0b35a214dcdc3688dc8579f50c5fbd6) +++ kernel/arch/arm64/include/arch/mm/frame.h (revision de9e28e0c0b35a214dcdc3688dc8579f50c5fbd6) @@ -0,0 +1,59 @@ +/* + * Copyright (c) 2015 Petr Pavlu + * 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 kernel_arm64_mm + * @{ + */ +/** @file + * @brief Frame related declarations. + */ + +#ifndef KERN_arm64_FRAME_H_ +#define KERN_arm64_FRAME_H_ + +#include + +#define FRAME_WIDTH 12 /* 4KB frames */ +#define FRAME_SIZE (1 << FRAME_WIDTH) + +#define FRAME_LOWPRIO 0 + +#ifndef __ASSEMBLER__ + +extern void frame_low_arch_init(void); +extern void frame_high_arch_init(void); +extern void physmem_print(void); + +extern memmap_t memmap; + +#endif /* __ASSEMBLER__ */ + +#endif + +/** @} + */ Index: kernel/arch/arm64/include/arch/mm/km.h =================================================================== --- kernel/arch/arm64/include/arch/mm/km.h (revision de9e28e0c0b35a214dcdc3688dc8579f50c5fbd6) +++ kernel/arch/arm64/include/arch/mm/km.h (revision de9e28e0c0b35a214dcdc3688dc8579f50c5fbd6) @@ -0,0 +1,66 @@ +/* + * Copyright (c) 2015 Petr Pavlu + * 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 kernel_arm64_mm + * @{ + */ +/** @file + */ + +#ifndef KERN_arm64_KM_H_ +#define KERN_arm64_KM_H_ + +#ifndef __ASSEMBLER__ + +#include +#include + +#define KM_ARM64_IDENTITY_START UINT64_C(0xffffffff80000000) +#define KM_ARM64_IDENTITY_SIZE UINT64_C(0x0000000080000000) + +#define KM_ARM64_NON_IDENTITY_START UINT64_C(0xffff000000000000) +#define KM_ARM64_NON_IDENTITY_SIZE UINT64_C(0x0000ffff80000000) + +extern void km_identity_arch_init(void); +extern void km_non_identity_arch_init(void); +extern bool km_is_non_identity_arch(uintptr_t); + +#else /* __ASSEMBLER__ */ + +#define KM_ARM64_IDENTITY_START 0xffffffff80000000 +#define KM_ARM64_IDENTITY_SIZE 0x0000000080000000 + +#define KM_ARM64_NON_IDENTITY_START 0xffff000000000000 +#define KM_ARM64_NON_IDENTITY_SIZE 0x0000ffff80000000 + +#endif /* __ASSEMBLER__ */ + +#endif + +/** @} + */ Index: kernel/arch/arm64/include/arch/mm/page.h =================================================================== --- kernel/arch/arm64/include/arch/mm/page.h (revision de9e28e0c0b35a214dcdc3688dc8579f50c5fbd6) +++ kernel/arch/arm64/include/arch/mm/page.h (revision de9e28e0c0b35a214dcdc3688dc8579f50c5fbd6) @@ -0,0 +1,422 @@ +/* + * Copyright (c) 2015 Petr Pavlu + * 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 kernel_arm64_mm + * @{ + */ +/** @file + * @brief Paging related declarations. + */ + +#ifndef KERN_arm64_PAGE_H_ +#define KERN_arm64_PAGE_H_ + +#include +#include +#include + +#ifndef __ASSEMBLER__ +#include +#endif /* __ASSEMBLER__ */ + +#define PAGE_WIDTH FRAME_WIDTH +#define PAGE_SIZE FRAME_SIZE + +#ifndef __ASSEMBLER__ + +extern uintptr_t physmem_base; + +#define KA2PA(x) \ + (((uintptr_t) (x)) - UINT64_C(0xffffffff80000000) + physmem_base) +#define PA2KA(x) \ + (((uintptr_t) (x)) + UINT64_C(0xffffffff80000000) - physmem_base) + +#endif /* __ASSEMBLER__ */ + +/** Log2 size of each translation table entry. */ +#define PTL_ENTRY_SIZE_SHIFT 3 + +/* Number of entries in each level. */ +#define PTL0_ENTRIES_ARCH 512 +#define PTL1_ENTRIES_ARCH 512 +#define PTL2_ENTRIES_ARCH 512 +#define PTL3_ENTRIES_ARCH 512 + +/* Page table sizes for each level. */ +#define PTL0_FRAMES_ARCH 1 +#define PTL1_FRAMES_ARCH 1 +#define PTL2_FRAMES_ARCH 1 +#define PTL3_FRAMES_ARCH 1 + +/* Starting bit of virtual address portion translated in each level. */ +#define PTL0_VA_SHIFT 39 +#define PTL1_VA_SHIFT 30 +#define PTL2_VA_SHIFT 21 +#define PTL3_VA_SHIFT 12 + +/* Size mask of virtual address portion translated in each level. */ +#define PTL0_VA_MASK 0x1ff +#define PTL1_VA_MASK 0x1ff +#define PTL2_VA_MASK 0x1ff +#define PTL3_VA_MASK 0x1ff + +/* Macros calculating indices into page tables for each level. */ +#define PTL0_INDEX_ARCH(vaddr) (((vaddr) >> PTL0_VA_SHIFT) & PTL0_VA_MASK) +#define PTL1_INDEX_ARCH(vaddr) (((vaddr) >> PTL1_VA_SHIFT) & PTL1_VA_MASK) +#define PTL2_INDEX_ARCH(vaddr) (((vaddr) >> PTL2_VA_SHIFT) & PTL2_VA_MASK) +#define PTL3_INDEX_ARCH(vaddr) (((vaddr) >> PTL3_VA_SHIFT) & PTL3_VA_MASK) + +/* Get PTE address accessors for each level. */ +#define GET_PTL1_ADDRESS_ARCH(ptl0, i) \ + ((pte_t *) (((uintptr_t) ((pte_t *) (ptl0))[(i)].output_address) << 12)) +#define GET_PTL2_ADDRESS_ARCH(ptl1, i) \ + ((pte_t *) (((uintptr_t) ((pte_t *) (ptl1))[(i)].output_address) << 12)) +#define GET_PTL3_ADDRESS_ARCH(ptl2, i) \ + ((pte_t *) (((uintptr_t) ((pte_t *) (ptl2))[(i)].output_address) << 12)) +#define GET_FRAME_ADDRESS_ARCH(ptl3, i) \ + (((uintptr_t) ((pte_t *) (ptl3))[(i)].output_address) << 12) + +/* + * Set PTE address accessors for each level. Setting of the level 0 table is + * ignored because it must be done only by calling as_install_arch() which also + * changes ASID. + */ +#define SET_PTL0_ADDRESS_ARCH(ptl0) +#define SET_PTL1_ADDRESS_ARCH(ptl0, i, a) \ + (((pte_t *) (ptl0))[(i)].output_address = (a) >> 12) +#define SET_PTL2_ADDRESS_ARCH(ptl1, i, a) \ + (((pte_t *) (ptl1))[(i)].output_address = (a) >> 12) +#define SET_PTL3_ADDRESS_ARCH(ptl2, i, a) \ + (((pte_t *) (ptl2))[(i)].output_address = (a) >> 12) +#define SET_FRAME_ADDRESS_ARCH(ptl3, i, a) \ + (((pte_t *) (ptl3))[(i)].output_address = (a) >> 12) + +/* Get PTE flags accessors for each level. */ +#define GET_PTL1_FLAGS_ARCH(ptl0, i) \ + get_pt_level012_flags((pte_t *) (ptl0), (size_t) (i)) +#define GET_PTL2_FLAGS_ARCH(ptl1, i) \ + get_pt_level012_flags((pte_t *) (ptl1), (size_t) (i)) +#define GET_PTL3_FLAGS_ARCH(ptl2, i) \ + get_pt_level012_flags((pte_t *) (ptl2), (size_t) (i)) +#define GET_FRAME_FLAGS_ARCH(ptl3, i) \ + get_pt_level3_flags((pte_t *) (ptl3), (size_t) (i)) + +/* Set PTE flags accessors for each level. */ +#define SET_PTL1_FLAGS_ARCH(ptl0, i, x) \ + set_pt_level012_flags((pte_t *) (ptl0), (size_t) (i), (x)) +#define SET_PTL2_FLAGS_ARCH(ptl1, i, x) \ + set_pt_level012_flags((pte_t *) (ptl1), (size_t) (i), (x)) +#define SET_PTL3_FLAGS_ARCH(ptl2, i, x) \ + set_pt_level012_flags((pte_t *) (ptl2), (size_t) (i), (x)) +#define SET_FRAME_FLAGS_ARCH(ptl3, i, x) \ + set_pt_level3_flags((pte_t *) (ptl3), (size_t) (i), (x)) + +/* Set PTE present bit accessors for each level. */ +#define SET_PTL1_PRESENT_ARCH(ptl0, i) \ + set_pt_present((pte_t *) (ptl0), (size_t) (i)) +#define SET_PTL2_PRESENT_ARCH(ptl1, i) \ + set_pt_present((pte_t *) (ptl1), (size_t) (i)) +#define SET_PTL3_PRESENT_ARCH(ptl2, i) \ + set_pt_present((pte_t *) (ptl2), (size_t) (i)) +#define SET_FRAME_PRESENT_ARCH(ptl3, i) \ + set_pt_present((pte_t *) (ptl3), (size_t) (i)) + +/* Macros for querying the last-level PTE entries. */ +#define PTE_VALID_ARCH(pte) \ + (((pte_t *) (pte))->valid != 0) +#define PTE_PRESENT_ARCH(pte) \ + (((pte_t *) (pte))->valid != 0) +#define PTE_GET_FRAME_ARCH(pte) \ + (((uintptr_t) ((pte_t *) (pte))->output_address) << FRAME_WIDTH) +#define PTE_WRITABLE_ARCH(pte) \ + get_pt_writable((pte_t *) (pte)) +#define PTE_EXECUTABLE_ARCH(pte) \ + get_pt_executable((pte_t *) (pte)) + +/* Level 3 access permissions. */ + +/** Data access permission. User mode: no access, privileged mode: read/write. + */ +#define PTE_AP_USER_NO_KERNEL_FULL 0 + +/** Data access permission. User mode: read/write, privileged mode: read/write. + */ +#define PTE_AP_USER_FULL_KERNEL_FULL 1 + +/** Data access permission. User mode: no access, privileged mode: read only. */ +#define PTE_AP_USER_NO_KERNEL_LIMITED 2 + +/** Data access permission. User mode: read only, privileged mode: read only. */ +#define PTE_AP_USER_LIMITED_KERNEL_LIMITED 3 + +/* + * Memory types. MAIR_EL1 index 0 is unused, which assures that if a page + * table entry is non-null then it is valid (PTE_VALID_ARCH() returns true). + */ + +/** Write-Back Cacheable Normal memory, Inner shareable, Read-write cache + * allocation. Defined in MAIR_EL1 index 1. + */ +#define MAIR_EL1_NORMAL_MEMORY_ATTR 0xff +#define MAIR_EL1_NORMAL_MEMORY_INDEX 1 + +/** Device-nGnRE memory (Device non-Gathering, non-Reordering, Early Write + * Acknowledgement). Equivalent to the Device memory type in earlier versions of + * the architecture. Defined in MAIR_EL1 index 2. + */ +#define MAIR_EL1_DEVICE_MEMORY_ATTR 0x04 +#define MAIR_EL1_DEVICE_MEMORY_INDEX 2 + +/** Bit width of one memory attribute field in MAIR_EL1. */ +#define MAIR_EL1_ATTR_SHIFT 8 + +/* Level 0, 1, 2 descriptor types. */ + +/** Block descriptor (valid in level 0, 1, 2 page translation tables). */ +#define PTE_L012_TYPE_BLOCK 0 + +/** Next-table descriptor (valid in level 0, 1, 2 page translation tables). */ +#define PTE_L012_TYPE_TABLE 1 + +/* Level 3 descriptor types. */ + +/** Page descriptor (valid in level 3 page translation tables). */ +#define PTE_L3_TYPE_PAGE 1 + +/** HelenOS descriptor type. Table for level 0, 1, 2 page translation tables, + * page for level 3 tables. Block descriptors are not used by HelenOS during + * normal processing. + */ +#define PTE_L0123_TYPE_HELENOS 1 + +/* Page table entry access macros. */ + +/** Shift to access the next-level table address in a page table entry. */ +#define PTE_NEXT_LEVEL_ADDRESS_SHIFT 12 + +/** Shift to access the resulting address in a page table entry. */ +#define PTE_OUTPUT_ADDRESS_SHIFT 12 + +/** Shift to access the access bit in a page table entry. */ +#define PTE_ACCESS_SHIFT 10 + +/** Shift to access the attr_index field in a page table entry. */ +#define PTE_ATTR_INDEX_SHIFT 2 + +/** Shift to access the type bit in a page table entry. */ +#define PTE_TYPE_SHIFT 1 + +/** Shift to access the present bit in a page table entry. */ +#define PTE_PRESENT_SHIFT 0 + +/** The present bit in a page table entry. */ +#define PTE_PRESENT_FLAG (1 << PTE_PRESENT_SHIFT) + +#ifndef __ASSEMBLER__ + +#include + +/** Page Table Entry. + * + * HelenOS model: + * * Level 0, 1, 2 translation tables hold next-level table descriptors. Block + * descriptors are not used during normal processing. + * * Level 3 tables store 4kB page descriptors. + */ +typedef struct { + /* Common bits. */ + /** Flag indicating entry contains valid data and can be used for page + * translation. + * + * Note: The flag is called `valid' in the official ARM terminology + * but it has the `present' (valid+active) sense in HelenOS. + */ + unsigned valid : 1; + unsigned type : 1; + + /* Lower block and page attributes. */ + unsigned attr_index : 3; + unsigned non_secure : 1; + unsigned access_permission : 2; + unsigned shareability : 2; + unsigned access : 1; + unsigned not_global : 1; + + /* Common output address. */ + uint64_t output_address : 36; + + unsigned : 4; + + /* Upper block and page attributes. */ + unsigned contiguous : 1; + unsigned privileged_execute_never : 1; + unsigned unprivileged_execute_never : 1; + + unsigned : 4; + + /* Next-level table attributes. */ + unsigned privileged_execute_never_table : 1; + unsigned unprivileged_execute_never_table : 1; + unsigned access_permission_table : 2; + unsigned non_secure_table : 1; +} __attribute__((packed)) pte_t; + +/** Returns level 0, 1, 2 page table entry flags. + * + * @param pt Level 0, 1, 2 page table. + * @param i Index of the entry to return. + */ +_NO_TRACE static inline unsigned int get_pt_level012_flags(pte_t *pt, size_t i) +{ + pte_t *p = &pt[i]; + + return (1 << PAGE_CACHEABLE_SHIFT) | + (!p->valid << PAGE_PRESENT_SHIFT) | (1 << PAGE_USER_SHIFT) | + (1 << PAGE_READ_SHIFT) | (1 << PAGE_WRITE_SHIFT) | + (1 << PAGE_EXEC_SHIFT); +} + +/** Returns level 3 page table entry flags. + * + * @param pt Level 3 page table. + * @param i Index of the entry to return. + */ +_NO_TRACE static inline unsigned int get_pt_level3_flags(pte_t *pt, size_t i) +{ + pte_t *p = &pt[i]; + + int cacheable = (p->attr_index == MAIR_EL1_NORMAL_MEMORY_INDEX); + int user = (p->access_permission == PTE_AP_USER_FULL_KERNEL_FULL || + p->access_permission == PTE_AP_USER_LIMITED_KERNEL_LIMITED); + int write = (p->access_permission == PTE_AP_USER_FULL_KERNEL_FULL || + p->access_permission == PTE_AP_USER_NO_KERNEL_FULL); + int exec = ((user && !p->unprivileged_execute_never) || + (!user && !p->privileged_execute_never)); + + return (cacheable << PAGE_CACHEABLE_SHIFT) | + (!p->valid << PAGE_PRESENT_SHIFT) | (user << PAGE_USER_SHIFT) | + (1 << PAGE_READ_SHIFT) | (write << PAGE_WRITE_SHIFT) | + (exec << PAGE_EXEC_SHIFT) | (!p->not_global << PAGE_GLOBAL_SHIFT); +} + +/** Sets flags of level 0, 1, 2 page table entry. + * + * @param pt Level 0, 1, 2 page table. + * @param i Index of the entry to be changed. + * @param flags New flags. + */ +_NO_TRACE static inline void set_pt_level012_flags(pte_t *pt, size_t i, + int flags) +{ + pte_t *p = &pt[i]; + + p->valid = (flags & PAGE_PRESENT) != 0; + p->type = PTE_L012_TYPE_TABLE; +} + +/** Sets flags of level 3 page table entry. + * + * @param pt Level 3 page table. + * @param i Index of the entry to be changed. + * @param flags New flags. + */ +_NO_TRACE static inline void set_pt_level3_flags(pte_t *pt, size_t i, + int flags) +{ + pte_t *p = &pt[i]; + + if (flags & PAGE_CACHEABLE) + p->attr_index = MAIR_EL1_NORMAL_MEMORY_INDEX; + else + p->attr_index = MAIR_EL1_DEVICE_MEMORY_INDEX; + p->valid = (flags & PAGE_PRESENT) != 0; + p->type = PTE_L3_TYPE_PAGE; + + /* Translate page permissions to access permissions. */ + if (flags & PAGE_USER) { + if (flags & PAGE_WRITE) + p->access_permission = PTE_AP_USER_FULL_KERNEL_FULL; + else + p->access_permission = + PTE_AP_USER_LIMITED_KERNEL_LIMITED; + } else { + if (flags & PAGE_WRITE) + p->access_permission = PTE_AP_USER_NO_KERNEL_FULL; + else + p->access_permission = PTE_AP_USER_NO_KERNEL_LIMITED; + } + p->access = 1; + p->unprivileged_execute_never = p->privileged_execute_never = + (flags & PAGE_EXEC) == 0; + + p->not_global = (flags & PAGE_GLOBAL) == 0; +} + +/** Sets the present flag of page table entry. + * + * @param pt Level 0, 1, 2, 3 page table. + * @param i Index of the entry to be changed. + */ +_NO_TRACE static inline void set_pt_present(pte_t *pt, size_t i) +{ + pte_t *p = &pt[i]; + + p->valid = 1; +} + +/** Gets the executable flag of page table entry. + * + * @param pte Page table entry. + */ +_NO_TRACE static inline bool get_pt_executable(pte_t *pte) +{ + if (pte->access_permission == PTE_AP_USER_NO_KERNEL_FULL || + pte->access_permission == PTE_AP_USER_NO_KERNEL_LIMITED) + return pte->privileged_execute_never; + else + return pte->unprivileged_execute_never; +} + +/** Gets the writable flag of page table entry. + * + * @param pte Page table entry. + */ +_NO_TRACE static inline bool get_pt_writable(pte_t *pte) +{ + return pte->access_permission == PTE_AP_USER_FULL_KERNEL_FULL || + pte->access_permission == PTE_AP_USER_NO_KERNEL_FULL; +} + +extern void page_arch_init(void); + +#endif /* __ASSEMBLER__ */ + +#endif + +/** @} + */ Index: kernel/arch/arm64/include/arch/mm/tlb.h =================================================================== --- kernel/arch/arm64/include/arch/mm/tlb.h (revision de9e28e0c0b35a214dcdc3688dc8579f50c5fbd6) +++ kernel/arch/arm64/include/arch/mm/tlb.h (revision de9e28e0c0b35a214dcdc3688dc8579f50c5fbd6) @@ -0,0 +1,42 @@ +/* + * Copyright (c) 2015 Petr Pavlu + * 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 kernel_arm64_mm + * @{ + */ +/** @file + * @brief TLB related declarations. + */ + +#ifndef KERN_arm64_TLB_H_ +#define KERN_arm64_TLB_H_ + +#endif + +/** @} + */ Index: kernel/arch/arm64/include/arch/proc/task.h =================================================================== --- kernel/arch/arm64/include/arch/proc/task.h (revision de9e28e0c0b35a214dcdc3688dc8579f50c5fbd6) +++ kernel/arch/arm64/include/arch/proc/task.h (revision de9e28e0c0b35a214dcdc3688dc8579f50c5fbd6) @@ -0,0 +1,48 @@ +/* + * Copyright (c) 2015 Petr Pavlu + * 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 kernel_arm64_proc + * @{ + */ +/** @file + * @brief Task related declarations. + */ + +#ifndef KERN_arm64_TASK_H_ +#define KERN_arm64_TASK_H_ + +typedef struct { +} task_arch_t; + +#define task_create_arch(t) +#define task_destroy_arch(t) + +#endif + +/** @} + */ Index: kernel/arch/arm64/include/arch/proc/thread.h =================================================================== --- kernel/arch/arm64/include/arch/proc/thread.h (revision de9e28e0c0b35a214dcdc3688dc8579f50c5fbd6) +++ kernel/arch/arm64/include/arch/proc/thread.h (revision de9e28e0c0b35a214dcdc3688dc8579f50c5fbd6) @@ -0,0 +1,49 @@ +/* + * Copyright (c) 2015 Petr Pavlu + * 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 kernel_arm64_proc + * @{ + */ +/** @file + * @brief Thread related declarations. + */ + +#ifndef KERN_arm64_THREAD_H_ +#define KERN_arm64_THREAD_H_ + +typedef struct { +} thread_arch_t; + +#define thr_constructor_arch(t) +#define thr_destructor_arch(t) +#define thread_create_arch(t, flags) (EOK) + +#endif + +/** @} + */ Index: kernel/arch/arm64/include/arch/regutils.h =================================================================== --- kernel/arch/arm64/include/arch/regutils.h (revision de9e28e0c0b35a214dcdc3688dc8579f50c5fbd6) +++ kernel/arch/arm64/include/arch/regutils.h (revision de9e28e0c0b35a214dcdc3688dc8579f50c5fbd6) @@ -0,0 +1,195 @@ +/* + * Copyright (c) 2015 Petr Pavlu + * 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 kernel_arm64 + * @{ + */ +/** @file + * @brief Utilities for convenient manipulation with ARM registers. + */ + +#ifndef KERN_arm64_REGUTILS_H_ +#define KERN_arm64_REGUTILS_H_ + +#ifndef __ASSEMBLER__ + +#include + +#define SPECIAL_REG_GEN_READ(name) \ + static inline uint64_t name##_read(void) \ + { \ + uint64_t res; \ + asm volatile ( \ + "mrs %[res], " #name \ + : [res] "=r" (res) \ + ); \ + return res; \ + } + +#define SPECIAL_REG_GEN_WRITE(name) \ + static inline void name##_write(uint64_t regn) \ + { \ + asm volatile ( \ + "msr " #name ", %[regn]\n" \ + "isb\n" \ + :: [regn] "r" (regn) \ + ); \ + } + +#define UWORD64(c) UINT64_C(c) + +#else /* __ASSEMBLER__ */ + +#define SPECIAL_REG_GEN_READ(name) +#define SPECIAL_REG_GEN_WRITE(name) +#define UWORD64(c) c + +#endif /* __ASSEMBLER__*/ + +/* CNTFRQ_EL0 */ +SPECIAL_REG_GEN_READ(CNTFRQ_EL0); + +/* CNTVCT_EL0 */ +SPECIAL_REG_GEN_READ(CNTVCT_EL0); + +/* CNTV_CTL_EL0 */ +SPECIAL_REG_GEN_READ(CNTV_CTL_EL0); +SPECIAL_REG_GEN_WRITE(CNTV_CTL_EL0); +#define CNTV_CTL_ENABLE_SHIFT 0 +#define CNTV_CTL_ENABLE_FLAG (UWORD64(1) << CNTV_CTL_ENABLE_SHIFT) +#define CNTV_CTL_IMASK_SHIFT 1 +#define CNTV_CTL_IMASK_FLAG (UWORD64(1) << CNTV_CTL_IMASK_SHIFT) + +/* CNTV_CVAL_EL0 */ +SPECIAL_REG_GEN_READ(CNTV_CVAL_EL0); +SPECIAL_REG_GEN_WRITE(CNTV_CVAL_EL0); + +/* CPACR_EL1 */ +SPECIAL_REG_GEN_READ(CPACR_EL1); +SPECIAL_REG_GEN_WRITE(CPACR_EL1); +#define CPACR_FPEN_SHIFT 20 +#define CPACR_FPEN_MASK (UWORD64(0x3) << CPACR_FPEN_SHIFT) +#define CPACR_FPEN_TRAP_ALL 0x0 +#define CPACR_FPEN_TRAP_NONE 0x3 + +/* CurrentEL */ +SPECIAL_REG_GEN_READ(CurrentEL); +#define CURRENT_EL_EL0 0x0 +#define CURRENT_EL_EL1 0x4 +#define CURRENT_EL_EL2 0x8 +#define CURRENT_EL_EL3 0xc + +/* DAIF */ +SPECIAL_REG_GEN_READ(DAIF); +SPECIAL_REG_GEN_WRITE(DAIF); +#define DAIF_IRQ_SHIFT 7 +#define DAIF_IRQ_FLAG (UWORD64(1) << DAIF_IRQ_SHIFT) + +/* ELR */ +SPECIAL_REG_GEN_WRITE(ELR_EL1); + +/* ESR */ +SPECIAL_REG_GEN_READ(ESR_EL1); +#define ESR_EC_SHIFT 26 +#define ESR_EC_MASK (UWORD64(0x3f) << ESR_EC_SHIFT) + +/** Exception from access to Advanced SIMD or floating-point functionality. */ +#define ESR_EC_FP 0x07 +/** Exception from SVC instruction execution. */ +#define ESR_EC_SVC 0x15 + +/** Instruction abort from Lower Exception level. */ +#define ESR_EC_IA_LOWER_EL 0x20 +/** Data abort from Lower Exception level. */ +#define ESR_EC_DA_LOWER_EL 0x24 +/** Data abort from Current Exception level. */ +#define ESR_EC_DA_CURRENT_EL 0x25 + +/** Instruction/data Fault Status Code. */ +#define ESR_IDFSC_SHIFT 0 +#define ESR_IDFSC_MASK (UWORD64(0x3f) << ESR_IDFSC_SHIFT) + +/** Instruction/data abort, translation fault, zeroth level. */ +#define ESR_IDA_IDFSC_TF0 0x4 +/** Instruction/data abort, translation fault, first level. */ +#define ESR_IDA_IDFSC_TF1 0x5 +/** Instruction/data abort, translation fault, second level. */ +#define ESR_IDA_IDFSC_TF2 0x6 +/** Instruction/data abort, translation fault, third level. */ +#define ESR_IDA_IDFSC_TF3 0x7 + +/** Data abort, Write not Read. */ +#define ESR_DA_WNR_SHIFT 6 +#define ESR_DA_WNR_FLAG (UWORD64(1) << ESR_DA_WNR_SHIFT) + +/* FAR */ +SPECIAL_REG_GEN_READ(FAR_EL1); + +/* MIDR_EL1 */ +SPECIAL_REG_GEN_READ(MIDR_EL1); +#define MIDR_REVISION_SHIFT 0 +#define MIDR_REVISION_MASK (UWORD64(0xf) << MIDR_REVISION_SHIFT) +#define MIDR_PARTNUM_SHIFT 4 +#define MIDR_PARTNUM_MASK (UWORD64(0xfff) << MIDR_PARTNUM_SHIFT) +#define MIDR_VARIANT_SHIFT 20 +#define MIDR_VARIANT_MASK (UWORD64(0xf) << MIDR_VARIANT_SHIFT) +#define MIDR_IMPLEMENTER_SHIFT 24 +#define MIDR_IMPLEMENTER_MASK (UWORD64(0xff) << MIDR_IMPLEMENTER_SHIFT) + +/* SCTLR */ +#define SCTLR_M_SHIFT 0 +#define SCTLR_M_FLAG (UWORD64(1) << SCTLR_M_SHIFT) + +/* SP */ +SPECIAL_REG_GEN_WRITE(SP_EL0); + +/* SPSR */ +SPECIAL_REG_GEN_READ(SPSR_EL1); +SPECIAL_REG_GEN_WRITE(SPSR_EL1); +#define SPSR_MODE_SHIFT 0 +#define SPSR_MODE_MASK (UWORD64(0x1f) << SPSR_MODE_SHIFT) +#define SPSR_MODE_ARM64_EL0T 0x00 /* ARM64, Exception Level 0, SP_EL0 */ + +/* TPIDR */ +SPECIAL_REG_GEN_WRITE(TPIDR_EL0); + +/* TTBR */ +SPECIAL_REG_GEN_WRITE(TTBR0_EL1); +SPECIAL_REG_GEN_WRITE(TTBR1_EL1); +#define TTBR0_ASID_SHIFT 48 + +/* VBAR */ +SPECIAL_REG_GEN_WRITE(VBAR_EL1); + +/* TLBI VAE1IS and TLBI ASIDE1IS parameter. */ +#define TLBI_ASID_SHIFT 48 + +#endif + +/** @} + */ Index: kernel/arch/arm64/include/arch/stack.h =================================================================== --- kernel/arch/arm64/include/arch/stack.h (revision de9e28e0c0b35a214dcdc3688dc8579f50c5fbd6) +++ kernel/arch/arm64/include/arch/stack.h (revision de9e28e0c0b35a214dcdc3688dc8579f50c5fbd6) @@ -0,0 +1,52 @@ +/* + * Copyright (c) 2015 Petr Pavlu + * 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 kernel_arm64 + * @{ + */ +/** @file + * @brief Stack constants. + */ + +#ifndef KERN_arm64_STACK_H_ +#define KERN_arm64_STACK_H_ + +#include + +#define MEM_STACK_SIZE STACK_SIZE + +/** Size of a stack item. */ +#define STACK_ITEM_SIZE 8 + +/** Required stack alignment. */ +#define STACK_ALIGNMENT 16 + +#endif + +/** @} + */ Index: kernel/arch/arm64/include/arch/types.h =================================================================== --- kernel/arch/arm64/include/arch/types.h (revision de9e28e0c0b35a214dcdc3688dc8579f50c5fbd6) +++ kernel/arch/arm64/include/arch/types.h (revision de9e28e0c0b35a214dcdc3688dc8579f50c5fbd6) @@ -0,0 +1,46 @@ +/* + * Copyright (c) 2015 Petr Pavlu + * 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 kernel_arm64 + * @{ + */ +/** @file + */ + +#ifndef KERN_arm64_TYPES_H_ +#define KERN_arm64_TYPES_H_ + +#include <_bits/all.h> + +typedef struct { +} fncptr_t; + +#endif + +/** @} + */ Index: kernel/arch/arm64/src/arm64.c =================================================================== --- kernel/arch/arm64/src/arm64.c (revision de9e28e0c0b35a214dcdc3688dc8579f50c5fbd6) +++ kernel/arch/arm64/src/arm64.c (revision de9e28e0c0b35a214dcdc3688dc8579f50c5fbd6) @@ -0,0 +1,253 @@ +/* + * Copyright (c) 2015 Petr Pavlu + * 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 kernel_arm64 + * @{ + */ +/** @file + * @brief ARM64 architecture specific functions. + */ + +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include + +static void arm64_post_mm_init(void); +static void arm64_post_smp_init(void); + +arch_ops_t arm64_ops = { + .post_mm_init = arm64_post_mm_init, + .post_smp_init = arm64_post_smp_init, +}; + +arch_ops_t *arch_ops = &arm64_ops; + +/** Perform ARM64 specific initialization before main_bsp() is called. */ +void arm64_pre_main(void *entry __attribute__((unused)), bootinfo_t *bootinfo) +{ + /* Copy init task info. */ + init.cnt = min3(bootinfo->taskmap.cnt, TASKMAP_MAX_RECORDS, + CONFIG_INIT_TASKS); + + size_t i; + for (i = 0; i < init.cnt; i++) { + init.tasks[i].paddr = + (uintptr_t) bootinfo->taskmap.tasks[i].addr; + init.tasks[i].size = bootinfo->taskmap.tasks[i].size; + str_cpy(init.tasks[i].name, CONFIG_TASK_NAME_BUFLEN, + bootinfo->taskmap.tasks[i].name); + } + + /* Copy physical memory map. */ + memmap.cnt = min(bootinfo->memmap.cnt, MEMMAP_MAX_RECORDS); + for (i = 0; i < memmap.cnt; i++) { + memmap.zones[i].type = bootinfo->memmap.zones[i].type; + memmap.zones[i].start = bootinfo->memmap.zones[i].start; + memmap.zones[i].size = bootinfo->memmap.zones[i].size; + } + + /* Initialize machine_ops pointer. */ + machine_ops_init(); +} + +/** Perform ARM64 specific tasks needed before the memory management is + * initialized. + */ +void arm64_post_mm_init(void) +{ + if (config.cpu_active != 1) + return; + + /* Do machine-specific initialization. */ + machine_init(); + + /* Initialize exception dispatch table. */ + exception_init(); + interrupt_init(); + + /* Merge all memory zones to 1 big zone. */ + zone_merge_all(); + + /* Initialize output device. */ + machine_output_init(); +} + +/** Perform ARM64 specific tasks needed after the multiprocessing is + * initialized. + */ +void arm64_post_smp_init(void) +{ + /* Set platform name. */ + const char *platform = machine_get_platform_name(); + + sysinfo_set_item_data("platform", NULL, (void *) platform, + str_size(platform)); + + /* Initialize input device. */ + machine_input_init(); +} + +/** Calibrate delay loop. + * + * On ARM64, we implement delay() by waiting for the CNTVCT_EL0 register to + * reach a pre-computed value, as opposed to performing some pre-computed amount + * of instructions of known duration. We set the delay_loop_const to 1 in order + * to neutralize the multiplication done by delay(). + */ +void calibrate_delay_loop(void) +{ + CPU->delay_loop_const = 1; +} + +/** Wait several microseconds. + * + * @param t Microseconds to wait. + */ +void asm_delay_loop(uint32_t usec) +{ + uint64_t stop = CNTVCT_EL0_read() + usec * CNTFRQ_EL0_read() / 1000000; + + while (CNTVCT_EL0_read() < stop) + ; +} + +/** Change processor mode. + * + * @param kernel_uarg Userspace settings (entry point, stack, ...). + */ +void userspace(uspace_arg_t *kernel_uarg) +{ + /* Prepare return to EL0. */ + SPSR_EL1_write((SPSR_EL1_read() & ~SPSR_MODE_MASK) | + SPSR_MODE_ARM64_EL0T); + + /* Set program entry. */ + ELR_EL1_write((uint64_t) kernel_uarg->uspace_entry); + + /* Set user stack. */ + SP_EL0_write(((uint64_t) kernel_uarg->uspace_stack + + kernel_uarg->uspace_stack_size)); + + /* Clear Thread ID register. */ + TPIDR_EL0_write(0); + + asm volatile ( + /* + * Clear all general-purpose registers, except x0 that holds an + * argument for the user space. + */ + "mov x0, %[uspace_uarg]\n" + "mov x1, #0\n" + "mov x2, #0\n" + "mov x3, #0\n" + "mov x4, #0\n" + "mov x5, #0\n" + "mov x6, #0\n" + "mov x7, #0\n" + "mov x8, #0\n" + "mov x9, #0\n" + "mov x10, #0\n" + "mov x11, #0\n" + "mov x12, #0\n" + "mov x13, #0\n" + "mov x14, #0\n" + "mov x15, #0\n" + "mov x16, #0\n" + "mov x17, #0\n" + "mov x18, #0\n" + "mov x19, #0\n" + "mov x20, #0\n" + "mov x21, #0\n" + "mov x22, #0\n" + "mov x23, #0\n" + "mov x24, #0\n" + "mov x25, #0\n" + "mov x26, #0\n" + "mov x27, #0\n" + "mov x28, #0\n" + "mov x29, #0\n" + "mov x30, #0\n" + "eret\n" + :: [uspace_uarg] "r" (kernel_uarg->uspace_uarg) + ); + + unreachable(); +} + +/** Perform ARM64 specific tasks needed before the new task is run. */ +void before_task_runs_arch(void) +{ +} + +/** Perform ARM64 specific tasks needed before the new thread is scheduled. + */ +void before_thread_runs_arch(void) +{ +} + +/** Perform ARM64 specific tasks before a thread stops running. */ +void after_thread_ran_arch(void) +{ +} + +/** Reboot the system. */ +void arch_reboot(void) +{ + /* Not implemented. */ + while (true) + ; +} + +/** Construct function pointer. + * + * @param fptr Function pointer structure. + * @param addr Function address. + * @param caller Calling function address. + * + * @return Address of the function pointer. + */ +void *arch_construct_function(fncptr_t *fptr, void *addr, void *caller) +{ + return addr; +} + +/** Perform ARM64 specific tasks to initialize IRQ processing. */ +void irq_initialize_arch(irq_t *irq __attribute__((unused))) +{ +} + +/** @} + */ Index: kernel/arch/arm64/src/asm.S =================================================================== --- kernel/arch/arm64/src/asm.S (revision de9e28e0c0b35a214dcdc3688dc8579f50c5fbd6) +++ kernel/arch/arm64/src/asm.S (revision de9e28e0c0b35a214dcdc3688dc8579f50c5fbd6) @@ -0,0 +1,220 @@ +/* + * Copyright (c) 2015 Petr Pavlu + * 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 +#include +#include + +.text + +FUNCTION_BEGIN(memcpy_from_uspace) +FUNCTION_BEGIN(memcpy_to_uspace) + /* Simple (un-optimized) memcpy(). */ + cbz x2, 2f + mov x3, x0 +1: + ldrb w4, [x1], #1 + strb w4, [x3], #1 + subs x2, x2, #1 + b.ne 1b + +2: + ret +FUNCTION_END(memcpy_from_uspace) +FUNCTION_END(memcpy_to_uspace) + +FUNCTION_BEGIN(memcpy_from_uspace_failover_address) +FUNCTION_BEGIN(memcpy_to_uspace_failover_address) + mov x0, #0 + ret +FUNCTION_END(memcpy_from_uspace_failover_address) +FUNCTION_END(memcpy_to_uspace_failover_address) + +FUNCTION_BEGIN(early_putwchar) + ret +FUNCTION_END(early_putwchar) + +/* Static checks for the istate_t save/load. */ +#if ISTATE_OFFSET_X0 + 8 != ISTATE_OFFSET_X1 +#error x0 and x1 are not successive in istate_t +#endif +#if ISTATE_OFFSET_X2 + 8 != ISTATE_OFFSET_X3 +#error x2 and x3 are not successive in istate_t +#endif +#if ISTATE_OFFSET_X4 + 8 != ISTATE_OFFSET_X5 +#error x4 and x5 are not successive in istate_t +#endif +#if ISTATE_OFFSET_X6 + 8 != ISTATE_OFFSET_X7 +#error x6 and x7 are not successive in istate_t +#endif +#if ISTATE_OFFSET_X8 + 8 != ISTATE_OFFSET_X9 +#error x8 and x9 are not successive in istate_t +#endif +#if ISTATE_OFFSET_X10 + 8 != ISTATE_OFFSET_X11 +#error x10 and x11 are not successive in istate_t +#endif +#if ISTATE_OFFSET_X12 + 8 != ISTATE_OFFSET_X13 +#error x12 and x13 are not successive in istate_t +#endif +#if ISTATE_OFFSET_X14 + 8 != ISTATE_OFFSET_X15 +#error x14 and x15 are not successive in istate_t +#endif +#if ISTATE_OFFSET_X16 + 8 != ISTATE_OFFSET_X17 +#error x16 and x17 are not successive in istate_t +#endif +#if ISTATE_OFFSET_X18 + 8 != ISTATE_OFFSET_X19 +#error x18 and x19 are not successive in istate_t +#endif +#if ISTATE_OFFSET_X20 + 8 != ISTATE_OFFSET_X21 +#error x20 and x21 are not successive in istate_t +#endif +#if ISTATE_OFFSET_X22 + 8 != ISTATE_OFFSET_X23 +#error x22 and x23 are not successive in istate_t +#endif +#if ISTATE_OFFSET_X24 + 8 != ISTATE_OFFSET_X25 +#error x24 and x25 are not successive in istate_t +#endif +#if ISTATE_OFFSET_X26 + 8 != ISTATE_OFFSET_X27 +#error x26 and x27 are not successive in istate_t +#endif +#if ISTATE_OFFSET_X28 + 8 != ISTATE_OFFSET_X29 +#error x28 and x29 are not successive in istate_t +#endif +#if ISTATE_OFFSET_SPSR + 8 != ISTATE_OFFSET_SP +#error spsr and sp are not successive in istate_t +#endif +#if ISTATE_OFFSET_PC + 8 != ISTATE_OFFSET_TPIDR +#error pc and tpidr are not successive in istate_t +#endif + +/* Exception vector. */ +.macro handler i +handler_\i: + /* + * Initial code for each handler, at maximum 128 bytes (32 + * instructions). + */ + + /* Save current state. */ + sub sp, sp, #ISTATE_SIZE /* 0x00 */ + stp x0, x1, [sp, #ISTATE_OFFSET_X0] /* 0x04 */ + stp x2, x3, [sp, #ISTATE_OFFSET_X2] /* 0x08 */ + stp x4, x5, [sp, #ISTATE_OFFSET_X4] /* 0x0c */ + stp x6, x7, [sp, #ISTATE_OFFSET_X6] /* 0x10 */ + stp x8, x9, [sp, #ISTATE_OFFSET_X8] /* 0x14 */ + stp x10, x11, [sp, #ISTATE_OFFSET_X10] /* 0x18 */ + stp x12, x13, [sp, #ISTATE_OFFSET_X12] /* 0x1c */ + stp x14, x15, [sp, #ISTATE_OFFSET_X14] /* 0x20 */ + stp x16, x17, [sp, #ISTATE_OFFSET_X16] /* 0x24 */ + stp x18, x19, [sp, #ISTATE_OFFSET_X18] /* 0x28 */ + stp x20, x21, [sp, #ISTATE_OFFSET_X20] /* 0x2c */ + stp x22, x23, [sp, #ISTATE_OFFSET_X22] /* 0x30 */ + stp x24, x25, [sp, #ISTATE_OFFSET_X24] /* 0x34 */ + stp x26, x27, [sp, #ISTATE_OFFSET_X26] /* 0x38 */ + stp x28, x29, [sp, #ISTATE_OFFSET_X28] /* 0x3c */ + str x30, [sp, #ISTATE_OFFSET_X30] /* 0x40 */ + + mrs x0, spsr_el1 /* 0x44 */ + mrs x1, sp_el0 /* 0x48 */ + stp x0, x1, [sp, #ISTATE_OFFSET_SPSR] /* 0x4c */ + + mrs x0, elr_el1 /* 0x50 */ + mrs x1, tpidr_el0 /* 0x54 */ + stp x0, x1, [sp, #ISTATE_OFFSET_PC] /* 0x58 */ + + mov x0, #\i /* 0x5c */ + mov x1, sp /* 0x60 */ + bl exc_dispatch /* 0x64 */ + + /* Restore previous state. */ + ldp x0, x1, [sp, #ISTATE_OFFSET_SPSR] /* 0x68 */ + msr spsr_el1, x0 /* 0x6c */ + msr sp_el0, x1 /* 0x70 */ + + ldp x0, x1, [sp, #ISTATE_OFFSET_PC] /* 0x74 */ + msr elr_el1, x0 /* 0x78 */ + b exc_restore_end /* 0x7c */ +.endm + +exc_restore_end: + /* Restore remaining registers and return from the exception handler. */ + msr tpidr_el0, x1 + ldp x0, x1, [sp, #ISTATE_OFFSET_X0] + ldp x2, x3, [sp, #ISTATE_OFFSET_X2] + ldp x4, x5, [sp, #ISTATE_OFFSET_X4] + ldp x6, x7, [sp, #ISTATE_OFFSET_X6] + ldp x8, x9, [sp, #ISTATE_OFFSET_X8] + ldp x10, x11, [sp, #ISTATE_OFFSET_X10] + ldp x12, x13, [sp, #ISTATE_OFFSET_X12] + ldp x14, x15, [sp, #ISTATE_OFFSET_X14] + ldp x16, x17, [sp, #ISTATE_OFFSET_X16] + ldp x18, x19, [sp, #ISTATE_OFFSET_X18] + ldp x20, x21, [sp, #ISTATE_OFFSET_X20] + ldp x22, x23, [sp, #ISTATE_OFFSET_X22] + ldp x24, x25, [sp, #ISTATE_OFFSET_X24] + ldp x26, x27, [sp, #ISTATE_OFFSET_X26] + ldp x28, x29, [sp, #ISTATE_OFFSET_X28] + ldr x30, [sp, #ISTATE_OFFSET_X30] + add sp, sp, #ISTATE_SIZE + eret + +.align 11 +SYMBOL(exc_vector) +.org exc_vector + 0x000 + handler EXC_CURRENT_EL_SP_SEL0_SYNCH +.org exc_vector + 0x080 + handler EXC_CURRENT_EL_SP_SEL0_IRQ +.org exc_vector + 0x100 + handler EXC_CURRENT_EL_SP_SEL0_FIQ +.org exc_vector + 0x180 + handler EXC_CURRENT_EL_SP_SEL0_SERROR +.org exc_vector + 0x200 + handler EXC_CURRENT_EL_SP_SELX_SYNCH +.org exc_vector + 0x280 + handler EXC_CURRENT_EL_SP_SELX_IRQ +.org exc_vector + 0x300 + handler EXC_CURRENT_EL_SP_SELX_FIQ +.org exc_vector + 0x380 + handler EXC_CURRENT_EL_SP_SELX_SERROR +.org exc_vector + 0x400 + handler EXC_LOWER_EL_AARCH64_SYNCH +.org exc_vector + 0x480 + handler EXC_LOWER_EL_AARCH64_IRQ +.org exc_vector + 0x500 + handler EXC_LOWER_EL_AARCH64_FIQ +.org exc_vector + 0x580 + handler EXC_LOWER_EL_AARCH64_SERROR +.org exc_vector + 0x600 + handler EXC_LOWER_EL_AARCH32_SYNCH +.org exc_vector + 0x680 + handler EXC_LOWER_EL_AARCH32_IRQ +.org exc_vector + 0x700 + handler EXC_LOWER_EL_AARCH32_FIQ +.org exc_vector + 0x780 + handler EXC_LOWER_EL_AARCH32_SERROR +.org exc_vector + 0x800 Index: kernel/arch/arm64/src/context.S =================================================================== --- kernel/arch/arm64/src/context.S (revision de9e28e0c0b35a214dcdc3688dc8579f50c5fbd6) +++ kernel/arch/arm64/src/context.S (revision de9e28e0c0b35a214dcdc3688dc8579f50c5fbd6) @@ -0,0 +1,84 @@ +/* + * Copyright (c) 2015 Petr Pavlu + * 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 +#include + +.text + +/* Static checks for the context_t save/load. */ +#if CONTEXT_OFFSET_SP + 8 != CONTEXT_OFFSET_PC +#error sp and pc are not successive in context_t +#endif +#if CONTEXT_OFFSET_X19 + 8 != CONTEXT_OFFSET_X20 +#error x19 and x20 are not successive in context_t +#endif +#if CONTEXT_OFFSET_X21 + 8 != CONTEXT_OFFSET_X22 +#error x21 and x22 are not successive in context_t +#endif +#if CONTEXT_OFFSET_X23 + 8 != CONTEXT_OFFSET_X24 +#error x23 and x24 are not successive in context_t +#endif +#if CONTEXT_OFFSET_X25 + 8 != CONTEXT_OFFSET_X26 +#error x25 and x26 are not successive in context_t +#endif +#if CONTEXT_OFFSET_X27 + 8 != CONTEXT_OFFSET_X28 +#error x27 and x28 are not successive in context_t +#endif + +FUNCTION_BEGIN(context_save_arch) + /* Save callee-saved registers into context_t pointed by x0. */ + mov x1, sp + stp x1, x30, [x0, #CONTEXT_OFFSET_SP] + stp x19, x20, [x0, #CONTEXT_OFFSET_X19] + stp x21, x22, [x0, #CONTEXT_OFFSET_X21] + stp x23, x24, [x0, #CONTEXT_OFFSET_X23] + stp x25, x26, [x0, #CONTEXT_OFFSET_X25] + stp x27, x28, [x0, #CONTEXT_OFFSET_X27] + str x29, [x0, #CONTEXT_OFFSET_X29] + + /* Return 1. */ + mov x0, #1 + ret +FUNCTION_END(context_save_arch) + +FUNCTION_BEGIN(context_restore_arch) + /* Restore callee-saved registers from context_t pointed by x0. */ + ldp x1, x30, [x0, #CONTEXT_OFFSET_SP] + mov sp, x1 + ldp x19, x20, [x0, #CONTEXT_OFFSET_X19] + ldp x21, x22, [x0, #CONTEXT_OFFSET_X21] + ldp x23, x24, [x0, #CONTEXT_OFFSET_X23] + ldp x25, x26, [x0, #CONTEXT_OFFSET_X25] + ldp x27, x28, [x0, #CONTEXT_OFFSET_X27] + ldr x29, [x0, #CONTEXT_OFFSET_X29] + + /* Return 0. */ + mov x0, #0 + ret +FUNCTION_END(context_restore_arch) Index: kernel/arch/arm64/src/cpu/cpu.c =================================================================== --- kernel/arch/arm64/src/cpu/cpu.c (revision de9e28e0c0b35a214dcdc3688dc8579f50c5fbd6) +++ kernel/arch/arm64/src/cpu/cpu.c (revision de9e28e0c0b35a214dcdc3688dc8579f50c5fbd6) @@ -0,0 +1,97 @@ +/* + * Copyright (c) 2015 Petr Pavlu + * 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 kernel_arm64 + * @{ + */ +/** @file + * @brief CPU identification. + */ + +#include +#include +#include + +/** Decode implementer (vendor) name. */ +static const char *implementer(uint32_t id) +{ + switch (id) { + case 0x41: + return "ARM Limited"; + case 0x42: + return "Broadcom Corporation"; + case 0x43: + return "Cavium Inc."; + case 0x44: + return "Digital Equipment Corporation"; + case 0x49: + return "Infineon Technologies AG"; + case 0x4d: + return "Motorola or Freescale Semiconductor Inc."; + case 0x4e: + return "NVIDIA Corporation"; + case 0x50: + return "Applied Micro Circuits Corporation"; + case 0x51: + return "Qualcomm Inc."; + case 0x56: + return "Marvell International Ltd."; + case 0x69: + return "Intel Corporation"; + } + return "Unknown implementer"; +} + +/** Perform ARM64-specific tasks needed for CPU initialization. */ +void cpu_arch_init(void) +{ +} + +/** Retrieve processor identification and stores it to #CPU.arch */ +void cpu_identify(void) +{ + uint64_t midr = MIDR_EL1_read(); + + CPU->arch.implementer = + (midr & MIDR_IMPLEMENTER_MASK) >> MIDR_IMPLEMENTER_SHIFT; + CPU->arch.variant = (midr & MIDR_VARIANT_MASK) >> MIDR_VARIANT_SHIFT; + CPU->arch.partnum = (midr & MIDR_PARTNUM_MASK) >> MIDR_PARTNUM_SHIFT; + CPU->arch.revision = (midr & MIDR_REVISION_MASK) >> MIDR_REVISION_SHIFT; +} + +/** Print CPU identification. */ +void cpu_print_report(cpu_t *m) +{ + printf("cpu%d: vendor=%s, variant=%" PRIx32 ", part number=%" PRIx32 + ", revision=%" PRIx32 "\n", + m->id, implementer(m->arch.implementer), m->arch.variant, + m->arch.partnum, m->arch.revision); +} + +/** @} + */ Index: kernel/arch/arm64/src/debug/stacktrace.c =================================================================== --- kernel/arch/arm64/src/debug/stacktrace.c (revision de9e28e0c0b35a214dcdc3688dc8579f50c5fbd6) +++ kernel/arch/arm64/src/debug/stacktrace.c (revision de9e28e0c0b35a214dcdc3688dc8579f50c5fbd6) @@ -0,0 +1,81 @@ +/* + * Copyright (c) 2015 Petr Pavlu + * 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 kernel_arm64 + * @{ + */ +/** @file + */ + +#include +#include +#include + +#define FRAME_OFFSET_FP_PREV 0 +#define FRAME_OFFSET_RA 1 + +bool kernel_stack_trace_context_validate(stack_trace_context_t *ctx) +{ + return ctx->fp != 0; +} + +bool kernel_frame_pointer_prev(stack_trace_context_t *ctx, uintptr_t *prev) +{ + uint64_t *stack = (void *) ctx->fp; + + *prev = stack[FRAME_OFFSET_FP_PREV]; + return true; +} + +bool kernel_return_address_get(stack_trace_context_t *ctx, uintptr_t *ra) +{ + uint64_t *stack = (void *) ctx->fp; + + *ra = stack[FRAME_OFFSET_RA]; + return true; +} + +bool uspace_stack_trace_context_validate(stack_trace_context_t *ctx) +{ + return ctx->fp != 0; +} + +bool uspace_frame_pointer_prev(stack_trace_context_t *ctx, uintptr_t *prev) +{ + return !copy_from_uspace((void *) prev, + (uint64_t *) ctx->fp + FRAME_OFFSET_FP_PREV, sizeof(*prev)); +} + +bool uspace_return_address_get(stack_trace_context_t *ctx, uintptr_t *ra) +{ + return !copy_from_uspace((void *) ra, + (uint64_t *) ctx->fp + FRAME_OFFSET_RA, sizeof(*ra)); +} + +/** @} + */ Index: kernel/arch/arm64/src/debug/stacktrace_asm.S =================================================================== --- kernel/arch/arm64/src/debug/stacktrace_asm.S (revision de9e28e0c0b35a214dcdc3688dc8579f50c5fbd6) +++ kernel/arch/arm64/src/debug/stacktrace_asm.S (revision de9e28e0c0b35a214dcdc3688dc8579f50c5fbd6) @@ -0,0 +1,41 @@ +/* + * Copyright (c) 2015 Petr Pavlu + * 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 + +.text + +FUNCTION_BEGIN(frame_pointer_get) + mov x0, x29 + ret +FUNCTION_END(frame_pointer_get) + +FUNCTION_BEGIN(program_counter_get) + mov x0, x30 + ret +FUNCTION_END(program_counter_get) Index: kernel/arch/arm64/src/exception.c =================================================================== --- kernel/arch/arm64/src/exception.c (revision de9e28e0c0b35a214dcdc3688dc8579f50c5fbd6) +++ kernel/arch/arm64/src/exception.c (revision de9e28e0c0b35a214dcdc3688dc8579f50c5fbd6) @@ -0,0 +1,324 @@ +/* + * Copyright (c) 2015 Petr Pavlu + * 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 kernel_arm64 + * @{ + */ +/** @file + * @brief Exception handlers and exception initialization routines. + */ + +#include +#include +#include +#include +#include +#include +#include +#include + +static void current_el_sp_sel0_synch_exception(unsigned int exc_no, + istate_t *istate) +{ + panic_badtrap(istate, exc_no, "Unhandled exception from Current EL, " + "SP_SEL0, Synch, ESR_EL1=%0#10" PRIx32 ", FAR_EL1=%0#18" PRIx64 ".", + (uint32_t) ESR_EL1_read(), FAR_EL1_read()); +} + +static void current_el_sp_sel0_irq_exception(unsigned int exc_no, + istate_t *istate) +{ + panic_badtrap(istate, exc_no, "Unhandled exception from Current EL, " + "SP_SEL0, IRQ, ESR_EL1=%0#10" PRIx32 ", FAR_EL1=%0#18" PRIx64 ".", + (uint32_t) ESR_EL1_read(), FAR_EL1_read()); +} + +static void current_el_sp_sel0_fiq_exception(unsigned int exc_no, + istate_t *istate) +{ + panic_badtrap(istate, exc_no, "Unhandled exception from Current EL, " + "SP_SEL0, FIQ, ESR_EL1=%0#10" PRIx32 ", FAR_EL1=%0#18" PRIx64 ".", + (uint32_t) ESR_EL1_read(), FAR_EL1_read()); +} + +static void current_el_sp_sel0_serror_exception(unsigned int exc_no, + istate_t *istate) +{ + panic_badtrap(istate, exc_no, "Unhandled exception from Current EL, " + "SP_SEL0, SError, ESR_EL1=%0#10" PRIx32 ", FAR_EL1=%0#18" PRIx64 + ".", (uint32_t) ESR_EL1_read(), FAR_EL1_read()); +} + +static void current_el_sp_selx_synch_exception(unsigned int exc_no, + istate_t *istate) +{ + uint64_t esr_el1 = ESR_EL1_read(); + uint64_t far_el1 = FAR_EL1_read(); + pf_access_t access; + + switch ((esr_el1 & ESR_EC_MASK) >> ESR_EC_SHIFT) { + case ESR_EC_DA_CURRENT_EL: + /* Data abort. */ + switch ((esr_el1 & ESR_IDFSC_MASK) >> ESR_IDFSC_SHIFT) { + case ESR_IDA_IDFSC_TF0: + case ESR_IDA_IDFSC_TF1: + case ESR_IDA_IDFSC_TF2: + case ESR_IDA_IDFSC_TF3: + /* Translation fault. */ + access = (esr_el1 & ESR_DA_WNR_FLAG) ? PF_ACCESS_WRITE : + PF_ACCESS_READ; + as_page_fault(far_el1, access, istate); + return; + } + } + + panic_badtrap(istate, exc_no, "Unhandled exception from Current EL, " + "SP_SELx, Synch, ESR_EL1=%0#10" PRIx32 ", FAR_EL1=%0#18" PRIx64 ".", + (uint32_t) ESR_EL1_read(), FAR_EL1_read()); +} + +static void current_el_sp_selx_irq_exception(unsigned int exc_no, + istate_t *istate) +{ + machine_irq_exception(exc_no, istate); +} + +static void current_el_sp_selx_fiq_exception(unsigned int exc_no, + istate_t *istate) +{ + panic_badtrap(istate, exc_no, "Unhandled exception from Current EL, " + "SP_SELx, FIQ, ESR_EL1=%0#10" PRIx32 ", FAR_EL1=%0#18" PRIx64 ".", + (uint32_t) ESR_EL1_read(), FAR_EL1_read()); +} + +static void current_el_sp_selx_serror_exception(unsigned int exc_no, + istate_t *istate) +{ + panic_badtrap(istate, exc_no, "Unhandled exception from Current EL, " + "SP_SELx, SError, ESR_EL1=%0#10" PRIx32 ", FAR_EL1=%0#18" PRIx64 + ".", (uint32_t) ESR_EL1_read(), FAR_EL1_read()); +} + +static void lower_el_aarch64_synch_exception(unsigned int exc_no, + istate_t *istate) +{ + uint64_t esr_el1 = ESR_EL1_read(); + uint64_t far_el1 = FAR_EL1_read(); + pf_access_t access; + bool exec = false; + + switch ((esr_el1 & ESR_EC_MASK) >> ESR_EC_SHIFT) { + case ESR_EC_FP: + /* Access to Advanced SIMD or floating-point functionality. */ +#ifdef CONFIG_FPU_LAZY + scheduler_fpu_lazy_request(); +#else + fault_from_uspace(istate, "AdvSIMD/FP fault."); +#endif + return; + case ESR_EC_SVC: + /* SVC instruction. */ + interrupts_enable(); + istate->x0 = syscall_handler(istate->x0, istate->x1, istate->x2, + istate->x3, istate->x4, istate->x5, istate->x6); + interrupts_disable(); + return; + case ESR_EC_IA_LOWER_EL: + /* Instruction abort. */ + exec = true; + /* Fallthrough */ + case ESR_EC_DA_LOWER_EL: + /* Data abort. */ + switch ((esr_el1 & ESR_IDFSC_MASK) >> ESR_IDFSC_SHIFT) { + case ESR_IDA_IDFSC_TF0: + case ESR_IDA_IDFSC_TF1: + case ESR_IDA_IDFSC_TF2: + case ESR_IDA_IDFSC_TF3: + /* Translation fault. */ + if (exec) + access = PF_ACCESS_EXEC; + else + access = (esr_el1 & ESR_DA_WNR_FLAG) ? + PF_ACCESS_WRITE : PF_ACCESS_READ; + as_page_fault(far_el1, access, istate); + return; + } + } + + fault_from_uspace(istate, "Unhandled exception from Lower EL, AArch64, " + "Synch, ESR_EL1=%0#10" PRIx32 ", FAR_EL1=%0#18" PRIx64 ".", + (uint32_t) esr_el1, far_el1); +} + +static void lower_el_aarch64_irq_exception(unsigned int exc_no, + istate_t *istate) +{ + machine_irq_exception(exc_no, istate); +} + +static void lower_el_aarch64_fiq_exception(unsigned int exc_no, + istate_t *istate) +{ + fault_from_uspace(istate, "Unhandled exception from Lower EL, AArch64, " + "FIQ, ESR_EL1=%0#10" PRIx32 ", FAR_EL1=%0#18" PRIx64 ".", + (uint32_t) ESR_EL1_read(), FAR_EL1_read()); +} + +static void lower_el_aarch64_serror_exception(unsigned int exc_no, + istate_t *istate) +{ + fault_from_uspace(istate, "Unhandled exception from Lower EL, AArch64, " + "SError, ESR_EL1=%0#10" PRIx32 ", FAR_EL1=%0#18" PRIx64 ".", + (uint32_t) ESR_EL1_read(), FAR_EL1_read()); +} + +static void lower_el_aarch32_synch_exception(unsigned int exc_no, + istate_t *istate) +{ + fault_from_uspace(istate, "Unhandled exception from Lower EL, AArch32, " + "Synch, ESR_EL1=%0#10" PRIx32 ", FAR_EL1=%0#18" PRIx64 ".", + (uint32_t) ESR_EL1_read(), FAR_EL1_read()); +} + +static void lower_el_aarch32_irq_exception(unsigned int exc_no, + istate_t *istate) +{ + fault_from_uspace(istate, "Unhandled exception from Lower EL, AArch32, " + "IRQ, ESR_EL1=%0#10" PRIx32 ", FAR_EL1=%0#18" PRIx64 ".", + (uint32_t) ESR_EL1_read(), FAR_EL1_read()); +} + +static void lower_el_aarch32_fiq_exception(unsigned int exc_no, + istate_t *istate) +{ + fault_from_uspace(istate, "Unhandled exception from Lower EL, AArch32, " + "FIQ, ESR_EL1=%0#10" PRIx32 ", FAR_EL1=%0#18" PRIx64 ".", + (uint32_t) ESR_EL1_read(), FAR_EL1_read()); +} + +static void lower_el_aarch32_serror_exception(unsigned int exc_no, + istate_t *istate) +{ + fault_from_uspace(istate, "Unhandled exception from Lower EL, AArch32, " + "SError, ESR_EL1=%0#10" PRIx32 ", FAR_EL1=%0#18" PRIx64 ".", + (uint32_t) ESR_EL1_read(), FAR_EL1_read()); +} + +/** Initializes exception handling. + * + * Installs low-level exception handlers and then registers exceptions and their + * handlers to kernel exception dispatcher. + */ +void exception_init(void) +{ + exc_register(EXC_CURRENT_EL_SP_SEL0_SYNCH, + "current EL, SP_SEL0, Synchronous", true, + (iroutine_t) current_el_sp_sel0_synch_exception); + exc_register(EXC_CURRENT_EL_SP_SEL0_IRQ, + "current EL, SP_SEL0, IRQ", true, + (iroutine_t) current_el_sp_sel0_irq_exception); + exc_register(EXC_CURRENT_EL_SP_SEL0_FIQ, + "current EL, SP_SEL0, FIQ", true, + (iroutine_t) current_el_sp_sel0_fiq_exception); + exc_register(EXC_CURRENT_EL_SP_SEL0_SERROR, + "current EL, SP_SEL0, SError", true, + (iroutine_t) current_el_sp_sel0_serror_exception); + exc_register(EXC_CURRENT_EL_SP_SELX_SYNCH, + "current EL, SP_SELx, Synchronous", true, + (iroutine_t) current_el_sp_selx_synch_exception); + exc_register(EXC_CURRENT_EL_SP_SELX_IRQ, + "current EL, SP_SELx, IRQ", true, + (iroutine_t) current_el_sp_selx_irq_exception); + exc_register(EXC_CURRENT_EL_SP_SELX_FIQ, + "current EL, SP_SELx, FIQ", true, + (iroutine_t) current_el_sp_selx_fiq_exception); + exc_register(EXC_CURRENT_EL_SP_SELX_SERROR, + "current EL, SP_SELx, SError", true, + (iroutine_t) current_el_sp_selx_serror_exception); + exc_register(EXC_LOWER_EL_AARCH64_SYNCH, + "lower EL, AArch64, Synchronous", true, + (iroutine_t) lower_el_aarch64_synch_exception); + exc_register(EXC_LOWER_EL_AARCH64_IRQ, + "lower EL, AArch64, IRQ", true, + (iroutine_t) lower_el_aarch64_irq_exception); + exc_register(EXC_LOWER_EL_AARCH64_FIQ, + "lower EL, AArch64, FIQ", true, + (iroutine_t) lower_el_aarch64_fiq_exception); + exc_register(EXC_LOWER_EL_AARCH64_SERROR, + "lower EL, AArch64, SError", true, + (iroutine_t) lower_el_aarch64_serror_exception); + exc_register(EXC_LOWER_EL_AARCH32_SYNCH, + "lower EL, AArch32, Synchronous", true, + (iroutine_t) lower_el_aarch32_synch_exception); + exc_register(EXC_LOWER_EL_AARCH32_IRQ, + "lower EL, AArch32, IRQ", true, + (iroutine_t) lower_el_aarch32_irq_exception); + exc_register(EXC_LOWER_EL_AARCH32_FIQ, + "lower EL, AArch32, FIQ", true, + (iroutine_t) lower_el_aarch32_fiq_exception); + exc_register(EXC_LOWER_EL_AARCH32_SERROR, + "lower EL, AArch32, SError", true, + (iroutine_t) lower_el_aarch32_serror_exception); + + VBAR_EL1_write(((uint64_t) &exc_vector)); +} + +/** Print #istate_t structure content. + * + * @param istate Structure to be printed. + */ +void istate_decode(istate_t *istate) +{ + printf("x0 =%0#18" PRIx64 "\tx1 =%0#18" PRIx64 "\t" + "x2 =%0#18" PRIx64 "\n", istate->x0, istate->x1, istate->x2); + printf("x3 =%0#18" PRIx64 "\tx4 =%0#18" PRIx64 "\t" + "x5 =%0#18" PRIx64 "\n", istate->x3, istate->x4, istate->x5); + printf("x6 =%0#18" PRIx64 "\tx7 =%0#18" PRIx64 "\t" + "x8 =%0#18" PRIx64 "\n", istate->x6, istate->x7, istate->x8); + printf("x9 =%0#18" PRIx64 "\tx10=%0#18" PRIx64 "\t" + "x11=%0#18" PRIx64 "\n", istate->x9, istate->x10, istate->x11); + printf("x12=%0#18" PRIx64 "\tx13=%0#18" PRIx64 "\t" + "x14=%0#18" PRIx64 "\n", istate->x12, istate->x13, istate->x14); + printf("x15=%0#18" PRIx64 "\tx16=%0#18" PRIx64 "\t" + "x17=%0#18" PRIx64 "\n", istate->x15, istate->x16, istate->x17); + printf("x18=%0#18" PRIx64 "\tx19=%0#18" PRIx64 "\t" + "x20=%0#18" PRIx64 "\n", istate->x18, istate->x19, istate->x20); + printf("x21=%0#18" PRIx64 "\tx22=%0#18" PRIx64 "\t" + "x23=%0#18" PRIx64 "\n", istate->x21, istate->x22, istate->x23); + printf("x24=%0#18" PRIx64 "\tx25=%0#18" PRIx64 "\t" + "x26=%0#18" PRIx64 "\n", istate->x24, istate->x25, istate->x26); + printf("x27=%0#18" PRIx64 "\tx28=%0#18" PRIx64 "\t" + "x29=%0#18" PRIx64 "\n", istate->x27, istate->x28, istate->x29); + printf("x30=%0#18" PRIx64 "\tsp =%0#18" PRIx64 "\t" + "pc =%0#18" PRIx64 "\n", istate->x30, istate->sp, istate->pc); + printf("spsr=%0#18" PRIx64 "\ttpidr=%0#18" PRIx64 "\n", istate->spsr, + istate->tpidr); +} + +/** @} + */ Index: kernel/arch/arm64/src/fpu.S =================================================================== --- kernel/arch/arm64/src/fpu.S (revision de9e28e0c0b35a214dcdc3688dc8579f50c5fbd6) +++ kernel/arch/arm64/src/fpu.S (revision de9e28e0c0b35a214dcdc3688dc8579f50c5fbd6) @@ -0,0 +1,82 @@ +/* + * Copyright (c) 2018 Petr Pavlu + * 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 +#include + +.text + +FUNCTION_BEGIN(fpu_context_save) + /* Save FPU registers into fpu_context_t pointed by x0. */ + stp q0, q1, [x0, #FPU_CONTEXT_OFFSET_VREGS + 16 * 0] + stp q2, q3, [x0, #FPU_CONTEXT_OFFSET_VREGS + 16 * 2] + stp q4, q5, [x0, #FPU_CONTEXT_OFFSET_VREGS + 16 * 4] + stp q6, q7, [x0, #FPU_CONTEXT_OFFSET_VREGS + 16 * 6] + stp q8, q9, [x0, #FPU_CONTEXT_OFFSET_VREGS + 16 * 8] + stp q10, q11, [x0, #FPU_CONTEXT_OFFSET_VREGS + 16 * 10] + stp q12, q13, [x0, #FPU_CONTEXT_OFFSET_VREGS + 16 * 12] + stp q14, q15, [x0, #FPU_CONTEXT_OFFSET_VREGS + 16 * 14] + stp q16, q17, [x0, #FPU_CONTEXT_OFFSET_VREGS + 16 * 16] + stp q18, q19, [x0, #FPU_CONTEXT_OFFSET_VREGS + 16 * 18] + stp q20, q21, [x0, #FPU_CONTEXT_OFFSET_VREGS + 16 * 20] + stp q22, q23, [x0, #FPU_CONTEXT_OFFSET_VREGS + 16 * 22] + stp q24, q25, [x0, #FPU_CONTEXT_OFFSET_VREGS + 16 * 24] + stp q26, q27, [x0, #FPU_CONTEXT_OFFSET_VREGS + 16 * 26] + stp q28, q29, [x0, #FPU_CONTEXT_OFFSET_VREGS + 16 * 28] + stp q30, q31, [x0, #FPU_CONTEXT_OFFSET_VREGS + 16 * 30] + mrs x1, fpcr + str w1, [x0, #FPU_CONTEXT_OFFSET_FPCR] + mrs x1, fpsr + str w1, [x0, #FPU_CONTEXT_OFFSET_FPSR] + ret +FUNCTION_END(fpu_context_save) + +FUNCTION_BEGIN(fpu_context_restore) + /* Restore FPU registers from fpu_context_t pointed by x0. */ + ldp q0, q1, [x0, #FPU_CONTEXT_OFFSET_VREGS + 16 * 0] + ldp q2, q3, [x0, #FPU_CONTEXT_OFFSET_VREGS + 16 * 2] + ldp q4, q5, [x0, #FPU_CONTEXT_OFFSET_VREGS + 16 * 4] + ldp q6, q7, [x0, #FPU_CONTEXT_OFFSET_VREGS + 16 * 6] + ldp q8, q9, [x0, #FPU_CONTEXT_OFFSET_VREGS + 16 * 8] + ldp q10, q11, [x0, #FPU_CONTEXT_OFFSET_VREGS + 16 * 10] + ldp q12, q13, [x0, #FPU_CONTEXT_OFFSET_VREGS + 16 * 12] + ldp q14, q15, [x0, #FPU_CONTEXT_OFFSET_VREGS + 16 * 14] + ldp q16, q17, [x0, #FPU_CONTEXT_OFFSET_VREGS + 16 * 16] + ldp q18, q19, [x0, #FPU_CONTEXT_OFFSET_VREGS + 16 * 18] + ldp q20, q21, [x0, #FPU_CONTEXT_OFFSET_VREGS + 16 * 20] + ldp q22, q23, [x0, #FPU_CONTEXT_OFFSET_VREGS + 16 * 22] + ldp q24, q25, [x0, #FPU_CONTEXT_OFFSET_VREGS + 16 * 24] + ldp q26, q27, [x0, #FPU_CONTEXT_OFFSET_VREGS + 16 * 26] + ldp q28, q29, [x0, #FPU_CONTEXT_OFFSET_VREGS + 16 * 28] + ldp q30, q31, [x0, #FPU_CONTEXT_OFFSET_VREGS + 16 * 30] + ldr w1, [x0, #FPU_CONTEXT_OFFSET_FPCR] + msr fpcr, x1 + ldr w1, [x0, #FPU_CONTEXT_OFFSET_FPSR] + msr fpsr, x1 + ret +FUNCTION_END(fpu_context_restore) Index: kernel/arch/arm64/src/fpu_context.c =================================================================== --- kernel/arch/arm64/src/fpu_context.c (revision de9e28e0c0b35a214dcdc3688dc8579f50c5fbd6) +++ kernel/arch/arm64/src/fpu_context.c (revision de9e28e0c0b35a214dcdc3688dc8579f50c5fbd6) @@ -0,0 +1,97 @@ +/* + * Copyright (c) 2015 Petr Pavlu + * 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 kernel_arm64 + * @{ + */ +/** @file + * @brief ARM64 FPU context. + */ + +#include +#include + +/** Initialize FPU functionality. */ +void fpu_init(void) +{ + /* + * Set initial FPU state: + * o Registers v0-v31 are cleared. + * o FPCR value: + * [31:27] - Reserved 0. + * [26] - AHP=0, IEEE half-precision format selected. + * [25] - DN=0, NaN operands propagate through to the output of a + * floating-point operation. + * [24] - FZ=0, flush-to-zero mode disabled. + * [23:22] - RMode=00, round to nearest mode. + * [21:20] - Stride=00, this field has no function in AArch64 state. + * [19] - FZ16=0, flush-to-zero mode disabled. + * [18:16] - Len=000, this field has no function in AArch64 state. + * [15] - IDE=0, input denormal FP exception is untrapped. + * [14:13] - Reserved 0. + * [12] - IXE=0, inexact FP exception is untrapped. + * [11] - UFE=0, underflow FP exception is untrapped. + * [10] - OFE=0, overflow FP exception is untrapped. + * [9] - DZE=0, divide by zero FP exception is untrapped. + * [8] - IOE=0, invalid operation FP exception is untrapped. + * [7:0] - Reserved 0. + * o FPSR value: + * [31] - N=0, negative condition flag for AArch32. + * [30] - Z=0, zero condition flag for AArch32. + * [29] - C=0, carry condition flag for AArch32. + * [28] - V=0, overflow condition flag for AArch32. + * [27] - QC=0, cumulative saturation bit. + * [26:8] - Reserved 0. + * [7] - IDC=0, input denormal cumulative FP exception bit. + * [6:5] - Reserved 0. + * [4] - IXC=0, inexact cumulative FP exception bit. + * [3] - UFC=0, underflow cumulative FP exception bit. + * [2] - OFC=0, overflow cumulative FP exception bit. + * [1] - DZC=0, divide by zero cumulative FP exception bit. + * [0] - IOC=0, invalid operation cumulative FP exception bit. + */ + static fpu_context_t init = { .vregs = { 0 }, .fpcr = 0, .fpsr = 0 }; + fpu_context_restore(&init); +} + +/** Enable FPU instructions. */ +void fpu_enable(void) +{ + CPACR_EL1_write((CPACR_EL1_read() & ~CPACR_FPEN_MASK) | + (CPACR_FPEN_TRAP_NONE << CPACR_FPEN_SHIFT)); +} + +/** Disable FPU instructions. */ +void fpu_disable(void) +{ + CPACR_EL1_write((CPACR_EL1_read() & ~CPACR_FPEN_MASK) | + (CPACR_FPEN_TRAP_ALL << CPACR_FPEN_SHIFT)); +} + +/** @} + */ Index: kernel/arch/arm64/src/interrupt.c =================================================================== --- kernel/arch/arm64/src/interrupt.c (revision de9e28e0c0b35a214dcdc3688dc8579f50c5fbd6) +++ kernel/arch/arm64/src/interrupt.c (revision de9e28e0c0b35a214dcdc3688dc8579f50c5fbd6) @@ -0,0 +1,172 @@ +/* + * Copyright (c) 2015 Petr Pavlu + * 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 kernel_arm64 + * @{ + */ +/** @file + * @brief Interrupts controlling routines. + */ + +#include +#include +#include +#include +#include