pxt-common-packages 10.1.10 → 10.1.12

package/libs/base/core.cpp

@@ -208,10 +208,10 @@ static void setupSkipList(String r, const char *data, int packed) {
     auto len = r->skip.size;
     if (data)
         memcpy(dst, data, len);
-    #pragma GCC diagnostic push
-    #pragma GCC diagnostic ignored "-Wstringop-overflow"
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wstringop-overflow"
     dst[len] = 0;
-    #pragma GCC diagnostic pop
+#pragma GCC diagnostic pop
     const char *ptr = dst;
     auto skipEntries = PXT_NUM_SKIP_ENTRIES(r);
     auto lst = packed ? r->skip_pack.list : r->skip.list;
@@ -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) {
@@ -1763,15 +1775,21 @@ void anyPrint(TValue v) {
 static void dtorDoNothing() {}
 
 #define PRIM_VTABLE(name, objectTp, tp, szexpr)                                                    \
-    static uint32_t name##_size(tp *p) { return TOWORDS(sizeof(tp) + szexpr); }                    \
+    static uint32_t name##_size(tp *p) {                                                           \
+        return TOWORDS(sizeof(tp) + szexpr);                                                       \
+    }                                                                                              \
     DEF_VTABLE(name##_vt, tp, objectTp, (void *)&dtorDoNothing, (void *)&anyPrint, 0,              \
                (void *)&name##_size)
 
 #define NOOP ((void)0)
 
 #define STRING_VT(name, fix, scan, gcsize, data, utfsize, length, dataAt)                          \
-    static uint32_t name##_gcsize(BoxedString *p) { return TOWORDS(sizeof(void *) + (gcsize)); }   \
-    static void name##_gcscan(BoxedString *p) { scan; }                                            \
+    static uint32_t name##_gcsize(BoxedString *p) {                                                \
+        return TOWORDS(sizeof(void *) + (gcsize));                                                 \
+    }                                                                                              \
+    static void name##_gcscan(BoxedString *p) {                                                    \
+        scan;                                                                                      \
+    }                                                                                              \
     static const char *name##_data(BoxedString *p) {                                               \
         fix;                                                                                       \
         return data;                                                                               \
@@ -1932,6 +1950,8 @@ void dumpPerfCounters() {
     for (uint32_t i = 0; i < info->numPerfCounters; ++i) {
         auto c = &perfCounters[i];
         DMESG("%d,%d,%s", c->numstops, c->value, info->perfCounterNames[i]);
+        c->value = 0;
+        c->numstops = 0;
     }
 }
 
@@ -1950,7 +1970,7 @@ void stopPerfCounter(PerfCounters n) {
     auto c = &perfCounters[(uint32_t)n];
     if (!c->start)
         oops(51);
-    c->value += PERF_NOW() - c->start;
+    c->value += ((PERF_NOW() - c->start) & PERF_NOW_MASK) / PERF_NOW_SCALE;
     c->start = 0;
     c->numstops++;
 }

package/libs/base/eventcontext.ts

