Factorize code

ledger_device_sdk/src/lib.rs

@@ -135,7 +135,7 @@ impl<T> NVMData<T> {
     /// because a static mutable will be assumed to be located in
     /// RAM, and be accessed through the static base (r9)
     #[cfg(not(target_os = "nanos"))]
-    pub fn get_mut(&mut self) -> &mut T {
+    fn get_addr(&self) -> *mut T {
         use core::arch::asm;
         unsafe {
             // Compute offset in .nvm_data by taking the reference to
@@ -145,25 +145,22 @@ impl<T> NVMData<T> {
             asm!( "mov {}, r9", out(reg) static_base);
             let offset = (addr - static_base) as isize;
             let data_addr = (_nvm_data_start as *const u8).offset(offset);
-            let pic_addr =
-                ledger_secure_sdk_sys::pic(data_addr as *mut core::ffi::c_void) as *mut T;
+            ledger_secure_sdk_sys::pic(data_addr as *mut core::ffi::c_void) as *mut T
+        }
+    }
+
+    #[cfg(not(target_os = "nanos"))]
+    pub fn get_mut(&mut self) -> &mut T {
+        unsafe {
+            let pic_addr = self.get_addr();
             &mut *pic_addr.cast()
         }
     }
 
     #[cfg(not(target_os = "nanos"))]
     pub fn get_ref(&mut self) -> &T {
-        use core::arch::asm;
         unsafe {
-            // Compute offset in .nvm_data by taking the reference to
-            // self.data and subtracting r9
-            let addr = &self.data as *const T as u32;
-            let static_base: u32;
-            asm!( "mov {}, r9", out(reg) static_base);
-            let offset = (addr - static_base) as isize;
-            let data_addr = (_nvm_data_start as *const u8).offset(offset);
-            let pic_addr =
-                ledger_secure_sdk_sys::pic(data_addr as *mut core::ffi::c_void) as *const T;
+            let pic_addr = self.get_addr();
             &*pic_addr.cast()
         }
     }