From 0fc79af6b25c60313e68fc145bd53dd9abe3c06d Mon Sep 17 00:00:00 2001
From: noseglasses <shinynoseglasses@gmail.com>
Date: Fri, 22 Dec 2017 17:04:14 +0100
Subject: [PATCH 1/2] Added name demangling in disassemblies

---
 bin/kaleidoscope-builder | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/bin/kaleidoscope-builder b/bin/kaleidoscope-builder
index 666d05cb..32785dc3 100755
--- a/bin/kaleidoscope-builder
+++ b/bin/kaleidoscope-builder
@@ -220,13 +220,17 @@ size_map () {
     "${AVR_NM}" --size-sort -C -r -l "${ELF_FILE_PATH}"
 }
 
-decompile () {
+disassembly () {
 
     if [ ! -e "${HEX_FILE_PATH}" ]; then
         compile
     fi
 
-    "${AVR_OBJDUMP}" -d "${ELF_FILE_PATH}"
+    "${AVR_OBJDUMP}" -C -d "${ELF_FILE_PATH}"
+}
+
+decompile () {
+    disassembly
 }
 
 clean () {

From 0dd1f498415510698eddc4b659de969a541bb523 Mon Sep 17 00:00:00 2001
From: Jesse Vincent <jesse@keyboard.io>
Date: Fri, 22 Dec 2017 12:58:16 -0800
Subject: [PATCH 2/2] "disassembly" -> "disassemble" to better match the
 phrasing of other targets.

(also, fixed the usage)
---
 bin/kaleidoscope-builder | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/bin/kaleidoscope-builder b/bin/kaleidoscope-builder
index 32785dc3..bd28ed52 100755
--- a/bin/kaleidoscope-builder
+++ b/bin/kaleidoscope-builder
@@ -220,7 +220,7 @@ size_map () {
     "${AVR_NM}" --size-sort -C -r -l "${ELF_FILE_PATH}"
 }
 
-disassembly () {
+disassemble () {
 
     if [ ! -e "${HEX_FILE_PATH}" ]; then
         compile
@@ -230,7 +230,7 @@ disassembly () {
 }
 
 decompile () {
-    disassembly
+    disassemble
 }
 
 clean () {
@@ -280,7 +280,7 @@ Available commands:
   size-map
     Displays the size map for the sketch.
 
-  decomple
+  disassemble
     Decompile the sketch.
 
   reset-device