Merge pull request #290 from gdt050579/dissasm_view

Miscelaneous fixes
gdt050579 · Apr 12, 2024 · cd78f28 · cd78f28
2 parents 2a561da + e6851e5
commit cd78f28
Show file tree

Hide file tree

Showing 4 changed files with 52 additions and 28 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -65,13 +65,20 @@ if(NOT DEFINED GVIEW_BINARIES_OUT_DIR)
     set(GVIEW_BINARIES_OUT_DIR "${CMAKE_SOURCE_DIR}/bin/${CMAKE_BUILD_TYPE}")
 endif()
 
-string(TOUPPER ${CMAKE_BUILD_TYPE} UPPER_BUILD_TYPE)
 if (NOT MSVC)
 	set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY ${GVIEW_BINARIES_OUT_DIR})
 	set(CMAKE_LIBRARY_OUTPUT_DIRECTORY ${GVIEW_BINARIES_OUT_DIR})
 endif()
 set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${GVIEW_BINARIES_OUT_DIR})
-set(CMAKE_RUNTIME_OUTPUT_DIRECTORY_${UPPER_BUILD_TYPE} "${GVIEW_BINARIES_OUT_DIR}")
+
+foreach(OUTPUTCONFIG ${CMAKE_CONFIGURATION_TYPES})
+    string(TOUPPER ${OUTPUTCONFIG} OUTPUTCONFIG)
+    if (NOT MSVC)
+        set(CMAKE_LIBRARY_OUTPUT_DIRECTORY_${OUTPUTCONFIG} ${GVIEW_BINARIES_OUT_DIR})
+        set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY_${OUTPUTCONFIG} ${GVIEW_BINARIES_OUT_DIR})
+    endif()
+    set(CMAKE_RUNTIME_OUTPUT_DIRECTORY_${OUTPUTCONFIG} ${GVIEW_BINARIES_OUT_DIR} )
+endforeach()
 
 if (MSVC)
     add_definitions(-DBUILD_FOR_WINDOWS)
@@ -155,13 +162,14 @@ endif()
 
 if (APPLE)
     if (CMAKE_GENERATOR STREQUAL "Xcode")
-        set_target_properties(${PROJECT_NAME} PROPERTIES
-            ARCHIVE_OUTPUT_DIRECTORY_DEBUG "${CMAKE_BINARY_DIR}/../bin/${CMAKE_BUILD_TYPE}"
-            LIBRARY_OUTPUT_DIRECTORY_DEBUG "${CMAKE_BINARY_DIR}/../bin/${CMAKE_BUILD_TYPE}"
-            RUNTIME_OUTPUT_DIRECTORY_DEBUG "${CMAKE_BINARY_DIR}/../bin/${CMAKE_BUILD_TYPE}"
-            ARCHIVE_OUTPUT_DIRECTORY_RELEASE "${CMAKE_BINARY_DIR}/../bin/${CMAKE_BUILD_TYPE}"
-            LIBRARY_OUTPUT_DIRECTORY_RELEASE "${CMAKE_BINARY_DIR}/../bin/${CMAKE_BUILD_TYPE}"
-            RUNTIME_OUTPUT_DIRECTORY_RELEASE "${CMAKE_BINARY_DIR}/../bin/${CMAKE_BUILD_TYPE}")
+        foreach(OUTPUTCONFIG ${CMAKE_CONFIGURATION_TYPES})
+            string(TOUPPER ${OUTPUTCONFIG} OUTPUTCONFIG)
+            set_target_properties(${PROJECT_NAME} PROPERTIES
+                ARCHIVE_OUTPUT_DIRECTORY_${OUTPUTCONFIG} "${CMAKE_BINARY_DIR}/../bin/${CMAKE_BUILD_TYPE}"
+                LIBRARY_OUTPUT_DIRECTORY_${OUTPUTCONFIG} "${CMAKE_BINARY_DIR}/../bin/${CMAKE_BUILD_TYPE}"
+                RUNTIME_OUTPUT_DIRECTORY_${OUTPUTCONFIG} "${CMAKE_BINARY_DIR}/../bin/${CMAKE_BUILD_TYPE}"
+            )
+        endforeach()
     endif()
 endif()
 

diff --git a/GViewCore/src/View/DissasmViewer/x86_x64/DissasmX86.cpp b/GViewCore/src/View/DissasmViewer/x86_x64/DissasmX86.cpp
@@ -1895,7 +1895,8 @@ DissasmAsmPreCacheLine DissasmCodeZone::GetCurrentAsmLine(uint32 currentLine, Re
     paramsPtr->isCollapsed = currentType.isCollapsed;
     paramsPtr->zoneName    = &currentType.name;
 
-    assert(asmCacheLine.TryGetDataFromInsn(*paramsPtr));
+    const auto isValidData = asmCacheLine.TryGetDataFromInsn(*paramsPtr);
+    assert(isValidData);
     lastDrawnLine = asmLine;
 
     // uint32 difflines = 0;

diff --git a/cmake/generic_plugin.cmake b/cmake/generic_plugin.cmake
@@ -40,23 +40,31 @@ function (create_generic_plugin generic_plugin_name)
 
 	set_target_properties(${PROJECT_NAME} PROPERTIES
 	    FOLDER "GenericPlugins"
-        RUNTIME_OUTPUT_DIRECTORY_DEBUG "${CMAKE_RUNTIME_OUTPUT_DIRECTORY_DEBUG}/GenericPlugins"
-        RUNTIME_OUTPUT_DIRECTORY_RELEASE "${CMAKE_RUNTIME_OUTPUT_DIRECTORY_RELEASE}/GenericPlugins")
+	)
+
+	foreach(OUTPUTCONFIG ${CMAKE_CONFIGURATION_TYPES})
+		string(TOUPPER ${OUTPUTCONFIG} OUTPUTCONFIG)
+		set_property(TARGET ${PROJECT_NAME} PROPERTY
+			RUNTIME_OUTPUT_DIRECTORY_${OUTPUTCONFIG} "${CMAKE_RUNTIME_OUTPUT_DIRECTORY_${OUTPUTCONFIG}}/GenericPlugins"
+		)
+	endforeach()
 
 	if (NOT MSVC)
 		set_target_properties(${PROJECT_NAME} PROPERTIES
 		    ARCHIVE_OUTPUT_DIRECTORY "${CMAKE_ARCHIVE_OUTPUT_DIRECTORY}/GenericPlugins"
 		    LIBRARY_OUTPUT_DIRECTORY "${CMAKE_LIBRARY_OUTPUT_DIRECTORY}/GenericPlugins")
 
+
 		if (APPLE)
 			if (CMAKE_GENERATOR STREQUAL "Xcode")
-				set_target_properties(${PROJECT_NAME} PROPERTIES
-					ARCHIVE_OUTPUT_DIRECTORY_DEBUG "${CMAKE_BINARY_DIR}/../bin/${CMAKE_BUILD_TYPE}/GenericPlugins"
-					LIBRARY_OUTPUT_DIRECTORY_DEBUG "${CMAKE_BINARY_DIR}/../bin/${CMAKE_BUILD_TYPE}/GenericPlugins"
-					RUNTIME_OUTPUT_DIRECTORY_DEBUG "${CMAKE_BINARY_DIR}/../bin/${CMAKE_BUILD_TYPE}/GenericPlugins"
-					ARCHIVE_OUTPUT_DIRECTORY_RELEASE "${CMAKE_BINARY_DIR}/../bin/${CMAKE_BUILD_TYPE}/GenericPlugins"
-					LIBRARY_OUTPUT_DIRECTORY_RELEASE "${CMAKE_BINARY_DIR}/../bin/${CMAKE_BUILD_TYPE}/GenericPlugins"
-					RUNTIME_OUTPUT_DIRECTORY_RELEASE "${CMAKE_BINARY_DIR}/../bin/${CMAKE_BUILD_TYPE}/GenericPlugins")
+				foreach(OUTPUTCONFIG ${CMAKE_CONFIGURATION_TYPES})
+					string(TOUPPER ${OUTPUTCONFIG} OUTPUTCONFIG)
+					set_target_properties(${PROJECT_NAME} PROPERTIES
+						ARCHIVE_OUTPUT_DIRECTORY_${OUTPUTCONFIG} "${CMAKE_BINARY_DIR}/../bin/${CMAKE_BUILD_TYPE}/GenericPlugins"
+						LIBRARY_OUTPUT_DIRECTORY_${OUTPUTCONFIG} "${CMAKE_BINARY_DIR}/../bin/${CMAKE_BUILD_TYPE}/GenericPlugins"
+						RUNTIME_OUTPUT_DIRECTORY_${OUTPUTCONFIG} "${CMAKE_BINARY_DIR}/../bin/${CMAKE_BUILD_TYPE}/GenericPlugins"
+					)
+				endforeach()
 			endif()
 		endif()
 	endif()

