From b48a89faf01d8e0ec8812346d89c90981cd8f9bb Mon Sep 17 00:00:00 2001 From: Andre Richter Date: Mon, 27 Jun 2022 10:38:04 +0200 Subject: [PATCH] Bump dependencies --- 02_runtime_init/Cargo.lock | 4 +-- 03_hacky_hello_world/Cargo.lock | 4 +-- 04_safe_globals/Cargo.lock | 4 +-- 05_drivers_gpio_uart/Cargo.lock | 4 +-- 06_uart_chainloader/Cargo.lock | 4 +-- 06_uart_chainloader/demo_payload_rpi3.img | Bin 7728 -> 7736 bytes 06_uart_chainloader/demo_payload_rpi4.img | Bin 7664 -> 7672 bytes 07_timestamps/Cargo.lock | 4 +-- 08_hw_debug_JTAG/Cargo.lock | 4 +-- 09_privilege_level/Cargo.lock | 4 +-- .../Cargo.lock | 4 +-- 11_exceptions_part1_groundwork/Cargo.lock | 4 +-- 12_integrated_testing/Cargo.lock | 20 +++++++-------- .../Cargo.lock | 20 +++++++-------- 14_virtual_mem_part2_mmio_remap/Cargo.lock | 20 +++++++-------- .../Cargo.lock | 20 +++++++-------- .../Cargo.lock | 20 +++++++-------- 17_kernel_symbols/Cargo.lock | 20 +++++++-------- 18_backtrace/Cargo.lock | 20 +++++++-------- 19_kernel_heap/Cargo.lock | 24 +++++++++--------- 19_kernel_heap/README.md | 8 +++--- 19_kernel_heap/kernel/Cargo.toml | 2 +- .../kernel/src/memory/heap_alloc.rs | 6 ++--- X1_JTAG_boot/Cargo.lock | 4 +-- X1_JTAG_boot/jtag_boot_rpi3.img | Bin 8792 -> 8792 bytes X1_JTAG_boot/jtag_boot_rpi4.img | Bin 7704 -> 7712 bytes 26 files changed, 112 insertions(+), 112 deletions(-) diff --git a/02_runtime_init/Cargo.lock b/02_runtime_init/Cargo.lock index 648c82ba..d164c36b 100644 --- a/02_runtime_init/Cargo.lock +++ b/02_runtime_init/Cargo.lock @@ -4,9 +4,9 @@ version = 3 [[package]] name = "cortex-a" -version = "7.3.0" +version = "7.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "342880ec3cd4f86ab0b7c42c7f51b0ff104de4311a53e01b97388971bb5b42a2" +checksum = "f75db6964ed6748e88ff46f9aa209249a0aefe6b06d4b9e9ab820c867586d51a" dependencies = [ "tock-registers", ] diff --git a/03_hacky_hello_world/Cargo.lock b/03_hacky_hello_world/Cargo.lock index dfb1e441..0609efb6 100644 --- a/03_hacky_hello_world/Cargo.lock +++ b/03_hacky_hello_world/Cargo.lock @@ -4,9 +4,9 @@ version = 3 [[package]] name = "cortex-a" -version = "7.3.0" +version = "7.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "342880ec3cd4f86ab0b7c42c7f51b0ff104de4311a53e01b97388971bb5b42a2" +checksum = "f75db6964ed6748e88ff46f9aa209249a0aefe6b06d4b9e9ab820c867586d51a" dependencies = [ "tock-registers", ] diff --git a/04_safe_globals/Cargo.lock b/04_safe_globals/Cargo.lock index a8102471..d5be2861 100644 --- a/04_safe_globals/Cargo.lock +++ b/04_safe_globals/Cargo.lock @@ -4,9 +4,9 @@ version = 3 [[package]] name = "cortex-a" -version = "7.3.0" +version = "7.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "342880ec3cd4f86ab0b7c42c7f51b0ff104de4311a53e01b97388971bb5b42a2" +checksum = "f75db6964ed6748e88ff46f9aa209249a0aefe6b06d4b9e9ab820c867586d51a" dependencies = [ "tock-registers", ] diff --git a/05_drivers_gpio_uart/Cargo.lock b/05_drivers_gpio_uart/Cargo.lock index d8521864..9958f13c 100644 --- a/05_drivers_gpio_uart/Cargo.lock +++ b/05_drivers_gpio_uart/Cargo.lock @@ -4,9 +4,9 @@ version = 3 [[package]] name = "cortex-a" -version = "7.3.0" +version = "7.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "342880ec3cd4f86ab0b7c42c7f51b0ff104de4311a53e01b97388971bb5b42a2" +checksum = "f75db6964ed6748e88ff46f9aa209249a0aefe6b06d4b9e9ab820c867586d51a" dependencies = [ "tock-registers", ] diff --git a/06_uart_chainloader/Cargo.lock b/06_uart_chainloader/Cargo.lock index 0c2a9aca..e0cea178 100644 --- a/06_uart_chainloader/Cargo.lock +++ b/06_uart_chainloader/Cargo.lock @@ -4,9 +4,9 @@ version = 3 [[package]] name = "cortex-a" -version = "7.3.0" +version = "7.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "342880ec3cd4f86ab0b7c42c7f51b0ff104de4311a53e01b97388971bb5b42a2" +checksum = "f75db6964ed6748e88ff46f9aa209249a0aefe6b06d4b9e9ab820c867586d51a" dependencies = [ "tock-registers", ] diff --git a/06_uart_chainloader/demo_payload_rpi3.img b/06_uart_chainloader/demo_payload_rpi3.img index 75bf414ecc24836e41b9a216a9670b10068fce17..c0f226a7df2660c157a6e1360a4de8143631c965 100755 GIT binary patch delta 1448 zcmZ8gT}&KR6h3!`g;@$@*k9OXVYXYL!?p_*7Feud0UNLli6O>Xi2<4tp(-S+X{x5# z-TKhR)`pu~gK3Ouqluk;XfPYp>I*&+eXxmA-yGT()(5JAu8su8bBCc4PjYkbIrsd0 z-?`_`AN}U&Y>hMdC&&$o_)C_Cdj!St=EfeQhOkhoGwba715bnGfn@V zYdj{6AGZIqNdU7~N;1RF$^oO>uGCtz+LA*nPI7tt@-=dys!2&c_%Ri&_0S_ zOw6bv`gIX7k4HfJ2z6e$ z9G8UMIo?~rqJCAlrLvd&jr9kMrd((O!->~sx?EFxV|4X|L*pS*mfi3N(wS{@ZVVv4 zi%9Pm=$n{T0p({TIZH@p7=AoV7sb(KU2MQ!H01c1_rer~d)v=|!Tli9MQ?AKb3kB$ zw^|tvK_s*g5w%B~>|1yAaQJDu&{sh@GdC`^_Xx$&nO(gPR{UfK$ZuWjqD35& zu+Chb=5!-6RooEgBsj<+$eh%RHL z(8&otA=lf%d%5Nf2>C5m?u(FG7W4H~)(#l2hro5!0rXHUd)F6}F7Q_4W9QG;yi8nr z5L>=Sib3|Ew!k8xW6?!E11LY)yHdZS{~FlYYiu2Y61!4&A`LKTCyUw%-?R1I67SnO z0=MLO3kE{H)h7qOijP0oJmccn@Dvl-O4U#d|gY5JP+Fn1cjP9 z76?WT;Fn9?22BRr+RT-sU)Frn{AS z`(C!=hS>MPri5-=J+@V`B&JBA9bTojy~@^~@MhtS$u2oh`*-rLt<-nK`q4MEaZUX93@RXRcw4Hw*atJNML?`t= zGFO4XI#1(22kHw1Rt$jkdfWp5D}M0b;kL!IpvnMF1>=;!2^MmN)Bt@T12sxZbnY?P z!^T{is~c2vLDI89qGx47vq4#Z^$}ZgH8!Q2=z4#EIxs^Ot}tn$$jWl&E?Du?J)pib z)k*h}fxrg4=ZY+Rnm1SdRnX3hZjtzivKO)XO*epQ+$Z!N7T7;0>zpv2_7sv9-fX5j zy^u2(?05;AMdWUOF1fGEo8@MYGi$;f=8$G>;U@v){BJak0GCd)PIUd&38npV)yu>te(1X5}x8 z=5Ni`s*X%;zSlJa&^C^*YMQ1N#v(g1BpjQaT?YE?;`uV}d$=32GqEp|#60SM%MjuE z`*=3Sr7)*!Zxr-x)cF&Z;Zktchx-Do#u=8d=AqYac}F&*C>n^6#VB(CL6jpP4GEcd}r6HQ6%iP(2Jek5&DyA nLdWrDzj#hIM%{(TnAqL51--#n*j1sQ@hR*x-)khpNNvZzhhUAB diff --git a/06_uart_chainloader/demo_payload_rpi4.img b/06_uart_chainloader/demo_payload_rpi4.img index 0d66373c74c01beda4fb6de40142a3d3d7adbbe5..82f75d6aef373994ecde6e7c8236afcbe19e5107 100755 GIT binary patch delta 747 zcmYjOPiWI{82$ayWwcT;Ym-KkcFitpt+O4iGi{2nDw`-cN4JZ3=*lKrhg%_qDF~wz zDFZz;euCn`;judiV<`0EpM#=1h?hB!dg~5DVV4F5HEF-1-zo3C@8!LG`IBy@t0!Hf zzX=yq9J^~<1H&xMK$e}Qne8|1JGU#JFl=RU8dg31%&%#9;o0EIs=*(%o)Su4+u{sd z^U5dIuM*Bd2=64M>KsVG9q$MeNx~~{Kl3sPU%m0DQ|rX+Hd|a{kJM~$*y0*{wC1&3 zrTeOJC==7>8|NX)PcRJ?R(b9CXO(cLNjYmPEAWxeF{u$46fV*yP!Mv=l{oAO8WWB~ zukSK7VZwLGWsaMVSYiyB@Z6^{$`E|_1%-ogGs2G6ANG{9ivpjBu%zxhfMa4zqIXjT zLeAx^fL5y|9y-XT9q6J-m=Z5A&L}(I!Se{qr^uo$5T~jory$Mps<3nE!F@w0I&&HPWh2^MTYBS#?$jXDMCa(41 z+7V(G;tE!wh?lJBqV=4FEm@?K@I?;xEy$f{uIm9)4yB$U%Ok6_C#t+hz8CpVh`U8A zaKj(!Ya(m?!uC|a@Q3Iy)cr-}Cw5x!cXEFqt|A7I&QbzzrMM7A$&IhED~4e#kj`{( YdVX#fBK delta 768 zcmYjOPiWI%6#tSgBhe1CHf^-&pY&q2y0+-L+SI{Tan3_~s9t19t=m{D+X^Xc7l}Jg z^sxF4f(JKmT@Qi`g`V6Fg7YA|Z0k{P?L~x9SV4$M^NK$B`11Snc)$1MH1#{Rah}`# zMfiYhJET4YV+<9995YJ=cRn$n?OY~YHI;B0G>4ylmxi~FP5x1$D*Vx36N-E^MHw(!~^Lf-*FnBK&2tmNS(x_#))##tpdWN>lftZ_@J!S&+v#75d_mFXBVh?3`Wgc`7mn@=Z06mL{Im8;SKp|c-B9)Er8ca$ewF?iV zz;F|L%=~6)@LUQdS+A8=ut*~JDk8^_A4Gl(aeoU9+EQq^h^+DJd!<3p8=|)0uD9%K oVx}f~4*Jh*-jMO7Ci@S61-lQ>X(b}0f*t)WpCbO3Vc!@13kdL_Qvd(} diff --git a/07_timestamps/Cargo.lock b/07_timestamps/Cargo.lock index c85a8846..fcc1ddd2 100644 --- a/07_timestamps/Cargo.lock +++ b/07_timestamps/Cargo.lock @@ -4,9 +4,9 @@ version = 3 [[package]] name = "cortex-a" -version = "7.3.0" +version = "7.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "342880ec3cd4f86ab0b7c42c7f51b0ff104de4311a53e01b97388971bb5b42a2" +checksum = "f75db6964ed6748e88ff46f9aa209249a0aefe6b06d4b9e9ab820c867586d51a" dependencies = [ "tock-registers", ] diff --git a/08_hw_debug_JTAG/Cargo.lock b/08_hw_debug_JTAG/Cargo.lock index dfe5e8e3..7c8e75a8 100644 --- a/08_hw_debug_JTAG/Cargo.lock +++ b/08_hw_debug_JTAG/Cargo.lock @@ -4,9 +4,9 @@ version = 3 [[package]] name = "cortex-a" -version = "7.3.0" +version = "7.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "342880ec3cd4f86ab0b7c42c7f51b0ff104de4311a53e01b97388971bb5b42a2" +checksum = "f75db6964ed6748e88ff46f9aa209249a0aefe6b06d4b9e9ab820c867586d51a" dependencies = [ "tock-registers", ] diff --git a/09_privilege_level/Cargo.lock b/09_privilege_level/Cargo.lock index 76f33c94..0f3104f5 100644 --- a/09_privilege_level/Cargo.lock +++ b/09_privilege_level/Cargo.lock @@ -4,9 +4,9 @@ version = 3 [[package]] name = "cortex-a" -version = "7.3.0" +version = "7.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "342880ec3cd4f86ab0b7c42c7f51b0ff104de4311a53e01b97388971bb5b42a2" +checksum = "f75db6964ed6748e88ff46f9aa209249a0aefe6b06d4b9e9ab820c867586d51a" dependencies = [ "tock-registers", ] diff --git a/10_virtual_mem_part1_identity_mapping/Cargo.lock b/10_virtual_mem_part1_identity_mapping/Cargo.lock index c93cf0e1..544f7715 100644 --- a/10_virtual_mem_part1_identity_mapping/Cargo.lock +++ b/10_virtual_mem_part1_identity_mapping/Cargo.lock @@ -4,9 +4,9 @@ version = 3 [[package]] name = "cortex-a" -version = "7.3.0" +version = "7.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "342880ec3cd4f86ab0b7c42c7f51b0ff104de4311a53e01b97388971bb5b42a2" +checksum = "f75db6964ed6748e88ff46f9aa209249a0aefe6b06d4b9e9ab820c867586d51a" dependencies = [ "tock-registers", ] diff --git a/11_exceptions_part1_groundwork/Cargo.lock b/11_exceptions_part1_groundwork/Cargo.lock index 7fe1386d..285a75b0 100644 --- a/11_exceptions_part1_groundwork/Cargo.lock +++ b/11_exceptions_part1_groundwork/Cargo.lock @@ -4,9 +4,9 @@ version = 3 [[package]] name = "cortex-a" -version = "7.3.0" +version = "7.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "342880ec3cd4f86ab0b7c42c7f51b0ff104de4311a53e01b97388971bb5b42a2" +checksum = "f75db6964ed6748e88ff46f9aa209249a0aefe6b06d4b9e9ab820c867586d51a" dependencies = [ "tock-registers", ] diff --git a/12_integrated_testing/Cargo.lock b/12_integrated_testing/Cargo.lock index 9c675b52..ab04eab7 100644 --- a/12_integrated_testing/Cargo.lock +++ b/12_integrated_testing/Cargo.lock @@ -4,9 +4,9 @@ version = 3 [[package]] name = "cortex-a" -version = "7.3.0" +version = "7.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "342880ec3cd4f86ab0b7c42c7f51b0ff104de4311a53e01b97388971bb5b42a2" +checksum = "f75db6964ed6748e88ff46f9aa209249a0aefe6b06d4b9e9ab820c867586d51a" dependencies = [ "tock-registers", ] @@ -24,9 +24,9 @@ dependencies = [ [[package]] name = "proc-macro2" -version = "1.0.39" +version = "1.0.40" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c54b25569025b7fc9651de43004ae593a75ad88543b17178aa5e1b9c4f15f56f" +checksum = "dd96a1e8ed2596c337f8eae5f24924ec83f5ad5ab21ea8e455d3566c69fbcaf7" dependencies = [ "unicode-ident", ] @@ -39,18 +39,18 @@ checksum = "9ff023245bfcc73fb890e1f8d5383825b3131cc920020a5c487d6f113dfc428a" [[package]] name = "quote" -version = "1.0.18" +version = "1.0.20" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a1feb54ed693b93a84e14094943b84b7c4eae204c512b7ccb95ab0c66d278ad1" +checksum = "3bcdf212e9776fbcb2d23ab029360416bb1706b1aea2d1a5ba002727cbcab804" dependencies = [ "proc-macro2", ] [[package]] name = "syn" -version = "1.0.95" +version = "1.0.98" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fbaf6116ab8924f39d52792136fb74fd60a80194cf1b1c6ffa6453eef1c3f942" +checksum = "c50aef8a904de4c23c788f104b7dddc7d6f79c647c7c8ce4cc8f73eb0ca773dd" dependencies = [ "proc-macro2", "quote", @@ -79,6 +79,6 @@ checksum = "4ee8fba06c1f4d0b396ef61a54530bb6b28f0dc61c38bc8bc5a5a48161e6282e" [[package]] name = "unicode-ident" -version = "1.0.0" +version = "1.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d22af068fba1eb5edcb4aea19d382b2a3deb4c8f9d475c589b6ada9e0fd493ee" +checksum = "5bd2fe26506023ed7b5e1e315add59d6f584c621d037f9368fea9cfb988f368c" diff --git a/13_exceptions_part2_peripheral_IRQs/Cargo.lock b/13_exceptions_part2_peripheral_IRQs/Cargo.lock index f69ea07e..05e524aa 100644 --- a/13_exceptions_part2_peripheral_IRQs/Cargo.lock +++ b/13_exceptions_part2_peripheral_IRQs/Cargo.lock @@ -4,9 +4,9 @@ version = 3 [[package]] name = "cortex-a" -version = "7.3.0" +version = "7.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "342880ec3cd4f86ab0b7c42c7f51b0ff104de4311a53e01b97388971bb5b42a2" +checksum = "f75db6964ed6748e88ff46f9aa209249a0aefe6b06d4b9e9ab820c867586d51a" dependencies = [ "tock-registers", ] @@ -24,9 +24,9 @@ dependencies = [ [[package]] name = "proc-macro2" -version = "1.0.39" +version = "1.0.40" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c54b25569025b7fc9651de43004ae593a75ad88543b17178aa5e1b9c4f15f56f" +checksum = "dd96a1e8ed2596c337f8eae5f24924ec83f5ad5ab21ea8e455d3566c69fbcaf7" dependencies = [ "unicode-ident", ] @@ -39,18 +39,18 @@ checksum = "9ff023245bfcc73fb890e1f8d5383825b3131cc920020a5c487d6f113dfc428a" [[package]] name = "quote" -version = "1.0.18" +version = "1.0.20" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a1feb54ed693b93a84e14094943b84b7c4eae204c512b7ccb95ab0c66d278ad1" +checksum = "3bcdf212e9776fbcb2d23ab029360416bb1706b1aea2d1a5ba002727cbcab804" dependencies = [ "proc-macro2", ] [[package]] name = "syn" -version = "1.0.95" +version = "1.0.98" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fbaf6116ab8924f39d52792136fb74fd60a80194cf1b1c6ffa6453eef1c3f942" +checksum = "c50aef8a904de4c23c788f104b7dddc7d6f79c647c7c8ce4cc8f73eb0ca773dd" dependencies = [ "proc-macro2", "quote", @@ -79,6 +79,6 @@ checksum = "4ee8fba06c1f4d0b396ef61a54530bb6b28f0dc61c38bc8bc5a5a48161e6282e" [[package]] name = "unicode-ident" -version = "1.0.0" +version = "1.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d22af068fba1eb5edcb4aea19d382b2a3deb4c8f9d475c589b6ada9e0fd493ee" +checksum = "5bd2fe26506023ed7b5e1e315add59d6f584c621d037f9368fea9cfb988f368c" diff --git a/14_virtual_mem_part2_mmio_remap/Cargo.lock b/14_virtual_mem_part2_mmio_remap/Cargo.lock index e93b2098..c732a7ab 100644 --- a/14_virtual_mem_part2_mmio_remap/Cargo.lock +++ b/14_virtual_mem_part2_mmio_remap/Cargo.lock @@ -4,9 +4,9 @@ version = 3 [[package]] name = "cortex-a" -version = "7.3.0" +version = "7.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "342880ec3cd4f86ab0b7c42c7f51b0ff104de4311a53e01b97388971bb5b42a2" +checksum = "f75db6964ed6748e88ff46f9aa209249a0aefe6b06d4b9e9ab820c867586d51a" dependencies = [ "tock-registers", ] @@ -24,9 +24,9 @@ dependencies = [ [[package]] name = "proc-macro2" -version = "1.0.39" +version = "1.0.40" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c54b25569025b7fc9651de43004ae593a75ad88543b17178aa5e1b9c4f15f56f" +checksum = "dd96a1e8ed2596c337f8eae5f24924ec83f5ad5ab21ea8e455d3566c69fbcaf7" dependencies = [ "unicode-ident", ] @@ -39,18 +39,18 @@ checksum = "9ff023245bfcc73fb890e1f8d5383825b3131cc920020a5c487d6f113dfc428a" [[package]] name = "quote" -version = "1.0.18" +version = "1.0.20" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a1feb54ed693b93a84e14094943b84b7c4eae204c512b7ccb95ab0c66d278ad1" +checksum = "3bcdf212e9776fbcb2d23ab029360416bb1706b1aea2d1a5ba002727cbcab804" dependencies = [ "proc-macro2", ] [[package]] name = "syn" -version = "1.0.95" +version = "1.0.98" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fbaf6116ab8924f39d52792136fb74fd60a80194cf1b1c6ffa6453eef1c3f942" +checksum = "c50aef8a904de4c23c788f104b7dddc7d6f79c647c7c8ce4cc8f73eb0ca773dd" dependencies = [ "proc-macro2", "quote", @@ -79,6 +79,6 @@ checksum = "4ee8fba06c1f4d0b396ef61a54530bb6b28f0dc61c38bc8bc5a5a48161e6282e" [[package]] name = "unicode-ident" -version = "1.0.0" +version = "1.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d22af068fba1eb5edcb4aea19d382b2a3deb4c8f9d475c589b6ada9e0fd493ee" +checksum = "5bd2fe26506023ed7b5e1e315add59d6f584c621d037f9368fea9cfb988f368c" diff --git a/15_virtual_mem_part3_precomputed_tables/Cargo.lock b/15_virtual_mem_part3_precomputed_tables/Cargo.lock index 33d507a7..8aa6b75d 100644 --- a/15_virtual_mem_part3_precomputed_tables/Cargo.lock +++ b/15_virtual_mem_part3_precomputed_tables/Cargo.lock @@ -4,9 +4,9 @@ version = 3 [[package]] name = "cortex-a" -version = "7.3.0" +version = "7.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "342880ec3cd4f86ab0b7c42c7f51b0ff104de4311a53e01b97388971bb5b42a2" +checksum = "f75db6964ed6748e88ff46f9aa209249a0aefe6b06d4b9e9ab820c867586d51a" dependencies = [ "tock-registers", ] @@ -24,9 +24,9 @@ dependencies = [ [[package]] name = "proc-macro2" -version = "1.0.39" +version = "1.0.40" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c54b25569025b7fc9651de43004ae593a75ad88543b17178aa5e1b9c4f15f56f" +checksum = "dd96a1e8ed2596c337f8eae5f24924ec83f5ad5ab21ea8e455d3566c69fbcaf7" dependencies = [ "unicode-ident", ] @@ -39,18 +39,18 @@ checksum = "9ff023245bfcc73fb890e1f8d5383825b3131cc920020a5c487d6f113dfc428a" [[package]] name = "quote" -version = "1.0.18" +version = "1.0.20" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a1feb54ed693b93a84e14094943b84b7c4eae204c512b7ccb95ab0c66d278ad1" +checksum = "3bcdf212e9776fbcb2d23ab029360416bb1706b1aea2d1a5ba002727cbcab804" dependencies = [ "proc-macro2", ] [[package]] name = "syn" -version = "1.0.95" +version = "1.0.98" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fbaf6116ab8924f39d52792136fb74fd60a80194cf1b1c6ffa6453eef1c3f942" +checksum = "c50aef8a904de4c23c788f104b7dddc7d6f79c647c7c8ce4cc8f73eb0ca773dd" dependencies = [ "proc-macro2", "quote", @@ -79,6 +79,6 @@ checksum = "4ee8fba06c1f4d0b396ef61a54530bb6b28f0dc61c38bc8bc5a5a48161e6282e" [[package]] name = "unicode-ident" -version = "1.0.0" +version = "1.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d22af068fba1eb5edcb4aea19d382b2a3deb4c8f9d475c589b6ada9e0fd493ee" +checksum = "5bd2fe26506023ed7b5e1e315add59d6f584c621d037f9368fea9cfb988f368c" diff --git a/16_virtual_mem_part4_higher_half_kernel/Cargo.lock b/16_virtual_mem_part4_higher_half_kernel/Cargo.lock index c31c4665..66ac8733 100644 --- a/16_virtual_mem_part4_higher_half_kernel/Cargo.lock +++ b/16_virtual_mem_part4_higher_half_kernel/Cargo.lock @@ -4,9 +4,9 @@ version = 3 [[package]] name = "cortex-a" -version = "7.3.0" +version = "7.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "342880ec3cd4f86ab0b7c42c7f51b0ff104de4311a53e01b97388971bb5b42a2" +checksum = "f75db6964ed6748e88ff46f9aa209249a0aefe6b06d4b9e9ab820c867586d51a" dependencies = [ "tock-registers", ] @@ -24,9 +24,9 @@ dependencies = [ [[package]] name = "proc-macro2" -version = "1.0.39" +version = "1.0.40" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c54b25569025b7fc9651de43004ae593a75ad88543b17178aa5e1b9c4f15f56f" +checksum = "dd96a1e8ed2596c337f8eae5f24924ec83f5ad5ab21ea8e455d3566c69fbcaf7" dependencies = [ "unicode-ident", ] @@ -39,18 +39,18 @@ checksum = "9ff023245bfcc73fb890e1f8d5383825b3131cc920020a5c487d6f113dfc428a" [[package]] name = "quote" -version = "1.0.18" +version = "1.0.20" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a1feb54ed693b93a84e14094943b84b7c4eae204c512b7ccb95ab0c66d278ad1" +checksum = "3bcdf212e9776fbcb2d23ab029360416bb1706b1aea2d1a5ba002727cbcab804" dependencies = [ "proc-macro2", ] [[package]] name = "syn" -version = "1.0.95" +version = "1.0.98" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fbaf6116ab8924f39d52792136fb74fd60a80194cf1b1c6ffa6453eef1c3f942" +checksum = "c50aef8a904de4c23c788f104b7dddc7d6f79c647c7c8ce4cc8f73eb0ca773dd" dependencies = [ "proc-macro2", "quote", @@ -79,6 +79,6 @@ checksum = "4ee8fba06c1f4d0b396ef61a54530bb6b28f0dc61c38bc8bc5a5a48161e6282e" [[package]] name = "unicode-ident" -version = "1.0.0" +version = "1.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d22af068fba1eb5edcb4aea19d382b2a3deb4c8f9d475c589b6ada9e0fd493ee" +checksum = "5bd2fe26506023ed7b5e1e315add59d6f584c621d037f9368fea9cfb988f368c" diff --git a/17_kernel_symbols/Cargo.lock b/17_kernel_symbols/Cargo.lock index 098cfbb5..a0da4e21 100644 --- a/17_kernel_symbols/Cargo.lock +++ b/17_kernel_symbols/Cargo.lock @@ -4,9 +4,9 @@ version = 3 [[package]] name = "cortex-a" -version = "7.3.0" +version = "7.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "342880ec3cd4f86ab0b7c42c7f51b0ff104de4311a53e01b97388971bb5b42a2" +checksum = "f75db6964ed6748e88ff46f9aa209249a0aefe6b06d4b9e9ab820c867586d51a" dependencies = [ "tock-registers", ] @@ -36,9 +36,9 @@ dependencies = [ [[package]] name = "proc-macro2" -version = "1.0.39" +version = "1.0.40" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c54b25569025b7fc9651de43004ae593a75ad88543b17178aa5e1b9c4f15f56f" +checksum = "dd96a1e8ed2596c337f8eae5f24924ec83f5ad5ab21ea8e455d3566c69fbcaf7" dependencies = [ "unicode-ident", ] @@ -51,18 +51,18 @@ checksum = "9ff023245bfcc73fb890e1f8d5383825b3131cc920020a5c487d6f113dfc428a" [[package]] name = "quote" -version = "1.0.18" +version = "1.0.20" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a1feb54ed693b93a84e14094943b84b7c4eae204c512b7ccb95ab0c66d278ad1" +checksum = "3bcdf212e9776fbcb2d23ab029360416bb1706b1aea2d1a5ba002727cbcab804" dependencies = [ "proc-macro2", ] [[package]] name = "syn" -version = "1.0.95" +version = "1.0.98" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fbaf6116ab8924f39d52792136fb74fd60a80194cf1b1c6ffa6453eef1c3f942" +checksum = "c50aef8a904de4c23c788f104b7dddc7d6f79c647c7c8ce4cc8f73eb0ca773dd" dependencies = [ "proc-macro2", "quote", @@ -91,6 +91,6 @@ checksum = "4ee8fba06c1f4d0b396ef61a54530bb6b28f0dc61c38bc8bc5a5a48161e6282e" [[package]] name = "unicode-ident" -version = "1.0.0" +version = "1.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d22af068fba1eb5edcb4aea19d382b2a3deb4c8f9d475c589b6ada9e0fd493ee" +checksum = "5bd2fe26506023ed7b5e1e315add59d6f584c621d037f9368fea9cfb988f368c" diff --git a/18_backtrace/Cargo.lock b/18_backtrace/Cargo.lock index e1cf54bc..e0ab66b1 100644 --- a/18_backtrace/Cargo.lock +++ b/18_backtrace/Cargo.lock @@ -4,9 +4,9 @@ version = 3 [[package]] name = "cortex-a" -version = "7.3.0" +version = "7.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "342880ec3cd4f86ab0b7c42c7f51b0ff104de4311a53e01b97388971bb5b42a2" +checksum = "f75db6964ed6748e88ff46f9aa209249a0aefe6b06d4b9e9ab820c867586d51a" dependencies = [ "tock-registers", ] @@ -36,9 +36,9 @@ dependencies = [ [[package]] name = "proc-macro2" -version = "1.0.39" +version = "1.0.40" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c54b25569025b7fc9651de43004ae593a75ad88543b17178aa5e1b9c4f15f56f" +checksum = "dd96a1e8ed2596c337f8eae5f24924ec83f5ad5ab21ea8e455d3566c69fbcaf7" dependencies = [ "unicode-ident", ] @@ -51,18 +51,18 @@ checksum = "9ff023245bfcc73fb890e1f8d5383825b3131cc920020a5c487d6f113dfc428a" [[package]] name = "quote" -version = "1.0.18" +version = "1.0.20" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a1feb54ed693b93a84e14094943b84b7c4eae204c512b7ccb95ab0c66d278ad1" +checksum = "3bcdf212e9776fbcb2d23ab029360416bb1706b1aea2d1a5ba002727cbcab804" dependencies = [ "proc-macro2", ] [[package]] name = "syn" -version = "1.0.95" +version = "1.0.98" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fbaf6116ab8924f39d52792136fb74fd60a80194cf1b1c6ffa6453eef1c3f942" +checksum = "c50aef8a904de4c23c788f104b7dddc7d6f79c647c7c8ce4cc8f73eb0ca773dd" dependencies = [ "proc-macro2", "quote", @@ -91,6 +91,6 @@ checksum = "4ee8fba06c1f4d0b396ef61a54530bb6b28f0dc61c38bc8bc5a5a48161e6282e" [[package]] name = "unicode-ident" -version = "1.0.0" +version = "1.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d22af068fba1eb5edcb4aea19d382b2a3deb4c8f9d475c589b6ada9e0fd493ee" +checksum = "5bd2fe26506023ed7b5e1e315add59d6f584c621d037f9368fea9cfb988f368c" diff --git a/19_kernel_heap/Cargo.lock b/19_kernel_heap/Cargo.lock index 7fb79026..09f99f4a 100644 --- a/19_kernel_heap/Cargo.lock +++ b/19_kernel_heap/Cargo.lock @@ -4,9 +4,9 @@ version = 3 [[package]] name = "cortex-a" -version = "7.3.0" +version = "7.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "342880ec3cd4f86ab0b7c42c7f51b0ff104de4311a53e01b97388971bb5b42a2" +checksum = "f75db6964ed6748e88ff46f9aa209249a0aefe6b06d4b9e9ab820c867586d51a" dependencies = [ "tock-registers", ] @@ -24,9 +24,9 @@ dependencies = [ [[package]] name = "linked_list_allocator" -version = "0.9.1" +version = "0.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "549ce1740e46b291953c4340adcd74c59bcf4308f4cac050fd33ba91b7168f4a" +checksum = "222d00bf23b303e0c82c7a4d5f04dc90f33a58b26a3adb1a09c6fbcf56cbd2a9" [[package]] name = "mingo" @@ -43,9 +43,9 @@ dependencies = [ [[package]] name = "proc-macro2" -version = "1.0.39" +version = "1.0.40" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c54b25569025b7fc9651de43004ae593a75ad88543b17178aa5e1b9c4f15f56f" +checksum = "dd96a1e8ed2596c337f8eae5f24924ec83f5ad5ab21ea8e455d3566c69fbcaf7" dependencies = [ "unicode-ident", ] @@ -58,18 +58,18 @@ checksum = "9ff023245bfcc73fb890e1f8d5383825b3131cc920020a5c487d6f113dfc428a" [[package]] name = "quote" -version = "1.0.18" +version = "1.0.20" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a1feb54ed693b93a84e14094943b84b7c4eae204c512b7ccb95ab0c66d278ad1" +checksum = "3bcdf212e9776fbcb2d23ab029360416bb1706b1aea2d1a5ba002727cbcab804" dependencies = [ "proc-macro2", ] [[package]] name = "syn" -version = "1.0.95" +version = "1.0.98" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fbaf6116ab8924f39d52792136fb74fd60a80194cf1b1c6ffa6453eef1c3f942" +checksum = "c50aef8a904de4c23c788f104b7dddc7d6f79c647c7c8ce4cc8f73eb0ca773dd" dependencies = [ "proc-macro2", "quote", @@ -98,6 +98,6 @@ checksum = "4ee8fba06c1f4d0b396ef61a54530bb6b28f0dc61c38bc8bc5a5a48161e6282e" [[package]] name = "unicode-ident" -version = "1.0.0" +version = "1.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d22af068fba1eb5edcb4aea19d382b2a3deb4c8f9d475c589b6ada9e0fd493ee" +checksum = "5bd2fe26506023ed7b5e1e315add59d6f584c621d037f9368fea9cfb988f368c" diff --git a/19_kernel_heap/README.md b/19_kernel_heap/README.md index 8a39a231..45f5f9e3 100644 --- a/19_kernel_heap/README.md +++ b/19_kernel_heap/README.md @@ -280,7 +280,7 @@ diff -uNr 18_backtrace/kernel/Cargo.toml 19_kernel_heap/kernel/Cargo.toml [dependencies] test-types = { path = "../libraries/test-types" } debug-symbol-types = { path = "../libraries/debug-symbol-types" } -+linked_list_allocator = { version = "0.9.x", default-features = false, features = ["const_mut_refs"] } ++linked_list_allocator = { version = "0.10.x", default-features = false, features = ["const_mut_refs"] } # Optional dependencies tock-registers = { version = "0.7.x", default-features = false, features = ["register_types"], optional = true } @@ -1043,9 +1043,9 @@ diff -uNr 18_backtrace/kernel/src/memory/heap_alloc.rs 19_kernel_heap/kernel/src +pub fn kernel_init_heap_allocator() { + let region = bsp::memory::mmu::virt_heap_region(); + -+ KERNEL_HEAP_ALLOCATOR -+ .inner -+ .lock(|inner| unsafe { inner.init(region.start_addr().as_usize(), region.size()) }); ++ KERNEL_HEAP_ALLOCATOR.inner.lock(|inner| unsafe { ++ inner.init(region.start_addr().as_usize() as *mut u8, region.size()) ++ }); +} diff -uNr 18_backtrace/kernel/src/memory/mmu/mapping_record.rs 19_kernel_heap/kernel/src/memory/mmu/mapping_record.rs diff --git a/19_kernel_heap/kernel/Cargo.toml b/19_kernel_heap/kernel/Cargo.toml index 2f5d0592..61a16158 100644 --- a/19_kernel_heap/kernel/Cargo.toml +++ b/19_kernel_heap/kernel/Cargo.toml @@ -18,7 +18,7 @@ test_build = ["qemu-exit"] [dependencies] test-types = { path = "../libraries/test-types" } debug-symbol-types = { path = "../libraries/debug-symbol-types" } -linked_list_allocator = { version = "0.9.x", default-features = false, features = ["const_mut_refs"] } +linked_list_allocator = { version = "0.10.x", default-features = false, features = ["const_mut_refs"] } # Optional dependencies tock-registers = { version = "0.7.x", default-features = false, features = ["register_types"], optional = true } diff --git a/19_kernel_heap/kernel/src/memory/heap_alloc.rs b/19_kernel_heap/kernel/src/memory/heap_alloc.rs index 81a5009c..c290be4d 100644 --- a/19_kernel_heap/kernel/src/memory/heap_alloc.rs +++ b/19_kernel_heap/kernel/src/memory/heap_alloc.rs @@ -131,7 +131,7 @@ unsafe impl GlobalAlloc for HeapAllocator { pub fn kernel_init_heap_allocator() { let region = bsp::memory::mmu::virt_heap_region(); - KERNEL_HEAP_ALLOCATOR - .inner - .lock(|inner| unsafe { inner.init(region.start_addr().as_usize(), region.size()) }); + KERNEL_HEAP_ALLOCATOR.inner.lock(|inner| unsafe { + inner.init(region.start_addr().as_usize() as *mut u8, region.size()) + }); } diff --git a/X1_JTAG_boot/Cargo.lock b/X1_JTAG_boot/Cargo.lock index dfe5e8e3..7c8e75a8 100644 --- a/X1_JTAG_boot/Cargo.lock +++ b/X1_JTAG_boot/Cargo.lock @@ -4,9 +4,9 @@ version = 3 [[package]] name = "cortex-a" -version = "7.3.0" +version = "7.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "342880ec3cd4f86ab0b7c42c7f51b0ff104de4311a53e01b97388971bb5b42a2" +checksum = "f75db6964ed6748e88ff46f9aa209249a0aefe6b06d4b9e9ab820c867586d51a" dependencies = [ "tock-registers", ] diff --git a/X1_JTAG_boot/jtag_boot_rpi3.img b/X1_JTAG_boot/jtag_boot_rpi3.img index f6d2df49fd719b98dd9f1ed641c087f99c32e336..4f2c13b0dc1a7ab85bbd5dcc18f7810c00c8b275 100755 GIT binary patch delta 1269 zcma)4Z)jUp6hHUfbtb8n*yi8XH1B2Ex~AlP}CsSL-@;o=W6G3ENc<mu)HHTuW>EV@3&un=)hMiSW?B&tD<6Pa2btcLQ?Tba$C0vb z7MuC3>=Oq&ibpEaY++`$;x>;i$Axb2rG)`-=OS}v&bC)qIEd)-9$_^wGv5J4d+H!w zsyv48dta;l)V8N?bI9%^`8!FAd$NCUmfcVIPY(4G_t@Cws|`()N(Z==>(GP)U?R#g z?>SDyiW$=@_?9ouQh34FP{YA3S)|*E#i@-Z`JQnwXVEX(h86zJW3LzNsU(A)2guE~ zZ9h;tjXs!f6Jeg|ZBMp|r^v?u<6Db!afC|CJ3w;%V4>(wApnl8N%KcyYjH<*nLD$u zmU0zs@@I4H>p~pX>3RmhDJJjOQ@|iLEBW=k1nyygNef`Mg27~%?y`uqy)g)G4&W(r zpLXDQRqewmkI2(7tp_%m(xtx(zo_ziJHc&_X=X0M%p7MT7vbi$JD9I}L0kL|)1Fh2!;M)q>J6$^p- zXEIcGe$8&NI+z$$<98*mUP{0G^KS{}y2&-z@1iw*C39{|i2Qaie@O79dMm!3(|B>y8eZJo zS7`)k2md%-A#AU{M!Nz0sb4R)TP^!VZO>R2A>leO_UwvL8~I9xOa0bwf(Q@SO1x?$%FZO)yXyQ)PWB zjEJX$q3R)}E?4R|Ny;qG83ty8I~(rD7FB#R4Pc;V(A%xLc~IqZldQw*dW0QAW{fvq zR`&nu{(EJYaq{GK{M@(^ystWO7SMeyKcnE4&(Z;3HeM F{RJ~mUIzdG delta 1279 zcmah|Z){Ul6hHS}7;P2ugm&%N`ra)yW9>%bhD(PduB@QaWFnJfG7@2$5in&gF}h^? zK$n|;?yl+eV*5M<%=;p$;o-Y zd;Z+t`Q7&V?(4fx9nsFO`Q#-{V>c#ywL4l(N+xzSNPC1?b{ypV8L;Xg-#LF8cC256 zeQTd#smXI|KlQO8d}TwHU7noUu*ef1HA_?Q*=!f+#rU*Ubey~M9Asi{hqUXNwUB{w z{!$mtZ0z5oT`jf3G5|~f_@#c|83P7W?g0A@&~pIq*Z@<56l3H9#5Znk^jXk3K+p$p z%GcA31EJbShJ$i}?y=WZSZ+zr9vlyaLmAMWlbThGGpop%EXKLjbsxVEy{L8E!Y3+I zfw?A`qoqEMt;3yGnQu1e3(W!juUp7X)e1w$QaLewgbq6RO2$SzW{l{!JC!U zZ69uz7y03DZEhCk$lY)11mB}+>nF|%HuurFzcAoUbW_UG%LhtM7)Prb>V{~+W5%v! zKfKrJe;=j?6gJ<5X_Ihi-=(weVBERs&0528#uhmgE)bVLDcU?(_=|4(jPTzak}f`1 z!e2Ml8h$D@0e&xLH0cVKVEGSx!zu5TW-%FTWy5$hSRcLT=&o{K?WC7GU13q}gpc{l zbyf?G2RFC;wz9f9pHod)9nR&9QVR9(F|Ffk91N!dJrxfGzYuO@XYfuq>6<9h8)R1i z%}6(~8H|{rm?m$xaqDeL)U6!7<}y3}B#uXt2Xl18#UCXHG1}$`?fZS-0{9%ftO?HdI)(Dpt@@F+~n_EnFSKaHe0MHHZ%kQP3N@4m#m91J~ zwKR4K3rC}8vELNTMrn>TJ*8y%Kbf*B?{4B+x4^8pnOLo@KjsmO<9;!KEnCDt^A%V= diff --git a/X1_JTAG_boot/jtag_boot_rpi4.img b/X1_JTAG_boot/jtag_boot_rpi4.img index ea37301f05b97d1219a77b74eac3910f376f12f3..ee1f6fc4c545edda38bc7b5ccb60381b0ebb4ad2 100755 GIT binary patch delta 1017 zcmah{O-NKx6h8OeF=qVZHO`Dq&ge7CaYh}<%pVe($%Q|(8VHIOiY25rF4_o{IU*!c z3t!hV2tsjTZ(50nx(TCA(jt{|Q7xVZ^%M;Q`x!7_=e@ati=YGdo%@}0-go})4jb9ay3^y@72Z40g$(*K;A3|#R%;Bs*79YL}}_>c#=AQ zClbFudp!+_y9#PdqS7+<$mJtt?1k%SUw(vS$Ggy!y9 zV(F1ir{iQG1?H@zf!)k{SX6U8W`n>b|7#mZJ4S$$e5hzrKzeHn^&86Sc#)AWv| z;vha#d5uyT{xOKr>f|8Ws*;0P{=)}>@n85*u<0SNl*@#~BJ;FmMWy-iRXoO>;Cfr? zfR$u#F)63jK9q~2I3NRV_8{jYoA=~6(HeCpy)GVs-VIM)&NFVtb((S)zZrPgF>hs& zVcBQJ$7BlQSundPi*9zqdz&?R%2|)+g!A{2WSVsD7Eu?osJp&WG&Y4Iac#}xc)x6p z8#%rtNkOK%&vpE-f?@tcnMn_@z;TiuV2NWJ_kZA6;P?~Ag!OxS#>HGBjCz^fQ_a46 GeSZN^Y#N&Y delta 1010 zcmah`O-NKx6h8MoCuU6LHGj^GGy2qYe$-U58D)ef6)6dcS+o&yD2lKQaT5g9NRdfD z_`HTvo6Lp1*@;NGiK#XU1r;hmo97fU<_In(Q$%0)zISWWq6_z(``vTS_s;j-r_JNd z!!fSSFnyNeP~FUVF2lJ8ypn&QR8j_!tdxV4o&wni@o0Jynuc(%;W#(ooq1uHHgfY_ zxTl~4xo2hzvb?{dUMdm!rH)PzR?Fw)RaMP12P&|21patYrgl2UI$+S&crmbhQHrNyV)@}AUawvhT2W)ZF~ z%#z9Vg+)iqtT_K-?RMFXM;u?Ur>M2=lub{?ScGC7_pz2OkB-L~#-l|idnt*?62vEM zl{1VO{`1cohHWmLNdE$O7&ftdCBq!UK86vlcU_%Kx)HZggx`2V__?bVe|FV5#@#wq z9%~Rt^pTBwoep!7CG9Lp6hC$rySLai@n2g*ADj(k|5J6)g9EM`BgNux DoqQqW