Embed hash of .hex template and the program in the generate .hex file (in prep for partial flashing).

embedded/bytecode.ts

@@ -58,7 +58,7 @@ module TDev.AST.Bytecode
             Util.oops("bad bytes " + bytes)
     }
 
-    var currentSetup = null;
+    var currentSetup:string = null;
     export function setupFor(extInfo:ExtensionInfo, bytecodeInfo:any)
     {
         if (isSetupFor(extInfo))
@@ -590,7 +590,11 @@ module TDev.AST.Bytecode
                 return bytes
             }
 
-            var hd = [0x4206, this.globals.length, bytecodeStartAddr & 0xffff, bytecodeStartAddr >>> 16, 0, 0, 0, 0]
+            var hd = [0x4207, this.globals.length, bytecodeStartAddr & 0xffff, bytecodeStartAddr >>> 16]
+            var tmp = hexTemplateHash()
+            for (var i = 0; i < 4; ++i)
+                hd.push(parseInt(swapBytes(tmp.slice(i * 4, i * 4 + 4)), 16))
+
             myhex[jmpStartIdx] = hexBytes(nextLine(hd, jmpStartAddr))
 
             ptr = 0
@@ -671,10 +675,13 @@ module TDev.AST.Bytecode
             Util.assert(this.csource == "");
 
             this.emit("; start")
+            this.emit(".hex 708E3B92C615A841C49866C975EE5197")
+            this.emit(".hex " + hexTemplateHash() + " ; hex template hash")
+            this.emit(".hex 0000000000000000 ; @SRCHASH@")
+            this.emit(".space 16 ; reserved")
 
             this.procs.forEach(p => {
-                this.csource += "\n"
-                this.csource += p.body
+                this.csource += "\n" + p.body
             })
 
             this.csource += this.stringsBody
@@ -682,6 +689,12 @@ module TDev.AST.Bytecode
             this.emit("_program_end:");
         }
 
+        patchSrcHash()
+        {
+            var srcSha = Random.sha256buffer(Util.stringToUint8Array(Util.toUTF8(this.csource)))
+            this.csource = this.csource.replace(/\n.*@SRCHASH@\n/, "\n    .hex " + srcSha.slice(0, 16).toUpperCase() + " ; program hash\n")
+        }
+
         addSource(meta:string, blob:Uint8Array)
         {
             var metablob = Util.stringToUint8Array(Util.toUTF8(meta))
@@ -692,10 +705,7 @@ module TDev.AST.Bytecode
             }
 
             this.emit(".balign 16");
-            this.emit(".short 0x1441");
-            this.emit(".short 0x2f0e");
-            this.emit(".short 0x2fb8");
-            this.emit(".short 0xbba2");
+            this.emit(".hex 41140E2FB82FA2BB");
             this.emit(".short " + metablob.length);
             this.emit(".short " + blob.length);
             this.emit(".short 0"); // future use
@@ -901,6 +911,8 @@ module TDev.AST.Bytecode
             if (metainfo != null && blob != null)
                 lenSrc = this.binary.addSource(metainfo, blob);
 
+            this.binary.patchSrcHash()
+
             var sourceSaved = lenSrc > 0;
             this.binary.assemble()
 
@@ -1779,6 +1791,13 @@ module TDev.AST.Bytecode
         return s + "\n"
     }
 
+    function hexTemplateHash()
+    {
+        var sha = currentSetup ? currentSetup.slice(0, 16) : ""
+        while (sha.length < 16) sha += "0"
+        return sha.toUpperCase()
+    }
+
     function emptyExtInfo()
     {
         return <ExtensionInfo> {

embedded/thumb.ts

@@ -507,6 +507,23 @@ module TDev.AST.Thumb
             }
         }
         
+        private emitHex(words:string[])
+        {
+            words.slice(1).forEach(w => {
+                if (w == ",") return
+                if (w.length % 4 != 0)
+                    this.directiveError(".hex needs an even number of bytes")
+                else if (!/^[a-f0-9]+$/i.test(w))
+                    this.directiveError(".hex needs a hex number")
+                else
+                    for (var i = 0; i < w.length; i += 4) {
+                        var n = parseInt(w.slice(i, i + 4), 16)
+                        n = ((n & 0xff) << 8) | ((n >> 8) & 0xff)
+                        this.emitShort(n)
+                    }
+            })
+        }
+        
         private handleDirective(l:Line)
         {
             var words = l.words;
@@ -551,6 +568,9 @@ module TDev.AST.Thumb
                 case ".byte":
                     this.emitBytes(words);
                     break;
+                case ".hex":
+                    this.emitHex(words);
+                    break;
                 case ".hword":
                 case ".short":
                 case ".2bytes":

rt/cloud.ts

@@ -4,7 +4,7 @@ module TDev.Cloud {
     export var lite = true;
     export var fullTD = true;
     export var litePermissions:StringMap<boolean> = {};
-    export var microbitGitTag = "v42";
+    export var microbitGitTag = "v43";
 
     export var _migrate: () => void;