improve coding style

consistent with other tools
pull/4438/head
Yuguo Zou 2017-02-24 15:21:32 +08:00 committed by Martin Kojtal
parent c20809492d
commit 9e9878f377
1 changed files with 22 additions and 22 deletions

View File

@ -26,12 +26,12 @@ from datetime import datetime
# Constant Variables
RAM2_RSVD = 0x3131373835393138
def write_fixed_width_string (value, width, output):
def write_fixed_width_string(value, width, output):
# cut string to list & reverse
line = [value[i:i+2] for i in range(0, len(value), 2)]
output.write("".join([chr(long(b, 16)) for b in line]))
def write_fixed_width_value (value, width, output):
def write_fixed_width_value(value, width, output):
# convert to string
line = format(value, '0%dx' %(width))
if len(line) > width:
@ -43,27 +43,27 @@ def write_fixed_width_value (value, width, output):
# convert to write buffer
output.write("".join([chr(long(b, 16)) for b in line]))
def append_image_file (image, output):
input = open (image, "rb")
def append_image_file(image, output):
input = open(image, "rb")
output.write(input.read())
input.close()
# ----------------------------
# main function
# ----------------------------
def prepend (image, sym_addr, image_prepend):
def prepend(image, sym_addr, image_prepend):
# parse input arguments
offset = 44
output_file = image_prepend
output = open (output_file, "wb")
output = open(output_file, "wb")
write_fixed_width_value (os.stat(image).st_size, 8, output)
write_fixed_width_value (int(sym_addr), 8, output)
write_fixed_width_value (RAM2_RSVD, 16, output)
write_fixed_width_value(os.stat(image).st_size, 8, output)
write_fixed_width_value(int(sym_addr), 8, output)
write_fixed_width_value(RAM2_RSVD, 16, output)
append_image_file (image, output)
append_image_file(image, output)
output.close()
def find_section(toolchain, elf, section):
@ -74,11 +74,11 @@ def find_section(toolchain, elf, section):
# .image2.table 0x[00000000]30000000 0x18
# 0x[00000000]30000000 __image2_start__ = .
# 0x[00000000]30000000 __image2_entry_func__ = .
with open (mapfile, 'r') as infile:
with open(mapfile, 'r') as infile:
# Search area to parse
for line in infile:
if line.startswith(section):
match = re.match (r'^' + section + \
match = re.match(r'^' + section + \
r'\s+0x0{,8}(?P<addr>[0-9A-Fa-f]{8})\s+.*$', line)
if match:
ret = match.group("addr")
@ -89,14 +89,14 @@ def find_section(toolchain, elf, section):
# Execution Region IMAGE2_TABLE (Base: 0x30000000, Size: 0x00000018, Max: 0xffffffff, ABSOLUTE, FIXED)
# Base Addr Size Type Attr Idx E Section Name Object
# 0x30000000 0x00000004 Data RO 5257 .image2.ram.data rtl8195a_init.o
with open (mapfile, 'r') as infile:
with open(mapfile, 'r') as infile:
# Search area to parse
for line in infile:
if line.startswith('Memory Map of the image'):
break
# Search section (block)
# Search section(block)
for line in infile:
match = re.match (r'^.*Region\s+' + section + \
match = re.match(r'^.*Region\s+' + section + \
r'\s+\(Base: 0x(?P<addr>[0-9A-Fa-f]{8}),\s+Size:.*\)$', line)
if match:
ret = match.group("addr")
@ -108,14 +108,14 @@ def find_section(toolchain, elf, section):
# IMAGE2 0x10006000 0x5d18 <Block>
# .ram_image2.text 0x10006000 0x5bbc <Block>
# .rodata const 0x10006000 0x14 retarget.o [17]
with open (mapfile, 'r') as infile:
with open(mapfile, 'r') as infile:
# Search area to parse
for line in infile:
if line.startswith(' Section '):
break
# Search section (block)
# Search section(block)
for line in infile:
match = re.match (r'^\s+' + section + \
match = re.match(r'^\s+' + section + \
r'\s+0x(?P<addr>[0-9A-Fa-f]{8})\s+.*<Block>$', line)
if match:
ret = match.group("addr")
@ -150,12 +150,12 @@ def rtl8195a_elf2bin(toolchain, image_elf, image_bin):
ram2_prepend_bin = image_name + '-ram_2_prepend.bin'
ram2_bin = image_name + '.bin'
ram2_addr = find_section(toolchain, image_elf, img2_section)
print("toolchain = %s, ram2_bin = %s, ram2_addr = 0x%x"%(toolchain,ram2_bin,ram2_addr))
#print("toolchain = %s, ram2_bin = %s, ram2_addr = 0x%x" % (toolchain, ram2_bin, ram2_addr))
prepend(ram2_bin, ram2_addr, ram2_prepend_bin)
# write output file
output = open (image_bin, "wb")
append_image_file (ram1_prepend_bin, output)
append_image_file (ram2_prepend_bin, output)
output = open(image_bin, "wb")
append_image_file(ram1_prepend_bin, output)
append_image_file(ram2_prepend_bin, output)
output.close()