Fix: ArrayType,config,tests

fkie-cad · Jun 12, 2024 · 17aa000 · 17aa000
1 parent 61ffa12
commit 17aa000
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 17 deletions.
diff --git a/decompiler/pipeline/controlflowanalysis/variable_name_generation.py b/decompiler/pipeline/controlflowanalysis/variable_name_generation.py
@@ -7,7 +7,7 @@
 from typing import Counter, List
 
 from decompiler.pipeline.stage import PipelineStage
-from decompiler.structures.pseudo import CustomType, Float, GlobalVariable, Integer, Pointer, Type, Variable
+from decompiler.structures.pseudo import ArrayType, CustomType, Float, GlobalVariable, Integer, Pointer, Type, Variable
 from decompiler.structures.visitors.ast_dataflowobjectvisitor import BaseAstDataflowObjectVisitor
 from decompiler.structures.visitors.substitute_visitor import SubstituteVisitor
 from decompiler.task import DecompilerTask
@@ -80,7 +80,7 @@ def __init__(self, task: DecompilerTask) -> None:
             var_type = vars[0].type
             name_identifier = self._get_name_identifier(variable_id.name)
 
-            counter_postfix = f"{self._counter_separator}{counter[(name_identifier, var_type)]}"
+            counter_postfix = f"{self._counter_separator}{counter[(name_identifier, var_type)]}"  # array[0x12] != array[0x13] kriegt aber selben Namen, da Typen unterschiedlich sind
             counter[(name_identifier, var_type)] += 1
 
             prefix = self._hungarian_prefix(var_type)
@@ -112,17 +112,18 @@ def _get_name_identifier(self, name: str) -> str:
     def _hungarian_prefix(self, var_type: Type) -> str | None:
         """Return hungarian prefix to a given variable type."""
         match var_type:
-            case Pointer():
+            case Pointer() | ArrayType():
                 if self._pointer_base:
-                    return f"{self._hungarian_prefix(var_type.type)}p"
+                    pprefix = self._hungarian_prefix(var_type.type)
+                    return f"{pprefix}p" if pprefix is not None else "unkp"
                 else:
                     return "p"
             case CustomType():
                 if var_type.is_boolean:
                     return "b"
-                elif var_type.size == 0:
+                if var_type.size == 0:
                     return "v"
-            case _ if isinstance(var_type, Integer | Float):
+            case Integer() | Float():
                 sign = "u" if isinstance(var_type, Integer) and not var_type.is_signed else ""
                 prefix = self.type_prefix[type(var_type)].get(var_type.size, "unk")
                 return f"{sign}{prefix}"

diff --git a/decompiler/util/default.json b/decompiler/util/default.json
@@ -213,16 +213,6 @@
                 "is_hidden_from_cli": false,
                 "argument_name": "--for-loop-exclude-conditions"
             },
-            {
-                "dest": "readability-based-refinement.rename_while_loop_variables",
-                "default": true,
-                "type": "boolean",
-                "title": "Rename while-loop variables",
-                "description": "Rename while-loop counter variables to counter, counter1, ...",
-                "is_hidden_from_gui": false,
-                "is_hidden_from_cli": false,
-                "argument_name": "--rename-while-loop-variables"
-            },
             {
                 "dest": "variable-name-generation.notation",
                 "default": "system_hungarian",

diff --git a/tests/pipeline/controlflowanalysis/test_variable_name_generation.py b/tests/pipeline/controlflowanalysis/test_variable_name_generation.py
@@ -177,4 +177,4 @@ def test_different_custom_names_1():
     )
     ast = AbstractSyntaxTree(node, {})
     _run_vng(ast, _generate_options())
-    assert node.instructions[0].destination.name == "dLoopBreak0"
+    assert node.instructions[0].destination.name == "dLoopbreak0"