File gdb-6.8-mingw-3.patch of Package mingw32-gdb

Overview Repositories Revisions Requests Users Attributes Meta

File gdb-6.8-mingw-3.patch of Package mingw32-gdb (Revision 8b9edb69d952f59fc6bd355628989843)

Currently displaying revision 8b9edb69d952f59fc6bd355628989843 , Show latest

diff -urp gdb-6.8/gdb/gdbserver/remote-utils.c gdb-6.8/gdb/gdbserver/remote-utils.c
--- gdb-6.8/gdb/gdbserver/remote-utils.c	2008-01-29 16:51:50.000000000 -0800
+++ gdb-6.8/gdb/gdbserver/remote-utils.c	2008-04-09 14:04:30.000000000 -0700
@@ -617,7 +617,12 @@ input_interrupt (int unused)
 
       cc = read (remote_desc, &c, 1);
 
+#ifdef _WIN32_WINNT
+      // its normal in windows for current_inferior to be null.
+      if (cc != 1 || c != '\003' /*|| current_inferior == NULL*/)
+#else
       if (cc != 1 || c != '\003' || current_inferior == NULL)
+#endif
 	{
 	  fprintf (stderr, "input_interrupt, count = %d c = %d ('%c')\n",
 		   cc, c, c);
diff -urp gdb-6.8/gdb/gdbserver/server.c gdb-6.8/gdb/gdbserver/server.c
--- gdb-6.8/gdb/gdbserver/server.c	2008-02-19 13:36:54.000000000 -0800
+++ gdb-6.8/gdb/gdbserver/server.c	2008-04-23 13:56:51.000000000 -0700
@@ -29,6 +29,10 @@
 #include <sys/wait.h>
 #endif
 
+#ifdef _WIN32
+#include <windows.h>
+#endif
+
 unsigned long cont_thread;
 unsigned long general_thread;
 unsigned long step_thread;
@@ -268,6 +272,20 @@ monitor_show_help (void)
   monitor_output ("    Enable general debugging messages\n");  
   monitor_output ("  set remote-debug <0|1>\n");
   monitor_output ("    Enable remote protocol debugging messages\n");
+#ifdef _WIN32
+  monitor_output ("  get processlist\n");
+  monitor_output ("    List remote processes with names and pid\n");
+  monitor_output ("  get processlistmi\n");
+  monitor_output ("    Process list in an MI-like format\n");
+#endif
+  monitor_output ("  set env <name=value>\n");
+  monitor_output ("    Set environment variable in remote environment\n");
+  monitor_output ("  cd <directory>\n");
+  monitor_output ("    Change current working directory\n");
+  monitor_output ("  pwd\n");
+  monitor_output ("    Print current working directory\n");
+  monitor_output ("  shell <command line>\n");
+  monitor_output ("    Execute command on remote target\n");
   monitor_output ("  exit\n");
   monitor_output ("    Quit GDBserver\n");
 }
@@ -279,6 +297,47 @@ monitor_show_help (void)
       return;					\
     }
 
+#ifdef _WIN32
+typedef DWORD (__stdcall *GETPROCESSIMAGEFILENAME)(HANDLE hProcess, LPTSTR lpImageFileName, DWORD nSize);
+typedef BOOL (__stdcall *ENUMPROCESSES)(DWORD* pProcessIds, DWORD cb, DWORD* pBytesReturned);
+
+# define HAS_DEVICE(P) \
+((((P)[0] >= 'A' && (P)[0] <= 'Z') || ((P)[0] >= 'a' && (P)[0] <= 'z')) \
+&& (P)[1] == ':')
+# define FILE_SYSTEM_PREFIX_LEN(P) (HAS_DEVICE (P) ? 2 : 0)
+# define ISSLASH(C) ((C) == '/' || (C) == '\\')
+
+char *
+__basename (char const *name)
+{
+	char const *base = name += FILE_SYSTEM_PREFIX_LEN (name);
+	int all_slashes = 1;
+	char const *p;
+	
+	for (p = name; *p; p++)
+    {
+		if (ISSLASH (*p))
+			base = p + 1;
+		else
+			all_slashes = 0;
+    }
+	
+	/* If NAME is all slashes, arrange to return `/'.  */
+	if (*base == '\0' && ISSLASH (*name) && all_slashes)
+		--base;
+	
+	/* Make sure the last byte is not a slash.  */
+	//assert (all_slashes || !ISSLASH (*(p - 1)));
+	
+	return (char *) base;
+}
+#endif
+
+#ifndef _POSIX_PATH_MAX
+#define _POSIX_PATH_MAX 1024
+#define _POSIX_PATH_MAX_WAS_UNDEFINED
+#endif
+
 /* Handle all of the extended 'q' packets.  */
 void
 handle_query (char *own_buf, int packet_len, int *new_packet_len_p)
