qiurui
/
glibc
mirror of git://sourceware.org/git/glibc.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Update. 

2003-09-08  Ulrich Drepper  <drepper@redhat.com>

	* sysdeps/unix/sysv/linux/x86_64/register-dump.h: Undo last change.
	* sysdeps/unix/sysv/linux/x86_64/sigcontextinfo.h: Likewise.

	* scripts/data/c++-types-i386-linux-gnu.data: New file.
This commit is contained in:
Ulrich Drepper 2003-09-09 02:42:46 +00:00
parent 806e4a4a01
commit 2750c39c44
5 changed files with 148 additions and 83 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
ChangeLog
View File

@ -1,3 +1,8 @@
2003-09-08 Ulrich Drepper <drepper@redhat.com>
* sysdeps/unix/sysv/linux/x86_64/register-dump.h: Undo last change.
* sysdeps/unix/sysv/linux/x86_64/sigcontextinfo.h: Likewise.
2003-09-08 Jakub Jelinek <jakub@redhat.com> 2003-09-08 Jakub Jelinek <jakub@redhat.com>
* sysdeps/generic/bits/types.h (__quad_t): Make long int if 64-bit. * sysdeps/generic/bits/types.h (__quad_t): Make long int if 64-bit.
@ -10,7 +15,7 @@
* Makefile (tests): Run check-c++-types.sh if possible. * Makefile (tests): Run check-c++-types.sh if possible.
* scripts/check-c++-types.h: New file. * scripts/check-c++-types.h: New file.
* scripts/data/c++-ctypes-i386-linux-gnu.data: New file. * scripts/data/c++-types-i386-linux-gnu.data: New file.
2003-09-08 Andreas Jaeger <aj@suse.de> 2003-09-08 Andreas Jaeger <aj@suse.de>

4
Makefile
View File

@ -229,7 +229,8 @@ tests-clean:
@$(MAKE) subdir_testclean no_deps=t @$(MAKE) subdir_testclean no_deps=t
tests: $(objpfx)c++-types-check.out tests: $(objpfx)c++-types-check.out
ifneq (no,$(CXX)$(wildcard scripts/data/c++-types-$(base-machine)-$(config-os).data)) ifneq ($(CXX),no)
ifneq (,$(wildcard scripts/data/c++-types-$(base-machine)-$(config-os).data))
$(objpfx)c++-types-check.out: scripts/data/c++-types-$(base-machine)-$(config-os).data $(objpfx)c++-types-check.out: scripts/data/c++-types-$(base-machine)-$(config-os).data
scripts/check-c++-types.sh $^ $(CXX) $(filter-out -std=gnu99,$(CFLAGS)) $(CPPFLAGS) > $@ scripts/check-c++-types.sh $^ $(CXX) $(filter-out -std=gnu99,$(CFLAGS)) $(CPPFLAGS) > $@
else else
@ -237,6 +238,7 @@ $(objpfx)c++-types-check.out:
@echo 'WARNING C++ tests not run; create a c++-types-XXX file' @echo 'WARNING C++ tests not run; create a c++-types-XXX file'
@echo "not run" > $@ @echo "not run" > $@
endif endif
endif
# The realclean target is just like distclean for the parent, but we want # The realclean target is just like distclean for the parent, but we want
# the subdirs to know the difference in case they care. # the subdirs to know the difference in case they care.

58
scripts/data/c++-types-x86_64-linux-gnu.data Normal file
View File

@ -0,0 +1,58 @@
blkcnt64_t:l
blkcnt_t:l
blksize_t:l
caddr_t:Pc
clockid_t:i
clock_t:l
daddr_t:i
dev_t:m
fd_mask:l
fsblkcnt64_t:m
fsblkcnt_t:m
fsfilcnt64_t:m
fsfilcnt_t:m
fsid_t:8__fsid_t
gid_t:j
id_t:j
ino64_t:m
ino_t:m
int16_t:s
int32_t:i
int64_t:l
int8_t:a
intptr_t:l
key_t:i
loff_t:l
mode_t:j
nlink_t:m
off64_t:l
off_t:l
pid_t:i
pthread_key_t:j
pthread_once_t:i
pthread_spinlock_t:i
pthread_t:m
quad_t:l
register_t:l
rlim64_t:m
rlim_t:m
sigset_t:10__sigset_t
size_t:m
socklen_t:j
ssize_t:l
suseconds_t:l
time_t:l
u_char:h
uid_t:j
uint:j
u_int:j
u_int16_t:t
u_int32_t:j
u_int64_t:m
u_int8_t:h
ulong:m
u_long:m
u_quad_t:m
useconds_t:j
ushort:t
u_short:t

