aboutsummaryrefslogtreecommitdiff
path: root/tools
diff options
context:
space:
mode:
authorDamien George2019-04-08 15:20:56 +1000
committerDamien George2019-04-08 15:24:24 +1000
commit74ed06828f4f8d4ec5c04f5b551e90f2fccbd0f3 (patch)
treee2d014949e6cb33f1c673a008eda3bc17380fb9e /tools
parent4831e38c7e3f7b46be3282354c0f6051bb96f6e6 (diff)
tools/mpy-tool.py: Fix init of QStrWindow, and remove unused variable.
The qstr window size is not log-2 encoded, it's just the actual number (but in mpy-tool.py this didn't lead to an error because the size is just used to truncate the window so it doesn't grow arbitrarily large in memory). Addresses issue #4635.
Diffstat (limited to 'tools')
-rwxr-xr-xtools/mpy-tool.py5
1 files changed, 2 insertions, 3 deletions
diff --git a/tools/mpy-tool.py b/tools/mpy-tool.py
index b8e5297aa..c8216bb60 100755
--- a/tools/mpy-tool.py
+++ b/tools/mpy-tool.py
@@ -75,9 +75,9 @@ for n in qstrutil.static_qstr_list:
global_qstrs.append(QStrType(n))
class QStrWindow:
- def __init__(self, size_log2):
+ def __init__(self, size):
self.window = []
- self.size = 1 << size_log2
+ self.size = size
def push(self, val):
self.window = [val] + self.window[:self.size - 1]
@@ -633,7 +633,6 @@ def read_qstr_and_pack(f, bytecode, qstr_win):
bytecode.append(qst >> 8)
def read_bytecode(file, bytecode, qstr_win):
- QSTR_LAST_STATIC = len(qstrutil.static_qstr_list)
while not bytecode.is_full():
op = read_byte(file, bytecode)
f, sz = mp_opcode_format(bytecode.buf, bytecode.idx - 1, False)