commit 04661f269b0096c68ef058b9f88011d425f5e3a3
author Woyten <woyten.tielesch@online.de> Sat Dec 30 20:26:32 2017 +0100
committer Woyten <woyten.tielesch@online.de> Fri Feb 16 14:16:39 2018 +0100
tree 2588d4d57af4c874985ad3eb17420644c353635b
parent ad1a857cf75196e85e1b14d578ad5ad93945d7a5

Fix heap problems

layout.ld

diff --git a/layout.ld b/layout.ld
index 1e7c2e2..d1df370 100644
--- a/layout.ld
+++ b/layout.ld
@@ -15,7 +15,7 @@
  * actual location in flash where the app is placed.
  */
 MEMORY {
-    FLASH (rx) : ORIGIN = 0x00020038, LENGTH = PROG_LENGTH
+    FLASH (rx) : ORIGIN = 0x80000000, LENGTH = PROG_LENGTH
     SRAM (RWX) : ORIGIN = 0x00000000, LENGTH = RAM_LENGTH
 }
 

run_example.sh

diff --git a/run_example.sh b/run_example.sh
index 1c35b11..b2ed92a 100755
--- a/run_example.sh
+++ b/run_example.sh
@@ -1,5 +1,7 @@
 #!/usr/bin/env bash
 
+# Examples only run on a NRF52DK board
+
 set -eux
 
 tab_file_name=metadata.toml

src/lib.rs

diff --git a/src/lib.rs b/src/lib.rs
index 9384b24..63a5b5c 100644
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -1,4 +1,5 @@
-#![feature(asm,alloc,allocator_api,compiler_builtins_lib,const_fn,global_allocator,lang_items,naked_functions)]
+#![feature(asm, alloc, allocator_api, compiler_builtins_lib, const_fn, global_allocator,
+           lang_items, naked_functions)]
 #![no_std]
 
 pub mod syscalls;
@@ -24,9 +25,9 @@
 
 impl BaseHeap {
     pub unsafe fn heap(&self) -> &mut Heap {
-        let heap: &mut Heap;
+        let heap: *mut Heap;
         asm!("mov $0, r9" : "=r"(heap) : : : "volatile");
-        heap
+        &mut *heap
     }
 
     /// Initializes an empty heap
@@ -66,35 +67,18 @@
 #[doc(hidden)]
 #[no_mangle]
 #[naked]
-pub extern "C" fn _start(
-    mem_start: usize,
-    _app_heap_break: usize,
-    _kernel_memory_break: usize,
-) -> ! {
+pub extern "C" fn _start(mem_start: usize, app_heap_break: usize, kernel_memory_break: usize) -> ! {
     extern "C" {
         // NOTE `rustc` forces this signature on us. See `src/lang_items.rs`
         fn main(argc: isize, argv: *const *const u8) -> isize;
     }
 
     unsafe {
-        // Setup stack
-        /*
-        syscalls::memop(0, mem_start + 1024);
-
-        let new_stack = mem_start + 1024;
-        asm!("mov sp, $0" : : "r"(new_stack) : : "volatile");
-        syscalls::memop(10, new_stack);
-
         // Setup heap
-        let new_heap = align_up(new_stack, align_of::<Heap>());
-        asm!("mov r9, $0" : : "r"(new_heap) : : "volatile");
-        syscalls::memop(11, new_heap);
+        asm!("mov r9, $0" : : "r"(app_heap_break) : : "volatile"); // Removing this line will result in a crash that requires reflashing the ROM...
 
-        let end_of_mem = BaseHeap.init(1024);
-        syscalls::memop(0, end_of_mem);
+        BaseHeap.init(1024);
 
-        // arguments are not used in Tock applications
-        */
         main(0, ptr::null());
     }