diff --git a/cmake/type.cmake b/cmake/type.cmake
@@ -58,8 +58,14 @@ function (create_type type_name)
 
 	set_target_properties(${PROJECT_NAME} PROPERTIES
 		FOLDER "Types"
-		RUNTIME_OUTPUT_DIRECTORY_DEBUG "${CMAKE_RUNTIME_OUTPUT_DIRECTORY_DEBUG}/Types"
-		RUNTIME_OUTPUT_DIRECTORY_RELEASE "${CMAKE_RUNTIME_OUTPUT_DIRECTORY_RELEASE}/Types")
+	)
+
+	foreach(OUTPUTCONFIG ${CMAKE_CONFIGURATION_TYPES})
+		string(TOUPPER ${OUTPUTCONFIG} OUTPUTCONFIG)
+		set_property(TARGET ${PROJECT_NAME} PROPERTY
+			RUNTIME_OUTPUT_DIRECTORY_${OUTPUTCONFIG} "${CMAKE_RUNTIME_OUTPUT_DIRECTORY_${OUTPUTCONFIG}}/Types"
+		)
+	endforeach()
 
 	if (NOT MSVC)
 		set_target_properties(${PROJECT_NAME} PROPERTIES
@@ -68,13 +74,14 @@ function (create_type type_name)
 
 		if (APPLE)
 			if (CMAKE_GENERATOR STREQUAL "Xcode")
-				set_target_properties(${PROJECT_NAME} PROPERTIES
-					ARCHIVE_OUTPUT_DIRECTORY_DEBUG "${CMAKE_BINARY_DIR}/../bin/${CMAKE_BUILD_TYPE}/Types"
-					LIBRARY_OUTPUT_DIRECTORY_DEBUG "${CMAKE_BINARY_DIR}/../bin/${CMAKE_BUILD_TYPE}/Types"
-					RUNTIME_OUTPUT_DIRECTORY_DEBUG "${CMAKE_BINARY_DIR}/../bin/${CMAKE_BUILD_TYPE}/Types"
-					ARCHIVE_OUTPUT_DIRECTORY_RELEASE "${CMAKE_BINARY_DIR}/../bin/${CMAKE_BUILD_TYPE}/Types"
-					LIBRARY_OUTPUT_DIRECTORY_RELEASE "${CMAKE_BINARY_DIR}/../bin/${CMAKE_BUILD_TYPE}/Types"
-					RUNTIME_OUTPUT_DIRECTORY_RELEASE "${CMAKE_BINARY_DIR}/../bin/${CMAKE_BUILD_TYPE}/Types")
+				foreach(OUTPUTCONFIG ${CMAKE_CONFIGURATION_TYPES})
+					string(TOUPPER ${OUTPUTCONFIG} OUTPUTCONFIG)
+					set_target_properties(${PROJECT_NAME} PROPERTIES
+						ARCHIVE_OUTPUT_DIRECTORY_${OUTPUTCONFIG} "${CMAKE_BINARY_DIR}/../bin/${CMAKE_BUILD_TYPE}/Types"
+						LIBRARY_OUTPUT_DIRECTORY_${OUTPUTCONFIG} "${CMAKE_BINARY_DIR}/../bin/${CMAKE_BUILD_TYPE}/Types"
+						RUNTIME_OUTPUT_DIRECTORY_${OUTPUTCONFIG} "${CMAKE_BINARY_DIR}/../bin/${CMAKE_BUILD_TYPE}/Types"
+					)
+				endforeach()
 			endif()
 		endif()
 	endif()