Commit Diff


commit - 13a3b042737345e3ac9deda41f77aae41c110c77
commit + 953577a60a43f37a917990deebe3e6cd60d5a1e8
blob - 923e2284830d1e0a67f22a19c83b24935c8803ef (mode 644)
blob + 3ff75307a5be5ca7ff335ec71a51c48ed0dba999 (mode 755)
--- memtrace.py
+++ memtrace.py
@@ -1,3 +1,4 @@
+#! /usr/bin/env python3
 import sys
 
 from memtrace_calliope_trns import CalliopeDebugTransform
blob - 6d2402ec4454b1aafe950a1e1436f1b1858bae30
blob + 8f910855ef6a6cce63daa1ae1e222c92bbf208a1
--- memtrace_calliope_trns.py
+++ memtrace_calliope_trns.py
@@ -32,11 +32,11 @@ class CalliopeDebugTransform(Transform):
 
     def __init__(self):
         self.r_malloc = re.compile("(?:microbit_)?malloc:\s+(?:NATIVE\s+)?(?:ALLOCATED:)\s+(\d+)\s+\[(0x[0-9a-f]+)\]")
-        self.r_free = re.compile("^(?:microbit_)?free:\\s+((0x)?[0-9a-f]+)")
-        self.r_heap_start = re.compile("^heap_start\s+:\s+(0x[0-9a-f]+)")
-        self.r_heap_end = re.compile("^heap_end\s+:\s+(0x[0-9a-f]+)")
-        self.r_heap_size = re.compile("^heap_size\s+:\s+(\d+)")
-        self.r_oom = re.compile("^malloc:\s+OUT OF MEMORY\s+\[(\d+)\]")
+        self.r_free = re.compile("(?:microbit_)?free:\\s+((0x)?[0-9a-f]+)")
+        self.r_heap_start = re.compile("heap_start\s+:\s+(0x[0-9a-f]+)")
+        self.r_heap_end = re.compile("heap_end\s+:\s+(0x[0-9a-f]+)")
+        self.r_heap_size = re.compile("heap_size\s+:\s+(\d+)")
+        self.r_oom = re.compile("malloc:\s+OUT OF MEMORY\s+\[(\d+)\]")
 
     def rx(self, rx_input):
         # collect lines
@@ -152,4 +152,4 @@ class CalliopeDebugTransform(Transform):
             return out
 
         # print all other lines as is, so we can still use the log functionality
-        return line
+        return line + '\n'