From 744b7771d7207267095f8de954da90f549687fd7 Mon Sep 17 00:00:00 2001
From: Hammarkvast <tomham-3@student.ltu.se>
Date: Fri, 21 Feb 2020 09:50:02 +0100
Subject: [PATCH] bare1_3

---
 .vscode/launch.json |  4 ++--
 examples/bare1.rs   | 18 +++++++++++++++---
 2 files changed, 17 insertions(+), 5 deletions(-)

diff --git a/.vscode/launch.json b/.vscode/launch.json
index 94a7bff..97e02cd 100644
--- a/.vscode/launch.json
+++ b/.vscode/launch.json
@@ -100,8 +100,8 @@
             "preLaunchTask": "cargo build --examples --release",
             "executable": "./target/thumbv7em-none-eabihf/release/examples/${fileBasenameNoExtension}",
             "configFiles": [
-                "interface/stlink.cfg",
-                // "interface/stlink-v2-1.cfg", // deprecated setup script
+                //"interface/stlink.cfg",
+                 "interface/stlink-v2-1.cfg", // deprecated setup script
                 "target/stm32f4x.cfg"
             ],
             "postLaunchCommands": [
diff --git a/examples/bare1.rs b/examples/bare1.rs
index cdcbff4..9230820 100644
--- a/examples/bare1.rs
+++ b/examples/bare1.rs
@@ -116,15 +116,27 @@ fn main() -> ! {
 //    > disassemble
 //
 //    ** your answer here **
-//
+// Dump of assembler code for function bare1::__cortex_m_rt_main:
+// 0x08000406 <+0>:	sub	sp, #4
+// 0x08000408 <+2>:	mvn.w	r0, #1
+// 0x0800040c <+6>:	str	r0, [sp, #0]
+// 0x0800040e <+8>:	adds	r0, #1
+// 0x08000410 <+10>:	bkpt	0x0000
+// 0x08000412 <+12>:	str	r0, [sp, #0]
+// => 0x08000414 <+14>:	bkpt	0x0000
+// 0x08000416 <+16>:	ldr	r0, [sp, #0]
+// 0x08000418 <+18>:	b.n	0x800040e <bare1::__cortex_m_rt_main+8>
+// End of assembler dump.
+
+
 //    How many instructions are in between the two `bkpt` instructions.
 //
 //    ** your answer here **
-//
+//      Only one
 //    Where is the local variable stored?
 //
 //    ** your answer here **
-//
+//      at address #0
 //    commit your answers (bare1_3)
 //
 //    Discussion:
-- 
GitLab