From 1581b26995c47666b26530dff55307671215ab41 Mon Sep 17 00:00:00 2001
From: Andre Richter <andre.o.richter@gmail.com>
Date: Fri, 8 Apr 2022 22:24:56 +0200
Subject: [PATCH] Panic: Print location

---
 03_hacky_hello_world/README.md                |  30 +++++--
 03_hacky_hello_world/src/main.rs              |   2 +-
 03_hacky_hello_world/src/panic_wait.rs        |  19 +++--
 04_safe_globals/README.md                     |   5 +-
 04_safe_globals/src/panic_wait.rs             |  19 +++--
 05_drivers_gpio_uart/README.md                |  21 ++---
 05_drivers_gpio_uart/src/panic_wait.rs        |  19 +++--
 06_uart_chainloader/demo_payload_rpi3.img     | Bin 6696 -> 7112 bytes
 06_uart_chainloader/demo_payload_rpi4.img     | Bin 6536 -> 7000 bytes
 06_uart_chainloader/src/panic_wait.rs         |  19 +++--
 07_timestamps/README.md                       |  36 ++++----
 07_timestamps/src/panic_wait.rs               |  31 +++----
 08_hw_debug_JTAG/src/panic_wait.rs            |  31 +++----
 09_privilege_level/src/panic_wait.rs          |  31 +++----
 .../src/panic_wait.rs                         |  31 +++----
 11_exceptions_part1_groundwork/README.md      |  78 +++++++++---------
 .../src/_arch/aarch64/exception.rs            |   2 +-
 .../src/panic_wait.rs                         |  31 +++----
 12_integrated_testing/README.md               |  14 ++--
 .../src/_arch/aarch64/exception.rs            |   2 +-
 12_integrated_testing/src/panic_wait.rs       |  31 +++----
 .../src/_arch/aarch64/exception.rs            |   2 +-
 .../src/panic_wait.rs                         |  31 +++----
 .../src/_arch/aarch64/exception.rs            |   2 +-
 .../src/panic_wait.rs                         |  31 +++----
 .../src/_arch/aarch64/exception.rs            |   2 +-
 .../src/panic_wait.rs                         |  31 +++----
 .../src/_arch/aarch64/exception.rs            |   2 +-
 .../src/panic_wait.rs                         |  31 +++----
 X1_JTAG_boot/jtag_boot_rpi3.img               | Bin 7840 -> 8104 bytes
 X1_JTAG_boot/jtag_boot_rpi4.img               | Bin 6864 -> 7032 bytes
 X1_JTAG_boot/src/panic_wait.rs                |  31 +++----
 32 files changed, 339 insertions(+), 276 deletions(-)

diff --git a/03_hacky_hello_world/README.md b/03_hacky_hello_world/README.md
index dffbbb8a..1e764e65 100644
--- a/03_hacky_hello_world/README.md
+++ b/03_hacky_hello_world/README.md
@@ -24,9 +24,14 @@ QEMU is no longer running in assembly mode. It will from now on show the output
 ```console
 $ make qemu
 [...]
+
 Hello from Rust!
+Kernel panic!
+
+Panic location:
+      File 'src/main.rs', line 126, column 5
 
-Kernel panic: Stopping here.
+Stopping here.
 ```
 
 ## Diff to previous
@@ -230,7 +235,7 @@ diff -uNr 02_runtime_init/src/main.rs 03_hacky_hello_world/src/main.rs
  /// - Only a single core must be active and running this function.
  unsafe fn kernel_init() -> ! {
 -    panic!()
-+    println!("[0] Hello from Rust!");
++    println!("Hello from Rust!");
 +
 +    panic!("Stopping here.")
  }
@@ -238,7 +243,7 @@ diff -uNr 02_runtime_init/src/main.rs 03_hacky_hello_world/src/main.rs
 diff -uNr 02_runtime_init/src/panic_wait.rs 03_hacky_hello_world/src/panic_wait.rs
 --- 02_runtime_init/src/panic_wait.rs
 +++ 03_hacky_hello_world/src/panic_wait.rs
-@@ -4,14 +4,52 @@
+@@ -4,14 +4,61 @@
 
  //! A panic handler that infinitely waits.
 
@@ -285,11 +290,20 @@ diff -uNr 02_runtime_init/src/panic_wait.rs 03_hacky_hello_world/src/panic_wait.
 +    // Protect against panic infinite loops if any of the following code panics itself.
 +    panic_prevent_reenter();
 +
-+    if let Some(args) = info.message() {
-+        println!("\nKernel panic: {}", args);
-+    } else {
-+        println!("\nKernel panic!");
-+    }
++    let (location, line, column) = match info.location() {
++        Some(loc) => (loc.file(), loc.line(), loc.column()),
++        _ => ("???", 0, 0),
++    };
++
++    println!(
++        "Kernel panic!\n\n\
++        Panic location:\n      File '{}', line {}, column {}\n\n\
++        {}",
++        location,
++        line,
++        column,
++        info.message().unwrap_or(&format_args!("")),
++    );
 +
      cpu::wait_forever()
  }
diff --git a/03_hacky_hello_world/src/main.rs b/03_hacky_hello_world/src/main.rs
index 7a3957dd..da450139 100644
--- a/03_hacky_hello_world/src/main.rs
+++ b/03_hacky_hello_world/src/main.rs
@@ -121,7 +121,7 @@ mod print;
 ///
 /// - Only a single core must be active and running this function.
 unsafe fn kernel_init() -> ! {
-    println!("[0] Hello from Rust!");
+    println!("Hello from Rust!");
 
     panic!("Stopping here.")
 }
diff --git a/03_hacky_hello_world/src/panic_wait.rs b/03_hacky_hello_world/src/panic_wait.rs
index e37724a4..fb30e8d4 100644
--- a/03_hacky_hello_world/src/panic_wait.rs
+++ b/03_hacky_hello_world/src/panic_wait.rs
@@ -45,11 +45,20 @@ fn panic(info: &PanicInfo) -> ! {
     // Protect against panic infinite loops if any of the following code panics itself.
     panic_prevent_reenter();
 
-    if let Some(args) = info.message() {
-        println!("\nKernel panic: {}", args);
-    } else {
-        println!("\nKernel panic!");
-    }
+    let (location, line, column) = match info.location() {
+        Some(loc) => (loc.file(), loc.line(), loc.column()),
+        _ => ("???", 0, 0),
+    };
+
+    println!(
+        "Kernel panic!\n\n\
+        Panic location:\n      File '{}', line {}, column {}\n\n\
+        {}",
+        location,
+        line,
+        column,
+        info.message().unwrap_or(&format_args!("")),
+    );
 
     cpu::wait_forever()
 }
