diff --git a/01_wait_forever/Makefile b/01_wait_forever/Makefile
index bc5e47c8..1481f8a4 100644
--- a/01_wait_forever/Makefile
+++ b/01_wait_forever/Makefile
@@ -88,10 +88,10 @@ readelf: $(KERNEL_ELF)
readelf --headers $(KERNEL_ELF)
objdump: $(KERNEL_ELF)
- @$(DOCKER_ELFTOOLS) $(OBJDUMP_BINARY) --disassemble --demangle $(KERNEL_ELF)
+ @$(DOCKER_ELFTOOLS) $(OBJDUMP_BINARY) --disassemble --demangle $(KERNEL_ELF) | rustfilt
nm: $(KERNEL_ELF)
- @$(DOCKER_ELFTOOLS) $(NM_BINARY) --demangle --print-size $(KERNEL_ELF) | sort
+ @$(DOCKER_ELFTOOLS) $(NM_BINARY) --demangle --print-size $(KERNEL_ELF) | sort | rustfilt
# For rust-analyzer
check:
diff --git a/02_runtime_init/Makefile b/02_runtime_init/Makefile
index bc5e47c8..1481f8a4 100644
--- a/02_runtime_init/Makefile
+++ b/02_runtime_init/Makefile
@@ -88,10 +88,10 @@ readelf: $(KERNEL_ELF)
readelf --headers $(KERNEL_ELF)
objdump: $(KERNEL_ELF)
- @$(DOCKER_ELFTOOLS) $(OBJDUMP_BINARY) --disassemble --demangle $(KERNEL_ELF)
+ @$(DOCKER_ELFTOOLS) $(OBJDUMP_BINARY) --disassemble --demangle $(KERNEL_ELF) | rustfilt
nm: $(KERNEL_ELF)
- @$(DOCKER_ELFTOOLS) $(NM_BINARY) --demangle --print-size $(KERNEL_ELF) | sort
+ @$(DOCKER_ELFTOOLS) $(NM_BINARY) --demangle --print-size $(KERNEL_ELF) | sort | rustfilt
# For rust-analyzer
check:
diff --git a/03_hacky_hello_world/Makefile b/03_hacky_hello_world/Makefile
index b6b62c58..a9b0f82c 100644
--- a/03_hacky_hello_world/Makefile
+++ b/03_hacky_hello_world/Makefile
@@ -88,10 +88,10 @@ readelf: $(KERNEL_ELF)
readelf --headers $(KERNEL_ELF)
objdump: $(KERNEL_ELF)
- @$(DOCKER_ELFTOOLS) $(OBJDUMP_BINARY) --disassemble --demangle $(KERNEL_ELF)
+ @$(DOCKER_ELFTOOLS) $(OBJDUMP_BINARY) --disassemble --demangle $(KERNEL_ELF) | rustfilt
nm: $(KERNEL_ELF)
- @$(DOCKER_ELFTOOLS) $(NM_BINARY) --demangle --print-size $(KERNEL_ELF) | sort
+ @$(DOCKER_ELFTOOLS) $(NM_BINARY) --demangle --print-size $(KERNEL_ELF) | sort | rustfilt
# For rust-analyzer
check:
diff --git a/04_zero_overhead_abstraction/Makefile b/04_zero_overhead_abstraction/Makefile
index b6b62c58..a9b0f82c 100644
--- a/04_zero_overhead_abstraction/Makefile
+++ b/04_zero_overhead_abstraction/Makefile
@@ -88,10 +88,10 @@ readelf: $(KERNEL_ELF)
readelf --headers $(KERNEL_ELF)
objdump: $(KERNEL_ELF)
- @$(DOCKER_ELFTOOLS) $(OBJDUMP_BINARY) --disassemble --demangle $(KERNEL_ELF)
+ @$(DOCKER_ELFTOOLS) $(OBJDUMP_BINARY) --disassemble --demangle $(KERNEL_ELF) | rustfilt
nm: $(KERNEL_ELF)
- @$(DOCKER_ELFTOOLS) $(NM_BINARY) --demangle --print-size $(KERNEL_ELF) | sort
+ @$(DOCKER_ELFTOOLS) $(NM_BINARY) --demangle --print-size $(KERNEL_ELF) | sort | rustfilt
# For rust-analyzer
check:
diff --git a/05_safe_globals/Makefile b/05_safe_globals/Makefile
index b6b62c58..a9b0f82c 100644
--- a/05_safe_globals/Makefile
+++ b/05_safe_globals/Makefile
@@ -88,10 +88,10 @@ readelf: $(KERNEL_ELF)
readelf --headers $(KERNEL_ELF)
objdump: $(KERNEL_ELF)
- @$(DOCKER_ELFTOOLS) $(OBJDUMP_BINARY) --disassemble --demangle $(KERNEL_ELF)
+ @$(DOCKER_ELFTOOLS) $(OBJDUMP_BINARY) --disassemble --demangle $(KERNEL_ELF) | rustfilt
nm: $(KERNEL_ELF)
- @$(DOCKER_ELFTOOLS) $(NM_BINARY) --demangle --print-size $(KERNEL_ELF) | sort
+ @$(DOCKER_ELFTOOLS) $(NM_BINARY) --demangle --print-size $(KERNEL_ELF) | sort | rustfilt
# For rust-analyzer
check:
diff --git a/06_drivers_gpio_uart/Makefile b/06_drivers_gpio_uart/Makefile
index 43318aa8..06c268de 100644
--- a/06_drivers_gpio_uart/Makefile
+++ b/06_drivers_gpio_uart/Makefile
@@ -107,10 +107,10 @@ readelf: $(KERNEL_ELF)
readelf --headers $(KERNEL_ELF)
objdump: $(KERNEL_ELF)
- @$(DOCKER_ELFTOOLS) $(OBJDUMP_BINARY) --disassemble --demangle $(KERNEL_ELF)
+ @$(DOCKER_ELFTOOLS) $(OBJDUMP_BINARY) --disassemble --demangle $(KERNEL_ELF) | rustfilt
nm: $(KERNEL_ELF)
- @$(DOCKER_ELFTOOLS) $(NM_BINARY) --demangle --print-size $(KERNEL_ELF) | sort
+ @$(DOCKER_ELFTOOLS) $(NM_BINARY) --demangle --print-size $(KERNEL_ELF) | sort | rustfilt
# For rust-analyzer
check:
diff --git a/07_uart_chainloader/Makefile b/07_uart_chainloader/Makefile
index 7ac28e4b..884a29f7 100644
--- a/07_uart_chainloader/Makefile
+++ b/07_uart_chainloader/Makefile
@@ -116,10 +116,10 @@ objdump: $(KERNEL_ELF)
@$(DOCKER_ELFTOOLS) $(OBJDUMP_BINARY) --disassemble --demangle \
--section .text \
--section .got \
- $(KERNEL_ELF)
+ $(KERNEL_ELF) | rustfilt
nm: $(KERNEL_ELF)
- @$(DOCKER_ELFTOOLS) $(NM_BINARY) --demangle --print-size $(KERNEL_ELF) | sort
+ @$(DOCKER_ELFTOOLS) $(NM_BINARY) --demangle --print-size $(KERNEL_ELF) | sort | rustfilt
# For rust-analyzer
check:
diff --git a/07_uart_chainloader/README.md b/07_uart_chainloader/README.md
index 7d6c3a04..378b6eb5 100644
--- a/07_uart_chainloader/README.md
+++ b/07_uart_chainloader/README.md
@@ -167,14 +167,14 @@ diff -uNr 06_drivers_gpio_uart/Makefile 07_uart_chainloader/Makefile
readelf --headers $(KERNEL_ELF)
objdump: $(KERNEL_ELF)
-- @$(DOCKER_ELFTOOLS) $(OBJDUMP_BINARY) --disassemble --demangle $(KERNEL_ELF)
+- @$(DOCKER_ELFTOOLS) $(OBJDUMP_BINARY) --disassemble --demangle $(KERNEL_ELF) | rustfilt
+ @$(DOCKER_ELFTOOLS) $(OBJDUMP_BINARY) --disassemble --demangle \
+ --section .text \
+ --section .got \
-+ $(KERNEL_ELF)
++ $(KERNEL_ELF) | rustfilt
nm: $(KERNEL_ELF)
- @$(DOCKER_ELFTOOLS) $(NM_BINARY) --demangle --print-size $(KERNEL_ELF) | sort
+ @$(DOCKER_ELFTOOLS) $(NM_BINARY) --demangle --print-size $(KERNEL_ELF) | sort | rustfilt
diff -uNr 06_drivers_gpio_uart/src/_arch/aarch64/cpu.rs 07_uart_chainloader/src/_arch/aarch64/cpu.rs
--- 06_drivers_gpio_uart/src/_arch/aarch64/cpu.rs
diff --git a/08_timestamps/Makefile b/08_timestamps/Makefile
index 4aac53d9..2f04337e 100644
--- a/08_timestamps/Makefile
+++ b/08_timestamps/Makefile
@@ -107,10 +107,10 @@ readelf: $(KERNEL_ELF)
readelf --headers $(KERNEL_ELF)
objdump: $(KERNEL_ELF)
- @$(DOCKER_ELFTOOLS) $(OBJDUMP_BINARY) --disassemble --demangle $(KERNEL_ELF)
+ @$(DOCKER_ELFTOOLS) $(OBJDUMP_BINARY) --disassemble --demangle $(KERNEL_ELF) | rustfilt
nm: $(KERNEL_ELF)
- @$(DOCKER_ELFTOOLS) $(NM_BINARY) --demangle --print-size $(KERNEL_ELF) | sort
+ @$(DOCKER_ELFTOOLS) $(NM_BINARY) --demangle --print-size $(KERNEL_ELF) | sort | rustfilt
# For rust-analyzer
check:
diff --git a/08_timestamps/README.md b/08_timestamps/README.md
index 43e949c4..b1244dce 100644
--- a/08_timestamps/README.md
+++ b/08_timestamps/README.md
@@ -106,11 +106,11 @@ diff -uNr 07_uart_chainloader/Makefile 08_timestamps/Makefile
- @$(DOCKER_ELFTOOLS) $(OBJDUMP_BINARY) --disassemble --demangle \
- --section .text \
- --section .got \
-- $(KERNEL_ELF)
-+ @$(DOCKER_ELFTOOLS) $(OBJDUMP_BINARY) --disassemble --demangle $(KERNEL_ELF)
+- $(KERNEL_ELF) | rustfilt
++ @$(DOCKER_ELFTOOLS) $(OBJDUMP_BINARY) --disassemble --demangle $(KERNEL_ELF) | rustfilt
nm: $(KERNEL_ELF)
- @$(DOCKER_ELFTOOLS) $(NM_BINARY) --demangle --print-size $(KERNEL_ELF) | sort
+ @$(DOCKER_ELFTOOLS) $(NM_BINARY) --demangle --print-size $(KERNEL_ELF) | sort | rustfilt
diff -uNr 07_uart_chainloader/src/_arch/aarch64/cpu.rs 08_timestamps/src/_arch/aarch64/cpu.rs
--- 07_uart_chainloader/src/_arch/aarch64/cpu.rs
diff --git a/09_hw_debug_JTAG/Makefile b/09_hw_debug_JTAG/Makefile
index f354c85d..5f49b1af 100644
--- a/09_hw_debug_JTAG/Makefile
+++ b/09_hw_debug_JTAG/Makefile
@@ -136,10 +136,10 @@ readelf: $(KERNEL_ELF)
readelf --headers $(KERNEL_ELF)
objdump: $(KERNEL_ELF)
- @$(DOCKER_ELFTOOLS) $(OBJDUMP_BINARY) --disassemble --demangle $(KERNEL_ELF)
+ @$(DOCKER_ELFTOOLS) $(OBJDUMP_BINARY) --disassemble --demangle $(KERNEL_ELF) | rustfilt
nm: $(KERNEL_ELF)
- @$(DOCKER_ELFTOOLS) $(NM_BINARY) --demangle --print-size $(KERNEL_ELF) | sort
+ @$(DOCKER_ELFTOOLS) $(NM_BINARY) --demangle --print-size $(KERNEL_ELF) | sort | rustfilt
# For rust-analyzer
check:
diff --git a/10_privilege_level/Makefile b/10_privilege_level/Makefile
index f354c85d..5f49b1af 100644
--- a/10_privilege_level/Makefile
+++ b/10_privilege_level/Makefile
@@ -136,10 +136,10 @@ readelf: $(KERNEL_ELF)
readelf --headers $(KERNEL_ELF)
objdump: $(KERNEL_ELF)
- @$(DOCKER_ELFTOOLS) $(OBJDUMP_BINARY) --disassemble --demangle $(KERNEL_ELF)
+ @$(DOCKER_ELFTOOLS) $(OBJDUMP_BINARY) --disassemble --demangle $(KERNEL_ELF) | rustfilt
nm: $(KERNEL_ELF)
- @$(DOCKER_ELFTOOLS) $(NM_BINARY) --demangle --print-size $(KERNEL_ELF) | sort
+ @$(DOCKER_ELFTOOLS) $(NM_BINARY) --demangle --print-size $(KERNEL_ELF) | sort | rustfilt
# For rust-analyzer
check:
diff --git a/11_virtual_mem_part1_identity_mapping/Makefile b/11_virtual_mem_part1_identity_mapping/Makefile
index f354c85d..5f49b1af 100644
--- a/11_virtual_mem_part1_identity_mapping/Makefile
+++ b/11_virtual_mem_part1_identity_mapping/Makefile
@@ -136,10 +136,10 @@ readelf: $(KERNEL_ELF)
readelf --headers $(KERNEL_ELF)
objdump: $(KERNEL_ELF)
- @$(DOCKER_ELFTOOLS) $(OBJDUMP_BINARY) --disassemble --demangle $(KERNEL_ELF)
+ @$(DOCKER_ELFTOOLS) $(OBJDUMP_BINARY) --disassemble --demangle $(KERNEL_ELF) | rustfilt
nm: $(KERNEL_ELF)
- @$(DOCKER_ELFTOOLS) $(NM_BINARY) --demangle --print-size $(KERNEL_ELF) | sort
+ @$(DOCKER_ELFTOOLS) $(NM_BINARY) --demangle --print-size $(KERNEL_ELF) | sort | rustfilt
# For rust-analyzer
check:
diff --git a/12_exceptions_part1_groundwork/Makefile b/12_exceptions_part1_groundwork/Makefile
index f354c85d..5f49b1af 100644
--- a/12_exceptions_part1_groundwork/Makefile
+++ b/12_exceptions_part1_groundwork/Makefile
@@ -136,10 +136,10 @@ readelf: $(KERNEL_ELF)
readelf --headers $(KERNEL_ELF)
objdump: $(KERNEL_ELF)
- @$(DOCKER_ELFTOOLS) $(OBJDUMP_BINARY) --disassemble --demangle $(KERNEL_ELF)
+ @$(DOCKER_ELFTOOLS) $(OBJDUMP_BINARY) --disassemble --demangle $(KERNEL_ELF) | rustfilt
nm: $(KERNEL_ELF)
- @$(DOCKER_ELFTOOLS) $(NM_BINARY) --demangle --print-size $(KERNEL_ELF) | sort
+ @$(DOCKER_ELFTOOLS) $(NM_BINARY) --demangle --print-size $(KERNEL_ELF) | sort | rustfilt
# For rust-analyzer
check:
diff --git a/13_integrated_testing/Makefile b/13_integrated_testing/Makefile
index 3cc26552..ad567bb5 100644
--- a/13_integrated_testing/Makefile
+++ b/13_integrated_testing/Makefile
@@ -166,10 +166,10 @@ readelf: $(KERNEL_ELF)
readelf --headers $(KERNEL_ELF)
objdump: $(KERNEL_ELF)
- @$(DOCKER_ELFTOOLS) $(OBJDUMP_BINARY) --disassemble --demangle $(KERNEL_ELF)
+ @$(DOCKER_ELFTOOLS) $(OBJDUMP_BINARY) --disassemble --demangle $(KERNEL_ELF) | rustfilt
nm: $(KERNEL_ELF)
- @$(DOCKER_ELFTOOLS) $(NM_BINARY) --demangle --print-size $(KERNEL_ELF) | sort
+ @$(DOCKER_ELFTOOLS) $(NM_BINARY) --demangle --print-size $(KERNEL_ELF) | sort | rustfilt
# For rust-analyzer
check:
diff --git a/14_exceptions_part2_peripheral_IRQs/Makefile b/14_exceptions_part2_peripheral_IRQs/Makefile
index 430a564a..58361af8 100644
--- a/14_exceptions_part2_peripheral_IRQs/Makefile
+++ b/14_exceptions_part2_peripheral_IRQs/Makefile
@@ -167,10 +167,10 @@ readelf: $(KERNEL_ELF)
readelf --headers $(KERNEL_ELF)
objdump: $(KERNEL_ELF)
- @$(DOCKER_ELFTOOLS) $(OBJDUMP_BINARY) --disassemble --demangle $(KERNEL_ELF)
+ @$(DOCKER_ELFTOOLS) $(OBJDUMP_BINARY) --disassemble --demangle $(KERNEL_ELF) | rustfilt
nm: $(KERNEL_ELF)
- @$(DOCKER_ELFTOOLS) $(NM_BINARY) --demangle --print-size $(KERNEL_ELF) | sort
+ @$(DOCKER_ELFTOOLS) $(NM_BINARY) --demangle --print-size $(KERNEL_ELF) | sort | rustfilt
# For rust-analyzer
check:
diff --git a/15_virtual_mem_part2_mmio_remap/Makefile b/15_virtual_mem_part2_mmio_remap/Makefile
index 430a564a..58361af8 100644
--- a/15_virtual_mem_part2_mmio_remap/Makefile
+++ b/15_virtual_mem_part2_mmio_remap/Makefile
@@ -167,10 +167,10 @@ readelf: $(KERNEL_ELF)
readelf --headers $(KERNEL_ELF)
objdump: $(KERNEL_ELF)
- @$(DOCKER_ELFTOOLS) $(OBJDUMP_BINARY) --disassemble --demangle $(KERNEL_ELF)
+ @$(DOCKER_ELFTOOLS) $(OBJDUMP_BINARY) --disassemble --demangle $(KERNEL_ELF) | rustfilt
nm: $(KERNEL_ELF)
- @$(DOCKER_ELFTOOLS) $(NM_BINARY) --demangle --print-size $(KERNEL_ELF) | sort
+ @$(DOCKER_ELFTOOLS) $(NM_BINARY) --demangle --print-size $(KERNEL_ELF) | sort | rustfilt
# For rust-analyzer
check:
diff --git a/README.CN.md b/README.CN.md
index 852e9cc7..ed767da6 100644
--- a/README.CN.md
+++ b/README.CN.md
@@ -56,7 +56,7 @@ _带上我最诚挚的问候,
Andre ([@andre-richter])_
rustup default nightly-2020-11-20
rustup component add llvm-tools-preview
rustup target add aarch64-unknown-none-softfloat
- cargo install cargo-binutils
+ cargo install cargo-binutils rustfilt
```
2. 如果你想要全新安装:
@@ -67,7 +67,7 @@ _带上我最诚挚的问候,
Andre ([@andre-richter])_
source $HOME/.cargo/env
rustup target add aarch64-unknown-none-softfloat
- cargo install cargo-binutils
+ cargo install cargo-binutils rustfilt
```
4. 如果你使用 `Visual Studio Code`,我强烈推荐你安装[Rust Analyzer 扩展]。
diff --git a/README.md b/README.md
index 033c3604..5af62a96 100644
--- a/README.md
+++ b/README.md
@@ -72,7 +72,7 @@ other Unix flavors such as **macOS**, but this is only _experimental_.
rustup default nightly-2020-11-20
rustup component add llvm-tools-preview
rustup target add aarch64-unknown-none-softfloat
- cargo install cargo-binutils
+ cargo install cargo-binutils rustfilt
```
2. If you need a fresh install:
@@ -83,7 +83,7 @@ other Unix flavors such as **macOS**, but this is only _experimental_.
source $HOME/.cargo/env
rustup target add aarch64-unknown-none-softfloat
- cargo install cargo-binutils
+ cargo install cargo-binutils rustfilt
```
3. In case you use `Visual Studio Code`, I strongly recommend installing the [Rust Analyzer extension].
diff --git a/X1_JTAG_boot/Makefile b/X1_JTAG_boot/Makefile
index 4aac53d9..2f04337e 100644
--- a/X1_JTAG_boot/Makefile
+++ b/X1_JTAG_boot/Makefile
@@ -107,10 +107,10 @@ readelf: $(KERNEL_ELF)
readelf --headers $(KERNEL_ELF)
objdump: $(KERNEL_ELF)
- @$(DOCKER_ELFTOOLS) $(OBJDUMP_BINARY) --disassemble --demangle $(KERNEL_ELF)
+ @$(DOCKER_ELFTOOLS) $(OBJDUMP_BINARY) --disassemble --demangle $(KERNEL_ELF) | rustfilt
nm: $(KERNEL_ELF)
- @$(DOCKER_ELFTOOLS) $(NM_BINARY) --demangle --print-size $(KERNEL_ELF) | sort
+ @$(DOCKER_ELFTOOLS) $(NM_BINARY) --demangle --print-size $(KERNEL_ELF) | sort | rustfilt
# For rust-analyzer
check: