Finished stack_var test

binsync · Apr 4, 2024 · d1418b4 · d1418b4
1 parent 2f7e2d7
commit d1418b4
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 2 deletions.
diff --git a/libbs/api/artifact_dict.py b/libbs/api/artifact_dict.py
@@ -41,7 +41,7 @@ def __init__(self, artifact_cls, deci: "DecompilerInterface", error_on_duplicate
             # ArtifactType: (setter, getter, lister)
             Function: (self._deci._set_function, self._deci._get_function, self._deci._functions),
             StackVariable: (self._deci._set_stack_variable, self._deci._get_stack_variable, self._deci._stack_variables),
-            GlobalVariable: (self._deci._set_global_variable, self._deci._get_global_var, self._deci._global_vars),
+            GlobalVariable: (self._deci._set_global_var, self._deci._get_global_var, self._deci._global_vars),
             Struct: (self._deci._set_struct, self._deci._get_struct, self._deci._structs),
             Enum: (self._deci._set_enum, self._deci._get_enum, self._deci._enums),
             Comment: (self._deci._set_comment, self._deci._get_comment, self._deci._comments),

diff --git a/libbs/decompilers/ghidra/interface.py b/libbs/decompilers/ghidra/interface.py
@@ -505,7 +505,7 @@ def _enums(self) -> Dict[str, Enum]:
                 name.count('/') == 1} if names else {}
 
     @ghidra_transaction
-    def fill_global_var(self, var_addr, user=None, artifact=None, **kwargs):
+    def _set_global_var(self, var_addr, user=None, artifact=None, **kwargs):
         """
         TODO: remove me and implement me properly as setters and getters
         """

diff --git a/tests/test_decompilers.py b/tests/test_decompilers.py
@@ -68,6 +68,18 @@ def test_ghidra(self):
         deci.enums[enum.name] = enum
         assert deci.enums[enum.name] == enum
 
+        # gvar_addr = deci.art_lifter.lift_addr(0x4008e0)
+        # g1 = deci.global_vars[gvar_addr]
+        # g1.name = "gvar1"
+        # deci.global_vars[gvar_addr] = g1
+        # assert deci.global_vars[gvar_addr] == g1
+
+        stack_var = main.stack_vars[-24]
+        stack_var.name = "named_char_array"
+        stack_var.type = 'double'
+        deci.functions[func_addr] = main
+        assert deci.functions[func_addr].stack_vars[-24] == stack_var
+
         #
         # Test Artifact Watchers
         #