Re: [common] Merge duplicated macros in linux-nat.c and linux-low.c

Yao Qi
2011-02-18T14:41:38Z

[-- Attachment #1: Type: text/plain, Size: 601 bytes --]

On 02/18/2011 04:24 PM, Jan Kratochvil wrote:

Jan,
Thanks for the quick review.

> There should be a wrapper:
>
> #ifndef COMMON_LINUX_COMMON_H
> #define COMMON_LINUX_COMMON_H
> #endif /* COMMON_LINUX_COMMON_H */
>

OK. Done.

>> > #include "gdb_proc_service.h"
>> > +#include "linux-common.h"
> If you moved the definitions out of linux-low.c it is enough
> to #include "linux-common.h" also just in linux-low.c.
>

Oh, yes. Fixed.

> If you moved the definitions out of linux-nat.c it is enough
> to #include "linux-common.h" also just in linux-nat.c.

Fixed as well.

--
Yao (é½å°§)

[-- Attachment #2: linux-common-h-0218-r2.patch --]
[-- Type: text/x-patch, Size: 6317 bytes --]

gdb/

* linux-nat.c: Move common macros to ...
Include linux-common.h.
* common/linux-common.h: ... here. New.

gdb/gdbserver/

* linux-low.c: Move common macros to linux-common.h.
Include linux-common.h.

diff --git a/gdb/common/linux-common.h b/gdb/common/linux-common.h
new file mode 100644
index 0000000..1987ea5
--- /dev/null
+++ b/gdb/common/linux-common.h
@@ -0,0 +1,65 @@
+/* Copyright (C) 2011 Free Software Foundation, Inc.
+
+ This file is part of GDB.
+
+ This program is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation; either version 3 of the License, or
+ (at your option) any later version.
+
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with this program. If not, see <http://www.gnu.org/licenses/>. */
+
+#ifndef COMMON_LINUX_COMMON_H
+#define COMMON_LINUX_COMMON_H
+
+#include <sys/ptrace.h>
+
+#ifndef PTRACE_GETSIGINFO
+# define PTRACE_GETSIGINFO 0x4202
+# define PTRACE_SETSIGINFO 0x4203
+#endif /* PTRACE_GETSIGINF */
+
+/* If the system headers did not provide the constants, hard-code the normal
+ values. */
+#ifndef PTRACE_EVENT_FORK
+
+#define PTRACE_SETOPTIONS 0x4200
+#define PTRACE_GETEVENTMSG 0x4201
+
+/* options set using PTRACE_SETOPTIONS */
+#define PTRACE_O_TRACESYSGOOD 0x00000001
+#define PTRACE_O_TRACEFORK 0x00000002
+#define PTRACE_O_TRACEVFORK 0x00000004
+#define PTRACE_O_TRACECLONE 0x00000008
+#define PTRACE_O_TRACEEXEC 0x00000010
+#define PTRACE_O_TRACEVFORKDONE 0x00000020
+#define PTRACE_O_TRACEEXIT 0x00000040
+
+/* Wait extended result codes for the above trace options. */
+#define PTRACE_EVENT_FORK 1
+#define PTRACE_EVENT_VFORK 2
+#define PTRACE_EVENT_CLONE 3
+#define PTRACE_EVENT_EXEC 4
+#define PTRACE_EVENT_VFORK_DONE 5
+#define PTRACE_EVENT_EXIT 6
+
+#endif /* PTRACE_EVENT_FORK */
+
+#ifndef O_LARGEFILE
+#define O_LARGEFILE 0
+#endif
+
+/* We can't always assume that this flag is available, but all systems
+ with the ptrace event handlers also have __WALL, so it's safe to use
+ in some contexts. */
+#ifndef __WALL
+#define __WALL 0x40000000 /* Wait for any child. */
+#endif
+
+#endif /* COMMON_LINUX_COMMON_H */
diff --git a/gdb/gdbserver/linux-low.c b/gdb/gdbserver/linux-low.c
index 93f3570..4b16366 100644
--- a/gdb/gdbserver/linux-low.c
+++ b/gdb/gdbserver/linux-low.c
@@ -24,6 +24,7 @@
#include <stdio.h>
#include <sys/param.h>
#include <sys/ptrace.h>
+#include "linux-common.h"
#include <signal.h>
#include <sys/ioctl.h>
#include <fcntl.h>
@@ -52,47 +53,9 @@
#define SPUFS_MAGIC 0x23c9b64e
#endif

-#ifndef PTRACE_GETSIGINFO
-# define PTRACE_GETSIGINFO 0x4202
-# define PTRACE_SETSIGINFO 0x4203
-#endif

-#ifndef O_LARGEFILE
-#define O_LARGEFILE 0
-#endif

-/* If the system headers did not provide the constants, hard-code the normal
- values. */
-#ifndef PTRACE_EVENT_FORK
-
-#define PTRACE_SETOPTIONS 0x4200
-#define PTRACE_GETEVENTMSG 0x4201
-
-/* options set using PTRACE_SETOPTIONS */
-#define PTRACE_O_TRACESYSGOOD 0x00000001
-#define PTRACE_O_TRACEFORK 0x00000002
-#define PTRACE_O_TRACEVFORK 0x00000004
-#define PTRACE_O_TRACECLONE 0x00000008
-#define PTRACE_O_TRACEEXEC 0x00000010
-#define PTRACE_O_TRACEVFORKDONE 0x00000020
-#define PTRACE_O_TRACEEXIT 0x00000040
-
-/* Wait extended result codes for the above trace options. */
-#define PTRACE_EVENT_FORK 1
-#define PTRACE_EVENT_VFORK 2
-#define PTRACE_EVENT_CLONE 3
-#define PTRACE_EVENT_EXEC 4
-#define PTRACE_EVENT_VFORK_DONE 5
-#define PTRACE_EVENT_EXIT 6
-
-#endif /* PTRACE_EVENT_FORK */
-
-/* We can't always assume that this flag is available, but all systems
- with the ptrace event handlers also have __WALL, so it's safe to use
- in some contexts. */
-#ifndef __WALL
-#define __WALL 0x40000000 /* Wait for any child. */
-#endif
+

#ifndef W_STOPCODE
#define W_STOPCODE(sig) ((sig) << 8 | 0x7f)
diff --git a/gdb/linux-nat.c b/gdb/linux-nat.c
index cd88df8..c4d61fc 100644
--- a/gdb/linux-nat.c
+++ b/gdb/linux-nat.c
@@ -30,6 +30,7 @@
#endif
#include <sys/ptrace.h>
#include "linux-nat.h"
+#include "linux-common.h"
#include "linux-fork.h"
#include "gdbthread.h"
#include "gdbcmd.h"
@@ -156,53 +157,12 @@ But we would still have to have some support for SIGSTOP, since PTRACE_ATTACH
generates it, and there are races with trying to find a signal that is not
blocked. */

-#ifndef O_LARGEFILE
-#define O_LARGEFILE 0
-#endif
-
-/* If the system headers did not provide the constants, hard-code the normal
- values. */
-#ifndef PTRACE_EVENT_FORK
-
-#define PTRACE_SETOPTIONS 0x4200
-#define PTRACE_GETEVENTMSG 0x4201
-
-/* Options set using PTRACE_SETOPTIONS. */
-#define PTRACE_O_TRACESYSGOOD 0x00000001
-#define PTRACE_O_TRACEFORK 0x00000002
-#define PTRACE_O_TRACEVFORK 0x00000004
-#define PTRACE_O_TRACECLONE 0x00000008
-#define PTRACE_O_TRACEEXEC 0x00000010
-#define PTRACE_O_TRACEVFORKDONE 0x00000020
-#define PTRACE_O_TRACEEXIT 0x00000040
-
-/* Wait extended result codes for the above trace options. */
-#define PTRACE_EVENT_FORK 1
-#define PTRACE_EVENT_VFORK 2
-#define PTRACE_EVENT_CLONE 3
-#define PTRACE_EVENT_EXEC 4
-#define PTRACE_EVENT_VFORK_DONE 5
-#define PTRACE_EVENT_EXIT 6
-
-#endif /* PTRACE_EVENT_FORK */

/* Unlike other extended result codes, WSTOPSIG (status) on
PTRACE_O_TRACESYSGOOD syscall events doesn't return SIGTRAP, but
instead SIGTRAP with bit 7 set. */
#define SYSCALL_SIGTRAP (SIGTRAP | 0x80)

-/* We can't always assume that this flag is available, but all systems
- with the ptrace event handlers also have __WALL, so it's safe to use
- here. */
-#ifndef __WALL
-#define __WALL 0x40000000 /* Wait for any child. */
-#endif
-
-#ifndef PTRACE_GETSIGINFO
-# define PTRACE_GETSIGINFO 0x4202
-# define PTRACE_SETSIGINFO 0x4203
-#endif
-
/* The single-threaded native GNU/Linux target_ops. We save a pointer for
the use of the multi-threaded target. */
static struct target_ops *linux_ops;