Commit 594fa734 authored by Damien George's avatar Damien George
Browse files

py/makeqstrdata: Factor out some code to functions that can be reused.

parent ed0c1123
...@@ -45,7 +45,10 @@ def compute_hash(qstr, bytes_hash): ...@@ -45,7 +45,10 @@ def compute_hash(qstr, bytes_hash):
# Make sure that valid hash is never zero, zero means "hash not computed" # Make sure that valid hash is never zero, zero means "hash not computed"
return (hash & ((1 << (8 * bytes_hash)) - 1)) or 1 return (hash & ((1 << (8 * bytes_hash)) - 1)) or 1
def do_work(infiles): def qstr_escape(qst):
return re.sub(r'[^A-Za-z0-9_]', lambda s: "_" + codepoint2name[ord(s.group(0))] + '_', qst)
def parse_input_headers(infiles):
# read the qstrs in from the input files # read the qstrs in from the input files
qcfgs = {} qcfgs = {}
qstrs = {} qstrs = {}
...@@ -71,7 +74,7 @@ def do_work(infiles): ...@@ -71,7 +74,7 @@ def do_work(infiles):
# get the qstr value # get the qstr value
qstr = match.group(1) qstr = match.group(1)
ident = re.sub(r'[^A-Za-z0-9_]', lambda s: "_" + codepoint2name[ord(s.group(0))] + "_", qstr) ident = qstr_escape(qstr)
# don't add duplicates # don't add duplicates
if ident in qstrs: if ident in qstrs:
...@@ -84,10 +87,24 @@ def do_work(infiles): ...@@ -84,10 +87,24 @@ def do_work(infiles):
sys.stderr.write("ERROR: Empty preprocessor output - check for errors above\n") sys.stderr.write("ERROR: Empty preprocessor output - check for errors above\n")
sys.exit(1) sys.exit(1)
return qcfgs, qstrs
def make_bytes(cfg_bytes_len, cfg_bytes_hash, qstr):
qhash = compute_hash(qstr, cfg_bytes_hash)
# Calculate len of str, taking escapes into account
qlen = len(qstr.replace("\\\\", "-").replace("\\", ""))
qdata = qstr.replace('"', '\\"')
if qlen >= (1 << (8 * cfg_bytes_len)):
print('qstr is too long:', qstr)
assert False
qlen_str = ('\\x%02x' * cfg_bytes_len) % tuple(((qlen >> (8 * i)) & 0xff) for i in range(cfg_bytes_len))
qhash_str = ('\\x%02x' * cfg_bytes_hash) % tuple(((qhash >> (8 * i)) & 0xff) for i in range(cfg_bytes_hash))
return '(const byte*)"%s%s" "%s"' % (qhash_str, qlen_str, qdata)
def print_qstr_data(qcfgs, qstrs):
# get config variables # get config variables
cfg_bytes_len = int(qcfgs['BYTES_IN_LEN']) cfg_bytes_len = int(qcfgs['BYTES_IN_LEN'])
cfg_bytes_hash = int(qcfgs['BYTES_IN_HASH']) cfg_bytes_hash = int(qcfgs['BYTES_IN_HASH'])
cfg_max_len = 1 << (8 * cfg_bytes_len)
# print out the starter of the generated C header file # print out the starter of the generated C header file
print('// This file was automatically generated by makeqstrdata.py') print('// This file was automatically generated by makeqstrdata.py')
...@@ -98,16 +115,12 @@ def do_work(infiles): ...@@ -98,16 +115,12 @@ def do_work(infiles):
# go through each qstr and print it out # go through each qstr and print it out
for order, ident, qstr in sorted(qstrs.values(), key=lambda x: x[0]): for order, ident, qstr in sorted(qstrs.values(), key=lambda x: x[0]):
qhash = compute_hash(qstr, cfg_bytes_hash) qbytes = make_bytes(cfg_bytes_len, cfg_bytes_hash, qstr)
# Calculate len of str, taking escapes into account print('QDEF(MP_QSTR_%s, %s)' % (ident, qbytes))
qlen = len(qstr.replace("\\\\", "-").replace("\\", ""))
qdata = qstr.replace('"', '\\"') def do_work(infiles):
if qlen >= cfg_max_len: qcfgs, qstrs = parse_input_headers(infiles)
print('qstr is too long:', qstr) print_qstr_data(qcfgs, qstrs)
assert False
qlen_str = ('\\x%02x' * cfg_bytes_len) % tuple(((qlen >> (8 * i)) & 0xff) for i in range(cfg_bytes_len))
qhash_str = ('\\x%02x' * cfg_bytes_hash) % tuple(((qhash >> (8 * i)) & 0xff) for i in range(cfg_bytes_hash))
print('QDEF(MP_QSTR_%s, (const byte*)"%s%s" "%s")' % (ident, qhash_str, qlen_str, qdata))
if __name__ == "__main__": if __name__ == "__main__":
do_work(sys.argv[1:]) do_work(sys.argv[1:])
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment