Merge branch 'master' into v2_lib

This commit is contained in:
Julien Cretin
2020-10-02 15:32:57 +02:00
5 changed files with 94 additions and 95 deletions

View File

@@ -1,5 +1,5 @@
diff --git a/boards/nordic/nrf52840_dongle/src/main.rs b/boards/nordic/nrf52840_dongle/src/main.rs diff --git a/boards/nordic/nrf52840_dongle/src/main.rs b/boards/nordic/nrf52840_dongle/src/main.rs
index fc53f59..d72d204 100644 index fc53f59c8..d72d20482 100644
--- a/boards/nordic/nrf52840_dongle/src/main.rs --- a/boards/nordic/nrf52840_dongle/src/main.rs
+++ b/boards/nordic/nrf52840_dongle/src/main.rs +++ b/boards/nordic/nrf52840_dongle/src/main.rs
@@ -55,6 +55,11 @@ const NUM_PROCS: usize = 8; @@ -55,6 +55,11 @@ const NUM_PROCS: usize = 8;
@@ -22,7 +22,7 @@ index fc53f59..d72d204 100644
} }
impl kernel::Platform for Platform { impl kernel::Platform for Platform {
@@ -108,19 +114,42 @@ impl kernel::Platform for Platform { @@ -108,10 +114,30 @@ impl kernel::Platform for Platform {
capsules::ieee802154::DRIVER_NUM => f(Some(self.ieee802154_radio)), capsules::ieee802154::DRIVER_NUM => f(Some(self.ieee802154_radio)),
capsules::temperature::DRIVER_NUM => f(Some(self.temp)), capsules::temperature::DRIVER_NUM => f(Some(self.temp)),
capsules::analog_comparator::DRIVER_NUM => f(Some(self.analog_comparator)), capsules::analog_comparator::DRIVER_NUM => f(Some(self.analog_comparator)),
@@ -53,8 +53,7 @@ index fc53f59..d72d204 100644
} }
/// Entry point in the vector table called on hard reset. /// Entry point in the vector table called on hard reset.
#[no_mangle] @@ -120,7 +146,10 @@ pub unsafe fn reset_handler() {
pub unsafe fn reset_handler() {
// Loads relocations and clears BSS // Loads relocations and clears BSS
nrf52840::init(); nrf52840::init();
@@ -90,7 +89,7 @@ index fc53f59..d72d204 100644
}; };
diff --git a/boards/nordic/nrf52840dk/src/main.rs b/boards/nordic/nrf52840dk/src/main.rs diff --git a/boards/nordic/nrf52840dk/src/main.rs b/boards/nordic/nrf52840dk/src/main.rs
index 169f3d3..2ebb384 100644 index 169f3d393..2ebb384d8 100644
--- a/boards/nordic/nrf52840dk/src/main.rs --- a/boards/nordic/nrf52840dk/src/main.rs
+++ b/boards/nordic/nrf52840dk/src/main.rs +++ b/boards/nordic/nrf52840dk/src/main.rs
@@ -123,6 +123,11 @@ const NUM_PROCS: usize = 8; @@ -123,6 +123,11 @@ const NUM_PROCS: usize = 8;
@@ -180,10 +179,10 @@ index 169f3d3..2ebb384 100644
}; };
diff --git a/chips/nrf52/src/nvmc.rs b/chips/nrf52/src/nvmc.rs diff --git a/chips/nrf52/src/nvmc.rs b/chips/nrf52/src/nvmc.rs
index b70162c..9dcb82b 100644 index b70162cae..9dcb82b07 100644
--- a/chips/nrf52/src/nvmc.rs --- a/chips/nrf52/src/nvmc.rs
+++ b/chips/nrf52/src/nvmc.rs +++ b/chips/nrf52/src/nvmc.rs
@@ -3,15 +3,16 @@ @@ -3,6 +3,7 @@
//! Used in order read and write to internal flash. //! Used in order read and write to internal flash.
use core::cell::Cell; use core::cell::Cell;
@@ -191,8 +190,7 @@ index b70162c..9dcb82b 100644
use core::ops::{Index, IndexMut}; use core::ops::{Index, IndexMut};
use kernel::common::cells::OptionalCell; use kernel::common::cells::OptionalCell;
use kernel::common::cells::TakeCell; use kernel::common::cells::TakeCell;
use kernel::common::cells::VolatileCell; @@ -11,7 +12,7 @@ use kernel::common::deferred_call::DeferredCall;
use kernel::common::deferred_call::DeferredCall;
use kernel::common::registers::{register_bitfields, ReadOnly, ReadWrite}; use kernel::common::registers::{register_bitfields, ReadOnly, ReadWrite};
use kernel::common::StaticRef; use kernel::common::StaticRef;
use kernel::hil; use kernel::hil;
@@ -427,7 +425,7 @@ index b70162c..9dcb82b 100644
+ } + }
+} +}
diff --git a/kernel/src/lib.rs b/kernel/src/lib.rs diff --git a/kernel/src/lib.rs b/kernel/src/lib.rs
index dbe5035..428d90c 100644 index dbe503515..428d90c29 100644
--- a/kernel/src/lib.rs --- a/kernel/src/lib.rs
+++ b/kernel/src/lib.rs +++ b/kernel/src/lib.rs
@@ -123,7 +123,7 @@ pub use crate::sched::cooperative::{CoopProcessNode, CooperativeSched}; @@ -123,7 +123,7 @@ pub use crate::sched::cooperative::{CoopProcessNode, CooperativeSched};
@@ -440,7 +438,7 @@ index dbe5035..428d90c 100644
// Export only select items from the process module. To remove the name conflict // Export only select items from the process module. To remove the name conflict
// this cannot be called `process`, so we use a shortened version. These // this cannot be called `process`, so we use a shortened version. These
diff --git a/kernel/src/memop.rs b/kernel/src/memop.rs diff --git a/kernel/src/memop.rs b/kernel/src/memop.rs
index 348c746..5465c95 100644 index 348c746a5..5465c95f4 100644
--- a/kernel/src/memop.rs --- a/kernel/src/memop.rs
+++ b/kernel/src/memop.rs +++ b/kernel/src/memop.rs
@@ -108,6 +108,25 @@ pub(crate) fn memop(process: &dyn ProcessType, op_type: usize, r1: usize) -> Ret @@ -108,6 +108,25 @@ pub(crate) fn memop(process: &dyn ProcessType, op_type: usize, r1: usize) -> Ret
@@ -470,7 +468,7 @@ index 348c746..5465c95 100644
} }
} }
diff --git a/kernel/src/process.rs b/kernel/src/process.rs diff --git a/kernel/src/process.rs b/kernel/src/process.rs
index 4dfde3b..0ceff3e 100644 index 4dfde3b4f..8380af673 100644
--- a/kernel/src/process.rs --- a/kernel/src/process.rs
+++ b/kernel/src/process.rs +++ b/kernel/src/process.rs
@@ -360,6 +360,15 @@ pub trait ProcessType { @@ -360,6 +360,15 @@ pub trait ProcessType {
@@ -489,7 +487,7 @@ index 4dfde3b..0ceff3e 100644
/// Debug function to update the kernel on where the stack starts for this /// Debug function to update the kernel on where the stack starts for this
/// process. Processes are not required to call this through the memop /// process. Processes are not required to call this through the memop
/// system call, but it aids in debugging the process. /// system call, but it aids in debugging the process.
@@ -1015,6 +1024,32 @@ impl<C: Chip> ProcessType for Process<'_, C> { @@ -1015,6 +1024,35 @@ impl<C: Chip> ProcessType for Process<'_, C> {
self.header.get_writeable_flash_region(region_index) self.header.get_writeable_flash_region(region_index)
} }
@@ -502,27 +500,30 @@ index 4dfde3b..0ceff3e 100644
+ } + }
+ +
+ fn fits_in_storage_location(&self, ptr: usize, len: usize) -> bool { + fn fits_in_storage_location(&self, ptr: usize, len: usize) -> bool {
+ self.kernel.storage_locations().iter().any(|storage_location| { + self.kernel
+ let storage_ptr = storage_location.address; + .storage_locations()
+ let storage_len = storage_location.size; + .iter()
+ // We want to check the 2 following inequalities: + .any(|storage_location| {
+ // (1) `storage_ptr <= ptr` + let storage_ptr = storage_location.address;
+ // (2) `ptr + len <= storage_ptr + storage_len` + let storage_len = storage_location.size;
+ // However, the second one may overflow written as is. We introduce a third + // We want to check the 2 following inequalities:
+ // inequality to solve this issue: + // (1) `storage_ptr <= ptr`
+ // (3) `len <= storage_len` + // (2) `ptr + len <= storage_ptr + storage_len`
+ // Using this third inequality, we can rewrite the second one as: + // However, the second one may overflow written as is. We introduce a third
+ // (4) `ptr - storage_ptr <= storage_len - len` + // inequality to solve this issue:
+ // This fourth inequality is equivalent to the second one but doesn't overflow when + // (3) `len <= storage_len`
+ // the first and third inequalities hold. + // Using this third inequality, we can rewrite the second one as:
+ storage_ptr <= ptr && len <= storage_len && ptr - storage_ptr <= storage_len - len + // (4) `ptr - storage_ptr <= storage_len - len`
+ }) + // This fourth inequality is equivalent to the second one but doesn't overflow when
+ // the first and third inequalities hold.
+ storage_ptr <= ptr && len <= storage_len && ptr - storage_ptr <= storage_len - len
+ })
+ } + }
+ +
fn update_stack_start_pointer(&self, stack_pointer: *const u8) { fn update_stack_start_pointer(&self, stack_pointer: *const u8) {
if stack_pointer >= self.mem_start() && stack_pointer < self.mem_end() { if stack_pointer >= self.mem_start() && stack_pointer < self.mem_end() {
self.debug.map(|debug| { self.debug.map(|debug| {
@@ -1664,6 +1699,33 @@ impl<C: 'static + Chip> Process<'_, C> { @@ -1664,6 +1702,33 @@ impl<C: 'static + Chip> Process<'_, C> {
return Err(ProcessLoadError::MpuInvalidFlashLength); return Err(ProcessLoadError::MpuInvalidFlashLength);
} }
@@ -557,10 +558,10 @@ index 4dfde3b..0ceff3e 100644
// memory space just for kernel and grant state. We need to make // memory space just for kernel and grant state. We need to make
// sure we allocate enough memory just for that. // sure we allocate enough memory just for that.
diff --git a/kernel/src/sched.rs b/kernel/src/sched.rs diff --git a/kernel/src/sched.rs b/kernel/src/sched.rs
index 88eea40..ed3ae82 100644 index 88eea4042..ed3ae8260 100644
--- a/kernel/src/sched.rs --- a/kernel/src/sched.rs
+++ b/kernel/src/sched.rs +++ b/kernel/src/sched.rs
@@ -118,15 +118,24 @@ pub enum SchedulingDecision { @@ -118,6 +118,12 @@ pub enum SchedulingDecision {
TrySleep, TrySleep,
} }
@@ -573,9 +574,7 @@ index 88eea40..ed3ae82 100644
/// Main object for the kernel. Each board will need to create one. /// Main object for the kernel. Each board will need to create one.
pub struct Kernel { pub struct Kernel {
/// How many "to-do" items exist at any given time. These include /// How many "to-do" items exist at any given time. These include
/// outstanding callbacks and processes in the Running state. @@ -127,6 +133,9 @@ pub struct Kernel {
work: Cell<usize>,
/// This holds a pointer to the static array of Process pointers. /// This holds a pointer to the static array of Process pointers.
processes: &'static [Option<&'static dyn process::ProcessType>], processes: &'static [Option<&'static dyn process::ProcessType>],

View File

@@ -1,9 +1,9 @@
dd5920dfb172d9371b29d019b6a37fae1a995bf9d814000944d9ef36bad31513 third_party/tock/target/thumbv7em-none-eabi/release/nrf52840dk.bin dd5920dfb172d9371b29d019b6a37fae1a995bf9d814000944d9ef36bad31513 third_party/tock/target/thumbv7em-none-eabi/release/nrf52840dk.bin
8868f4fa542d9dd9c88abfbd84b4527bcd2f4b9ae16caf3098a3d5e73eae0067 target/nrf52840dk_merged.hex fe868d9398863ff6e484742d93a4266ee7afa1ac34f9fa5ed570f8309272156a target/nrf52840dk_merged.hex
e4acfa602a5cc5d7c61d465f873918e8e0858628d0e5f8e0db26a7b7dd0b94d4 third_party/tock/target/thumbv7em-none-eabi/release/nrf52840_dongle.bin e4acfa602a5cc5d7c61d465f873918e8e0858628d0e5f8e0db26a7b7dd0b94d4 third_party/tock/target/thumbv7em-none-eabi/release/nrf52840_dongle.bin
c162cfdd219306940f919716a4f53d053b0bcfed2963f8787e1098a5163ae704 target/nrf52840_dongle_merged.hex acca7d690ecc4733be4606ff9cd491fbc62dc3216ce0b98132e5669c8b2cba29 target/nrf52840_dongle_merged.hex
c0ace9f13ef3fd18c576a735ae23b3956bf8dd346f20c6217086e748d6bad8a2 third_party/tock/target/thumbv7em-none-eabi/release/nrf52840_dongle_dfu.bin c0ace9f13ef3fd18c576a735ae23b3956bf8dd346f20c6217086e748d6bad8a2 third_party/tock/target/thumbv7em-none-eabi/release/nrf52840_dongle_dfu.bin
c1e79ad3aa2c9566c13c5469a389195a3814839b815253ffc4f5325329496b26 target/nrf52840_dongle_dfu_merged.hex e5cf030db968b0d78a30683d7278e7481d5e2d385b80e6509e76cfb9392899b2 target/nrf52840_dongle_dfu_merged.hex
06a38a0d6d356145467a73c765e28a945878f663664016f888393207097bfe10 third_party/tock/target/thumbv7em-none-eabi/release/nrf52840_mdk_dfu.bin 06a38a0d6d356145467a73c765e28a945878f663664016f888393207097bfe10 third_party/tock/target/thumbv7em-none-eabi/release/nrf52840_mdk_dfu.bin
d0b23e0dd0c349ded966fb5563a5a65c3935710d1741ade0ae7d9e06a176f442 target/nrf52840_mdk_dfu_merged.hex 3735572cccfc0c39540f77e2c55d0a25aa82dd22ad698824fd2630fcbd87f611 target/nrf52840_mdk_dfu_merged.hex
aacf3873a90bf93f0c51ccc85d0c03642d078865d16c4aeb0b805d1f6865e6ba target/tab/ctap2.tab 4d36b3b456de9340e4e18fd595ae25e71298431f73ef17653bb7fb707830a9af target/tab/ctap2.tab

View File

@@ -1,9 +1,9 @@
2426ee9a6c75e325537818081d45445d95468a4c0a77feacdc6133d7d9aa227a third_party/tock/target/thumbv7em-none-eabi/release/nrf52840dk.bin 2426ee9a6c75e325537818081d45445d95468a4c0a77feacdc6133d7d9aa227a third_party/tock/target/thumbv7em-none-eabi/release/nrf52840dk.bin
c8507168c7e81d388641177c17c917b7473c8fe27849678cc7e558c64b33e9f5 target/nrf52840dk_merged.hex b4248106097b9d54b882cd1dd1f88710585a3e274ee5edff334dcb2b26c8af51 target/nrf52840dk_merged.hex
c53d1e1db72df25950fa6d28699a2d38757def0dcbeb0d09d2366481cf0149a6 third_party/tock/target/thumbv7em-none-eabi/release/nrf52840_dongle.bin c53d1e1db72df25950fa6d28699a2d38757def0dcbeb0d09d2366481cf0149a6 third_party/tock/target/thumbv7em-none-eabi/release/nrf52840_dongle.bin
103888792b1b81a50e16746f1e2e2bee7cc01599881c464b56d9d7f6ae856c3e target/nrf52840_dongle_merged.hex ac2d36a3c7f8326496c66d1e4aa8a82bbe2d689fe9cd86308f1304393bc125ec target/nrf52840_dongle_merged.hex
233b5ba4459523759e3171cee83cdb3a383bbe65727c8ece64dfe5321d6ebe34 third_party/tock/target/thumbv7em-none-eabi/release/nrf52840_dongle_dfu.bin 233b5ba4459523759e3171cee83cdb3a383bbe65727c8ece64dfe5321d6ebe34 third_party/tock/target/thumbv7em-none-eabi/release/nrf52840_dongle_dfu.bin
ca1847ac82a3b3498f79918746f5662863033a0c69300d669e466701f485e3d9 target/nrf52840_dongle_dfu_merged.hex aff4b19511486548529f02be3a32bd47bd6329f813aef6e761c15dce8284bfa7 target/nrf52840_dongle_dfu_merged.hex
1baaf518a74c6077cb936d9cf178b6dd0232e7562fa56174886b05b77886cc32 third_party/tock/target/thumbv7em-none-eabi/release/nrf52840_mdk_dfu.bin 1baaf518a74c6077cb936d9cf178b6dd0232e7562fa56174886b05b77886cc32 third_party/tock/target/thumbv7em-none-eabi/release/nrf52840_mdk_dfu.bin
97f89caa930fde44193d16e3f396584de6044ca4c46092c7275b5b44b9eed774 target/nrf52840_mdk_dfu_merged.hex a2f1e440b9c875f0ca1dd0952fd435686dfd1c29d708771b08827ae21fc31c51 target/nrf52840_mdk_dfu_merged.hex
7e05f90206506e78aa9eec0b1495bf3548d7a0446722c1f40b3a84f674d2ca0e target/tab/ctap2.tab 5eb8a111c5eb1554785e86bb8168180ee984ee69bc110d859cad1043b79daa2e target/tab/ctap2.tab

View File

@@ -6,8 +6,8 @@ Min RAM size from segments in ELF: 20 bytes
Number of writeable flash regions: 0 Number of writeable flash regions: 0
Adding .crt0_header section. Offset: 64 (0x40). Length: 64 (0x40) bytes. Adding .crt0_header section. Offset: 64 (0x40). Length: 64 (0x40) bytes.
Entry point is in .text section Entry point is in .text section
Adding .text section. Offset: 128 (0x80). Length: 187008 (0x2da80) bytes. Adding .text section. Offset: 128 (0x80). Length: 187352 (0x2dbd8) bytes.
Adding .stack section. Offset: 187136 (0x2db00). Length: 16384 (0x4000) bytes. Adding .stack section. Offset: 187480 (0x2dc58). Length: 16384 (0x4000) bytes.
Searching for .rel.X sections to add. Searching for .rel.X sections to add.
TBF Header: TBF Header:
version: 2 0x2 version: 2 0x2
@@ -30,8 +30,8 @@ Min RAM size from segments in ELF: 20 bytes
Number of writeable flash regions: 0 Number of writeable flash regions: 0
Adding .crt0_header section. Offset: 64 (0x40). Length: 64 (0x40) bytes. Adding .crt0_header section. Offset: 64 (0x40). Length: 64 (0x40) bytes.
Entry point is in .text section Entry point is in .text section
Adding .text section. Offset: 128 (0x80). Length: 187008 (0x2da80) bytes. Adding .text section. Offset: 128 (0x80). Length: 187352 (0x2dbd8) bytes.
Adding .stack section. Offset: 187136 (0x2db00). Length: 16384 (0x4000) bytes. Adding .stack section. Offset: 187480 (0x2dc58). Length: 16384 (0x4000) bytes.
Searching for .rel.X sections to add. Searching for .rel.X sections to add.
TBF Header: TBF Header:
version: 2 0x2 version: 2 0x2
@@ -54,8 +54,8 @@ Min RAM size from segments in ELF: 20 bytes
Number of writeable flash regions: 0 Number of writeable flash regions: 0
Adding .crt0_header section. Offset: 64 (0x40). Length: 64 (0x40) bytes. Adding .crt0_header section. Offset: 64 (0x40). Length: 64 (0x40) bytes.
Entry point is in .text section Entry point is in .text section
Adding .text section. Offset: 128 (0x80). Length: 187008 (0x2da80) bytes. Adding .text section. Offset: 128 (0x80). Length: 187352 (0x2dbd8) bytes.
Adding .stack section. Offset: 187136 (0x2db00). Length: 16384 (0x4000) bytes. Adding .stack section. Offset: 187480 (0x2dc58). Length: 16384 (0x4000) bytes.
Searching for .rel.X sections to add. Searching for .rel.X sections to add.
TBF Header: TBF Header:
version: 2 0x2 version: 2 0x2
@@ -78,8 +78,8 @@ Min RAM size from segments in ELF: 20 bytes
Number of writeable flash regions: 0 Number of writeable flash regions: 0
Adding .crt0_header section. Offset: 64 (0x40). Length: 64 (0x40) bytes. Adding .crt0_header section. Offset: 64 (0x40). Length: 64 (0x40) bytes.
Entry point is in .text section Entry point is in .text section
Adding .text section. Offset: 128 (0x80). Length: 187008 (0x2da80) bytes. Adding .text section. Offset: 128 (0x80). Length: 187352 (0x2dbd8) bytes.
Adding .stack section. Offset: 187136 (0x2db00). Length: 16384 (0x4000) bytes. Adding .stack section. Offset: 187480 (0x2dc58). Length: 16384 (0x4000) bytes.
Searching for .rel.X sections to add. Searching for .rel.X sections to add.
TBF Header: TBF Header:
version: 2 0x2 version: 2 0x2

View File

@@ -6,8 +6,8 @@ Min RAM size from segments in ELF: 20 bytes
Number of writeable flash regions: 0 Number of writeable flash regions: 0
Adding .crt0_header section. Offset: 64 (0x40). Length: 64 (0x40) bytes. Adding .crt0_header section. Offset: 64 (0x40). Length: 64 (0x40) bytes.
Entry point is in .text section Entry point is in .text section
Adding .text section. Offset: 128 (0x80). Length: 187008 (0x2da80) bytes. Adding .text section. Offset: 128 (0x80). Length: 187344 (0x2dbd0) bytes.
Adding .stack section. Offset: 187136 (0x2db00). Length: 16384 (0x4000) bytes. Adding .stack section. Offset: 187472 (0x2dc50). Length: 16384 (0x4000) bytes.
Searching for .rel.X sections to add. Searching for .rel.X sections to add.
TBF Header: TBF Header:
version: 2 0x2 version: 2 0x2
@@ -30,8 +30,8 @@ Min RAM size from segments in ELF: 20 bytes
Number of writeable flash regions: 0 Number of writeable flash regions: 0
Adding .crt0_header section. Offset: 64 (0x40). Length: 64 (0x40) bytes. Adding .crt0_header section. Offset: 64 (0x40). Length: 64 (0x40) bytes.
Entry point is in .text section Entry point is in .text section
Adding .text section. Offset: 128 (0x80). Length: 187008 (0x2da80) bytes. Adding .text section. Offset: 128 (0x80). Length: 187344 (0x2dbd0) bytes.
Adding .stack section. Offset: 187136 (0x2db00). Length: 16384 (0x4000) bytes. Adding .stack section. Offset: 187472 (0x2dc50). Length: 16384 (0x4000) bytes.
Searching for .rel.X sections to add. Searching for .rel.X sections to add.
TBF Header: TBF Header:
version: 2 0x2 version: 2 0x2
@@ -54,8 +54,8 @@ Min RAM size from segments in ELF: 20 bytes
Number of writeable flash regions: 0 Number of writeable flash regions: 0
Adding .crt0_header section. Offset: 64 (0x40). Length: 64 (0x40) bytes. Adding .crt0_header section. Offset: 64 (0x40). Length: 64 (0x40) bytes.
Entry point is in .text section Entry point is in .text section
Adding .text section. Offset: 128 (0x80). Length: 187008 (0x2da80) bytes. Adding .text section. Offset: 128 (0x80). Length: 187344 (0x2dbd0) bytes.
Adding .stack section. Offset: 187136 (0x2db00). Length: 16384 (0x4000) bytes. Adding .stack section. Offset: 187472 (0x2dc50). Length: 16384 (0x4000) bytes.
Searching for .rel.X sections to add. Searching for .rel.X sections to add.
TBF Header: TBF Header:
version: 2 0x2 version: 2 0x2
@@ -78,8 +78,8 @@ Min RAM size from segments in ELF: 20 bytes
Number of writeable flash regions: 0 Number of writeable flash regions: 0
Adding .crt0_header section. Offset: 64 (0x40). Length: 64 (0x40) bytes. Adding .crt0_header section. Offset: 64 (0x40). Length: 64 (0x40) bytes.
Entry point is in .text section Entry point is in .text section
Adding .text section. Offset: 128 (0x80). Length: 187008 (0x2da80) bytes. Adding .text section. Offset: 128 (0x80). Length: 187344 (0x2dbd0) bytes.
Adding .stack section. Offset: 187136 (0x2db00). Length: 16384 (0x4000) bytes. Adding .stack section. Offset: 187472 (0x2dc50). Length: 16384 (0x4000) bytes.
Searching for .rel.X sections to add. Searching for .rel.X sections to add.
TBF Header: TBF Header:
version: 2 0x2 version: 2 0x2