Fix the some breakpoint types could be used on x64 despite being invalid

thpatch · Jun 4, 2024 · a967404 · a967404
1 parent f035db8
commit a967404
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 0 deletions.
diff --git a/thcrap/src/breakpoint.cpp b/thcrap/src/breakpoint.cpp
@@ -231,6 +231,12 @@ bool breakpoint_from_json(const char *name, json_t *in, breakpoint_t *out) {
 			break;
 	}
 
+#if TH_X64
+	// x64 CPUs aren't guaranteed to support LAHF/SAHF when operating
+	// in long mode, so don't allow setting those breakpoint types
+	// if that situation is detected.
+	state_type |= !CPU_Supports_LMLSAHF();
+#endif
 	// State bit 1 indicates whether a stack adjustment is required
 	state_type <<= 1;
 

diff --git a/thcrap/src/expression.cpp b/thcrap/src/expression.cpp
@@ -459,6 +459,10 @@ THCRAP_API bool OS_is_wine(void) {
 	return wine_version != NULL;
 }
 
+bool CPU_Supports_LMLSAHF(void) {
+	return CPUID_Data.HasLMLSAHF;
+}
+
 #define WarnOnce(warning) do {\
 	static bool AlreadyDisplayedWarning = false;\
 	if (!AlreadyDisplayedWarning) { \

diff --git a/thcrap/src/expression.h b/thcrap/src/expression.h
@@ -242,6 +242,7 @@ bool CPU_Supports_SHA(void);
 bool CPU_FDP_ErrorOnly(void);
 bool CPU_FCS_FDS_Deprecated(void);
 THCRAP_API bool OS_is_wine(void);
+bool CPU_Supports_LMLSAHF(void);
 
 void DisableCodecaveNotFoundWarning(bool state);