pxt-core 8.2.3 → 8.2.6

package/built/pxtblockly.js

@@ -12931,9 +12931,6 @@ var pxtblockly;
                 }
             }
             containerSize.height += addedHeight;
-            if (this.sourceBlock_.RTL) {
-                Blockly.utils.uiMenu.adjustBBoxesForRTL(viewportBBox, anchorBBox, containerSize);
-            }
             // Position the menu.
             Blockly.WidgetDiv.positionWithAnchor(viewportBBox, anchorBBox, containerSize, this.sourceBlock_.RTL);
             //            (<any>scrollContainer).focus();
@@ -15424,6 +15421,8 @@ var pxtblockly;
                 this.options.interpolationFieldName = "interpolation";
             if (!this.options.effectFieldName)
                 this.options.effectFieldName = "effect";
+            if (!this.options.useMixerSynthesizer)
+                this.options.useMixerSynthesizer = false;
             this.redrawPreview();
             if (this.sourceBlock_.workspace) {
                 this.workspace = this.sourceBlock_.workspace;
@@ -15540,7 +15539,8 @@ var pxtblockly;
                     this.updateSiblingBlocks(newSound);
                     this.redrawPreview();
                 },
-                initialSound: initialSound
+                initialSound: initialSound,
+                useMixerSynthesizer: isTrue(this.options.useMixerSynthesizer)
             };
             const fv = pxt.react.getFieldEditorView("soundeffect-editor", initialSound, opts, widgetDiv);
             const block = this.sourceBlock_;
@@ -15734,6 +15734,23 @@ var pxtblockly;
     function reverseLookup(map, value) {
         return Object.keys(map).find(k => map[k] === value);
     }
+    function isTrue(value) {
+        if (!value)
+            return false;
+        if (typeof value === "string") {
+            switch (value.toLowerCase().trim()) {
+                case "1":
+                case "yes":
+                case "y":
+                case "on":
+                case "true":
+                    return true;
+                default:
+                    return false;
+            }
+        }
+        return !!value;
+    }
 })(pxtblockly || (pxtblockly = {}));
 /// <reference path="../../localtypings/blockly.d.ts"/>
 /// <reference path="../../built/pxtsim.d.ts"/>

package/built/pxtblocks.d.ts

@@ -1187,6 +1187,7 @@ declare namespace pxtblockly {
         waveFieldName: string;
         interpolationFieldName: string;
         effectFieldName: string;
+        useMixerSynthesizer: any;
     }
     class FieldSoundEffect extends FieldBase<FieldSoundEffectParams> {
         protected mostRecentValue: pxt.assets.Sound;

package/built/pxtblocks.js

@@ -9369,9 +9369,6 @@ var pxtblockly;
                 }
             }
             containerSize.height += addedHeight;
-            if (this.sourceBlock_.RTL) {
-                Blockly.utils.uiMenu.adjustBBoxesForRTL(viewportBBox, anchorBBox, containerSize);
-            }
             // Position the menu.
             Blockly.WidgetDiv.positionWithAnchor(viewportBBox, anchorBBox, containerSize, this.sourceBlock_.RTL);
             //            (<any>scrollContainer).focus();
@@ -11862,6 +11859,8 @@ var pxtblockly;
                 this.options.interpolationFieldName = "interpolation";
             if (!this.options.effectFieldName)
                 this.options.effectFieldName = "effect";
+            if (!this.options.useMixerSynthesizer)
+                this.options.useMixerSynthesizer = false;
             this.redrawPreview();
             if (this.sourceBlock_.workspace) {
                 this.workspace = this.sourceBlock_.workspace;
@@ -11978,7 +11977,8 @@ var pxtblockly;
                     this.updateSiblingBlocks(newSound);
                     this.redrawPreview();
                 },
-                initialSound: initialSound
+                initialSound: initialSound,
+                useMixerSynthesizer: isTrue(this.options.useMixerSynthesizer)
             };
             const fv = pxt.react.getFieldEditorView("soundeffect-editor", initialSound, opts, widgetDiv);
             const block = this.sourceBlock_;
@@ -12172,6 +12172,23 @@ var pxtblockly;
     function reverseLookup(map, value) {
         return Object.keys(map).find(k => map[k] === value);
     }
+    function isTrue(value) {
+        if (!value)
+            return false;
+        if (typeof value === "string") {
+            switch (value.toLowerCase().trim()) {
+                case "1":
+                case "yes":
+                case "y":
+                case "on":
+                case "true":
+                    return true;
+                default:
+                    return false;
+            }
+        }
+        return !!value;
+    }
 })(pxtblockly || (pxtblockly = {}));
 /// <reference path="../../localtypings/blockly.d.ts"/>
 /// <reference path="../../built/pxtsim.d.ts"/>

