pxt-core 11.3.30 → 11.3.32

package/built/pxt.js

@@ -122401,7 +122401,7 @@ var ts;
                     }
                     return r;
                 }
-                getSource(clean, numStmts = 1, flashSize = 0) {
+                getSource(clean, numStmts = 1, flashUsableEnd = 0) {
                     let lenPrev = 0;
                     let size = (lbl) => {
                         let curr = this.labels[lbl] || lenPrev;
@@ -122415,14 +122415,14 @@ var ts;
                     let lenVtables = size("_vtables_end");
                     let lenLiterals = size("_literals_end");
                     let lenAllCode = lenPrev;
-                    let totalSize = (lenTotal + this.baseOffset) & 0xffffff;
-                    if (flashSize && totalSize > flashSize) {
-                        const e = new Error(lf("program too big by {0} bytes!", totalSize - flashSize));
+                    let totalEnd = (lenTotal + this.baseOffset) & 0xffffff;
+                    if (flashUsableEnd && totalEnd > flashUsableEnd) {
+                        const e = new Error(lf("program too big by {0} bytes!", totalEnd - flashUsableEnd));
                         e.ksErrorCode = 9283;
                         throw e;
                     }
-                    flashSize = flashSize || 128 * 1024;
-                    let totalInfo = lf("; total bytes: {0} ({1}% of {2}k flash with {3} free)", totalSize, (100 * totalSize / flashSize).toFixed(1), (flashSize / 1024).toFixed(1), flashSize - totalSize);
+                    flashUsableEnd = flashUsableEnd || 128 * 1024;
+                    let totalInfo = lf("; total bytes: {0} ({1}% of {2}k flash with {3} free)", totalEnd, (100 * totalEnd / flashUsableEnd).toFixed(1), (flashUsableEnd / 1024).toFixed(1), flashUsableEnd - totalEnd);
                     let res = 
                     // ARM-specific
                     lf("; generated code sizes (bytes): {0} (incl. {1} user, {2} helpers, {3} vtables, {4} lits); src size {5}\n", lenAllCode, lenCode, lenHelpers, lenVtables, lenLiterals, lenTotal - lenAllCode) +
@@ -139691,9 +139691,10 @@ ${hexfile.hexPrelude()}
         function assemble(target, bin, src) {
             let b = mkProcessorFile(target);
             b.emit(src);
+            let flashUsableEnd = target.flashUsableEnd ? target.flashUsableEnd : target.flashEnd;
             src = `; Interface tables: ${bin.itFullEntries}/${bin.itEntries} (${Math.round(100 * bin.itFullEntries / bin.itEntries)}%)\n` +
                 `; Virtual methods: ${bin.numVirtMethods} / ${bin.numMethods}\n` +
-                b.getSource(!peepDbg, bin.numStmts, target.flashEnd);
+                b.getSource(!peepDbg, bin.numStmts, flashUsableEnd);
             throwAssemblerErrors(b);
             return {
                 src: src,

package/built/pxtcompiler.js

@@ -16083,9 +16083,10 @@ ${hexfile.hexPrelude()}
         function assemble(target, bin, src) {
             let b = mkProcessorFile(target);
             b.emit(src);
+            let flashUsableEnd = target.flashUsableEnd ? target.flashUsableEnd : target.flashEnd;
             src = `; Interface tables: ${bin.itFullEntries}/${bin.itEntries} (${Math.round(100 * bin.itFullEntries / bin.itEntries)}%)\n` +
                 `; Virtual methods: ${bin.numVirtMethods} / ${bin.numMethods}\n` +
-                b.getSource(!peepDbg, bin.numStmts, target.flashEnd);
+                b.getSource(!peepDbg, bin.numStmts, flashUsableEnd);
             throwAssemblerErrors(b);
             return {
                 src: src,

package/built/pxtlib.d.ts

@@ -3788,7 +3788,7 @@ declare namespace ts.pxtc.assembler {
         private iterLines;
         getSourceMap(): pxt.Map<number[]>;
         getCodeSizeStats(): string;
-        getSource(clean: boolean, numStmts?: number, flashSize?: number): string;
+        getSource(clean: boolean, numStmts?: number, flashUsableEnd?: number): string;
         private peepHole;
         private clearLabels;
         private peepPass;

package/built/pxtlib.js

@@ -24715,7 +24715,7 @@ var ts;
                     }
                     return r;
                 }
-                getSource(clean, numStmts = 1, flashSize = 0) {
+                getSource(clean, numStmts = 1, flashUsableEnd = 0) {
                     let lenPrev = 0;
                     let size = (lbl) => {
                         let curr = this.labels[lbl] || lenPrev;
@@ -24729,14 +24729,14 @@ var ts;
                     let lenVtables = size("_vtables_end");
                     let lenLiterals = size("_literals_end");
                     let lenAllCode = lenPrev;
-                    let totalSize = (lenTotal + this.baseOffset) & 0xffffff;
-                    if (flashSize && totalSize > flashSize) {
-                        const e = new Error(lf("program too big by {0} bytes!", totalSize - flashSize));
+                    let totalEnd = (lenTotal + this.baseOffset) & 0xffffff;
+                    if (flashUsableEnd && totalEnd > flashUsableEnd) {
+                        const e = new Error(lf("program too big by {0} bytes!", totalEnd - flashUsableEnd));
                         e.ksErrorCode = 9283;
                         throw e;
                     }
-                    flashSize = flashSize || 128 * 1024;
-                    let totalInfo = lf("; total bytes: {0} ({1}% of {2}k flash with {3} free)", totalSize, (100 * totalSize / flashSize).toFixed(1), (flashSize / 1024).toFixed(1), flashSize - totalSize);
+                    flashUsableEnd = flashUsableEnd || 128 * 1024;
+                    let totalInfo = lf("; total bytes: {0} ({1}% of {2}k flash with {3} free)", totalEnd, (100 * totalEnd / flashUsableEnd).toFixed(1), (flashUsableEnd / 1024).toFixed(1), flashUsableEnd - totalEnd);
                     let res = 
                     // ARM-specific
                     lf("; generated code sizes (bytes): {0} (incl. {1} user, {2} helpers, {3} vtables, {4} lits); src size {5}\n", lenAllCode, lenCode, lenHelpers, lenVtables, lenLiterals, lenTotal - lenAllCode) +