Fix compilation on Musl targets.

dd86k · Oct 20, 2023 · 9eb63af · 9eb63af
1 parent 3bf615e
commit 9eb63af
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 18 deletions.
diff --git a/src/adbg/v1/debugger/debugger.d b/src/adbg/v1/debugger/debugger.d
@@ -568,15 +568,11 @@ L_DEBUG_LOOP:
 		// - gdbserver and lldb never attempt to do such thing anyway
 		case SIGILL, SIGSEGV, SIGFPE, SIGBUS:
 			siginfo_t sig = void;
-			if (ptrace(PT_GETSIGINFO, g_debuggee.pid, null, &sig) >= 0) {
-				version (CRuntime_Glibc)
-					e.fault.raw = sig._sifields._sigfault.si_addr;
-				else version (CRuntime_Musl)
-					e.fault.raw = sig.__si_fields.__sigfault.si_addr;
-				else static assert(0, "hack me");
-			} else {
+			if (ptrace(PT_GETSIGINFO, g_debuggee.pid, null, &sig) < 0) {
 				e.fault.raw = null;
+				break;
 			}
+			e.fault.raw = sig._sifields._sigfault.si_addr;
 			break;
 //		case SIGINT, SIGTERM, SIGABRT: //TODO: Kill?
 		default:

diff --git a/src/adbg/v1/debugger/seh/posix.d b/src/adbg/v1/debugger/seh/posix.d
@@ -62,11 +62,11 @@ void adbg_seh_action(int sig, siginfo_t *si, void *p) {
 
 	mexception.oscode = sig;
 	// HACK: Missing ref'd D bindings to Musl
-	version (CRuntime_Glibc)
+	/*version (CRuntime_Glibc)
 		mexception.fault.raw = si._sifields._sigfault.si_addr;
 	else version (CRuntime_Musl)
 		mexception.fault.raw = si.__si_fields.__sigfault.si_addr;
-	else static assert(0, "hack me");
+	else static assert(0, "hack me");*/
 
 	/+mexception.pid = mexception.tid = 0;
 	adbg_ctx_init(&mexception.registers);

diff --git a/src/adbg/v2/debugger/process.d b/src/adbg/v2/debugger/process.d
@@ -675,17 +675,19 @@ L_DEBUG_LOOP:
 		//   - First SIGTRAP does NOT contain int3
 		//     - Windows does, though, and points to it
 		// - gdbserver and lldb never attempt to do such thing anyway
+		// NOTE: Newer D compilers fixed siginfo_t as a whole
+		//       for version (linux). Noticed on DMD 2.103.1.
+		//       Old glibc: ._sifields._sigfault.si_addr
+		//       Old musl: .__si_fields.__sigfault.si_addr
+		//       New: ._sifields._sigfault.si_addr & .si_addr()
+		// NOTE: .si_addr() emits linker errors on Musl platforms.
 		case SIGILL, SIGSEGV, SIGFPE, SIGBUS:
 			siginfo_t sig = void;
 			if (ptrace(PT_GETSIGINFO, tracee.pid, null, &sig) < 0) {
 				exception.fault_address = 0;
 				break;
 			}
-			version (CRuntime_Glibc)
-				exception.fault_address = cast(ulong)sig._sifields._sigfault.si_addr;
-			else version (CRuntime_Musl)
-				exception.fault_address = cast(ulong)sig.__si_fields.__sigfault.si_addr;
-			else static assert(0, "hack me");
+			exception.fault_address = cast(size_t)sig._sifields._sigfault.si_addr;
 			break;
 //		case SIGINT, SIGTERM, SIGABRT: //TODO: Killed?
 		default:

diff --git a/src/adbg/v2/debugger/seh.d b/src/adbg/v2/debugger/seh.d
@@ -1,4 +1,4 @@
-/// (Incomplete module) Structued Exception Handling wrapper.
+/// (Work in progress) Structued Exception Handling wrapper.
 /// 
 /// Authors: dd86k <[email protected]>
 /// Copyright: © dd86k <[email protected]>
@@ -48,7 +48,7 @@ version (Windows) {
 
 extern (C):
 
-version (none)
+version (none) // Disabled until setjmp works on Win64
 public int adbg_seh_enable(int function(adbg_exception_t*) func) {
 	if (func == null)
 		return adbg_oops(AdbgError.nullArgument);
@@ -134,11 +134,11 @@ void adbg_seh_catch(int sig, siginfo_t *si, void *p) {
 
 	checkpoint.exception.oscode = sig;
 	// HACK: Missing ref'd D bindings to Musl
-	version (CRuntime_Glibc)
+	/*version (CRuntime_Glibc)
 		checkpoint.exception.fault_address = cast(ulong)si._sifields._sigfault.si_addr;
 	else version (CRuntime_Musl)
 		checkpoint.exception.fault_address = cast(ulong)si.__si_fields.__sigfault.si_addr;
-	else static assert(0, "hack me");
+	else static assert(0, "hack me");*/
 
 	/+mexception.pid = mexception.tid = 0;
 	adbg_ctx_init(&mexception.registers);