REP: small fix for patchcandidates on MIPS

don't use the hardcoded ARM attribute to access the function
from the instruction object.

This adds a new abstract method/property to the generic
Instruction class which returns the associated Function.

All the arch-specific instructions already had a member for it
but with an arch-specific name so this new property just wraps
around that

Author: waskyo

chb/app/Instruction.py

@@ -62,6 +62,7 @@
     from chb.bctypes.BCTyp import BCTyp
     from chb.invariants.XVariable import XVariable
     from chb.invariants.XXpr import XXpr
+    from chb.app.Function import Function
 
 
 class Instruction(ABC):
@@ -97,6 +98,11 @@ def mnemonic_stem(self) -> str:
 
         return self.mnemonic
 
+    @property
+    @abstractmethod
+    def function(self) -> 'Function':
+        ...
+
     @property
     @abstractmethod
     def opcodetext(self) -> str:

chb/arm/ARMInstruction.py

@@ -80,6 +80,10 @@ def __init__(self, armblock: "ARMBlock", xnode: ET.Element) -> None:
     def armblock(self) -> "ARMBlock":
         return self._armblock
 
+    @property
+    def function(self) -> "ARMFunction":
+        return self.armfunction
+
     @property
     def armfunction(self) -> "ARMFunction":
         return self.armblock.armfunction

chb/cmdline/reportcmds.py

@@ -1179,15 +1179,15 @@ def include_target(target: 'CallTarget') -> bool:
     patchcallsites = libcalls.patch_callsites()
 
     for pc in sorted(patchcallsites, key=lambda pc:pc.faddr):
-        instr = cast("ARMInstruction", pc.instr)
+        instr = pc.instr
         dstarg = pc.dstarg
         if dstarg is None:
             chklogger.logger.warning(
                 "No expression found for destination argument: %s",
                 str(instr))
             continue
         dstoffset = dstarg.stack_address_offset()
-        fn = instr.armfunction
+        fn = instr.function
         stackframe = fn.stackframe
         stackbuffer = stackframe.get_stack_buffer(dstoffset)
         if stackbuffer is None:

chb/pwr/PowerInstruction.py

@@ -74,6 +74,10 @@ def pwrblock(self) -> "PowerBlock":
     def pwrfunction(self) -> "PowerFunction":
         return self.pwrblock.pwrfunction
 
+    @property
+    def function(self) -> "PowerFunction":
+        return self.pwrfunction
+
     @property
     def pwrdictionary(self) -> "PowerDictionary":
         return self.pwrblock.pwrdictionary

chb/x86/X86Instruction.py

@@ -91,6 +91,10 @@ def x86functiondictionary(self) -> "FunctionDictionary":
     def x86function(self) -> "X86Function":
         return self.x86block.x86function
 
+    @property
+    def function(self) -> "X86Function":
+        return self.x86function
+
     @property
     def opcode(self) -> X86Opcode:
         if self._opcode is None: