Demangle in objdump

4 years ago · 5a0d8de96b
parent bf8e6c36c7
commit 5a0d8de96b
15 changed files with 30 additions and 15 deletions
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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