falso
/
botw
mirror of https://github.com/zeldaret/botw.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #37 from leoetlino/ldrb-fix 

tools: Fix check script not handling ldrb, ldrsb, etc. correctly
This commit is contained in:
Léo Lam 2021-06-25 00:43:25 +02:00 committed by GitHub
parent 1b9f698134 c249c93be1
commit 24cc84add7
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 22 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
tools/util/checker.py
View File

@ -60,12 +60,12 @@ class FunctionChecker:
gprs1[i1.operands[0].reg] = i1.operands[1].imm gprs1[i1.operands[0].reg] = i1.operands[1].imm
gprs2[i2.operands[0].reg] = i2.operands[1].imm gprs2[i2.operands[0].reg] = i2.operands[1].imm
adrp_pair_registers.add(i1.operands[0].reg) adrp_pair_registers.add(i1.operands[0].reg)
elif i1.mnemonic == 'ldr': elif i1.mnemonic == 'ldp' or i1.mnemonic == 'ldpsw':
reg = i1.operands[1].value.mem.base reg = i1.operands[2].value.mem.base
if reg in adrp_pair_registers: if reg in adrp_pair_registers:
adrp_pair_registers.remove(reg) adrp_pair_registers.remove(reg)
elif i1.mnemonic == 'ldp': elif i1.mnemonic.startswith('ld'):
reg = i1.operands[2].value.mem.base reg = i1.operands[1].value.mem.base
if reg in adrp_pair_registers: if reg in adrp_pair_registers:
adrp_pair_registers.remove(reg) adrp_pair_registers.remove(reg)
elif i1.mnemonic == 'add': elif i1.mnemonic == 'add':
@ -113,24 +113,7 @@ class FunctionChecker:
adrp_pair_registers.add(reg) adrp_pair_registers.add(reg)
continue continue
if i1.mnemonic == 'ldr' or i1.mnemonic in _store_instructions: if i1.mnemonic == 'ldp' or i1.mnemonic == 'ldpsw' or i1.mnemonic == 'stp':
if i1.operands[0].reg != i2.operands[0].reg:
return False
if i1.operands[1].value.mem.base != i2.operands[1].value.mem.base:
return False
reg = i1.operands[1].value.mem.base
if reg not in adrp_pair_registers:
return False
gprs1[reg] += i1.operands[1].value.mem.disp
gprs2[reg] += i2.operands[1].value.mem.disp
if not self._check_data_symbol_load(i1, i2, gprs1[reg], gprs2[reg]):
return False
adrp_pair_registers.remove(reg)
continue
if i1.mnemonic == 'ldp' or i1.mnemonic == 'stp':
if i1.operands[0].reg != i2.operands[0].reg: if i1.operands[0].reg != i2.operands[0].reg:
return False return False
if i1.operands[1].reg != i2.operands[1].reg: if i1.operands[1].reg != i2.operands[1].reg:
@ -149,6 +132,23 @@ class FunctionChecker:
adrp_pair_registers.remove(reg) adrp_pair_registers.remove(reg)
continue continue
if i1.mnemonic.startswith('ld') or i1.mnemonic in _store_instructions:
if i1.operands[0].reg != i2.operands[0].reg:
return False
if i1.operands[1].value.mem.base != i2.operands[1].value.mem.base:
return False
reg = i1.operands[1].value.mem.base
if reg not in adrp_pair_registers:
return False
gprs1[reg] += i1.operands[1].value.mem.disp
gprs2[reg] += i2.operands[1].value.mem.disp
if not self._check_data_symbol_load(i1, i2, gprs1[reg], gprs2[reg]):
return False
adrp_pair_registers.remove(reg)
continue
if i1.mnemonic == 'add': if i1.mnemonic == 'add':
if i1.operands[0].reg != i2.operands[0].reg: if i1.operands[0].reg != i2.operands[0].reg:
return False return False