ARMmbed
/
mbed-os
mirror of https://github.com/ARMmbed/mbed-os.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Require endianness specification for ints > 8 bits

pull/5950/head
Jimmy Brisson 2018-02-02 16:21:48 -06:00
parent 4c47f21cac
commit 5b2d7a27d2
2 changed files with 13 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
tools/build_api.py
View File

@ -369,13 +369,18 @@ def _fill_header(region_list, current_region):
_, type, subtype, data = member
member_size = Config.header_member_size(member)
if type == "const":
fmt = {"8": "<B", "16": "<H", "32": "<L", "64": "<Q"}[subtype]
fmt = {
"8le": ">B", "16le": "<H", "32le": "<L", "64le": "<Q",
"8be": "<B", "16be": ">H", "32be": ">L", "64be": ">Q"
}[subtype]
header.puts(start, struct.pack(fmt, int(data, 0)))
elif type == "timestamp":
fmt = {"32": "<L", "64": "<Q"}[subtype]
fmt = {"32le": "<L", "64le": "<Q",
"32be": ">L", "64be": ">Q"}[subtype]
header.puts(start, struct.pack(fmt, time()))
elif type == "size":
fmt = {"32": "<L", "64": "<Q"}[subtype]
fmt = {"32le": "<L", "64le": "<Q",
"32be": ">L", "64be": ">Q"}[subtype]
size = sum(_real_region_size(region_dict[r]) for r in data)
header.puts(start, struct.pack(fmt, size))
start += Config.header_member_size(member)
@ -387,8 +392,9 @@ def _fill_header(region_list, current_region):
ih = header
else:
ih = intelhex_offset(region_dict[data].filename, offset=region_dict[data].start)
if subtype == "CRCITT32":
header.puts(start, struct.pack("<l", zlib.crc32(ih.tobinarray())))
if subtype.startswith("CRCITT32"):
fmt = {"CRCITT32be": ">l", "CRCITT32le": "<l"}[subtype]
header.puts(start, struct.pack(fmt, zlib.crc32(ih.tobinarray())))
elif subtype.startswith("SHA"):
if subtype == "SHA256":
hash = hashlib.sha256()

4
tools/config/__init__.py
View File

@ -573,9 +573,9 @@ class Config(object):
def header_member_size(member):
_, _, subtype, _ = member
try:
return int(subtype) // 8
return int(subtype[:-2]) // 8
except:
if subtype == "CRCITT32":
if subtype.startswith("CRCITT32"):
return 32 // 8
elif subtype == "SHA256":
return 256 // 8