Fix Posix build

dd86k · Sep 18, 2024 · 477433f · 477433f
1 parent 08e7179
commit 477433f
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 4 deletions.
diff --git a/debugger/shell.d b/debugger/shell.d
@@ -606,10 +606,18 @@ void shell_event_exception(adbg_process_t *proc, int event, void *edata, void *u
 		adbg_exception_t *ex = adbg_debugger_event_exception(edata);
 		assert(ex);
 
+		// HACK: Currently have no way to determine remote associated thread
+		version (Windows)
 		printf("*	Process %d (thread %d) stopped\n"~
 			"	Reason  : %s ("~ADBG_OS_ERROR_FORMAT~")\n",
 			proc.pid, proc.tid,
 			adbg_exception_name(ex), ex.oscode);
+		else
+		printf("*	Process %d stopped\n"~
+			"	Reason  : %s ("~ADBG_OS_ERROR_FORMAT~")\n",
+			proc.pid,
+			adbg_exception_name(ex), ex.oscode);
+
 
 		// No fault address available
 		if (ex.faultz == 0)

diff --git a/src/adbg/debugger.d b/src/adbg/debugger.d
@@ -660,7 +660,7 @@ Lwait:
 		event.type = AdbgEvent.exception;
 		tracee.status = AdbgProcStatus.paused;
 		int sig = WSTOPSIG(wstatus);
-		adbg_exception_translate(&exception, &tracee.pid, &sig);
+		adbg_exception_translate(&event.exception, &tracee.pid, &sig);
 	/*
 	} else if (WIFCONTINUED(wstatus)) { // Process continues, ignore these
 		goto Lwait;

diff --git a/src/adbg/process/exception.d b/src/adbg/process/exception.d
@@ -26,6 +26,7 @@ version (Windows) {
 	}
 } else version (Posix) {
 	import core.sys.posix.signal;
+	import adbg.include.posix.ptrace;
 
 	private enum SEGV_BNDERR = 3;
 }
@@ -286,13 +287,13 @@ version (Windows) {
 				exception.fault_address = 0;
 				break;
 			}
-			event.exception.fault_address = cast(size_t)siginfo._sifields._sigfault.si_addr;
+			exception.fault_address = cast(size_t)siginfo._sifields._sigfault.si_addr;
 			break;
 		default:
-			event.exception.fault_address = 0;
+			exception.fault_address = 0;
 		}
 	} else {
-		event.exception.fault_address = 0;
+		exception.fault_address = 0;
 	}
 
 	exception.oscode = signo;