mirror of
https://github.com/izzy2lost/Diddy-Kong-Racing.git
synced 2026-06-19 01:16:26 -07:00
Updated glabel finder
This commit is contained in:
@@ -5,8 +5,8 @@ from file_util import FileUtil
|
||||
LINE_START_REGEX = r'\n/\* ([0-9A-F]{6}) [0-9A-F]{8} [0-9A-F]{8} \*/\s+'
|
||||
REG_REGEX = r'(\$(at|v[0-1]|a[0-3]|t[0-9]|s[0-7]|k[0-1]|gp|sp|fp|ra))'
|
||||
GLABEL_UPPER_REGEX = '(' + LINE_START_REGEX + r'lui\s+' + REG_REGEX + r',\s+(0x80[0-9a-f]{2}))'
|
||||
GLABEL_LOWER_REGEX = '(' + LINE_START_REGEX + r'l[bhw]\s+\3,\s+(0x[0-9a-f]{4})\(' + REG_REGEX + '\))'
|
||||
GLABEL_REGEX = GLABEL_UPPER_REGEX + '(' + LINE_START_REGEX + '((?!\n|jr|\sb\w*\s).)*(?=\n)){0,10}' + GLABEL_LOWER_REGEX
|
||||
GLABEL_LOWER_REGEX = '(' + LINE_START_REGEX + r'l[bhw]\s+' + REG_REGEX + r',\s+(0x[0-9a-f]{4})\(\3\))'
|
||||
GLABEL_REGEX = GLABEL_UPPER_REGEX + '(' + LINE_START_REGEX + '[^\n]*(?=\n)){0,10}' + GLABEL_LOWER_REGEX
|
||||
|
||||
def _find_glabels(asm):
|
||||
glabels = []
|
||||
@@ -15,7 +15,7 @@ def _find_glabels(asm):
|
||||
for match in matches:
|
||||
offsets = (match[1], match[8]) # ROM offsets of the lu and lw
|
||||
glabel_upper = int(match[4], 16) # upper immediate of glabel
|
||||
glabel_lower = int(match[10], 16) # lower immediate of the glabel
|
||||
glabel_lower = int(match[11], 16) # lower immediate of the glabel
|
||||
if glabel_lower & 0x8000:
|
||||
glabel_upper -= 1
|
||||
glabel = 'D_%08X' % (glabel_upper << 16 | glabel_lower)
|
||||
@@ -26,7 +26,9 @@ def main():
|
||||
FileUtil.set_working_dir_to_project_base()
|
||||
contents = FileUtil.get_text_from_file('asm/non_matchings/unknown_005740/func_80005254.s')
|
||||
glabels = _find_glabels(contents)
|
||||
print(len(glabels))
|
||||
print('%d undeclared labels found:' % len(glabels))
|
||||
for glabel in glabels:
|
||||
print(glabel)
|
||||
|
||||
if __name__ == '__main__':
|
||||
main()
|
||||
|
||||
Reference in New Issue
Block a user