Changed Type from Pointer(FunctionPointer) to FunctionPointer()

fkie-cad · Feb 27, 2024 · 008fef1 · 008fef1
1 parent adb451d
commit 008fef1
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 9 deletions.
diff --git a/decompiler/backend/cexpressiongenerator.py b/decompiler/backend/cexpressiongenerator.py
@@ -2,7 +2,7 @@
 from itertools import chain, repeat
 
 from decompiler.structures import pseudo as expressions
-from decompiler.structures.pseudo import Float, FunctionTypeDef, Integer, OperationType, Pointer, StringSymbol, Type
+from decompiler.structures.pseudo import Float, FunctionTypeDef, FunctionPointer, Integer, OperationType, Pointer, StringSymbol, Type
 from decompiler.structures.pseudo import instructions as instructions
 from decompiler.structures.pseudo import operations as operations
 from decompiler.structures.pseudo.operations import MemberAccess
@@ -349,7 +349,8 @@ def _format_string_literal(constant: expressions.Constant) -> str:
  def format_variables_declaration(var_type: Type, var_names: list[str]) -> str:
  """Return a string representation of variable declarations."""
  match var_type:
- case Pointer(type=FunctionTypeDef() as fun_type):
+ case Pointer(type=FunctionTypeDef()) | FunctionPointer():
+ fun_type = var_type.type if isinstance(var_type, Pointer) else var_type
  parameter_names = ", ".join(str(parameter) for parameter in fun_type.parameters)
  declarations_without_return_type = [f"(* {var_name})({parameter_names})" for var_name in var_names]
  return f"{fun_type.return_type} {', '.join(declarations_without_return_type)}"

diff --git a/decompiler/pipeline/preprocessing/get_function_pointer.py b/decompiler/pipeline/preprocessing/get_function_pointer.py
@@ -18,10 +18,8 @@ def run(self, task: DecompilerTask):
  and isinstance(expression.value, Call)
  and isinstance(expression.value.function, Variable)
  ):
- expression.value.function._type = Pointer(
- basetype=FunctionPointer(
- size=expression.value.function.type.size,
- return_type=expression.value.function.type,
- parameters=tuple(expression.value.parameters),
- ),
+ expression.value.function._type = FunctionPointer(
+ return_type=expression.value.function.type,
+ parameters=tuple(expression.value.parameters),
+ size=expression.value.function.type.size,
  )
diff --git a/decompiler/structures/pseudo/__init__.py b/decompiler/structures/pseudo/__init__.py
@@ -34,5 +34,5 @@
  Return,
 )
 from .operations import BinaryOperation, Call, Condition, ListOperation, Operation, OperationType, TernaryExpression, UnaryOperation
-from .typing import CustomType, Float, FunctionTypeDef, Integer, Pointer, Type, TypeParser, UnknownType
+from .typing import CustomType, Float, FunctionTypeDef, FunctionPointer, Integer, Pointer, Type, TypeParser, UnknownType
 from .z3_logic import Z3Converter