CPunch
/
LuaDecompy
mirror of https://github.com/CPunch/LuaDecompy.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

lundump.py: improved instruction operand labeling 

- RKs are fully supported
- KBx are also supported
This commit is contained in:
CPunch 2022-08-11 15:49:57 -05:00
parent 0dbdfc49c6
commit 4d8c78f023
1 changed files with 17 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
lundump.py
View File

@ -66,6 +66,10 @@ class ConstType(IntEnum):
NUMBER = 3,
STRING = 4,
_RKBCInstr = [Opcodes.SETTABLE, Opcodes.ADD, Opcodes.SUB, Opcodes.MUL, Opcodes.DIV, Opcodes.MOD, Opcodes.POW, Opcodes.EQ, Opcodes.LT]
_RKCInstr = [Opcodes.GETTABLE, Opcodes.SELF]
_KBx = [Opcodes.LOADK, Opcodes.GETGLOBAL]
class Instruction:
def __init__(self, type: InstructionType, name: str) -> None:
self.type = type
@ -87,20 +91,27 @@ class Instruction:
regs = ""
if self.type == InstructionType.ABC:
A = "%d" % self.A
B = "%d" % self.B
C = "%d" % self.C
# by default, treat them as registers
A = "R[%d]" % self.A
B = "R[%d]" % self.B
C = "R[%d]" % self.C
# these opcodes have RKs for B & C
if self.opcode == Opcodes.SETTABLE or self.opcode == Opcodes.EQ or self.opcode == Opcodes.LT:
if self.opcode in _RKBCInstr:
B = self.__readRK(self.B)
C = self.__readRK(self.C)
elif self.opcode == Opcodes.GETTABLE: # just for C
elif self.opcode in _RKCInstr: # just for C
C = self.__readRK(self.C)
regs = "%s %s %s" % (A, B, C)
elif self.type == InstructionType.ABx or self.type == InstructionType.AsBx:
regs = "%d %d" % (self.A, self.B)
A = "R[%d]" % self.A
B = "R[%d]" % self.B
if self.opcode in _KBx:
B = "K[%d]" % self.B
regs = "%s %s" % (A, B)
return "%s : %s" % (instr, regs)