From 4d6182736f913c577261a155f281c339953d0faf Mon Sep 17 00:00:00 2001 From: horsicq Date: Sun, 22 Dec 2024 00:32:54 +0100 Subject: [PATCH] Update file(s): 2024-12-22 --- AbstractWidgets/xformatwidget.cpp | 10 +++------- AbstractWidgets/xformatwidget_def.h | 1 + 2 files changed, 4 insertions(+), 7 deletions(-) diff --git a/AbstractWidgets/xformatwidget.cpp b/AbstractWidgets/xformatwidget.cpp index 054b7db5..27ce9926 100644 --- a/AbstractWidgets/xformatwidget.cpp +++ b/AbstractWidgets/xformatwidget.cpp @@ -1605,7 +1605,7 @@ void XFormatWidget::_addStruct(const SPSTRUCT &spStruct) _spStructRecord.nStructSize = listCommands.at(i).nSize; _spStructRecord.nStructCount = 1; _spStructRecord.widgetMode = XFW_DEF::WIDGETMODE_HEADER; - _spStructRecord.type = load_commandIdToType(listCommands.at(i).nId, mach.getArch()); + _spStructRecord.type = load_commandIdToType(listCommands.at(i).nId); _addStruct(_spStructRecord); } @@ -1871,7 +1871,7 @@ void XFormatWidget::_addStruct(const SPSTRUCT &spStruct) // } // } -XFW_DEF::TYPE XFormatWidget::load_commandIdToType(qint32 nCommandId, QString sArch) +XFW_DEF::TYPE XFormatWidget::load_commandIdToType(qint32 nCommandId) { XFW_DEF::TYPE result = XFW_DEF::TYPE_MACH_load_command; @@ -1937,11 +1937,7 @@ XFW_DEF::TYPE XFormatWidget::load_commandIdToType(qint32 nCommandId, QString sAr } else if (nCommandId == XMACH_DEF::S_LC_LOADFVMLIB) { result = XFW_DEF::TYPE_MACH_fvm_library_command; } else if (nCommandId == XMACH_DEF::S_LC_UNIXTHREAD) { - if (sArch == "MC68030") { - - } else { - result = XFW_DEF::TYPE_MACH_unix_thread_command; - } + result = XFW_DEF::TYPE_MACH_unix_thread_command; } else { result = XFW_DEF::TYPE_MACH_load_command; } diff --git a/AbstractWidgets/xformatwidget_def.h b/AbstractWidgets/xformatwidget_def.h index d02514fc..4acd740e 100644 --- a/AbstractWidgets/xformatwidget_def.h +++ b/AbstractWidgets/xformatwidget_def.h @@ -94,6 +94,7 @@ enum TYPE { TYPE_MACH_routines_command_64, TYPE_MACH_fvm_library_command, TYPE_MACH_unix_thread_command, + TYPE_MACH_nlist, TYPE_MACH_nlist_64, TYPE_MACH_dyld_chained_fixups_header,