projects
/
deliverable
/
binutils-gdb.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Don't define _FORTIFY_SOURCE on MinGW
[deliverable/binutils-gdb.git]
/
gdb
/
darwin-nat.c
diff --git
a/gdb/darwin-nat.c
b/gdb/darwin-nat.c
index ec9a313d5994c3051271d46060fd5d78c1eaf0d6..2a33a7d522f272bf77e6643ccf39bfe0278fac8c 100644
(file)
--- a/
gdb/darwin-nat.c
+++ b/
gdb/darwin-nat.c
@@
-1,5
+1,5
@@
/* Darwin support for GDB, the GNU debugger.
/* Darwin support for GDB, the GNU debugger.
- Copyright (C) 2008-20
19
Free Software Foundation, Inc.
+ Copyright (C) 2008-20
20
Free Software Foundation, Inc.
Contributed by AdaCore.
Contributed by AdaCore.
@@
-19,56
+19,56
@@
along with this program. If not, see <http://www.gnu.org/licenses/>. */
#include "defs.h"
along with this program. If not, see <http://www.gnu.org/licenses/>. */
#include "defs.h"
+#include "top.h"
+#include "inferior.h"
+#include "target.h"
+#include "symfile.h"
+#include "symtab.h"
+#include "objfiles.h"
+#include "gdbcmd.h"
+#include "gdbcore.h"
+#include "gdbthread.h"
+#include "regcache.h"
+#include "event-top.h"
+#include "inf-loop.h"
+#include <sys/stat.h>
+#include "inf-child.h"
+#include "value.h"
+#include "arch-utils.h"
+#include "bfd.h"
+#include "bfd/mach-o.h"
+#include "gdbarch.h"
-/* Standard C includes. */
#include <copyfile.h>
#include <copyfile.h>
+#include <sys/ptrace.h>
+#include <sys/signal.h>
+#include <setjmp.h>
+#include <sys/types.h>
+#include <unistd.h>
+#include <signal.h>
#include <ctype.h>
#include <ctype.h>
+#include <sys/sysctl.h>
+#include <sys/proc.h>
#include <libproc.h>
#include <libproc.h>
+#include <sys/syscall.h>
+#include <spawn.h>
+
#include <mach/mach_error.h>
#include <mach/mach_error.h>
-#include <mach/mach_init.h>
-#include <mach/mach_port.h>
#include <mach/mach_vm.h>
#include <mach/mach_vm.h>
-#include <mach/port.h>
+#include <mach/mach_init.h>
+#include <mach/vm_map.h>
#include <mach/task.h>
#include <mach/task.h>
+#include <mach/mach_port.h>
#include <mach/thread_act.h>
#include <mach/thread_act.h>
-#include <mach/vm_map.h>
-#include <setjmp.h>
-#include <signal.h>
-#include <spawn.h>
-#include <sys/proc.h>
-#include <sys/ptrace.h>
-#include <sys/signal.h>
-#include <sys/stat.h>
-#include <sys/syscall.h>
-#include <sys/sysctl.h>
-#include <sys/types.h>
-#include <unistd.h>
+#include <mach/port.h>
-/* Local non-gdb includes. */
-#include "arch-utils.h"
-#include "bfd.h"
-#include "bfd/mach-o.h"
-#include "common/filestuff.h"
-#include "common/gdb_unlinker.h"
-#include "common/pathstuff.h"
-#include "common/scoped_fd.h"
#include "darwin-nat.h"
#include "darwin-nat.h"
-#include "event-top.h"
#include "filenames.h"
#include "filenames.h"
-#include "gdbcmd.h"
-#include "gdbcore.h"
-#include "gdbthread.h"
-#include "inf-child.h"
-#include "inf-loop.h"
-#include "inferior.h"
+#include "gdbsupport/filestuff.h"
+#include "gdbsupport/gdb_unlinker.h"
+#include "gdbsupport/pathstuff.h"
+#include "gdbsupport/scoped_fd.h"
#include "nat/fork-inferior.h"
#include "nat/fork-inferior.h"
-#include "objfiles.h"
-#include "regcache.h"
-#include "symfile.h"
-#include "symtab.h"
-#include "target.h"
-#include "top.h"
-#include "value.h"
/* Quick overview.
Darwin kernel is Mach + BSD derived kernel. Note that they share the
/* Quick overview.
Darwin kernel is Mach + BSD derived kernel. Note that they share the
@@
-120,7
+120,7
@@
static vm_size_t mach_page_size;
/* If Set, catch all mach exceptions (before they are converted to signals
by the kernel). */
/* If Set, catch all mach exceptions (before they are converted to signals
by the kernel). */
-static
int
enable_mach_exceptions;
+static
bool
enable_mach_exceptions;
/* Inferior that should report a fake stop event. */
static struct inferior *darwin_inf_fake_stop;
/* Inferior that should report a fake stop event. */
static struct inferior *darwin_inf_fake_stop;
@@
-688,7
+688,6
@@
darwin_decode_exception_message (mach_msg_header_t *hdr,
/* Not a known inferior. This could happen if the child fork, as
the created process will inherit its exception port.
FIXME: should the exception port be restored ? */
/* Not a known inferior. This could happen if the child fork, as
the created process will inherit its exception port.
FIXME: should the exception port be restored ? */
- kern_return_t kret;
mig_reply_error_t reply;
inferior_debug
mig_reply_error_t reply;
inferior_debug
@@
-1126,14
+1125,14
@@
darwin_decode_message (mach_msg_header_t *hdr,
if (!priv->no_ptrace)
{
if (!priv->no_ptrace)
{
- pid_t res;
+ pid_t res
_pid
;
int wstatus;
int wstatus;
- res = wait4 (inf->pid, &wstatus, 0, NULL);
- if (res
< 0 || res
!= inf->pid)
+ res
_pid
= wait4 (inf->pid, &wstatus, 0, NULL);
+ if (res
_pid < 0 || res_pid
!= inf->pid)
{
printf_unfiltered (_("wait4: res=%d: %s\n"),
{
printf_unfiltered (_("wait4: res=%d: %s\n"),
- res, safe_strerror (errno));
+ res
_pid
, safe_strerror (errno));
status->kind = TARGET_WAITKIND_IGNORE;
return minus_one_ptid;
}
status->kind = TARGET_WAITKIND_IGNORE;
return minus_one_ptid;
}
@@
-1149,7
+1148,7
@@
darwin_decode_message (mach_msg_header_t *hdr,
}
inferior_debug (4, _("darwin_wait: pid=%d exit, status=0x%x\n"),
}
inferior_debug (4, _("darwin_wait: pid=%d exit, status=0x%x\n"),
- res, wstatus);
+ res
_pid
, wstatus);
/* Looks necessary on Leopard and harmless... */
wait4 (inf->pid, &wstatus, 0, NULL);
/* Looks necessary on Leopard and harmless... */
wait4 (inf->pid, &wstatus, 0, NULL);
@@
-1560,7
+1559,6
@@
darwin_nat_target::kill ()
signaled thus darwin_decode_message function knows that the kill
signal was sent by gdb and will take the appropriate action
(cancel signal and reply to the signal message). */
signaled thus darwin_decode_message function knows that the kill
signal was sent by gdb and will take the appropriate action
(cancel signal and reply to the signal message). */
- darwin_inferior *priv = get_darwin_inferior (inf);
for (darwin_thread_t *thread : priv->threads)
thread->signaled = 1;
for (darwin_thread_t *thread : priv->threads)
thread->signaled = 1;
@@
-1612,7
+1610,7
@@
darwin_attach_pid (struct inferior *inf)
darwin_inferior *priv = new darwin_inferior;
inf->priv.reset (priv);
darwin_inferior *priv = new darwin_inferior;
inf->priv.reset (priv);
- TRY
+ try
{
kret = task_for_pid (gdb_task, inf->pid, &priv->task);
if (kret != KERN_SUCCESS)
{
kret = task_for_pid (gdb_task, inf->pid, &priv->task);
if (kret != KERN_SUCCESS)
@@
-1689,14
+1687,13
@@
darwin_attach_pid (struct inferior *inf)
darwin_setup_exceptions (inf);
}
darwin_setup_exceptions (inf);
}
-
CATCH (ex, RETURN_MASK_ALL
)
+
catch (const gdb_exception &ex
)
{
exit_inferior (inf);
inferior_ptid = null_ptid;
{
exit_inferior (inf);
inferior_ptid = null_ptid;
- throw
_exception (ex)
;
+ throw;
}
}
- END_CATCH
target_ops *darwin_ops = get_native_target ();
if (!target_is_pushed (darwin_ops))
target_ops *darwin_ops = get_native_target ();
if (!target_is_pushed (darwin_ops))
@@
-1950,11
+1947,11
@@
The error was: %s"),
/* Maybe it was cached by some earlier gdb. */
if (stat (new_name.c_str (), &sb) != 0 || !S_ISREG (sb.st_mode))
{
/* Maybe it was cached by some earlier gdb. */
if (stat (new_name.c_str (), &sb) != 0 || !S_ISREG (sb.st_mode))
{
- TRY
+ try
{
copy_shell_to_cache (shell, new_name);
}
{
copy_shell_to_cache (shell, new_name);
}
-
CATCH (ex, RETURN_MASK_ERROR
)
+
catch (const gdb_exception_error &ex
)
{
warning (_("This version of macOS has System Integrity Protection.\n\
Because `startup-with-shell' is enabled, gdb tried to work around SIP by\n\
{
warning (_("This version of macOS has System Integrity Protection.\n\
Because `startup-with-shell' is enabled, gdb tried to work around SIP by\n\
@@
-1963,10
+1960,9
@@
caching a copy of your shell. However, this failed:\n\
If you correct the problem, gdb will automatically try again the next time\n\
you \"run\". To prevent these attempts, you can use:\n\
set startup-with-shell off"),
If you correct the problem, gdb will automatically try again the next time\n\
you \"run\". To prevent these attempts, you can use:\n\
set startup-with-shell off"),
- ex.
message
);
+ ex.
what ()
);
return false;
}
return false;
}
- END_CATCH
printf_filtered (_("Note: this version of macOS has System Integrity Protection.\n\
Because `startup-with-shell' is enabled, gdb has worked around this by\n\
printf_filtered (_("Note: this version of macOS has System Integrity Protection.\n\
Because `startup-with-shell' is enabled, gdb has worked around this by\n\
@@
-1989,7
+1985,7
@@
darwin_nat_target::create_inferior (const char *exec_file,
const std::string &allargs,
char **env, int from_tty)
{
const std::string &allargs,
char **env, int from_tty)
{
- gdb::optional<scoped_restore_tmpl<
int
>> restore_startup_with_shell;
+ gdb::optional<scoped_restore_tmpl<
bool
>> restore_startup_with_shell;
if (startup_with_shell && may_have_sip ())
{
if (startup_with_shell && may_have_sip ())
{
@@
-2049,7
+2045,7
@@
darwin_nat_target::attach (const char *args, int from_tty)
if (from_tty)
{
if (from_tty)
{
- char *exec_file = get_exec_file (0);
+ c
onst c
har *exec_file = get_exec_file (0);
if (exec_file)
printf_unfiltered (_("Attaching to program: %s, %s\n"), exec_file,
if (exec_file)
printf_unfiltered (_("Attaching to program: %s, %s\n"), exec_file,
@@
-2149,7
+2145,7
@@
darwin_nat_target::thread_alive (ptid_t ptid)
copy it to RDADDR in gdb's address space.
If WRADDR is not NULL, write gdb's LEN bytes from WRADDR and copy it
to ADDR in inferior task's address space.
copy it to RDADDR in gdb's address space.
If WRADDR is not NULL, write gdb's LEN bytes from WRADDR and copy it
to ADDR in inferior task's address space.
- Return 0 on failure; number of bytes read / writen otherwise. */
+ Return 0 on failure; number of bytes read / writ
t
en otherwise. */
static int
darwin_read_write_inferior (task_t task, CORE_ADDR addr,
static int
darwin_read_write_inferior (task_t task, CORE_ADDR addr,
This page took
0.029653 seconds
and
4
git commands to generate.