diff --git a/12_exceptions_part1_groundwork/README.md b/12_exceptions_part1_groundwork/README.md index abe6d1c4..ccc80aaa 100644 --- a/12_exceptions_part1_groundwork/README.md +++ b/12_exceptions_part1_groundwork/README.md @@ -883,6 +883,22 @@ diff -uNr 11_virtual_memory/src/_arch/aarch64/exception.S 12_exceptions_part1_gr + + eret +diff -uNr 11_virtual_memory/src/bsp/raspberrypi/link.ld 12_exceptions_part1_groundwork/src/bsp/raspberrypi/link.ld +--- 11_virtual_memory/src/bsp/raspberrypi/link.ld ++++ 12_exceptions_part1_groundwork/src/bsp/raspberrypi/link.ld +@@ -14,6 +14,11 @@ + *(.text._start) *(.text*) + } + ++ .exception_vectors : ++ { ++ *(.exception_vectors*) ++ } ++ + .rodata : + { + *(.rodata*) + diff -uNr 11_virtual_memory/src/bsp/raspberrypi/memory/mmu.rs 12_exceptions_part1_groundwork/src/bsp/raspberrypi/memory/mmu.rs --- 11_virtual_memory/src/bsp/raspberrypi/memory/mmu.rs +++ 12_exceptions_part1_groundwork/src/bsp/raspberrypi/memory/mmu.rs diff --git a/12_exceptions_part1_groundwork/src/bsp/raspberrypi/link.ld b/12_exceptions_part1_groundwork/src/bsp/raspberrypi/link.ld index fac86cda..8923b960 100644 --- a/12_exceptions_part1_groundwork/src/bsp/raspberrypi/link.ld +++ b/12_exceptions_part1_groundwork/src/bsp/raspberrypi/link.ld @@ -14,6 +14,11 @@ SECTIONS *(.text._start) *(.text*) } + .exception_vectors : + { + *(.exception_vectors*) + } + .rodata : { *(.rodata*) diff --git a/13_integrated_testing/src/bsp/raspberrypi/link.ld b/13_integrated_testing/src/bsp/raspberrypi/link.ld index fac86cda..8923b960 100644 --- a/13_integrated_testing/src/bsp/raspberrypi/link.ld +++ b/13_integrated_testing/src/bsp/raspberrypi/link.ld @@ -14,6 +14,11 @@ SECTIONS *(.text._start) *(.text*) } + .exception_vectors : + { + *(.exception_vectors*) + } + .rodata : { *(.rodata*) diff --git a/14_exceptions_part2_peripheral_IRQs/src/bsp/raspberrypi/link.ld b/14_exceptions_part2_peripheral_IRQs/src/bsp/raspberrypi/link.ld index fac86cda..8923b960 100644 --- a/14_exceptions_part2_peripheral_IRQs/src/bsp/raspberrypi/link.ld +++ b/14_exceptions_part2_peripheral_IRQs/src/bsp/raspberrypi/link.ld @@ -14,6 +14,11 @@ SECTIONS *(.text._start) *(.text*) } + .exception_vectors : + { + *(.exception_vectors*) + } + .rodata : { *(.rodata*)