Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1958)

Side by Side Diff: gdb/rs6000-nat.c

Issue 11969036: Merge GDB 7.5.1 (Closed) Base URL: http://git.chromium.org/native_client/nacl-gdb.git@master
Patch Set: Created 7 years, 11 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « gdb/rs6000-aix-tdep.c ('k') | gdb/rs6000-tdep.c » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
None
OLDNEW
1 /* IBM RS/6000 native-dependent code for GDB, the GNU debugger. 1 /* IBM RS/6000 native-dependent code for GDB, the GNU debugger.
2 2
3 Copyright (C) 1986-1987, 1989, 1991-2004, 2007-2012 Free Software 3 Copyright (C) 1986-1987, 1989, 1991-2004, 2007-2012 Free Software
4 Foundation, Inc. 4 Foundation, Inc.
5 5
6 This file is part of GDB. 6 This file is part of GDB.
7 7
8 This program is free software; you can redistribute it and/or modify 8 This program is free software; you can redistribute it and/or modify
9 it under the terms of the GNU General Public License as published by 9 it under the terms of the GNU General Public License as published by
10 the Free Software Foundation; either version 3 of the License, or 10 the Free Software Foundation; either version 3 of the License, or
(...skipping 13 matching lines...) Expand all
24 #include "gdbcore.h" 24 #include "gdbcore.h"
25 #include "xcoffsolib.h" 25 #include "xcoffsolib.h"
26 #include "symfile.h" 26 #include "symfile.h"
27 #include "objfiles.h" 27 #include "objfiles.h"
28 #include "libbfd.h" /* For bfd_default_set_arch_mach (FIXME) */ 28 #include "libbfd.h" /* For bfd_default_set_arch_mach (FIXME) */
29 #include "bfd.h" 29 #include "bfd.h"
30 #include "exceptions.h" 30 #include "exceptions.h"
31 #include "gdb-stabs.h" 31 #include "gdb-stabs.h"
32 #include "regcache.h" 32 #include "regcache.h"
33 #include "arch-utils.h" 33 #include "arch-utils.h"
34 #include "inf-child.h"
34 #include "inf-ptrace.h" 35 #include "inf-ptrace.h"
35 #include "ppc-tdep.h" 36 #include "ppc-tdep.h"
36 #include "rs6000-tdep.h" 37 #include "rs6000-tdep.h"
37 #include "exec.h" 38 #include "exec.h"
38 #include "observer.h" 39 #include "observer.h"
39 #include "xcoffread.h" 40 #include "xcoffread.h"
40 41
41 #include <sys/ptrace.h> 42 #include <sys/ptrace.h>
42 #include <sys/reg.h> 43 #include <sys/reg.h>
43 44
(...skipping 499 matching lines...) Expand 10 before | Expand all | Expand 10 after
543 clear_sigint_trap (); 544 clear_sigint_trap ();
544 545
545 if (pid == -1) 546 if (pid == -1)
546 { 547 {
547 fprintf_unfiltered (gdb_stderr, 548 fprintf_unfiltered (gdb_stderr,
548 _("Child process unexpectedly missing: %s.\n"), 549 _("Child process unexpectedly missing: %s.\n"),
549 safe_strerror (save_errno)); 550 safe_strerror (save_errno));
550 551
551 /* Claim it exited with unknown signal. */ 552 /* Claim it exited with unknown signal. */
552 ourstatus->kind = TARGET_WAITKIND_SIGNALLED; 553 ourstatus->kind = TARGET_WAITKIND_SIGNALLED;
553 » ourstatus->value.sig = TARGET_SIGNAL_UNKNOWN; 554 » ourstatus->value.sig = GDB_SIGNAL_UNKNOWN;
554 return inferior_ptid; 555 return inferior_ptid;
555 } 556 }
556 557
557 /* Ignore terminated detached child processes. */ 558 /* Ignore terminated detached child processes. */
558 if (!WIFSTOPPED (status) && pid != ptid_get_pid (inferior_ptid)) 559 if (!WIFSTOPPED (status) && pid != ptid_get_pid (inferior_ptid))
559 pid = -1; 560 pid = -1;
560 } 561 }
561 while (pid == -1); 562 while (pid == -1);
562 563
563 /* AIX has a couple of strange returns from wait(). */ 564 /* AIX has a couple of strange returns from wait(). */
(...skipping 640 matching lines...) Expand 10 before | Expand all | Expand 10 after
1204 1205
1205 static CORE_ADDR 1206 static CORE_ADDR
1206 find_toc_address (CORE_ADDR pc) 1207 find_toc_address (CORE_ADDR pc)
1207 { 1208 {
1208 struct vmap *vp; 1209 struct vmap *vp;
1209 1210
1210 for (vp = vmap; vp; vp = vp->nxt) 1211 for (vp = vmap; vp; vp = vp->nxt)
1211 { 1212 {
1212 if (pc >= vp->tstart && pc < vp->tend) 1213 if (pc >= vp->tstart && pc < vp->tend)
1213 { 1214 {

error: old chunk mismatch

OLDNEW
« no previous file with comments | « gdb/rs6000-aix-tdep.c ('k') | gdb/rs6000-tdep.c » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698