isledecomp/isle
1
0
Fork 0
mirror of https://github.com/isledecomp/isle.git synced 2026-01-23 16:21:15 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

run formatter

Browse Source
This commit is contained in:
jonschz 2024-06-16 14:08:57 +02:00
parent 3be0665136
commit 3811debea6
2 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
tools/ghidra_scripts/lego_util/function_importer.py
View File

@ -92,9 +92,15 @@ def matches_ghidra_function(self, ghidra_function: Function) -> bool:
(not return_type_match) (not return_type_match)
and (self.return_type.getLength() > 4) and (self.return_type.getLength() > 4)
and (add_pointer_type(self.api, self.return_type) == ghidra_return_type) and (add_pointer_type(self.api, self.return_type) == ghidra_return_type)
and any(param for param in ghidra_function.getParameters() if param.getName() == "__return_storage_ptr__") and any(
param
for param in ghidra_function.getParameters()
if param.getName() == "__return_storage_ptr__"
)
): ):
logger.debug("%s has a return type larger than 4 bytes", self.get_full_name()) logger.debug(
"%s has a return type larger than 4 bytes", self.get_full_name()
)
return_type_match = True return_type_match = True
# match arguments: decide if thiscall or not # match arguments: decide if thiscall or not

5
tools/ghidra_scripts/lego_util/type_importer.py
View File

@ -269,7 +269,6 @@ def _get_or_create_namespace(self, class_name_with_namespace: str):
def _get_or_create_enum_data_type( def _get_or_create_enum_data_type(
self, enum_type_name: str, enum_type_size: int self, enum_type_name: str, enum_type_size: int
) -> Enum: ) -> Enum:
if (known_enum := self.handled_enums.get(enum_type_name, None)) is not None: if (known_enum := self.handled_enums.get(enum_type_name, None)) is not None:
return known_enum return known_enum
@ -325,7 +324,9 @@ def _get_or_create_data_type(
data_type = ( data_type = (
self.api.getCurrentProgram() self.api.getCurrentProgram()
.getDataTypeManager() .getDataTypeManager()
.addDataType(new_instance_callback(), DataTypeConflictHandler.KEEP_HANDLER) .addDataType(
new_instance_callback(), DataTypeConflictHandler.KEEP_HANDLER
)
) )
logger.info( logger.info(
"Created new %s data type %s", readable_name_of_type_category, type_name "Created new %s data type %s", readable_name_of_type_category, type_name