michaelh/zephyr
1
0
Fork 0
Code Releases Activity

code_relocation: improve code conciseness

Browse source 
This patch makes various simplifications to the code structure which make
it more concise by reducing repetition.

Signed-off-by: Joel Holdsworth <jholdsworth@nvidia.com>
This commit is contained in:
Joel Holdsworth 2025-04-03 15:34:44 -07:00 • committed by Benjamin Cabé
commit f7332da62e
1 changed files with 20 additions and 34 deletions
Download patch file Download diff file Expand all files Collapse all files

54
scripts/build/gen_relocate_app.py
View file

@ -345,15 +345,15 @@ def string_create_helper(
phdrs, phdrs,
): ):
linker_string = '' linker_string = ''
if load_address_in_flash:
if is_copy: if not load_address_in_flash:
load_address_string = LOAD_ADDRESS_LOCATION_FLASH.format(add_phdr(memory_type, phdrs)) phdr_template = LOAD_ADDRESS_LOCATION_BSS
else: elif is_copy:
load_address_string = LOAD_ADDRESS_LOCATION_FLASH_NOCOPY.format( phdr_template = LOAD_ADDRESS_LOCATION_FLASH
add_phdr(memory_type, phdrs)
)
else: else:
load_address_string = LOAD_ADDRESS_LOCATION_BSS.format(add_phdr(memory_type, phdrs)) phdr_template = LOAD_ADDRESS_LOCATION_FLASH_NOCOPY
load_address_string = phdr_template.format(add_phdr(memory_type, phdrs))
if full_list_of_sections[kind]: if full_list_of_sections[kind]:
# Create a complete list of funcs/ variables that goes in for this # Create a complete list of funcs/ variables that goes in for this
# memory type # memory type
@ -371,11 +371,10 @@ def string_create_helper(
} }
if not region_is_default_ram(memory_type) and kind is SectionKind.RODATA: if not region_is_default_ram(memory_type) and kind is SectionKind.RODATA:
align_size = 0 linker_string += LINKER_SECTION_SEQ_MPU.format(
if memory_type in mpu_align: align_size=mpu_align.get(memory_type, 0),
align_size = mpu_align[memory_type] **fields,
)
linker_string += LINKER_SECTION_SEQ_MPU.format(align_size=align_size, **fields)
else: else:
if region_is_default_ram(memory_type) and kind in ( if region_is_default_ram(memory_type) and kind in (
SectionKind.TEXT, SectionKind.TEXT,
@ -418,20 +417,14 @@ def generate_linker_script(
if region_is_default_ram(memory_type) and is_copy: if region_is_default_ram(memory_type) and is_copy:
gen_string += MPU_RO_REGION_END.format(mem=memory_type.lower()) gen_string += MPU_RO_REGION_END.format(mem=memory_type.lower())
data_sections = string_create_helper(
SectionKind.DATA, memory_type, full_list_of_sections, 1, 1, phdrs
) + string_create_helper(SectionKind.BSS, memory_type, full_list_of_sections, 0, 1, phdrs)
if region_is_default_ram(memory_type): if region_is_default_ram(memory_type):
gen_string_sram_data += string_create_helper( gen_string_sram_data += data_sections
SectionKind.DATA, memory_type, full_list_of_sections, 1, 1, phdrs
)
gen_string_sram_bss += string_create_helper(
SectionKind.BSS, memory_type, full_list_of_sections, 0, 1, phdrs
)
else: else:
gen_string += string_create_helper( gen_string += data_sections
SectionKind.DATA, memory_type, full_list_of_sections, 1, 1, phdrs
)
gen_string += string_create_helper(
SectionKind.BSS, memory_type, full_list_of_sections, 0, 1, phdrs
)
# finally writing to the linker file # finally writing to the linker file
with open(linker_file, "w") as file_desc: with open(linker_file, "w") as file_desc:
@ -482,15 +475,8 @@ def dump_header_file(header_file, code_generation):
# bss/data/text regions # bss/data/text regions
code_string += code_generation["extern"] code_string += code_generation["extern"]
code_string += DATA_COPY_FUNCTION.format(code_generation["copy_code"] or "return;")
if code_generation["copy_code"]: code_string += BSS_ZEROING_FUNCTION.format(code_generation["zero_code"] or "return;")
code_string += DATA_COPY_FUNCTION.format(code_generation["copy_code"])
else:
code_string += DATA_COPY_FUNCTION.format("return;")
if code_generation["zero_code"]:
code_string += BSS_ZEROING_FUNCTION.format(code_generation["zero_code"])
else:
code_string += BSS_ZEROING_FUNCTION.format("return;")
with open(header_file, "w") as header_file_desc: with open(header_file, "w") as header_file_desc:
header_file_desc.write(SOURCE_CODE_INCLUDES) header_file_desc.write(SOURCE_CODE_INCLUDES)