izzy/Diddy-Kong-Racing
0
0
Fork 0
mirror of https://github.com/izzy2lost/Diddy-Kong-Racing.git synced 2026-06-19 01:16:26 -07:00
Code Issues Packages Projects Releases Wiki Activity

Added syntax to RAM_POS for conditionally including a source file

Browse Source
This commit is contained in:
David
2023-06-17 16:43:20 -05:00
parent f04232693a
commit c643999c77
5 changed files with 43 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
tools/python/generate_ld.py
+25 -2
View File
@@ -46,6 +46,8 @@ class GenerateLD:
self.gen_comment('linker script generated by generate_ld.py')
self.gen_comment('If you want to make any changes, then edit the generate_ld.py script!')
self.gen_newline()
self.gen_line('#include "config.h"')
self.gen_newline()
self.gen_line('OUTPUT_ARCH (mips)')
self.gen_newline()
self.gen_sections()
@@ -85,7 +87,12 @@ class GenerateLD:
self.gen_line('.main __FUNC_RAM_START : AT(romPos) SUBALIGN(16)')
self.gen_open_block()
for file in self.files:
condition = file[4]
if condition != None:
self.gen_line('#if ' + condition)
self.gen_line(file[0] + '(.text);')
if condition != None:
self.gen_line('#endif')
self.gen_close_block()
self.gen_line('romPos += SIZEOF(.main);')
self.gen_newline()
@@ -102,8 +109,13 @@ class GenerateLD:
self.gen_line('.data . : AT(romPos) SUBALIGN(16)')
self.gen_open_block()
for file in self.files:
condition = file[4]
if file[0] not in LATE_DATA_FILES:
if condition != None:
self.gen_line('#if ' + condition)
self.gen_line(file[0] + '(.data);')
if condition != None:
self.gen_line('#endif')
for file in LATE_DATA_FILES:
self.gen_line(file + '(.data);')
self.gen_close_block()
@@ -115,12 +127,17 @@ class GenerateLD:
self.gen_open_block()
for file in self.files:
f = file[0]
condition = file[4]
if f not in LATE_DATA_FILES:
if condition != None:
self.gen_line('#if ' + condition)
self.gen_line(f + '(.rodata);')
fname = f[f.rindex('/')+1:f.rindex('.')]
testName = DATA_DIR + '/' + fname + '.rodata.s'
if FileUtil.does_file_exist(testName):
self.gen_line(BUILD_DIR + '/data/' + fname + '.rodata.o(.rodata);')
if condition != None:
self.gen_line('#endif')
for f in LATE_DATA_FILES:
self.gen_line(f + '(.rodata);')
fname = f[f.rindex('/')+1:f.rindex('.')]
@@ -145,8 +162,13 @@ class GenerateLD:
self.gen_line('.bss.noload . (NOLOAD): SUBALIGN(4)')
self.gen_open_block()
for file in self.files:
condition = file[4]
if file[0] not in BSS_LIB_ORDER_FILES:
if condition != None:
self.gen_line('#if ' + condition)
self.gen_line(file[0] + '(.bss);')
if condition != None:
self.gen_line('#endif')
for file in BSS_LIB_ORDER_FILES:
self.gen_line(file + '(.bss);')
self.gen_close_block()
@@ -205,7 +227,7 @@ class GenerateLD:
def append_files(self, files, extensions, directory, outputDir):
filenames = FileUtil.get_filenames_from_directory_recursive(directory, extensions)
regex = r'[\/][*]+\s*RAM_POS:\s*((?:0x)[0-9a-fA-F]+|(?:[Aa][Uu][Tt][Oo]))\s*[*]+[\/]'
regex = r'[\/][*]+\s*RAM_POS:\s*((?:0x)[0-9a-fA-F]+|(?:[Aa][Uu][Tt][Oo]))\s*(?:if\s*(.*))?\s*[*]+[\/]'
for filename in filenames:
with open(directory + '/' + filename, 'r') as inFile:
notDone = True
@@ -217,9 +239,10 @@ class GenerateLD:
continue
matchedGroups = matches.groups()
ramPos = matchedGroups[0]
condition = matchedGroups[1]
if ramPos.lower() == 'auto':
ramPos = '800FFFF0'
files.append((outputDir + filename[:-2] + '.o', '', ramPos, 0))
files.append((outputDir + filename[:-2] + '.o', '', ramPos, 0, condition))
break
def get_code_files(self):