package/built/pxtcompiler.d.ts

@@ -121,6 +121,7 @@ declare namespace ts.pxtc {
         private emitFieldAccess;
         private writeFailBranch;
         private emitClassCall;
+        private helperObject;
         private emitBindHelper;
         private ifaceCallCore;
         private emitIfaceCall;

package/built/pxtcompiler.js

@@ -665,6 +665,7 @@ var ts;
                 const info = utf8AsmStringLiteral(strLit);
                 return `
             .balign 4
+            .object ${lbl}
             ${lbl}: ${this.obj_header(info.vt)}
             ${info.asm}
 `;
@@ -675,6 +676,7 @@ var ts;
                 const align = /f{16}/i.test(data) ? 8 : 4;
                 return `
 .balign ${align}
+.object ${lbl}
 ${lbl}: ${this.obj_header("pxt::buffer_vt")}
 ${hexLiteralAsm(data)}
 `;
@@ -784,6 +786,7 @@ ${hexLiteralAsm(data)}
 ;
 `);
                 let baseLabel = this.proc.label();
+                this.write(`.object ${baseLabel} ${JSON.stringify(this.proc.getFullName())}`);
                 let preLabel = baseLabel + "_pre";
                 let bkptLabel = baseLabel + "_bkpt";
                 let locLabel = baseLabel + "_locals";
@@ -1148,9 +1151,13 @@ ${baseLabel}_nochk:
                     this.writeFailBranch();
                 });
             }
+            helperObject(desc) {
+                return `.object _pxt_helper_${desc.replace(/[^\w]+/g, "_")} "helper: ${desc}"`;
+            }
             emitBindHelper() {
                 const maxArgs = 12;
                 this.write(`
+                ${this.helperObject("bind")}
                 .section code
                 _pxt_bind_helper:
                     push {r0, r2}
@@ -1625,6 +1632,7 @@ ${baseLabel}_nochk:
             emitFieldMethods() {
                 for (let op of ["get", "set"]) {
                     this.write(`
+                ${this.helperObject(op)}
                 .section code
                 _pxt_map_${op}:
                 `);
@@ -1666,6 +1674,7 @@ ${baseLabel}_nochk:
             }
             emitArrayMethod(op, isBuffer) {
                 this.write(`
+            ${this.helperObject(op + " " + (isBuffer ? "buffer" : "array"))}
             .section code
             _pxt_${isBuffer ? "buffer" : "array"}_${op}:
             `);
@@ -1750,6 +1759,7 @@ ${baseLabel}_nochk:
             emitLambdaTrampoline() {
                 let r3 = pxtc.target.stackAlign ? "r3," : "";
                 this.write(`
+            ${this.helperObject("trampoline")}
             .section code
             _pxt_lambda_trampoline:
                 push {${r3} r4, r5, r6, r7, lr}
@@ -1789,6 +1799,7 @@ ${baseLabel}_nochk:
                 mov r11, r7
                 pop {${r3} r4, r5, r6, r7, pc}`);
                 this.write(`
+            ${this.helperObject("exn")}
             .section code
             ; r0 - try frame
             ; r1 - handler PC
@@ -1817,6 +1828,7 @@ ${baseLabel}_nochk:
                 bx r1
                 `);
                 this.write(`
+            ${this.helperObject("stringconv")}
             .section code
             _pxt_stringConv:
             `);
@@ -3131,6 +3143,7 @@ _numops_fromInt:
                     // this make sure to set the Z flag correctly
                     r += `
 .section code
+.object _pxt_helper_cmp_${op}
 _cmp_${op}:
     lsls r2, r0, #31
     beq .boxed
@@ -7716,7 +7729,8 @@ var ts;
                                 lbl = "_ldlit_" + ++seq;
                                 values[v] = lbl;
                             }
-                            line.update(`ldr ${reg}, ${lbl}`);
+                            line.ldlitLabel = line.words[3];
+                            line.update(`ldr ${reg}, ${lbl} ; ${line.ldlitLabel}`);
                         }
                         if (line === nextGoodSpot) {
                             nextGoodSpot = null;
@@ -7724,6 +7738,7 @@ var ts;
                             let jmplbl = "_jmpwords_" + ++seq;
                             if (needsJumpOver)
                                 txtLines.push("bb " + jmplbl);
+                            txtLines.push(`.object PUSH`);
                             txtLines.push(".balign 4");
                             for (let v of Object.keys(values)) {
                                 let lbl = values[v];
@@ -7731,6 +7746,7 @@ var ts;
                             }
                             if (needsJumpOver)
                                 txtLines.push(jmplbl + ":");
+                            txtLines.push(`.object POP`);
                             for (let t of txtLines) {
                                 f.buildLine(t, outlines);
                                 let ll = outlines[outlines.length - 1];
@@ -9025,7 +9041,7 @@ var ts;
         function inspect(n) {
             console.log(stringKind(n));
         }
-        // next free error 9283
+        // next free error 9284
         function userError(code, msg, secondary = false) {
             let e = new Error(msg);
             e.ksEmitterUserError = true;
@@ -15195,7 +15211,8 @@ var ts;
                         asmLabels[lbl] = true;
                         return "";
                     });
-                    let code = ".section code\n" +
+                    let code = ".object inlineasm\n" +
+                        ".section code\n" +
                         "@stackmark func\n" +
                         "@scope user" + asmIdx++ + "\n" +
                         src + "\n" +
@@ -15728,6 +15745,7 @@ var ts;
             for (let data of Object.keys(bin.doubles)) {
                 let lbl = bin.doubles[data];
                 bin.otherLiterals.push(`
+.object ${lbl}
 .balign 4
 ${lbl}: ${snippets.obj_header("pxt::number_vt")}
         .hex ${data}
@@ -15820,6 +15838,7 @@ ${lbl}: ${snippets.obj_header("pxt::number_vt")}
             //    ifaceInfo.mult = 0
             let ptrSz = pxtc.target.shortPointers ? ".short" : ".word";
             let s = `
+        .object ${info.id}_VT
         .balign 4
 ${info.id}_VT:
         .short ${info.allfields.length * 4 + 4}  ; size in bytes
@@ -15917,14 +15936,18 @@ ${hexfile.hexPrelude()}
             asmsource += hexfile.asmTotalSource; // user-supplied asm
             asmsource += "_code_end:\n\n";
             pxtc.U.iterMap(bin.codeHelpers, (code, lbl) => {
-                asmsource += `    .section code\n${lbl}:\n${code}\n`;
+                asmsource +=
+                    `    .section code\n` +
+                        `    .object _code_helper_${lbl}\n` +
+                        `${lbl}:\n` +
+                        `${code}\n`;
             });
             asmsource += snippets.arithmetic();
             asmsource += "_helpers_end:\n\n";
             bin.usedClassInfos.forEach(info => {
                 asmsource += vtableToAsm(info, opts, bin);
             });
-            asmsource += `\n.balign 4\n_pxt_iface_member_names:\n`;
+            asmsource += `\n.balign 4\n.object _pxt_iface_member_names\n_pxt_iface_member_names:\n`;
             asmsource += `    .word ${bin.ifaceMembers.length}\n`;
             let idx = 0;
             for (let d of bin.ifaceMembers) {
@@ -15933,7 +15956,7 @@ ${hexfile.hexPrelude()}
             }
             asmsource += `    .word 0\n`;
             asmsource += "_vtables_end:\n\n";
-            asmsource += `\n.balign 4\n_pxt_config_data:\n`;
+            asmsource += `\n.balign 4\n.object _pxt_config_data\n_pxt_config_data:\n`;
             const cfg = bin.res.configData || [];
             // asmsource += `    .word ${cfg.length}, 0 ; num. entries`
             for (let d of cfg) {
@@ -15942,7 +15965,7 @@ ${hexfile.hexPrelude()}
             asmsource += `    .word 0\n\n`;
             emitStrings(snippets, bin);
             asmsource += bin.otherLiterals.join("");
-            asmsource += `\n.balign 4\n.section code\n_pxt_perf_counters:\n`;
+            asmsource += `\n.balign 4\n.section code\n.object _perf_counters\n_pxt_perf_counters:\n`;
             asmsource += `    .word ${perfCounters.length}\n`;
             let strs = "";
             for (let i = 0; i < perfCounters.length; ++i) {
@@ -15975,6 +15998,8 @@ ${hexfile.hexPrelude()}
             b.ei.testAssembler(); // just in case
             if (target.switches.noPeepHole)
                 b.disablePeepHole = true;
+            if (target.switches.size)
+                b.codeSizeStats = true;
             b.lookupExternalLabel = hexfile.lookupFunctionAddr;
             b.normalizeExternalLabel = s => {
                 let inf = hexfile.lookupFunc(s);
@@ -16035,6 +16060,7 @@ ${hexfile.hexPrelude()}
             }
             return `
     .balign 16
+    .object _stored_program
 _stored_program: .hex ${res}
 `;
         }
@@ -18582,7 +18608,7 @@ var ts;
                         }
                         const type = checker === null || checker === void 0 ? void 0 : checker.getTypeAtLocation(param);
                         const typeSymbol = service.getPxtSymbolFromTsSymbol(type === null || type === void 0 ? void 0 : type.symbol, apis, checker);
-                        if ((typeSymbol === null || typeSymbol === void 0 ? void 0 : typeSymbol.attributes.fixedInstances) && python) {
+                        if (((typeSymbol === null || typeSymbol === void 0 ? void 0 : typeSymbol.attributes.fixedInstances) || (typeSymbol === null || typeSymbol === void 0 ? void 0 : typeSymbol.attributes.emitAsConstant)) && python) {
                             return pxt.Util.snakify(paramDefl);
                         }
                         if (python) {

package/built/pxteditor.d.ts

@@ -377,6 +377,7 @@ declare namespace pxt.editor {
         renderUsbPairDialog?: (firmwareUrl?: string, failedOnce?: boolean) => any;
         renderIncompatibleHardwareDialog?: (unsupportedParts: string[]) => any;
         showUploadInstructionsAsync?: (fn: string, url: string, confirmAsync: (options: any) => Promise<number>) => Promise<void>;
+        showProgramTooLargeErrorAsync?: (variants: string[], confirmAsync: (options: any) => Promise<number>) => Promise<pxt.commands.RecompileOptions>;
         toolboxOptions?: IToolboxOptions;
         blocklyPatch?: (pkgTargetVersion: string, dom: Element) => void;
         webUsbPairDialogAsync?: (pairAsync: () => Promise<boolean>, confirmAsync: (options: any) => Promise<number>) => Promise<number>;

package/built/pxteditor.js

@@ -1055,7 +1055,8 @@ var pxt;
                     onClose: () => this.fv.hide(),
                     onSoundChange: (newValue) => this.value = newValue,
                     initialSound: this.value,
-                    useFlex: true
+                    useFlex: true,
+                    useMixerSynthesizer: pxt.appTarget.id !== "microbit" // FIXME
                 };
             }
         }

package/built/pxtlib.d.ts

@@ -878,6 +878,10 @@ declare namespace pxt.cloud {
     };
 }
 declare namespace pxt.commands {
+    interface RecompileOptions {
+        recompile: boolean;
+        useVariants: string[];
+    }
     interface DeployOptions {
         reportError: (e: string) => void;
         showNotification: (msg: string) => void;
@@ -899,6 +903,7 @@ declare namespace pxt.commands {
         helpUrl: string;
     };
     let showUploadInstructionsAsync: (fn: string, url: string, confirmAsync: (options: any) => Promise<number>, saveonly?: boolean) => Promise<void>;
+    let showProgramTooLargeErrorAsync: (variants: string[], confirmAsync: (options: any) => Promise<number>) => Promise<RecompileOptions>;
     let saveProjectAsync: (project: pxt.cpp.HexFile) => Promise<void>;
     let electronDeployAsync: (r: ts.pxtc.CompileResult) => Promise<void>;
     let webUsbPairDialogAsync: (pairAsync: () => Promise<boolean>, confirmAsync: (options: any) => Promise<number>) => Promise<number>;
@@ -2333,6 +2338,7 @@ declare namespace pxt.assets {
     const MAX_VOLUME = 255;
     function renderSoundPath(sound: pxt.assets.Sound, width: number, height: number): string;
     function renderWaveSnapshot(frequency: number, volume: number, wave: SoundWaveForm, width: number, height: number, timeBase: number): string;
+    function soundToInstructionBuffer(sound: Sound, fxSteps: number, fxRange: number): Uint8Array;
 }
 declare namespace pxt.streams {
     interface JsonStreamField {
@@ -3399,6 +3405,7 @@ declare namespace ts.pxtc.assembler {
         opcode: number;
         stack: number;
         isLong: boolean;
+        ldlitLabel: string;
         constructor(bin: File, text: string);
         getOpExt(): string;
         getOp(): string;
@@ -3436,10 +3443,17 @@ declare namespace ts.pxtc.assembler {
         disablePeepHole: boolean;
         stackAtLabel: pxt.Map<number>;
         private prevLabel;
+        codeSizeStats: boolean;
+        private labelToObject;
+        private idToObject;
+        private objSuspendStart;
+        private currObject;
+        private labelsToObjectDone;
         protected emitShort(op: number): void;
         protected emitOpCode(op: number): void;
         location(): number;
         pc(): number;
+        useLabel(name: string): void;
         parseOneInt(s: string): number;
         private looksLikeLabel;
         private scopedName;
@@ -3460,6 +3474,7 @@ declare namespace ts.pxtc.assembler {
         private prepLines;
         private iterLines;
         getSourceMap(): pxt.Map<number[]>;
+        getCodeSizeStats(): string;
         getSource(clean: boolean, numStmts?: number, flashSize?: number): string;
         private peepHole;
         private clearLabels;