diff --git a/04_safe_globals/README.md b/04_safe_globals/README.md
index 83e1a45c..b42be642 100644
--- a/04_safe_globals/README.md
+++ b/04_safe_globals/README.md
@@ -244,11 +244,12 @@ diff -uNr 03_hacky_hello_world/src/main.rs 04_safe_globals/src/main.rs
  ///
  /// - Only a single core must be active and running this function.
  unsafe fn kernel_init() -> ! {
+-    println!("Hello from Rust!");
 +    use console::interface::Statistics;
-+
-     println!("[0] Hello from Rust!");
 
 -    panic!("Stopping here.")
++    println!("[0] Hello from Rust!");
++
 +    println!(
 +        "[1] Chars written: {}",
 +        bsp::console::console().chars_written()
diff --git a/04_safe_globals/src/panic_wait.rs b/04_safe_globals/src/panic_wait.rs
index e37724a4..fb30e8d4 100644
--- a/04_safe_globals/src/panic_wait.rs
+++ b/04_safe_globals/src/panic_wait.rs
@@ -45,11 +45,20 @@ fn panic(info: &PanicInfo) -> ! {
     // Protect against panic infinite loops if any of the following code panics itself.
     panic_prevent_reenter();
 
-    if let Some(args) = info.message() {
-        println!("\nKernel panic: {}", args);
-    } else {
-        println!("\nKernel panic!");
-    }
+    let (location, line, column) = match info.location() {
+        Some(loc) => (loc.file(), loc.line(), loc.column()),
+        _ => ("???", 0, 0),
+    };
+
+    println!(
+        "Kernel panic!\n\n\
+        Panic location:\n      File '{}', line {}, column {}\n\n\
+        {}",
+        location,
+        line,
+        column,
+        info.message().unwrap_or(&format_args!("")),
+    );
 
     cpu::wait_forever()
 }
diff --git a/05_drivers_gpio_uart/README.md b/05_drivers_gpio_uart/README.md
index 44e5aadf..aa39cbaa 100644
--- a/05_drivers_gpio_uart/README.md
+++ b/05_drivers_gpio_uart/README.md
@@ -1446,18 +1446,15 @@ diff -uNr 04_safe_globals/src/panic_wait.rs 05_drivers_gpio_uart/src/panic_wait.
  /// Stop immediately if called a second time.
  ///
  /// # Note
-@@ -46,9 +62,9 @@
-     panic_prevent_reenter();
-
-     if let Some(args) = info.message() {
--        println!("\nKernel panic: {}", args);
-+        panic_println!("\nKernel panic: {}", args);
-     } else {
--        println!("\nKernel panic!");
-+        panic_println!("\nKernel panic!");
-     }
-
-     cpu::wait_forever()
+@@ -50,7 +66,7 @@
+         _ => ("???", 0, 0),
+     };
+
+-    println!(
++    panic_println!(
+         "Kernel panic!\n\n\
+         Panic location:\n      File '{}', line {}, column {}\n\n\
+         {}",
 
 diff -uNr 04_safe_globals/tests/boot_test_string.rb 05_drivers_gpio_uart/tests/boot_test_string.rb
 --- 04_safe_globals/tests/boot_test_string.rb
diff --git a/05_drivers_gpio_uart/src/panic_wait.rs b/05_drivers_gpio_uart/src/panic_wait.rs
index e879b5b3..e546b06d 100644
--- a/05_drivers_gpio_uart/src/panic_wait.rs
+++ b/05_drivers_gpio_uart/src/panic_wait.rs
@@ -61,11 +61,20 @@ fn panic(info: &PanicInfo) -> ! {
     // Protect against panic infinite loops if any of the following code panics itself.
     panic_prevent_reenter();
 
-    if let Some(args) = info.message() {
-        panic_println!("\nKernel panic: {}", args);
-    } else {
-        panic_println!("\nKernel panic!");
-    }
+    let (location, line, column) = match info.location() {
+        Some(loc) => (loc.file(), loc.line(), loc.column()),
+        _ => ("???", 0, 0),
+    };
+
+    panic_println!(
+        "Kernel panic!\n\n\
+        Panic location:\n      File '{}', line {}, column {}\n\n\
+        {}",
+        location,
+        line,
+        column,
+        info.message().unwrap_or(&format_args!("")),
+    );
 
     cpu::wait_forever()
 }
diff --git a/06_uart_chainloader/demo_payload_rpi3.img b/06_uart_chainloader/demo_payload_rpi3.img
index b95058e4377a7f061a86cb39025e188660b064fe..1997951a5d4b8429956ff250ab5928d11b3d272f 100755
GIT binary patch
delta 3253
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

delta 2743
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

diff --git a/06_uart_chainloader/demo_payload_rpi4.img b/06_uart_chainloader/demo_payload_rpi4.img
index 33debd906b54faf573ba0976cffd27da54c1c226..9f463d32d7dd4c60080c8b92f3b298fa1d8f9d4c 100755
GIT binary patch
delta 3099
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
E8!KS%-2eap

delta 2678
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

diff --git a/06_uart_chainloader/src/panic_wait.rs b/06_uart_chainloader/src/panic_wait.rs
index e879b5b3..e546b06d 100644
--- a/06_uart_chainloader/src/panic_wait.rs
+++ b/06_uart_chainloader/src/panic_wait.rs
@@ -61,11 +61,20 @@ fn panic(info: &PanicInfo) -> ! {
     // Protect against panic infinite loops if any of the following code panics itself.
     panic_prevent_reenter();
 
-    if let Some(args) = info.message() {
-        panic_println!("\nKernel panic: {}", args);
-    } else {
-        panic_println!("\nKernel panic!");
-    }
+    let (location, line, column) = match info.location() {
+        Some(loc) => (loc.file(), loc.line(), loc.column()),
+        _ => ("???", 0, 0),
+    };
+
+    panic_println!(
+        "Kernel panic!\n\n\
+        Panic location:\n      File '{}', line {}, column {}\n\n\
+        {}",
+        location,
+        line,
+        column,
+        info.message().unwrap_or(&format_args!("")),
+    );
 
     cpu::wait_forever()
 }
diff --git a/07_timestamps/README.md b/07_timestamps/README.md
index bfd2ee14..0af0b046 100644
--- a/07_timestamps/README.md
+++ b/07_timestamps/README.md
@@ -635,7 +635,7 @@ diff -uNr 06_uart_chainloader/src/main.rs 07_timestamps/src/main.rs
 diff -uNr 06_uart_chainloader/src/panic_wait.rs 07_timestamps/src/panic_wait.rs
 --- 06_uart_chainloader/src/panic_wait.rs
 +++ 07_timestamps/src/panic_wait.rs
-@@ -58,13 +58,26 @@
+@@ -58,18 +58,23 @@
 
  #[panic_handler]
  fn panic(info: &PanicInfo) -> ! {
@@ -645,25 +645,21 @@ diff -uNr 06_uart_chainloader/src/panic_wait.rs 07_timestamps/src/panic_wait.rs
      panic_prevent_reenter();
 
 +    let timestamp = crate::time::time_manager().uptime();
-+
-     if let Some(args) = info.message() {
--        panic_println!("\nKernel panic: {}", args);
-+        panic_println!(
-+            "[  {:>3}.{:06}] Kernel panic: {}",
-+            timestamp.as_secs(),
-+            timestamp.subsec_micros(),
-+            args,
-+        );
-     } else {
--        panic_println!("\nKernel panic!");
-+        panic_println!(
-+            "[  {:>3}.{:06}] Kernel panic!",
-+            timestamp.as_secs(),
-+            timestamp.subsec_micros(),
-+        );
-     }
-
-     cpu::wait_forever()
+     let (location, line, column) = match info.location() {
+         Some(loc) => (loc.file(), loc.line(), loc.column()),
+         _ => ("???", 0, 0),
+     };
+
+     panic_println!(
+-        "Kernel panic!\n\n\
++        "[  {:>3}.{:06}] Kernel panic!\n\n\
+         Panic location:\n      File '{}', line {}, column {}\n\n\
+         {}",
++        timestamp.as_secs(),
++        timestamp.subsec_micros(),
+         location,
+         line,
+         column,
 
 diff -uNr 06_uart_chainloader/src/print.rs 07_timestamps/src/print.rs
 --- 06_uart_chainloader/src/print.rs
diff --git a/07_timestamps/src/panic_wait.rs b/07_timestamps/src/panic_wait.rs
index 3c57f562..f851e0d8 100644
--- a/07_timestamps/src/panic_wait.rs
+++ b/07_timestamps/src/panic_wait.rs
@@ -64,21 +64,22 @@ fn panic(info: &PanicInfo) -> ! {
     panic_prevent_reenter();
 
     let timestamp = crate::time::time_manager().uptime();
-
-    if let Some(args) = info.message() {
-        panic_println!(
-            "[  {:>3}.{:06}] Kernel panic: {}",
-            timestamp.as_secs(),
-            timestamp.subsec_micros(),
-            args,
-        );
-    } else {
-        panic_println!(
-            "[  {:>3}.{:06}] Kernel panic!",
-            timestamp.as_secs(),
-            timestamp.subsec_micros(),
-        );
-    }
+    let (location, line, column) = match info.location() {
+        Some(loc) => (loc.file(), loc.line(), loc.column()),
+        _ => ("???", 0, 0),
+    };
+
+    panic_println!(
+        "[  {:>3}.{:06}] Kernel panic!\n\n\
+        Panic location:\n      File '{}', line {}, column {}\n\n\
+        {}",
+        timestamp.as_secs(),
+        timestamp.subsec_micros(),
+        location,
+        line,
+        column,
+        info.message().unwrap_or(&format_args!("")),
+    );
 
     cpu::wait_forever()
 }
diff --git a/08_hw_debug_JTAG/src/panic_wait.rs b/08_hw_debug_JTAG/src/panic_wait.rs
index 3c57f562..f851e0d8 100644
--- a/08_hw_debug_JTAG/src/panic_wait.rs
+++ b/08_hw_debug_JTAG/src/panic_wait.rs
@@ -64,21 +64,22 @@ fn panic(info: &PanicInfo) -> ! {
     panic_prevent_reenter();
 
     let timestamp = crate::time::time_manager().uptime();
-
-    if let Some(args) = info.message() {
-        panic_println!(
-            "[  {:>3}.{:06}] Kernel panic: {}",
-            timestamp.as_secs(),
-            timestamp.subsec_micros(),
-            args,
-        );
-    } else {
-        panic_println!(
-            "[  {:>3}.{:06}] Kernel panic!",
-            timestamp.as_secs(),
-            timestamp.subsec_micros(),
-        );
-    }
+    let (location, line, column) = match info.location() {
+        Some(loc) => (loc.file(), loc.line(), loc.column()),
+        _ => ("???", 0, 0),
+    };
+
+    panic_println!(
+        "[  {:>3}.{:06}] Kernel panic!\n\n\
+        Panic location:\n      File '{}', line {}, column {}\n\n\
+        {}",
+        timestamp.as_secs(),
+        timestamp.subsec_micros(),
+        location,
+        line,
+        column,
+        info.message().unwrap_or(&format_args!("")),
+    );
 
     cpu::wait_forever()
 }
diff --git a/09_privilege_level/src/panic_wait.rs b/09_privilege_level/src/panic_wait.rs
index 3c57f562..f851e0d8 100644
--- a/09_privilege_level/src/panic_wait.rs
+++ b/09_privilege_level/src/panic_wait.rs
@@ -64,21 +64,22 @@ fn panic(info: &PanicInfo) -> ! {
     panic_prevent_reenter();
 
     let timestamp = crate::time::time_manager().uptime();
-
-    if let Some(args) = info.message() {
-        panic_println!(
-            "[  {:>3}.{:06}] Kernel panic: {}",
-            timestamp.as_secs(),
-            timestamp.subsec_micros(),
-            args,
-        );
-    } else {
-        panic_println!(
-            "[  {:>3}.{:06}] Kernel panic!",
-            timestamp.as_secs(),
-            timestamp.subsec_micros(),
-        );
-    }
+    let (location, line, column) = match info.location() {
+        Some(loc) => (loc.file(), loc.line(), loc.column()),
+        _ => ("???", 0, 0),
+    };
+
+    panic_println!(
+        "[  {:>3}.{:06}] Kernel panic!\n\n\
+        Panic location:\n      File '{}', line {}, column {}\n\n\
+        {}",
+        timestamp.as_secs(),
+        timestamp.subsec_micros(),
+        location,
+        line,
+        column,
+        info.message().unwrap_or(&format_args!("")),
+    );
 
     cpu::wait_forever()
 }
diff --git a/10_virtual_mem_part1_identity_mapping/src/panic_wait.rs b/10_virtual_mem_part1_identity_mapping/src/panic_wait.rs
index 3c57f562..f851e0d8 100644
--- a/10_virtual_mem_part1_identity_mapping/src/panic_wait.rs
+++ b/10_virtual_mem_part1_identity_mapping/src/panic_wait.rs
@@ -64,21 +64,22 @@ fn panic(info: &PanicInfo) -> ! {
     panic_prevent_reenter();
 
     let timestamp = crate::time::time_manager().uptime();
-
-    if let Some(args) = info.message() {
-        panic_println!(
-            "[  {:>3}.{:06}] Kernel panic: {}",
-            timestamp.as_secs(),
-            timestamp.subsec_micros(),
-            args,
-        );
-    } else {
-        panic_println!(
-            "[  {:>3}.{:06}] Kernel panic!",
-            timestamp.as_secs(),
-            timestamp.subsec_micros(),
-        );
-    }
+    let (location, line, column) = match info.location() {
+        Some(loc) => (loc.file(), loc.line(), loc.column()),
+        _ => ("???", 0, 0),
+    };
+
+    panic_println!(
+        "[  {:>3}.{:06}] Kernel panic!\n\n\
+        Panic location:\n      File '{}', line {}, column {}\n\n\
+        {}",
+        timestamp.as_secs(),
+        timestamp.subsec_micros(),
+        location,
+        line,
+        column,
+        info.message().unwrap_or(&format_args!("")),
+    );
 
     cpu::wait_forever()
 }
diff --git a/11_exceptions_part1_groundwork/README.md b/11_exceptions_part1_groundwork/README.md
index 8d18d616..4df5c939 100644
--- a/11_exceptions_part1_groundwork/README.md
+++ b/11_exceptions_part1_groundwork/README.md
@@ -313,7 +313,7 @@ for each exception yet, a default handler is provided:
 /// Prints verbose information about the exception and then panics.
 fn default_exception_handler(exc: &ExceptionContext) {
     panic!(
-        "\n\nCPU Exception!\n\
+        "CPU Exception!\n\n\
         {}",
         exc
     );
@@ -413,33 +413,37 @@ Minipush 1.0
 [MP] ⏩ Pushing 64 KiB =========================================🦀 100% 0 KiB/s Time: 00:00:00
 [ML] Loaded! Executing the payload now
 
-[    0.789853] mingo version 0.11.0
-[    0.790060] Booting on: Raspberry Pi 3
-[    0.790515] MMU online. Special regions:
-[    0.790992]       0x00080000 - 0x0008ffff |  64 KiB | C   RO PX  | Kernel code and RO data
-[    0.792010]       0x3f000000 - 0x4000ffff |  16 MiB | Dev RW PXN | Device MMIO
-[    0.792899] Current privilege level: EL1
-[    0.793375] Exception handling state:
-[    0.793819]       Debug:  Masked
-[    0.794209]       SError: Masked
-[    0.794599]       IRQ:    Masked
-[    0.794989]       FIQ:    Masked
-[    0.795379] Architectural timer resolution: 52 ns
-[    0.795954] Drivers loaded:
-[    0.796289]       1. BCM GPIO
-[    0.796647]       2. BCM PL011 UART
-[    0.797070] Timer test, spinning for 1 second
-[    1.797600]
-[    1.797604] Trying to read from address 8 GiB...
-[    1.798154] ************************************************
-[    1.798846] Whoa! We recovered from a synchronous exception!
-[    1.799539] ************************************************
-[    1.800233]
-[    1.800406] Let's try again
-[    1.800742] Trying to read from address 9 GiB...
-[    1.801306] Kernel panic:
+[    0.787414] mingo version 0.11.0
+[    0.787621] Booting on: Raspberry Pi 3
+[    0.788076] MMU online. Special regions:
+[    0.788553]       0x00080000 - 0x0008ffff |  64 KiB | C   RO PX  | Kernel code and RO data
+[    0.789571]       0x3f000000 - 0x4000ffff |  16 MiB | Dev RW PXN | Device MMIO
+[    0.790460] Current privilege level: EL1
+[    0.790936] Exception handling state:
+[    0.791380]       Debug:  Masked
+[    0.791770]       SError: Masked
+[    0.792160]       IRQ:    Masked
+[    0.792550]       FIQ:    Masked
+[    0.792940] Architectural timer resolution: 52 ns
+[    0.793514] Drivers loaded:
+[    0.793850]       1. BCM GPIO
+[    0.794208]       2. BCM PL011 UART
+[    0.794630] Timer test, spinning for 1 second
+[    1.795161]
+[    1.795165] Trying to read from address 8 GiB...
+[    1.795715] ************************************************
+[    1.796407] Whoa! We recovered from a synchronous exception!
+[    1.797100] ************************************************
+[    1.797794]
+[    1.797967] Let's try again
+[    1.798303] Trying to read from address 9 GiB...
+[    1.798867] Kernel panic!
+
+Panic location:
+      File 'src/_arch/aarch64/exception.rs', line 58, column 5
 
 CPU Exception!
+
 ESR_EL1: 0x96000004
       Exception Class         (EC) : 0x25 - Data Abort, current EL
       Instr Specific Syndrome (ISS): 0x4
@@ -459,21 +463,21 @@ SPSR_EL1: 0x600003c5
 ELR_EL1: 0x0000000000082194
 
 General purpose register:
-      x0 : 0x0000000000000000         x1 : 0x000000000008555f
-      x2 : 0x0000000000000027         x3 : 0x000000000008435c
-      x4 : 0x0000000000000006         x5 : 0x3f27329c00000000
-      x6 : 0x0000000000000000         x7 : 0xd3d1b900228f0241
-      x8 : 0x0000000240000000         x9 : 0x000000000008555f
+      x0 : 0x0000000000000000         x1 : 0x0000000000085517
+      x2 : 0x0000000000000027         x3 : 0x0000000000084380
+      x4 : 0x0000000000000006         x5 : 0xfb5f341800000000
+      x6 : 0x0000000000000000         x7 : 0x7f91bc012b2b0209
+      x8 : 0x0000000240000000         x9 : 0x0000000000085517
       x10: 0x0000000000000443         x11: 0x000000003f201000
       x12: 0x0000000000000019         x13: 0x00000000ffffd8f0
       x14: 0x000000000000147b         x15: 0x00000000ffffff9c
       x16: 0x000000000007fd38         x17: 0x0000000005f5e0ff
-      x18: 0x0000000000000034         x19: 0x0000000000090008
-      x20: 0x0000000000085398         x21: 0x000000003b9aca00
-      x22: 0x0000000000082e30         x23: 0x0000000000082308
+      x18: 0x0000000000000030         x19: 0x0000000000090008
+      x20: 0x0000000000085350         x21: 0x000000003b9aca00
+      x22: 0x0000000000082e4c         x23: 0x0000000000082308
       x24: 0x0000000010624dd3         x25: 0xffffffffc4653600
-      x26: 0x00000000000866b8         x27: 0x0000000000085458
-      x28: 0x0000000000084fe0         x29: 0x0000000000086770
+      x26: 0x0000000000086638         x27: 0x0000000000085410
+      x28: 0x0000000000084f90         x29: 0x0000000000086538
       lr : 0x0000000000082188
 ```
 
@@ -546,7 +550,7 @@ diff -uNr 10_virtual_mem_part1_identity_mapping/src/_arch/aarch64/exception.rs 1
 +/// Prints verbose information about the exception and then panics.
 +fn default_exception_handler(exc: &ExceptionContext) {
 +    panic!(
-+        "\n\nCPU Exception!\n\
++        "CPU Exception!\n\n\
 +        {}",
 +        exc
 +    );
diff --git a/11_exceptions_part1_groundwork/src/_arch/aarch64/exception.rs b/11_exceptions_part1_groundwork/src/_arch/aarch64/exception.rs
index f8178210..e8484938 100644
--- a/11_exceptions_part1_groundwork/src/_arch/aarch64/exception.rs
+++ b/11_exceptions_part1_groundwork/src/_arch/aarch64/exception.rs
@@ -56,7 +56,7 @@ struct ExceptionContext {
 /// Prints verbose information about the exception and then panics.
 fn default_exception_handler(exc: &ExceptionContext) {
     panic!(
-        "\n\nCPU Exception!\n\
+        "CPU Exception!\n\n\
         {}",
         exc
     );
diff --git a/11_exceptions_part1_groundwork/src/panic_wait.rs b/11_exceptions_part1_groundwork/src/panic_wait.rs
index 3c57f562..f851e0d8 100644
--- a/11_exceptions_part1_groundwork/src/panic_wait.rs
+++ b/11_exceptions_part1_groundwork/src/panic_wait.rs
@@ -64,21 +64,22 @@ fn panic(info: &PanicInfo) -> ! {
     panic_prevent_reenter();
 
     let timestamp = crate::time::time_manager().uptime();
-
-    if let Some(args) = info.message() {
-        panic_println!(
-            "[  {:>3}.{:06}] Kernel panic: {}",
-            timestamp.as_secs(),
-            timestamp.subsec_micros(),
-            args,
-        );
-    } else {
-        panic_println!(
-            "[  {:>3}.{:06}] Kernel panic!",
-            timestamp.as_secs(),
-            timestamp.subsec_micros(),
-        );
-    }
+    let (location, line, column) = match info.location() {
+        Some(loc) => (loc.file(), loc.line(), loc.column()),
+        _ => ("???", 0, 0),
+    };
+
+    panic_println!(
+        "[  {:>3}.{:06}] Kernel panic!\n\n\
+        Panic location:\n      File '{}', line {}, column {}\n\n\
+        {}",
+        timestamp.as_secs(),
+        timestamp.subsec_micros(),
+        location,
+        line,
+        column,
+        info.message().unwrap_or(&format_args!("")),
+    );
 
     cpu::wait_forever()
 }
diff --git a/12_integrated_testing/README.md b/12_integrated_testing/README.md
index 5de7c0ef..8a20a0d5 100644
--- a/12_integrated_testing/README.md
+++ b/12_integrated_testing/README.md
@@ -856,10 +856,14 @@ Compiling integration test(s) - rpi3
          🦀 Testing synchronous exception handling by causing a page fault
          -------------------------------------------------------------------
 
-         [    0.163030] Writing beyond mapped area to address 9 GiB...
-         [    0.164791] Kernel panic:
+         [    0.132792] Writing beyond mapped area to address 9 GiB...
+         [    0.134563] Kernel panic!
+
+         Panic location:
+               File 'src/_arch/aarch64/exception.rs', line 58, column 5
 
          CPU Exception!
+
          ESR_EL1: 0x96000004
                Exception Class         (EC) : 0x25 - Data Abort, current EL
          [...]
@@ -1753,9 +1757,9 @@ diff -uNr 11_exceptions_part1_groundwork/src/panic_wait.rs 12_integrated_testing
  }
 
  #[panic_handler]
-@@ -80,5 +97,5 @@
-         );
-     }
+@@ -81,5 +98,5 @@
+         info.message().unwrap_or(&format_args!("")),
+     );
 
 -    cpu::wait_forever()
 +    _panic_exit()
diff --git a/12_integrated_testing/src/_arch/aarch64/exception.rs b/12_integrated_testing/src/_arch/aarch64/exception.rs
index e15dc7a0..e84699e1 100644
--- a/12_integrated_testing/src/_arch/aarch64/exception.rs
+++ b/12_integrated_testing/src/_arch/aarch64/exception.rs
@@ -56,7 +56,7 @@ struct ExceptionContext {
 /// Prints verbose information about the exception and then panics.
 fn default_exception_handler(exc: &ExceptionContext) {
     panic!(
-        "\n\nCPU Exception!\n\
+        "CPU Exception!\n\n\
         {}",
         exc
     );
diff --git a/12_integrated_testing/src/panic_wait.rs b/12_integrated_testing/src/panic_wait.rs
index a1b090d7..6f09f11c 100644
--- a/12_integrated_testing/src/panic_wait.rs
+++ b/12_integrated_testing/src/panic_wait.rs
@@ -81,21 +81,22 @@ fn panic(info: &PanicInfo) -> ! {
     panic_prevent_reenter();
 
     let timestamp = crate::time::time_manager().uptime();
-
-    if let Some(args) = info.message() {
-        panic_println!(
-            "[  {:>3}.{:06}] Kernel panic: {}",
-            timestamp.as_secs(),
-            timestamp.subsec_micros(),
-            args,
-        );
-    } else {
-        panic_println!(
-            "[  {:>3}.{:06}] Kernel panic!",
-            timestamp.as_secs(),
-            timestamp.subsec_micros(),
-        );
-    }
+    let (location, line, column) = match info.location() {
+        Some(loc) => (loc.file(), loc.line(), loc.column()),
+        _ => ("???", 0, 0),
+    };
+
+    panic_println!(
+        "[  {:>3}.{:06}] Kernel panic!\n\n\
+        Panic location:\n      File '{}', line {}, column {}\n\n\
+        {}",
+        timestamp.as_secs(),
+        timestamp.subsec_micros(),
+        location,
+        line,
+        column,
+        info.message().unwrap_or(&format_args!("")),
+    );
 
     _panic_exit()
 }
diff --git a/13_exceptions_part2_peripheral_IRQs/src/_arch/aarch64/exception.rs b/13_exceptions_part2_peripheral_IRQs/src/_arch/aarch64/exception.rs
index 18441018..495dba34 100644
--- a/13_exceptions_part2_peripheral_IRQs/src/_arch/aarch64/exception.rs
+++ b/13_exceptions_part2_peripheral_IRQs/src/_arch/aarch64/exception.rs
@@ -57,7 +57,7 @@ struct ExceptionContext {
 /// Prints verbose information about the exception and then panics.
 fn default_exception_handler(exc: &ExceptionContext) {
     panic!(
-        "\n\nCPU Exception!\n\
+        "CPU Exception!\n\n\
         {}",
         exc
     );
diff --git a/13_exceptions_part2_peripheral_IRQs/src/panic_wait.rs b/13_exceptions_part2_peripheral_IRQs/src/panic_wait.rs
index 787bc7dc..08d7d453 100644
--- a/13_exceptions_part2_peripheral_IRQs/src/panic_wait.rs
+++ b/13_exceptions_part2_peripheral_IRQs/src/panic_wait.rs
@@ -83,21 +83,22 @@ fn panic(info: &PanicInfo) -> ! {
     panic_prevent_reenter();
 
     let timestamp = crate::time::time_manager().uptime();
-
-    if let Some(args) = info.message() {
-        panic_println!(
-            "[  {:>3}.{:06}] Kernel panic: {}",
-            timestamp.as_secs(),
-            timestamp.subsec_micros(),
-            args,
-        );
-    } else {
-        panic_println!(
-            "[  {:>3}.{:06}] Kernel panic!",
-            timestamp.as_secs(),
-            timestamp.subsec_micros(),
-        );
-    }
+    let (location, line, column) = match info.location() {
+        Some(loc) => (loc.file(), loc.line(), loc.column()),
+        _ => ("???", 0, 0),
+    };
+
+    panic_println!(
+        "[  {:>3}.{:06}] Kernel panic!\n\n\
+        Panic location:\n      File '{}', line {}, column {}\n\n\
+        {}",
+        timestamp.as_secs(),
+        timestamp.subsec_micros(),
+        location,
+        line,
+        column,
+        info.message().unwrap_or(&format_args!("")),
+    );
 
     _panic_exit()
 }
diff --git a/14_virtual_mem_part2_mmio_remap/src/_arch/aarch64/exception.rs b/14_virtual_mem_part2_mmio_remap/src/_arch/aarch64/exception.rs
index 18441018..495dba34 100644
--- a/14_virtual_mem_part2_mmio_remap/src/_arch/aarch64/exception.rs
+++ b/14_virtual_mem_part2_mmio_remap/src/_arch/aarch64/exception.rs
@@ -57,7 +57,7 @@ struct ExceptionContext {
 /// Prints verbose information about the exception and then panics.
 fn default_exception_handler(exc: &ExceptionContext) {
     panic!(
-        "\n\nCPU Exception!\n\
+        "CPU Exception!\n\n\
         {}",
         exc
     );
diff --git a/14_virtual_mem_part2_mmio_remap/src/panic_wait.rs b/14_virtual_mem_part2_mmio_remap/src/panic_wait.rs
index 787bc7dc..08d7d453 100644
--- a/14_virtual_mem_part2_mmio_remap/src/panic_wait.rs
+++ b/14_virtual_mem_part2_mmio_remap/src/panic_wait.rs
@@ -83,21 +83,22 @@ fn panic(info: &PanicInfo) -> ! {
     panic_prevent_reenter();
 
     let timestamp = crate::time::time_manager().uptime();
-
-    if let Some(args) = info.message() {
-        panic_println!(
-            "[  {:>3}.{:06}] Kernel panic: {}",
-            timestamp.as_secs(),
-            timestamp.subsec_micros(),
-            args,
-        );
-    } else {
-        panic_println!(
-            "[  {:>3}.{:06}] Kernel panic!",
-            timestamp.as_secs(),
-            timestamp.subsec_micros(),
-        );
-    }
+    let (location, line, column) = match info.location() {
+        Some(loc) => (loc.file(), loc.line(), loc.column()),
+        _ => ("???", 0, 0),
+    };
+
+    panic_println!(
+        "[  {:>3}.{:06}] Kernel panic!\n\n\
+        Panic location:\n      File '{}', line {}, column {}\n\n\
+        {}",
+        timestamp.as_secs(),
+        timestamp.subsec_micros(),
+        location,
+        line,
+        column,
+        info.message().unwrap_or(&format_args!("")),
+    );
 
     _panic_exit()
 }
diff --git a/15_virtual_mem_part3_precomputed_tables/src/_arch/aarch64/exception.rs b/15_virtual_mem_part3_precomputed_tables/src/_arch/aarch64/exception.rs
index 18441018..495dba34 100644
--- a/15_virtual_mem_part3_precomputed_tables/src/_arch/aarch64/exception.rs
+++ b/15_virtual_mem_part3_precomputed_tables/src/_arch/aarch64/exception.rs
@@ -57,7 +57,7 @@ struct ExceptionContext {
 /// Prints verbose information about the exception and then panics.
 fn default_exception_handler(exc: &ExceptionContext) {
     panic!(
-        "\n\nCPU Exception!\n\
+        "CPU Exception!\n\n\
         {}",
         exc
     );
diff --git a/15_virtual_mem_part3_precomputed_tables/src/panic_wait.rs b/15_virtual_mem_part3_precomputed_tables/src/panic_wait.rs
index 787bc7dc..08d7d453 100644
--- a/15_virtual_mem_part3_precomputed_tables/src/panic_wait.rs
+++ b/15_virtual_mem_part3_precomputed_tables/src/panic_wait.rs
@@ -83,21 +83,22 @@ fn panic(info: &PanicInfo) -> ! {
     panic_prevent_reenter();
 
     let timestamp = crate::time::time_manager().uptime();
-
-    if let Some(args) = info.message() {
-        panic_println!(
-            "[  {:>3}.{:06}] Kernel panic: {}",
-            timestamp.as_secs(),
-            timestamp.subsec_micros(),
-            args,
-        );
-    } else {
-        panic_println!(
-            "[  {:>3}.{:06}] Kernel panic!",
-            timestamp.as_secs(),
-            timestamp.subsec_micros(),
-        );
-    }
+    let (location, line, column) = match info.location() {
+        Some(loc) => (loc.file(), loc.line(), loc.column()),
+        _ => ("???", 0, 0),
+    };
+
+    panic_println!(
+        "[  {:>3}.{:06}] Kernel panic!\n\n\
+        Panic location:\n      File '{}', line {}, column {}\n\n\
+        {}",
+        timestamp.as_secs(),
+        timestamp.subsec_micros(),
+        location,
+        line,
+        column,
+        info.message().unwrap_or(&format_args!("")),
+    );
 
     _panic_exit()
 }
diff --git a/16_virtual_mem_part4_higher_half_kernel/src/_arch/aarch64/exception.rs b/16_virtual_mem_part4_higher_half_kernel/src/_arch/aarch64/exception.rs
index 18441018..495dba34 100644
--- a/16_virtual_mem_part4_higher_half_kernel/src/_arch/aarch64/exception.rs
+++ b/16_virtual_mem_part4_higher_half_kernel/src/_arch/aarch64/exception.rs
@@ -57,7 +57,7 @@ struct ExceptionContext {
 /// Prints verbose information about the exception and then panics.
 fn default_exception_handler(exc: &ExceptionContext) {
     panic!(
-        "\n\nCPU Exception!\n\
+        "CPU Exception!\n\n\
         {}",
         exc
     );
diff --git a/16_virtual_mem_part4_higher_half_kernel/src/panic_wait.rs b/16_virtual_mem_part4_higher_half_kernel/src/panic_wait.rs
index 787bc7dc..08d7d453 100644
--- a/16_virtual_mem_part4_higher_half_kernel/src/panic_wait.rs
+++ b/16_virtual_mem_part4_higher_half_kernel/src/panic_wait.rs
@@ -83,21 +83,22 @@ fn panic(info: &PanicInfo) -> ! {
     panic_prevent_reenter();
 
     let timestamp = crate::time::time_manager().uptime();
-
-    if let Some(args) = info.message() {
-        panic_println!(
-            "[  {:>3}.{:06}] Kernel panic: {}",
-            timestamp.as_secs(),
-            timestamp.subsec_micros(),
-            args,
-        );
-    } else {
-        panic_println!(
-            "[  {:>3}.{:06}] Kernel panic!",
-            timestamp.as_secs(),
-            timestamp.subsec_micros(),
-        );
-    }
+    let (location, line, column) = match info.location() {
+        Some(loc) => (loc.file(), loc.line(), loc.column()),
+        _ => ("???", 0, 0),
+    };
+
+    panic_println!(
+        "[  {:>3}.{:06}] Kernel panic!\n\n\
+        Panic location:\n      File '{}', line {}, column {}\n\n\
+        {}",
+        timestamp.as_secs(),
+        timestamp.subsec_micros(),
+        location,
+        line,
+        column,
+        info.message().unwrap_or(&format_args!("")),
+    );
 
     _panic_exit()
 }
diff --git a/X1_JTAG_boot/jtag_boot_rpi3.img b/X1_JTAG_boot/jtag_boot_rpi3.img
index 9fcd693ec7b0fc4bda4a744f682aa366843ed900..14b22a47c71443e49155f7e5c782e9f24bb121bc 100755
GIT binary patch
delta 2334
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
E4}iOyB>(^b

delta 2508
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

diff --git a/X1_JTAG_boot/jtag_boot_rpi4.img b/X1_JTAG_boot/jtag_boot_rpi4.img
index fb16a02b18124c41465c5d4ffafac9455f46d64c..8622b9be7170b4557239565e64e74a6903bee4cd 100755
GIT binary patch
delta 1815
zcmah|Z)_7~7=PZo7Vf%#u(oT<u)S?;Yk_SJWD5I0w+4YJG7H2-6St+JG>lFLh7Wvb
zbw-dZ+Shjp36ePeBzQF@kbzlAl;Mn-iHQ;zUo`PLK5&JZKtQ${xAVE{)u7S%CYRsy
zyzle(_dNIGy1AC5#|Dj*0GzK1Hqx4PT}Lc1EP-@G8?;`VKfF}_{f%;YuG=m@ddVR_
z-0qYGG!;o~eH7rSZi%1LG|d%&L|7z^>wnqEPx+PBDG|RwDO`NOL(0AAov{0xD+8=+
zi9f!6{<-Vo_<Lb_Xl!6Zjad0I55o`9XqJQF-w+@1B&G0<)Ew%wJgn5^2m0G9AS>Nm
zAh!{6doI5p-co#eU`zbdkA?Zyud7EOt?>5LCXA&QC$xE~8W&|PZj;q`k?aGwuZB1(
zkVO21x*2lnEkZ?rWT4kZ)pJDeC@Gv;OS5*4X3ubPmIrFXKpp!<n*EHIvmwBHi=5q|
zqg7UGINkqz;DU($i{zu&y?`Bx_czjPyja%uLQW*X^f5~!yw&MgD-uYHkP3^LIHZNa
zSI3TmyTymp>GGuJd)miC+UJ7w9z9UVHzsh1gNUVw6TUHj4<g#AJfBb8=EB4!@*Uk?
z@0fV#cPQUEQ!1+wy~r{-djxXER1?)yiSTrKkf$ZBNaYB?y29KtBtL7wAaJ&ha)|BY
z4$31&Mw~Q*P7l#X-v@S*uOmJ-TSD1R%jF6$4d^`Ae<dr6iL4-Hc1=6ZR#?NtJ9^0a
zq19PO13cC=0dy7CHiXty<F%}^XcyVf_7^3&kZqJNo+56+5=4I?HO_b6geAeWfsSCB
z-6*LhzR}r|X0km#uN_~g4CXYRP~%+)<_s*(qc%aV?Xf1pIJTrdzK#oiT8y$%1IEH;
ziimtS1a#=Wp9)vKtiP<bbqB`O8&h%TGPrvR&!wiZ4p`7!lGH96?DbUB(^x%U63q30
z@1{Z2#R~RAnUi&L_b$BlJy~@UU>I$aRXWqRfKFrnriFjhi|-JuVVn6~i;Q*qoZTr~
zxdSP40R(f8<~5hbbJrGHA%`iF(9=LGkxn3R$<PxG^d{;Gz@^)W5~kEkH$q)qq0h@<
z$fTCtDz7WY#Z~JqvWk`HjC5rDtkUikMgmj`0eyzG*|${S^3Mzc{dE-ROcTg=HSONs
zQ)}5L_6pnE4F-8bnU(B{y^cGziruzX2le*O5IQ{p^c+$*^4K07HmNjf&F@jNy{BHU
zD;bgeG=n}LjBa%-Ce>(SoIgsj;KvR!Xq?GXcFg7FI-M-#S`n|Z**be;(TLR7AL%_9
z?T>A+Nyd3L+P7P(Zx3ygHg|5_UcXxEi^g_KtEEVP-&^})lFf#F8z-?Wp9f1Z&Y-Cm
z@+F-4_XhL*lBpZFwRriZd4YetalSQm{8x-K>0}-5F9^@5+r<>OL@a+v)`GNVx#i!x
zmCXC3>+kO^%h=b>pW>LHz*FJ9fKZl~W=uT0G_UKFbUy!NbF;LoExhx;{S}k{dnOk0
zxXrfoXpOr3vl)2C#IDMGBE_A@9#a=QtlU-iM5iZz?J?tQLiCz4ux+m8A9<RZ3&{%i
zg<(vZ#T*!jG`%?xjU8+pIH23iv0hKp8p#}8h3VE}>V-+@Ui*5ZG1CdUkVMZ5f&bfp
Qcg-+s*o*E%?EEt6Pkr6|SO5S3

delta 1821
zcmb7ET}+!*7=F+975Xz)5NJyaqb=pH?X)7om`k=6H2gUs4P2P0gCIJ<kXcCdMq6Am
zMRE4zEa8G=A=}M97Lz7r5j5Gl;Dx)HER$tX6I*uE!j?=i(I$h>_xtHU6SM3jU*Ged
z^Zq^0`=0*YyxJ7C8vI^L0AkLFm%5sCR0HQ6;P@$?E?gy!&rp*u{U(~c2XvhW+Q-4U
zopOIx<OyYuj1RSd-T-EH@0orU<!Xr~{teen%x3Bim}$E1s*uzYA&H&|^kik4ATh_s
zG+*VJ4p28A32v+a^+F^#gVxSu1uHc4lNL5?h;kFg_+N%K!qNqm7*xBzfwZ657H4zG
z6a0xgpz~)XDXx%PC-Wjf13)x`sk%}JX#wt&E)aBBUuqu_Hrs&CIG?4u>t^<;v4*_C
zzBXEp>UTto!_g|pFb8b(0+zz>_h$#den&<&X`_Thf>M?wZ(m5^C+(%Ey4Ts!V$aL#
zqG$o|XK!LCafQ3J(+$}_dkj+Is6H@ucm&|Z6Ape&L_0Tz*9W|Ze>=vn)hCav>G8`H
z!6J>-ha0!MZ|f6hg2K#FXtGLQz95RTel0AX{B}CnQE(wN{qdzaUH&IQ-S^i*TQ11D
zx8J#)IR?uaQGDp7M!JC=NqRxZYysWCv*6$%x>-jAi4cjHu0f!G)N#T_Ib^4$Ixvps
z_hV?Q5kwz^vmWAK{z4N8j+#mvJp`5wun_d5U|B!)*3vYTHQNz{w7((R583hFZi3|z
z8IXO+z#;onD2*tu+m}28DA6YEA~f9tS&0nYpo4yn_WN)@Ht3{jZ@#d31hS0)rMmpE
zf@}oQcFJglIT<032oafts0&eME+axjB<qMUbD0Qx(QJ7UO*l_@YB1raMKfi`@y?gq
ztRrsPiOAB3ChY>6xu_K~?U2Q(iaMpoGsMyL(}W)15ohNCnsVddL|uArIBC&$0jep7
zo7Thu%A*{bucRq-^5PswMk0^1g$X2MNO)*Bo&$j^vYzzNnn&Vn65vXQY_Ggynf6q<
z6t7g?J1f|C#kDO?z}huJIyV}DTGaD|4#cqGB1j;IBomr(@zTqPI-!mx+kn2$tR)@I
z*oFJ2fj)=>z3&5I6FW18op|6QLgz;}<_tK)3pm4an^PY7A<hKq*=$KIN8IdMNtIus
z<RYQ#D?pR@r04fgvWR+)l3hls6-FX8G=)A_<IYko2@e25!lnG~%05mxd0V}yQ1#Zf
z<Br}}pKoYz^ap}{0QGq}PdN;7sjP$QdDQgp`?FR>$0kXO{b;!vmSVQ|cJ`qDf93p8
zsJPu#WzMclj<Q>}pI7X9RT;A>`X#d>msEXK)h9wjKGtWgFqK&p1FIVF6_l0iOKXKw
zJ;-HL)yF_%g{;d|$we(})KndQ$?>M6dpI;c{GQ{~;P}Xp({NV>jMF2pUsOFu)T)}e
zNWI5@8F@X)FYzD0qA~=aL07_3whvg$+`<H_?}f*Vs$uuktpJu7I29ThpL{MfA=&gY
jz0Ftrp<1O`bvtWiUA9UtW@V$c*Q%aW+pkvkv+evp0d)z^

diff --git a/X1_JTAG_boot/src/panic_wait.rs b/X1_JTAG_boot/src/panic_wait.rs
index 3c57f562..f851e0d8 100644
--- a/X1_JTAG_boot/src/panic_wait.rs
+++ b/X1_JTAG_boot/src/panic_wait.rs
@@ -64,21 +64,22 @@ fn panic(info: &PanicInfo) -> ! {
     panic_prevent_reenter();
 
     let timestamp = crate::time::time_manager().uptime();
-
-    if let Some(args) = info.message() {
-        panic_println!(
-            "[  {:>3}.{:06}] Kernel panic: {}",
-            timestamp.as_secs(),
-            timestamp.subsec_micros(),
-            args,
-        );
-    } else {
-        panic_println!(
-            "[  {:>3}.{:06}] Kernel panic!",
-            timestamp.as_secs(),
-            timestamp.subsec_micros(),
-        );
-    }
+    let (location, line, column) = match info.location() {
+        Some(loc) => (loc.file(), loc.line(), loc.column()),
+        _ => ("???", 0, 0),
+    };
+
+    panic_println!(
+        "[  {:>3}.{:06}] Kernel panic!\n\n\
+        Panic location:\n      File '{}', line {}, column {}\n\n\
+        {}",
+        timestamp.as_secs(),
+        timestamp.subsec_micros(),
+        location,
+        line,
+        column,
+        info.message().unwrap_or(&format_args!("")),
+    );
 
     cpu::wait_forever()
 }