@@ -49,6 +49,7 @@ namespace control {
         private frameWorker: number;
         private framesInSample: number;
         private timeInSample: number;
+        private lastPerfDump: number;
         public deltaTimeMillis: number;
         private prevTimeMillis: number;
         private idleCallbacks: (() => void)[];
@@ -81,16 +82,19 @@ namespace control {
             for (let f of this.frameCallbacks) {
                 f.handler()
             }
-            let runtime = control.millis() - loopStart
+            const now = control.millis()
+            let runtime = now - loopStart
             this.timeInSample += runtime
             this.framesInSample++
             if (this.timeInSample > 1000 || this.framesInSample > 30) {
+                const realTimeInSample = now - this.lastPerfDump
+                this.lastPerfDump = now
                 const fps = this.framesInSample / (this.timeInSample / 1000);
                 EventContext.lastStats = `fps:${Math.round(fps)}`;
                 if (fps < 99)
                     EventContext.lastStats += "." + (Math.round(fps * 10) % 10)
-                if (control.ramSize() > 2000000 && control.profilingEnabled()) {
-                    control.dmesg(`${(fps * 100) | 0}/100 fps - ${this.framesInSample} frames`)
+                if (control.profilingEnabled()) {
+                    control.dmesg(`${(fps * 100) | 0}/100 fps - ${this.framesInSample} frames (${this.timeInSample}ms/${realTimeInSample}ms)`)
                     control.gc()
                     control.dmesgPerfCounters()
                 }

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/base/pxtbase.h

@@ -1020,6 +1020,14 @@ enum class PerfCounters {
 #error "missing platform timer support"
 #endif
 
+#ifndef PERF_NOW_MASK
+#define PERF_NOW_MASK 0xffffffff
+#endif
+
+#ifndef PERF_NOW_SCALE
+#define PERF_NOW_SCALE 1
+#endif
+
 struct PerfCounter {
     uint32_t value;
     uint32_t numstops;

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

@@ -56,7 +56,7 @@ const pxsim_pxtrt = pxsim.pxtrt;
 const pxsim_numops = pxsim.numops;
 
 
-function _main___P136215(s) {
+function _main___P136319(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___136458 = (undefined);
-    globals._pollEventQueue___136471 = (undefined);
+    globals._intervals___136562 = (undefined);
+    globals._pollEventQueue___136575 = (undefined);
     r0 = undefined;
     return leave(s, r0)
   default: oops()
 } } }
-_main___P136215.info = {"start":0,"length":0,"line":0,"column":0,"endLine":0,"endColumn":0,"fileName":"colorbuffer.ts","functionName":"<main>","argumentNames":[]}
-_main___P136215.continuations = [  ]
+_main___P136319.info = {"start":0,"length":0,"line":0,"column":0,"endLine":0,"endColumn":0,"fileName":"colorbuffer.ts","functionName":"<main>","argumentNames":[]}
+_main___P136319.continuations = [  ]
 
-function _main___P136215_mk(s) {
+function _main___P136319_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: _main___P136215, depth: s.depth + 1,
+        parent: s, fn: _main___P136319, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
 } }
 
@@ -88,5 +88,5 @@ function _main___P136215_mk(s) {
 
 const breakpoints = setupDebugger(1, [])
 
-return _main___P136215
+return _main___P136319
 })

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

@@ -56,7 +56,7 @@ const pxsim_pxtrt = pxsim.pxtrt;
 const pxsim_numops = pxsim.numops;
 
 
-function _main___P95247(s) {
+function _main___P95325(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___95490 = (undefined);
-    globals._pollEventQueue___95503 = (undefined);
+    globals._intervals___95568 = (undefined);
+    globals._pollEventQueue___95581 = (undefined);
     r0 = undefined;
     return leave(s, r0)
   default: oops()
 } } }
-_main___P95247.info = {"start":0,"length":0,"line":0,"column":0,"endLine":0,"endColumn":0,"fileName":"tcs34725.ts","functionName":"<main>","argumentNames":[]}
-_main___P95247.continuations = [  ]
+_main___P95325.info = {"start":0,"length":0,"line":0,"column":0,"endLine":0,"endColumn":0,"fileName":"tcs34725.ts","functionName":"<main>","argumentNames":[]}
+_main___P95325.continuations = [  ]
 
-function _main___P95247_mk(s) {
+function _main___P95325_mk(s) {
     checkStack(s.depth);
     return {
-        parent: s, fn: _main___P95247, depth: s.depth + 1,
+        parent: s, fn: _main___P95325, depth: s.depth + 1,
         pc: 0, retval: undefined, r0: undefined, overwrittenPC: false, lambdaArgs: null,
 } }
 
@@ -88,5 +88,5 @@ function _main___P95247_mk(s) {
 
 const breakpoints = setupDebugger(1, [])
 
-return _main___P95247
+return _main___P95325
 })