154
sysdeps/unix/sysv/linux/x86_64/register-dump.h
View File

@ -65,7 +65,7 @@ hexvalue (unsigned long int value, char *buf, size_t len)
} }
static void static void
register_dump (int fd, struct sigcontext *ctx) register_dump (int fd, struct ucontext *ctx)
{ {
char regs[25][16]; char regs[25][16];
char fpregs[30][8]; char fpregs[30][8];
@ -84,33 +84,33 @@ register_dump (int fd, struct sigcontext *ctx)
++nr ++nr
/* Generate strings of register contents. */ /* Generate strings of register contents. */
hexvalue (ctx->rax, regs[0], 16); hexvalue (ctx->uc_mcontext.gregs[REG_RAX], regs[0], 16);
hexvalue (ctx->rbx, regs[1], 16); hexvalue (ctx->uc_mcontext.gregs[REG_RBX], regs[1], 16);
hexvalue (ctx->rcx, regs[2], 16); hexvalue (ctx->uc_mcontext.gregs[REG_RCX], regs[2], 16);
hexvalue (ctx->rdx, regs[3], 16); hexvalue (ctx->uc_mcontext.gregs[REG_RDX], regs[3], 16);
hexvalue (ctx->rsi, regs[4], 16); hexvalue (ctx->uc_mcontext.gregs[REG_RSI], regs[4], 16);
hexvalue (ctx->rdi, regs[5], 16); hexvalue (ctx->uc_mcontext.gregs[REG_RDI], regs[5], 16);
hexvalue (ctx->rbp, regs[6], 16); hexvalue (ctx->uc_mcontext.gregs[REG_RBP], regs[6], 16);
hexvalue (ctx->r8, regs[7], 16); hexvalue (ctx->uc_mcontext.gregs[REG_R8], regs[7], 16);
hexvalue (ctx->r9, regs[8], 16); hexvalue (ctx->uc_mcontext.gregs[REG_R9], regs[8], 16);
hexvalue (ctx->r10, regs[9], 16); hexvalue (ctx->uc_mcontext.gregs[REG_R10], regs[9], 16);
hexvalue (ctx->r11, regs[10], 16); hexvalue (ctx->uc_mcontext.gregs[REG_R11], regs[10], 16);
hexvalue (ctx->r12, regs[11], 16); hexvalue (ctx->uc_mcontext.gregs[REG_R12], regs[11], 16);
hexvalue (ctx->r13, regs[12], 16); hexvalue (ctx->uc_mcontext.gregs[REG_R13], regs[12], 16);
hexvalue (ctx->r14, regs[13], 16); hexvalue (ctx->uc_mcontext.gregs[REG_R14], regs[13], 16);
hexvalue (ctx->r15, regs[14], 16); hexvalue (ctx->uc_mcontext.gregs[REG_R15], regs[14], 16);
hexvalue (ctx->rsp, regs[15], 16); hexvalue (ctx->uc_mcontext.gregs[REG_RSP], regs[15], 16);
hexvalue (ctx->rip, regs[16], 16); hexvalue (ctx->uc_mcontext.gregs[REG_RIP], regs[16], 16);
hexvalue (ctx->eflags, regs[17], 8); hexvalue (ctx->uc_mcontext.gregs[REG_EFL], regs[17], 8);
hexvalue (ctx->cs, regs[18], 4); hexvalue (ctx->uc_mcontext.gregs[REG_CSGSFS] & 0xffff, regs[18], 4);
hexvalue (ctx->gs, regs[19], 4); hexvalue ((ctx->uc_mcontext.gregs[REG_CSGSFS] >> 16) & 0xffff, regs[19], 4);
hexvalue (ctx->fs, regs[20], 4); hexvalue ((ctx->uc_mcontext.gregs[REG_CSGSFS] >> 32) & 0xffff, regs[20], 4);
/* hexvalue (ctx->ss, regs[23], 4); */ /* hexvalue (ctx->ss, regs[23], 4); */
hexvalue (ctx->trapno, regs[21], 8); hexvalue (ctx->uc_mcontext.gregs[REG_TRAPNO], regs[21], 8);
hexvalue (ctx->err, regs[22], 8); hexvalue (ctx->uc_mcontext.gregs[REG_ERR], regs[22], 8);
hexvalue (ctx->oldmask, regs[23], 8); hexvalue (ctx->uc_mcontext.gregs[REG_OLDMASK], regs[23], 8);
hexvalue (ctx->cr2, regs[24], 8); hexvalue (ctx->uc_mcontext.gregs[REG_CR2], regs[24], 8);
/* Generate the output. */ /* Generate the output. */
ADD_STRING ("Register dump:\n\n RAX: "); ADD_STRING ("Register dump:\n\n RAX: ");
@ -168,15 +168,15 @@ register_dump (int fd, struct sigcontext *ctx)
ADD_STRING (" CR2: "); ADD_STRING (" CR2: ");
ADD_MEM (regs[24], 8); ADD_MEM (regs[24], 8);
if (ctx->fpstate != NULL) if (ctx->uc_mcontext.fpregs != NULL)
{ {
/* Generate output for the FPU control/status registers. */ /* Generate output for the FPU control/status registers. */
hexvalue (ctx->fpstate->cwd, fpregs[0], 8); hexvalue (ctx->uc_mcontext.fpregs->cwd, fpregs[0], 8);
hexvalue (ctx->fpstate->swd, fpregs[1], 8); hexvalue (ctx->uc_mcontext.fpregs->swd, fpregs[1], 8);
hexvalue (ctx->fpstate->ftw, fpregs[2], 8); hexvalue (ctx->uc_mcontext.fpregs->ftw, fpregs[2], 8);
hexvalue (ctx->fpstate->rip, fpregs[3], 8); hexvalue (ctx->uc_mcontext.fpregs->rip, fpregs[3], 8);
hexvalue (ctx->fpstate->rdp, fpregs[4], 8); hexvalue (ctx->uc_mcontext.fpregs->rdp, fpregs[4], 8);
ADD_STRING ("\n\n FPUCW: "); ADD_STRING ("\n\n FPUCW: ");
ADD_MEM (fpregs[0], 8); ADD_MEM (fpregs[0], 8);
@ -190,70 +190,70 @@ register_dump (int fd, struct sigcontext *ctx)
ADD_MEM (fpregs[4], 8); ADD_MEM (fpregs[4], 8);
/* Now the real FPU registers. */ /* Now the real FPU registers. */
hexvalue (ctx->fpstate->_st[0].exponent, fpregs[5], 8); hexvalue (ctx->uc_mcontext.fpregs->_st[0].exponent, fpregs[5], 8);
hexvalue (ctx->fpstate->_st[0].significand[3] << 16 hexvalue (ctx->uc_mcontext.fpregs->_st[0].significand[3] << 16
| ctx->fpstate->_st[0].significand[2], fpregs[6], | ctx->uc_mcontext.fpregs->_st[0].significand[2], fpregs[6],
8); 8);
hexvalue (ctx->fpstate->_st[0].significand[1] << 16 hexvalue (ctx->uc_mcontext.fpregs->_st[0].significand[1] << 16
| ctx->fpstate->_st[0].significand[0], fpregs[7], | ctx->uc_mcontext.fpregs->_st[0].significand[0], fpregs[7],
8); 8);
hexvalue (ctx->fpstate->_st[1].exponent, fpregs[8], 8); hexvalue (ctx->uc_mcontext.fpregs->_st[1].exponent, fpregs[8], 8);
hexvalue (ctx->fpstate->_st[1].significand[3] << 16 hexvalue (ctx->uc_mcontext.fpregs->_st[1].significand[3] << 16
| ctx->fpstate->_st[1].significand[2], fpregs[9], | ctx->uc_mcontext.fpregs->_st[1].significand[2], fpregs[9],
8); 8);
hexvalue (ctx->fpstate->_st[1].significand[1] << 16 hexvalue (ctx->uc_mcontext.fpregs->_st[1].significand[1] << 16
| ctx->fpstate->_st[1].significand[0], fpregs[10], | ctx->uc_mcontext.fpregs->_st[1].significand[0], fpregs[10],
8); 8);
hexvalue (ctx->fpstate->_st[2].exponent, fpregs[11], 8); hexvalue (ctx->uc_mcontext.fpregs->_st[2].exponent, fpregs[11], 8);
hexvalue (ctx->fpstate->_st[2].significand[3] << 16 hexvalue (ctx->uc_mcontext.fpregs->_st[2].significand[3] << 16
| ctx->fpstate->_st[2].significand[2], fpregs[12], | ctx->uc_mcontext.fpregs->_st[2].significand[2], fpregs[12],
8); 8);
hexvalue (ctx->fpstate->_st[2].significand[1] << 16 hexvalue (ctx->uc_mcontext.fpregs->_st[2].significand[1] << 16
| ctx->fpstate->_st[2].significand[0], fpregs[13], | ctx->uc_mcontext.fpregs->_st[2].significand[0], fpregs[13],
8); 8);
hexvalue (ctx->fpstate->_st[3].exponent, fpregs[14], 8); hexvalue (ctx->uc_mcontext.fpregs->_st[3].exponent, fpregs[14], 8);
hexvalue (ctx->fpstate->_st[3].significand[3] << 16 hexvalue (ctx->uc_mcontext.fpregs->_st[3].significand[3] << 16
| ctx->fpstate->_st[3].significand[2], fpregs[15], | ctx->uc_mcontext.fpregs->_st[3].significand[2], fpregs[15],
8); 8);
hexvalue (ctx->fpstate->_st[3].significand[1] << 16 hexvalue (ctx->uc_mcontext.fpregs->_st[3].significand[1] << 16
| ctx->fpstate->_st[3].significand[0], fpregs[16], | ctx->uc_mcontext.fpregs->_st[3].significand[0], fpregs[16],
8); 8);
hexvalue (ctx->fpstate->_st[4].exponent, fpregs[17], 8); hexvalue (ctx->uc_mcontext.fpregs->_st[4].exponent, fpregs[17], 8);
hexvalue (ctx->fpstate->_st[4].significand[3] << 16 hexvalue (ctx->uc_mcontext.fpregs->_st[4].significand[3] << 16
| ctx->fpstate->_st[4].significand[2], fpregs[18], | ctx->uc_mcontext.fpregs->_st[4].significand[2], fpregs[18],
8); 8);
hexvalue (ctx->fpstate->_st[4].significand[1] << 16 hexvalue (ctx->uc_mcontext.fpregs->_st[4].significand[1] << 16
| ctx->fpstate->_st[4].significand[0], fpregs[19], | ctx->uc_mcontext.fpregs->_st[4].significand[0], fpregs[19],
8); 8);
hexvalue (ctx->fpstate->_st[5].exponent, fpregs[20], 8); hexvalue (ctx->uc_mcontext.fpregs->_st[5].exponent, fpregs[20], 8);
hexvalue (ctx->fpstate->_st[5].significand[3] << 16 hexvalue (ctx->uc_mcontext.fpregs->_st[5].significand[3] << 16
| ctx->fpstate->_st[5].significand[2], fpregs[21], | ctx->uc_mcontext.fpregs->_st[5].significand[2], fpregs[21],
8); 8);
hexvalue (ctx->fpstate->_st[5].significand[1] << 16 hexvalue (ctx->uc_mcontext.fpregs->_st[5].significand[1] << 16
| ctx->fpstate->_st[5].significand[0], fpregs[22], | ctx->uc_mcontext.fpregs->_st[5].significand[0], fpregs[22],
8); 8);
hexvalue (ctx->fpstate->_st[6].exponent, fpregs[23], 8); hexvalue (ctx->uc_mcontext.fpregs->_st[6].exponent, fpregs[23], 8);
hexvalue (ctx->fpstate->_st[6].significand[3] << 16 hexvalue (ctx->uc_mcontext.fpregs->_st[6].significand[3] << 16
| ctx->fpstate->_st[6].significand[2], fpregs[24], | ctx->uc_mcontext.fpregs->_st[6].significand[2], fpregs[24],
8); 8);
hexvalue (ctx->fpstate->_st[6].significand[1] << 16 hexvalue (ctx->uc_mcontext.fpregs->_st[6].significand[1] << 16
| ctx->fpstate->_st[6].significand[0], fpregs[25], | ctx->uc_mcontext.fpregs->_st[6].significand[0], fpregs[25],
8); 8);
hexvalue (ctx->fpstate->_st[7].exponent, fpregs[26], 8); hexvalue (ctx->uc_mcontext.fpregs->_st[7].exponent, fpregs[26], 8);
hexvalue (ctx->fpstate->_st[7].significand[3] << 16 hexvalue (ctx->uc_mcontext.fpregs->_st[7].significand[3] << 16
| ctx->fpstate->_st[7].significand[2], fpregs[27], | ctx->uc_mcontext.fpregs->_st[7].significand[2], fpregs[27],
8); 8);
hexvalue (ctx->fpstate->_st[7].significand[1] << 16 hexvalue (ctx->uc_mcontext.fpregs->_st[7].significand[1] << 16
| ctx->fpstate->_st[7].significand[0], fpregs[28], | ctx->uc_mcontext.fpregs->_st[7].significand[0], fpregs[28],
8); 8);
hexvalue (ctx->fpstate->mxcsr, fpregs[29], 4); hexvalue (ctx->uc_mcontext.fpregs->mxcsr, fpregs[29], 4);
for (i = 0; i < 16; i++) for (i = 0; i < 16; i++)
hexvalue (ctx->fpstate->_xmm[i].element[3] << 24 hexvalue (ctx->uc_mcontext.fpregs->_xmm[i].element[3] << 24
| ctx->fpstate->_xmm[i].element[2] << 16 | ctx->uc_mcontext.fpregs->_xmm[i].element[2] << 16
| ctx->fpstate->_xmm[i].element[1] << 8 | ctx->uc_mcontext.fpregs->_xmm[i].element[1] << 8
| ctx->fpstate->_xmm[i].element[0], xmmregs[i], | ctx->uc_mcontext.fpregs->_xmm[i].element[0], xmmregs[i],
32); 32);

8
sysdeps/unix/sysv/linux/x86_64/sigcontextinfo.h
View File

@ -16,11 +16,11 @@
Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
02111-1307 USA. */ 02111-1307 USA. */
#define SIGCONTEXT struct sigcontext #define SIGCONTEXT struct ucontext
#define SIGCONTEXT_EXTRA_ARGS #define SIGCONTEXT_EXTRA_ARGS
#define GET_PC(ctx) ((void *) (ctx).rip) #define GET_PC(ctx) ((void *) (ctx).uc_mcontext.gregs[REG_RIP])
#define GET_FRAME(ctx) ((void *) (ctx).rbp) #define GET_FRAME(ctx) ((void *) (ctx).uc_mcontext.gregs[REG_RBP])
#define GET_STACK(ctx) ((void *) (ctx).rsp) #define GET_STACK(ctx) ((void *) (ctx).uc_mcontext.gregs[REG_RSP])
#define CALL_SIGHANDLER(handler, signo, ctx) \ #define CALL_SIGHANDLER(handler, signo, ctx) \
(handler)((signo), SIGCONTEXT_EXTRA_ARGS (ctx)) (handler)((signo), SIGCONTEXT_EXTRA_ARGS (ctx))