From 54f203b5985d2e11891f814282ed034722b59aed Mon Sep 17 00:00:00 2001 From: jameszow Date: Wed, 13 Sep 2023 11:48:56 +0800 Subject: [PATCH] fix error Line is too long. [101/100] --- .githooks/pre-commit | 4 +-- 01_wait_forever/Makefile | 20 ++++++------- 02_runtime_init/Makefile | 20 ++++++------- 02_runtime_init/README.md | 2 +- 03_hacky_hello_world/Makefile | 24 ++++++++-------- 03_hacky_hello_world/README.md | 4 +-- 04_safe_globals/Makefile | 24 ++++++++-------- 05_drivers_gpio_uart/Makefile | 24 ++++++++-------- 05_drivers_gpio_uart/README.md | 6 ++-- 06_uart_chainloader/Makefile | 24 ++++++++-------- 06_uart_chainloader/README.md | 8 +++--- 06_uart_chainloader/tests/chainboot_test.rb | 4 +-- 07_timestamps/Makefile | 24 ++++++++-------- 07_timestamps/README.md | 4 +-- 08_hw_debug_JTAG/Makefile | 28 +++++++++---------- 08_hw_debug_JTAG/README.md | 8 +++--- 09_privilege_level/Makefile | 28 +++++++++---------- .../Makefile | 28 +++++++++---------- 11_exceptions_part1_groundwork/Makefile | 28 +++++++++---------- 12_integrated_testing/Makefile | 28 +++++++++---------- .../kernel/tests/00_console_sanity.rb | 4 +-- .../tests/03_exception_restore_sanity.rb | 4 +-- 13_exceptions_part2_peripheral_IRQs/Makefile | 28 +++++++++---------- .../kernel/tests/00_console_sanity.rb | 4 +-- .../tests/03_exception_restore_sanity.rb | 4 +-- 14_virtual_mem_part2_mmio_remap/Makefile | 28 +++++++++---------- .../kernel/tests/00_console_sanity.rb | 4 +-- .../tests/03_exception_restore_sanity.rb | 4 +-- .../Makefile | 28 +++++++++---------- .../kernel/Cargo.toml | 8 +++--- .../kernel/tests/00_console_sanity.rb | 4 +-- .../tests/03_exception_restore_sanity.rb | 4 +-- .../Makefile | 28 +++++++++---------- .../kernel/tests/00_console_sanity.rb | 4 +-- .../tests/03_exception_restore_sanity.rb | 4 +-- 17_kernel_symbols/Makefile | 28 +++++++++---------- 17_kernel_symbols/README.md | 20 ++++++------- .../kernel/tests/00_console_sanity.rb | 4 +-- .../tests/03_exception_restore_sanity.rb | 4 +-- 17_kernel_symbols/kernel_symbols.mk | 16 +++++------ 18_backtrace/Makefile | 28 +++++++++---------- 18_backtrace/README.md | 12 ++++---- .../kernel/tests/00_console_sanity.rb | 4 +-- .../tests/03_exception_restore_sanity.rb | 4 +-- .../kernel/tests/05_backtrace_sanity.rb | 4 +-- .../tests/06_backtrace_invalid_frame.rb | 4 +-- .../kernel/tests/07_backtrace_invalid_link.rb | 4 +-- 18_backtrace/kernel_symbols.mk | 16 +++++------ 19_kernel_heap/Makefile | 28 +++++++++---------- 19_kernel_heap/README.md | 2 +- .../kernel/tests/00_console_sanity.rb | 4 +-- .../tests/03_exception_restore_sanity.rb | 4 +-- .../kernel/tests/05_backtrace_sanity.rb | 4 +-- .../tests/06_backtrace_invalid_frame.rb | 4 +-- .../kernel/tests/07_backtrace_invalid_link.rb | 4 +-- 19_kernel_heap/kernel_symbols.mk | 16 +++++------ 20_timer_callbacks/Makefile | 28 +++++++++---------- 20_timer_callbacks/kernel/Cargo.toml | 8 +++--- .../kernel/tests/00_console_sanity.rb | 4 +-- .../tests/03_exception_restore_sanity.rb | 4 +-- .../kernel/tests/05_backtrace_sanity.rb | 4 +-- .../tests/06_backtrace_invalid_frame.rb | 4 +-- .../kernel/tests/07_backtrace_invalid_link.rb | 4 +-- 20_timer_callbacks/kernel_symbols.mk | 16 +++++------ X1_JTAG_boot/Cargo.toml | 4 +-- X1_JTAG_boot/Makefile | 24 ++++++++-------- common/serial/minipush.rb | 4 +-- common/serial/miniterm.rb | 4 +-- utils/devtool.rb | 4 +-- 69 files changed, 413 insertions(+), 413 deletions(-) diff --git a/.githooks/pre-commit b/.githooks/pre-commit index 2a9e5cc7..71381892 100755 --- a/.githooks/pre-commit +++ b/.githooks/pre-commit @@ -23,9 +23,9 @@ def copyright_check(staged_files) copyright_check_files(staged_files) end -## -------------------------------------------------------------------------------------------------- +## ------------------------------------------------------------------------------------------------- ## Execution starts here -## -------------------------------------------------------------------------------------------------- +## ------------------------------------------------------------------------------------------------- staged_files = `git --no-pager diff --name-only --cached --diff-filter=d`.split(/\n/) root_dir = `git rev-parse --show-toplevel`.strip diff --git a/01_wait_forever/Makefile b/01_wait_forever/Makefile index a7c8160c..5e9debc5 100644 --- a/01_wait_forever/Makefile +++ b/01_wait_forever/Makefile @@ -6,18 +6,18 @@ include ../common/docker.mk include ../common/format.mk include ../common/operating_system.mk -## -------------------------------------------------------------------------------------------------- +## ------------------------------------------------------------------------------------------------- ## Optional, user-provided configuration values -## -------------------------------------------------------------------------------------------------- +## ------------------------------------------------------------------------------------------------- # Default to the RPi3. BSP ?= rpi3 -## -------------------------------------------------------------------------------------------------- +## ------------------------------------------------------------------------------------------------- ## BSP-specific configuration values -## -------------------------------------------------------------------------------------------------- +## ------------------------------------------------------------------------------------------------- QEMU_MISSING_STRING = "This board is not yet supported for QEMU." ifeq ($(BSP),rpi3) @@ -49,9 +49,9 @@ export LD_SCRIPT_PATH -## -------------------------------------------------------------------------------------------------- +## ------------------------------------------------------------------------------------------------- ## Targets and Prerequisites -## -------------------------------------------------------------------------------------------------- +## ------------------------------------------------------------------------------------------------- KERNEL_MANIFEST = Cargo.toml KERNEL_LINKER_SCRIPT = kernel.ld LAST_BUILD_CONFIG = target/$(BSP).build_config @@ -63,9 +63,9 @@ KERNEL_ELF_DEPS = $(filter-out %: ,$(file < $(KERNEL_ELF).d)) $(KERNEL_MANIFEST) -## -------------------------------------------------------------------------------------------------- +## ------------------------------------------------------------------------------------------------- ## Command building blocks -## -------------------------------------------------------------------------------------------------- +## ------------------------------------------------------------------------------------------------- RUSTFLAGS = $(RUSTC_MISC_ARGS) \ -C link-arg=--library-path=$(LD_SCRIPT_PATH) \ -C link-arg=--script=$(KERNEL_LINKER_SCRIPT) @@ -100,9 +100,9 @@ DOCKER_TOOLS = $(DOCKER_CMD) $(DOCKER_IMAGE) -## -------------------------------------------------------------------------------------------------- +## ------------------------------------------------------------------------------------------------- ## Targets -## -------------------------------------------------------------------------------------------------- +## ------------------------------------------------------------------------------------------------- .PHONY: all doc qemu clippy clean readelf objdump nm check all: $(KERNEL_BIN) diff --git a/02_runtime_init/Makefile b/02_runtime_init/Makefile index 8109e314..dd6080f9 100644 --- a/02_runtime_init/Makefile +++ b/02_runtime_init/Makefile @@ -6,18 +6,18 @@ include ../common/docker.mk include ../common/format.mk include ../common/operating_system.mk -## -------------------------------------------------------------------------------------------------- +## ------------------------------------------------------------------------------------------------- ## Optional, user-provided configuration values -## -------------------------------------------------------------------------------------------------- +## ------------------------------------------------------------------------------------------------- # Default to the RPi3. BSP ?= rpi3 -## -------------------------------------------------------------------------------------------------- +## ------------------------------------------------------------------------------------------------- ## BSP-specific configuration values -## -------------------------------------------------------------------------------------------------- +## ------------------------------------------------------------------------------------------------- QEMU_MISSING_STRING = "This board is not yet supported for QEMU." ifeq ($(BSP),rpi3) @@ -49,9 +49,9 @@ export LD_SCRIPT_PATH -## -------------------------------------------------------------------------------------------------- +## ------------------------------------------------------------------------------------------------- ## Targets and Prerequisites -## -------------------------------------------------------------------------------------------------- +## ------------------------------------------------------------------------------------------------- KERNEL_MANIFEST = Cargo.toml KERNEL_LINKER_SCRIPT = kernel.ld LAST_BUILD_CONFIG = target/$(BSP).build_config @@ -63,9 +63,9 @@ KERNEL_ELF_DEPS = $(filter-out %: ,$(file < $(KERNEL_ELF).d)) $(KERNEL_MANIFEST) -## -------------------------------------------------------------------------------------------------- +## ------------------------------------------------------------------------------------------------- ## Command building blocks -## -------------------------------------------------------------------------------------------------- +## ------------------------------------------------------------------------------------------------- RUSTFLAGS = $(RUSTC_MISC_ARGS) \ -C link-arg=--library-path=$(LD_SCRIPT_PATH) \ -C link-arg=--script=$(KERNEL_LINKER_SCRIPT) @@ -100,9 +100,9 @@ DOCKER_TOOLS = $(DOCKER_CMD) $(DOCKER_IMAGE) -## -------------------------------------------------------------------------------------------------- +## ------------------------------------------------------------------------------------------------- ## Targets -## -------------------------------------------------------------------------------------------------- +## ------------------------------------------------------------------------------------------------- .PHONY: all doc qemu clippy clean readelf objdump nm check all: $(KERNEL_BIN) diff --git a/02_runtime_init/README.md b/02_runtime_init/README.md index f9453519..2383b695 100644 --- a/02_runtime_init/README.md +++ b/02_runtime_init/README.md @@ -41,7 +41,7 @@ diff -uNr 01_wait_forever/Cargo.toml 02_runtime_init/Cargo.toml edition = "2021" @@ -21,3 +21,7 @@ - ## -------------------------------------------------------------------------------------------------- + ## ------------------------------------------------------------------------------------------------- [dependencies] + diff --git a/03_hacky_hello_world/Makefile b/03_hacky_hello_world/Makefile index 85e44f50..ed9cb8a4 100644 --- a/03_hacky_hello_world/Makefile +++ b/03_hacky_hello_world/Makefile @@ -6,18 +6,18 @@ include ../common/docker.mk include ../common/format.mk include ../common/operating_system.mk -## -------------------------------------------------------------------------------------------------- +## ------------------------------------------------------------------------------------------------- ## Optional, user-provided configuration values -## -------------------------------------------------------------------------------------------------- +## ------------------------------------------------------------------------------------------------- # Default to the RPi3. BSP ?= rpi3 -## -------------------------------------------------------------------------------------------------- +## ------------------------------------------------------------------------------------------------- ## BSP-specific configuration values -## -------------------------------------------------------------------------------------------------- +## ------------------------------------------------------------------------------------------------- QEMU_MISSING_STRING = "This board is not yet supported for QEMU." ifeq ($(BSP),rpi3) @@ -49,9 +49,9 @@ export LD_SCRIPT_PATH -## -------------------------------------------------------------------------------------------------- +## ------------------------------------------------------------------------------------------------- ## Targets and Prerequisites -## -------------------------------------------------------------------------------------------------- +## ------------------------------------------------------------------------------------------------- KERNEL_MANIFEST = Cargo.toml KERNEL_LINKER_SCRIPT = kernel.ld LAST_BUILD_CONFIG = target/$(BSP).build_config @@ -63,9 +63,9 @@ KERNEL_ELF_DEPS = $(filter-out %: ,$(file < $(KERNEL_ELF).d)) $(KERNEL_MANIFEST) -## -------------------------------------------------------------------------------------------------- +## ------------------------------------------------------------------------------------------------- ## Command building blocks -## -------------------------------------------------------------------------------------------------- +## ------------------------------------------------------------------------------------------------- RUSTFLAGS = $(RUSTC_MISC_ARGS) \ -C link-arg=--library-path=$(LD_SCRIPT_PATH) \ -C link-arg=--script=$(KERNEL_LINKER_SCRIPT) @@ -103,9 +103,9 @@ DOCKER_TEST = $(DOCKER_CMD) $(DOCKER_ARG_DIR_COMMON) $(DOCKER_IMAGE) -## -------------------------------------------------------------------------------------------------- +## ------------------------------------------------------------------------------------------------- ## Targets -## -------------------------------------------------------------------------------------------------- +## ------------------------------------------------------------------------------------------------- .PHONY: all doc qemu clippy clean readelf objdump nm check all: $(KERNEL_BIN) @@ -196,9 +196,9 @@ nm: $(KERNEL_ELF) -## -------------------------------------------------------------------------------------------------- +## ------------------------------------------------------------------------------------------------- ## Testing targets -## -------------------------------------------------------------------------------------------------- +## ------------------------------------------------------------------------------------------------- .PHONY: test test_boot ifeq ($(QEMU_MACHINE_TYPE),) # QEMU is not supported for the board. diff --git a/03_hacky_hello_world/README.md b/03_hacky_hello_world/README.md index 0f772e1e..8e5eca18 100644 --- a/03_hacky_hello_world/README.md +++ b/03_hacky_hello_world/README.md @@ -101,9 +101,9 @@ diff -uNr 02_runtime_init/Makefile 03_hacky_hello_world/Makefile + + -+## -------------------------------------------------------------------------------------------------- ++## ------------------------------------------------------------------------------------------------- +## Testing targets -+## -------------------------------------------------------------------------------------------------- ++## ------------------------------------------------------------------------------------------------- +.PHONY: test test_boot + +ifeq ($(QEMU_MACHINE_TYPE),) # QEMU is not supported for the board. diff --git a/04_safe_globals/Makefile b/04_safe_globals/Makefile index 85e44f50..ed9cb8a4 100644 --- a/04_safe_globals/Makefile +++ b/04_safe_globals/Makefile @@ -6,18 +6,18 @@ include ../common/docker.mk include ../common/format.mk include ../common/operating_system.mk -## -------------------------------------------------------------------------------------------------- +## ------------------------------------------------------------------------------------------------- ## Optional, user-provided configuration values -## -------------------------------------------------------------------------------------------------- +## ------------------------------------------------------------------------------------------------- # Default to the RPi3. BSP ?= rpi3 -## -------------------------------------------------------------------------------------------------- +## ------------------------------------------------------------------------------------------------- ## BSP-specific configuration values -## -------------------------------------------------------------------------------------------------- +## ------------------------------------------------------------------------------------------------- QEMU_MISSING_STRING = "This board is not yet supported for QEMU." ifeq ($(BSP),rpi3) @@ -49,9 +49,9 @@ export LD_SCRIPT_PATH -## -------------------------------------------------------------------------------------------------- +## ------------------------------------------------------------------------------------------------- ## Targets and Prerequisites -## -------------------------------------------------------------------------------------------------- +## ------------------------------------------------------------------------------------------------- KERNEL_MANIFEST = Cargo.toml KERNEL_LINKER_SCRIPT = kernel.ld LAST_BUILD_CONFIG = target/$(BSP).build_config @@ -63,9 +63,9 @@ KERNEL_ELF_DEPS = $(filter-out %: ,$(file < $(KERNEL_ELF).d)) $(KERNEL_MANIFEST) -## -------------------------------------------------------------------------------------------------- +## ------------------------------------------------------------------------------------------------- ## Command building blocks -## -------------------------------------------------------------------------------------------------- +## ------------------------------------------------------------------------------------------------- RUSTFLAGS = $(RUSTC_MISC_ARGS) \ -C link-arg=--library-path=$(LD_SCRIPT_PATH) \ -C link-arg=--script=$(KERNEL_LINKER_SCRIPT) @@ -103,9 +103,9 @@ DOCKER_TEST = $(DOCKER_CMD) $(DOCKER_ARG_DIR_COMMON) $(DOCKER_IMAGE) -## -------------------------------------------------------------------------------------------------- +## ------------------------------------------------------------------------------------------------- ## Targets -## -------------------------------------------------------------------------------------------------- +## ------------------------------------------------------------------------------------------------- .PHONY: all doc qemu clippy clean readelf objdump nm check all: $(KERNEL_BIN) @@ -196,9 +196,9 @@ nm: $(KERNEL_ELF) -## -------------------------------------------------------------------------------------------------- +## ------------------------------------------------------------------------------------------------- ## Testing targets -## -------------------------------------------------------------------------------------------------- +## ------------------------------------------------------------------------------------------------- .PHONY: test test_boot ifeq ($(QEMU_MACHINE_TYPE),) # QEMU is not supported for the board. diff --git a/05_drivers_gpio_uart/Makefile b/05_drivers_gpio_uart/Makefile index 399e9481..bc180f25 100644 --- a/05_drivers_gpio_uart/Makefile +++ b/05_drivers_gpio_uart/Makefile @@ -6,9 +6,9 @@ include ../common/docker.mk include ../common/format.mk include ../common/operating_system.mk -## -------------------------------------------------------------------------------------------------- +## ------------------------------------------------------------------------------------------------- ## Optional, user-provided configuration values -## -------------------------------------------------------------------------------------------------- +## ------------------------------------------------------------------------------------------------- # Default to the RPi3. BSP ?= rpi3 @@ -18,9 +18,9 @@ DEV_SERIAL ?= /dev/ttyUSB0 -## -------------------------------------------------------------------------------------------------- +## ------------------------------------------------------------------------------------------------- ## BSP-specific configuration values -## -------------------------------------------------------------------------------------------------- +## ------------------------------------------------------------------------------------------------- QEMU_MISSING_STRING = "This board is not yet supported for QEMU." ifeq ($(BSP),rpi3) @@ -52,9 +52,9 @@ export LD_SCRIPT_PATH -## -------------------------------------------------------------------------------------------------- +## ------------------------------------------------------------------------------------------------- ## Targets and Prerequisites -## -------------------------------------------------------------------------------------------------- +## ------------------------------------------------------------------------------------------------- KERNEL_MANIFEST = Cargo.toml KERNEL_LINKER_SCRIPT = kernel.ld LAST_BUILD_CONFIG = target/$(BSP).build_config @@ -66,9 +66,9 @@ KERNEL_ELF_DEPS = $(filter-out %: ,$(file < $(KERNEL_ELF).d)) $(KERNEL_MANIFEST) -## -------------------------------------------------------------------------------------------------- +## ------------------------------------------------------------------------------------------------- ## Command building blocks -## -------------------------------------------------------------------------------------------------- +## ------------------------------------------------------------------------------------------------- RUSTFLAGS = $(RUSTC_MISC_ARGS) \ -C link-arg=--library-path=$(LD_SCRIPT_PATH) \ -C link-arg=--script=$(KERNEL_LINKER_SCRIPT) @@ -115,9 +115,9 @@ endif -## -------------------------------------------------------------------------------------------------- +## ------------------------------------------------------------------------------------------------- ## Targets -## -------------------------------------------------------------------------------------------------- +## ------------------------------------------------------------------------------------------------- .PHONY: all doc qemu miniterm clippy clean readelf objdump nm check all: $(KERNEL_BIN) @@ -215,9 +215,9 @@ nm: $(KERNEL_ELF) -## -------------------------------------------------------------------------------------------------- +## ------------------------------------------------------------------------------------------------- ## Testing targets -## -------------------------------------------------------------------------------------------------- +## ------------------------------------------------------------------------------------------------- .PHONY: test test_boot ifeq ($(QEMU_MACHINE_TYPE),) # QEMU is not supported for the board. diff --git a/05_drivers_gpio_uart/README.md b/05_drivers_gpio_uart/README.md index dba6bfda..9db9df01 100644 --- a/05_drivers_gpio_uart/README.md +++ b/05_drivers_gpio_uart/README.md @@ -195,7 +195,7 @@ diff -uNr 04_safe_globals/Makefile 05_drivers_gpio_uart/Makefile + - ## -------------------------------------------------------------------------------------------------- + ## ------------------------------------------------------------------------------------------------- @@ -88,6 +91,7 @@ EXEC_QEMU = $(QEMU_BINARY) -M $(QEMU_MACHINE_TYPE) @@ -224,9 +224,9 @@ diff -uNr 04_safe_globals/Makefile 05_drivers_gpio_uart/Makefile + - ## -------------------------------------------------------------------------------------------------- + ## ------------------------------------------------------------------------------------------------- ## Targets - ## -------------------------------------------------------------------------------------------------- + ## ------------------------------------------------------------------------------------------------- -.PHONY: all doc qemu clippy clean readelf objdump nm check +.PHONY: all doc qemu miniterm clippy clean readelf objdump nm check diff --git a/06_uart_chainloader/Makefile b/06_uart_chainloader/Makefile index 6f6c41f5..139492f8 100644 --- a/06_uart_chainloader/Makefile +++ b/06_uart_chainloader/Makefile @@ -6,9 +6,9 @@ include ../common/docker.mk include ../common/format.mk include ../common/operating_system.mk -## -------------------------------------------------------------------------------------------------- +## ------------------------------------------------------------------------------------------------- ## Optional, user-provided configuration values -## -------------------------------------------------------------------------------------------------- +## ------------------------------------------------------------------------------------------------- # Default to the RPi3. BSP ?= rpi3 @@ -18,9 +18,9 @@ DEV_SERIAL ?= /dev/ttyUSB0 -## -------------------------------------------------------------------------------------------------- +## ------------------------------------------------------------------------------------------------- ## BSP-specific configuration values -## -------------------------------------------------------------------------------------------------- +## ------------------------------------------------------------------------------------------------- QEMU_MISSING_STRING = "This board is not yet supported for QEMU." ifeq ($(BSP),rpi3) @@ -54,9 +54,9 @@ export LD_SCRIPT_PATH -## -------------------------------------------------------------------------------------------------- +## ------------------------------------------------------------------------------------------------- ## Targets and Prerequisites -## -------------------------------------------------------------------------------------------------- +## ------------------------------------------------------------------------------------------------- KERNEL_MANIFEST = Cargo.toml KERNEL_LINKER_SCRIPT = kernel.ld LAST_BUILD_CONFIG = target/$(BSP).build_config @@ -68,9 +68,9 @@ KERNEL_ELF_DEPS = $(filter-out %: ,$(file < $(KERNEL_ELF).d)) $(KERNEL_MANIFEST) -## -------------------------------------------------------------------------------------------------- +## ------------------------------------------------------------------------------------------------- ## Command building blocks -## -------------------------------------------------------------------------------------------------- +## ------------------------------------------------------------------------------------------------- RUSTFLAGS = $(RUSTC_MISC_ARGS) \ -C link-arg=--library-path=$(LD_SCRIPT_PATH) \ -C link-arg=--script=$(KERNEL_LINKER_SCRIPT) @@ -117,9 +117,9 @@ endif -## -------------------------------------------------------------------------------------------------- +## ------------------------------------------------------------------------------------------------- ## Targets -## -------------------------------------------------------------------------------------------------- +## ------------------------------------------------------------------------------------------------- .PHONY: all doc qemu chainboot clippy clean readelf objdump nm check all: $(KERNEL_BIN) @@ -221,9 +221,9 @@ nm: $(KERNEL_ELF) -## -------------------------------------------------------------------------------------------------- +## ------------------------------------------------------------------------------------------------- ## Testing targets -## -------------------------------------------------------------------------------------------------- +## ------------------------------------------------------------------------------------------------- .PHONY: test test_boot ifeq ($(QEMU_MACHINE_TYPE),) # QEMU is not supported for the board. diff --git a/06_uart_chainloader/README.md b/06_uart_chainloader/README.md index a60c5cb5..6502d07b 100644 --- a/06_uart_chainloader/README.md +++ b/06_uart_chainloader/README.md @@ -211,9 +211,9 @@ diff -uNr 05_drivers_gpio_uart/Makefile 06_uart_chainloader/Makefile @@ -118,7 +120,7 @@ - ## -------------------------------------------------------------------------------------------------- + ## ------------------------------------------------------------------------------------------------- ## Targets - ## -------------------------------------------------------------------------------------------------- + ## ------------------------------------------------------------------------------------------------- -.PHONY: all doc qemu miniterm clippy clean readelf objdump nm check +.PHONY: all doc qemu chainboot clippy clean readelf objdump nm check @@ -647,9 +647,9 @@ diff -uNr 05_drivers_gpio_uart/tests/chainboot_test.rb 06_uart_chainloader/tests + end +end + -+## -------------------------------------------------------------------------------------------------- ++## ------------------------------------------------------------------------------------------------- +## Execution starts here -+## -------------------------------------------------------------------------------------------------- ++## ------------------------------------------------------------------------------------------------- +payload_path = ARGV.pop +qemu_cmd = ARGV.join(' ') + diff --git a/06_uart_chainloader/tests/chainboot_test.rb b/06_uart_chainloader/tests/chainboot_test.rb index 436f5e24..00de42a3 100644 --- a/06_uart_chainloader/tests/chainboot_test.rb +++ b/06_uart_chainloader/tests/chainboot_test.rb @@ -69,9 +69,9 @@ class ChainbootTest < BootTest end end -## -------------------------------------------------------------------------------------------------- +## ------------------------------------------------------------------------------------------------- ## Execution starts here -## -------------------------------------------------------------------------------------------------- +## ------------------------------------------------------------------------------------------------- payload_path = ARGV.pop qemu_cmd = ARGV.join(' ') diff --git a/07_timestamps/Makefile b/07_timestamps/Makefile index 40d7b259..f97db7f3 100644 --- a/07_timestamps/Makefile +++ b/07_timestamps/Makefile @@ -6,9 +6,9 @@ include ../common/docker.mk include ../common/format.mk include ../common/operating_system.mk -## -------------------------------------------------------------------------------------------------- +## ------------------------------------------------------------------------------------------------- ## Optional, user-provided configuration values -## -------------------------------------------------------------------------------------------------- +## ------------------------------------------------------------------------------------------------- # Default to the RPi3. BSP ?= rpi3 @@ -18,9 +18,9 @@ DEV_SERIAL ?= /dev/ttyUSB0 -## -------------------------------------------------------------------------------------------------- +## ------------------------------------------------------------------------------------------------- ## BSP-specific configuration values -## -------------------------------------------------------------------------------------------------- +## ------------------------------------------------------------------------------------------------- QEMU_MISSING_STRING = "This board is not yet supported for QEMU." ifeq ($(BSP),rpi3) @@ -52,9 +52,9 @@ export LD_SCRIPT_PATH -## -------------------------------------------------------------------------------------------------- +## ------------------------------------------------------------------------------------------------- ## Targets and Prerequisites -## -------------------------------------------------------------------------------------------------- +## ------------------------------------------------------------------------------------------------- KERNEL_MANIFEST = Cargo.toml KERNEL_LINKER_SCRIPT = kernel.ld LAST_BUILD_CONFIG = target/$(BSP).build_config @@ -66,9 +66,9 @@ KERNEL_ELF_DEPS = $(filter-out %: ,$(file < $(KERNEL_ELF).d)) $(KERNEL_MANIFEST) -## -------------------------------------------------------------------------------------------------- +## ------------------------------------------------------------------------------------------------- ## Command building blocks -## -------------------------------------------------------------------------------------------------- +## ------------------------------------------------------------------------------------------------- RUSTFLAGS = $(RUSTC_MISC_ARGS) \ -C link-arg=--library-path=$(LD_SCRIPT_PATH) \ -C link-arg=--script=$(KERNEL_LINKER_SCRIPT) @@ -115,9 +115,9 @@ endif -## -------------------------------------------------------------------------------------------------- +## ------------------------------------------------------------------------------------------------- ## Targets -## -------------------------------------------------------------------------------------------------- +## ------------------------------------------------------------------------------------------------- .PHONY: all doc qemu chainboot clippy clean readelf objdump nm check all: $(KERNEL_BIN) @@ -215,9 +215,9 @@ nm: $(KERNEL_ELF) -## -------------------------------------------------------------------------------------------------- +## ------------------------------------------------------------------------------------------------- ## Testing targets -## -------------------------------------------------------------------------------------------------- +## ------------------------------------------------------------------------------------------------- .PHONY: test test_boot ifeq ($(QEMU_MACHINE_TYPE),) # QEMU is not supported for the board. diff --git a/07_timestamps/README.md b/07_timestamps/README.md index 98427725..e2c6ea0e 100644 --- a/07_timestamps/README.md +++ b/07_timestamps/README.md @@ -961,9 +961,9 @@ diff -uNr 06_uart_chainloader/tests/chainboot_test.rb 07_timestamps/tests/chainb - end -end - --## -------------------------------------------------------------------------------------------------- +-## ------------------------------------------------------------------------------------------------- -## Execution starts here --## -------------------------------------------------------------------------------------------------- +-## ------------------------------------------------------------------------------------------------- -payload_path = ARGV.pop -qemu_cmd = ARGV.join(' ') - diff --git a/08_hw_debug_JTAG/Makefile b/08_hw_debug_JTAG/Makefile index cc233afd..8b386adf 100644 --- a/08_hw_debug_JTAG/Makefile +++ b/08_hw_debug_JTAG/Makefile @@ -6,9 +6,9 @@ include ../common/docker.mk include ../common/format.mk include ../common/operating_system.mk -## -------------------------------------------------------------------------------------------------- +## ------------------------------------------------------------------------------------------------- ## Optional, user-provided configuration values -## -------------------------------------------------------------------------------------------------- +## ------------------------------------------------------------------------------------------------- # Default to the RPi3. BSP ?= rpi3 @@ -18,9 +18,9 @@ DEV_SERIAL ?= /dev/ttyUSB0 -## -------------------------------------------------------------------------------------------------- +## ------------------------------------------------------------------------------------------------- ## BSP-specific configuration values -## -------------------------------------------------------------------------------------------------- +## ------------------------------------------------------------------------------------------------- QEMU_MISSING_STRING = "This board is not yet supported for QEMU." ifeq ($(BSP),rpi3) @@ -56,9 +56,9 @@ export LD_SCRIPT_PATH -## -------------------------------------------------------------------------------------------------- +## ------------------------------------------------------------------------------------------------- ## Targets and Prerequisites -## -------------------------------------------------------------------------------------------------- +## ------------------------------------------------------------------------------------------------- KERNEL_MANIFEST = Cargo.toml KERNEL_LINKER_SCRIPT = kernel.ld LAST_BUILD_CONFIG = target/$(BSP).build_config @@ -70,9 +70,9 @@ KERNEL_ELF_DEPS = $(filter-out %: ,$(file < $(KERNEL_ELF).d)) $(KERNEL_MANIFEST) -## -------------------------------------------------------------------------------------------------- +## ------------------------------------------------------------------------------------------------- ## Command building blocks -## -------------------------------------------------------------------------------------------------- +## ------------------------------------------------------------------------------------------------- RUSTFLAGS = $(RUSTC_MISC_ARGS) \ -C link-arg=--library-path=$(LD_SCRIPT_PATH) \ -C link-arg=--script=$(KERNEL_LINKER_SCRIPT) @@ -126,9 +126,9 @@ endif -## -------------------------------------------------------------------------------------------------- +## ------------------------------------------------------------------------------------------------- ## Targets -## -------------------------------------------------------------------------------------------------- +## ------------------------------------------------------------------------------------------------- .PHONY: all doc qemu chainboot clippy clean readelf objdump nm check all: $(KERNEL_BIN) @@ -226,9 +226,9 @@ nm: $(KERNEL_ELF) -## -------------------------------------------------------------------------------------------------- +## ------------------------------------------------------------------------------------------------- ## Debugging targets -## -------------------------------------------------------------------------------------------------- +## ------------------------------------------------------------------------------------------------- .PHONY: jtagboot openocd gdb gdb-opt0 ## ------------------------------------------------------------------------------ @@ -255,9 +255,9 @@ gdb gdb-opt0: $(KERNEL_ELF) -## -------------------------------------------------------------------------------------------------- +## ------------------------------------------------------------------------------------------------- ## Testing targets -## -------------------------------------------------------------------------------------------------- +## ------------------------------------------------------------------------------------------------- .PHONY: test test_boot ifeq ($(QEMU_MACHINE_TYPE),) # QEMU is not supported for the board. diff --git a/08_hw_debug_JTAG/README.md b/08_hw_debug_JTAG/README.md index 679496f4..8ea5b37d 100644 --- a/08_hw_debug_JTAG/README.md +++ b/08_hw_debug_JTAG/README.md @@ -368,9 +368,9 @@ diff -uNr 07_timestamps/Makefile 08_hw_debug_JTAG/Makefile -+## -------------------------------------------------------------------------------------------------- ++## ------------------------------------------------------------------------------------------------- +## Debugging targets -+## -------------------------------------------------------------------------------------------------- ++## ------------------------------------------------------------------------------------------------- +.PHONY: jtagboot openocd gdb gdb-opt0 + +## ------------------------------------------------------------------------------ @@ -397,9 +397,9 @@ diff -uNr 07_timestamps/Makefile 08_hw_debug_JTAG/Makefile + + + - ## -------------------------------------------------------------------------------------------------- + ## ------------------------------------------------------------------------------------------------- ## Testing targets - ## -------------------------------------------------------------------------------------------------- + ## ------------------------------------------------------------------------------------------------- diff -uNr 07_timestamps/src/bsp/raspberrypi/driver.rs 08_hw_debug_JTAG/src/bsp/raspberrypi/driver.rs --- 07_timestamps/src/bsp/raspberrypi/driver.rs diff --git a/09_privilege_level/Makefile b/09_privilege_level/Makefile index cc233afd..8b386adf 100644 --- a/09_privilege_level/Makefile +++ b/09_privilege_level/Makefile @@ -6,9 +6,9 @@ include ../common/docker.mk include ../common/format.mk include ../common/operating_system.mk -## -------------------------------------------------------------------------------------------------- +## ------------------------------------------------------------------------------------------------- ## Optional, user-provided configuration values -## -------------------------------------------------------------------------------------------------- +## ------------------------------------------------------------------------------------------------- # Default to the RPi3. BSP ?= rpi3 @@ -18,9 +18,9 @@ DEV_SERIAL ?= /dev/ttyUSB0 -## -------------------------------------------------------------------------------------------------- +## ------------------------------------------------------------------------------------------------- ## BSP-specific configuration values -## -------------------------------------------------------------------------------------------------- +## ------------------------------------------------------------------------------------------------- QEMU_MISSING_STRING = "This board is not yet supported for QEMU." ifeq ($(BSP),rpi3) @@ -56,9 +56,9 @@ export LD_SCRIPT_PATH -## -------------------------------------------------------------------------------------------------- +## ------------------------------------------------------------------------------------------------- ## Targets and Prerequisites -## -------------------------------------------------------------------------------------------------- +## ------------------------------------------------------------------------------------------------- KERNEL_MANIFEST = Cargo.toml KERNEL_LINKER_SCRIPT = kernel.ld LAST_BUILD_CONFIG = target/$(BSP).build_config @@ -70,9 +70,9 @@ KERNEL_ELF_DEPS = $(filter-out %: ,$(file < $(KERNEL_ELF).d)) $(KERNEL_MANIFEST) -## -------------------------------------------------------------------------------------------------- +## ------------------------------------------------------------------------------------------------- ## Command building blocks -## -------------------------------------------------------------------------------------------------- +## ------------------------------------------------------------------------------------------------- RUSTFLAGS = $(RUSTC_MISC_ARGS) \ -C link-arg=--library-path=$(LD_SCRIPT_PATH) \ -C link-arg=--script=$(KERNEL_LINKER_SCRIPT) @@ -126,9 +126,9 @@ endif -## -------------------------------------------------------------------------------------------------- +## ------------------------------------------------------------------------------------------------- ## Targets -## -------------------------------------------------------------------------------------------------- +## ------------------------------------------------------------------------------------------------- .PHONY: all doc qemu chainboot clippy clean readelf objdump nm check all: $(KERNEL_BIN) @@ -226,9 +226,9 @@ nm: $(KERNEL_ELF) -## -------------------------------------------------------------------------------------------------- +## ------------------------------------------------------------------------------------------------- ## Debugging targets -## -------------------------------------------------------------------------------------------------- +## ------------------------------------------------------------------------------------------------- .PHONY: jtagboot openocd gdb gdb-opt0 ## ------------------------------------------------------------------------------ @@ -255,9 +255,9 @@ gdb gdb-opt0: $(KERNEL_ELF) -## -------------------------------------------------------------------------------------------------- +## ------------------------------------------------------------------------------------------------- ## Testing targets -## -------------------------------------------------------------------------------------------------- +## ------------------------------------------------------------------------------------------------- .PHONY: test test_boot ifeq ($(QEMU_MACHINE_TYPE),) # QEMU is not supported for the board. diff --git a/10_virtual_mem_part1_identity_mapping/Makefile b/10_virtual_mem_part1_identity_mapping/Makefile index cc233afd..8b386adf 100644 --- a/10_virtual_mem_part1_identity_mapping/Makefile +++ b/10_virtual_mem_part1_identity_mapping/Makefile @@ -6,9 +6,9 @@ include ../common/docker.mk include ../common/format.mk include ../common/operating_system.mk -## -------------------------------------------------------------------------------------------------- +## ------------------------------------------------------------------------------------------------- ## Optional, user-provided configuration values -## -------------------------------------------------------------------------------------------------- +## ------------------------------------------------------------------------------------------------- # Default to the RPi3. BSP ?= rpi3 @@ -18,9 +18,9 @@ DEV_SERIAL ?= /dev/ttyUSB0 -## -------------------------------------------------------------------------------------------------- +## ------------------------------------------------------------------------------------------------- ## BSP-specific configuration values -## -------------------------------------------------------------------------------------------------- +## ------------------------------------------------------------------------------------------------- QEMU_MISSING_STRING = "This board is not yet supported for QEMU." ifeq ($(BSP),rpi3) @@ -56,9 +56,9 @@ export LD_SCRIPT_PATH -## -------------------------------------------------------------------------------------------------- +## ------------------------------------------------------------------------------------------------- ## Targets and Prerequisites -## -------------------------------------------------------------------------------------------------- +## ------------------------------------------------------------------------------------------------- KERNEL_MANIFEST = Cargo.toml KERNEL_LINKER_SCRIPT = kernel.ld LAST_BUILD_CONFIG = target/$(BSP).build_config @@ -70,9 +70,9 @@ KERNEL_ELF_DEPS = $(filter-out %: ,$(file < $(KERNEL_ELF).d)) $(KERNEL_MANIFEST) -## -------------------------------------------------------------------------------------------------- +## ------------------------------------------------------------------------------------------------- ## Command building blocks -## -------------------------------------------------------------------------------------------------- +## ------------------------------------------------------------------------------------------------- RUSTFLAGS = $(RUSTC_MISC_ARGS) \ -C link-arg=--library-path=$(LD_SCRIPT_PATH) \ -C link-arg=--script=$(KERNEL_LINKER_SCRIPT) @@ -126,9 +126,9 @@ endif -## -------------------------------------------------------------------------------------------------- +## ------------------------------------------------------------------------------------------------- ## Targets -## -------------------------------------------------------------------------------------------------- +## ------------------------------------------------------------------------------------------------- .PHONY: all doc qemu chainboot clippy clean readelf objdump nm check all: $(KERNEL_BIN) @@ -226,9 +226,9 @@ nm: $(KERNEL_ELF) -## -------------------------------------------------------------------------------------------------- +## ------------------------------------------------------------------------------------------------- ## Debugging targets -## -------------------------------------------------------------------------------------------------- +## ------------------------------------------------------------------------------------------------- .PHONY: jtagboot openocd gdb gdb-opt0 ## ------------------------------------------------------------------------------ @@ -255,9 +255,9 @@ gdb gdb-opt0: $(KERNEL_ELF) -## -------------------------------------------------------------------------------------------------- +## ------------------------------------------------------------------------------------------------- ## Testing targets -## -------------------------------------------------------------------------------------------------- +## ------------------------------------------------------------------------------------------------- .PHONY: test test_boot ifeq ($(QEMU_MACHINE_TYPE),) # QEMU is not supported for the board. diff --git a/11_exceptions_part1_groundwork/Makefile b/11_exceptions_part1_groundwork/Makefile index cc233afd..8b386adf 100644 --- a/11_exceptions_part1_groundwork/Makefile +++ b/11_exceptions_part1_groundwork/Makefile @@ -6,9 +6,9 @@ include ../common/docker.mk include ../common/format.mk include ../common/operating_system.mk -## -------------------------------------------------------------------------------------------------- +## ------------------------------------------------------------------------------------------------- ## Optional, user-provided configuration values -## -------------------------------------------------------------------------------------------------- +## ------------------------------------------------------------------------------------------------- # Default to the RPi3. BSP ?= rpi3 @@ -18,9 +18,9 @@ DEV_SERIAL ?= /dev/ttyUSB0 -## -------------------------------------------------------------------------------------------------- +## ------------------------------------------------------------------------------------------------- ## BSP-specific configuration values -## -------------------------------------------------------------------------------------------------- +## ------------------------------------------------------------------------------------------------- QEMU_MISSING_STRING = "This board is not yet supported for QEMU." ifeq ($(BSP),rpi3) @@ -56,9 +56,9 @@ export LD_SCRIPT_PATH -## -------------------------------------------------------------------------------------------------- +## ------------------------------------------------------------------------------------------------- ## Targets and Prerequisites -## -------------------------------------------------------------------------------------------------- +## ------------------------------------------------------------------------------------------------- KERNEL_MANIFEST = Cargo.toml KERNEL_LINKER_SCRIPT = kernel.ld LAST_BUILD_CONFIG = target/$(BSP).build_config @@ -70,9 +70,9 @@ KERNEL_ELF_DEPS = $(filter-out %: ,$(file < $(KERNEL_ELF).d)) $(KERNEL_MANIFEST) -## -------------------------------------------------------------------------------------------------- +## ------------------------------------------------------------------------------------------------- ## Command building blocks -## -------------------------------------------------------------------------------------------------- +## ------------------------------------------------------------------------------------------------- RUSTFLAGS = $(RUSTC_MISC_ARGS) \ -C link-arg=--library-path=$(LD_SCRIPT_PATH) \ -C link-arg=--script=$(KERNEL_LINKER_SCRIPT) @@ -126,9 +126,9 @@ endif -## -------------------------------------------------------------------------------------------------- +## ------------------------------------------------------------------------------------------------- ## Targets -## -------------------------------------------------------------------------------------------------- +## ------------------------------------------------------------------------------------------------- .PHONY: all doc qemu chainboot clippy clean readelf objdump nm check all: $(KERNEL_BIN) @@ -226,9 +226,9 @@ nm: $(KERNEL_ELF) -## -------------------------------------------------------------------------------------------------- +## ------------------------------------------------------------------------------------------------- ## Debugging targets -## -------------------------------------------------------------------------------------------------- +## ------------------------------------------------------------------------------------------------- .PHONY: jtagboot openocd gdb gdb-opt0 ## ------------------------------------------------------------------------------ @@ -255,9 +255,9 @@ gdb gdb-opt0: $(KERNEL_ELF) -## -------------------------------------------------------------------------------------------------- +## ------------------------------------------------------------------------------------------------- ## Testing targets -## -------------------------------------------------------------------------------------------------- +## ------------------------------------------------------------------------------------------------- .PHONY: test test_boot ifeq ($(QEMU_MACHINE_TYPE),) # QEMU is not supported for the board. diff --git a/12_integrated_testing/Makefile b/12_integrated_testing/Makefile index a1e7c4f7..1be5e0bd 100644 --- a/12_integrated_testing/Makefile +++ b/12_integrated_testing/Makefile @@ -6,9 +6,9 @@ include ../common/docker.mk include ../common/format.mk include ../common/operating_system.mk -## -------------------------------------------------------------------------------------------------- +## ------------------------------------------------------------------------------------------------- ## Optional, user-provided configuration values -## -------------------------------------------------------------------------------------------------- +## ------------------------------------------------------------------------------------------------- # Default to the RPi3. BSP ?= rpi3 @@ -25,9 +25,9 @@ endif -## -------------------------------------------------------------------------------------------------- +## ------------------------------------------------------------------------------------------------- ## BSP-specific configuration values -## -------------------------------------------------------------------------------------------------- +## ------------------------------------------------------------------------------------------------- QEMU_MISSING_STRING = "This board is not yet supported for QEMU." ifeq ($(BSP),rpi3) @@ -65,9 +65,9 @@ export LD_SCRIPT_PATH -## -------------------------------------------------------------------------------------------------- +## ------------------------------------------------------------------------------------------------- ## Targets and Prerequisites -## -------------------------------------------------------------------------------------------------- +## ------------------------------------------------------------------------------------------------- KERNEL_MANIFEST = kernel/Cargo.toml KERNEL_LINKER_SCRIPT = kernel.ld LAST_BUILD_CONFIG = target/$(BSP).build_config @@ -79,9 +79,9 @@ KERNEL_ELF_DEPS = $(filter-out %: ,$(file < $(KERNEL_ELF).d)) $(KERNEL_MANIFEST) -## -------------------------------------------------------------------------------------------------- +## ------------------------------------------------------------------------------------------------- ## Command building blocks -## -------------------------------------------------------------------------------------------------- +## ------------------------------------------------------------------------------------------------- RUSTFLAGS = $(RUSTC_MISC_ARGS) \ -C link-arg=--library-path=$(LD_SCRIPT_PATH) \ -C link-arg=--script=$(KERNEL_LINKER_SCRIPT) @@ -136,9 +136,9 @@ endif -## -------------------------------------------------------------------------------------------------- +## ------------------------------------------------------------------------------------------------- ## Targets -## -------------------------------------------------------------------------------------------------- +## ------------------------------------------------------------------------------------------------- .PHONY: all doc qemu chainboot clippy clean readelf objdump nm check all: $(KERNEL_BIN) @@ -238,9 +238,9 @@ nm: $(KERNEL_ELF) -## -------------------------------------------------------------------------------------------------- +## ------------------------------------------------------------------------------------------------- ## Debugging targets -## -------------------------------------------------------------------------------------------------- +## ------------------------------------------------------------------------------------------------- .PHONY: jtagboot openocd gdb gdb-opt0 ## ------------------------------------------------------------------------------ @@ -267,9 +267,9 @@ gdb gdb-opt0: $(KERNEL_ELF) -## -------------------------------------------------------------------------------------------------- +## ------------------------------------------------------------------------------------------------- ## Testing targets -## -------------------------------------------------------------------------------------------------- +## ------------------------------------------------------------------------------------------------- .PHONY: test test_boot test_unit test_integration test_unit test_integration: FEATURES += --features test_build diff --git a/12_integrated_testing/kernel/tests/00_console_sanity.rb b/12_integrated_testing/kernel/tests/00_console_sanity.rb index c8d9167b..8be7a2f1 100644 --- a/12_integrated_testing/kernel/tests/00_console_sanity.rb +++ b/12_integrated_testing/kernel/tests/00_console_sanity.rb @@ -40,9 +40,9 @@ class RxStatisticsTest < SubtestBase end end -## -------------------------------------------------------------------------------------------------- +## ------------------------------------------------------------------------------------------------- ## Test registration -## -------------------------------------------------------------------------------------------------- +## ------------------------------------------------------------------------------------------------- def subtest_collection [TxRxHandshakeTest.new, TxStatisticsTest.new, RxStatisticsTest.new] end diff --git a/12_integrated_testing/kernel/tests/03_exception_restore_sanity.rb b/12_integrated_testing/kernel/tests/03_exception_restore_sanity.rb index 136e4392..02f51f74 100644 --- a/12_integrated_testing/kernel/tests/03_exception_restore_sanity.rb +++ b/12_integrated_testing/kernel/tests/03_exception_restore_sanity.rb @@ -17,9 +17,9 @@ class ExceptionRestoreTest < SubtestBase end end -## -------------------------------------------------------------------------------------------------- +## ------------------------------------------------------------------------------------------------- ## Test registration -## -------------------------------------------------------------------------------------------------- +## ------------------------------------------------------------------------------------------------- def subtest_collection [ExceptionRestoreTest.new] end diff --git a/13_exceptions_part2_peripheral_IRQs/Makefile b/13_exceptions_part2_peripheral_IRQs/Makefile index a1e7c4f7..1be5e0bd 100644 --- a/13_exceptions_part2_peripheral_IRQs/Makefile +++ b/13_exceptions_part2_peripheral_IRQs/Makefile @@ -6,9 +6,9 @@ include ../common/docker.mk include ../common/format.mk include ../common/operating_system.mk -## -------------------------------------------------------------------------------------------------- +## ------------------------------------------------------------------------------------------------- ## Optional, user-provided configuration values -## -------------------------------------------------------------------------------------------------- +## ------------------------------------------------------------------------------------------------- # Default to the RPi3. BSP ?= rpi3 @@ -25,9 +25,9 @@ endif -## -------------------------------------------------------------------------------------------------- +## ------------------------------------------------------------------------------------------------- ## BSP-specific configuration values -## -------------------------------------------------------------------------------------------------- +## ------------------------------------------------------------------------------------------------- QEMU_MISSING_STRING = "This board is not yet supported for QEMU." ifeq ($(BSP),rpi3) @@ -65,9 +65,9 @@ export LD_SCRIPT_PATH -## -------------------------------------------------------------------------------------------------- +## ------------------------------------------------------------------------------------------------- ## Targets and Prerequisites -## -------------------------------------------------------------------------------------------------- +## ------------------------------------------------------------------------------------------------- KERNEL_MANIFEST = kernel/Cargo.toml KERNEL_LINKER_SCRIPT = kernel.ld LAST_BUILD_CONFIG = target/$(BSP).build_config @@ -79,9 +79,9 @@ KERNEL_ELF_DEPS = $(filter-out %: ,$(file < $(KERNEL_ELF).d)) $(KERNEL_MANIFEST) -## -------------------------------------------------------------------------------------------------- +## ------------------------------------------------------------------------------------------------- ## Command building blocks -## -------------------------------------------------------------------------------------------------- +## ------------------------------------------------------------------------------------------------- RUSTFLAGS = $(RUSTC_MISC_ARGS) \ -C link-arg=--library-path=$(LD_SCRIPT_PATH) \ -C link-arg=--script=$(KERNEL_LINKER_SCRIPT) @@ -136,9 +136,9 @@ endif -## -------------------------------------------------------------------------------------------------- +## ------------------------------------------------------------------------------------------------- ## Targets -## -------------------------------------------------------------------------------------------------- +## ------------------------------------------------------------------------------------------------- .PHONY: all doc qemu chainboot clippy clean readelf objdump nm check all: $(KERNEL_BIN) @@ -238,9 +238,9 @@ nm: $(KERNEL_ELF) -## -------------------------------------------------------------------------------------------------- +## ------------------------------------------------------------------------------------------------- ## Debugging targets -## -------------------------------------------------------------------------------------------------- +## ------------------------------------------------------------------------------------------------- .PHONY: jtagboot openocd gdb gdb-opt0 ## ------------------------------------------------------------------------------ @@ -267,9 +267,9 @@ gdb gdb-opt0: $(KERNEL_ELF) -## -------------------------------------------------------------------------------------------------- +## ------------------------------------------------------------------------------------------------- ## Testing targets -## -------------------------------------------------------------------------------------------------- +## ------------------------------------------------------------------------------------------------- .PHONY: test test_boot test_unit test_integration test_unit test_integration: FEATURES += --features test_build diff --git a/13_exceptions_part2_peripheral_IRQs/kernel/tests/00_console_sanity.rb b/13_exceptions_part2_peripheral_IRQs/kernel/tests/00_console_sanity.rb index c8d9167b..8be7a2f1 100644 --- a/13_exceptions_part2_peripheral_IRQs/kernel/tests/00_console_sanity.rb +++ b/13_exceptions_part2_peripheral_IRQs/kernel/tests/00_console_sanity.rb @@ -40,9 +40,9 @@ class RxStatisticsTest < SubtestBase end end -## -------------------------------------------------------------------------------------------------- +## ------------------------------------------------------------------------------------------------- ## Test registration -## -------------------------------------------------------------------------------------------------- +## ------------------------------------------------------------------------------------------------- def subtest_collection [TxRxHandshakeTest.new, TxStatisticsTest.new, RxStatisticsTest.new] end diff --git a/13_exceptions_part2_peripheral_IRQs/kernel/tests/03_exception_restore_sanity.rb b/13_exceptions_part2_peripheral_IRQs/kernel/tests/03_exception_restore_sanity.rb index 136e4392..02f51f74 100644 --- a/13_exceptions_part2_peripheral_IRQs/kernel/tests/03_exception_restore_sanity.rb +++ b/13_exceptions_part2_peripheral_IRQs/kernel/tests/03_exception_restore_sanity.rb @@ -17,9 +17,9 @@ class ExceptionRestoreTest < SubtestBase end end -## -------------------------------------------------------------------------------------------------- +## ------------------------------------------------------------------------------------------------- ## Test registration -## -------------------------------------------------------------------------------------------------- +## ------------------------------------------------------------------------------------------------- def subtest_collection [ExceptionRestoreTest.new] end diff --git a/14_virtual_mem_part2_mmio_remap/Makefile b/14_virtual_mem_part2_mmio_remap/Makefile index a1e7c4f7..1be5e0bd 100644 --- a/14_virtual_mem_part2_mmio_remap/Makefile +++ b/14_virtual_mem_part2_mmio_remap/Makefile @@ -6,9 +6,9 @@ include ../common/docker.mk include ../common/format.mk include ../common/operating_system.mk -## -------------------------------------------------------------------------------------------------- +## ------------------------------------------------------------------------------------------------- ## Optional, user-provided configuration values -## -------------------------------------------------------------------------------------------------- +## ------------------------------------------------------------------------------------------------- # Default to the RPi3. BSP ?= rpi3 @@ -25,9 +25,9 @@ endif -## -------------------------------------------------------------------------------------------------- +## ------------------------------------------------------------------------------------------------- ## BSP-specific configuration values -## -------------------------------------------------------------------------------------------------- +## ------------------------------------------------------------------------------------------------- QEMU_MISSING_STRING = "This board is not yet supported for QEMU." ifeq ($(BSP),rpi3) @@ -65,9 +65,9 @@ export LD_SCRIPT_PATH -## -------------------------------------------------------------------------------------------------- +## ------------------------------------------------------------------------------------------------- ## Targets and Prerequisites -## -------------------------------------------------------------------------------------------------- +## ------------------------------------------------------------------------------------------------- KERNEL_MANIFEST = kernel/Cargo.toml KERNEL_LINKER_SCRIPT = kernel.ld LAST_BUILD_CONFIG = target/$(BSP).build_config @@ -79,9 +79,9 @@ KERNEL_ELF_DEPS = $(filter-out %: ,$(file < $(KERNEL_ELF).d)) $(KERNEL_MANIFEST) -## -------------------------------------------------------------------------------------------------- +## ------------------------------------------------------------------------------------------------- ## Command building blocks -## -------------------------------------------------------------------------------------------------- +## ------------------------------------------------------------------------------------------------- RUSTFLAGS = $(RUSTC_MISC_ARGS) \ -C link-arg=--library-path=$(LD_SCRIPT_PATH) \ -C link-arg=--script=$(KERNEL_LINKER_SCRIPT) @@ -136,9 +136,9 @@ endif -## -------------------------------------------------------------------------------------------------- +## ------------------------------------------------------------------------------------------------- ## Targets -## -------------------------------------------------------------------------------------------------- +## ------------------------------------------------------------------------------------------------- .PHONY: all doc qemu chainboot clippy clean readelf objdump nm check all: $(KERNEL_BIN) @@ -238,9 +238,9 @@ nm: $(KERNEL_ELF) -## -------------------------------------------------------------------------------------------------- +## ------------------------------------------------------------------------------------------------- ## Debugging targets -## -------------------------------------------------------------------------------------------------- +## ------------------------------------------------------------------------------------------------- .PHONY: jtagboot openocd gdb gdb-opt0 ## ------------------------------------------------------------------------------ @@ -267,9 +267,9 @@ gdb gdb-opt0: $(KERNEL_ELF) -## -------------------------------------------------------------------------------------------------- +## ------------------------------------------------------------------------------------------------- ## Testing targets -## -------------------------------------------------------------------------------------------------- +## ------------------------------------------------------------------------------------------------- .PHONY: test test_boot test_unit test_integration test_unit test_integration: FEATURES += --features test_build diff --git a/14_virtual_mem_part2_mmio_remap/kernel/tests/00_console_sanity.rb b/14_virtual_mem_part2_mmio_remap/kernel/tests/00_console_sanity.rb index c8d9167b..8be7a2f1 100644 --- a/14_virtual_mem_part2_mmio_remap/kernel/tests/00_console_sanity.rb +++ b/14_virtual_mem_part2_mmio_remap/kernel/tests/00_console_sanity.rb @@ -40,9 +40,9 @@ class RxStatisticsTest < SubtestBase end end -## -------------------------------------------------------------------------------------------------- +## ------------------------------------------------------------------------------------------------- ## Test registration -## -------------------------------------------------------------------------------------------------- +## ------------------------------------------------------------------------------------------------- def subtest_collection [TxRxHandshakeTest.new, TxStatisticsTest.new, RxStatisticsTest.new] end diff --git a/14_virtual_mem_part2_mmio_remap/kernel/tests/03_exception_restore_sanity.rb b/14_virtual_mem_part2_mmio_remap/kernel/tests/03_exception_restore_sanity.rb index 136e4392..02f51f74 100644 --- a/14_virtual_mem_part2_mmio_remap/kernel/tests/03_exception_restore_sanity.rb +++ b/14_virtual_mem_part2_mmio_remap/kernel/tests/03_exception_restore_sanity.rb @@ -17,9 +17,9 @@ class ExceptionRestoreTest < SubtestBase end end -## -------------------------------------------------------------------------------------------------- +## ------------------------------------------------------------------------------------------------- ## Test registration -## -------------------------------------------------------------------------------------------------- +## ------------------------------------------------------------------------------------------------- def subtest_collection [ExceptionRestoreTest.new] end diff --git a/15_virtual_mem_part3_precomputed_tables/Makefile b/15_virtual_mem_part3_precomputed_tables/Makefile index fc21c7be..a472a1e8 100644 --- a/15_virtual_mem_part3_precomputed_tables/Makefile +++ b/15_virtual_mem_part3_precomputed_tables/Makefile @@ -6,9 +6,9 @@ include ../common/docker.mk include ../common/format.mk include ../common/operating_system.mk -## -------------------------------------------------------------------------------------------------- +## ------------------------------------------------------------------------------------------------- ## Optional, user-provided configuration values -## -------------------------------------------------------------------------------------------------- +## ------------------------------------------------------------------------------------------------- # Default to the RPi3. BSP ?= rpi3 @@ -25,9 +25,9 @@ endif -## -------------------------------------------------------------------------------------------------- +## ------------------------------------------------------------------------------------------------- ## BSP-specific configuration values -## -------------------------------------------------------------------------------------------------- +## ------------------------------------------------------------------------------------------------- QEMU_MISSING_STRING = "This board is not yet supported for QEMU." ifeq ($(BSP),rpi3) @@ -65,9 +65,9 @@ export LD_SCRIPT_PATH -## -------------------------------------------------------------------------------------------------- +## ------------------------------------------------------------------------------------------------- ## Targets and Prerequisites -## -------------------------------------------------------------------------------------------------- +## ------------------------------------------------------------------------------------------------- KERNEL_MANIFEST = kernel/Cargo.toml KERNEL_LINKER_SCRIPT = kernel.ld LAST_BUILD_CONFIG = target/$(BSP).build_config @@ -89,9 +89,9 @@ KERNEL_ELF = $(KERNEL_ELF_TTABLES) -## -------------------------------------------------------------------------------------------------- +## ------------------------------------------------------------------------------------------------- ## Command building blocks -## -------------------------------------------------------------------------------------------------- +## ------------------------------------------------------------------------------------------------- RUSTFLAGS = $(RUSTC_MISC_ARGS) \ -C link-arg=--library-path=$(LD_SCRIPT_PATH) \ -C link-arg=--script=$(KERNEL_LINKER_SCRIPT) @@ -147,9 +147,9 @@ endif -## -------------------------------------------------------------------------------------------------- +## ------------------------------------------------------------------------------------------------- ## Targets -## -------------------------------------------------------------------------------------------------- +## ------------------------------------------------------------------------------------------------- .PHONY: all doc qemu chainboot clippy clean readelf objdump nm check all: $(KERNEL_BIN) @@ -257,9 +257,9 @@ nm: $(KERNEL_ELF) -## -------------------------------------------------------------------------------------------------- +## ------------------------------------------------------------------------------------------------- ## Debugging targets -## -------------------------------------------------------------------------------------------------- +## ------------------------------------------------------------------------------------------------- .PHONY: jtagboot openocd gdb gdb-opt0 ## ------------------------------------------------------------------------------ @@ -286,9 +286,9 @@ gdb gdb-opt0: $(KERNEL_ELF) -## -------------------------------------------------------------------------------------------------- +## ------------------------------------------------------------------------------------------------- ## Testing targets -## -------------------------------------------------------------------------------------------------- +## ------------------------------------------------------------------------------------------------- .PHONY: test test_boot test_unit test_integration test_unit test_integration: FEATURES += --features test_build diff --git a/15_virtual_mem_part3_precomputed_tables/kernel/Cargo.toml b/15_virtual_mem_part3_precomputed_tables/kernel/Cargo.toml index 43126486..0785aba7 100644 --- a/15_virtual_mem_part3_precomputed_tables/kernel/Cargo.toml +++ b/15_virtual_mem_part3_precomputed_tables/kernel/Cargo.toml @@ -10,9 +10,9 @@ bsp_rpi3 = ["tock-registers"] bsp_rpi4 = ["tock-registers"] test_build = ["qemu-exit"] -## -------------------------------------------------------------------------------------------------- +## ------------------------------------------------------------------------------------------------- ## Dependencies -## -------------------------------------------------------------------------------------------------- +## ------------------------------------------------------------------------------------------------- [dependencies] test-types = { path = "../libraries/test-types" } @@ -25,9 +25,9 @@ qemu-exit = { version = "3.x.x", optional = true } [target.'cfg(target_arch = "aarch64")'.dependencies] aarch64-cpu = { version = "9.x.x" } -## -------------------------------------------------------------------------------------------------- +## ------------------------------------------------------------------------------------------------- ## Testing -## -------------------------------------------------------------------------------------------------- +## ------------------------------------------------------------------------------------------------- [dev-dependencies] test-macros = { path = "../libraries/test-macros" } diff --git a/15_virtual_mem_part3_precomputed_tables/kernel/tests/00_console_sanity.rb b/15_virtual_mem_part3_precomputed_tables/kernel/tests/00_console_sanity.rb index c8d9167b..8be7a2f1 100644 --- a/15_virtual_mem_part3_precomputed_tables/kernel/tests/00_console_sanity.rb +++ b/15_virtual_mem_part3_precomputed_tables/kernel/tests/00_console_sanity.rb @@ -40,9 +40,9 @@ class RxStatisticsTest < SubtestBase end end -## -------------------------------------------------------------------------------------------------- +## ------------------------------------------------------------------------------------------------- ## Test registration -## -------------------------------------------------------------------------------------------------- +## ------------------------------------------------------------------------------------------------- def subtest_collection [TxRxHandshakeTest.new, TxStatisticsTest.new, RxStatisticsTest.new] end diff --git a/15_virtual_mem_part3_precomputed_tables/kernel/tests/03_exception_restore_sanity.rb b/15_virtual_mem_part3_precomputed_tables/kernel/tests/03_exception_restore_sanity.rb index 136e4392..02f51f74 100644 --- a/15_virtual_mem_part3_precomputed_tables/kernel/tests/03_exception_restore_sanity.rb +++ b/15_virtual_mem_part3_precomputed_tables/kernel/tests/03_exception_restore_sanity.rb @@ -17,9 +17,9 @@ class ExceptionRestoreTest < SubtestBase end end -## -------------------------------------------------------------------------------------------------- +## ------------------------------------------------------------------------------------------------- ## Test registration -## -------------------------------------------------------------------------------------------------- +## ------------------------------------------------------------------------------------------------- def subtest_collection [ExceptionRestoreTest.new] end diff --git a/16_virtual_mem_part4_higher_half_kernel/Makefile b/16_virtual_mem_part4_higher_half_kernel/Makefile index fc21c7be..a472a1e8 100644 --- a/16_virtual_mem_part4_higher_half_kernel/Makefile +++ b/16_virtual_mem_part4_higher_half_kernel/Makefile @@ -6,9 +6,9 @@ include ../common/docker.mk include ../common/format.mk include ../common/operating_system.mk -## -------------------------------------------------------------------------------------------------- +## ------------------------------------------------------------------------------------------------- ## Optional, user-provided configuration values -## -------------------------------------------------------------------------------------------------- +## ------------------------------------------------------------------------------------------------- # Default to the RPi3. BSP ?= rpi3 @@ -25,9 +25,9 @@ endif -## -------------------------------------------------------------------------------------------------- +## ------------------------------------------------------------------------------------------------- ## BSP-specific configuration values -## -------------------------------------------------------------------------------------------------- +## ------------------------------------------------------------------------------------------------- QEMU_MISSING_STRING = "This board is not yet supported for QEMU." ifeq ($(BSP),rpi3) @@ -65,9 +65,9 @@ export LD_SCRIPT_PATH -## -------------------------------------------------------------------------------------------------- +## ------------------------------------------------------------------------------------------------- ## Targets and Prerequisites -## -------------------------------------------------------------------------------------------------- +## ------------------------------------------------------------------------------------------------- KERNEL_MANIFEST = kernel/Cargo.toml KERNEL_LINKER_SCRIPT = kernel.ld LAST_BUILD_CONFIG = target/$(BSP).build_config @@ -89,9 +89,9 @@ KERNEL_ELF = $(KERNEL_ELF_TTABLES) -## -------------------------------------------------------------------------------------------------- +## ------------------------------------------------------------------------------------------------- ## Command building blocks -## -------------------------------------------------------------------------------------------------- +## ------------------------------------------------------------------------------------------------- RUSTFLAGS = $(RUSTC_MISC_ARGS) \ -C link-arg=--library-path=$(LD_SCRIPT_PATH) \ -C link-arg=--script=$(KERNEL_LINKER_SCRIPT) @@ -147,9 +147,9 @@ endif -## -------------------------------------------------------------------------------------------------- +## ------------------------------------------------------------------------------------------------- ## Targets -## -------------------------------------------------------------------------------------------------- +## ------------------------------------------------------------------------------------------------- .PHONY: all doc qemu chainboot clippy clean readelf objdump nm check all: $(KERNEL_BIN) @@ -257,9 +257,9 @@ nm: $(KERNEL_ELF) -## -------------------------------------------------------------------------------------------------- +## ------------------------------------------------------------------------------------------------- ## Debugging targets -## -------------------------------------------------------------------------------------------------- +## ------------------------------------------------------------------------------------------------- .PHONY: jtagboot openocd gdb gdb-opt0 ## ------------------------------------------------------------------------------ @@ -286,9 +286,9 @@ gdb gdb-opt0: $(KERNEL_ELF) -## -------------------------------------------------------------------------------------------------- +## ------------------------------------------------------------------------------------------------- ## Testing targets -## -------------------------------------------------------------------------------------------------- +## ------------------------------------------------------------------------------------------------- .PHONY: test test_boot test_unit test_integration test_unit test_integration: FEATURES += --features test_build diff --git a/16_virtual_mem_part4_higher_half_kernel/kernel/tests/00_console_sanity.rb b/16_virtual_mem_part4_higher_half_kernel/kernel/tests/00_console_sanity.rb index c8d9167b..8be7a2f1 100644 --- a/16_virtual_mem_part4_higher_half_kernel/kernel/tests/00_console_sanity.rb +++ b/16_virtual_mem_part4_higher_half_kernel/kernel/tests/00_console_sanity.rb @@ -40,9 +40,9 @@ class RxStatisticsTest < SubtestBase end end -## -------------------------------------------------------------------------------------------------- +## ------------------------------------------------------------------------------------------------- ## Test registration -## -------------------------------------------------------------------------------------------------- +## ------------------------------------------------------------------------------------------------- def subtest_collection [TxRxHandshakeTest.new, TxStatisticsTest.new, RxStatisticsTest.new] end diff --git a/16_virtual_mem_part4_higher_half_kernel/kernel/tests/03_exception_restore_sanity.rb b/16_virtual_mem_part4_higher_half_kernel/kernel/tests/03_exception_restore_sanity.rb index 136e4392..02f51f74 100644 --- a/16_virtual_mem_part4_higher_half_kernel/kernel/tests/03_exception_restore_sanity.rb +++ b/16_virtual_mem_part4_higher_half_kernel/kernel/tests/03_exception_restore_sanity.rb @@ -17,9 +17,9 @@ class ExceptionRestoreTest < SubtestBase end end -## -------------------------------------------------------------------------------------------------- +## ------------------------------------------------------------------------------------------------- ## Test registration -## -------------------------------------------------------------------------------------------------- +## ------------------------------------------------------------------------------------------------- def subtest_collection [ExceptionRestoreTest.new] end diff --git a/17_kernel_symbols/Makefile b/17_kernel_symbols/Makefile index dc625f27..cc74a8ef 100644 --- a/17_kernel_symbols/Makefile +++ b/17_kernel_symbols/Makefile @@ -6,9 +6,9 @@ include ../common/docker.mk include ../common/format.mk include ../common/operating_system.mk -## -------------------------------------------------------------------------------------------------- +## ------------------------------------------------------------------------------------------------- ## Optional, user-provided configuration values -## -------------------------------------------------------------------------------------------------- +## ------------------------------------------------------------------------------------------------- # Default to the RPi3. BSP ?= rpi3 @@ -25,9 +25,9 @@ endif -## -------------------------------------------------------------------------------------------------- +## ------------------------------------------------------------------------------------------------- ## BSP-specific configuration values -## -------------------------------------------------------------------------------------------------- +## ------------------------------------------------------------------------------------------------- QEMU_MISSING_STRING = "This board is not yet supported for QEMU." ifeq ($(BSP),rpi3) @@ -65,9 +65,9 @@ export LD_SCRIPT_PATH -## -------------------------------------------------------------------------------------------------- +## ------------------------------------------------------------------------------------------------- ## Targets and Prerequisites -## -------------------------------------------------------------------------------------------------- +## ------------------------------------------------------------------------------------------------- KERNEL_MANIFEST = kernel/Cargo.toml KERNEL_LINKER_SCRIPT = kernel.ld LAST_BUILD_CONFIG = target/$(BSP).build_config @@ -106,9 +106,9 @@ KERNEL_ELF = $(KERNEL_ELF_TTABLES_SYMS) -## -------------------------------------------------------------------------------------------------- +## ------------------------------------------------------------------------------------------------- ## Command building blocks -## -------------------------------------------------------------------------------------------------- +## ------------------------------------------------------------------------------------------------- RUSTFLAGS = $(RUSTC_MISC_ARGS) \ -C link-arg=--library-path=$(LD_SCRIPT_PATH) \ -C link-arg=--script=$(KERNEL_LINKER_SCRIPT) @@ -164,9 +164,9 @@ endif -## -------------------------------------------------------------------------------------------------- +## ------------------------------------------------------------------------------------------------- ## Targets -## -------------------------------------------------------------------------------------------------- +## ------------------------------------------------------------------------------------------------- .PHONY: all doc qemu chainboot clippy clean readelf objdump nm check all: $(KERNEL_BIN) @@ -281,9 +281,9 @@ nm: $(KERNEL_ELF) -## -------------------------------------------------------------------------------------------------- +## ------------------------------------------------------------------------------------------------- ## Debugging targets -## -------------------------------------------------------------------------------------------------- +## ------------------------------------------------------------------------------------------------- .PHONY: jtagboot openocd gdb gdb-opt0 ## ------------------------------------------------------------------------------ @@ -310,9 +310,9 @@ gdb gdb-opt0: $(KERNEL_ELF) -## -------------------------------------------------------------------------------------------------- +## ------------------------------------------------------------------------------------------------- ## Testing targets -## -------------------------------------------------------------------------------------------------- +## ------------------------------------------------------------------------------------------------- .PHONY: test test_boot test_unit test_integration test_unit test_integration: FEATURES += --features test_build diff --git a/17_kernel_symbols/README.md b/17_kernel_symbols/README.md index 5dc778ff..934b1aa1 100644 --- a/17_kernel_symbols/README.md +++ b/17_kernel_symbols/README.md @@ -465,9 +465,9 @@ diff -uNr 16_virtual_mem_part4_higher_half_kernel/kernel_symbols/Cargo.toml 17_k +default = [] +generated_symbols_available = [] + -+## -------------------------------------------------------------------------------------------------- ++## ------------------------------------------------------------------------------------------------- +## Dependencies -+## -------------------------------------------------------------------------------------------------- ++## ------------------------------------------------------------------------------------------------- + +[dependencies] +debug-symbol-types = { path = "../libraries/debug-symbol-types" } @@ -524,9 +524,9 @@ diff -uNr 16_virtual_mem_part4_higher_half_kernel/kernel_symbols.mk 17_kernel_sy +include ../common/format.mk +include ../common/docker.mk + -+## -------------------------------------------------------------------------------------------------- ++## ------------------------------------------------------------------------------------------------- +## Check for input variables that need be exported by the calling Makefile -+## -------------------------------------------------------------------------------------------------- ++## ------------------------------------------------------------------------------------------------- +ifndef KERNEL_SYMBOLS_TOOL_PATH +$(error KERNEL_SYMBOLS_TOOL_PATH is not set) +endif @@ -545,9 +545,9 @@ diff -uNr 16_virtual_mem_part4_higher_half_kernel/kernel_symbols.mk 17_kernel_sy + + + -+## -------------------------------------------------------------------------------------------------- ++## ------------------------------------------------------------------------------------------------- +## Targets and Prerequisites -+## -------------------------------------------------------------------------------------------------- ++## ------------------------------------------------------------------------------------------------- +KERNEL_SYMBOLS_MANIFEST = kernel_symbols/Cargo.toml +KERNEL_SYMBOLS_LINKER_SCRIPT = kernel_symbols/kernel_symbols.ld + @@ -562,9 +562,9 @@ diff -uNr 16_virtual_mem_part4_higher_half_kernel/kernel_symbols.mk 17_kernel_sy + + + -+## -------------------------------------------------------------------------------------------------- ++## ------------------------------------------------------------------------------------------------- +## Command building blocks -+## -------------------------------------------------------------------------------------------------- ++## ------------------------------------------------------------------------------------------------- +GET_SYMBOLS_SECTION_VIRT_ADDR = $(DOCKER_TOOLS) $(EXEC_SYMBOLS_TOOL) \ + --get_symbols_section_virt_addr $(KERNEL_SYMBOLS_OUTPUT_ELF) + @@ -595,9 +595,9 @@ diff -uNr 16_virtual_mem_part4_higher_half_kernel/kernel_symbols.mk 17_kernel_sy + + + -+## -------------------------------------------------------------------------------------------------- ++## ------------------------------------------------------------------------------------------------- +## Targets -+## -------------------------------------------------------------------------------------------------- ++## ------------------------------------------------------------------------------------------------- +.PHONY: all symbols measure_time_start measure_time_finish + +all: measure_time_start symbols measure_time_finish diff --git a/17_kernel_symbols/kernel/tests/00_console_sanity.rb b/17_kernel_symbols/kernel/tests/00_console_sanity.rb index c8d9167b..8be7a2f1 100644 --- a/17_kernel_symbols/kernel/tests/00_console_sanity.rb +++ b/17_kernel_symbols/kernel/tests/00_console_sanity.rb @@ -40,9 +40,9 @@ class RxStatisticsTest < SubtestBase end end -## -------------------------------------------------------------------------------------------------- +## ------------------------------------------------------------------------------------------------- ## Test registration -## -------------------------------------------------------------------------------------------------- +## ------------------------------------------------------------------------------------------------- def subtest_collection [TxRxHandshakeTest.new, TxStatisticsTest.new, RxStatisticsTest.new] end diff --git a/17_kernel_symbols/kernel/tests/03_exception_restore_sanity.rb b/17_kernel_symbols/kernel/tests/03_exception_restore_sanity.rb index 136e4392..02f51f74 100644 --- a/17_kernel_symbols/kernel/tests/03_exception_restore_sanity.rb +++ b/17_kernel_symbols/kernel/tests/03_exception_restore_sanity.rb @@ -17,9 +17,9 @@ class ExceptionRestoreTest < SubtestBase end end -## -------------------------------------------------------------------------------------------------- +## ------------------------------------------------------------------------------------------------- ## Test registration -## -------------------------------------------------------------------------------------------------- +## ------------------------------------------------------------------------------------------------- def subtest_collection [ExceptionRestoreTest.new] end diff --git a/17_kernel_symbols/kernel_symbols.mk b/17_kernel_symbols/kernel_symbols.mk index fe05e569..78eef39c 100644 --- a/17_kernel_symbols/kernel_symbols.mk +++ b/17_kernel_symbols/kernel_symbols.mk @@ -5,9 +5,9 @@ include ../common/format.mk include ../common/docker.mk -## -------------------------------------------------------------------------------------------------- +## ------------------------------------------------------------------------------------------------- ## Check for input variables that need be exported by the calling Makefile -## -------------------------------------------------------------------------------------------------- +## ------------------------------------------------------------------------------------------------- ifndef KERNEL_SYMBOLS_TOOL_PATH $(error KERNEL_SYMBOLS_TOOL_PATH is not set) endif @@ -26,9 +26,9 @@ endif -## -------------------------------------------------------------------------------------------------- +## ------------------------------------------------------------------------------------------------- ## Targets and Prerequisites -## -------------------------------------------------------------------------------------------------- +## ------------------------------------------------------------------------------------------------- KERNEL_SYMBOLS_MANIFEST = kernel_symbols/Cargo.toml KERNEL_SYMBOLS_LINKER_SCRIPT = kernel_symbols/kernel_symbols.ld @@ -43,9 +43,9 @@ export KERNEL_SYMBOLS_DEMANGLED_RS -## -------------------------------------------------------------------------------------------------- +## ------------------------------------------------------------------------------------------------- ## Command building blocks -## -------------------------------------------------------------------------------------------------- +## ------------------------------------------------------------------------------------------------- GET_SYMBOLS_SECTION_VIRT_ADDR = $(DOCKER_TOOLS) $(EXEC_SYMBOLS_TOOL) \ --get_symbols_section_virt_addr $(KERNEL_SYMBOLS_OUTPUT_ELF) @@ -76,9 +76,9 @@ DOCKER_TOOLS = $(DOCKER_CMD) $(DOCKER_IMAGE) -## -------------------------------------------------------------------------------------------------- +## ------------------------------------------------------------------------------------------------- ## Targets -## -------------------------------------------------------------------------------------------------- +## ------------------------------------------------------------------------------------------------- .PHONY: all symbols measure_time_start measure_time_finish all: measure_time_start symbols measure_time_finish diff --git a/18_backtrace/Makefile b/18_backtrace/Makefile index 1731f85c..714ad0e9 100644 --- a/18_backtrace/Makefile +++ b/18_backtrace/Makefile @@ -6,9 +6,9 @@ include ../common/docker.mk include ../common/format.mk include ../common/operating_system.mk -## -------------------------------------------------------------------------------------------------- +## ------------------------------------------------------------------------------------------------- ## Optional, user-provided configuration values -## -------------------------------------------------------------------------------------------------- +## ------------------------------------------------------------------------------------------------- # Default to the RPi3. BSP ?= rpi3 @@ -25,9 +25,9 @@ endif -## -------------------------------------------------------------------------------------------------- +## ------------------------------------------------------------------------------------------------- ## BSP-specific configuration values -## -------------------------------------------------------------------------------------------------- +## ------------------------------------------------------------------------------------------------- QEMU_MISSING_STRING = "This board is not yet supported for QEMU." ifeq ($(BSP),rpi3) @@ -65,9 +65,9 @@ export LD_SCRIPT_PATH -## -------------------------------------------------------------------------------------------------- +## ------------------------------------------------------------------------------------------------- ## Targets and Prerequisites -## -------------------------------------------------------------------------------------------------- +## ------------------------------------------------------------------------------------------------- KERNEL_MANIFEST = kernel/Cargo.toml KERNEL_LINKER_SCRIPT = kernel.ld LAST_BUILD_CONFIG = target/$(BSP).build_config @@ -106,9 +106,9 @@ KERNEL_ELF = $(KERNEL_ELF_TTABLES_SYMS) -## -------------------------------------------------------------------------------------------------- +## ------------------------------------------------------------------------------------------------- ## Command building blocks -## -------------------------------------------------------------------------------------------------- +## ------------------------------------------------------------------------------------------------- RUSTFLAGS = $(RUSTC_MISC_ARGS) \ -C link-arg=--library-path=$(LD_SCRIPT_PATH) \ -C link-arg=--script=$(KERNEL_LINKER_SCRIPT) @@ -166,9 +166,9 @@ endif -## -------------------------------------------------------------------------------------------------- +## ------------------------------------------------------------------------------------------------- ## Targets -## -------------------------------------------------------------------------------------------------- +## ------------------------------------------------------------------------------------------------- .PHONY: all doc qemu chainboot clippy clean readelf objdump nm check all: $(KERNEL_BIN) @@ -283,9 +283,9 @@ nm: $(KERNEL_ELF) -## -------------------------------------------------------------------------------------------------- +## ------------------------------------------------------------------------------------------------- ## Debugging targets -## -------------------------------------------------------------------------------------------------- +## ------------------------------------------------------------------------------------------------- .PHONY: jtagboot openocd gdb gdb-opt0 ## ------------------------------------------------------------------------------ @@ -311,9 +311,9 @@ gdb gdb-opt0: $(KERNEL_ELF) -## -------------------------------------------------------------------------------------------------- +## ------------------------------------------------------------------------------------------------- ## Testing targets -## -------------------------------------------------------------------------------------------------- +## ------------------------------------------------------------------------------------------------- .PHONY: test test_boot test_unit test_integration test_unit test_integration: FEATURES += --features test_build diff --git a/18_backtrace/README.md b/18_backtrace/README.md index 767b1f83..6c9157d5 100644 --- a/18_backtrace/README.md +++ b/18_backtrace/README.md @@ -1039,9 +1039,9 @@ diff -uNr 17_kernel_symbols/kernel/tests/05_backtrace_sanity.rb 18_backtrace/ker + end +end + -+## -------------------------------------------------------------------------------------------------- ++## ------------------------------------------------------------------------------------------------- +## Test registration -+## -------------------------------------------------------------------------------------------------- ++## ------------------------------------------------------------------------------------------------- +def subtest_collection + [PanicBacktraceTest.new, BacktraceCorrectnessTest.new] +end @@ -1106,9 +1106,9 @@ diff -uNr 17_kernel_symbols/kernel/tests/06_backtrace_invalid_frame.rb 18_backtr + end +end + -+## -------------------------------------------------------------------------------------------------- ++## ------------------------------------------------------------------------------------------------- +## Test registration -+## -------------------------------------------------------------------------------------------------- ++## ------------------------------------------------------------------------------------------------- +def subtest_collection + [InvalidFramePointerTest.new] +end @@ -1174,9 +1174,9 @@ diff -uNr 17_kernel_symbols/kernel/tests/07_backtrace_invalid_link.rb 18_backtra + end +end + -+## -------------------------------------------------------------------------------------------------- ++## ------------------------------------------------------------------------------------------------- +## Test registration -+## -------------------------------------------------------------------------------------------------- ++## ------------------------------------------------------------------------------------------------- +def subtest_collection + [InvalidLinkTest.new] +end diff --git a/18_backtrace/kernel/tests/00_console_sanity.rb b/18_backtrace/kernel/tests/00_console_sanity.rb index c8d9167b..8be7a2f1 100644 --- a/18_backtrace/kernel/tests/00_console_sanity.rb +++ b/18_backtrace/kernel/tests/00_console_sanity.rb @@ -40,9 +40,9 @@ class RxStatisticsTest < SubtestBase end end -## -------------------------------------------------------------------------------------------------- +## ------------------------------------------------------------------------------------------------- ## Test registration -## -------------------------------------------------------------------------------------------------- +## ------------------------------------------------------------------------------------------------- def subtest_collection [TxRxHandshakeTest.new, TxStatisticsTest.new, RxStatisticsTest.new] end diff --git a/18_backtrace/kernel/tests/03_exception_restore_sanity.rb b/18_backtrace/kernel/tests/03_exception_restore_sanity.rb index 136e4392..02f51f74 100644 --- a/18_backtrace/kernel/tests/03_exception_restore_sanity.rb +++ b/18_backtrace/kernel/tests/03_exception_restore_sanity.rb @@ -17,9 +17,9 @@ class ExceptionRestoreTest < SubtestBase end end -## -------------------------------------------------------------------------------------------------- +## ------------------------------------------------------------------------------------------------- ## Test registration -## -------------------------------------------------------------------------------------------------- +## ------------------------------------------------------------------------------------------------- def subtest_collection [ExceptionRestoreTest.new] end diff --git a/18_backtrace/kernel/tests/05_backtrace_sanity.rb b/18_backtrace/kernel/tests/05_backtrace_sanity.rb index 057db3f3..243e2fc8 100644 --- a/18_backtrace/kernel/tests/05_backtrace_sanity.rb +++ b/18_backtrace/kernel/tests/05_backtrace_sanity.rb @@ -31,9 +31,9 @@ class BacktraceCorrectnessTest < SubtestBase end end -## -------------------------------------------------------------------------------------------------- +## ------------------------------------------------------------------------------------------------- ## Test registration -## -------------------------------------------------------------------------------------------------- +## ------------------------------------------------------------------------------------------------- def subtest_collection [PanicBacktraceTest.new, BacktraceCorrectnessTest.new] end diff --git a/18_backtrace/kernel/tests/06_backtrace_invalid_frame.rb b/18_backtrace/kernel/tests/06_backtrace_invalid_frame.rb index 918a5229..80695468 100644 --- a/18_backtrace/kernel/tests/06_backtrace_invalid_frame.rb +++ b/18_backtrace/kernel/tests/06_backtrace_invalid_frame.rb @@ -18,9 +18,9 @@ class InvalidFramePointerTest < SubtestBase end end -## -------------------------------------------------------------------------------------------------- +## ------------------------------------------------------------------------------------------------- ## Test registration -## -------------------------------------------------------------------------------------------------- +## ------------------------------------------------------------------------------------------------- def subtest_collection [InvalidFramePointerTest.new] end diff --git a/18_backtrace/kernel/tests/07_backtrace_invalid_link.rb b/18_backtrace/kernel/tests/07_backtrace_invalid_link.rb index 2a9e6a1b..6b6f0413 100644 --- a/18_backtrace/kernel/tests/07_backtrace_invalid_link.rb +++ b/18_backtrace/kernel/tests/07_backtrace_invalid_link.rb @@ -17,9 +17,9 @@ class InvalidLinkTest < SubtestBase end end -## -------------------------------------------------------------------------------------------------- +## ------------------------------------------------------------------------------------------------- ## Test registration -## -------------------------------------------------------------------------------------------------- +## ------------------------------------------------------------------------------------------------- def subtest_collection [InvalidLinkTest.new] end diff --git a/18_backtrace/kernel_symbols.mk b/18_backtrace/kernel_symbols.mk index fe05e569..78eef39c 100644 --- a/18_backtrace/kernel_symbols.mk +++ b/18_backtrace/kernel_symbols.mk @@ -5,9 +5,9 @@ include ../common/format.mk include ../common/docker.mk -## -------------------------------------------------------------------------------------------------- +## ------------------------------------------------------------------------------------------------- ## Check for input variables that need be exported by the calling Makefile -## -------------------------------------------------------------------------------------------------- +## ------------------------------------------------------------------------------------------------- ifndef KERNEL_SYMBOLS_TOOL_PATH $(error KERNEL_SYMBOLS_TOOL_PATH is not set) endif @@ -26,9 +26,9 @@ endif -## -------------------------------------------------------------------------------------------------- +## ------------------------------------------------------------------------------------------------- ## Targets and Prerequisites -## -------------------------------------------------------------------------------------------------- +## ------------------------------------------------------------------------------------------------- KERNEL_SYMBOLS_MANIFEST = kernel_symbols/Cargo.toml KERNEL_SYMBOLS_LINKER_SCRIPT = kernel_symbols/kernel_symbols.ld @@ -43,9 +43,9 @@ export KERNEL_SYMBOLS_DEMANGLED_RS -## -------------------------------------------------------------------------------------------------- +## ------------------------------------------------------------------------------------------------- ## Command building blocks -## -------------------------------------------------------------------------------------------------- +## ------------------------------------------------------------------------------------------------- GET_SYMBOLS_SECTION_VIRT_ADDR = $(DOCKER_TOOLS) $(EXEC_SYMBOLS_TOOL) \ --get_symbols_section_virt_addr $(KERNEL_SYMBOLS_OUTPUT_ELF) @@ -76,9 +76,9 @@ DOCKER_TOOLS = $(DOCKER_CMD) $(DOCKER_IMAGE) -## -------------------------------------------------------------------------------------------------- +## ------------------------------------------------------------------------------------------------- ## Targets -## -------------------------------------------------------------------------------------------------- +## ------------------------------------------------------------------------------------------------- .PHONY: all symbols measure_time_start measure_time_finish all: measure_time_start symbols measure_time_finish diff --git a/19_kernel_heap/Makefile b/19_kernel_heap/Makefile index 23c7cfaa..393bc3bd 100644 --- a/19_kernel_heap/Makefile +++ b/19_kernel_heap/Makefile @@ -6,9 +6,9 @@ include ../common/docker.mk include ../common/format.mk include ../common/operating_system.mk -## -------------------------------------------------------------------------------------------------- +## ------------------------------------------------------------------------------------------------- ## Optional, user-provided configuration values -## -------------------------------------------------------------------------------------------------- +## ------------------------------------------------------------------------------------------------- # Default to the RPi3. BSP ?= rpi3 @@ -30,9 +30,9 @@ endif -## -------------------------------------------------------------------------------------------------- +## ------------------------------------------------------------------------------------------------- ## BSP-specific configuration values -## -------------------------------------------------------------------------------------------------- +## ------------------------------------------------------------------------------------------------- QEMU_MISSING_STRING = "This board is not yet supported for QEMU." ifeq ($(BSP),rpi3) @@ -70,9 +70,9 @@ export LD_SCRIPT_PATH -## -------------------------------------------------------------------------------------------------- +## ------------------------------------------------------------------------------------------------- ## Targets and Prerequisites -## -------------------------------------------------------------------------------------------------- +## ------------------------------------------------------------------------------------------------- KERNEL_MANIFEST = kernel/Cargo.toml KERNEL_LINKER_SCRIPT = kernel.ld LAST_BUILD_CONFIG = target/$(BSP)_$(DEBUG_PRINTS).build_config @@ -111,9 +111,9 @@ KERNEL_ELF = $(KERNEL_ELF_TTABLES_SYMS) -## -------------------------------------------------------------------------------------------------- +## ------------------------------------------------------------------------------------------------- ## Command building blocks -## -------------------------------------------------------------------------------------------------- +## ------------------------------------------------------------------------------------------------- RUSTFLAGS = $(RUSTC_MISC_ARGS) \ -C link-arg=--library-path=$(LD_SCRIPT_PATH) \ -C link-arg=--script=$(KERNEL_LINKER_SCRIPT) @@ -171,9 +171,9 @@ endif -## -------------------------------------------------------------------------------------------------- +## ------------------------------------------------------------------------------------------------- ## Targets -## -------------------------------------------------------------------------------------------------- +## ------------------------------------------------------------------------------------------------- .PHONY: all doc qemu chainboot clippy clean readelf objdump nm check all: $(KERNEL_BIN) @@ -288,9 +288,9 @@ nm: $(KERNEL_ELF) -## -------------------------------------------------------------------------------------------------- +## ------------------------------------------------------------------------------------------------- ## Debugging targets -## -------------------------------------------------------------------------------------------------- +## ------------------------------------------------------------------------------------------------- .PHONY: jtagboot openocd gdb gdb-opt0 ## ------------------------------------------------------------------------------ @@ -316,9 +316,9 @@ gdb gdb-opt0: $(KERNEL_ELF) -## -------------------------------------------------------------------------------------------------- +## ------------------------------------------------------------------------------------------------- ## Testing targets -## -------------------------------------------------------------------------------------------------- +## ------------------------------------------------------------------------------------------------- .PHONY: test test_boot test_unit test_integration test_unit test_integration: FEATURES += --features test_build diff --git a/19_kernel_heap/README.md b/19_kernel_heap/README.md index 8126a238..97611794 100644 --- a/19_kernel_heap/README.md +++ b/19_kernel_heap/README.md @@ -1439,7 +1439,7 @@ diff -uNr 18_backtrace/Makefile 19_kernel_heap/Makefile ifdef TEST TEST_ARG = --test $(TEST) @@ -70,7 +75,7 @@ - ## -------------------------------------------------------------------------------------------------- + ## ------------------------------------------------------------------------------------------------- KERNEL_MANIFEST = kernel/Cargo.toml KERNEL_LINKER_SCRIPT = kernel.ld -LAST_BUILD_CONFIG = target/$(BSP).build_config diff --git a/19_kernel_heap/kernel/tests/00_console_sanity.rb b/19_kernel_heap/kernel/tests/00_console_sanity.rb index c8d9167b..8be7a2f1 100644 --- a/19_kernel_heap/kernel/tests/00_console_sanity.rb +++ b/19_kernel_heap/kernel/tests/00_console_sanity.rb @@ -40,9 +40,9 @@ class RxStatisticsTest < SubtestBase end end -## -------------------------------------------------------------------------------------------------- +## ------------------------------------------------------------------------------------------------- ## Test registration -## -------------------------------------------------------------------------------------------------- +## ------------------------------------------------------------------------------------------------- def subtest_collection [TxRxHandshakeTest.new, TxStatisticsTest.new, RxStatisticsTest.new] end diff --git a/19_kernel_heap/kernel/tests/03_exception_restore_sanity.rb b/19_kernel_heap/kernel/tests/03_exception_restore_sanity.rb index 136e4392..02f51f74 100644 --- a/19_kernel_heap/kernel/tests/03_exception_restore_sanity.rb +++ b/19_kernel_heap/kernel/tests/03_exception_restore_sanity.rb @@ -17,9 +17,9 @@ class ExceptionRestoreTest < SubtestBase end end -## -------------------------------------------------------------------------------------------------- +## ------------------------------------------------------------------------------------------------- ## Test registration -## -------------------------------------------------------------------------------------------------- +## ------------------------------------------------------------------------------------------------- def subtest_collection [ExceptionRestoreTest.new] end diff --git a/19_kernel_heap/kernel/tests/05_backtrace_sanity.rb b/19_kernel_heap/kernel/tests/05_backtrace_sanity.rb index 057db3f3..243e2fc8 100644 --- a/19_kernel_heap/kernel/tests/05_backtrace_sanity.rb +++ b/19_kernel_heap/kernel/tests/05_backtrace_sanity.rb @@ -31,9 +31,9 @@ class BacktraceCorrectnessTest < SubtestBase end end -## -------------------------------------------------------------------------------------------------- +## ------------------------------------------------------------------------------------------------- ## Test registration -## -------------------------------------------------------------------------------------------------- +## ------------------------------------------------------------------------------------------------- def subtest_collection [PanicBacktraceTest.new, BacktraceCorrectnessTest.new] end diff --git a/19_kernel_heap/kernel/tests/06_backtrace_invalid_frame.rb b/19_kernel_heap/kernel/tests/06_backtrace_invalid_frame.rb index 918a5229..80695468 100644 --- a/19_kernel_heap/kernel/tests/06_backtrace_invalid_frame.rb +++ b/19_kernel_heap/kernel/tests/06_backtrace_invalid_frame.rb @@ -18,9 +18,9 @@ class InvalidFramePointerTest < SubtestBase end end -## -------------------------------------------------------------------------------------------------- +## ------------------------------------------------------------------------------------------------- ## Test registration -## -------------------------------------------------------------------------------------------------- +## ------------------------------------------------------------------------------------------------- def subtest_collection [InvalidFramePointerTest.new] end diff --git a/19_kernel_heap/kernel/tests/07_backtrace_invalid_link.rb b/19_kernel_heap/kernel/tests/07_backtrace_invalid_link.rb index 2a9e6a1b..6b6f0413 100644 --- a/19_kernel_heap/kernel/tests/07_backtrace_invalid_link.rb +++ b/19_kernel_heap/kernel/tests/07_backtrace_invalid_link.rb @@ -17,9 +17,9 @@ class InvalidLinkTest < SubtestBase end end -## -------------------------------------------------------------------------------------------------- +## ------------------------------------------------------------------------------------------------- ## Test registration -## -------------------------------------------------------------------------------------------------- +## ------------------------------------------------------------------------------------------------- def subtest_collection [InvalidLinkTest.new] end diff --git a/19_kernel_heap/kernel_symbols.mk b/19_kernel_heap/kernel_symbols.mk index fe05e569..78eef39c 100644 --- a/19_kernel_heap/kernel_symbols.mk +++ b/19_kernel_heap/kernel_symbols.mk @@ -5,9 +5,9 @@ include ../common/format.mk include ../common/docker.mk -## -------------------------------------------------------------------------------------------------- +## ------------------------------------------------------------------------------------------------- ## Check for input variables that need be exported by the calling Makefile -## -------------------------------------------------------------------------------------------------- +## ------------------------------------------------------------------------------------------------- ifndef KERNEL_SYMBOLS_TOOL_PATH $(error KERNEL_SYMBOLS_TOOL_PATH is not set) endif @@ -26,9 +26,9 @@ endif -## -------------------------------------------------------------------------------------------------- +## ------------------------------------------------------------------------------------------------- ## Targets and Prerequisites -## -------------------------------------------------------------------------------------------------- +## ------------------------------------------------------------------------------------------------- KERNEL_SYMBOLS_MANIFEST = kernel_symbols/Cargo.toml KERNEL_SYMBOLS_LINKER_SCRIPT = kernel_symbols/kernel_symbols.ld @@ -43,9 +43,9 @@ export KERNEL_SYMBOLS_DEMANGLED_RS -## -------------------------------------------------------------------------------------------------- +## ------------------------------------------------------------------------------------------------- ## Command building blocks -## -------------------------------------------------------------------------------------------------- +## ------------------------------------------------------------------------------------------------- GET_SYMBOLS_SECTION_VIRT_ADDR = $(DOCKER_TOOLS) $(EXEC_SYMBOLS_TOOL) \ --get_symbols_section_virt_addr $(KERNEL_SYMBOLS_OUTPUT_ELF) @@ -76,9 +76,9 @@ DOCKER_TOOLS = $(DOCKER_CMD) $(DOCKER_IMAGE) -## -------------------------------------------------------------------------------------------------- +## ------------------------------------------------------------------------------------------------- ## Targets -## -------------------------------------------------------------------------------------------------- +## ------------------------------------------------------------------------------------------------- .PHONY: all symbols measure_time_start measure_time_finish all: measure_time_start symbols measure_time_finish diff --git a/20_timer_callbacks/Makefile b/20_timer_callbacks/Makefile index 23c7cfaa..393bc3bd 100644 --- a/20_timer_callbacks/Makefile +++ b/20_timer_callbacks/Makefile @@ -6,9 +6,9 @@ include ../common/docker.mk include ../common/format.mk include ../common/operating_system.mk -## -------------------------------------------------------------------------------------------------- +## ------------------------------------------------------------------------------------------------- ## Optional, user-provided configuration values -## -------------------------------------------------------------------------------------------------- +## ------------------------------------------------------------------------------------------------- # Default to the RPi3. BSP ?= rpi3 @@ -30,9 +30,9 @@ endif -## -------------------------------------------------------------------------------------------------- +## ------------------------------------------------------------------------------------------------- ## BSP-specific configuration values -## -------------------------------------------------------------------------------------------------- +## ------------------------------------------------------------------------------------------------- QEMU_MISSING_STRING = "This board is not yet supported for QEMU." ifeq ($(BSP),rpi3) @@ -70,9 +70,9 @@ export LD_SCRIPT_PATH -## -------------------------------------------------------------------------------------------------- +## ------------------------------------------------------------------------------------------------- ## Targets and Prerequisites -## -------------------------------------------------------------------------------------------------- +## ------------------------------------------------------------------------------------------------- KERNEL_MANIFEST = kernel/Cargo.toml KERNEL_LINKER_SCRIPT = kernel.ld LAST_BUILD_CONFIG = target/$(BSP)_$(DEBUG_PRINTS).build_config @@ -111,9 +111,9 @@ KERNEL_ELF = $(KERNEL_ELF_TTABLES_SYMS) -## -------------------------------------------------------------------------------------------------- +## ------------------------------------------------------------------------------------------------- ## Command building blocks -## -------------------------------------------------------------------------------------------------- +## ------------------------------------------------------------------------------------------------- RUSTFLAGS = $(RUSTC_MISC_ARGS) \ -C link-arg=--library-path=$(LD_SCRIPT_PATH) \ -C link-arg=--script=$(KERNEL_LINKER_SCRIPT) @@ -171,9 +171,9 @@ endif -## -------------------------------------------------------------------------------------------------- +## ------------------------------------------------------------------------------------------------- ## Targets -## -------------------------------------------------------------------------------------------------- +## ------------------------------------------------------------------------------------------------- .PHONY: all doc qemu chainboot clippy clean readelf objdump nm check all: $(KERNEL_BIN) @@ -288,9 +288,9 @@ nm: $(KERNEL_ELF) -## -------------------------------------------------------------------------------------------------- +## ------------------------------------------------------------------------------------------------- ## Debugging targets -## -------------------------------------------------------------------------------------------------- +## ------------------------------------------------------------------------------------------------- .PHONY: jtagboot openocd gdb gdb-opt0 ## ------------------------------------------------------------------------------ @@ -316,9 +316,9 @@ gdb gdb-opt0: $(KERNEL_ELF) -## -------------------------------------------------------------------------------------------------- +## ------------------------------------------------------------------------------------------------- ## Testing targets -## -------------------------------------------------------------------------------------------------- +## ------------------------------------------------------------------------------------------------- .PHONY: test test_boot test_unit test_integration test_unit test_integration: FEATURES += --features test_build diff --git a/20_timer_callbacks/kernel/Cargo.toml b/20_timer_callbacks/kernel/Cargo.toml index ec76d782..18b00e7a 100644 --- a/20_timer_callbacks/kernel/Cargo.toml +++ b/20_timer_callbacks/kernel/Cargo.toml @@ -11,9 +11,9 @@ bsp_rpi3 = ["tock-registers"] bsp_rpi4 = ["tock-registers"] test_build = ["qemu-exit"] -## -------------------------------------------------------------------------------------------------- +## ------------------------------------------------------------------------------------------------- ## Dependencies -## -------------------------------------------------------------------------------------------------- +## ------------------------------------------------------------------------------------------------- [dependencies] test-types = { path = "../libraries/test-types" } @@ -28,9 +28,9 @@ qemu-exit = { version = "3.x.x", optional = true } [target.'cfg(target_arch = "aarch64")'.dependencies] aarch64-cpu = { version = "9.x.x" } -## -------------------------------------------------------------------------------------------------- +## ------------------------------------------------------------------------------------------------- ## Testing -## -------------------------------------------------------------------------------------------------- +## ------------------------------------------------------------------------------------------------- [dev-dependencies] test-macros = { path = "../libraries/test-macros" } diff --git a/20_timer_callbacks/kernel/tests/00_console_sanity.rb b/20_timer_callbacks/kernel/tests/00_console_sanity.rb index c8d9167b..8be7a2f1 100644 --- a/20_timer_callbacks/kernel/tests/00_console_sanity.rb +++ b/20_timer_callbacks/kernel/tests/00_console_sanity.rb @@ -40,9 +40,9 @@ class RxStatisticsTest < SubtestBase end end -## -------------------------------------------------------------------------------------------------- +## ------------------------------------------------------------------------------------------------- ## Test registration -## -------------------------------------------------------------------------------------------------- +## ------------------------------------------------------------------------------------------------- def subtest_collection [TxRxHandshakeTest.new, TxStatisticsTest.new, RxStatisticsTest.new] end diff --git a/20_timer_callbacks/kernel/tests/03_exception_restore_sanity.rb b/20_timer_callbacks/kernel/tests/03_exception_restore_sanity.rb index 136e4392..02f51f74 100644 --- a/20_timer_callbacks/kernel/tests/03_exception_restore_sanity.rb +++ b/20_timer_callbacks/kernel/tests/03_exception_restore_sanity.rb @@ -17,9 +17,9 @@ class ExceptionRestoreTest < SubtestBase end end -## -------------------------------------------------------------------------------------------------- +## ------------------------------------------------------------------------------------------------- ## Test registration -## -------------------------------------------------------------------------------------------------- +## ------------------------------------------------------------------------------------------------- def subtest_collection [ExceptionRestoreTest.new] end diff --git a/20_timer_callbacks/kernel/tests/05_backtrace_sanity.rb b/20_timer_callbacks/kernel/tests/05_backtrace_sanity.rb index 057db3f3..243e2fc8 100644 --- a/20_timer_callbacks/kernel/tests/05_backtrace_sanity.rb +++ b/20_timer_callbacks/kernel/tests/05_backtrace_sanity.rb @@ -31,9 +31,9 @@ class BacktraceCorrectnessTest < SubtestBase end end -## -------------------------------------------------------------------------------------------------- +## ------------------------------------------------------------------------------------------------- ## Test registration -## -------------------------------------------------------------------------------------------------- +## ------------------------------------------------------------------------------------------------- def subtest_collection [PanicBacktraceTest.new, BacktraceCorrectnessTest.new] end diff --git a/20_timer_callbacks/kernel/tests/06_backtrace_invalid_frame.rb b/20_timer_callbacks/kernel/tests/06_backtrace_invalid_frame.rb index 918a5229..80695468 100644 --- a/20_timer_callbacks/kernel/tests/06_backtrace_invalid_frame.rb +++ b/20_timer_callbacks/kernel/tests/06_backtrace_invalid_frame.rb @@ -18,9 +18,9 @@ class InvalidFramePointerTest < SubtestBase end end -## -------------------------------------------------------------------------------------------------- +## ------------------------------------------------------------------------------------------------- ## Test registration -## -------------------------------------------------------------------------------------------------- +## ------------------------------------------------------------------------------------------------- def subtest_collection [InvalidFramePointerTest.new] end diff --git a/20_timer_callbacks/kernel/tests/07_backtrace_invalid_link.rb b/20_timer_callbacks/kernel/tests/07_backtrace_invalid_link.rb index 2a9e6a1b..6b6f0413 100644 --- a/20_timer_callbacks/kernel/tests/07_backtrace_invalid_link.rb +++ b/20_timer_callbacks/kernel/tests/07_backtrace_invalid_link.rb @@ -17,9 +17,9 @@ class InvalidLinkTest < SubtestBase end end -## -------------------------------------------------------------------------------------------------- +## ------------------------------------------------------------------------------------------------- ## Test registration -## -------------------------------------------------------------------------------------------------- +## ------------------------------------------------------------------------------------------------- def subtest_collection [InvalidLinkTest.new] end diff --git a/20_timer_callbacks/kernel_symbols.mk b/20_timer_callbacks/kernel_symbols.mk index fe05e569..78eef39c 100644 --- a/20_timer_callbacks/kernel_symbols.mk +++ b/20_timer_callbacks/kernel_symbols.mk @@ -5,9 +5,9 @@ include ../common/format.mk include ../common/docker.mk -## -------------------------------------------------------------------------------------------------- +## ------------------------------------------------------------------------------------------------- ## Check for input variables that need be exported by the calling Makefile -## -------------------------------------------------------------------------------------------------- +## ------------------------------------------------------------------------------------------------- ifndef KERNEL_SYMBOLS_TOOL_PATH $(error KERNEL_SYMBOLS_TOOL_PATH is not set) endif @@ -26,9 +26,9 @@ endif -## -------------------------------------------------------------------------------------------------- +## ------------------------------------------------------------------------------------------------- ## Targets and Prerequisites -## -------------------------------------------------------------------------------------------------- +## ------------------------------------------------------------------------------------------------- KERNEL_SYMBOLS_MANIFEST = kernel_symbols/Cargo.toml KERNEL_SYMBOLS_LINKER_SCRIPT = kernel_symbols/kernel_symbols.ld @@ -43,9 +43,9 @@ export KERNEL_SYMBOLS_DEMANGLED_RS -## -------------------------------------------------------------------------------------------------- +## ------------------------------------------------------------------------------------------------- ## Command building blocks -## -------------------------------------------------------------------------------------------------- +## ------------------------------------------------------------------------------------------------- GET_SYMBOLS_SECTION_VIRT_ADDR = $(DOCKER_TOOLS) $(EXEC_SYMBOLS_TOOL) \ --get_symbols_section_virt_addr $(KERNEL_SYMBOLS_OUTPUT_ELF) @@ -76,9 +76,9 @@ DOCKER_TOOLS = $(DOCKER_CMD) $(DOCKER_IMAGE) -## -------------------------------------------------------------------------------------------------- +## ------------------------------------------------------------------------------------------------- ## Targets -## -------------------------------------------------------------------------------------------------- +## ------------------------------------------------------------------------------------------------- .PHONY: all symbols measure_time_start measure_time_finish all: measure_time_start symbols measure_time_finish diff --git a/X1_JTAG_boot/Cargo.toml b/X1_JTAG_boot/Cargo.toml index e0b0590f..f6251c8f 100644 --- a/X1_JTAG_boot/Cargo.toml +++ b/X1_JTAG_boot/Cargo.toml @@ -16,9 +16,9 @@ bsp_rpi4 = ["tock-registers"] name = "kernel" path = "src/main.rs" -## -------------------------------------------------------------------------------------------------- +## ------------------------------------------------------------------------------------------------- ## Dependencies -## -------------------------------------------------------------------------------------------------- +## ------------------------------------------------------------------------------------------------- [dependencies] diff --git a/X1_JTAG_boot/Makefile b/X1_JTAG_boot/Makefile index 40d7b259..f97db7f3 100644 --- a/X1_JTAG_boot/Makefile +++ b/X1_JTAG_boot/Makefile @@ -6,9 +6,9 @@ include ../common/docker.mk include ../common/format.mk include ../common/operating_system.mk -## -------------------------------------------------------------------------------------------------- +## ------------------------------------------------------------------------------------------------- ## Optional, user-provided configuration values -## -------------------------------------------------------------------------------------------------- +## ------------------------------------------------------------------------------------------------- # Default to the RPi3. BSP ?= rpi3 @@ -18,9 +18,9 @@ DEV_SERIAL ?= /dev/ttyUSB0 -## -------------------------------------------------------------------------------------------------- +## ------------------------------------------------------------------------------------------------- ## BSP-specific configuration values -## -------------------------------------------------------------------------------------------------- +## ------------------------------------------------------------------------------------------------- QEMU_MISSING_STRING = "This board is not yet supported for QEMU." ifeq ($(BSP),rpi3) @@ -52,9 +52,9 @@ export LD_SCRIPT_PATH -## -------------------------------------------------------------------------------------------------- +## ------------------------------------------------------------------------------------------------- ## Targets and Prerequisites -## -------------------------------------------------------------------------------------------------- +## ------------------------------------------------------------------------------------------------- KERNEL_MANIFEST = Cargo.toml KERNEL_LINKER_SCRIPT = kernel.ld LAST_BUILD_CONFIG = target/$(BSP).build_config @@ -66,9 +66,9 @@ KERNEL_ELF_DEPS = $(filter-out %: ,$(file < $(KERNEL_ELF).d)) $(KERNEL_MANIFEST) -## -------------------------------------------------------------------------------------------------- +## ------------------------------------------------------------------------------------------------- ## Command building blocks -## -------------------------------------------------------------------------------------------------- +## ------------------------------------------------------------------------------------------------- RUSTFLAGS = $(RUSTC_MISC_ARGS) \ -C link-arg=--library-path=$(LD_SCRIPT_PATH) \ -C link-arg=--script=$(KERNEL_LINKER_SCRIPT) @@ -115,9 +115,9 @@ endif -## -------------------------------------------------------------------------------------------------- +## ------------------------------------------------------------------------------------------------- ## Targets -## -------------------------------------------------------------------------------------------------- +## ------------------------------------------------------------------------------------------------- .PHONY: all doc qemu chainboot clippy clean readelf objdump nm check all: $(KERNEL_BIN) @@ -215,9 +215,9 @@ nm: $(KERNEL_ELF) -## -------------------------------------------------------------------------------------------------- +## ------------------------------------------------------------------------------------------------- ## Testing targets -## -------------------------------------------------------------------------------------------------- +## ------------------------------------------------------------------------------------------------- .PHONY: test test_boot ifeq ($(QEMU_MACHINE_TYPE),) # QEMU is not supported for the board. diff --git a/common/serial/minipush.rb b/common/serial/minipush.rb index 08c4760d..2b90dd71 100755 --- a/common/serial/minipush.rb +++ b/common/serial/minipush.rb @@ -113,9 +113,9 @@ class MiniPush < MiniTerm end end -## -------------------------------------------------------------------------------------------------- +## ------------------------------------------------------------------------------------------------- ## Execution starts here -## -------------------------------------------------------------------------------------------------- +## ------------------------------------------------------------------------------------------------- if __FILE__ == $PROGRAM_NAME puts puts 'Minipush 1.0'.cyan diff --git a/common/serial/miniterm.rb b/common/serial/miniterm.rb index b3ffb59a..db2ddac5 100755 --- a/common/serial/miniterm.rb +++ b/common/serial/miniterm.rb @@ -126,9 +126,9 @@ class MiniTerm end end -## -------------------------------------------------------------------------------------------------- +## ------------------------------------------------------------------------------------------------- ## Execution starts here -## -------------------------------------------------------------------------------------------------- +## ------------------------------------------------------------------------------------------------- if __FILE__ == $PROGRAM_NAME puts puts 'Miniterm 1.0'.cyan diff --git a/utils/devtool.rb b/utils/devtool.rb index cdd37210..2b120d6b 100755 --- a/utils/devtool.rb +++ b/utils/devtool.rb @@ -329,9 +329,9 @@ class DevTool end end -## -------------------------------------------------------------------------------------------------- +## ------------------------------------------------------------------------------------------------- ## Execution starts here -## -------------------------------------------------------------------------------------------------- +## ------------------------------------------------------------------------------------------------- tool = DevTool.new cmd = ARGV[0] commands = tool.public_methods(false).sort