This is the mail archive of the
libc-alpha@sourceware.org
mailing list for the glibc project.
[SH][PATCH] fix headers for new kernel headers
- From: SUGIOKA Toshinobu <sugioka at itonet dot co dot jp>
- To: Kaz Kojima <kkojima at rr dot iij4u dot or dot jp>
- Cc: libc-alpha at sourceware dot org
- Date: Tue, 17 Feb 2009 08:52:58 +0900
- Subject: [SH][PATCH] fix headers for new kernel headers
Hi,
Newer kernel headers build by 'make headers_install' does not include
asm/elf.h and asm/user.h. So we should copy content of these headers
to our own heades. Attached patch worked for me to compile under recent
kernel headers.
2009-02-17 SUGIOKA Toshinobu <sugioka@itonet.co.jp>
sysdeps/unix/sysv/linux/sh/sys/procfs.h: Don't include signal.h,
sys/ucontext.h, asm/elf.h. remove #if 0...#endif. add/fix comments.
sysdeps/unix/sysv/linux/sh/sys/user.h: Don't include features.h,
asm/user.h.
Define REGS_XXX, struct user_regs_struct, struct user_dspregs_struct,
struct user_fpu_struct, struct user, PAGE_SHIFT, PAGE_SIZE, PAGE_MASK,
NBPG, UPAGES, HOST_TEXT_START_ADDR, HOST_DATA_START_ADDR,
HOST_STACK_END_ADDR.
remove "#undef start_thread".
Index: sysdeps/unix/sysv/linux/sh/sys/procfs.h
===================================================================
RCS file: /cvs/glibc/libc/sysdeps/unix/sysv/linux/sh/sys/procfs.h,v
retrieving revision 1.1
diff -u -r1.1 procfs.h
--- sysdeps/unix/sysv/linux/sh/sys/procfs.h 20 Nov 2004 17:56:16 -0000 1.1
+++ sysdeps/unix/sysv/linux/sh/sys/procfs.h 16 Feb 2009 23:50:31 -0000
@@ -1,4 +1,4 @@
-/* Copyright (C) 1996, 1997, 1999, 2004 Free Software Foundation, Inc.
+/* Copyright (C) 1996, 1997, 1999, 2000, 2009 Free Software Foundation, Inc.
This file is part of the GNU C Library.
The GNU C Library is free software; you can redistribute it and/or
@@ -19,20 +19,37 @@
#ifndef _SYS_PROCFS_H
#define _SYS_PROCFS_H 1
-/* This is somehow modelled after the file of the same name on SysVr4
+/* This is somewhat modelled after the file of the same name on SVR4
systems. It provides a definition of the core file format for ELF
- used on Linux. */
+ used on Linux. It doesn't have anything to do with the /proc file
+ system, even though Linux has one.
+
+ Anyway, the whole purpose of this file is for GDB and GDB only.
+ Don't read too much into it. Don't use it for anything other than
+ GDB unless you know what you are doing. */
#include <features.h>
-#include <signal.h>
#include <sys/time.h>
#include <sys/types.h>
-#include <sys/ucontext.h>
#include <sys/user.h>
-#include <asm/elf.h>
__BEGIN_DECLS
+/* Type for a general-purpose register. */
+typedef unsigned long elf_greg_t;
+
+/* And the whole bunch of them. We could have used `struct
+ user_regs_struct' directly in the typedef, but tradition says that
+ the register set is an array, which does have some peculiar
+ semantics, so leave it that way. */
+#define ELF_NGREG (sizeof (struct user_regs_struct) / sizeof(elf_greg_t))
+typedef elf_greg_t elf_gregset_t[ELF_NGREG];
+
+/* Register set for the floating-point registers. */
+typedef struct user_fpu_struct elf_fpregset_t;
+
+
+/* Signal info. */
struct elf_siginfo
{
int si_signo; /* Signal number. */
@@ -40,28 +57,20 @@
int si_errno; /* Errno. */
};
+
/* Definitions to generate Intel SVR4-like core files. These mostly
have the same names as the SVR4 types with "elf_" tacked on the
- front to prevent clashes with linux definitions, and the typedef
+ front to prevent clashes with Linux definitions, and the typedef
forms have been avoided. This is mostly like the SVR4 structure,
but more Linuxy, with things that Linux does not support and which
- gdb doesn't really use excluded. Fields present but not used are
- marked with "XXX". */
+ GDB doesn't really use excluded. */
+
struct elf_prstatus
{
-#if 0
- long int pr_flags; /* XXX Process flags. */
- short int pr_why; /* XXX Reason for process halt. */
- short int pr_what; /* XXX More detailed reason. */
-#endif
struct elf_siginfo pr_info; /* Info associated with signal. */
short int pr_cursig; /* Current signal. */
unsigned long int pr_sigpend; /* Set of pending signals. */
unsigned long int pr_sighold; /* Set of held signals. */
-#if 0
- struct sigaltstack pr_altstack; /* Alternate stack info. */
- struct sigaction pr_action; /* Signal action for current sig. */
-#endif
__pid_t pr_pid;
__pid_t pr_ppid;
__pid_t pr_pgrp;
@@ -70,15 +79,12 @@
struct timeval pr_stime; /* System time. */
struct timeval pr_cutime; /* Cumulative user time. */
struct timeval pr_cstime; /* Cumulative system time. */
-#if 0
- long int pr_instr; /* Current instruction. */
-#endif
elf_gregset_t pr_reg; /* GP registers. */
int pr_fpvalid; /* True if math copro being used. */
};
-#define ELF_PRARGSZ (80) /* Number of chars for args */
+#define ELF_PRARGSZ (80) /* Number of chars for args. */
struct elf_prpsinfo
{
@@ -95,6 +101,11 @@
char pr_psargs[ELF_PRARGSZ]; /* Initial part of arg list. */
};
+
+/* The rest of this file provides the types for emulation of the
+ Solaris <proc_service.h> interfaces that should be implemented by
+ users of libthread_db. */
+
/* Addresses. */
typedef void *psaddr_t;
@@ -103,10 +114,10 @@
typedef elf_fpregset_t prfpregset_t;
/* We don't have any differences between processes and threads,
- therefore habe only ine PID type. */
+ therefore have only one PID type. */
typedef __pid_t lwpid_t;
-
+/* Process status and info. In the end we do provide typedefs for them. */
typedef struct elf_prstatus prstatus_t;
typedef struct elf_prpsinfo prpsinfo_t;
Index: sysdeps/unix/sysv/linux/sh/sys/user.h
===================================================================
RCS file: /cvs/glibc/libc/sysdeps/unix/sysv/linux/sh/sys/user.h,v
retrieving revision 1.4
diff -u -r1.4 user.h
--- sysdeps/unix/sysv/linux/sh/sys/user.h 8 Feb 2003 02:32:42 -0000 1.4
+++ sysdeps/unix/sysv/linux/sh/sys/user.h 16 Feb 2009 23:50:31 -0000
@@ -1,4 +1,4 @@
-/* Copyright (C) 1998, 1999, 2000, 2003 Free Software Foundation, Inc.
+/* Copyright (C) 1998, 1999, 2000, 2003, 2009 Free Software Foundation, Inc.
This file is part of the GNU C Library.
The GNU C Library is free software; you can redistribute it and/or
@@ -19,10 +19,108 @@
#ifndef _SYS_USER_H
#define _SYS_USER_H 1
-#include <features.h>
-
-#include <asm/user.h>
-
-#undef start_thread
-
+/*
+ * GCC defines register number like this:
+ * -----------------------------
+ * 0 - 15 are integer registers
+ * 17 - 22 are control/special registers
+ * 24 - 39 fp registers
+ * 40 - 47 xd registers
+ * 48 - fpscr register
+ * -----------------------------
+ *
+ * We follows above, except:
+ * 16 --- program counter (PC)
+ * 22 --- syscall #
+ * 23 --- floating point communication register
+ */
+#define REG_REG0 0
+#define REG_REG15 15
+
+#define REG_PC 16
+
+#define REG_PR 17
+#define REG_SR 18
+#define REG_GBR 19
+#define REG_MACH 20
+#define REG_MACL 21
+
+#define REG_SYSCALL 22
+
+#define REG_FPREG0 23
+#define REG_FPREG15 38
+#define REG_XFREG0 39
+#define REG_XFREG15 54
+
+#define REG_FPSCR 55
+#define REG_FPUL 56
+
+/*
+ * This struct defines the way the registers are stored on the
+ * kernel stack during a system call or other kernel entry.
+ */
+struct user_regs_struct {
+ unsigned long regs[16];
+ unsigned long pc;
+ unsigned long pr;
+ unsigned long sr;
+ unsigned long gbr;
+ unsigned long mach;
+ unsigned long macl;
+ unsigned long tra;
+};
+
+/*
+ * This struct defines the way the DSP registers are stored on the
+ * kernel stack during a system call or other kernel entry.
+ */
+struct user_dspregs_struct {
+ unsigned long a1;
+ unsigned long a0g;
+ unsigned long a1g;
+ unsigned long m0;
+ unsigned long m1;
+ unsigned long a0;
+ unsigned long x0;
+ unsigned long x1;
+ unsigned long y0;
+ unsigned long y1;
+ unsigned long dsr;
+ unsigned long rs;
+ unsigned long re;
+ unsigned long mod;
+};
+
+struct user_fpu_struct {
+ unsigned long fp_regs[16];
+ unsigned long xfp_regs[16];
+ unsigned long fpscr;
+ unsigned long fpul;
+};
+
+struct user {
+ struct user_regs_struct regs; /* entire machine state */
+ struct user_fpu_struct fpu; /* Math Co-processor registers */
+ int u_fpvalid; /* True if math co-processor being used */
+ size_t u_tsize; /* text size (pages) */
+ size_t u_dsize; /* data size (pages) */
+ size_t u_ssize; /* stack size (pages) */
+ unsigned long start_code; /* text starting address */
+ unsigned long start_data; /* data starting address */
+ unsigned long start_stack; /* stack starting address */
+ long int signal; /* signal causing core dump */
+ unsigned long u_ar0; /* help gdb find registers */
+ struct user_fpu_struct *u_fpstate; /* Math Co-processor pointer */
+ unsigned long magic; /* identifies a core file */
+ char u_comm[32]; /* user command name */
+};
+
+#define PAGE_SHIFT 12
+#define PAGE_SIZE (1UL << PAGE_SHIFT)
+#define PAGE_MASK (~(PAGE_SIZE-1))
+#define NBPG PAGE_SIZE
+#define UPAGES 1
+#define HOST_TEXT_START_ADDR (u.start_code)
+#define HOST_DATA_START_ADDR (u.start_data)
+#define HOST_STACK_END_ADDR (u.start_stack + u.u_ssize * NBPG)
#endif /* sys/user.h */
---
杉岡利信