pxt-common-packages 10.1.8 → 10.1.11

package/libs/base/core.cpp

@@ -1504,7 +1504,19 @@ int getConfig(int key, int defl) {
         return defl;
     int *cfgData = vmImg->configData;
 #else
-    int *cfgData = bytecode ? *(int **)&bytecode[18] : NULL;
+    int *cfgData = NULL;
+    if (bytecode) {
+        cfgData = *(int **)&bytecode[18];
+    } else {
+        // This happens when getConfig() is called before the TypeScript
+        // program starts (exec_binary()). One example is overriding heap size with:
+        // namespace userconfig { export const SYSTEM_HEAP_BYTES = 10000 }
+        unsigned *pc = (unsigned *)functionsAndBytecode;
+        if (*pc++ == 0x4210) {
+            uint16_t *bcode = *((uint16_t **)pc++);
+            cfgData = *(int **)&bcode[18];
+        }
+    }
 #endif
 
     if (cfgData) {

package/libs/base/gc.cpp

@@ -455,6 +455,7 @@ static GCBlock *allocateBlockCore() {
     auto lowMem = getConfig(CFG_LOW_MEM_SIMULATION_KB, 0);
     auto sysHeapSize = getConfig(CFG_SYSTEM_HEAP_BYTES, 4 * 1024);
     auto heapSize = GC_GET_HEAP_SIZE();
+    DMESG("heap: %d (minus %d sys bytes)", heapSize, sysHeapSize);
     sz = heapSize - sysHeapSize;
     if (lowMem) {
         auto memIncrement = 32 * 1024;

package/libs/color/built/debug/binary.js

@@ -56,7 +56,7 @@ const pxsim_pxtrt = pxsim.pxtrt;
 const pxsim_numops = pxsim.numops;
 
 
-function _main___P135987(s) {
+function _main___P136215(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -66,19 +66,19 @@ if (yieldSteps-- < 0 && maybeYield(s, step, r0) || runtime !== pxsim.runtime) re
 switch (step) {
   case 0:
 
-    globals._intervals___136230 = (undefined);
-    globals._pollEventQueue___136243 = (undefined);
+    globals._intervals___136458 = (undefined);
+    globals._pollEventQueue___136471 = (undefined);
     r0 = undefined;
     return leave(s, r0)
   default: oops()
 } } }
-_main___P135987.info = {"start":0,"length":0,"line":0,"column":0,"endLine":0,"endColumn":0,"fileName":"colorbuffer.ts","functionName":"<main>","argumentNames":[]}
-_main___P135987.continuations = [  ]
+_main___P136215.info = {"start":0,"length":0,"line":0,"column":0,"endLine":0,"endColumn":0,"fileName":"colorbuffer.ts","functionName":"<main>","argumentNames":[]}
+_main___P136215.continuations = [  ]
 
-function _main___P135987_mk(s) {
+function _main___P136215_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: _main___P135987, depth: s.depth + 1,
+        parent: s, fn: _main___P136215, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
 } }
 
@@ -88,5 +88,5 @@ function _main___P135987_mk(s) {
 
 const breakpoints = setupDebugger(1, [])
 
-return _main___P135987
+return _main___P136215
 })

package/libs/color-sensor/built/debug/binary.js

@@ -56,7 +56,7 @@ const pxsim_pxtrt = pxsim.pxtrt;
 const pxsim_numops = pxsim.numops;
 
 
-function _main___P95076(s) {
+function _main___P95247(s) {
 let r0 = s.r0, step = s.pc;
 s.pc = -1;
 
@@ -66,19 +66,19 @@ if (yieldSteps-- < 0 && maybeYield(s, step, r0) || runtime !== pxsim.runtime) re
 switch (step) {
   case 0:
 
-    globals._intervals___95319 = (undefined);
-    globals._pollEventQueue___95332 = (undefined);
+    globals._intervals___95490 = (undefined);
+    globals._pollEventQueue___95503 = (undefined);
     r0 = undefined;
     return leave(s, r0)
   default: oops()
 } } }
-_main___P95076.info = {"start":0,"length":0,"line":0,"column":0,"endLine":0,"endColumn":0,"fileName":"tcs34725.ts","functionName":"<main>","argumentNames":[]}
-_main___P95076.continuations = [  ]
+_main___P95247.info = {"start":0,"length":0,"line":0,"column":0,"endLine":0,"endColumn":0,"fileName":"tcs34725.ts","functionName":"<main>","argumentNames":[]}
+_main___P95247.continuations = [  ]
 
-function _main___P95076_mk(s) {
+function _main___P95247_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: _main___P95076, depth: s.depth + 1,
+        parent: s, fn: _main___P95247, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
 } }
 
@@ -88,5 +88,5 @@ function _main___P95076_mk(s) {
 
 const breakpoints = setupDebugger(1, [])
 
-return _main___P95076
+return _main___P95247
 })