From 5a0d8de96b3fbd23834dbfc5325c6d597902ebf9 Mon Sep 17 00:00:00 2001 From: Andre Richter Date: Wed, 15 Apr 2020 23:38:44 +0200 Subject: [PATCH] Demangle in objdump --- 01_wait_forever/Makefile | 3 ++- 02_runtime_init/Makefile | 3 ++- 03_hacky_hello_world/Makefile | 3 ++- 04_zero_overhead_abstraction/Makefile | 3 ++- 05_safe_globals/Makefile | 3 ++- 06_drivers_gpio_uart/Makefile | 3 ++- 07_uart_chainloader/Makefile | 3 ++- 08_timestamps/Makefile | 3 ++- 09_hw_debug_JTAG/Makefile | 3 ++- 10_privilege_level/Makefile | 3 ++- 11_virtual_memory/Makefile | 3 ++- 12_exceptions_part1_groundwork/Makefile | 3 ++- 13_integrated_testing/Makefile | 3 ++- 14_exceptions_part2_peripheral_IRQs/Makefile | 3 ++- X1_JTAG_boot/Makefile | 3 ++- 15 files changed, 30 insertions(+), 15 deletions(-) diff --git a/01_wait_forever/Makefile b/01_wait_forever/Makefile index 37b8f19c..568d1ed7 100644 --- a/01_wait_forever/Makefile +++ b/01_wait_forever/Makefile @@ -81,7 +81,8 @@ readelf: all readelf -a $(KERNEL_ELF) objdump: all - rust-objdump --arch-name aarch64 -disassemble -no-show-raw-insn -print-imm-hex $(KERNEL_ELF) + rust-objdump --arch-name aarch64 --disassemble --demangle --no-show-raw-insn \ + --print-imm-hex $(KERNEL_ELF) nm: all rust-nm --demangle --print-size $(KERNEL_ELF) | sort diff --git a/02_runtime_init/Makefile b/02_runtime_init/Makefile index 37b8f19c..568d1ed7 100644 --- a/02_runtime_init/Makefile +++ b/02_runtime_init/Makefile @@ -81,7 +81,8 @@ readelf: all readelf -a $(KERNEL_ELF) objdump: all - rust-objdump --arch-name aarch64 -disassemble -no-show-raw-insn -print-imm-hex $(KERNEL_ELF) + rust-objdump --arch-name aarch64 --disassemble --demangle --no-show-raw-insn \ + --print-imm-hex $(KERNEL_ELF) nm: all rust-nm --demangle --print-size $(KERNEL_ELF) | sort diff --git a/03_hacky_hello_world/Makefile b/03_hacky_hello_world/Makefile index 8f50b3c8..568dc4b5 100644 --- a/03_hacky_hello_world/Makefile +++ b/03_hacky_hello_world/Makefile @@ -81,7 +81,8 @@ readelf: all readelf -a $(KERNEL_ELF) objdump: all - rust-objdump --arch-name aarch64 -disassemble -no-show-raw-insn -print-imm-hex $(KERNEL_ELF) + rust-objdump --arch-name aarch64 --disassemble --demangle --no-show-raw-insn \ + --print-imm-hex $(KERNEL_ELF) nm: all rust-nm --demangle --print-size $(KERNEL_ELF) | sort diff --git a/04_zero_overhead_abstraction/Makefile b/04_zero_overhead_abstraction/Makefile index 8f50b3c8..568dc4b5 100644 --- a/04_zero_overhead_abstraction/Makefile +++ b/04_zero_overhead_abstraction/Makefile @@ -81,7 +81,8 @@ readelf: all readelf -a $(KERNEL_ELF) objdump: all - rust-objdump --arch-name aarch64 -disassemble -no-show-raw-insn -print-imm-hex $(KERNEL_ELF) + rust-objdump --arch-name aarch64 --disassemble --demangle --no-show-raw-insn \ + --print-imm-hex $(KERNEL_ELF) nm: all rust-nm --demangle --print-size $(KERNEL_ELF) | sort diff --git a/05_safe_globals/Makefile b/05_safe_globals/Makefile index 8f50b3c8..568dc4b5 100644 --- a/05_safe_globals/Makefile +++ b/05_safe_globals/Makefile @@ -81,7 +81,8 @@ readelf: all readelf -a $(KERNEL_ELF) objdump: all - rust-objdump --arch-name aarch64 -disassemble -no-show-raw-insn -print-imm-hex $(KERNEL_ELF) + rust-objdump --arch-name aarch64 --disassemble --demangle --no-show-raw-insn \ + --print-imm-hex $(KERNEL_ELF) nm: all rust-nm --demangle --print-size $(KERNEL_ELF) | sort diff --git a/06_drivers_gpio_uart/Makefile b/06_drivers_gpio_uart/Makefile index 8f50b3c8..568dc4b5 100644 --- a/06_drivers_gpio_uart/Makefile +++ b/06_drivers_gpio_uart/Makefile @@ -81,7 +81,8 @@ readelf: all readelf -a $(KERNEL_ELF) objdump: all - rust-objdump --arch-name aarch64 -disassemble -no-show-raw-insn -print-imm-hex $(KERNEL_ELF) + rust-objdump --arch-name aarch64 --disassemble --demangle --no-show-raw-insn \ + --print-imm-hex $(KERNEL_ELF) nm: all rust-nm --demangle --print-size $(KERNEL_ELF) | sort diff --git a/07_uart_chainloader/Makefile b/07_uart_chainloader/Makefile index 55e33691..dfd5ebbe 100644 --- a/07_uart_chainloader/Makefile +++ b/07_uart_chainloader/Makefile @@ -105,7 +105,8 @@ readelf: all readelf -a $(KERNEL_ELF) objdump: all - rust-objdump --arch-name aarch64 -disassemble -no-show-raw-insn -print-imm-hex $(KERNEL_ELF) + rust-objdump --arch-name aarch64 --disassemble --demangle --no-show-raw-insn \ + --print-imm-hex $(KERNEL_ELF) nm: all rust-nm --demangle --print-size $(KERNEL_ELF) | sort diff --git a/08_timestamps/Makefile b/08_timestamps/Makefile index 6e016995..1e2bcab4 100644 --- a/08_timestamps/Makefile +++ b/08_timestamps/Makefile @@ -100,7 +100,8 @@ readelf: all readelf -a $(KERNEL_ELF) objdump: all - rust-objdump --arch-name aarch64 -disassemble -no-show-raw-insn -print-imm-hex $(KERNEL_ELF) + rust-objdump --arch-name aarch64 --disassemble --demangle --no-show-raw-insn \ + --print-imm-hex $(KERNEL_ELF) nm: all rust-nm --demangle --print-size $(KERNEL_ELF) | sort diff --git a/09_hw_debug_JTAG/Makefile b/09_hw_debug_JTAG/Makefile index d3ab5f31..62ddd07b 100644 --- a/09_hw_debug_JTAG/Makefile +++ b/09_hw_debug_JTAG/Makefile @@ -129,7 +129,8 @@ readelf: all readelf -a $(KERNEL_ELF) objdump: all - rust-objdump --arch-name aarch64 -disassemble -no-show-raw-insn -print-imm-hex $(KERNEL_ELF) + rust-objdump --arch-name aarch64 --disassemble --demangle --no-show-raw-insn \ + --print-imm-hex $(KERNEL_ELF) nm: all rust-nm --demangle --print-size $(KERNEL_ELF) | sort diff --git a/10_privilege_level/Makefile b/10_privilege_level/Makefile index d3ab5f31..62ddd07b 100644 --- a/10_privilege_level/Makefile +++ b/10_privilege_level/Makefile @@ -129,7 +129,8 @@ readelf: all readelf -a $(KERNEL_ELF) objdump: all - rust-objdump --arch-name aarch64 -disassemble -no-show-raw-insn -print-imm-hex $(KERNEL_ELF) + rust-objdump --arch-name aarch64 --disassemble --demangle --no-show-raw-insn \ + --print-imm-hex $(KERNEL_ELF) nm: all rust-nm --demangle --print-size $(KERNEL_ELF) | sort diff --git a/11_virtual_memory/Makefile b/11_virtual_memory/Makefile index d3ab5f31..62ddd07b 100644 --- a/11_virtual_memory/Makefile +++ b/11_virtual_memory/Makefile @@ -129,7 +129,8 @@ readelf: all readelf -a $(KERNEL_ELF) objdump: all - rust-objdump --arch-name aarch64 -disassemble -no-show-raw-insn -print-imm-hex $(KERNEL_ELF) + rust-objdump --arch-name aarch64 --disassemble --demangle --no-show-raw-insn \ + --print-imm-hex $(KERNEL_ELF) nm: all rust-nm --demangle --print-size $(KERNEL_ELF) | sort diff --git a/12_exceptions_part1_groundwork/Makefile b/12_exceptions_part1_groundwork/Makefile index d3ab5f31..62ddd07b 100644 --- a/12_exceptions_part1_groundwork/Makefile +++ b/12_exceptions_part1_groundwork/Makefile @@ -129,7 +129,8 @@ readelf: all readelf -a $(KERNEL_ELF) objdump: all - rust-objdump --arch-name aarch64 -disassemble -no-show-raw-insn -print-imm-hex $(KERNEL_ELF) + rust-objdump --arch-name aarch64 --disassemble --demangle --no-show-raw-insn \ + --print-imm-hex $(KERNEL_ELF) nm: all rust-nm --demangle --print-size $(KERNEL_ELF) | sort diff --git a/13_integrated_testing/Makefile b/13_integrated_testing/Makefile index 134c7591..7886b54d 100644 --- a/13_integrated_testing/Makefile +++ b/13_integrated_testing/Makefile @@ -160,7 +160,8 @@ readelf: all readelf -a $(KERNEL_ELF) objdump: all - rust-objdump --arch-name aarch64 -disassemble -no-show-raw-insn -print-imm-hex $(KERNEL_ELF) + rust-objdump --arch-name aarch64 --disassemble --demangle --no-show-raw-insn \ + --print-imm-hex $(KERNEL_ELF) nm: all rust-nm --demangle --print-size $(KERNEL_ELF) | sort diff --git a/14_exceptions_part2_peripheral_IRQs/Makefile b/14_exceptions_part2_peripheral_IRQs/Makefile index 61d75f17..4fda86dc 100644 --- a/14_exceptions_part2_peripheral_IRQs/Makefile +++ b/14_exceptions_part2_peripheral_IRQs/Makefile @@ -163,7 +163,8 @@ readelf: all readelf -a $(KERNEL_ELF) objdump: all - rust-objdump --arch-name aarch64 -disassemble -no-show-raw-insn -print-imm-hex $(KERNEL_ELF) + rust-objdump --arch-name aarch64 --disassemble --demangle --no-show-raw-insn \ + --print-imm-hex $(KERNEL_ELF) nm: all rust-nm --demangle --print-size $(KERNEL_ELF) | sort diff --git a/X1_JTAG_boot/Makefile b/X1_JTAG_boot/Makefile index 6e016995..1e2bcab4 100644 --- a/X1_JTAG_boot/Makefile +++ b/X1_JTAG_boot/Makefile @@ -100,7 +100,8 @@ readelf: all readelf -a $(KERNEL_ELF) objdump: all - rust-objdump --arch-name aarch64 -disassemble -no-show-raw-insn -print-imm-hex $(KERNEL_ELF) + rust-objdump --arch-name aarch64 --disassemble --demangle --no-show-raw-insn \ + --print-imm-hex $(KERNEL_ELF) nm: all rust-nm --demangle --print-size $(KERNEL_ELF) | sort