@@ -664,6 +723,158 @@ handle_query (char *own_buf, int packet_
 	  debug_threads = 1;
 	  monitor_output ("Debug output enabled.\n");
 	}
+#ifdef _WIN32
+  else if (strncmp (mon, "get processlist", 15) == 0)
+  {
+	  HINSTANCE lib = LoadLibrary("PSAPI.DLL");
+	  GETPROCESSIMAGEFILENAME imageFilename = (GETPROCESSIMAGEFILENAME)GetProcAddress(lib, "GetProcessImageFileNameA");
+	  ENUMPROCESSES enumProcesses = (ENUMPROCESSES)GetProcAddress(lib, "EnumProcesses");
+	  
+	  char* name = (char*)malloc(MAX_PATH);
+	  
+	  int miMode = (strcmp(mon, "get processlistmi") == 0);
+	  
+	  DWORD* pids = (DWORD*)malloc(sizeof(DWORD)*1024);
+	  memset(pids, 0, sizeof(pids));
+	  DWORD size = 0;
+	  
+	  if (!enumProcesses(pids, 1024 * sizeof(DWORD), &size))
+	  {
+		  free(pids);
+		  free(mon);
+		  return;
+	  }
+	  
+	  int cnt = 0;
+	  int number = size / sizeof(DWORD);
+	  
+	  char* miOutput = NULL;
+	  
+	  if (!miMode) 
+		  monitor_output("Remote process list:\n");
+	  else
+	  {
+		  miOutput = (char*)malloc((number * 255) * sizeof(char));
+		  strcpy(miOutput, "^done,processlist=[");
+	  }
+	  
+	  for (cnt = 0; cnt < number; cnt++)
+	  {
+		  HMODULE hProcess = (HMODULE)OpenProcess(PROCESS_QUERY_INFORMATION | PROCESS_VM_READ, FALSE, pids[cnt]);
+		  strcpy(name, "");
+		  printf(name);
+		  
+		  imageFilename(hProcess, name, MAX_PATH);
+		  
+		  if (pids[cnt] > 4 && strcmp(name, "") != 0)
+		  {
+			  char item[2048] = "";
+			  char tmp[24] = "0";
+			  itoa(pids[cnt], tmp, 10);
+			  strcat(item, tmp);
+			  strcat(item, "=");
+			  strcat(item, __basename(name));
+			  
+			  if (!miMode)
+			  {
+				  strcat(item, "\n");
+				  monitor_output(item);
+			  }
+			  else
+			  {
+				  strcat(miOutput, item);
+				  strcat(miOutput, ",");
+			  }
+		  }
+		  
+		  CloseHandle(hProcess);
+	  }
+	  
+	  if (miMode)
+	  {
+		  strcat(miOutput, "]\n");
+		  monitor_output(miOutput);
+		  free(miOutput);
+	  }
+	  
+	  FreeLibrary(lib);
+	  
+	  free(pids);
+	  free(name);	  
+  }
+#endif		
+  else if (strncmp (mon, "set env ", 8) == 0)
+  {
+	  char* envLine = mon + 8;
+	  char* envName = strtok(envLine, "= ");
+	  char* envValue = strtok(NULL, "= ");
+	  if (envName && envValue)
+	  {
+#ifdef _WIN32
+		  SetEnvironmentVariable(envName, envValue);
+#else
+		  setenv(envName, envValue, 1);
+#endif 
+		  monitor_output("Target environment variable set (");
+		  monitor_output(envName);
+		  monitor_output(" = ");
+		  monitor_output(envValue);
+		  monitor_output(").\n");
+	  }
+	  else
+		  monitor_output("Incorrect format for environment variable.\n");
+  }
+  else if (strncmp (mon, "cd ", 3) == 0)
+  {
+	  char* dir = mon + 3;
+	  if (strlen(dir) > 0)
+		  chdir(dir);
+  }
+  else if (strcmp(mon, "pwd") == 0)
+  {
+	  long size = _POSIX_PATH_MAX;
+	  char* current_directory = (char*)malloc(size);	  
+	  getcwd(current_directory, size);
+	  if (strlen(current_directory) > 0)
+	  {
+		  monitor_output(current_directory);
+		  monitor_output("\n");
+	  }
+	  free(current_directory);
+  }
+  else if (strncmp (mon, "shell ", 6) == 0)
+  {
+	  char* arg = mon + 6;
+	  
+	  if (strlen(arg) == 0)
+	  {
+		  monitor_output("Inferior shells are not supported.");
+		  free(mon);
+		  return;
+	  }
+	  
+	  long size = _POSIX_PATH_MAX;
+	  char* current_directory = (char*)malloc(size);  
+	  getcwd(current_directory, size);
+
+	  int rc = system (arg);
+	  char msg[255];
+	  if (rc == -1)
+	  {
+		  sprintf(msg, "Cannot execute '%s': %s.\n", arg, strerror(errno));
+		  monitor_output(msg);
+	  }
+	  else if (rc != -1)
+	  {
+		  sprintf(msg, "'%s' exited with status %d.\n", arg, rc);
+		  monitor_output(msg);
+	  }
+
+	  /* Make sure to return to the directory GDB thinks it is, in case the
+	   shell command we just ran changed it.  */
+	  chdir(current_directory);
+	  free(current_directory);
+  }
       else if (strcmp (mon, "set debug 0") == 0)
 	{
 	  debug_threads = 0;
@@ -699,6 +910,11 @@ handle_query (char *own_buf, int packet_
   own_buf[0] = 0;
 }
 
+#ifdef _POSIX_PATH_MAX_WAS_UNDEFINED
+#undef _POSIX_PATH_MAX
+#undef _POSIX_PATH_MAX_WAS_UNDEFINED
+#endif
+
 /* Parse vCont packets.  */
 void
 handle_v_cont (char *own_buf, char *status, int *signal)
@@ -1503,6 +1719,8 @@ main (int argc, char *argv[])
 		fprintf (stderr, "\nChild terminated with signal = 0x%x (%s)\n",
 			 target_signal_to_host (signal),
 			 target_signal_to_name (signal));
+			
+		kill_inferior();
 
 	      if (extended_protocol)
 		goto restart;
diff -urp gdb-6.8/gdb/gdbserver/win32-low.c gdb-6.8/gdb/gdbserver/win32-low.c
--- gdb-6.8/gdb/gdbserver/win32-low.c	2008-02-14 14:41:39.000000000 -0800
+++ gdb-6.8/gdb/gdbserver/win32-low.c	2008-04-22 23:24:38.000000000 -0700
@@ -38,7 +38,7 @@
 #include <sys/cygwin.h>
 #endif
 
-#define LOG 0
+#define LOG 1
 
 #define OUTMSG(X) do { printf X; fflush (stdout); } while (0)
 #if LOG
@@ -543,9 +543,9 @@ win32_create_inferior (char *program, ch
     }
   OUTMSG2 (("Command line is \"%s\"\n", args));
 
-#ifdef CREATE_NEW_PROCESS_GROUP
+//#ifdef CREATE_NEW_PROCESS_GROUP
   flags |= CREATE_NEW_PROCESS_GROUP;
-#endif
+//#endif
 
   ret = create_process (program, args, flags, &pi);
   err = GetLastError ();
@@ -684,8 +684,37 @@ win32_kill (void)
   if (current_process_handle == NULL)
     return;
 
-  TerminateProcess (current_process_handle, 0);
-  for (;;)
+	TerminateProcess (current_process_handle, 0);
+	
+	// BKS - fix for terminating apps prior to their exit, lets go of execs.
+	winapi_DebugActiveProcessStop pDebugActiveProcessStop = NULL;
+	winapi_DebugSetProcessKillOnExit pDebugSetProcessKillOnExit = NULL;
+#ifdef _WIN32_WCE
+	HMODULE dll = GetModuleHandle (_T("COREDLL.DLL"));
+#else
+	HMODULE dll = GetModuleHandle (_T("KERNEL32.DLL"));
+#endif
+	pDebugActiveProcessStop = GETPROCADDRESS (dll, DebugActiveProcessStop);
+	pDebugSetProcessKillOnExit = GETPROCADDRESS (dll, DebugSetProcessKillOnExit);
+	
+	if (pDebugSetProcessKillOnExit != NULL
+		&& pDebugActiveProcessStop != NULL)
+	{	
+		{
+			struct thread_resume resume;
+			resume.thread = -1;
+			resume.step = 0;
+			resume.sig = 0;
+			resume.leave_stopped = 0;
+			win32_resume (&resume);
+		}
+	
+		pDebugActiveProcessStop (current_process_id);
+		pDebugSetProcessKillOnExit (FALSE);
+	}
+	// end BKS
+
+   for (;;)
     {
       if (!child_continue (DBG_CONTINUE, -1))
 	break;
@@ -1186,6 +1216,7 @@ handle_exception (struct target_waitstat
 
   ourstatus->kind = TARGET_WAITKIND_STOPPED;
 
+	//printf("handle exception....................%X\n", (unsigned int)code);
   switch (code)
     {
     case EXCEPTION_ACCESS_VIOLATION:
@@ -1196,7 +1227,13 @@ handle_exception (struct target_waitstat
       OUTMSG2 (("STATUS_STACK_OVERFLOW"));
       ourstatus->value.sig = TARGET_SIGNAL_SEGV;
       break;
-    case STATUS_FLOAT_DENORMAL_OPERAND:
+	// BKS
+	case STATUS_INVALID_HANDLE:
+      OUTMSG2 (("STATUS_INVALID_HANDLE"));
+	  ourstatus->value.sig = TARGET_SIGNAL_TRAP;
+	  break;
+	// BKS
+	case STATUS_FLOAT_DENORMAL_OPERAND:
       OUTMSG2 (("STATUS_FLOAT_DENORMAL_OPERAND"));
       ourstatus->value.sig = TARGET_SIGNAL_FPE;
       break;
@@ -1453,7 +1490,8 @@ get_child_debug_event (struct target_wai
 		(unsigned) current_event.dwThreadId));
       ourstatus->kind = TARGET_WAITKIND_EXITED;
       ourstatus->value.integer = current_event.u.ExitProcess.dwExitCode;
-      CloseHandle (current_process_handle);
+	  win32_kill();  // fixed problem with exec's not being let go after completion.
+      //CloseHandle (current_process_handle); // let this get done by win32_kill().
       current_process_handle = NULL;
       break;
 
diff -urp gdb-6.8/gdb/linespec.c gdb-6.8/gdb/linespec.c
--- gdb-6.8/gdb/linespec.c	2008-01-01 14:53:11.000000000 -0800
+++ gdb-6.8/gdb/linespec.c	2008-04-23 11:15:58.000000000 -0700
@@ -1534,11 +1534,11 @@ symtab_from_filename (char **argptr, cha
   file_symtab = lookup_symtab (copy);
   if (file_symtab == 0)
     {
-      if (!have_full_symbols () && !have_partial_symbols ())
-	error (_("No symbol table is loaded.  Use the \"file\" command."));
+//      if (!have_full_symbols () && !have_partial_symbols ())
+//	error (_("No symbol table is loaded.  Use the \"file\" command."));
       if (not_found_ptr)
 	*not_found_ptr = 1;
-      throw_error (NOT_FOUND_ERROR, _("No source file named %s."), copy);
+      throw_error (NOT_FOUND_ERROR, _("No source file named %s in loaded symbols."), copy);
     }
 
   /* Discard the file name from the arg.  */
@@ -1744,13 +1744,13 @@ decode_variable (char *copy, int funfirs
   if (msymbol != NULL)
     return minsym_found (funfirstline, msymbol);
 
-  if (!have_full_symbols () &&
+  /*if (!have_full_symbols () &&
       !have_partial_symbols () && !have_minimal_symbols ())
-    error (_("No symbol table is loaded.  Use the \"file\" command."));
+    error (_("No symbol table is loaded.  Use the \"file\" command."));*/
 
   if (not_found_ptr)
     *not_found_ptr = 1;
-  throw_error (NOT_FOUND_ERROR, _("Function \"%s\" not defined."), copy);
+  throw_error (NOT_FOUND_ERROR, _("Function \"%s\" not defined in loaded symbols."), copy);
 }
 
 
diff -urp gdb-6.8/gdb/win32-nat.c gdb-6.8/gdb/win32-nat.c
--- gdb-6.8/gdb/win32-nat.c	2008-01-29 13:11:24.000000000 -0800
+++ gdb-6.8/gdb/win32-nat.c	2008-04-18 17:45:52.000000000 -0700
@@ -1031,6 +1031,10 @@
       DEBUG_EXCEPTION_SIMPLE ("STATUS_STACK_OVERFLOW");
       ourstatus->value.sig = TARGET_SIGNAL_SEGV;
       break;
+	case STATUS_INVALID_HANDLE:
+	  DEBUG_EXCEPTION_SIMPLE ("STATUS_INVALID_HANDLE");
+	  ourstatus->value.sig = TARGET_SIGNAL_TRAP;
+	  break;
     case STATUS_FLOAT_DENORMAL_OPERAND:
       DEBUG_EXCEPTION_SIMPLE ("STATUS_FLOAT_DENORMAL_OPERAND");
       ourstatus->value.sig = TARGET_SIGNAL_FPE;
@@ -1522,8 +1526,8 @@
    If loading these functions succeeds use them to actually detach from
    the inferior process, otherwise behave as usual, pretending that
    detach has worked. */
-static BOOL WINAPI (*DebugSetProcessKillOnExit)(BOOL);
-static BOOL WINAPI (*DebugActiveProcessStop)(DWORD);
+static BOOL WINAPI (*pDebugSetProcessKillOnExit)(BOOL);
+static BOOL WINAPI (*pDebugActiveProcessStop)(DWORD);
 
 static int
 has_detach_ability (void)
@@ -1534,13 +1538,13 @@
     kernel32 = LoadLibrary ("kernel32.dll");
   if (kernel32)
     {
-      if (!DebugSetProcessKillOnExit)
-	DebugSetProcessKillOnExit = GetProcAddress (kernel32,
+      if (!pDebugSetProcessKillOnExit)
+	pDebugSetProcessKillOnExit = GetProcAddress (kernel32,
 						 "DebugSetProcessKillOnExit");
-      if (!DebugActiveProcessStop)
-	DebugActiveProcessStop = GetProcAddress (kernel32,
+      if (!pDebugActiveProcessStop)
+	pDebugActiveProcessStop = GetProcAddress (kernel32,
 						 "DebugActiveProcessStop");
-      if (DebugSetProcessKillOnExit && DebugActiveProcessStop)
+      if (pDebugSetProcessKillOnExit && pDebugActiveProcessStop)
 	return 1;
     }
   return 0;
@@ -1660,7 +1664,7 @@
     error (_("Can't attach to process."));
 
   if (has_detach_ability ())
-    DebugSetProcessKillOnExit (FALSE);
+    pDebugSetProcessKillOnExit (FALSE);
 
   attach_flag = 1;
 
@@ -1692,13 +1696,13 @@
       ptid_t ptid = {-1};
       win32_resume (ptid, 0, TARGET_SIGNAL_0);
 
-      if (!DebugActiveProcessStop (current_event.dwProcessId))
+      if (!pDebugActiveProcessStop (current_event.dwProcessId))
 	{
 	  error (_("Can't detach process %lu (error %lu)"),
 		 current_event.dwProcessId, GetLastError ());
 	  detached = 0;
 	}
-      DebugSetProcessKillOnExit (FALSE);
+      pDebugSetProcessKillOnExit (FALSE);
     }
   if (detached && from_tty)
     {
--- gdb-6.8/gdb/event-top.c	2009-08-13 10:45:41.000000000 +0200
+++ gdb-6.8/gdb/event-top.c	2009-08-13 10:46:52.000000000 +0200
@@ -42,6 +42,10 @@
 /* readline defines this.  */
 #undef savestring
 
+#if defined(_WIN32) && defined(SIGHUP)
+#undef SIGHUP
+#endif
+
 static void rl_callback_read_char_wrapper (gdb_client_data client_data);
 static void command_line_handler (char *rl);
 static void command_line_handler_continuation (struct continuation_arg *arg);

Places

File gdb-6.8-mingw-3.patch of Package mingw32-gdb (Revision 8b9edb69d952f59fc6bd355628989843)

Places